Fix APP_FIREFOX constants in the code (it does not exists anymore).

.hgignore

@@ -1,5 +1,5 @@
 ~$
 \.svn/
-^site/app/webroot/files/
+^site/app/webroot/files($|/)
 ^site/app/tmp/
 ^site/app/config/config.php$

bin/compatibility_report.php

@@ -152,7 +152,7 @@ foreach ($compatibility_versions as $compatibility_version) {
 
     $versions_qry = $db->query("SELECT id, version
                                 FROM appversions
-                                WHERE application_id = ".APP_FIREFOX." AND
+                                WHERE application_id = ".APP_INSTANTBIRD." AND
                                       (".compatibleVersions($compatibility_version).")
                                 ORDER BY version");
     $versions = array();

site/app/controllers/collections_controller.php

@@ -270,7 +270,7 @@ class CollectionsController extends AppController
      */
     function interactive() {
         // this is Firefox only, for now.
-        if (APP_ID != APP_FIREFOX) {
+        if (true) {
             $this->redirect('/');
             exit();
         }

site/app/controllers/compatibility_controller.php

@@ -132,7 +132,7 @@ class CompatibilityController extends AppController
             
             if (!empty($addon_ids)) {
                 $relatedVersions = $this->Appversion->getRelatedVersions($version);
-                $appversions = $this->Versioncompare->getCompatibilityGrades($version, $relatedVersions[APP_FIREFOX]);
+                $appversions = $this->Versioncompare->getCompatibilityGrades($version, $relatedVersions[APP_INSTANTBIRD]);
                 
                 foreach ($addon_ids as $addon_id => $addon_name) {
                     $stats = $this->Addon->query("SELECT date, count, application FROM update_counts WHERE addon_id = {$addon_id} ORDER BY date DESC LIMIT 1");
@@ -157,7 +157,7 @@ class CompatibilityController extends AppController
                     $addons[$addon_id]['percentage'] = round(($addons[$addon_id]['versionCount'] / $addons[$addon_id]['totalCount'] * 100), 2);
                     
                     // Get latest version's compatibility
-                    $compat = $this->Addon->query("SELECT appversions.version, versions.id FROM versions INNER JOIN applications_versions ON applications_versions.version_id = versions.id INNER JOIN appversions ON appversions.id = applications_versions.max WHERE versions.addon_id={$addon_id} AND applications_versions.application_id = ".APP_FIREFOX." ORDER BY versions.created DESC LIMIT 1");
+                    $compat = $this->Addon->query("SELECT appversions.version, versions.id FROM versions INNER JOIN applications_versions ON applications_versions.version_id = versions.id INNER JOIN appversions ON appversions.id = applications_versions.max WHERE versions.addon_id={$addon_id} AND applications_versions.application_id = ".APP_INSTANTBIRD." ORDER BY versions.created DESC LIMIT 1");
                     
                     $addons[$addon_id]['appversion'] = $compat[0]['appversions']['version'];
                     $addons[$addon_id]['latestVersion'] = $compat[0]['versions']['id'];

site/app/controllers/developers_controller.php

@@ -734,7 +734,7 @@ class DevelopersController extends AppController
             $supportedApps = array(
                 0 => array(
                         'Application' => array(
-                            'id' => APP_FIREFOX
+                            'id' => APP_INSTANTBIRD
                         )
                     )
             );

site/app/controllers/sharing_api_controller.php

@@ -261,7 +261,7 @@ class SharingApiController extends AppController
         if (!empty($app_shortnames[$params['app']])) {
             $appid = $app_shortnames[$params['app']];
         } else {
-            $appid = APP_FIREFOX;
+            $appid = APP_INSTANTBIRD;
         }
 
         $data = array(

site/app/views/elements/install.thtml

@@ -273,23 +273,6 @@ if (count($addonFiles) < 1) {
         $versionsPage = true;
     }		
 		
-    // show add-on compatibility hints for Firefox
-    if (APP_ID == APP_FIREFOX && !empty($compatible_apps)) {
-        $fromVer = $toVer = null;
-        foreach ($compatible_apps as $app) {
-            if ($app['Application']['application_id'] == APP_FIREFOX) {
-                $fromVer = $app['Min_Version']['version'];
-                $toVer = $app['Max_Version']['version'];
-            }
-        }
-        if ($fromVer && $toVer) { 
-            // show "ignore" link for logged in users only
-            $_loggedin = $this->controller->Session->check('User');
-            echo "addCompatibilityHints('{$addonId}', '{$versionId}', "
-                ."'{$fromVer}', '{$toVer}', '{$_loggedin}', '{$versionsPage}');";
-        }
-
-    }
     echo "},0);".
          '</script>';
     ?>

site/app/views/elements/search.thtml

@@ -58,26 +58,12 @@ if (!isset($appid)) {
 } 
 
 $min_display_version_by_app = array( // eventually this information should be kept in DB
-    APP_FIREFOX => "1.0",
-    APP_THUNDERBIRD => "1.0",
-    APP_SEAMONKEY => "1.0",
-    APP_SUNBIRD => "0.2"
+    APP_INSTANTBIRD => "0.2",
 );
 
 $new_versions = array();
 foreach ($app_shortnames as $n => $k) {
 // AmoVersions is from controller->beforeRender()
-    if (!empty($AmoVersions[$k])) foreach ($AmoVersions[$k] as $version) {
-        $versions_parts = explode(".", $version);
-        $second_part = (isset($versions_parts[1])) ? ".".intval($versions_parts[1]) : "";
-        if (!isset($min_display_version_by_app[$k])
-            || $min_display_version_by_app[$k] <= $versions_parts[0].$second_part ) {
-            
-            if ($k != APP_FIREFOX || $versions_parts[0].$second_part !== '1.4') { // yuck. Baz didn't like FF 1.4
-                $new_versions[$k][] = $versions_parts[0].$second_part;  
-            }
-        }
-    }
     if (!empty($new_versions[$k]))
         $new_versions[$k] = array_unique($new_versions[$k]);
 }
@@ -266,25 +252,6 @@ if (!isset($category)) $category = array(0, 0);
     // JS to do browser detection to determine default low range to be current browser if applicable
 ?>
 
-    var current_app_id = 0;
-    var uapattern = /Mozilla.*(?:Firefox|Minefield|Shiretoko|GranParadiso|BonEcho|Iceweasel)\/([^\s]*).*$/;
-    var ua = navigator.userAgent;
-    var uamatch = uapattern.exec(ua);
-    if (uamatch != null) {
-        version = uamatch[1].split(".");
-        low_appversion = version[0]+"."+parseInt(version[1]);
-        current_app_id = <?=APP_FIREFOX ?>;
-    }
-
-    uapattern = /Mozilla.*(?:SeaMonkey|Iceape)\/([^\s]*).*$/;
-    ua = navigator.userAgent;
-    uamatch = uapattern.exec(ua);
-    if (uamatch != null) {
-        version = uamatch[1].split(".");
-        low_appversion = version[0]+"."+parseInt(version[1]);
-        current_app_id = <?=APP_SEAMONKEY ?>;
-    }
-    
     default_low = ('<?=$oldver ?>' == '' && current_app_id == <?=APP_ID; ?>) ? low_appversion : <?=$lver ?>;      
  
     <?php