From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 4 Apr 2006 02:54:55 +0000 (+0000)
Subject: * Count log entries too, for uber-anal-completeness' sake
X-Git-Tag: 1.6.0~47
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=971d902bd482bcafc3376c529552f3ee25787175;p=lhc%2Fweb%2Fwiklou.git

* Count log entries too, for uber-anal-completeness' sake
* Fix oversight in counts
---

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 2c967b1d51..9166a40441 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -34,7 +34,7 @@ echo( "Found " . count( $users ) . " accounts.\n\n" );
 echo( "Locating inactive users..." );
 foreach( $users as $user ) {
 	if( $user != 1 ) {	# Don't *touch* the first user account, ever
-		if( CountEdits( $user, false ) == 0 && CountImages( $user, false ) == 0 ) {
+		if( CountEdits( $user, false ) == 0 && CountImages( $user, false ) == 0 && CountLogs( $user, false ) == 0 ) {
 			# User has no edits or images, mark them for deletion
 			$del[] = $user;
 			$count++;
diff --git a/maintenance/userFunctions.inc b/maintenance/userFunctions.inc
index 314da61ed1..a1b8c76068 100644
--- a/maintenance/userFunctions.inc
+++ b/maintenance/userFunctions.inc
@@ -18,7 +18,7 @@
 function CountEdits( $user, $slave = true ) {
 	$dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
 	# Count current edits
-	$res = $dbw->select( 'revision', 'COUNT(rev_id) AS count', array( 'rev_user' => $user ) );
+	$res = $dbw->select( 'revision', 'COUNT(*) AS count', array( 'rev_user' => $user ) );
 	$row = $dbw->fetchObject( $res );
 	$count = $row->count;
 	# Count deleted edits
@@ -39,7 +39,7 @@ function CountEdits( $user, $slave = true ) {
 function CountImages( $user, $slave = true ) {
 	$dbw =& wfGetDB( $slave ? DB_SLAVE: DB_MASTER );
 	# Count current images
-	$res = $dbw->select( 'image', 'COUNT(rev_id) AS count', array( 'img_user' => $user ) );
+	$res = $dbw->select( 'image', 'COUNT(*) AS count', array( 'img_user' => $user ) );
 	$row = $dbw->fetchObject( $res );
 	$count = $row->count;
 	# Count deleted edits
@@ -50,6 +50,23 @@ function CountImages( $user, $slave = true ) {
 	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 );
+}
+
 /**
  * Retrieve all valid user IDs
  *