dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix small typo in documentation of IDatabase"
[lhc/web/wiklou.git]
/
maintenance
/
userDupes.inc
diff --git
a/maintenance/userDupes.inc
b/maintenance/userDupes.inc
index
bd3338a
..
69c9265
100644
(file)
--- a/
maintenance/userDupes.inc
+++ b/
maintenance/userDupes.inc
@@
-61,6
+61,7
@@
class UserDupes {
$info = $this->db->indexInfo( 'user', 'user_name', __METHOD__ );
if ( !$info ) {
$this->out( "WARNING: doesn't seem to have user_name index at all!\n" );
$info = $this->db->indexInfo( 'user', 'user_name', __METHOD__ );
if ( !$info ) {
$this->out( "WARNING: doesn't seem to have user_name index at all!\n" );
+
return false;
}
return false;
}
@@
-102,6
+103,7
@@
class UserDupes {
function checkDupes( $doDelete = false ) {
if ( $this->hasUniqueIndex() ) {
echo wfWikiID() . " already has a unique index on its user table.\n";
function checkDupes( $doDelete = false ) {
if ( $this->hasUniqueIndex() ) {
echo wfWikiID() . " already has a unique index on its user table.\n";
+
return true;
}
return true;
}
@@
-125,7
+127,8
@@
class UserDupes {
if ( $this->reassigned > 0 ) {
if ( $doDelete ) {
if ( $this->reassigned > 0 ) {
if ( $doDelete ) {
- $this->out( "$this->reassigned duplicate accounts had edits reassigned to a canonical record id.\n" );
+ $this->out( "$this->reassigned duplicate accounts had edits "
+ . "reassigned to a canonical record id.\n" );
} else {
$this->out( "$this->reassigned duplicate accounts need to have edits reassigned.\n" );
}
} else {
$this->out( "$this->reassigned duplicate accounts need to have edits reassigned.\n" );
}
@@
-133,22
+136,27
@@
class UserDupes {
if ( $this->trimmed > 0 ) {
if ( $doDelete ) {
if ( $this->trimmed > 0 ) {
if ( $doDelete ) {
- $this->out( "$this->trimmed duplicate user records were deleted from " . wfWikiID() . ".\n" );
+ $this->out( "$this->trimmed duplicate user records were deleted from "
+ . wfWikiID() . ".\n" );
} else {
} else {
- $this->out( "$this->trimmed duplicate user accounts were found on " . wfWikiID() . " which can be removed safely.\n" );
+ $this->out( "$this->trimmed duplicate user accounts were found on "
+ . wfWikiID() . " which can be removed safely.\n" );
}
}
if ( $this->failed > 0 ) {
$this->out( "Something terribly awry; $this->failed duplicate accounts were not removed.\n" );
}
}
if ( $this->failed > 0 ) {
$this->out( "Something terribly awry; $this->failed duplicate accounts were not removed.\n" );
+
return false;
}
if ( $this->trimmed == 0 || $doDelete ) {
$this->out( "It is now safe to apply the unique index on user_name.\n" );
return false;
}
if ( $this->trimmed == 0 || $doDelete ) {
$this->out( "It is now safe to apply the unique index on user_name.\n" );
+
return true;
} else {
$this->out( "Run this script again with the --fix option to automatically delete them.\n" );
return true;
} else {
$this->out( "Run this script again with the --fix option to automatically delete them.\n" );
+
return false;
}
}
return false;
}
}
@@
-158,8
+166,8
@@
class UserDupes {
* @access private
*/
function lock() {
* @access private
*/
function lock() {
- $set =
array( 'user', 'revision' )
;
- $names = array_map(
array( $this, 'lockTable' )
, $set );
+ $set =
[ 'user', 'revision' ]
;
+ $names = array_map(
[ $this, 'lockTable' ]
, $set );
$tables = implode( ',', $names );
$this->db->query( "LOCK TABLES $tables", __METHOD__ );
$tables = implode( ',', $names );
$this->db->query( "LOCK TABLES $tables", __METHOD__ );
@@
-187,12
+195,13
@@
class UserDupes {
"SELECT user_name,COUNT(*) AS n
FROM $user
GROUP BY user_name
"SELECT user_name,COUNT(*) AS n
FROM $user
GROUP BY user_name
- HAVING n > 1", __METHOD__ );
+
HAVING n > 1", __METHOD__ );
- $list =
array()
;
+ $list =
[]
;
foreach ( $result as $row ) {
$list[] = $row->user_name;
}
foreach ( $result as $row ) {
$list[] = $row->user_name;
}
+
return $list;
}
return $list;
}
@@
-206,8
+215,8
@@
class UserDupes {
*/
function examine( $name, $doDelete ) {
$result = $this->db->select( 'user',
*/
function examine( $name, $doDelete ) {
$result = $this->db->select( 'user',
-
array( 'user_id' )
,
-
array( 'user_name' => $name )
,
+
[ 'user_id' ]
,
+
[ 'user_name' => $name ]
,
__METHOD__ );
$firstRow = $this->db->fetchObject( $result );
__METHOD__ );
$firstRow = $this->db->fetchObject( $result );
@@
-257,7
+266,7
@@
class UserDupes {
return intval( $this->db->selectField(
'revision',
'COUNT(*)',
return intval( $this->db->selectField(
'revision',
'COUNT(*)',
-
array( 'rev_user' => $userid )
,
+
[ 'rev_user' => $userid ]
,
__METHOD__ ) );
}
__METHOD__ ) );
}
@@
-269,8
+278,8
@@
class UserDupes {
function reassignEdits( $from, $to ) {
$this->out( 'reassigning... ' );
$this->db->update( 'revision',
function reassignEdits( $from, $to ) {
$this->out( 'reassigning... ' );
$this->db->update( 'revision',
-
array( 'rev_user' => $to )
,
-
array( 'rev_user' => $from )
,
+
[ 'rev_user' => $to ]
,
+
[ 'rev_user' => $from ]
,
__METHOD__ );
$this->out( "ok. " );
}
__METHOD__ );
$this->out( "ok. " );
}
@@
-282,8
+291,7
@@
class UserDupes {
*/
function trimAccount( $userid ) {
$this->out( "deleting..." );
*/
function trimAccount( $userid ) {
$this->out( "deleting..." );
- $this->db->delete( 'user',
array( 'user_id' => $userid )
, __METHOD__ );
+ $this->db->delete( 'user',
[ 'user_id' => $userid ]
, __METHOD__ );
$this->out( " ok" );
}
$this->out( " ok" );
}
-
}
}