Alexander Nicolaysen Sørnes : Fix queue links/count for maintainers

[Chris Morgan]

Module: appdb
Branch: master
Commit: dd6f0109bf6dab7bd543db957ff5227ab07790d6
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=dd6f0109bf6dab7bd543db957...

Author: Alexander Nicolaysen Sørnes 
Date:   Wed Jan 23 00:31:47 2008 +0100

Fix queue links/count for maintainers

---

include/appData.php                  |    1 -
 include/screenshot.php               |    4 ++--
 include/sidebar_maintainer_admin.php |   19 +++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/appData.php b/include/appData.php
index 9174a34..2b0c137 100644
--- a/include/appData.php
+++ b/include/appData.php
@@ -341,7 +341,6 @@ class appData
                 appVersion, appFamily WHERE
                 appFamily.appId = appVersion.appId
                 AND
-                AND
                 appMaintainers.state = 'accepted'
                 AND
                 appMaintainers.userId = '?'
diff --git a/include/screenshot.php b/include/screenshot.php
index 6b91d37..b0c6ca2 100644
--- a/include/screenshot.php
+++ b/include/screenshot.php
@@ -652,10 +652,10 @@ class screenshot
     function objectGetEntries($sState, $iRows = 0, $iStart = 0)
     {
         return appData::objectGetEntries($sState, $iRows, $iStart,
-                                         "screenshot");
+                                         'screenshot');
     }

-    function objectGetEntriesCount($sState, $iRows = 0, $iStart = 0)
+    function objectGetEntriesCount($sState)
     {
         return appData::objectGetEntriesCount($sState, 'screenshot');
     }
diff --git a/include/sidebar_maintainer_admin.php b/include/sidebar_maintainer_admin.php
index 468a294..9006ee3 100644
--- a/include/sidebar_maintainer_admin.php
+++ b/include/sidebar_maintainer_admin.php
@@ -7,16 +7,15 @@ function global_maintainer_admin_menu() {

$g = new htmlmenu("Maintainer Admin");

-    $g->add("View Version Queue (".version::objectGetEntriesCount(true, false).")",
-            BASE."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=".
-            "Version%20Queue");
-    $g->add("View Screenshot Queue (".appData::objectGetEntriesCount("true",
-            false, "screenshot").")",
-            BASE."objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=".
-            "Screenshot%20Queue");
-    $g->add("View Test Results Queue (".testData::objectGetEntriesCount(true, false).")",
-            BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=".
-            "Test%20Results%20Queue");
+    $g->add('View Version Queue ('.version::objectGetEntriesCount('queued').')',
+            BASE.'objectManager.php?sClass=version_queue&sState=queued&sTitle='.
+            'Version%20Queue');
+    $g->add('View Screenshot Queue ('.screenshot::objectGetEntriesCount('queued').')',
+            BASE.'objectManager.php?sClass=screenshot&sState=queued&sTitle='.
+            'Screenshot%20Queue');
+    $g->add('View Test Results Queue ('.testData::objectGetEntriesCount('queued').')',
+            BASE.'objectManager.php?sClass=testData_queue&sState=queued&sTitle='.
+            'Test%20Results%20Queue');
     $g->done();
 }