appdb/. appdbStats.php viewScreenshots.php

[WineHQ]

ChangeSet ID:	30956
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/03/11 17:42:29

Modified files:
    .              : appdbStats.php viewScreenshots.php

Log message:
    Alexander Nicolaysen Sørnes 
    Replace references to getNumberOfImages()

Patch: http://cvs.winehq.org/patch.py?id=30956

Old revision  New revision  Changes     Path
 1.12          1.13          +2 -2       appdb/appdbStats.php
 1.8           1.9           +5 -2       appdb/viewScreenshots.php

Index: appdb/appdbStats.php
diff -u -p appdb/appdbStats.php:1.12 appdb/appdbStats.php:1.13
--- appdb/appdbStats.php:1.12	11 Mar 2007 22:42:29 -0000
+++ appdb/appdbStats.php	11 Mar 2007 22:42:29 -0000
@@ -73,8 +73,8 @@ echo "</tr>\n\n";

/* Display the number of images */
 echo "<tr class=color4>\n";
-echo "    <td>Images:</td>\n";
-echo "    <td>".getNumberOfImages()."</td>\n";
+echo "    <td>Screenshots:</td>\n";
+echo "    <td>".appData::objectGetEntriesCount(false)."</td>\n";
 echo "</tr>\n\n";
    
 echo "</table>\n\n";
Index: appdb/viewScreenshots.php
diff -u -p appdb/viewScreenshots.php:1.8 appdb/viewScreenshots.php:1.9
--- appdb/viewScreenshots.php:1.8	11 Mar 2007 22:42:29 -0000
+++ appdb/viewScreenshots.php	11 Mar 2007 22:42:29 -0000
@@ -22,7 +22,7 @@ if($aClean['iPage'])
     $currentPage = $aClean['iPage'];

$ItemsPerPage = min($ItemsPerPage,100);
-$totalPages = ceil(getNumberOfImages()/$ItemsPerPage);
+$totalPages = ceil(appData::objectGetEntriesCount(false)/$ItemsPerPage);
 $currentPage = min($currentPage,$totalPages);
 $offset = (($currentPage-1) * $ItemsPerPage);

@@ -58,7 +58,10 @@ echo "</center>";

/* query for all of the Screenshots in assending order */
 $Ids = query_parameters("SELECT * from appData 
-                     WHERE type = 'image' 
+                     WHERE
+                     type = 'screenshot'
+                     AND
+                     queued = 'false'
                      ORDER BY id ASC LIMIT ?, ?",
                     $offset, $ItemsPerPage);
 $c = 1;