* Add wfReadOnlyReason() to supply the reason for the wiki being read only. Use it...
[lhc/web/wiklou.git] / includes / SpecialPreferences.php
index ee38e53..ca163a6 100644 (file)
@@ -1,13 +1,9 @@
 <?php
 /**
  * Hold things related to displaying and saving user preferences.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/* to get a list of languages in setting user's language preference */
-require_once('languages/Names.php');
-
 /**
  * Entry point that create the "Preferences" object
  */
@@ -21,23 +17,23 @@ function wfSpecialPreferences() {
 /**
  * Preferences form handling
  * This object will show the preferences form and can save it as well.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class PreferencesForm {
        var $mQuickbar, $mOldpass, $mNewpass, $mRetypePass, $mStubs;
        var $mRows, $mCols, $mSkin, $mMath, $mDate, $mUserEmail, $mEmailFlag, $mNick;
        var $mUserLanguage, $mUserVariant;
-       var $mSearch, $mRecent, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
-       var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize;
+       var $mSearch, $mRecent, $mRecentDays, $mHourDiff, $mSearchLines, $mSearchChars, $mAction;
+       var $mReset, $mPosted, $mToggles, $mUseAjaxSearch, $mSearchNs, $mRealName, $mImageSize;
+       var $mUnderline, $mWatchlistEdits;
 
        /**
         * Constructor
         * Load some values
         */
-       function PreferencesForm( &$request ) { 
-               global $wgLang, $wgContLang, $wgAllowRealName;
-               
+       function PreferencesForm( &$request ) {
+               global $wgContLang, $wgUser, $wgAllowRealName;
+
                $this->mQuickbar = $request->getVal( 'wpQuickbar' );
                $this->mOldpass = $request->getVal( 'wpOldpass' );
                $this->mNewpass = $request->getVal( 'wpNewpass' );
@@ -49,34 +45,43 @@ class PreferencesForm {
                $this->mMath = $request->getVal( 'wpMath' );
                $this->mDate = $request->getVal( 'wpDate' );
                $this->mUserEmail = $request->getVal( 'wpUserEmail' );
-               $this->mRealName = ($wgAllowRealName) ? $request->getVal( 'wpRealName' ) : '';
-               $this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 1 : 0;
+               $this->mRealName = $wgAllowRealName ? $request->getVal( 'wpRealName' ) : '';
+               $this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 0 : 1;
                $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->mRecentDays = $request->getVal( 'wpRecentDays' );
                $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->mSuccess = $request->getCheck( 'success' );
+               $this->mWatchlistDays = $request->getVal( 'wpWatchlistDays' );
+               $this->mWatchlistEdits = $request->getVal( 'wpWatchlistEdits' );
+               $this->mUseAjaxSearch = $request->getCheck( 'wpUseAjaxSearch' );
+
+               $this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) &&
+                       $this->mPosted &&
+                       $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
 
                # User toggles  (the big ugly unsorted list of checkboxes)
                $this->mToggles = array();
                if ( $this->mPosted ) {
-                       $togs = $wgLang->getUserToggles();
+                       $togs = User::getToggles();
                        foreach ( $togs as $tname ) {
                                $this->mToggles[$tname] = $request->getCheck( "wpOp$tname" ) ? 1 : 0;
                        }
                }
-               
+
                $this->mUsedToggles = array();
-               
+
                # Search namespace options
                # Note: namespaces don't necessarily have consecutive keys
                $this->mSearchNs = array();
@@ -88,13 +93,20 @@ class PreferencesForm {
                                }
                        }
                }
+
+               # Validate language
+               if ( !preg_match( '/^[a-z\-]*$/', $this->mUserLanguage ) ) {
+                       $this->mUserLanguage = 'nolanguage';
+               }
+
+               wfRunHooks( 'InitPreferencesForm', array( $this, $request ) );
        }
 
        function execute() {
-               global $wgUser, $wgOut, $wgUseDynamicDates;
-               
-               if ( 0 == $wgUser->getID() ) {
-                       $wgOut->errorpage( 'prefsnologin', 'prefsnologintext' );
+               global $wgUser, $wgOut;
+
+               if ( $wgUser->isAnon() ) {
+                       $wgOut->showErrorPage( 'prefsnologin', 'prefsnologintext' );
                        return;
                }
                if ( wfReadOnly() ) {
@@ -103,7 +115,7 @@ class PreferencesForm {
                }
                if ( $this->mReset ) {
                        $this->resetPrefs();
-                       $this->mainPrefsForm( wfMsg( 'prefsreset' ) );
+                       $this->mainPrefsForm( 'reset', wfMsg( 'prefsreset' ) );
                } else if ( $this->mSaveprefs ) {
                        $this->savePreferences();
                } else {
@@ -111,7 +123,6 @@ class PreferencesForm {
                        $this->mainPrefsForm( '' );
                }
        }
-
        /**
         * @access private
         */
@@ -122,6 +133,16 @@ class PreferencesForm {
                return $val;
        }
 
+       /**
+        * @access private
+        */
+       function validateFloat( &$val, $min, $max=0x7fffffff ) {
+               $val = floatval( $val );
+               $val = min( $val, $max );
+               $val = max( $val, $min );
+               return( $val );
+       }
+
        /**
         * @access private
         */
@@ -137,6 +158,27 @@ class PreferencesForm {
        /**
         * @access private
         */
+       function validateDate( $val ) {
+               global $wgLang, $wgContLang;
+               if ( $val !== false && (
+                       in_array( $val, (array)$wgLang->getDatePreferences() ) ||
+                       in_array( $val, (array)$wgContLang->getDatePreferences() ) ) ) 
+               {
+                       return $val;
+               } else {
+                       return $wgLang->getDefaultDateFormat();
+               }
+       }
+
+       /**
+        * Used to validate the user inputed timezone before saving it as
+        * 'timecorrection', 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 !== '' ) {
                        if ( strpos( $s, ':' ) ) {
@@ -149,8 +191,10 @@ class PreferencesForm {
                                $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 );
@@ -162,77 +206,183 @@ class PreferencesForm {
         * @access private
         */
        function savePreferences() {
-               global $wgUser, $wgLang, $wgDeferredUpdateList, $wgOut;
+               global $wgUser, $wgOut, $wgParser;
+               global $wgEnableUserEmail, $wgEnableEmail;
+               global $wgEmailAuthentication, $wgRCMaxAge;
+               global $wgAuth, $wgEmailConfirmToEdit;
+
 
-               if ( '' != $this->mNewpass ) {
+               if ( '' != $this->mNewpass && $wgAuth->allowPasswordChange() ) {
                        if ( $this->mNewpass != $this->mRetypePass ) {
-                               $this->mainPrefsForm( wfMsg( 'badretype' ) );                   
+                               wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'badretype' ) );
+                               $this->mainPrefsForm( 'error', wfMsg( 'badretype' ) );
                                return;
                        }
 
                        if (!$wgUser->checkPassword( $this->mOldpass )) {
-                               $this->mainPrefsForm( wfMsg( 'wrongpassword' ) );
+                               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->setPassword( $this->mNewpass );
                }
-               $wgUser->setEmail( $this->mUserEmail );
                $wgUser->setRealName( $this->mRealName );
+
+               if( $wgUser->getOption( 'language' ) !== $this->mUserLanguage ) {
+                       $needRedirect = true;
+               } else {
+                       $needRedirect = false;
+               }
+
+               # Validate the signature and clean it up as needed
+               global $wgMaxSigChars;
+               if( mb_strlen( $this->mNick ) > $wgMaxSigChars ) {
+                       global $wgLang;
+                       $this->mainPrefsForm( 'error',
+                               wfMsg( 'badsiglength', $wgLang->formatNum( $wgMaxSigChars ) ) );
+                       return;
+               } elseif( $this->mToggles['fancysig'] ) {
+                       if( $wgParser->validateSig( $this->mNick ) !== false ) {
+                               $this->mNick = $wgParser->cleanSig( $this->mNick );
+                       } else {
+                               $this->mainPrefsForm( 'error', wfMsg( 'badsig' ) );
+                               return;
+                       }
+               } else {
+                       // When no fancy sig used, make sure ~{3,5} get removed.
+                       $this->mNick = $wgParser->cleanSigInSig( $this->mNick );
+               }
+
                $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->validateDate( $this->mDate ) );
                $wgUser->setOption( 'searchlimit', $this->validateIntOrNull( $this->mSearch ) );
                $wgUser->setOption( 'contextlines', $this->validateIntOrNull( $this->mSearchLines ) );
                $wgUser->setOption( 'contextchars', $this->validateIntOrNull( $this->mSearchChars ) );
                $wgUser->setOption( 'rclimit', $this->validateIntOrNull( $this->mRecent ) );
+               $wgUser->setOption( 'rcdays', $this->validateInt($this->mRecentDays, 1, ceil($wgRCMaxAge / (3600*24))));
+               $wgUser->setOption( 'wllimit', $this->validateIntOrNull( $this->mWatchlistEdits, 0, 1000 ) );
                $wgUser->setOption( 'rows', $this->validateInt( $this->mRows, 4, 1000 ) );
                $wgUser->setOption( 'cols', $this->validateInt( $this->mCols, 4, 1000 ) );
                $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) );
+               $wgUser->setOption( 'watchlistdays', $this->validateFloat( $this->mWatchlistDays, 0, 7 ) );
+               $wgUser->setOption( 'ajaxsearch', $this->mUseAjaxSearch );
 
                # Set search namespace options
                foreach( $this->mSearchNs as $i => $value ) {
                        $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 );
                }
+
+               $error = false;
+               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
+                                       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', htmlspecialchars( $result->getMessage() ) );
+                                               } else {
+                                                       $error = wfMsg( 'eauthentsent', $wgUser->getName() );
+                                               }
+                                       }
+                               } else {
+                                       $error = wfMsg( 'invalidemailaddress' );
+                               }
+                       } else {
+                               if( $wgEmailConfirmToEdit && empty( $newadr ) ) {
+                                       $this->mainPrefsForm( 'error', wfMsg( 'noemailtitle' ) );
+                                       return;
+                               }
+                               $wgUser->setEmail( $this->mUserEmail );
+                       }
+                       if( $oldadr != $newadr ) {
+                               wfRunHooks( 'PrefsEmailAudit', array( $wgUser, $oldadr, $newadr ) );
+                       }
+               }
+
+               if (!$wgAuth->updateExternalDB($wgUser)) {
+                       $this->mainPrefsForm( 'error', wfMsg( 'externaldberror' ) );
+                       return;
+               }
+
+               $msg = '';
+               if ( !wfRunHooks( 'SavePreferences', array( $this, $wgUser, &$msg ) ) ) {
+                       print "(($msg))";
+                       $this->mainPrefsForm( 'error', $msg );
+                       return;
+               }
+
                $wgUser->setCookies();
