* Moving hardcoded styles into CSS.

[lhc/web/wiklou.git] / includes / SpecialPreferences.php

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 0c1fd47..b4e91e4 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -56,13 +56,14 @@ class PreferencesForm {
                $this->mEmailFlag = $request->getCheck( 'wpEmailFlag' ) ? 1 : 0;
                $this->mNick = $request->getVal( 'wpNick' );
                $this->mUserLanguage = $request->getVal( 'wpUserLanguage' );
-        $this->mUserVariant = $request->getVal( 'wpUserVariant' );
+               $this->mUserVariant = $request->getVal( 'wpUserVariant' );
                $this->mSearch = $request->getVal( 'wpSearch' );
                $this->mRecent = $request->getVal( 'wpRecent' );
                $this->mHourDiff = $request->getVal( 'wpHourDiff' );
                $this->mSearchLines = $request->getVal( 'wpSearchLines' );
                $this->mSearchChars = $request->getVal( 'wpSearchChars' );
                $this->mImageSize = $request->getVal( 'wpImageSize' );
+               $this->mThumbSize = $request->getInt( 'wpThumbSize' );
 
                $this->mAction = $request->getVal( 'action' );
                $this->mReset = $request->getCheck( 'wpReset' );
@@ -203,7 +204,7 @@ class PreferencesForm {
                }
                $wgUser->setRealName( $this->mRealName );
                $wgUser->setOption( 'language', $this->mUserLanguage );
-        $wgUser->setOption( 'variant', $this->mUserVariant );
+               $wgUser->setOption( 'variant', $this->mUserVariant );
                $wgUser->setOption( 'nickname', $this->mNick );
                $wgUser->setOption( 'quickbar', $this->mQuickbar );
                $wgUser->setOption( 'skin', $this->mSkin );
@@ -218,6 +219,7 @@ class PreferencesForm {
                $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 );
 
                # Set search namespace options
                foreach( $this->mSearchNs as $i => $value ) {
@@ -247,7 +249,7 @@ class PreferencesForm {
                                }
                                $wgUser->mEmail = $newadr; # new behaviour: set this new emailaddr from login-page into user database record
                                $wgUser->mEmailAuthenticationtimestamp = 0; # but flag as "dirty" = unauthenticated
-               $wgUser->saveSettings();
+                               $wgUser->saveSettings();
                                if ($wgEmailAuthentication) {
                                        # mail a temporary password to the dirty address
                                        # on "save options", this user will be logged-out automatically
@@ -287,7 +289,7 @@ class PreferencesForm {
                        global $wgContLanguageCode;
                        $this->mUserLanguage = $wgContLanguageCode;
                }
-        $this->mUserVariant = $wgUser->getOption( 'variant');
+               $this->mUserVariant = $wgUser->getOption( 'variant');
                if ( 1 == $wgUser->getOption( 'disablemail' ) ) { $this->mEmailFlag = 1; }
                else { $this->mEmailFlag = 0; }
                $this->mNick = $wgUser->getOption( 'nickname' );
@@ -304,6 +306,7 @@ 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' );
 
                $togs = $wgLang->getUserToggles();
@@ -375,7 +378,7 @@ class PreferencesForm {
         */
        function mainPrefsForm( $err ) {
                global $wgUser, $wgOut, $wgLang, $wgContLang, $wgValidSkinNames;
-               global $wgAllowRealName, $wgImageLimits;
+               global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
                global $wgLanguageNames, $wgDisableLangConversion;
                global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForUserTalkPages,$wgEmailNotificationForMinorEdits;
                global $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
@@ -408,6 +411,7 @@ class PreferencesForm {
                $cp = wfMsg( 'changepassword' );
                $sk = wfMsg( 'skin' );
                $math = wfMsg( 'math' );
+               $files = wfMsg( 'files' );
                $dateFormat = wfMsg('dateformat');
                $opw = wfMsg( 'oldpassword' );
                $npw = wfMsg( 'newpassword' );
@@ -607,7 +611,28 @@ class PreferencesForm {
        value=\"$i\"$checked /> ".wfMsg($mathopts[$i])."</label></div>\n" );
                }
                $wgOut->addHTML( "</fieldset>\n\n" );
-               
+
+               # Files
+               #
+               $wgOut->addHTML("<fieldset>
+                       <legend>$files</legend>
+                       <div><label>" . wfMsg('imagemaxsize') . "<select name=\"wpImageSize\">");
+                       
+                       $imageLimitOptions = null;
+                       foreach ( $wgImageLimits as $index => $limits ) {
+                               $selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
+                               $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+                       }
+                       
+                       $imageThumbOptions = null;
+                       $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>
+                               <div><label>" . wfMsg('thumbsize') . "<select name=\"wpThumbSize\">");
+                       foreach ( $wgThumbLimits as $index => $size ) {
+                               $selected = ($index == $this->mThumbSize) ? 'selected="selected"' : '';
+                               $imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}px</option>\n";
+                       }
+                       $wgOut->addHTML( "{$imageThumbOptions}</select></label></div></fieldset>\n\n");
+
                 # Date format
                 #
                if ($dateopts) {
@@ -643,6 +668,9 @@ class PreferencesForm {
                        <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( "editsection" ) .
+               $this->getToggle( "editsectiononrightclick" ) .
+               $this->getToggle( "editondblclick" ) .
                $this->getToggle( "editwidth" ) .
                $this->getToggle( "showtoolbar" ) .
                $this->getToggle( "previewonfirst" ) .
@@ -650,6 +678,7 @@ class PreferencesForm {
                $this->getToggle( "watchdefault" ) .
                $this->getToggle( "minordefault" ) . 
                $this->getToggle( "externaleditor" ) .
+               $this->getToggle( "externaldiff" ) .
                "
        </fieldset>");
        
@@ -659,7 +688,9 @@ class PreferencesForm {
        <fieldset><legend>".wfMsg('prefs-rc')."</legend>
                <div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>" .
                $this->getToggle( "hideminor" ) . $shownumberswatching .
-               $this->getToggle( "usenewrc" ) . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
+               $this->getToggle( "usenewrc" ) . 
+               $this->getToggle( "rcusemodstyle" ) .
+               $this->getToggle('showupdated', wfMsg('updatedmarker')) .
                "<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
        </fieldset>
        
@@ -680,16 +711,6 @@ class PreferencesForm {
                #
                $wgOut->addHTML("<fieldset><legend>".wfMsg('prefs-misc')."</legend>");
 
-               $wgOut->addHTML( '<div><label>' . wfMsg('imagemaxsize') . "<select name=\"wpImageSize\">");
-
-               $imageLimitOptions='';
-               foreach ( $wgImageLimits as $index => $limits ) {
-                       $selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
-                       $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
-               }
-               $wgOut->addHTML( "{$imageLimitOptions}</select></label></div>" );
-
-
                foreach ( $togs as $tname ) {
                        if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
                                $wgOut->addHTML( $this->getToggle( $tname ) );