| Index: trunk/extensions/Renameuser/renameUserCleanup.php |
| — | — | @@ -49,16 +49,19 @@ |
| 50 | 50 | $this->checkRenameLog( $olduser, $newuser ); |
| 51 | 51 | |
| 52 | 52 | if ( $olduid ) { |
| 53 | | - $this->doUpdates( $olduser, $newuser, $olduid, $dbw ); |
| | 53 | + $this->doUpdates( $olduser, $newuser, $olduid ); |
| 54 | 54 | } |
| 55 | | - $this->doUpdates( $olduser, $newuser, $newuser->getId(), $dbw ); |
| 56 | | - $this->doUpdates( $olduser, $newuser, 0, $dbw ); |
| | 55 | + $this->doUpdates( $olduser, $newuser, $newuser->getId() ); |
| | 56 | + $this->doUpdates( $olduser, $newuser, 0 ); |
| 57 | 57 | |
| 58 | 58 | print "Done!\n"; |
| 59 | 59 | exit(0); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | | - |
| | 62 | + /** |
| | 63 | + * @param $olduser User |
| | 64 | + * @param $newuser User |
| | 65 | + */ |
| 63 | 66 | public function checkUserExistence( $olduser, $newuser ) { |
| 64 | 67 | if ( !$newuser->getId() ) { |
| 65 | 68 | $this->error( "No such user: " . $this->getOption( 'newuser' ), true ); |
| — | — | @@ -78,6 +81,10 @@ |
| 79 | 82 | } |
| 80 | 83 | } |
| 81 | 84 | |
| | 85 | + /** |
| | 86 | + * @param $olduser User |
| | 87 | + * @param $newuser User |
| | 88 | + */ |
| 82 | 89 | public function checkRenameLog( $olduser, $newuser ) { |
| 83 | 90 | $dbr = wfGetDB( DB_SLAVE ); |
| 84 | 91 | |
| — | — | @@ -111,14 +118,12 @@ |
| 112 | 119 | print "Exiting at user's request\n"; |
| 113 | 120 | exit(1); |
| 114 | 121 | } |
| 115 | | - } |
| 116 | | - else { |
| | 122 | + } else { |
| 117 | 123 | foreach ( $result as $row ) { |
| 118 | 124 | print "Found possible log entry of the rename, please check: ".$row->log_title." with comment ".$row->log_comment." on $row->log_timestamp\n"; |
| 119 | 125 | } |
| 120 | 126 | } |
| 121 | | - } |
| 122 | | - else { |
| | 127 | + } else { |
| 123 | 128 | foreach ( $result as $row ) { |
| 124 | 129 | print "Found log entry of the rename: ".$olduser->getName()." to ".$newuser->getName()." on $row->log_timestamp\n"; |
| 125 | 130 | } |
| — | — | @@ -135,8 +140,12 @@ |
| 136 | 141 | } |
| 137 | 142 | } |
| 138 | 143 | |
| 139 | | - |
| 140 | | - public function doUpdates( $olduser, $newuser, $uid, $dbw ) { |
| | 144 | + /** |
| | 145 | + * @param $olduser User |
| | 146 | + * @param $newuser User |
| | 147 | + * @param $uid |
| | 148 | + */ |
| | 149 | + public function doUpdates( $olduser, $newuser, $uid ) { |
| 141 | 150 | $this->updateTable( 'revision', 'rev_user_text', 'rev_user', 'rev_timestamp', $olduser, $newuser, $uid ); |
| 142 | 151 | $this->updateTable( 'archive', 'ar_user_text', 'ar_user', 'ar_timestamp', $olduser, $newuser, $uid ); |
| 143 | 152 | $this->updateTable( 'logging', 'log_user_text', 'log_user', 'log_timestamp', $olduser, $newuser, $uid ); |
| — | — | @@ -145,7 +154,17 @@ |
| 146 | 155 | $this->updateTable( 'filearchive', 'fa_user_text','fa_user', 'fa_timestamp', $olduser, $newuser, $uid ); |
| 147 | 156 | } |
| 148 | 157 | |
| 149 | | - public function updateTable( $table,$usernamefield,$useridfield,$timestampfield,$olduser,$newuser,$uid ) { |
| | 158 | + /** |
| | 159 | + * @param $table |
| | 160 | + * @param $usernamefield |
| | 161 | + * @param $useridfield |
| | 162 | + * @param $timestampfield |
| | 163 | + * @param $olduser User |
| | 164 | + * @param $newuser User |
| | 165 | + * @param $uid |
| | 166 | + * @return int |
| | 167 | + */ |
| | 168 | + public function updateTable( $table, $usernamefield, $useridfield, $timestampfield, $olduser, $newuser, $uid ) { |
| 150 | 169 | $dbw = wfGetDB( DB_MASTER ); |
| 151 | 170 | |
| 152 | 171 | $contribs = $dbw->selectField( $table, 'count(*)', |
| — | — | @@ -199,8 +218,7 @@ |
| 200 | 219 | if ( $success ) { |
| 201 | 220 | $rowsDone = $dbw->affectedRows(); |
| 202 | 221 | $dbw->commit(); |
| 203 | | - } |
| 204 | | - else { |
| | 222 | + } else { |
| 205 | 223 | print "Problem with the update, rolling back and exiting\n"; |
| 206 | 224 | $dbw->rollback(); |
| 207 | 225 | exit(1); |