if ( '' != $this->mNewpass && $wgAuth->allowPasswordChange() ) {
if ( $this->mNewpass != $this->mRetypePass ) {
+ wfRunHooks( "PrefsPasswordAudit", array( $wgUser, $this->mNewpass, 'badretype' ) );
$this->mainPrefsForm( 'error', wfMsg( 'badretype' ) );
return;
}
if (!$wgUser->checkPassword( $this->mOldpass )) {
+ wfRunHooks( "PrefsPasswordAudit", array( $wgUser, $this->mNewpass, 'wrongpassword' ) );
$this->mainPrefsForm( 'error', wfMsg( 'wrongpassword' ) );
return;
}
try {
$wgUser->setPassword( $this->mNewpass );
+ wfRunHooks( "PrefsPasswordAudit", array( $wgUser, $this->mNewpass, 'success' ) );
$this->mNewpass = $this->mOldpass = $this->mRetypePass = '';
} catch( PasswordError $e ) {
+ wfRunHooks( "PrefsPasswordAudit", array( $wgUser, $this->mNewpass, 'error' ) );
$this->mainPrefsForm( 'error', $e->getMessage() );
return;
}
$wgUser->setCookies();
$wgUser->saveSettings();
}
+ if( $oldadr != $newadr ) {
+ wfRunHooks( "PrefsEmailAudit", array( $wgUser, $oldadr, $newadr ) );
+ }
}
if( $needRedirect && $error === false ) {
return "<tr><td align='right'>$td1</td><td align='left'>$td2</td></tr>";
}
- function tableRow( $td1, $td2, $td3 = null ) {
- global $wgLang;
+ /**
+ * Helper function for user information panel
+ * @param $td1 label for an item
+ * @param $td2 item or null
+ * @param $td3 optional help or null
+ * @return xhtml block
+ */
+ function tableRow( $td1, $td2 = null, $td3 = null ) {
+ global $wgContLang;
- $a1 = $a2 = array();
- $a1['align'] = $wgLang->isRtl() ? 'left' : 'right';
- $a2['align'] = $wgLang->isRtl() ? 'right' : 'left';
+ $align['align'] = $wgContLang->isRtl() ? 'right' : 'left';
if ( is_null( $td3 ) ) {
$td3 = '';
);
}
- $td1 = Xml::tags( 'td', $a2, $td1 );
- $td2 = Xml::tags( 'td', $a2, $td2 );
+ if ( is_null( $td2 ) ) {
+ $td1 = Xml::tags( 'td', $align + array( 'colspan' => '2' ), $td1 );
+ $td2 = '';
+ } else {
+ $td1 = Xml::tags( 'td', $align, $td1 );
+ $td2 = Xml::tags( 'td', $align, $td2 );
+ }
return Xml::tags( 'tr', null, $td1 . $td2 ). $td3 . "\n";
$wgOut->setArticleRelated( false );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->disallowUserJs(); # Prevent hijacked user scripts from sniffing passwords etc.
+
if ( $this->mSuccess || 'success' == $status ) {
$wgOut->addWikitext( '<div class="successbox"><strong>'. wfMsg( 'savedprefs' ) . '</strong></div>' );
} else if ( 'error' == $status ) {
$wgOut->addHTML( "<div id='preferences'>" );
# User data
- #
$wgOut->addHTML(
Xml::openElement( 'fieldset ' ) .
Xml::element( 'legend', null, wfMsg('prefs-personal') ) .
Xml::openElement( 'table' ) .
- Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => '2' ),
- Xml::element( 'h1', null, wfMsg( 'prefs-personal' ) )
- )
- )
+ $this->tableRow( Xml::element( 'h2', null, wfMsg( 'prefs-personal' ) ) )
);
$userInformationHtml =
Xml::input( 'wpNick', 25, $this->mNick, array( 'id' => 'wpNick' ) )
) .
$invalidSig .
- # FIXME: The <input> part should be where the is, getToggle() needs
- # to be changed to out return its output in two parts. -ævar
- $this->tableRow(
- ' ',
- $this->getToggle( 'fancysig' )
- )
+ $this->tableRow( ' ', $this->getToggle( 'fancysig' ) )
);
list( $lsLabel, $lsSelect) = Xml::languageSelector( $this->mUserLanguage );
# Password
if( $wgAuth->allowPasswordChange() ) {
$wgOut->addHTML(
- Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => '2' ),
- Xml::element( 'h1', null, wfMsg( 'changepassword' ) )
- )
- ) .
+ $this->tableRow( Xml::element( 'h2', null, wfMsg( 'changepassword' ) ) ) .
$this->tableRow(
Xml::label( wfMsg( 'oldpassword' ), 'wpOldpass' ),
- Xml::input( 'wpOldpass', 25, $this->mOldpass, array( 'id' => 'wpOldpass' ) )
+ Xml::password( 'wpOldpass', 25, $this->mOldpass, array( 'id' => 'wpOldpass' ) )
) .
$this->tableRow(
Xml::label( wfMsg( 'newpassword' ), 'wpNewpass' ),
- Xml::input( 'wpNewpass', 25, $this->mNewpass, array( 'id' => 'wpNewpass' ) )
+ Xml::password( 'wpNewpass', 25, $this->mNewpass, array( 'id' => 'wpNewpass' ) )
) .
$this->tableRow(
Xml::label( wfMsg( 'retypenew' ), 'wpRetypePass' ),
- Xml::input( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) )
+ Xml::password( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) )
) .
Xml::tags( 'tr', null,
Xml::tags( 'td', array( 'colspan' => '2' ),
$wgOut->addHTML(
- Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => '2' ),
- Xml::element( 'h1', null, wfMsg( 'email' ) )
- )
- ) .
- Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => '2' ),
- $emailauthenticated.
- $enotifrevealaddr.
- $enotifwatchlistpages.
- $enotifusertalkpages.
- $enotifminoredits.
- $moreEmail.
- $this->getToggle( 'ccmeonemails' )
- )
+ $this->tableRow( Xml::element( 'h2', null, wfMsg( 'email' ) ) ) .
+ $this->tableRow(
+ $emailauthenticated.
+ $enotifrevealaddr.
+ $enotifwatchlistpages.
+ $enotifusertalkpages.
+ $enotifminoredits.
+ $moreEmail.
+ $this->getToggle( 'ccmeonemails' )
)
);
}
+ # </FIXME>
$wgOut->addHTML(
Xml::closeElement( 'table' ) .
Xml::closeElement( 'fieldset' )
);
- # </FIXME>
# Quickbar
#