New global config setting $wgMaxTocLevel: Maximum indent level of toc.

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

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index ea495dc..ceaf1d7 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -1,5 +1,4 @@
 <?php
-
 function wfSpecialPreferences()
 {
        global $wgRequest;
@@ -15,21 +14,20 @@ class PreferencesForm {
        var $mReset, $mPosted, $mToggles, $mSearchNs, $mRealName;
 
        function PreferencesForm( &$request ) { 
-               global $wgLang;
+               global $wgLang, $wgAllowRealName;
                
                $this->mQuickbar = $request->getVal( 'wpQuickbar' );
                $this->mOldpass = $request->getVal( 'wpOldpass' );
                $this->mNewpass = $request->getVal( 'wpNewpass' );
                $this->mRetypePass =$request->getVal( 'wpRetypePass' );
                $this->mStubs = $request->getVal( 'wpStubs' );
-               $this->mCollapse = $request->getVal( 'wpCollapse' );
                $this->mRows = $request->getVal( 'wpRows' );
                $this->mCols = $request->getVal( 'wpCols' );
                $this->mSkin = $request->getVal( 'wpSkin' );
                $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->mSearch = $request->getVal( 'wpSearch' );
@@ -159,7 +157,6 @@ class PreferencesForm {
                $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( "collapsethreshold", $this->validateIntOrNull( $this->mCollapse ) );
                $wgUser->setOption( "timecorrection", $this->validateTimeZone( $this->mHourDiff, -12, 14 ) );
 
                # Set search namespace options
@@ -183,11 +180,11 @@ class PreferencesForm {
 
        /* private */ function resetPrefs()
        {
-               global $wgUser, $wgLang;
+               global $wgUser, $wgLang, $wgAllowRealName;
 
                $this->mOldpass = $this->mNewpass = $this->mRetypePass = "";
                $this->mUserEmail = $wgUser->getEmail();
-               $this->mRealName = $wgUser->getRealName();
+               $this->mRealName = ($wgAllowRealName) ? $wgUser->getRealName() : '';
                if ( 1 == $wgUser->getOption( "disablemail" ) ) { $this->mEmailFlag = 1; }
                else { $this->mEmailFlag = 0; }
                $this->mNick = $wgUser->getOption( "nickname" );
@@ -199,7 +196,6 @@ class PreferencesForm {
                $this->mRows = $wgUser->getOption( "rows" );
                $this->mCols = $wgUser->getOption( "cols" );
                $this->mStubs = $wgUser->getOption( "stubthreshold" );
-               $this->mCollapse = $wgUser->getOption( "collapsethreshold" );
                $this->mHourDiff = $wgUser->getOption( "timecorrection" );
                $this->mSearch = $wgUser->getOption( "searchlimit" );
                $this->mSearchLines = $wgUser->getOption( "contextlines" );
@@ -269,7 +265,8 @@ class PreferencesForm {
        /* private */ function mainPrefsForm( $err )
        {
                global $wgUser, $wgOut, $wgLang, $wgUseDynamicDates, $wgValidSkinNames;
-
+               global $wgAllowRealName;
+           
                $wgOut->setPageTitle( wfMsg( "preferences" ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
@@ -281,6 +278,7 @@ class PreferencesForm {
                $uid = $wgUser->getID();
 
                $wgOut->addWikiText( wfMsg( "prefslogintext", $uname, $uid ) );
+               $wgOut->addWikiText( wfMsg('clearyourcache'));
 
                $qbs = $wgLang->getQuickbarSettings();
                $skinNames = $wgLang->getSkinNames();
@@ -305,16 +303,16 @@ class PreferencesForm {
                $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 = wfMsg( "yourrealname" );
+               $yrn = ($wgAllowRealName) ? wfMsg( "yourrealname" ) : '';
                $emf = wfMsg( "emailflag" );
                $ynn = wfMsg( "yournick" );
                $stt = wfMsg ( "stubthreshold" ) ;
-               $coltr = wfMsg("collapsethreshold");
                $srh = wfMsg( "searchresultshead" );
                $rpp = wfMsg( "resultsperpage" );
                $scl = wfMsg( "contextlines" );
@@ -337,12 +335,15 @@ class PreferencesForm {
                $ps = $this->namespacesCheckboxes();
 
                $wgOut->addHTML( "<fieldset>
-               <legend>Idento</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" );
-       
+
                # Fields for changing password
                #
                $this->mOldpass = wfEscapeHTML( $this->mOldpass );
@@ -350,28 +351,30 @@ class PreferencesForm {
                $this->mRetypePass = wfEscapeHTML( $this->mRetypePass );
 
                $wgOut->addHTML( "<fieldset>
-       <legend>$cp:</legend>
+       <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>\n</fieldset>\n" );
+       </fieldset>
+       <div class='prefsectiontip'>".wfMsg('prefs-help-userdata')."</div>\n</fieldset>\n" );
 
        
                # Quickbar setting
                #
-               $wgOut->addHtml( "<fieldset>\n<legend>$qb:</legend>\n" );
+               $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" );
                }
+               $wgOut->addHtml('<div class="prefsectiontip">'.wfMsg('qbsettingsnote').'</div>');
                $wgOut->addHtml( "</fieldset>\n\n" );
 
                # Skin setting
                #
-               $wgOut->addHTML( "<fieldset>\n<legend>$sk:</legend>\n" );
+               $wgOut->addHTML( "<fieldset>\n<legend>$sk</legend>\n" );
                # Only show members of $wgValidSkinNames rather than
                # $skinNames (skins is all skin names from Language.php)
                foreach ($wgValidSkinNames as $skinkey => $skinname ) {
@@ -387,19 +390,19 @@ class PreferencesForm {
 
                # Math setting
                #
-               $wgOut->addHTML( "<fieldset>\n<legend>$math:</legend>\n" );
+               $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 /> {$mathopts[$i]}</label></div>\n" );
+       value=\"$i\"$checked /> ".wfMsg($mathopts[$i])."</label></div>\n" );
                }
                $wgOut->addHTML( "</fieldset>\n\n" );
                
                # Date format
                #
                if ( $wgUseDynamicDates ) {
-                       $wgOut->addHTML( "<fieldset>\n<legend>$dateFormat:</legend>\n" );
+                       $wgOut->addHTML( "<fieldset>\n<legend>$dateFormat</legend>\n" );
                        for ( $i = 0; $i < count( $dateopts ); ++$i) {
                                if ( $i == $this->mDate ) {
                                        $checked = ' checked="checked"';
@@ -417,7 +420,7 @@ class PreferencesForm {
                $nowlocal = $wgLang->time( $now = wfTimestampNow(), true );
                $nowserver = $wgLang->time( $now, false );
                $wgOut->addHTML( "<fieldset>
-       <legend>$tbs:</legend>\n
+       <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>
@@ -430,20 +433,20 @@ class PreferencesForm {
        </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>
-               <div><input type=\"button\" value=\"$tzGuess\" onClick=\"javascript:guessTimezone()\" /></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>
+       <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>$coltr: <input type='text' name=\"wpCollapse\" value=\"$this->mCollapse\" size='6' /></label></div>
        </fieldset>
        
        <fieldset>
@@ -461,7 +464,7 @@ class PreferencesForm {
        
                # Various checkbox options
                #
-               $wgOut->addHTML("<fieldset>");
+               $wgOut->addHTML("<fieldset><legend>".wfMsg('prefs-misc')."</legend>");
                foreach ( $togs as $tname => $ttext ) {
                        if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
                                $wgOut->addHTML( $this->getToggle( $tname ) );
@@ -470,13 +473,14 @@ class PreferencesForm {
                $wgOut->addHTML( "</fieldset>\n\n" );
 
                $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\" />
        </div>
        
-       <div>* {$tzt}</div>
+       </div>
        
        </form>\n" );
        }