appdb/ ./appdbStats.php include/user.php

[WineHQ]

ChangeSet ID:	31066
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/04/21 12:06:50

Modified files:
    .              : appdbStats.php 
    include        : user.php

Log message:
    Alexander Nicolaysen Sørnes 
    Rename user::count() to objectGetEntriesCount() for consistency with the other generic
    object methods

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

Old revision  New revision  Changes     Path
 1.17          1.18          +3 -2       appdb/appdbStats.php
 1.88          1.89          +3 -2       appdb/include/user.php

Index: appdb/appdbStats.php
diff -u -p appdb/appdbStats.php:1.17 appdb/appdbStats.php:1.18
--- appdb/appdbStats.php:1.17	21 Apr 2007 17: 6:50 -0000
+++ appdb/appdbStats.php	21 Apr 2007 17: 6:50 -0000
@@ -14,7 +14,7 @@ echo "<table width='100%' border=1 cellp
 /* Display the number of users */
 echo "<tr class=color4>\n";
 echo "    <td>Users:</td>\n";
-echo "    <td>".User::count()."</td>\n";
+echo "    <td>".User::objectGetEntriesCount()."</td>\n";
 echo "</tr>\n\n";

/* Display the active users in the last 30 days */
@@ -38,7 +38,8 @@ echo "</tr>\n\n";
 /* Display the inactive users */
 echo "<tr class=color4>\n";
 echo "    <td>Inactive users (not logged in since six months):</td>\n";
-echo "    <td>".(User::count()-User::active_users_within_days(183))."</td>\n";
+echo "    <td>".(User::objectGetEntriesCount()-
+        User::active_users_within_days(183))."</td>\n";
 echo "</tr>\n\n";

/* Display the users who were warned and pending deletion */
Index: appdb/include/user.php
diff -u -p appdb/include/user.php:1.88 appdb/include/user.php:1.89
--- appdb/include/user.php:1.88	21 Apr 2007 17: 6:50 -0000
+++ appdb/include/user.php	21 Apr 2007 17: 6:50 -0000
@@ -480,9 +480,10 @@ class User {
      }

/**
-      * Get the number of users in the database 
+      * Get the number of users in the database
+      * The parameters are only included for compatibility; we don't queue users 
       */
-     function count()
+     function objectGetEntriesCount($bQueued = null, $bRejected = null)
      {
          $hResult = query_parameters("SELECT count(*) as num_users FROM user_list;");
          $oRow = mysql_fetch_object($hResult);