| Index: trunk/extensions/ConfirmAccount/presentation/ConfirmAccountUI.hooks.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // FIXME: don't just take on to general site notice |
| 62 | | - public static function confirmAccountsNotice( $notice ) { |
| | 62 | + public static function confirmAccountsNotice( &$notice ) { |
| 63 | 63 | global $wgConfirmAccountNotice, $wgUser, $wgMemc, $wgOut; |
| 64 | 64 | if ( !$wgConfirmAccountNotice || !$wgUser->isAllowed( 'confirmaccount' ) ) { |
| 65 | 65 | return true; |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/UserCredentials_body.php |
| — | — | @@ -7,7 +7,6 @@ |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | function execute( $par ) { |
| 11 | | - global $wgAccountRequestTypes; |
| 12 | 11 | $out = $this->getOutput(); |
| 13 | 12 | $request = $this->getRequest(); |
| 14 | 13 | $reqUser = $this->getUser(); |
| — | — | @@ -56,7 +55,6 @@ |
| 57 | 56 | } |
| 58 | 57 | |
| 59 | 58 | function showCredentials() { |
| 60 | | - global $wgLang, $wgAccountRequestTypes; |
| 61 | 59 | $reqUser = $this->getUser(); |
| 62 | 60 | $out = $this->getOutput(); |
| 63 | 61 | |
| — | — | @@ -162,7 +160,6 @@ |
| 163 | 161 | } |
| 164 | 162 | |
| 165 | 163 | if ( $reqUser->isAllowed( 'requestips' ) ) { |
| 166 | | - $blokip = SpecialPage::getTitleFor( 'blockip' ); |
| 167 | 164 | $form .= "<p>" . wfMsgHtml( 'usercredentials-ip' ) . " " . htmlspecialchars( $row->acd_ip ) . "</p>\n"; |
| 168 | 165 | } |
| 169 | 166 | $form .= '</fieldset>'; |
| — | — | @@ -189,7 +186,7 @@ |
| 190 | 187 | * @return void |
| 191 | 188 | */ |
| 192 | 189 | function showFile( $key ) { |
| 193 | | - global $wgConfirmAccountFSRepos, $IP; |
| | 190 | + global $wgConfirmAccountFSRepos; |
| 194 | 191 | $out = $this->getOutput(); |
| 195 | 192 | $request = $this->getRequest(); |
| 196 | 193 | |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php |
| — | — | @@ -223,9 +223,6 @@ |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | protected function doSubmit() { |
| 227 | | - global $wgAuth, $wgAccountRequestThrottle; |
| 228 | | - $out = $this->getOutput(); |
| 229 | | - |
| 230 | 227 | # Now create a dummy user ($u) and check if it is valid |
| 231 | 228 | $name = trim( $this->mUsername ); |
| 232 | 229 | $u = User::newFromName( $name, 'creatable' ); |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/ConfirmAccount_body.php |
| — | — | @@ -381,7 +381,7 @@ |
| 382 | 382 | * @param $key string |
| 383 | 383 | */ |
| 384 | 384 | protected function showFile( $key ) { |
| 385 | | - global $wgConfirmAccountFSRepos, $IP; |
| | 385 | + global $wgConfirmAccountFSRepos; |
| 386 | 386 | $out = $this->getOutput(); |
| 387 | 387 | $request = $this->getRequest(); |
| 388 | 388 | |
| — | — | @@ -607,7 +607,7 @@ |
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | # Safe to hook/log now... |
| 611 | | - wfRunHooks( 'AddNewAccount', array( $user ) ); |
| | 611 | + wfRunHooks( 'AddNewAccount', array( $user, false /* not by email */ ) ); |
| 612 | 612 | $user->addNewUserLogEntry(); |
| 613 | 613 | |
| 614 | 614 | # Clear cache for notice of how many account requests there are |
| — | — | @@ -641,7 +641,7 @@ |
| 642 | 642 | $areas = explode("\n*","\n".wfMsg('requestaccount-areas')); |
| 643 | 643 | foreach( $areas as $n => $line ) { |
| 644 | 644 | $set = explode("|",$line); |
| 645 | | - $name = str_replace("_"," ",$set[0]); |
| | 645 | + //$name = str_replace("_"," ",$set[0]); |
| 646 | 646 | if( in_array($set[0],$this->mAreaSet) ) { |
| 647 | 647 | # General userpage text for anyone with this interest |
| 648 | 648 | if( isset($set[2]) ) { |
| — | — | @@ -834,12 +834,8 @@ |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | 837 | protected function showList() { |
| 838 | | - global $wgLang; |
| 839 | | - $reqUser = $this->getUser(); |
| 840 | 838 | $out = $this->getOutput(); |
| 841 | 839 | |
| 842 | | - $titleObj = SpecialPage::getTitleFor( 'ConfirmAccounts', $this->specialPageParameter ); |
| 843 | | - |
| 844 | 840 | # Output the list |
| 845 | 841 | $pager = new ConfirmAccountsPager( $this, array(), |
| 846 | 842 | $this->queueType, $this->showRejects, $this->showHeld, $this->showStale ); |
| — | — | @@ -875,7 +871,6 @@ |
| 876 | 872 | |
| 877 | 873 | public function formatRow( $row ) { |
| 878 | 874 | global $wgLang, $wgUseRealNamesOnly, $wgAllowRealName; |
| 879 | | - $reqUser = $this->getUser(); |
| 880 | 875 | |
| 881 | 876 | $titleObj = SpecialPage::getTitleFor( 'ConfirmAccounts', $this->specialPageParameter ); |
| 882 | 877 | if( $this->showRejects || $this->showStale ) { |
| — | — | @@ -976,7 +971,6 @@ |
| 977 | 972 | } |
| 978 | 973 | |
| 979 | 974 | function formatRow( $row ) { |
| 980 | | - $block = new Block; |
| 981 | 975 | return $this->mForm->formatRow( $row ); |
| 982 | 976 | } |
| 983 | 977 | |