* @subpackage SpecialPage
*/
-/* to get a list of languages in setting user's language preference */
+if( !defined( 'MEDIAWIKI' ) )
+ die();
+
+/** to get a list of languages in setting user's language preference */
require_once('languages/Names.php');
/**
* Load some values
*/
function PreferencesForm( &$request ) {
- global $wgLang, $wgContLang, $wgAllowRealName;
+ global $wgLang, $wgContLang, $wgUser, $wgAllowRealName;
$this->mQuickbar = $request->getVal( 'wpQuickbar' );
$this->mOldpass = $request->getVal( 'wpOldpass' );
$this->mAction = $request->getVal( 'action' );
$this->mReset = $request->getCheck( 'wpReset' );
$this->mPosted = $request->wasPosted();
- $this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) && $this->mPosted;
+ $this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) &&
+ $this->mPosted &&
+ $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
# User toggles (the big ugly unsorted list of checkboxes)
$this->mToggles = array();
}
}
}
+
+ # Validate language
+ if ( !preg_match( '/^[a-z\-]*$/', $this->mUserLanguage ) ) {
+ $this->mUserLanguage = 'nolanguage';
+ }
}
function execute() {
global $wgUser, $wgOut, $wgUseDynamicDates;
- if ( 0 == $wgUser->getID() ) {
+ if ( $wgUser->isAnon() ) {
$wgOut->errorpage( 'prefsnologin', 'prefsnologintext' );
return;
}
* @access private
*/
function savePreferences() {
- global $wgUser, $wgLang, $wgDeferredUpdateList, $wgOut;
+ global $wgUser, $wgLang, $wgOut;
+ global $wgEnableUserEmail, $wgEnableEmail;
+ global $wgEmailAuthentication, $wgMinimalPasswordLength;
+;
if ( '' != $this->mNewpass ) {
if ( $this->mNewpass != $this->mRetypePass ) {
return;
}
+ if ( strlen( $this->mNewpass ) < $wgMinimalPasswordLength ) {
+ $this->mainPrefsForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+ return;
+ }
+
if (!$wgUser->checkPassword( $this->mOldpass )) {
$this->mainPrefsForm( wfMsg( 'wrongpassword' ) );
return;
}
$wgUser->setPassword( $this->mNewpass );
}
- $wgUser->setEmail( $this->mUserEmail );
$wgUser->setRealName( $this->mRealName );
$wgUser->setOption( 'language', $this->mUserLanguage );
$wgUser->setOption( 'variant', $this->mUserVariant );
$wgUser->setOption( "searchNs{$i}", $value );
}
- $wgUser->setOption( 'disablemail', $this->mEmailFlag );
+ if( $wgEnableEmail && $wgEnableUserEmail ) {
+ $wgUser->setOption( 'disablemail', $this->mEmailFlag );
+ }
# Set user toggles
foreach ( $this->mToggles as $tname => $tvalue ) {
$wgUser->setOption( $tname, $tvalue );
}
$wgUser->setCookies();
- $up = new UserUpdate();
- array_push( $wgDeferredUpdateList, $up );
+ $wgUser->saveSettings();
+
+ if( $wgEnableEmail ) {
+ $newadr = strtolower( $this->mUserEmail );
+ $oldadr = strtolower($wgUser->getEmail());
+ if (($newadr <> '') && ($newadr <> $oldadr)) { # the user has supplied a new email address on the login page
+ # prepare for authentication and mail a temporary password to newadr
+ require_once( 'SpecialUserlogin.php' );
+ if ( !$wgUser->isValidEmailAddr( $newadr ) ) {
+ $this->mainPrefsForm( wfMsg( 'invalidemailaddress' ) );
+ return;
+ }
+ $wgUser->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+ $wgUser->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
+ $wgUser->saveSettings();
+ if ($wgEmailAuthentication) {
+ # mail a temporary password to the dirty address
+ # on "save options", this user will be logged-out automatically
+ $error = LoginForm::mailPasswordInternal( $wgUser, true, $dummy );
+ if ($error === '') {
+ return LoginForm::mainLoginForm( wfMsg( 'passwordsentforemailauthentication', $wgUser->getName() ) );
+ } else {
+ return LoginForm::mainLoginForm( wfMsg( 'mailerror', $error ) );
+ }
+ # if user returns, that new email address gets authenticated in checkpassword()
+ }
+ } else {
+ $wgUser->setEmail( strtolower($this->mUserEmail) );
+ $wgUser->setCookies();
+ $wgUser->saveSettings();
+ }
+ }
+
$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
$po = ParserOptions::newFromUser( $wgUser );
$this->mainPrefsForm( wfMsg( 'savedprefs' ) );
$this->mOldpass = $this->mNewpass = $this->mRetypePass = '';
$this->mUserEmail = $wgUser->getEmail();
+ $this->mUserEmailAuthenticationtimestamp = $wgUser->getEmailAuthenticationtimestamp();
$this->mRealName = ($wgAllowRealName) ? $wgUser->getRealName() : '';
- $this->mUserLanguage = $wgUser->getOption( 'language');
+ $this->mUserLanguage = $wgUser->getOption( 'language' );
+ if( empty( $this->mUserLanguage ) ) {
+ # Quick hack for conversions, where this value is blank
+ global $wgContLanguageCode;
+ $this->mUserLanguage = $wgContLanguageCode;
+ }
$this->mUserVariant = $wgUser->getOption( 'variant');
if ( 1 == $wgUser->getOption( 'disablemail' ) ) { $this->mEmailFlag = 1; }
else { $this->mEmailFlag = 0; }
}
- function getToggle( $tname ) {
+ function getToggle( $tname, $trailer = false) {
global $wgUser, $wgLang;
$this->mUsedToggles[$tname] = true;
} else {
$checked = '';
}
+ $trailer =($trailer) ? $trailer : '';
return "<div><input type='checkbox' value=\"1\" "
- . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label></div>\n";
+ . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label>$trailer</div>\n";
}
/**
global $wgUser, $wgOut, $wgLang, $wgContLang, $wgUseDynamicDates, $wgValidSkinNames;
global $wgAllowRealName, $wgImageLimits;
global $wgLanguageNames, $wgDisableLangConversion;
+ global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForUserTalkPages,$wgEmailNotificationForMinorEdits;
+ global $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
+ global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
+ global $wgContLanguageCode;
$wgOut->setPageTitle( wfMsg( 'preferences' ) );
$wgOut->setArticleRelated( false );
if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
else { $emfc = ''; }
+ if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
+ if ($wgUser->getEmailAuthenticationtimestamp() != 0) {
+ $emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationtimestamp(), true ) ).'<br />';
+ $disabled = '';
+ } else {
+ $emailauthenticated = wfMsg('emailnotauthenticated').'<br />';
+ $disabled = ' '.wfMsg('disableduntilauthent');
+ }
+ } else {
+ $emailauthenticated = '';
+ }
+
+ if ($this->mUserEmail == '') {
+ $disabled = ' '.wfMsg('disablednoemail');
+ }
+
$ps = $this->namespacesCheckboxes();
+ $enotifwatchlistpages = ($wgEmailNotificationForWatchlistPages) ? $this->getToggle( 'enotifwatchlistpages', $disabled) : '';
+ $enotifusertalkpages = ($wgEmailNotificationForUserTalkPages) ? $this->getToggle( 'enotifusertalkpages', $disabled) : '';
+ $enotifminoredits = ($wgEmailNotificationForMinorEdits) ? $this->getToggle( 'enotifminoredits', $disabled) : '';
+ $enotifrevealaddr = ($wgEmailNotificationRevealPageEditorAddress) ? $this->getToggle( 'enotifrevealaddr', $disabled) : '';
+ $prefs_help_email_enotif = ( $wgEmailNotificationForWatchlistPages || $wgEmailNotificationForUserTalkPages) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
+ $prefs_help_realname = '';
+
$wgOut->addHTML( "<fieldset>
<legend>".wfMsg('prefs-personal')."</legend>");
+
if ($wgAllowRealName) {
$wgOut->addHTML("<div><label>$yrn: <input type='text' name=\"wpRealName\" value=\"{$this->mRealName}\" size='20' /></label></div>");
+ $prefs_help_realname = wfMsg('prefs-help-realname').'<br />';
}
+
+ if( $wgEnableEmail ) {
+ $wgOut->addHTML("
+ <div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>" );
+ if( $wgEnableUserEmail ) {
+ $wgOut->addHTML(
+ $emailauthenticated.
+ $enotifrevealaddr.
+ $enotifwatchlistpages.
+ $enotifusertalkpages.
+ $enotifminoredits.
+ "<div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf.$disabled</label></div>" );
+ }
+ }
+
+ $fancysig = $this->getToggle( 'fancysig' );
$wgOut->addHTML("
- <div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>
- <div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" /> $emf</label></div>
- <div><label>$ynn: <input type='text' name=\"wpNick\" value=\"{$this->mNick}\" size='12' /></label></div>
+ <div><label>$ynn: <input type='text' name=\"wpNick\" value=\"{$this->mNick}\" size='25' /></label></div>
+ <div>$fancysig<br /></div>
<div><label>$yl: <select name=\"wpUserLanguage\">\n");
+ /**
+ * If a bogus value is set, default to the content language.
+ * Otherwise, no default is selected and the user ends up
+ * with an Afrikaans interface since it's first in the list.
+ */
+ if( isset( $wgLanguageNames[$this->mUserLanguage] ) ) {
+ $selectedLang = $this->mUserLanguage;
+ } else {
+ $selectedLang = $wgContLanguageCode;
+ }
foreach($wgLanguageNames as $code => $name) {
global $IP;
/* only add languages that have a file */
$langfile="$IP/languages/Language".str_replace('-', '_', ucfirst($code)).".php";
- if(file_exists($langfile)) {
- $sel = ($code == $this->mUserLanguage)? 'selected="selected"' : '';
+ if(file_exists($langfile) || $code == $wgContLanguageCode) {
+ $sel = ($code == $selectedLang)? 'selected="selected"' : '';
$wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
}
}
<div><label>$rpw: <input type='password' name=\"wpRetypePass\" value=\"{$this->mRetypePass}\" size='20' /></label></div>
" . $this->getToggle( "rememberpassword" ) . "
</fieldset>
- <div class='prefsectiontip'>".wfMsg('prefs-help-userdata')."</div>\n</fieldset>\n" );
+ <div class='prefsectiontip'>".$prefs_help_realname.wfMsg('prefs-help-email').$prefs_help_email_enotif."</div>\n</fieldset>\n" );
# Quickbar setting
} else {
$sn = $skinname;
}
+ global $wgDefaultSkin;
+ if( $skinkey == $wgDefaultSkin ) {
+ $sn .= ' (' . wfMsg( 'default' ) . ')';
+ }
$wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\"
value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
}
<div class='prefsectiontip'>* {$tzt}</div>
</fieldset>\n\n" );
+ $shownumberswatching = ($wgRCShowWatchingUsers) ? $this->getToggle('shownumberswatching') : '';
+
$wgOut->addHTML( "
<fieldset><legend>".wfMsg('prefs-rc')."</legend>
- <div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>
- " . $this->getToggle( "hideminor" ) .
- $this->getToggle( "usenewrc" ) . "
- <div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
+ <div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>" .
+ $this->getToggle( "hideminor" ) . $shownumberswatching .
+ $this->getToggle( "usenewrc" ) . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
+
"<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
<div><label>".wfMsg('imagemaxsize')."<select name=\"wpImageSize\">");
$imageLimitOptions='';
}
$wgOut->addHTML( "</fieldset>\n\n" );
+ $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML( "
<div id='prefsubmit'>
<div>
</div>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
}
}
dépôts / lhc / web / wiklou.git / blobdiff