From aa387acd2937fa3c5c6664fbb56ca3fb0a5aaead Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 30 Jun 2009 00:52:44 +0000
Subject: Suppress more 'all' related errors

---
diff --git a/site/app/models/addon.php b/site/app/models/addon.php
index 0b99cf4..704f7fe 100644
--- a/site/app/models/addon.php
+++ b/site/app/models/addon.php
@@ -384,6 +384,7 @@ class Addon extends AppModel
         $select_field = 'DISTINCT Addon.id';
 
         // make input data uniform
+        if ($addontypes == 'all') $addontypes = array();
         if (!is_array($addontypes)) $addontypes = array($addontypes);
         if (!is_array($status)) $status = array($status);
         if ($page <= 0) $page = 1;
@@ -457,7 +458,7 @@ class Addon extends AppModel
             $sql = "SELECT {$select_field} FROM addons AS Addon "
                 ."INNER JOIN versions AS Version ON (Addon.id = Version.addon_id) "
                 .$add_joins
-                ."WHERE Addon.addontype_id IN(".implode(',',$addontypes).") "
+                .(!empty($addontypes) ? 'WHERE Addon.addontype_id IN('.implode(',',$addontypes).') ' : '')
                 ."AND Addon.status IN(".implode(',',$status).") "
                 ."AND Addon.inactive = 0 "
                 ."{$where} {$groupby} {$orderby} {$limitclause}";
@@ -466,7 +467,7 @@ class Addon extends AppModel
                 ."INNER JOIN versions AS Version ON (Addon.id = Version.addon_id) "
                 ."INNER JOIN applications_versions AS av ON (av.version_id = Version.id AND av.application_id = ".APP_ID.") "
                 .$add_joins
-                ."WHERE Addon.addontype_id IN(".implode(',',$addontypes).") "
+                .(!empty($addontypes) ? 'WHERE Addon.addontype_id IN('.implode(',',$addontypes).') ' : '')
                 ."AND Addon.status IN(".implode(',',$status).") "
                 ."AND Addon.inactive = 0 "
                 ."{$where} {$groupby} {$orderby} {$limitclause}";
@@ -599,6 +600,8 @@ class Addon extends AppModel
 
         if (!is_array($status))
             $status = array($status);
+        if ($addontypes == 'all')
+            $addontypes = array();
         if (!is_array($addontypes))
             $addontypes = array($addontypes);
 
@@ -609,7 +612,7 @@ class Addon extends AppModel
                 .'INNER JOIN applications_versions AS av ON (av.version_id = Version.id AND av.application_id = '.APP_ID.') '
                 .'INNER JOIN addons_categories AS at ON (at.addon_id = Addon.id)  '
                 .'INNER JOIN files AS File ON (Version.id = File.version_id AND File.status IN ('.implode(',',$status).')) '
-                .'WHERE Addon.addontype_id IN('.implode(',',$addontypes).') '
+                .(!empty($addontypes) ? 'WHERE Addon.addontype_id IN('.implode(',',$addontypes).') ' : '')
                 .'AND Addon.status IN('.implode(',',$status).') '
                 .'AND Addon.inactive = 0 '
                 .'GROUP BY at.category_id';
diff --git a/site/app/models/addon_category.php b/site/app/models/addon_category.php
index 0cf7677..4581b4b 100644
--- a/site/app/models/addon_category.php
+++ b/site/app/models/addon_category.php
@@ -65,6 +65,7 @@ class AddonCategory extends AppModel
         
         if ($category == 'all') $category = array();
         if (!is_array($category)) $category = array($category);
+        if ($addontype == 'all') $addontype = array();
         if (!is_null($addontype) && !is_array($addontype)) $addontype = array($addontype);
         
         $raw_addons = $this->query(
--
cgit v0.9.1