if( !defined( 'MEDIAWIKI' ) )
die();
-/* to get a list of languages in setting user's language preference */
-require_once('languages/Names.php');
-
/**
* Entry point that create the "Preferences" object
*/
var $mUserLanguage, $mUserVariant;
var $mSearch, $mRecent, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize;
+ var $mUnderline;
/**
* Constructor
* 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->mMath = $request->getVal( 'wpMath' );
$this->mDate = $request->getVal( 'wpDate' );
$this->mUserEmail = $request->getVal( 'wpUserEmail' );
- $this->mRealName = ($wgAllowRealName) ? $request->getVal( 'wpRealName' ) : '';
+ $this->mRealName = $wgAllowRealName ? $request->getVal( 'wpRealName' ) : '';
$this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 1 : 0;
$this->mNick = $request->getVal( 'wpNick' );
$this->mUserLanguage = $request->getVal( 'wpUserLanguage' );
- $this->mUserVariant = $request->getVal( 'wpUserVariant' );
+ $this->mUserVariant = $request->getVal( 'wpUserVariant' );
$this->mSearch = $request->getVal( 'wpSearch' );
$this->mRecent = $request->getVal( 'wpRecent' );
$this->mHourDiff = $request->getVal( 'wpHourDiff' );
$this->mSearchLines = $request->getVal( 'wpSearchLines' );
$this->mSearchChars = $request->getVal( 'wpSearchChars' );
$this->mImageSize = $request->getVal( 'wpImageSize' );
-
+ $this->mThumbSize = $request->getInt( 'wpThumbSize' );
+ $this->mUnderline = $request->getInt( 'wpOpunderline' );
$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;
+ global $wgUser, $wgOut;
- if ( 0 == $wgUser->getID() ) {
+ if ( $wgUser->isAnon() ) {
$wgOut->errorpage( 'prefsnologin', 'prefsnologintext' );
return;
}
}
}
- /**
+ /**
* @access private
*/
function validateInt( &$val, $min=0, $max=0x7fffffff ) {
}
/**
+ * Used to validate the user inputed timezone before saving it as
+ * 'timeciorrection', will return '00:00' if fed bogus data.
+ * Note: It's not a 100% correct implementation timezone-wise, it will
+ * accept stuff like '14:30',
* @access private
+ * @param string $s the user input
+ * @return string
*/
function validateTimeZone( $s ) {
if ( $s !== '' ) {
$hour = intval( $minute / 60 );
$minute = abs( $minute ) % 60;
}
- $hour = min( $hour, 15 );
- $hour = max( $hour, -15 );
+ # Max is +14:00 and min is -12:00, see:
+ # http://en.wikipedia.org/wiki/Timezone
+ $hour = min( $hour, 14 );
+ $hour = max( $hour, -12 );
$minute = min( $minute, 59 );
$minute = max( $minute, 0 );
$s = sprintf( "%02d:%02d", $hour, $minute );
*/
function savePreferences() {
global $wgUser, $wgLang, $wgOut;
+ global $wgEnableUserEmail, $wgEnableEmail;
+ global $wgEmailAuthentication, $wgMinimalPasswordLength;
+ global $wgAuth;
+
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;
}
+ if (!$wgAuth->setPassword( $wgUser, $this->mNewpass )) {
+ $this->mainPrefsForm( wfMsg( 'externaldberror' ) );
+ return;
+ }
$wgUser->setPassword( $this->mNewpass );
}
- global $wgEnableEmail;
- if( $wgEnableEmail ) {
- $wgUser->setEmail( $this->mUserEmail );
- }
$wgUser->setRealName( $this->mRealName );
$wgUser->setOption( 'language', $this->mUserLanguage );
- $wgUser->setOption( 'variant', $this->mUserVariant );
+ $wgUser->setOption( 'variant', $this->mUserVariant );
$wgUser->setOption( 'nickname', $this->mNick );
$wgUser->setOption( 'quickbar', $this->mQuickbar );
$wgUser->setOption( 'skin', $this->mSkin );
- $wgUser->setOption( 'math', $this->mMath );
- $wgUser->setOption( 'date', $this->mDate );
+ global $wgUseTeX;
+ if( $wgUseTeX ) {
+ $wgUser->setOption( 'math', $this->mMath );
+ }
+ $wgUser->setOption( 'date', $this->validateInt( $this->mDate, 0, 10 ) );
$wgUser->setOption( 'searchlimit', $this->validateIntOrNull( $this->mSearch ) );
$wgUser->setOption( 'contextlines', $this->validateIntOrNull( $this->mSearchLines ) );
$wgUser->setOption( 'contextchars', $this->validateIntOrNull( $this->mSearchChars ) );
$wgUser->setOption( 'stubthreshold', $this->validateIntOrNull( $this->mStubs ) );
$wgUser->setOption( 'timecorrection', $this->validateTimeZone( $this->mHourDiff, -12, 14 ) );
$wgUser->setOption( 'imagesize', $this->mImageSize );
+ $wgUser->setOption( 'thumbsize', $this->mThumbSize );
+ $wgUser->setOption( 'underline', $this->validateInt($this->mUnderline, 0, 2) );
# Set search namespace options
foreach( $this->mSearchNs as $i => $value ) {
$wgUser->setOption( "searchNs{$i}", $value );
}
- global $wgEnableUserEmail;
if( $wgEnableEmail && $wgEnableUserEmail ) {
$wgUser->setOption( 'disablemail', $this->mEmailFlag );
}
foreach ( $this->mToggles as $tname => $tvalue ) {
$wgUser->setOption( $tname, $tvalue );
}
+ if (!$wgAuth->updateExternalDB($wgUser)) {
+ $this->mainPrefsForm( wfMsg( 'externaldberror' ) );
+ return;
+ }
$wgUser->setCookies();
-
$wgUser->saveSettings();
+
+ $error = wfMsg( 'savedprefs' );
+ if( $wgEnableEmail ) {
+ $newadr = $this->mUserEmail;
+ $oldadr = $wgUser->getEmail();
+ if( ($newadr != '') && ($newadr != $oldadr) ) {
+ # the user has supplied a new email address on the login page
+ if( $wgUser->isValidEmailAddr( $newadr ) ) {
+ $wgUser->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
+ $wgUser->mEmailAuthenticated = null; # but flag as "dirty" = unauthenticated
+ $wgUser->saveSettings();
+ if ($wgEmailAuthentication) {
+ # Mail a temporary password to the dirty address.
+ # User can come back through the confirmation URL to re-enable email.
+ $result = $wgUser->sendConfirmationMail();
+ if( WikiError::isError( $result ) ) {
+ $error = wfMsg( 'mailerror', $result->getMessage() );
+ } else {
+ $error = wfMsg( 'eauthentsent', $wgUser->getName() );
+ }
+ }
+ } else {
+ $error = wfMsg( 'invalidemailaddress' );
+ }
+ } else {
+ $wgUser->setEmail( $this->mUserEmail );
+ $wgUser->setCookies();
+ $wgUser->saveSettings();
+ }
+ }
$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
$po = ParserOptions::newFromUser( $wgUser );
- $this->mainPrefsForm( wfMsg( 'savedprefs' ) );
+ $this->mainPrefsForm( $error );
}
/**
$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->mUserVariant = $wgUser->getOption( 'variant');
- if ( 1 == $wgUser->getOption( 'disablemail' ) ) { $this->mEmailFlag = 1; }
- else { $this->mEmailFlag = 0; }
+ $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');
+ $this->mEmailFlag = $wgUser->getOption( 'disablemail' ) == 1 ? 1 : 0;
$this->mNick = $wgUser->getOption( 'nickname' );
$this->mQuickbar = $wgUser->getOption( 'quickbar' );
$this->mSearchLines = $wgUser->getOption( 'contextlines' );
$this->mSearchChars = $wgUser->getOption( 'contextchars' );
$this->mImageSize = $wgUser->getOption( 'imagesize' );
+ $this->mThumbSize = $wgUser->getOption( 'thumbsize' );
$this->mRecent = $wgUser->getOption( 'rclimit' );
+ $this->mUnderline = $wgUser->getOption( 'underline' );
$togs = $wgLang->getUserToggles();
foreach ( $togs as $tname ) {
$namespaces = $wgContLang->getNamespaces();
foreach ( $namespaces as $i => $namespace ) {
- if ( $i >= 0 ) {
+ if ( $i >= NS_MAIN ) {
$this->mSearchNs[$i] = $wgUser->getOption( 'searchNs'.$i );
}
}
# Determine namespace checkboxes
$namespaces = $wgContLang->getNamespaces();
- $r1 = '';
+ $r1 = null;
foreach ( $namespaces as $i => $name ) {
- # Skip special or anything similar
- if ( $i >= 0 ) {
- $checked = '';
- if ( $this->mSearchNs[$i] ) {
- $checked = ' checked="checked"';
- }
- $name = str_replace( '_', ' ', $namespaces[$i] );
- if ( '' == $name ) {
- $name = wfMsg( 'blanknamespace' );
- }
-
- if ( 0 != $i ) {
- $r1 .= ' ';
- }
- $r1 .= "<label><input type='checkbox' value=\"1\" name=\"" .
- "wpNs$i\"{$checked} />{$name}</label>\n";
- }
+ if ($i < 0)
+ continue;
+ $checked = $this->mSearchNs[$i] ? "checked='checked'" : '';
+ $name = str_replace( '_', ' ', $namespaces[$i] );
+
+ if ( empty($name) )
+ $name = wfMsg( 'blanknamespace' );
+
+ $r1 .= "<label><input type='checkbox' value='1' name='wpNs$i' {$checked}/>{$name}</label>\n";
}
-
return $r1;
}
- function getToggle( $tname ) {
+ function getToggle( $tname, $trailer = false) {
global $wgUser, $wgLang;
$this->mUsedToggles[$tname] = true;
$ttext = $wgLang->getUserToggle( $tname );
- if ( 1 == $wgUser->getOption( $tname ) ) {
- $checked = ' checked="checked"';
- } else {
- $checked = '';
- }
- return "<div><input type='checkbox' value=\"1\" "
- . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label></div>\n";
+ $checked = $wgUser->getOption( $tname ) == 1 ? ' checked="checked"' : '';
+ $trailer = $trailer ? $trailer : '';
+ return "<div class='toggle'><input type='checkbox' value='1' id=\"$tname\" name=\"wpOp$tname\"$checked />" .
+ " <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>";
+ }
+
+ function getToggles( $items ) {
+ $out = "";
+ foreach( $items as $item ) {
+ if( $item === false )
+ continue;
+ if( is_array( $item ) ) {
+ list( $key, $trailer ) = $item;
+ } else {
+ $key = $item;
+ $trailer = false;
+ }
+ $out .= $this->getToggle( $key, $trailer );
+ }
+ return $out;
+ }
+
+ function addRow($td1, $td2) {
+ return "<tr><td align='right'>$td1</td><td align='left'>$td2</td></tr>";
}
/**
* @access private
*/
function mainPrefsForm( $err ) {
- global $wgUser, $wgOut, $wgLang, $wgContLang, $wgUseDynamicDates, $wgValidSkinNames;
- global $wgAllowRealName, $wgImageLimits;
- global $wgLanguageNames, $wgDisableLangConversion;
- global $wgContLanguageCode;
+ global $wgUser, $wgOut, $wgLang, $wgContLang, $wgValidSkinNames;
+ global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
+ global $wgDisableLangConversion;
+ global $wgEnotifWatchlist, $wgEnotifUserTalk,$wgEnotifMinorEdits;
+ global $wgRCShowWatchingUsers, $wgEnotifRevealEditorAddress;
+ global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
+ global $wgContLanguageCode, $wgDefaultSkin, $wgSkipSkins;
+
$wgOut->setPageTitle( wfMsg( 'preferences' ) );
$wgOut->setArticleRelated( false );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$titleObj = Title::makeTitle( NS_SPECIAL, 'Preferences' );
$action = $titleObj->escapeLocalURL();
-
- $qb = wfMsg( 'qbsettings' );
- $cp = wfMsg( 'changepassword' );
- $sk = wfMsg( 'skin' );
- $math = wfMsg( 'math' );
- $dateFormat = wfMsg('dateformat');
- $opw = wfMsg( 'oldpassword' );
- $npw = wfMsg( 'newpassword' );
- $rpw = wfMsg( 'retypenew' );
- $svp = wfMsg( 'saveprefs' );
- $rsp = wfMsg( 'resetprefs' );
- $tbs = wfMsg( 'textboxsize' );
- $tbr = wfMsg( 'rows' );
- $tbc = wfMsg( 'columns' );
- $ltz = wfMsg( 'localtime' );
- $timezone = wfMsg( 'timezonelegend' );
- $tzt = wfMsg( 'timezonetext' );
- $tzo = wfMsg( 'timezoneoffset' );
- $tzGuess = wfMsg( 'guesstimezone' );
- $tzServerTime = wfMsg( 'servertime' );
- $yem = wfMsg( 'youremail' );
- $yrn = ($wgAllowRealName) ? wfMsg( 'yourrealname' ) : '';
- $yl = wfMsg( 'yourlanguage' );
- $yv = wfMsg( 'yourvariant' );
- $emf = wfMsg( 'emailflag' );
- $ynn = wfMsg( 'yournick' );
- $stt = wfMsg ( 'stubthreshold' ) ;
- $srh = wfMsg( 'searchresultshead' );
- $rpp = wfMsg( 'resultsperpage' );
- $scl = wfMsg( 'contextlines' );
- $scc = wfMsg( 'contextchars' );
- $rcc = wfMsg( 'recentchangescount' );
- $dsn = wfMsg( 'defaultns' );
-
- $wgOut->addHTML( "<form id=\"preferences\" name=\"preferences\" action=\"$action\"
- method=\"post\">" );
-
- # First section: identity
- # Email, etc.
- #
+
+ # Pre-expire some toggles so they won't show if disabled
+ $this->mUsedToggles[ 'shownumberswatching' ] = true;
+ $this->mUsedToggles[ 'showupdated' ] = true;
+ $this->mUsedToggles[ 'enotifwatchlistpages' ] = true;
+ $this->mUsedToggles[ 'enotifusertalkpages' ] = true;
+ $this->mUsedToggles[ 'enotifminoredits' ] = true;
+ $this->mUsedToggles[ 'enotifrevealaddr' ] = true;
+
+ # Enotif
+ # <FIXME>
$this->mUserEmail = htmlspecialchars( $this->mUserEmail );
$this->mRealName = htmlspecialchars( $this->mRealName );
$this->mNick = htmlspecialchars( $this->mNick );
if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
else { $emfc = ''; }
+ if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
+ if( $wgUser->getEmailAuthenticationTimestamp() ) {
+ $emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />';
+ } else {
+ $skin = $wgUser->getSkin();
+ $emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
+ $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Confirmemail' ),
+ wfMsg( 'emailconfirmlink' ) );
+ }
+ } else {
+ $emailauthenticated = '';
+ }
+
+ if ($this->mUserEmail == '') {
+ $emailauthenticated = wfMsg( 'noemailprefs' );
+ }
+
$ps = $this->namespacesCheckboxes();
- $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>");
+ $enotifwatchlistpages = ($wgEnotifWatchlist) ? $this->getToggle( 'enotifwatchlistpages' ) : '';
+ $enotifusertalkpages = ($wgEnotifUserTalk) ? $this->getToggle( 'enotifusertalkpages' ) : '';
+ $enotifminoredits = ($wgEnotifWatchlist && $wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits' ) : '';
+ $enotifrevealaddr = (($wgEnotifWatchlist || $wgEnotifUserTalk) && $wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr' ) : '';
+ $prefs_help_email_enotif = ( $wgEnotifWatchlist || $wgEnotifUserTalk) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
+ $prefs_help_realname = '';
+
+ # </FIXME>
+
+ $wgOut->addHTML( "<form id='preferences' name='preferences' action=\"$action\" method='post'>" );
+
+ # User data
+ #
+
+ $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg('prefs-personal') . "</legend>\n<table>\n");
+
+ if ($wgAllowRealName) {
+ $wgOut->addHTML(
+ $this->addRow(
+ wfMsg('yourrealname'),
+ "<input type='text' name='wpRealName' value=\"{$this->mRealName}\" size='25' />"
+ )
+ );
}
-
- global $wgEnableEmail, $wgEnableUserEmail;
- if( $wgEnableEmail ) {
- $wgOut->addHTML("
- <div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>" );
- if( $wgEnableUserEmail ) {
- $wgOut->addHTML("
- <div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf</label></div>" );
- }
+ if ($wgEnableEmail) {
+ $wgOut->addHTML(
+ $this->addRow(
+ wfMsg( 'youremail' ),
+ "<input type='text' name='wpUserEmail' value=\"{$this->mUserEmail}\" size='25' />"
+ )
+ );
}
- $wgOut->addHTML("
- <div><label>$ynn: <input type='text' name=\"wpNick\" value=\"{$this->mNick}\" size='12' /></label></div>
- <div><label>$yl: <select name=\"wpUserLanguage\">\n");
-
- foreach($wgLanguageNames as $code => $name) {
+ $wgOut->addHTML(
+ $this->addRow(
+ wfMsg( 'yournick' ),
+ "<input type='text' name='wpNick' value=\"{$this->mNick}\" size='25' />"
+ ) .
+ # FIXME: The <input> part should be where the is, getToggle() needs
+ # to be changed to out return its output in two parts. -รฆvar
+ $this->addRow(
+ ' ',
+ $this->getToggle( 'fancysig' )
+ )
+ );
+
+ /**
+ * 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.
+ */
+ $languages = $wgLang->getLanguageNames();
+ $selectedLang = isset( $languages[$this->mUserLanguage] ) ? $this->mUserLanguage : $wgContLanguageCode;
+ $selbox = null;
+ foreach($languages 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) || $code == $wgContLanguageCode) {
- $sel = ($code == $this->mUserLanguage)? 'selected="selected"' : '';
- $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+ $sel = ($code == $selectedLang)? ' selected="selected"' : '';
+ $selbox .= "<option value=\"$code\"$sel>$code - $name</option>\n";
}
}
- $wgOut->addHtml("</select></label></div>\n" );
+ $wgOut->addHTML( $this->addRow( wfMsg('yourlanguage'), "<select name='wpUserLanguage'>$selbox</select>" ));
/* see if there are multiple language variants to choose from*/
if(!$wgDisableLangConversion) {
$variants = $wgContLang->getVariants();
- $size=sizeof($variants);
- $variantArray=array();
foreach($variants as $v) {
$v = str_replace( '_', '-', strtolower($v));
- if($name=$wgLanguageNames[$v]) {
+ if($name = $languages[$v]) {
$variantArray[$v] = $name;
}
}
- $size=sizeof($variantArray);
-
- if(sizeof($variantArray) > 1) {
- $wgOut->addHtml("
- <div><label>$yv: <select name=\"wpUserVariant\">\n");
- foreach($variantArray as $code => $name) {
- $sel = ($code==$this->mUserVariant)? 'selected="selected"' : '';
- $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
- }
+
+ $selbox = null;
+ foreach($variantArray as $code => $name) {
+ $sel = $code == $this->mUserVariant ? 'selected="selected"' : '';
+ $selbox .= "<option value=\"$code\" $sel>$code - $name</option>";
+ }
+
+ if(count($variantArray) > 1) {
+ $wgOut->addHtml(
+ $this->addRow( wfMsg( 'yourvariant' ), "<select name='wpUserVariant'>$selbox</select>" )
+ );
}
}
- # Fields for changing password
- #
+ $wgOut->addHTML('</table>');
+
+ # Password
$this->mOldpass = htmlspecialchars( $this->mOldpass );
$this->mNewpass = htmlspecialchars( $this->mNewpass );
$this->mRetypePass = htmlspecialchars( $this->mRetypePass );
- $wgOut->addHTML( "<fieldset>
- <legend>$cp</legend>
- <div><label>$opw: <input type='password' name=\"wpOldpass\" value=\"{$this->mOldpass}\" size='20' /></label></div>
- <div><label>$npw: <input type='password' name=\"wpNewpass\" value=\"{$this->mNewpass}\" size='20' /></label></div>
- <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" );
+ $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'changepassword' ) . '</legend><table>');
+ $wgOut->addHTML(
+ $this->addRow( wfMsg( 'oldpassword' ), "<input type='password' name='wpOldpass' value=\"{$this->mOldpass}\" size='20' />" ) .
+ $this->addRow( wfMsg( 'newpassword' ), "<input type='password' name='wpNewpass' value=\"{$this->mNewpass}\" size='20' />" ) .
+ $this->addRow( wfMsg( 'retypenew' ), "<input type='password' name='wpRetypePass' value=\"{$this->mRetypePass}\" size='20' />" ) .
+ "</table>\n" .
+ $this->getToggle( "rememberpassword" ) . "</fieldset>\n\n" );
+
+ # <FIXME>
+ # Enotif
+ if ($wgEnableEmail) {
+ $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'email' ) . '</legend>' );
+ $wgOut->addHTML(
+ $emailauthenticated.
+ $enotifrevealaddr.
+ $enotifwatchlistpages.
+ $enotifusertalkpages.
+ $enotifminoredits );
+ if ($wgEnableUserEmail) {
+ $emf = wfMsg( 'emailflag' );
+ $wgOut->addHTML(
+ "<div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf</label></div>" );
+ }
+
+ $wgOut->addHTML( '</fieldset>' );
+ }
+ # </FIXME>
+
+ if ($wgAllowRealName || $wgEnableEmail) {
+ $wgOut->addHTML("<div class='prefsectiontip'>");
+ $rn = $wgAllowRealName ? wfMsg('prefs-help-realname') : '';
+ $em = $wgEnableEmail ? '<br />' . wfMsg('prefs-help-email') : '';
+ $wgOut->addHTML( $rn . $em . '</div>');
+ }
-
- # Quickbar setting
+ $wgOut->addHTML( '</fieldset>' );
+
+ # Quickbar
#
- $wgOut->addHtml( "<fieldset>\n<legend>$qb</legend>\n" );
- for ( $i = 0; $i < count( $qbs ); ++$i ) {
- if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
- else { $checked = ""; }
- $wgOut->addHTML( "<div><label><input type='radio' name=\"wpQuickbar\"
- value=\"$i\"$checked /> {$qbs[$i]}</label></div>\n" );
+ if ($this->mSkin == 'cologneblue' || $this->mSkin == 'standard') {
+ $wgOut->addHtml( "<fieldset>\n<legend>" . wfMsg( 'qbsettings' ) . "</legend>\n" );
+ for ( $i = 0; $i < count( $qbs ); ++$i ) {
+ if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
+ else { $checked = ""; }
+ $wgOut->addHTML( "<div><label><input type='radio' name='wpQuickbar' value=\"$i\"$checked />{$qbs[$i]}</label></div>\n" );
+ }
+ $wgOut->addHtml( "</fieldset>\n\n" );
+ } else {
+ # Need to output a hidden option even if the relevant skin is not in use,
+ # otherwise the preference will get reset to 0 on submit
+ $wgOut->addHTML( "<input type='hidden' name='wpQuickbar' value='{$this->mQuickbar}' />" );
}
- $wgOut->addHtml('<div class="prefsectiontip">'.wfMsg('qbsettingsnote').'</div>');
- $wgOut->addHtml( "</fieldset>\n\n" );
- # Skin setting
+ # Skin
#
- $wgOut->addHTML( "<fieldset>\n<legend>$sk</legend>\n" );
+ $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
# Only show members of $wgValidSkinNames rather than
# $skinNames (skins is all skin names from Language.php)
foreach ($wgValidSkinNames as $skinkey => $skinname ) {
- if ( $skinkey == $this->mSkin ) {
- $checked = ' checked="checked"';
- } else {
- $checked = '';
- }
- if ( isset( $skinNames[$skinkey] ) ) {
- $sn = $skinNames[$skinkey];
- } else {
- $sn = $skinname;
- }
- global $wgDefaultSkin;
- if( $skinkey == $wgDefaultSkin ) {
+ if ( in_array( $skinkey, $wgSkipSkins ) ) {
+ continue;
+ }
+ $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
+ $sn = isset( $skinNames[$skinkey] ) ? $skinNames[$skinkey] : $skinname;
+
+ if( $skinkey == $wgDefaultSkin )
$sn .= ' (' . wfMsg( 'default' ) . ')';
- }
- $wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\"
- value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
+ $wgOut->addHTML( "<input type='radio' name='wpSkin' value=\"$skinkey\"$checked /> {$sn}<br/>\n" );
}
$wgOut->addHTML( "</fieldset>\n\n" );
- # Math setting
+ # Math
#
- $wgOut->addHTML( "<fieldset>\n<legend>$math</legend>\n" );
- for ( $i = 0; $i < count( $mathopts ); ++$i ) {
- if ( $i == $this->mMath ) { $checked = ' checked="checked"'; }
- else { $checked = ""; }
- $wgOut->addHTML( "<div><label><input type='radio' name=\"wpMath\"
- value=\"$i\"$checked /> ".wfMsg($mathopts[$i])."</label></div>\n" );
+ global $wgUseTeX;
+ if( $wgUseTeX ) {
+ $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg('math') . '</legend>' );
+ foreach ( $mathopts as $k => $v ) {
+ $checked = $k == $this->mMath ? ' checked="checked"' : '';
+ $wgOut->addHTML( "<div><label><input type='radio' name='wpMath' value=\"$k\"$checked /> ".wfMsg($v)."</label></div>\n" );
+ }
+ $wgOut->addHTML( "</fieldset>\n\n" );
}
- $wgOut->addHTML( "</fieldset>\n\n" );
-
- # Date format
+
+ # Files
#
- if ( $wgUseDynamicDates ) {
- $wgOut->addHTML( "<fieldset>\n<legend>$dateFormat</legend>\n" );
- for ( $i = 0; $i < count( $dateopts ); ++$i) {
- if ( $i == $this->mDate ) {
- $checked = ' checked="checked"';
- } else {
- $checked = "";
- }
+ $wgOut->addHTML("<fieldset>
+ <legend>" . wfMsg( 'files' ) . "</legend>
+ <div><label>" . wfMsg('imagemaxsize') . "<select name=\"wpImageSize\">");
+
+ $imageLimitOptions = null;
+ foreach ( $wgImageLimits as $index => $limits ) {
+ $selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
+ $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+ }
+
+ $imageThumbOptions = null;
+ $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
+ <div><label>" . wfMsg('thumbsize') . "<select name=\"wpThumbSize\">");
+ foreach ( $wgThumbLimits as $index => $size ) {
+ $selected = ($index == $this->mThumbSize) ? 'selected="selected"' : '';
+ $imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}px</option>\n";
+ }
+ $wgOut->addHTML( "{$imageThumbOptions}</select></label></div></fieldset>\n\n");
+
+ # Date format
+ #
+ if ($dateopts) {
+ $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg('dateformat') . "</legend>\n" );
+ foreach($dateopts as $key => $option) {
+ ($key == $this->mDate) ? $checked = ' checked="checked"' : $checked = '';
$wgOut->addHTML( "<div><label><input type='radio' name=\"wpDate\" ".
- "value=\"$i\"$checked /> {$dateopts[$i]}</label></div>\n" );
+ "value=\"$key\"$checked />$option</label></div>\n" );
}
$wgOut->addHTML( "</fieldset>\n\n");
}
-
- # Textbox rows, cols
+
+ # Time zone
#
+
$nowlocal = $wgLang->time( $now = wfTimestampNow(), true );
$nowserver = $wgLang->time( $now, false );
- $wgOut->addHTML( "<fieldset>
- <legend>$tbs</legend>\n
- <div>
- <label>$tbr: <input type='text' name=\"wpRows\" value=\"{$this->mRows}\" size='6' /></label>
- <label>$tbc: <input type='text' name=\"wpCols\" value=\"{$this->mCols}\" size='6' /></label>
- </div> " .
- $this->getToggle( "editwidth" ) .
- $this->getToggle( "showtoolbar" ) .
- $this->getToggle( "previewonfirst" ) .
- $this->getToggle( "previewontop" ) .
- $this->getToggle( "watchdefault" ) .
- $this->getToggle( "minordefault" ) . "
- </fieldset>
-
- <fieldset>
- <legend>$timezone</legend>
- <div><b>$tzServerTime:</b> $nowserver</div>
- <div><b>$ltz:</b> $nowlocal</div>
- <div><label>$tzo*: <input type='text' name=\"wpHourDiff\" value=\"" . htmlspecialchars( $this->mHourDiff ) . "\" size='6' /></label></div>
- <div><input type=\"button\" value=\"$tzGuess\" onclick=\"javascript:guessTimezone()\" id=\"guesstimezonebutton\" style=\"display:none\" /></div>
- <div class='prefsectiontip'>* {$tzt}</div>
- </fieldset>\n\n" );
-
- $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>".wfMsg('imagemaxsize')."<select name=\"wpImageSize\">");
+
+ $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'timezonelegend' ) . '</legend><table>' .
+ $this->addRow( wfMsg( 'servertime' ), $nowserver ) .
+ $this->addRow( wfMsg( 'localtime' ), $nowlocal ) .
+ $this->addRow(
+ wfMsg( 'timezoneoffset' ),
+ "<input type='text' name='wpHourDiff' value=\"" . htmlspecialchars( $this->mHourDiff ) . "\" size='6' />"
+ ) . "<tr><td colspan='2'>
+ <input type='button' value=\"" . wfMsg( 'guesstimezone' ) ."\"
+ onclick='javascript:guessTimezone()' id='guesstimezonebutton' style='display:none;' />
+ </td></tr></table>
+ <div class='prefsectiontip'>ยน" . wfMsg( 'timezonetext' ) . "</div>
+ </fieldset>\n\n" );
- $imageLimitOptions='';
- foreach ( $wgImageLimits as $index => $limits ) {
- $selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
- $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
- }
- $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
-
- </fieldset>
+ # Editing
+ #
+ $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textboxsize' ) . '</legend>
+ <div>
+ <label>' . wfMsg( 'rows' ) . ": <input type='text' name='wpRows' value=\"{$this->mRows}\" size='6' /></label>
+ <label>" . wfMsg( 'columns' ) . ": <input type='text' name='wpCols' value=\"{$this->mCols}\" size='6' /></label>
+ </div>" .
+ $this->getToggles( array(
+ 'editsection',
+ 'editsectiononrightclick',
+ 'editondblclick',
+ 'editwidth',
+ 'showtoolbar',
+ 'previewonfirst',
+ 'previewontop',
+ 'watchdefault',
+ 'minordefault',
+ 'externaleditor',
+ 'externaldiff' )
+ ) . '</fieldset>'
+ );
- <fieldset>
- <legend>$srh</legend>
- <div><label>$rpp: <input type='text' name=\"wpSearch\" value=\"$this->mSearch\" size='6' /></label></div>
- <div><label>$scl: <input type='text' name=\"wpSearchLines\" value=\"$this->mSearchLines\" size='6' /></label></div>
- <div><label>$scc: <input type='text' name=\"wpSearchChars\" value=\"$this->mSearchChars\" size='6' /></label></div>
-
- <fieldset>
- <legend>$dsn</legend>
- $ps
- </fieldset>
- </fieldset>
- " );
+ $wgOut->addHTML( '<fieldset><legend>' . htmlspecialchars(wfMsg('prefs-rc')) . '</legend>
+ <table>' .
+ $this->addRow(
+ wfMsg ( 'stubthreshold' ),
+ "<input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' />"
+ ) .
+ $this->addRow(
+ wfMsg( 'recentchangescount' ),
+ "<input type='text' name='wpRecent' value=\"$this->mRecent\" size='6' />"
+ ) .
+ '</table>' .
+ $this->getToggles( array(
+ 'hideminor',
+ $wgRCShowWatchingUsers ? 'shownumberswatching' : false,
+ 'usenewrc' )
+ ) . '</fieldset>'
+ );
- # Various checkbox options
+ $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'searchresultshead' ) . '</legend><table>' .
+ $this->addRow( wfMsg( 'resultsperpage' ), "<input type='text' name='wpSearch' value=\"$this->mSearch\" size='4' />" ) .
+ $this->addRow( wfMsg( 'contextlines' ), "<input type='text' name='wpSearchLines' value=\"$this->mSearchLines\" size='4' />" ) .
+ $this->addRow( wfMsg( 'contextchars' ), "<input type='text' name='wpSearchChars' value=\"$this->mSearchChars\" size='4' />" ) .
+ "</table><fieldset><legend>" . wfMsg( 'defaultns' ) . "</legend>$ps</fieldset></fieldset>" );
+
+ # Misc
#
- $wgOut->addHTML("<fieldset><legend>".wfMsg('prefs-misc')."</legend>");
+ $wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>');
+
+ $msgUnderline = htmlspecialchars(wfMsg("tog-underline"));
+ $msgUnderlinenever = htmlspecialchars(wfMsg("underline-never"));
+ $msgUnderlinealways = htmlspecialchars(wfMsg("underline-always"));
+ $msgUnderlinedefault = htmlspecialchars(wfMsg("underline-default"));
+ $uopt = $wgUser->getOption("underline");
+ $s0 = $uopt == 0 ? " selected=\"selected\"" : "";
+ $s1 = $uopt == 1 ? " selected=\"selected\"" : "";
+ $s2 = $uopt == 2 ? " selected=\"selected\"" : "";
+ $wgOut->addHTML("
+<div class='toggle'><label>$msgUnderline
+<select name=\"wpOpunderline\">
+<option value=\"0\"$s0>$msgUnderlinenever</option>
+<option value=\"1\"$s1>$msgUnderlinealways</option>
+<option value=\"2\"$s2>$msgUnderlinedefault</option>
+</select>
+</label></div>
+");
foreach ( $togs as $tname ) {
if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
$wgOut->addHTML( $this->getToggle( $tname ) );
}
}
- $wgOut->addHTML( "</fieldset>\n\n" );
+ $wgOut->addHTML( '</fieldset>' );
+ $token = $wgUser->editToken();
$wgOut->addHTML( "
<div id='prefsubmit'>
<div>
- <input type='submit' name=\"wpSaveprefs\" value=\"$svp\" accesskey=\"".
+ <input type='submit' name='wpSaveprefs' value=\"" . wfMsg( 'saveprefs' ) . "\" accesskey=\"".
wfMsg('accesskey-save')."\" title=\"[alt-".wfMsg('accesskey-save')."]\" />
- <input type='submit' name=\"wpReset\" value=\"$rsp\" />
+ <input type='submit' name='wpReset' value=\"" . wfMsg( 'resetprefs' ) . "\" />
</div>
</div>
+ <input type='hidden' name='wpEditToken' value='{$token}' />
</form>\n" );
}
}
dépôts / lhc / web / wiklou.git / blobdiff