new wfMsg* functions to use the wgContLang object for translating content related...
[lhc/web/wiklou.git] / includes / SpecialPreferences.php
index 11696a0..976bbd2 100644 (file)
@@ -1,20 +1,42 @@
 <?php
-function wfSpecialPreferences()
-{
+/**
+ * Hold things related to displaying and saving user preferences.
+ * @package MediaWiki
+ * @subpackage 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
+ */
+function wfSpecialPreferences() {
        global $wgRequest;
 
        $form = new PreferencesForm( $wgRequest );
        $form->execute();
 }
 
+/**
+ * Preferences form handling
+ * This object will show the preferences form and can save it as well.
+ * @package MediaWiki
+ * @subpackage 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;
+       var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName, $mImageSize;
 
+       /**
+        * Constructor
+        * Load some values
+        */
        function PreferencesForm( &$request ) { 
-               global $wgLang;
+               global $wgLang, $wgAllowRealName;
                
                $this->mQuickbar = $request->getVal( 'wpQuickbar' );
                $this->mOldpass = $request->getVal( 'wpOldpass' );
@@ -27,14 +49,18 @@ class PreferencesForm {
                $this->mMath = $request->getVal( 'wpMath' );
                $this->mDate = $request->getVal( 'wpDate' );
                $this->mUserEmail = $request->getVal( 'wpUserEmail' );
-               $this->mRealName = $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->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->mAction = $request->getVal( 'action' );
                $this->mReset = $request->getCheck( 'wpReset' );
                $this->mPosted = $request->wasPosted();
@@ -44,7 +70,7 @@ class PreferencesForm {
                $this->mToggles = array();
                if ( $this->mPosted ) {
                        $togs = $wgLang->getUserToggles();
-                       foreach ( $togs as $tname => $ttext ) {
+                       foreach ( $togs as $tname ) {
                                $this->mToggles[$tname] = $request->getCheck( "wpOp$tname" ) ? 1 : 0;
                        }
                }
@@ -68,7 +94,7 @@ class PreferencesForm {
                global $wgUser, $wgOut, $wgUseDynamicDates;
                
                if ( 0 == $wgUser->getID() ) {
-                       $wgOut->errorpage( "prefsnologin", "prefsnologintext" );
+                       $wgOut->errorpage( 'prefsnologin', 'prefsnologintext' );
                        return;
                }
                if ( wfReadOnly() ) {
@@ -77,38 +103,45 @@ class PreferencesForm {
                }
                if ( $this->mReset ) {
                        $this->resetPrefs();
-                       $this->mainPrefsForm( wfMsg( "prefsreset" ) );
+                       $this->mainPrefsForm( wfMsg( 'prefsreset' ) );
                } else if ( $this->mSaveprefs ) {
                        $this->savePreferences();
                } else {
                        $this->resetPrefs();
-                       $this->mainPrefsForm( "" );
+                       $this->mainPrefsForm( '' );
                }
        }
 
-       /* private */ function validateInt( &$val, $min=0, $max=0x7fffffff ) {
+       /**
+        * @access private
+        */
+       function validateInt( &$val, $min=0, $max=0x7fffffff ) {
                $val = intval($val);
                $val = min($val, $max);
                $val = max($val, $min);
                return $val;
        }
 
-       /* private */ function validateIntOrNull( &$val, $min=0, $max=0x7fffffff ) {
+       /**
+        * @access private
+        */
+       function validateIntOrNull( &$val, $min=0, $max=0x7fffffff ) {
                $val = trim($val);
-               if($val === "") {
+               if($val === '') {
                        return $val;
                } else {
                        return $this->validateInt( $val, $min, $max );
                }
        }
 
-       /* private */ function validateTimeZone( $s )
-       {
-               
-               if ( $s !== "" ) {
-                       if ( strpos( $s, ":" ) ) {
+       /**
+        * @access private
+        */
+       function validateTimeZone( $s ) {
+               if ( $s !== '' ) {
+                       if ( strpos( $s, ':' ) ) {
                                # HH:MM
-                               $array = explode( ":" , $s );
+                               $array = explode( ':' , $s );
                                $hour = intval( $array[0] );
                                $minute = intval( $array[1] );
                        } else {
@@ -125,46 +158,49 @@ class PreferencesForm {
                return $s;
        }
 
-       /* private */ function savePreferences()
-       {
+       /**
+        * @access private
+        */
+       function savePreferences() {
                global $wgUser, $wgLang, $wgDeferredUpdateList, $wgOut;
 
-               if ( "" != $this->mNewpass ) {
+               if ( '' != $this->mNewpass ) {
                        if ( $this->mNewpass != $this->mRetypePass ) {
-                               $this->mainPrefsForm( wfMsg( "badretype" ) );                   
+                               $this->mainPrefsForm( wfMsg( 'badretype' ) );                   
                                return;
                        }
-                       $ep = $wgUser->encryptPassword( $this->mOldpass );
-                       if ( $ep != $wgUser->getPassword() ) {
-                               if ( $ep != $wgUser->getNewpassword() ) {
-                                       $this->mainPrefsForm( wfMsg( "wrongpassword" ) );
-                                       return;
-                               }
+
+                       if (!$wgUser->checkPassword( $this->mOldpass )) {
+                               $this->mainPrefsForm( wfMsg( 'wrongpassword' ) );
+                               return;
                        }
                        $wgUser->setPassword( $this->mNewpass );
                }
                $wgUser->setEmail( $this->mUserEmail );
                $wgUser->setRealName( $this->mRealName );
-               $wgUser->setOption( "nickname", $this->mNick );
-               $wgUser->setOption( "quickbar", $this->mQuickbar );
-               $wgUser->setOption( "skin", $this->mSkin );
-               $wgUser->setOption( "math", $this->mMath );
-               $wgUser->setOption( "date", $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( "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( 'language', $this->mUserLanguage );
+        $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 );
+               $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( '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 );
 
                # Set search namespace options
                foreach( $this->mSearchNs as $i => $value ) {
                        $wgUser->setOption( "searchNs{$i}", $value );
                }
                
-               $wgUser->setOption( "disablemail", $this->mEmailFlag );
+               $wgUser->setOption( 'disablemail', $this->mEmailFlag );
 
                # Set user toggles
                foreach ( $this->mToggles as $tname => $tvalue ) {
@@ -175,68 +211,76 @@ class PreferencesForm {
                array_push( $wgDeferredUpdateList, $up );
                $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
                $po = ParserOptions::newFromUser( $wgUser );
-               $this->mainPrefsForm( wfMsg( "savedprefs" ) );
+               $this->mainPrefsForm( wfMsg( 'savedprefs' ) );
        }
 
-       /* private */ function resetPrefs()
-       {
-               global $wgUser, $wgLang;
+       /**
+        * @access private
+        */
+       function resetPrefs() {
+               global $wgUser, $wgLang, $wgAllowRealName;
 
-               $this->mOldpass = $this->mNewpass = $this->mRetypePass = "";
+               $this->mOldpass = $this->mNewpass = $this->mRetypePass = '';
                $this->mUserEmail = $wgUser->getEmail();
-               $this->mRealName = $wgUser->getRealName();
-               if ( 1 == $wgUser->getOption( "disablemail" ) ) { $this->mEmailFlag = 1; }
+               $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->mNick = $wgUser->getOption( "nickname" );
-
-               $this->mQuickbar = $wgUser->getOption( "quickbar" );
-               $this->mSkin = $wgUser->getOption( "skin" );
-               $this->mMath = $wgUser->getOption( "math" );
-               $this->mDate = $wgUser->getOption( "date" );
-               $this->mRows = $wgUser->getOption( "rows" );
-               $this->mCols = $wgUser->getOption( "cols" );
-               $this->mStubs = $wgUser->getOption( "stubthreshold" );
-               $this->mHourDiff = $wgUser->getOption( "timecorrection" );
-               $this->mSearch = $wgUser->getOption( "searchlimit" );
-               $this->mSearchLines = $wgUser->getOption( "contextlines" );
-               $this->mSearchChars = $wgUser->getOption( "contextchars" );
-               $this->mRecent = $wgUser->getOption( "rclimit" );
+               $this->mNick = $wgUser->getOption( 'nickname' );
+
+               $this->mQuickbar = $wgUser->getOption( 'quickbar' );
+               $this->mSkin = $wgUser->getOption( 'skin' );
+               $this->mMath = $wgUser->getOption( 'math' );
+               $this->mDate = $wgUser->getOption( 'date' );
+               $this->mRows = $wgUser->getOption( 'rows' );
+               $this->mCols = $wgUser->getOption( 'cols' );
+               $this->mStubs = $wgUser->getOption( 'stubthreshold' );
+               $this->mHourDiff = $wgUser->getOption( 'timecorrection' );
+               $this->mSearch = $wgUser->getOption( 'searchlimit' );
+               $this->mSearchLines = $wgUser->getOption( 'contextlines' );
+               $this->mSearchChars = $wgUser->getOption( 'contextchars' );
+               $this->mImageSize = $wgUser->getOption( 'imagesize' );
+               $this->mRecent = $wgUser->getOption( 'rclimit' );
 
                $togs = $wgLang->getUserToggles();
-               foreach ( $togs as $tname => $ttext ) {
+               foreach ( $togs as $tname ) {
+                       $ttext = wfMsg('tog-'.$tname);
                        $this->mToggles[$tname] = $wgUser->getOption( $tname );
                }
 
                $namespaces = $wgLang->getNamespaces();
                foreach ( $namespaces as $i => $namespace ) {
                        if ( $i >= 0 ) {
-                               $this->mSearchNs[$i] = $wgUser->getOption( "searchNs$i" );
+                               $this->mSearchNs[$i] = $wgUser->getOption( 'searchNs'.$i );
                        }
                }
        }
 
-       /* private */ function namespacesCheckboxes()
-       {
+       /**
+        * @access private
+        */
+       function namespacesCheckboxes() {
                global $wgLang, $wgUser;
                
                # Determine namespace checkboxes
                $namespaces = $wgLang->getNamespaces();
-               $r1 = "";
+               $r1 = '';
 
                foreach ( $namespaces as $i => $name ) {
                        # Skip special or anything similar
                        if ( $i >= 0 ) {
-                               $checked = "";
+                               $checked = '';
                                if ( $this->mSearchNs[$i] ) {
                                        $checked = ' checked="checked"';
                                }
-                               $name = str_replace( "_", " ", $namespaces[$i] );
-                               if ( "" == $name ) { 
-                                       $name = wfMsg( "blanknamespace" ); 
+                               $name = str_replace( '_', ' ', $namespaces[$i] );
+                               if ( '' == $name ) { 
+                                       $name = wfMsg( 'blanknamespace' ); 
                                }
 
                                if ( 0 != $i ) { 
-                                       $r1 .= " "
+                                       $r1 .= ' '
                                }
                                $r1 .= "<label><input type='checkbox' value=\"1\" name=\"" .
                                  "wpNs$i\"{$checked} />{$name}</label>\n";
@@ -256,27 +300,33 @@ class PreferencesForm {
                if ( 1 == $wgUser->getOption( $tname ) ) {
                        $checked = ' checked="checked"';
                } else {
-                       $checked = "";
+                       $checked = '';
                }               
                return "<div><input type='checkbox' value=\"1\" "
                  . "id=\"$tname\" name=\"wpOp$tname\"$checked /><label for=\"$tname\">$ttext</label></div>\n";
        }
 
-       /* private */ function mainPrefsForm( $err )
-       {
+       /**
+        * @access private
+        */
+       function mainPrefsForm( $err ) {
                global $wgUser, $wgOut, $wgLang, $wgUseDynamicDates, $wgValidSkinNames;
+               global $wgAllowRealName, $wgImageLimits;
+        
+           global $wgLanguageNames;
 
-               $wgOut->setPageTitle( wfMsg( "preferences" ) );
+               $wgOut->setPageTitle( wfMsg( 'preferences' ) );
                $wgOut->setArticleRelated( false );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-               if ( "" != $err ) {
+               if ( '' != $err ) {
                        $wgOut->addHTML( "<p class='error'>" . htmlspecialchars( $err ) . "</p>\n" );
                }
                $uname = $wgUser->getName();
                $uid = $wgUser->getID();
 
-               $wgOut->addWikiText( wfMsg( "prefslogintext", $uname, $uid ) );
+               $wgOut->addWikiText( wfMsg( 'prefslogintext', $uname, $uid ) );
+               $wgOut->addWikiText( wfMsg('clearyourcache'));
 
                $qbs = $wgLang->getQuickbarSettings();
                $skinNames = $wgLang->getSkinNames();
@@ -284,38 +334,41 @@ class PreferencesForm {
                $dateopts = $wgLang->getDateFormats();
                $togs = $wgLang->getUserToggles();
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, "Preferences" );
+               $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" );
-               $tzt = wfMsg( "timezonetext" );
-               $tzo = wfMsg( "timezoneoffset" );
-               $tzGuess = wfMsg( "guesstimezone" );
-               $tzServerTime = wfMsg( "servertime" );
-               $yem = wfMsg( "youremail" );
-               $yrn = wfMsg( "yourrealname" );
-               $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" );
+               $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\">" );
@@ -323,26 +376,59 @@ class PreferencesForm {
                # First section: identity
                # Email, etc.
                #
-               $this->mUserEmail = wfEscapeHTML( $this->mUserEmail );
-               $this->mRealName = wfEscapeHTML( $this->mRealName );
-               $this->mNick = wfEscapeHTML( $this->mNick );
+               $this->mUserEmail = htmlspecialchars( $this->mUserEmail );
+               $this->mRealName = htmlspecialchars( $this->mRealName );
+               $this->mNick = htmlspecialchars( $this->mNick );
                if ( $this->mEmailFlag ) { $emfc = 'checked="checked"'; }
-               else { $emfc = ""; }
+               else { $emfc = ''; }
 
                $ps = $this->namespacesCheckboxes();
 
                $wgOut->addHTML( "<fieldset>
-               <legend>".wfMsg('prefs-personal')."</legend>
-               <div><label>$yrn: <input type='text' name=\"wpRealName\" value=\"{$this->mRealName}\" size='20' /></label></div>
+               <legend>".wfMsg('prefs-personal')."</legend>");
+               if ($wgAllowRealName) {
+                   $wgOut->addHTML("<div><label>$yrn: <input type='text' name=\"wpRealName\" value=\"{$this->mRealName}\" size='20' /></label></div>");
+               }
+               $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>\n" );
-       
+               <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) {
+            $sel = ($code == $this->mUserLanguage)? "selected" : "";
+            $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+        }
+        $wgOut->addHtml("</label></div>\n" );
+
+        /* see if there are multiple language variants to choose from*/
+        $variants = $wgLang->getVariants();
+        $size=sizeof($variants);
+
+        $variantArray=array();
+        foreach($variants as $v) {
+            $v = str_replace( '_', '-', strtolower($v));
+            if($name=$wgLanguageNames[$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" : "";
+              $wgOut->addHtml("\t<option value=\"$code\" $sel>$code - $name</option>\n");
+            }
+            $wgOut->addHtml("</label></div>\n");
+        }
+
                # Fields for changing password
                #
-               $this->mOldpass = wfEscapeHTML( $this->mOldpass );
-               $this->mNewpass = wfEscapeHTML( $this->mNewpass );
-               $this->mRetypePass = wfEscapeHTML( $this->mRetypePass );
+               $this->mOldpass = htmlspecialchars( $this->mOldpass );
+               $this->mNewpass = htmlspecialchars( $this->mNewpass );
+               $this->mRetypePass = htmlspecialchars( $this->mRetypePass );
 
                $wgOut->addHTML( "<fieldset>
        <legend>$cp</legend>
@@ -363,6 +449,7 @@ class PreferencesForm {
                        $wgOut->addHTML( "<div><label><input type='radio' name=\"wpQuickbar\"
        value=\"$i\"$checked /> {$qbs[$i]}</label></div>\n" );
                }
+               $wgOut->addHtml('<div class="prefsectiontip">'.wfMsg('qbsettingsnote').'</div>');
                $wgOut->addHtml( "</fieldset>\n\n" );
 
                # Skin setting
@@ -374,10 +461,15 @@ class PreferencesForm {
                        if ( $skinkey == $this->mSkin ) { 
                                $checked = ' checked="checked"'; 
                        } else { 
-                               $checked = ""; 
+                               $checked = ''; 
+                       }
+                       if ( isset( $skinNames[$skinkey] ) ) {
+                               $sn = $skinNames[$skinkey];
+                       } else {
+                               $sn = $skinname;
                        }
                        $wgOut->addHTML( "<div><label><input type='radio' name=\"wpSkin\"
-       value=\"$skinkey\"$checked /> {$skinNames[$skinkey]}</label></div>\n" );
+       value=\"$skinkey\"$checked /> {$sn}</label></div>\n" );
                }
                $wgOut->addHTML( "</fieldset>\n\n" );
 
@@ -388,7 +480,7 @@ class PreferencesForm {
                        if ( $i == $this->mMath ) { $checked = ' checked="checked"'; }
                        else { $checked = ""; }
                        $wgOut->addHTML( "<div><label><input type='radio' name=\"wpMath\"
-       value=\"$i\"$checked /> {$mathopts[$i]}</label></div>\n" );
+       value=\"$i\"$checked /> ".wfMsg($mathopts[$i])."</label></div>\n" );
                }
                $wgOut->addHTML( "</fieldset>\n\n" );
                
@@ -420,13 +512,14 @@ class PreferencesForm {
                </div> " .
                $this->getToggle( "editwidth" ) .
                $this->getToggle( "showtoolbar" ) .
+               $this->getToggle( "previewonfirst" ) .
                $this->getToggle( "previewontop" ) .
                $this->getToggle( "watchdefault" ) .
                $this->getToggle( "minordefault" ) . "
        </fieldset>
        
        <fieldset>
-               <legend>$dateFormat</legend>
+               <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>
@@ -440,6 +533,15 @@ class PreferencesForm {
                " . $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\">");
+               
+               $imageLimitOptions='';
+               foreach ( $wgImageLimits as $index => $limits ) {
+                       $selected = ($index == $this->mImageSize) ? ' selected ': '';
+                       $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+               }
+               $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
+
        </fieldset>
        
        <fieldset>
@@ -458,7 +560,7 @@ class PreferencesForm {
                # Various checkbox options
                #
                $wgOut->addHTML("<fieldset><legend>".wfMsg('prefs-misc')."</legend>");
-               foreach ( $togs as $tname => $ttext ) {
+               foreach ( $togs as $tname ) {
                        if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
                                $wgOut->addHTML( $this->getToggle( $tname ) );
                        }