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 "Make doTestLockCalls() faster"
[lhc/web/wiklou.git]
/
maintenance
/
resetUserTokens.php
diff --git
a/maintenance/resetUserTokens.php
b/maintenance/resetUserTokens.php
index
08be553
..
154482c
100644
(file)
--- a/
maintenance/resetUserTokens.php
+++ b/
maintenance/resetUserTokens.php
@@
-30,12
+30,15
@@
require_once __DIR__ . '/Maintenance.php';
* Maintenance script to reset the user_token for all users on the wiki.
*
* @ingroup Maintenance
* Maintenance script to reset the user_token for all users on the wiki.
*
* @ingroup Maintenance
+ * @deprecated since 1.27, use $wgAuthenticationTokenVersion instead.
*/
class ResetUserTokens extends Maintenance {
public function __construct() {
parent::__construct();
*/
class ResetUserTokens extends Maintenance {
public function __construct() {
parent::__construct();
- $this->mDescription =
- "Reset the user_token of all users on the wiki. Note that this may log some of them out.";
+ $this->addDescription(
+ "Reset the user_token of all users on the wiki. Note that this may log some of them out.\n"
+ . "Deprecated, use \$wgAuthenticationTokenVersion instead."
+ );
$this->addOption( 'nowarn', "Hides the 5 seconds warning", false, false );
$this->addOption(
'nulls',
$this->addOption( 'nowarn', "Hides the 5 seconds warning", false, false );
$this->addOption(
'nulls',
@@
-47,10
+50,10
@@
class ResetUserTokens extends Maintenance {
}
public function execute() {
}
public function execute() {
- $
this->
nullsOnly = $this->getOption( 'nulls' );
+ $nullsOnly = $this->getOption( 'nulls' );
if ( !$this->getOption( 'nowarn' ) ) {
if ( !$this->getOption( 'nowarn' ) ) {
- if ( $
this->
nullsOnly ) {
+ if ( $nullsOnly ) {
$this->output( "The script is about to reset the user_token "
. "for USERS WITH NULL TOKENS in the database.\n" );
} else {
$this->output( "The script is about to reset the user_token "
. "for USERS WITH NULL TOKENS in the database.\n" );
} else {
@@
-61,31
+64,31
@@
class ResetUserTokens extends Maintenance {
$this->output( "\n" );
$this->output( "Abort with control-c in the next five seconds "
. "(skip this countdown with --nowarn) ... " );
$this->output( "\n" );
$this->output( "Abort with control-c in the next five seconds "
. "(skip this countdown with --nowarn) ... " );
-
wfC
ountDown( 5 );
+
$this->c
ountDown( 5 );
}
}
- // We list user by user_id from one of the
slave database
- $dbr =
wfGetDB( DB_SLAVE
);
+ // We list user by user_id from one of the
replica DBs
+ $dbr =
$this->getDB( DB_REPLICA
);
- $where =
array()
;
- if ( $
this->
nullsOnly ) {
+ $where =
[]
;
+ if ( $nullsOnly ) {
// Have to build this by hand, because \ is escaped in helper functions
// Have to build this by hand, because \ is escaped in helper functions
- $where =
array( 'user_token = \'' . str_repeat( '\0', 32 ) . '\'' )
;
+ $where =
[ 'user_token = \'' . str_repeat( '\0', 32 ) . '\'' ]
;
}
}
- $maxid = $dbr->selectField( 'user', 'MAX(user_id)',
array()
, __METHOD__ );
+ $maxid = $dbr->selectField( 'user', 'MAX(user_id)',
[]
, __METHOD__ );
$min = 0;
$min = 0;
- $max = $this->
mBatchSize
;
+ $max = $this->
getBatchSize()
;
do {
$result = $dbr->select( 'user',
do {
$result = $dbr->select( 'user',
-
array( 'user_id' )
,
+
[ 'user_id' ]
,
array_merge(
$where,
array_merge(
$where,
-
array(
'user_id > ' . $dbr->addQuotes( $min ),
+
[
'user_id > ' . $dbr->addQuotes( $min ),
'user_id <= ' . $dbr->addQuotes( $max )
'user_id <= ' . $dbr->addQuotes( $max )
- )
+ ]
),
__METHOD__
);
),
__METHOD__
);
@@
-95,7
+98,7
@@
class ResetUserTokens extends Maintenance {
}
$min = $max;
}
$min = $max;
- $max = $min + $this->
mBatchSize
;
+ $max = $min + $this->
getBatchSize()
;
wfWaitForSlaves();
} while ( $min <= $maxid );
wfWaitForSlaves();
} while ( $min <= $maxid );
@@
-112,5
+115,5
@@
class ResetUserTokens extends Maintenance {
}
}
}
}
-$maintClass =
"ResetUserTokens"
;
+$maintClass =
ResetUserTokens::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;