Use getInt not getVal

[lhc/web/wiklou.git] / maintenance / userFunctions.inc

diff --git a/maintenance/userFunctions.inc b/maintenance/userFunctions.inc
index c635de5..a1b8c76 100644 (file)
--- a/maintenance/userFunctions.inc
+++ b/maintenance/userFunctions.inc
@@ -17,9 +17,54 @@
  */
 function CountEdits( $user, $slave = true ) {
        $dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
-       $res = $dbw->select( 'revision', 'COUNT(rev_id) AS count', array( 'rev_user' => $user ) );
+       # Count current edits
+       $res = $dbw->select( 'revision', 'COUNT(*) AS count', array( 'rev_user' => $user ) );
        $row = $dbw->fetchObject( $res );
-       return( $row->count );
+       $count = $row->count;
+       # Count deleted edits
+       $res = $dbw->select( 'archive', 'COUNT(*) AS count', array( 'ar_user' => $user ) );
+       $row = $dbw->fetchObject( $res );
+       $count += $row->count;
+       # Done
+       return( $count );
+}
+
+/**
+ * Count the number of images the specified user has uploaded
+ *
+ * @param integer $user User ID
+ * @param bool $slave Whether or not a slave can be used
+ * @return integer
+ */
+function CountImages( $user, $slave = true ) {
+       $dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
+       # Count current images
+       $res = $dbw->select( 'image', 'COUNT(*) AS count', array( 'img_user' => $user ) );
+       $row = $dbw->fetchObject( $res );
+       $count = $row->count;
+       # Count deleted edits
+       $res = $dbw->select( 'oldimage', 'COUNT(*) AS count', array( 'oi_user' => $user ) );
+       $row = $dbw->fetchObject( $res );
+       $count += $row->count;
+       # Done
+       return( $count );
+}
+
+/**
+ * Count the number of log entries associated with the specified user
+ *
+ * @param integer $user User ID
+ * @param bool $slave Whether or not a slave can be used
+ * @return integer
+ */
+function CountLogs( $user, $slave = true ) {
+       $dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
+       # Count log entries
+       $res = $dbw->select( 'logging', 'COUNT(*) AS count', array( 'log_user' => $user ) );
+       $row = $dbw->fetchObject( $res );
+       $count = $row->count;
+       # Done
+       return( $count );
 }
 
 /**