-               $up = new UserUpdate();
-               array_push( $wgDeferredUpdateList, $up );
+               $wgUser->saveSettings();
+
+               if( $needRedirect && $error === false ) {
+                       $title = SpecialPage::getTitleFor( 'Preferences' );
+                       $wgOut->redirect($title->getFullURL('success'));
+                       return;
+               }
+
                $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
-               $po = ParserOptions::newFromUser( $wgUser );
-               $this->mainPrefsForm( wfMsg( 'savedprefs' ) );
+               $this->mainPrefsForm( $error === false ? 'success' : 'error', $error);
        }
 
        /**
         * @access private
         */
        function resetPrefs() {
-               global $wgUser, $wgLang, $wgContLang, $wgAllowRealName;
+               global $wgUser, $wgLang, $wgContLang, $wgContLanguageCode, $wgAllowRealName;
 
                $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; }
+
+               # language value might be blank, default to content language
+               $this->mUserLanguage = $wgUser->getOption( 'language', $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->mSkin = $wgUser->getOption( 'skin' );
+               $this->mSkin = Skin::normalizeKey( $wgUser->getOption( 'skin' ) );
                $this->mMath = $wgUser->getOption( 'math' );
-               $this->mDate = $wgUser->getOption( 'date' );
+               $this->mDate = $wgUser->getDatePreference();
                $this->mRows = $wgUser->getOption( 'rows' );
                $this->mCols = $wgUser->getOption( 'cols' );
                $this->mStubs = $wgUser->getOption( 'stubthreshold' );
@@ -241,347 +391,657 @@ class PreferencesForm {
                $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->mRecentDays = $wgUser->getOption( 'rcdays' );
+               $this->mWatchlistEdits = $wgUser->getOption( 'wllimit' );
+               $this->mUnderline = $wgUser->getOption( 'underline' );
+               $this->mWatchlistDays = $wgUser->getOption( 'watchlistdays' );
+               $this->mUseAjaxSearch = $wgUser->getBoolOption( 'ajaxsearch' );
 
-               $togs = $wgLang->getUserToggles();
+               $togs = User::getToggles();
                foreach ( $togs as $tname ) {
-                       $ttext = wfMsg('tog-'.$tname);
                        $this->mToggles[$tname] = $wgUser->getOption( $tname );
                }
 
                $namespaces = $wgContLang->getNamespaces();
                foreach ( $namespaces as $i => $namespace ) {
-                       if ( $i >= 0 ) {
+                       if ( $i >= NS_MAIN ) {
                                $this->mSearchNs[$i] = $wgUser->getOption( 'searchNs'.$i );
                        }
                }
+
+               wfRunHooks( 'ResetPreferences', array( $this, $wgUser ) );
        }
 
        /**
         * @access private
         */
        function namespacesCheckboxes() {
-               global $wgContLang, $wgUser;
-               
+               global $wgContLang;
+
                # 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 ($i < 0)
+                               continue;
+                       $checked = $this->mSearchNs[$i] ? "checked='checked'" : '';
+                       $name = str_replace( '_', ' ', $namespaces[$i] );
 
-                               if ( 0 != $i ) { 
-                                       $r1 .= ' '; 
-                               }
-                               $r1 .= "<label><input type='checkbox' value=\"1\" name=\"" .
-                                 "wpNs$i\"{$checked} />{$name}</label>\n";
-                       }
+                       if ( empty($name) )
+                               $name = wfMsg( 'blanknamespace' );
+
+                       $r1 .= "<input type='checkbox' value='1' name='wpNs$i' id='wpNs$i' {$checked}/> <label for='wpNs$i'>{$name}</label><br />\n";
                }
-               
                return $r1;
        }
 
 
