| Index: trunk/extensions/ConfirmAccount/dataclasses/ConfirmAccount.class.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | |
| 17 | 17 | $repo = new FSRepo( $wgConfirmAccountFSRepos['accountreqs'] ); |
| 18 | 18 | # Clear out any associated attachments and delete those rows |
| 19 | | - while( $row = $dbw->fetchObject( $res ) ) { |
| | 19 | + foreach( $res as $row ) { |
| 20 | 20 | $key = $row->acr_storage_key; |
| 21 | 21 | if( $key ) { |
| 22 | 22 | $path = $repo->getZonePath( 'public' ).'/'. |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | * @param string $ip User IP address |
| 103 | 103 | * @param string $token |
| 104 | 104 | * @param string $expiration |
| 105 | | - * @return mixed True on success, a Status object on failure. |
| | 105 | + * @return true|Status True on success, a Status object on failure. |
| 106 | 106 | */ |
| 107 | 107 | public static function sendConfirmationMail( User $user, $ip, $token, $expiration ) { |
| 108 | 108 | global $wgContLang; |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/UserCredentials_body.php |
| — | — | @@ -2,6 +2,7 @@ |
| 3 | 3 | |
| 4 | 4 | class UserCredentialsPage extends SpecialPage { |
| 5 | 5 | |
| | 6 | + protected $target, $skin, $file; |
| 6 | 7 | function __construct() { |
| 7 | 8 | parent::__construct( 'UserCredentials', 'lookupcredentials' ); |
| 8 | 9 | } |
| — | — | @@ -93,7 +94,7 @@ |
| 94 | 95 | |
| 95 | 96 | $form .= '</table></fieldset>'; |
| 96 | 97 | |
| 97 | | - $areaSet = RequestAccountPage::expandAreas( $row->acd_areas ); |
| | 98 | + $areaSet = RequestAccountPage::expandAreas( $row->acd_areas ); // FIXME: Method is undefined |
| 98 | 99 | |
| 99 | 100 | if ( wfMsg( 'requestaccount-areas' ) ) { |
| 100 | 101 | $form .= '<fieldset>'; |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/RequestAccount_body.php |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | $this->mAreas = $this->mAreaSet = array(); |
| 51 | 51 | if ( wfMsg( 'requestaccount-areas' ) ) { |
| 52 | 52 | $areas = explode( "\n*", "\n" . wfMsg( 'requestaccount-areas' ) ); |
| 53 | | - foreach ( $areas as $n => $area ) { |
| | 53 | + foreach ( $areas as $area ) { |
| 54 | 54 | $set = explode( "|", $area, 2 ); |
| 55 | 55 | if ( $set[0] && isset( $set[1] ) ) { |
| 56 | 56 | $formName = "wpArea-" . htmlspecialchars( str_replace( ' ', '_', $set[0] ) ); |
| — | — | @@ -115,6 +115,7 @@ |
| 116 | 116 | $form .= "<td>" . Xml::input( 'wpEmail', 30, $this->mEmail, array( 'id' => 'wpEmail' ) ) . "</td></tr>\n"; |
| 117 | 117 | if ( count( $wgAccountRequestTypes ) > 1 ) { |
| 118 | 118 | $form .= "<tr><td>" . wfMsgHtml( 'requestaccount-reqtype' ) . "</td><td>"; |
| | 119 | + $options = array(); |
| 119 | 120 | foreach ( $wgAccountRequestTypes as $i => $params ) { |
| 120 | 121 | $options[] = Xml::option( wfMsg( "requestaccount-level-$i" ), $i, ( $i == $this->mType ) ); |
| 121 | 122 | } |
| — | — | @@ -314,7 +315,7 @@ |
| 315 | 316 | $reqUser = $this->getUser(); |
| 316 | 317 | $out = $this->getOutput(); |
| 317 | 318 | # Confirm if this token is in the pending requests |
| 318 | | - $name = ConfirmAccount::requestNameFromEmailToken( $code ); |
| | 319 | + $name = ConfirmAccount::requestNameFromEmailToken( $code ); // FIXME: This method isn't static |
| 319 | 320 | if ( $name !== false ) { |
| 320 | 321 | # Send confirmation email to prospective user |
| 321 | 322 | ConfirmAccount::confirmEmail( $name ); |
| Index: trunk/extensions/ConfirmAccount/presentation/specialpages/actions/ConfirmAccount_body.php |
| — | — | @@ -670,7 +670,7 @@ |
| 671 | 671 | # Add any interest categories |
| 672 | 672 | if( wfMsgForContent( 'requestaccount-areas' ) ) { |
| 673 | 673 | $areas = explode("\n*","\n".wfMsg('requestaccount-areas')); |
| 674 | | - foreach( $areas as $n => $line ) { |
| | 674 | + foreach( $areas as $line ) { |
| 675 | 675 | $set = explode("|",$line); |
| 676 | 676 | //$name = str_replace("_"," ",$set[0]); |
| 677 | 677 | if( in_array($set[0],$this->reqAreaSet) ) { |