-       function getToggle( $tname ) {
+       function getToggle( $tname, $trailer = false, $disabled = false ) {
                global $wgUser, $wgLang;
-               
+
                $this->mUsedToggles[$tname] = true;
                $ttext = $wgLang->getUserToggle( $tname );
-               
-               if ( 1 == $wgUser->getOption( $tname ) ) {
-                       $checked = ' checked="checked"';
+
+               $checked = $wgUser->getOption( $tname ) == 1 ? ' checked="checked"' : '';
+               $disabled = $disabled ? ' disabled="disabled"' : '';
+               $trailer = $trailer ? $trailer : '';
+               return "<div class='toggle'><input type='checkbox' value='1' id=\"$tname\" name=\"wpOp$tname\"$checked$disabled />" .
+                       " <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>\n";
+       }
+
+       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>";
+       }
+
+       /**
+        * 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;
+
+               $align['align'] = $wgContLang->isRtl() ? 'right' : 'left';
+
+               if ( is_null( $td3 ) ) {
+                       $td3 = '';
                } else {
-                       $checked = '';
-               }               
-               return "<div><input type='checkbox' value=\"1\" "
-                 . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label></div>\n";
+                       $td3 = Xml::tags( 'tr', null,
+                               Xml::tags( 'td', array( 'colspan' => '2' ), $td3 )
+                       );
+               }
+
+               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";
+       
        }
 
        /**
         * @access private
         */
-       function mainPrefsForm( $err ) {
-               global $wgUser, $wgOut, $wgLang, $wgContLang, $wgUseDynamicDates, $wgValidSkinNames;
-               global $wgAllowRealName, $wgImageLimits;
-               global $wgLanguageNames;
+       function mainPrefsForm( $status , $message = '' ) {
+               global $wgUser, $wgOut, $wgLang, $wgContLang;
+               global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
+               global $wgDisableLangConversion;
+               global $wgEnotifWatchlist, $wgEnotifUserTalk,$wgEnotifMinorEdits;
+               global $wgRCShowWatchingUsers, $wgEnotifRevealEditorAddress;
+               global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
+               global $wgContLanguageCode, $wgDefaultSkin, $wgSkipSkins, $wgAuth;
+               global $wgEmailConfirmToEdit, $wgAjaxSearch;
 
                $wgOut->setPageTitle( wfMsg( 'preferences' ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-               if ( '' != $err ) {
-                       $wgOut->addHTML( "<p class='error'>" . htmlspecialchars( $err ) . "</p>\n" );
-               }
-               $uname = $wgUser->getName();
-               $uid = $wgUser->getID();
+               $wgOut->disallowUserJs();  # Prevent hijacked user scripts from sniffing passwords etc.
 
-               $wgOut->addWikiText( wfMsg( 'prefslogintext', $uname, $uid ) );
-               $wgOut->addWikiText( wfMsg('clearyourcache'));
+               if ( $this->mSuccess || 'success' == $status ) {
+                       $wgOut->wrapWikiMsg( '<div class="successbox"><strong>$1</strong></div>', 'savedprefs' );
+               } else  if ( 'error' == $status ) {
+                       $wgOut->addWikiText( '<div class="errorbox"><strong>' . $message  . '</strong></div>' );
+               } else if ( '' != $status ) {
+                       $wgOut->addWikiText( $message . "\n----" );
+               }
 
                $qbs = $wgLang->getQuickbarSettings();
                $skinNames = $wgLang->getSkinNames();
                $mathopts = $wgLang->getMathNames();
-               $dateopts = $wgLang->getDateFormats();
-               $togs = $wgLang->getUserToggles();
+               $dateopts = $wgLang->getDatePreferences();
+               $togs = User::getToggles();
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Preferences' );
+               $titleObj = SpecialPage::getTitleFor( '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.
-               #
-               $this->mUserEmail = htmlspecialchars( $this->mUserEmail );
-               $this->mRealName = htmlspecialchars( $this->mRealName );
-               $this->mNick = htmlspecialchars( $this->mNick );
-               if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
+               # 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;
+               $this->mUsedToggles[ 'ccmeonemails' ] = true;
+               $this->mUsedToggles[ 'uselivepreview' ] = true;
+
+
+               if ( !$this->mEmailFlag ) { $emfc = 'checked="checked"'; }
                else { $emfc = ''; }
 
+
+               if ($wgEmailAuthentication && ($this->mUserEmail != '') ) {
+                       if( $wgUser->getEmailAuthenticationTimestamp() ) {
+                               $emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />';
+                               $disableEmailPrefs = false;
+                       } else {
+                               $disableEmailPrefs = true;
+                               $skin = $wgUser->getSkin();
+                               $emailauthenticated = wfMsg('emailnotauthenticated').'<br />' .
+                                       $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ),
+                                               wfMsg( 'emailconfirmlink' ) ) . '<br />';
+                       }
+               } else {
+                       $emailauthenticated = '';
+                       $disableEmailPrefs = false;
+               }
+
+               if ($this->mUserEmail == '') {
+                       $emailauthenticated = wfMsg( 'noemailprefs' ) . '<br />';
+               }
+
                $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', false, $disableEmailPrefs ) : '';
+               $enotifusertalkpages = ($wgEnotifUserTalk) ? $this->getToggle( 'enotifusertalkpages', false, $disableEmailPrefs ) : '';
+               $enotifminoredits = ($wgEnotifWatchlist && $wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits', false, $disableEmailPrefs ) : '';
+               $enotifrevealaddr = (($wgEnotifWatchlist || $wgEnotifUserTalk) && $wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr', false, $disableEmailPrefs ) : '';
+
+               # </FIXME>
+
+               $wgOut->addHTML( "<form action=\"$action\" method='post'>" );
+               $wgOut->addHTML( "<div id='preferences'>" );
+
+               # User data
+
+               $wgOut->addHTML(
+                       Xml::openElement( 'fieldset ' ) .
+                       Xml::element( 'legend', null, wfMsg('prefs-personal') ) .
+                       Xml::openElement( 'table' ) .
+                       $this->tableRow( Xml::element( 'h2', null, wfMsg( 'prefs-personal' ) ) )
+               );
+
+               $userInformationHtml =
+                       $this->tableRow( wfMsgHtml( 'username' ), htmlspecialchars( $wgUser->getName() ) ) .
+                       $this->tableRow( wfMsgHtml( 'uid' ), htmlspecialchars( $wgUser->getID() ) ) .
+                       $this->tableRow(
+                               wfMsgHtml( 'prefs-edits' ),
+                               $wgLang->formatNum( User::edits( $wgUser->getId() ) )
+                       );
+
+               if( wfRunHooks( 'PreferencesUserInformationPanel', array( $this, &$userInformationHtml ) ) ) {
+                       $wgOut->addHtml( $userInformationHtml );
                }
-               $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>$yl: <select name=\"wpUserLanguage\" />\n");
-
-               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" : "";
-                               $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
-                       }
+
+               if ( $wgAllowRealName ) {
+                       $wgOut->addHTML(
+                               $this->tableRow(
+                                       Xml::label( wfMsg('yourrealname'), 'wpRealName' ),
+                                       Xml::input( 'wpRealName', 25, $this->mRealName, array( 'id' => 'wpRealName' ) ),
+                                       Xml::tags('div', array( 'class' => 'prefsectiontip' ),
+                                               wfMsgExt( 'prefs-help-realname', 'parseinline' )
+                                       )
+                               )
+                       );
+               }
+               if ( $wgEnableEmail ) {
+                       $wgOut->addHTML(
+                               $this->tableRow(
+                                       Xml::label( wfMsg('youremail'), 'wpUserEmail' ),
+                                       Xml::input( 'wpUserEmail', 25, $this->mUserEmail, array( 'id' => 'wpUserEmail' ) ),
+                                       Xml::tags('div', array( 'class' => 'prefsectiontip' ),
+                                               wfMsgExt( $wgEmailConfirmToEdit ? 'prefs-help-email-required' : 'prefs-help-email', 'parseinline' )
+                                       )
+                               )
+                       );
+               }
+
+               global $wgParser, $wgMaxSigChars;
+               if( mb_strlen( $this->mNick ) > $wgMaxSigChars ) {
+                       $invalidSig = $this->tableRow(
+                               '&nbsp;',
+                               Xml::element( 'span', array( 'class' => 'error' ),
+                                       wfMsg( 'badsiglength', $wgLang->formatNum( $wgMaxSigChars ) ) )
+                       );
+               } elseif( !empty( $this->mToggles['fancysig'] ) &&
+                       false === $wgParser->validateSig( $this->mNick ) ) {
+                       $invalidSig = $this->tableRow(
+                               '&nbsp;',
+                               Xml::element( 'span', array( 'class' => 'error' ), wfMsg( 'badsig' ) )
+                       );
+               } else {
+                       $invalidSig = '';
                }
-               $wgOut->addHtml("</select></label></div>\n" );
+
+               $wgOut->addHTML(
+                       $this->tableRow(
+                               Xml::label( wfMsg( 'yournick' ), 'wpNick' ),
+                               Xml::input( 'wpNick', 25, $this->mNick,
+                                       array(
+                                               'id' => 'wpNick',
+                                               // Note: $wgMaxSigChars is enforced in Unicode characters,
+                                               // both on the backend and now in the browser.
+                                               // Badly-behaved requests may still try to submit
+                                               // an overlong string, however.
+                                               'maxlength' => $wgMaxSigChars ) )
+                       ) .
+                       $invalidSig .
+                       $this->tableRow( '&nbsp;', $this->getToggle( 'fancysig' ) )
+               );
+
+               list( $lsLabel, $lsSelect) = Xml::languageSelector( $this->mUserLanguage );
+               $wgOut->addHTML(
+                       $this->tableRow( $lsLabel, $lsSelect )
+               );
 
                /* see if there are multiple language variants to choose from*/
-               $variants = $wgContLang->getVariants();
-               $size=sizeof($variants);
-               
-               $variantArray=array();
-               foreach($variants as $v) {
-                       $v = str_replace( '_', '-', strtolower($v));
-                       if($name=$wgLanguageNames[$v]) {
-                               $variantArray[$v] = $name;
+               if(!$wgDisableLangConversion) {
+                       $variants = $wgContLang->getVariants();
+                       $variantArray = array();
+
+                       $languages = Language::getLanguageNames( true );
+                       foreach($variants as $v) {
+                               $v = str_replace( '_', '-', strtolower($v));
+                               if( array_key_exists( $v, $languages ) ) {
+                                       // If it doesn't have a name, we'll pretend it doesn't exist
+                                       $variantArray[$v] = $languages[$v];
+                               }
+                       }
+
+                       $options = "\n";
+                       foreach( $variantArray as $code => $name ) {
+                               $selected = ($code == $this->mUserVariant);
+                               $options .= Xml::option( "$code - $name", $code, $selected ) . "\n";
+                       }
+
+                       if(count($variantArray) > 1) {
+                               $wgOut->addHtml(
+                                       $this->tableRow(
+                                               Xml::label( wfMsg( 'yourvariant' ), 'wpUserVariant' ),
+                                               Xml::tags( 'select',
+                                                       array( 'name' => 'wpUserVariant', 'id' => 'wpUserVariant' ),
+                                                       $options
+                                               )
+                                       )
+                               );
                        }
                }
-               $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" : "";
-                               $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+
+               # Password
+               if( $wgAuth->allowPasswordChange() ) {  
+                       $wgOut->addHTML(
+                               $this->tableRow( Xml::element( 'h2', null, wfMsg( 'changepassword' ) ) ) .
+                               $this->tableRow(
+                                       Xml::label( wfMsg( 'oldpassword' ), 'wpOldpass' ),
+                                       Xml::password( 'wpOldpass', 25, $this->mOldpass, array( 'id' => 'wpOldpass' ) )
+                               ) .
+                               $this->tableRow(
+                                       Xml::label( wfMsg( 'newpassword' ), 'wpNewpass' ),
+                                       Xml::password( 'wpNewpass', 25, $this->mNewpass, array( 'id' => 'wpNewpass' ) )
+                               ) .
+                               $this->tableRow(
+                                       Xml::label( wfMsg( 'retypenew' ), 'wpRetypePass' ),
+                                       Xml::password( 'wpRetypePass', 25, $this->mRetypePass, array( 'id' => 'wpRetypePass' ) )
+                               ) .
+                               Xml::tags( 'tr', null,
+                                       Xml::tags( 'td', array( 'colspan' => '2' ),
+                                               $this->getToggle( "rememberpassword" )
+                                       )
+                               )
+                       );
+               }
+
+               # <FIXME>
+               # Enotif
+               if ( $wgEnableEmail ) {
+
+                       $moreEmail = '';
+                       if ($wgEnableUserEmail) {
+                               $emf = wfMsg( 'allowemail' );
+                               $disabled = $disableEmailPrefs ? ' disabled="disabled"' : '';
+                               $moreEmail =
+                               "<input type='checkbox' $emfc $disabled value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label>";
                        }
-                       $wgOut->addHtml("</select></label></div>\n");
+
+
+                       $wgOut->addHTML(
+                               $this->tableRow( Xml::element( 'h2', null, wfMsg( 'email' ) ) ) .
+                               $this->tableRow(
+                                       $emailauthenticated.
+                                       $enotifrevealaddr.
+                                       $enotifwatchlistpages.
+                                       $enotifusertalkpages.
+                                       $enotifminoredits.
+                                       $moreEmail.
+                                       $this->getToggle( 'ccmeonemails' )
+                               )
+                       );
                }
+               # </FIXME>
 
-               # Fields for changing 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(
+                       Xml::closeElement( 'table' ) .
+                       Xml::closeElement( 'fieldset' )
+               );
 
-       
-               # Quickbar setting
+
+               # 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( wfHidden( 'wpQuickbar', $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" );
-               # Only show members of $wgValidSkinNames rather than
+               $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
+               $mptitle = Title::newMainPage();
+               $previewtext = wfMsg('skinpreview');
+               # Only show members of Skin::getSkinNames() 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 = ''; 
+               $validSkinNames = Skin::getSkinNames();
+               # Sort by UI skin name. First though need to update validSkinNames as sometimes
+               # the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
+               foreach ($validSkinNames as $skinkey => & $skinname ) {
+                       if ( isset( $skinNames[$skinkey] ) )  {
+                               $skinname = $skinNames[$skinkey];
                        }
-                       if ( isset( $skinNames[$skinkey] ) ) {
-                               $sn = $skinNames[$skinkey];
-                       } else {
-                               $sn = $skinname;
+               }
+               asort($validSkinNames);
+               foreach ($validSkinNames as $skinkey => $sn ) {
+                       if ( in_array( $skinkey, $wgSkipSkins ) ) {
+                               continue;
                        }
-                       $wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\"
-       value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
+                       $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
+
+                       $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
+                       $previewlink = "<a target='_blank' href=\"$mplink\">$previewtext</a>";
+                       if( $skinkey == $wgDefaultSkin )
+                               $sn .= ' (' . wfMsg( 'default' ) . ')';
+                       $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<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);
+                               $wgOut->addHTML(
+                                       Xml::openElement( 'div' ) .
+                                       Xml::radioLabel( wfMsg( $v ), 'wpMath', $k, "mw-sp-math-$k", $checked ) .
+                                       Xml::closeElement( 'div' ) . "\n"
+                               );
+                       }
+                       $wgOut->addHTML( "</fieldset>\n\n" );
+               }
+
+               # Files
+               #
+               $wgOut->addHTML(
+                       "<fieldset>\n" . Xml::element( 'legend', null, wfMsg( 'files' ) ) . "\n"
+               );
+
+               $imageLimitOptions = null;
+               foreach ( $wgImageLimits as $index => $limits ) {
+                       $selected = ($index == $this->mImageSize);
+                       $imageLimitOptions .= Xml::option( "{$limits[0]}×{$limits[1]}" .
+                               wfMsg('unit-pixel'), $index, $selected );
                }
+
+               $imageSizeId = 'wpImageSize';
+               $wgOut->addHTML(
+                       "<div>" . Xml::label( wfMsg('imagemaxsize'), $imageSizeId ) . " " .
+                       Xml::openElement( 'select', array( 'name' => $imageSizeId, 'id' => $imageSizeId ) ) .
+                               $imageLimitOptions .
+                       Xml::closeElement( 'select' ) . "</div>\n"
+               );
+
+               $imageThumbOptions = null;
+               foreach ( $wgThumbLimits as $index => $size ) {
+                       $selected = ($index == $this->mThumbSize);
+                       $imageThumbOptions .= Xml::option($size . wfMsg('unit-pixel'), $index,
+                               $selected);
+               }
+
+               $thumbSizeId = 'wpThumbSize';
+               $wgOut->addHTML(
+                       "<div>" . Xml::label( wfMsg('thumbsize'), $thumbSizeId ) . " " .
+                       Xml::openElement( 'select', array( 'name' => $thumbSizeId, 'id' => $thumbSizeId ) ) .
+                               $imageThumbOptions .
+                       Xml::closeElement( 'select' ) . "</div>\n"
+               );
+
                $wgOut->addHTML( "</fieldset>\n\n" );
-               
+
                # Date format
                #
-               if ( $wgUseDynamicDates ) {
-                       $wgOut->addHTML( "<fieldset>\n<legend>$dateFormat</legend>\n" );
-                       for ( $i = 0; $i < count( $dateopts ); ++$i) {
-                               if ( $i == $this->mDate ) {
-                                       $checked = ' checked="checked"';
+               # Date/Time
+               #
+
+               $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'datetime' ) . "</legend>\n" );
+
+               if ($dateopts) {
+                       $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'dateformat' ) . "</legend>\n" );
+                       $idCnt = 0;
+                       $epoch = '20010115161234'; # Wikipedia day
+                       foreach( $dateopts as $key ) {
+                               if( $key == 'default' ) {
+                                       $formatted = wfMsgHtml( 'datedefault' );
                                } else {
-                                       $checked = "";
+                                       $formatted = htmlspecialchars( $wgLang->timeanddate( $epoch, false, $key ) );
                                }
-                               $wgOut->addHTML( "<div><label><input type='radio' name=\"wpDate\" ".
-                                       "value=\"$i\"$checked /> {$dateopts[$i]}</label></div>\n" );
+                               ($key == $this->mDate) ? $checked = ' checked="checked"' : $checked = '';
+                               $wgOut->addHTML( "<div><input type='radio' name=\"wpDate\" id=\"wpDate$idCnt\" ".
+                                       "value=\"$key\"$checked /> <label for=\"wpDate$idCnt\">$formatted</label></div>\n" );
+                               $idCnt++;
                        }
-                       $wgOut->addHTML( "</fieldset>\n\n");
+                       $wgOut->addHTML( "</fieldset>\n);
                }
-               
-               # Textbox rows, cols
-               #
+
                $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=\"{$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(
+                               '<label for="wpHourDiff">' . wfMsg( 'timezoneoffset' ) . '</label>',
+                               "<input type='text' name='wpHourDiff' id='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>
+               </fieldset>\n\n" );
+
+               # Editing
+               #
+               global $wgLivePreview;
+               $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'textboxsize' ) . '</legend>
+                       <div>' .
+                               wfInputLabel( wfMsg( 'rows' ), 'wpRows', 'wpRows', 3, $this->mRows ) .
+                               ' ' .
+                               wfInputLabel( wfMsg( 'columns' ), 'wpCols', 'wpCols', 3, $this->mCols ) .
+                       "</div>" .
+                       $this->getToggles( array(
+                               'editsection',
+                               'editsectiononrightclick',
+                               'editondblclick',
+                               'editwidth',
+                               'showtoolbar',
+                               'previewonfirst',
+                               'previewontop',
+                               'minordefault',
+                               'externaleditor',
+                               'externaldiff',
+                               $wgLivePreview ? 'uselivepreview' : false,
+                               'forceeditsummary',
+                       ) ) . '</fieldset>'
+               );
+
+               # Recent changes
+               $wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' );
                
-               $imageLimitOptions='';
-               foreach ( $wgImageLimits as $index => $limits ) {
-                       $selected = ($index == $this->mImageSize) ? ' selected ': '';
-                       $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+               $rc  = '<table><tr>';
+               $rc .= '<td>' . Xml::label( wfMsg( 'recentchangesdays' ), 'wpRecentDays' ) . '</td>';
+               $rc .= '<td>' . Xml::input( 'wpRecentDays', 3, $this->mRecentDays, array( 'id' => 'wpRecentDays' ) ) . '</td>';         
+               $rc .= '</tr><tr>';
+               $rc .= '<td>' . Xml::label( wfMsg( 'recentchangescount' ), 'wpRecent' ) . '</td>';
+               $rc .= '<td>' . Xml::input( 'wpRecent', 3, $this->mRecent, array( 'id' => 'wpRecent' ) ) . '</td>';
+               $rc .= '</tr></table>';
+               $wgOut->addHtml( $rc );
+               
+               $wgOut->addHtml( '<br />' );
+               
+               $toggles[] = 'hideminor';
+               if( $wgRCShowWatchingUsers )
+                       $toggles[] = 'shownumberswatching';
+               $toggles[] = 'usenewrc';
+               $wgOut->addHtml( $this->getToggles( $toggles ) );
+
+               $wgOut->addHtml( '</fieldset>' );
+
+               # Watchlist
+               $wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-watchlist' ) . '</legend>' );
+               
+               $wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-days' ), 'wpWatchlistDays', 'wpWatchlistDays', 3, $this->mWatchlistDays ) );
+               $wgOut->addHtml( '<br /><br />' );
+
+               $wgOut->addHtml( $this->getToggle( 'extendwatchlist' ) );
+               $wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) );
+               $wgOut->addHtml( '<br /><br />' );
+
+               $wgOut->addHtml( $this->getToggles( array( 'watchlisthideown', 'watchlisthidebots', 'watchlisthideminor' ) ) );
+               
+               if( $wgUser->isAllowed( 'createpage' ) || $wgUser->isAllowed( 'createtalk' ) )
+                       $wgOut->addHtml( $this->getToggle( 'watchcreations' ) );
+               foreach( array( 'edit' => 'watchdefault', 'move' => 'watchmoves', 'delete' => 'watchdeletion' ) as $action => $toggle ) {
+                       if( $wgUser->isAllowed( $action ) )
+                               $wgOut->addHtml( $this->getToggle( $toggle ) );
                }
-               $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
+               $this->mUsedToggles['watchcreations'] = true;
+               $this->mUsedToggles['watchdefault'] = true;
+               $this->mUsedToggles['watchmoves'] = true;
+               $this->mUsedToggles['watchdeletion'] = true;
+               
+               $wgOut->addHtml( '</fieldset>' );
 
-       </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>
-               " );
-       
-               # Various checkbox options
+               # Search
+               $ajaxsearch = $wgAjaxSearch ?
+                       $this->addRow(
+                               wfLabel( wfMsg( 'useajaxsearch' ), 'wpUseAjaxSearch' ),
+                               wfCheck( 'wpUseAjaxSearch', $this->mUseAjaxSearch, array( 'id' => 'wpUseAjaxSearch' ) )
+                       ) : '';
+               $wgOut->addHTML( '<fieldset><legend>' . wfMsg( 'searchresultshead' ) . '</legend><table>' .
+                       $ajaxsearch .
+                       $this->addRow(
+                               wfLabel( wfMsg( 'resultsperpage' ), 'wpSearch' ),
+                               wfInput( 'wpSearch', 4, $this->mSearch, array( 'id' => 'wpSearch' ) )
+                       ) .
+                       $this->addRow(
+                               wfLabel( wfMsg( 'contextlines' ), 'wpSearchLines' ),
+                               wfInput( 'wpSearchLines', 4, $this->mSearchLines, array( 'id' => 'wpSearchLines' ) )
+                       ) .
+                       $this->addRow(
+                               wfLabel( wfMsg( 'contextchars' ), 'wpSearchChars' ),
+                               wfInput( 'wpSearchChars', 4, $this->mSearchChars, array( 'id' => 'wpSearchChars' ) )
+                       ) .
+               "</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>');
+               $wgOut->addHtml( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
+               $wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
+               $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'><p><label for='wpOpunderline'>$msgUnderline</label>
+<select name='wpOpunderline' id='wpOpunderline'>
+<option value=\"0\"$s0>$msgUnderlinenever</option>
+<option value=\"1\"$s1>$msgUnderlinealways</option>
+<option value=\"2\"$s2>$msgUnderlinedefault</option>
+</select></p></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>' );
+
+               wfRunHooks( 'RenderPreferencesForm', array( $this, $wgOut ) );
 
+               $token = htmlspecialchars( $wgUser->editToken() );
+               $skin = $wgUser->getSkin();
                $wgOut->addHTML( "
        <div id='prefsubmit'>
        <div>
-               <input type='submit' name=\"wpSaveprefs\" value=\"$svp\" accesskey=\"".
-               wfMsg('accesskey-save')."\" title=\"[alt-".wfMsg('accesskey-save')."]\" />
-               <input type='submit' name=\"wpReset\" value=\"$rsp\" />
+               <input type='submit' name='wpSaveprefs' class='btnSavePrefs' value=\"" . wfMsgHtml( 'saveprefs' ) . '"'.$skin->tooltipAndAccesskey('save')." />
+               <input type='submit' name='wpReset' value=\"" . wfMsgHtml( 'resetprefs' ) . "\" />
        </div>
-       
+
        </div>
-       
-       </form>\n" );
+
+       <input type='hidden' name='wpEditToken' value=\"{$token}\" />
+       </div></form>\n" );
+
+               $wgOut->addHtml( Xml::tags( 'div', array( 'class' => "prefcache" ),
+                       wfMsgExt( 'clearyourcache', 'parseinline' ) )
+               );
+
        }
 }
-?>
+