X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=eb5e1f9e14aecdd84f1168776b4f29d10da1d79c;hb=480257da0d92ec759b93d14b3ea6476c47e2fc01;hp=5d5362ed436182107c5e5681f42b2aef312209d4;hpb=973094184d4bb2b70e3ed7943de1c811258e828c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Preferences.php b/includes/Preferences.php index 5d5362ed43..eb5e1f9e14 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -1,18 +1,43 @@ array( 'Preferences', 'filterTimezoneInput' ), ); - + static function getPreferences( $user ) { - if (self::$defaultPreferences) + if ( self::$defaultPreferences ) return self::$defaultPreferences; - - global $wgLang, $wgRCMaxAge; - + + global $wgRCMaxAge; + $defaultPreferences = array(); self::profilePreferences( $user, $defaultPreferences ); @@ -26,59 +51,70 @@ class Preferences { self::watchlistPreferences( $user, $defaultPreferences ); self::searchPreferences( $user, $defaultPreferences ); self::miscPreferences( $user, $defaultPreferences ); - + wfRunHooks( 'GetPreferences', array( $user, &$defaultPreferences ) ); - + + ## Remove preferences that wikis don't want to use + global $wgHiddenPrefs; + foreach ( $wgHiddenPrefs as $pref ) { + if ( isset( $defaultPreferences[$pref] ) ) { + unset( $defaultPreferences[$pref] ); + } + } + ## Prod in defaults from the user global $wgDefaultUserOptions; foreach( $defaultPreferences as $name => &$info ) { $prefFromUser = self::getOptionFromUser( $name, $info, $user ); $field = HTMLForm::loadInputFromParameters( $info ); // For validation - $globalDefault = isset($wgDefaultUserOptions[$name]) - ? $wgDefaultUserOptions[$name] + $defaultOptions = User::getDefaultOptions(); + $globalDefault = isset( $defaultOptions[$name] ) + ? $defaultOptions[$name] : null; - + // If it validates, set it as the default - if ( isset($info['default']) ) { + if ( isset( $info['default'] ) ) { // Already set, no problem continue; } elseif ( !is_null( $prefFromUser ) && // Make sure we're not just pulling nothing - $field->validate( $prefFromUser, $user->mOptions ) ) { + $field->validate( $prefFromUser, $user->mOptions ) === true ) { $info['default'] = $prefFromUser; - } elseif( $field->validate( $globalDefault, $user->mOptions ) ) { + } elseif( $field->validate( $globalDefault, $user->mOptions ) === true ) { $info['default'] = $globalDefault; + } else { + throw new MWException( "Global default '$globalDefault' is invalid for field $name" ); } } - + self::$defaultPreferences = $defaultPreferences; - + return $defaultPreferences; } - + // Pull option from a user account. Handles stuff like array-type preferences. static function getOptionFromUser( $name, $info, $user ) { $val = $user->getOption( $name ); - + // Handling for array-type preferences - if ( ( isset($info['type']) && $info['type'] == 'multiselect' ) || - ( isset($info['class']) && $info['class'] == 'HTMLMultiSelectField' ) ) { + if ( ( isset( $info['type'] ) && $info['type'] == 'multiselect' ) || + ( isset( $info['class'] ) && $info['class'] == 'HTMLMultiSelectField' ) ) { - $options = HTMLFormField::flattenOptions($info['options']); - $prefix = isset($info['prefix']) ? $info['prefix'] : $name; + $options = HTMLFormField::flattenOptions( $info['options'] ); + $prefix = isset( $info['prefix'] ) ? $info['prefix'] : $name; $val = array(); - + foreach( $options as $label => $value ) { - if ($user->getOption( "$prefix$value" ) ) { + if( $user->getOption( "$prefix$value" ) ) { $val[] = $value; } } } - + return $val; } - + static function profilePreferences( $user, &$defaultPreferences ) { - global $wgLang; + global $wgLang, $wgUser; ## User info ##################################### // Information panel $defaultPreferences['username'] = @@ -88,7 +124,7 @@ class Preferences { 'default' => $user->getName(), 'section' => 'personal/info', ); - + $defaultPreferences['userid'] = array( 'type' => 'info', @@ -96,81 +132,87 @@ class Preferences { 'default' => $user->getId(), 'section' => 'personal/info', ); - + # Get groups to which the user belongs $userEffectiveGroups = $user->getEffectiveGroups(); - $userEffectiveGroupsArray = array(); + $userGroups = $userMembers = array(); foreach( $userEffectiveGroups as $ueg ) { if( $ueg == '*' ) { // Skip the default * group, seems useless here continue; } - $userEffectiveGroupsArray[] = User::makeGroupLinkHTML( $ueg ); + $groupName = User::getGroupName( $ueg ); + $userGroups[] = User::makeGroupLinkHTML( $ueg, $groupName ); + + $memberName = User::getGroupMember( $ueg ); + $userMembers[] = User::makeGroupLinkHTML( $ueg, $memberName ); } - asort( $userEffectiveGroupsArray ); - + asort( $userGroups ); + asort( $userMembers ); + $defaultPreferences['usergroups'] = array( 'type' => 'info', 'label' => wfMsgExt( 'prefs-memberingroups', 'parseinline', - count($userEffectiveGroupsArray) ), - 'default' => $wgLang->commaList( $userEffectiveGroupsArray ), + $wgLang->formatNum( count($userGroups) ) ), + 'default' => wfMsgExt( 'prefs-memberingroups-type', array(), + $wgLang->commaList( $userGroups ), + $wgLang->commaList( $userMembers ) + ), 'raw' => true, 'section' => 'personal/info', ); - + $defaultPreferences['editcount'] = array( 'type' => 'info', 'label-message' => 'prefs-edits', - 'default' => $user->getEditCount(), + 'default' => $wgLang->formatNum( $user->getEditCount() ), 'section' => 'personal/info', ); - - if ($user->getRegistration()) { + + if( $user->getRegistration() ) { $defaultPreferences['registrationdate'] = array( 'type' => 'info', 'label-message' => 'prefs-registration', - 'default' => $wgLang->timeanddate( $user->getRegistration() ), + 'default' => wfMsgExt( 'prefs-registration-date-time', 'parsemag', + $wgLang->timeanddate( $user->getRegistration(), true ), + $wgLang->date( $user->getRegistration(), true ), + $wgLang->time( $user->getRegistration(), true ) ), 'section' => 'personal/info', ); } - + // Actually changeable stuff - global $wgAllowRealName; - if ($wgAllowRealName) { - $defaultPreferences['realname'] = - array( - 'type' => 'text', - 'default' => $user->getRealName(), - 'section' => 'personal/info', - 'label-message' => 'yourrealname', - 'help-message' => 'prefs-help-realname', - ); - } - - + global $wgAuth; + $defaultPreferences['realname'] = + array( + 'type' => $wgAuth->allowPropChange( 'realname' ) ? 'text' : 'info', + 'default' => $user->getRealName(), + 'section' => 'personal/info', + 'label-message' => 'yourrealname', + 'help-message' => 'prefs-help-realname', + ); + $defaultPreferences['gender'] = array( 'type' => 'select', 'section' => 'personal/info', 'options' => array( - wfMsg('gender-male') => 'male', - wfMsg('gender-female') => 'female', - wfMsg('gender-unknown') => 'unknown', + wfMsg( 'gender-male' ) => 'male', + wfMsg( 'gender-female' ) => 'female', + wfMsg( 'gender-unknown' ) => 'unknown', ), 'label-message' => 'yourgender', 'help-message' => 'prefs-help-gender', ); - global $wgAuth; - if ($wgAuth->allowPasswordChange()) { - global $wgUser; // For skin. - $link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'ResetPass' ), - wfMsgHtml( 'prefs-resetpass' ), array() , - array('returnto' => SpecialPage::getTitleFor( 'Preferences') ) ); - + if( $wgAuth->allowPasswordChange() ) { + $link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'Resetpass' ), + wfMsgHtml( 'prefs-resetpass' ), array(), + array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) ); + $defaultPreferences['password'] = array( 'type' => 'info', @@ -180,14 +222,14 @@ class Preferences { 'section' => 'personal/info', ); } - + $defaultPreferences['rememberpassword'] = array( 'type' => 'toggle', 'label-message' => 'tog-rememberpassword', 'section' => 'personal/info', ); - + // Language global $wgContLanguageCode; $languages = array_reverse( Language::getLanguageNames( false ) ); @@ -195,10 +237,10 @@ class Preferences { $languages[$wgContLanguageCode] = $wgContLanguageCode; } ksort( $languages ); - + $options = array(); foreach( $languages as $code => $name ) { - $display = "$code - $name"; + $display = wfBCP47( $code ) . ' - ' . $name; $options[$display] = $code; } $defaultPreferences['language'] = @@ -208,16 +250,17 @@ class Preferences { 'options' => $options, 'label-message' => 'yourlanguage', ); - + global $wgContLang, $wgDisableLangConversion; + global $wgDisableTitleConversion; /* see if there are multiple language variants to choose from*/ $variantArray = array(); - if(!$wgDisableLangConversion) { + if( !$wgDisableLangConversion ) { $variants = $wgContLang->getVariants(); $languages = Language::getLanguageNames( true ); - foreach($variants as $v) { - $v = str_replace( '_', '-', strtolower($v)); + 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]; @@ -226,11 +269,11 @@ class Preferences { $options = array(); foreach( $variantArray as $code => $name ) { - $display = "$code - $name"; + $display = wfBCP47( $code ) . ' - ' . $name; $options[$display] = $code; } - if(count($variantArray) > 1) { + if( count( $variantArray ) > 1 ) { $defaultPreferences['variant'] = array( 'label-message' => 'yourvariant', @@ -240,8 +283,8 @@ class Preferences { ); } } - - if( count($variantArray) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion ) { + + if( count( $variantArray ) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion ) { $defaultPreferences['noconvertlink'] = array( 'type' => 'toggle', @@ -249,11 +292,23 @@ class Preferences { 'label-message' => 'tog-noconvertlink', ); } - - global $wgMaxSigChars; + + global $wgMaxSigChars, $wgOut, $wgParser; + + // show a preview of the old signature first + $oldsigWikiText = $wgParser->preSaveTransform( "~~~", new Title , $user, new ParserOptions ); + $oldsigHTML = $wgOut->parseInline( $oldsigWikiText ); + $defaultPreferences['oldsig'] = + array( + 'type' => 'info', + 'raw' => true, + 'label-message' => 'tog-oldsig', + 'default' => $oldsigHTML, + 'section' => 'personal/signature', + ); $defaultPreferences['nickname'] = array( - 'type' => 'text', + 'type' => $wgAuth->allowPropChange( 'nickname' ) ? 'text' : 'info', 'maxlength' => $wgMaxSigChars, 'label-message' => 'yournick', 'validation-callback' => @@ -265,148 +320,199 @@ class Preferences { array( 'type' => 'toggle', 'label-message' => 'tog-fancysig', + 'help-message' => 'prefs-help-signature', // show general help about signature at the bottom of the section 'section' => 'personal/signature' ); ## Email stuff - global $wgEmailConfirmToEdit; - - $defaultPreferences['emailaddress'] = - array( - 'type' => 'text', - 'default' => $user->getEmail(), - 'section' => 'personal/email', - 'label-message' => 'youremail', - 'help-message' => $wgEmailConfirmToEdit - ? 'prefs-help-email-required' - : 'prefs-help-email', - 'validation-callback' => array( 'Preferences', 'validateEmail' ), - ); - - global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication; + global $wgEnableEmail; + if ($wgEnableEmail) { - if ( $wgEmailAuthentication ) { - if ( $user->getEmail() ) { - if( $user->getEmailAuthenticationTimestamp() ) { - // date and time are separate parameters to facilitate localisation. - // $time is kept for backward compat reasons. - // 'emailauthenticated' is also used in SpecialConfirmemail.php - $time = $wgLang->timeAndDate( $user->getEmailAuthenticationTimestamp(), true ); - $d = $wgLang->date( $user->getEmailAuthenticationTimestamp(), true ); - $t = $wgLang->time( $user->getEmailAuthenticationTimestamp(), true ); - $emailauthenticated = wfMsg('emailauthenticated', $time, $d, $t ).'
'; - $disableEmailPrefs = false; + global $wgEmailConfirmToEdit; + + $defaultPreferences['emailaddress'] = + array( + 'type' => $wgAuth->allowPropChange( 'emailaddress' ) ? 'email' : 'info', + 'default' => $user->getEmail(), + 'section' => 'personal/email', + 'label-message' => 'youremail', + 'help-message' => $wgEmailConfirmToEdit + ? 'prefs-help-email-required' + : 'prefs-help-email', + 'validation-callback' => array( 'Preferences', 'validateEmail' ), + ); + + global $wgEnableUserEmail, $wgEmailAuthentication; + + $disableEmailPrefs = false; + + if ( $wgEmailAuthentication ) { + if ( $user->getEmail() ) { + if( $user->getEmailAuthenticationTimestamp() ) { + // date and time are separate parameters to facilitate localisation. + // $time is kept for backward compat reasons. + // 'emailauthenticated' is also used in SpecialConfirmemail.php + $time = $wgLang->timeAndDate( $user->getEmailAuthenticationTimestamp(), true ); + $d = $wgLang->date( $user->getEmailAuthenticationTimestamp(), true ); + $t = $wgLang->time( $user->getEmailAuthenticationTimestamp(), true ); + $emailauthenticated = wfMsgExt( 'emailauthenticated', 'parseinline', + array($time, $d, $t ) ) . '
'; + $disableEmailPrefs = false; + } else { + $disableEmailPrefs = true; + $skin = $wgUser->getSkin(); + $emailauthenticated = wfMsgExt( 'emailnotauthenticated', 'parseinline' ) . '
' . + $skin->link( + SpecialPage::getTitleFor( 'Confirmemail' ), + wfMsg( 'emailconfirmlink' ), + array(), + array(), + array( 'known', 'noclasses' ) + ) . '
'; + } } else { $disableEmailPrefs = true; - global $wgUser; // wgUser is okay here, it's for display - $skin = $wgUser->getSkin(); - $emailauthenticated = wfMsg('emailnotauthenticated').'
' . - $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ), - wfMsg( 'emailconfirmlink' ) ) . '
'; + $emailauthenticated = wfMsgHtml( 'noemailprefs' ); } - } else { - $emailauthenticated = wfMsg( 'noemailprefs' ); + + $defaultPreferences['emailauthentication'] = + array( + 'type' => 'info', + 'raw' => true, + 'section' => 'personal/email', + 'label-message' => 'prefs-emailconfirm-label', + 'default' => $emailauthenticated, + ); + } - - $defaultPreferences['emailauthentication'] = - array( - 'type' => 'info', - 'raw' => true, - 'section' => 'personal/email', - 'label-message' => 'prefs-emailconfirm-label', - 'default' => $emailauthenticated, - ); - - } - - if ($wgEnableEmail) { - if ($wgEnableUserEmail) { + + if( $wgEnableUserEmail && $user->isAllowed( 'sendemail' ) ) { $defaultPreferences['disablemail'] = array( 'type' => 'toggle', 'invert' => true, 'section' => 'personal/email', 'label-message' => 'allowemail', + 'disabled' => $disableEmailPrefs, ); $defaultPreferences['ccmeonemails'] = array( 'type' => 'toggle', 'section' => 'personal/email', 'label-message' => 'tog-ccmeonemails', + 'disabled' => $disableEmailPrefs, ); } - $defaultPreferences['enotifwatchlistpages'] = - array( - 'type' => 'toggle', - 'section' => 'personal/email', - 'label-message' => 'tog-enotifwatchlistpages', - ); - $defaultPreferences['enotifusertalkpages'] = - array( - 'type' => 'toggle', - 'section' => 'personal/email', - 'label-message' => 'tog-enotifusertalkpages', - ); - $defaultPreferences['enotifminoredits'] = - array( - 'type' => 'toggle', - 'section' => 'personal/email', - 'label-message' => 'tog-enotifminoredits', - ); - $defaultPreferences['enotifrevealaddr'] = - array( - 'type' => 'toggle', - 'section' => 'personal/email', - 'label-message' => 'tog-enotifrevealaddr' - ); + global $wgEnotifWatchlist; + if ( $wgEnotifWatchlist ) { + $defaultPreferences['enotifwatchlistpages'] = + array( + 'type' => 'toggle', + 'section' => 'personal/email', + 'label-message' => 'tog-enotifwatchlistpages', + 'disabled' => $disableEmailPrefs, + ); + } + global $wgEnotifUserTalk; + if( $wgEnotifUserTalk ) { + $defaultPreferences['enotifusertalkpages'] = + array( + 'type' => 'toggle', + 'section' => 'personal/email', + 'label-message' => 'tog-enotifusertalkpages', + 'disabled' => $disableEmailPrefs, + ); + } + if( $wgEnotifUserTalk || $wgEnotifWatchlist ) { + $defaultPreferences['enotifminoredits'] = + array( + 'type' => 'toggle', + 'section' => 'personal/email', + 'label-message' => 'tog-enotifminoredits', + 'disabled' => $disableEmailPrefs, + ); + global $wgEnotifRevealEditorAddress; + if ( $wgEnotifRevealEditorAddress ) { + $defaultPreferences['enotifrevealaddr'] = + array( + 'type' => 'toggle', + 'section' => 'personal/email', + 'label-message' => 'tog-enotifrevealaddr', + 'disabled' => $disableEmailPrefs, + ); + } + } } } - + static function skinPreferences( $user, &$defaultPreferences ) { ## Skin ##################################### - global $wgAllowUserSkin, $wgLang; - - if ($wgAllowUserSkin) { - $defaultPreferences['skin'] = - array( - 'type' => 'radio', - 'options' => self::generateSkinOptions( $user ), - 'label' => ' ', - 'section' => 'rendering/skin', - ); + global $wgLang, $wgAllowUserCss, $wgAllowUserJs; + + $defaultPreferences['skin'] = + array( + 'type' => 'radio', + 'options' => self::generateSkinOptions( $user ), + 'label' => ' ', + 'section' => 'rendering/skin', + ); + + # Create links to user CSS/JS pages for all skins + # This code is basically copied from generateSkinOptions(). It'd + # be nice to somehow merge this back in there to avoid redundancy. + if( $wgAllowUserCss || $wgAllowUserJs ) { + $sk = $user->getSkin(); + $linkTools = array(); + if( $wgAllowUserCss ) { + $cssPage = Title::makeTitleSafe( NS_USER, $user->getName() . '/common.css' ); + $linkTools[] = $sk->link( $cssPage, wfMsgHtml( 'prefs-custom-css' ) ); + } + if( $wgAllowUserJs ) { + $jsPage = Title::makeTitleSafe( NS_USER, $user->getName() . '/common.js' ); + $linkTools[] = $sk->link( $jsPage, wfMsgHtml( 'prefs-custom-js' ) ); + } + $defaultPreferences['commoncssjs'] = + array( + 'type' => 'info', + 'raw' => true, + 'default' => $wgLang->pipeList( $linkTools ), + 'label-message' => 'prefs-common-css-js', + 'section' => 'rendering/skin', + ); } - + $selectedSkin = $user->getOption( 'skin' ); if ( in_array( $selectedSkin, array( 'cologneblue', 'standard' ) ) ) { - $settings = array_flip($wgLang->getQuickbarSettings()); - + global $wgLang; + $settings = array_flip( $wgLang->getQuickbarSettings() ); + $defaultPreferences['quickbar'] = array( 'type' => 'radio', 'options' => $settings, - 'section' => 'skin', + 'section' => 'rendering/skin', 'label-message' => 'qbsettings', ); } } - + static function mathPreferences( $user, &$defaultPreferences ) { ## Math ##################################### global $wgUseTeX, $wgLang; - if ($wgUseTeX) { + if( $wgUseTeX ) { $defaultPreferences['math'] = array( 'type' => 'radio', 'options' => - array_flip( array_map( 'wfMsg', $wgLang->getMathNames() ) ), + array_flip( array_map( 'wfMsgHtml', $wgLang->getMathNames() ) ), 'label' => ' ', 'section' => 'rendering/math', ); } } - + static function filesPreferences( $user, &$defaultPreferences ) { ## Files ##################################### $defaultPreferences['imagesize'] = @@ -424,138 +530,149 @@ class Preferences { 'section' => 'rendering/files', ); } - + static function datetimePreferences( $user, &$defaultPreferences ) { global $wgLang; - + ## Date and time ##################################### $dateOptions = self::getDateOptions(); - if ($dateOptions) { + if( $dateOptions ) { $defaultPreferences['date'] = array( 'type' => 'radio', 'options' => $dateOptions, - 'label-message' => 'dateformat', - 'section' => 'datetime', + 'label' => ' ', + 'section' => 'datetime/dateformat', ); } - + // Info $nowlocal = Xml::element( 'span', array( 'id' => 'wpLocalTime' ), $wgLang->time( $now = wfTimestampNow(), true ) ); $nowserver = $wgLang->time( $now, false ) . Xml::hidden( 'wpServerTime', substr( $now, 8, 2 ) * 60 + substr( $now, 10, 2 ) ); - + $defaultPreferences['nowserver'] = array( 'type' => 'info', 'raw' => 1, 'label-message' => 'servertime', 'default' => $nowserver, - 'section' => 'datetime', + 'section' => 'datetime/timeoffset', ); - + $defaultPreferences['nowlocal'] = array( 'type' => 'info', 'raw' => 1, 'label-message' => 'localtime', 'default' => $nowlocal, - 'section' => 'datetime', + 'section' => 'datetime/timeoffset', ); - + // Grab existing pref. $tzOffset = $user->getOption( 'timecorrection' ); $tz = explode( '|', $tzOffset, 2 ); - + $tzSetting = $tzOffset; - if (count($tz) > 1 && $tz[0] == 'Offset') { + if( count( $tz ) > 1 && $tz[0] == 'Offset' ) { $minDiff = $tz[1]; - $tzSetting = sprintf( '%+03d:%02d', floor($minDiff/60), abs($minDiff)%60 );; + $tzSetting = sprintf( '%+03d:%02d', floor( $minDiff/60 ), abs( $minDiff )%60 ); } - + $defaultPreferences['timecorrection'] = array( 'class' => 'HTMLSelectOrOtherField', 'label-message' => 'timezonelegend', 'options' => self::getTimezoneOptions(), 'default' => $tzSetting, - 'section' => 'datetime', + 'size' => 20, + 'section' => 'datetime/timeoffset', ); } - + static function renderingPreferences( $user, &$defaultPreferences ) { ## Page Rendering ############################## - $defaultPreferences['underline'] = - array( - 'type' => 'select', - 'options' => array( - wfMsg( 'underline-never' ) => 0, - wfMsg( 'underline-always' ) => 1, - wfMsg( 'underline-default' ) => 2, - ), - 'label-message' => 'tog-underline', - 'section' => 'rendering', - ); - + global $wgAllowUserCssPrefs; + if( $wgAllowUserCssPrefs ){ + $defaultPreferences['underline'] = + array( + 'type' => 'select', + 'options' => array( + wfMsg( 'underline-never' ) => 0, + wfMsg( 'underline-always' ) => 1, + wfMsg( 'underline-default' ) => 2, + ), + 'label-message' => 'tog-underline', + 'section' => 'rendering/advancedrendering', + ); + } + $stubThresholdValues = array( 0, 50, 100, 500, 1000, 2000, 5000, 10000 ); $stubThresholdOptions = array(); foreach( $stubThresholdValues as $value ) { $stubThresholdOptions[wfMsg( 'size-bytes', $value )] = $value; } - + $defaultPreferences['stubthreshold'] = array( 'type' => 'selectorother', - 'section' => 'rendering', + 'section' => 'rendering/advancedrendering', 'options' => $stubThresholdOptions, - 'label' => wfMsg('stub-threshold'), // Raw HTML message. Yay? - ); - $defaultPreferences['highlightbroken'] = - array( - 'type' => 'toggle', - 'section' => 'rendering', - 'label' => wfMsg('tog-highlightbroken'), // Raw HTML - ); - $defaultPreferences['showtoc'] = - array( - 'type' => 'toggle', - 'section' => 'rendering', - 'label-message' => 'tog-showtoc', + 'size' => 20, + 'label' => wfMsg( 'stub-threshold' ), // Raw HTML message. Yay? ); + if( $wgAllowUserCssPrefs ){ + $defaultPreferences['highlightbroken'] = + array( + 'type' => 'toggle', + 'section' => 'rendering/advancedrendering', + 'label' => wfMsg( 'tog-highlightbroken' ), // Raw HTML + ); + $defaultPreferences['showtoc'] = + array( + 'type' => 'toggle', + 'section' => 'rendering/advancedrendering', + 'label-message' => 'tog-showtoc', + ); + } $defaultPreferences['nocache'] = array( 'type' => 'toggle', 'label-message' => 'tog-nocache', - 'section' => 'rendering', + 'section' => 'rendering/advancedrendering', ); $defaultPreferences['showhiddencats'] = array( 'type' => 'toggle', - 'section' => 'rendering', + 'section' => 'rendering/advancedrendering', 'label-message' => 'tog-showhiddencats' ); $defaultPreferences['showjumplinks'] = array( 'type' => 'toggle', - 'section' => 'rendering', + 'section' => 'rendering/advancedrendering', 'label-message' => 'tog-showjumplinks', ); - $defaultPreferences['justify'] = - array( - 'type' => 'toggle', - 'section' => 'rendering', - 'label-message' => 'tog-justify', - ); + if( $wgAllowUserCssPrefs ){ + $defaultPreferences['justify'] = + array( + 'type' => 'toggle', + 'section' => 'rendering/advancedrendering', + 'label-message' => 'tog-justify', + ); + } $defaultPreferences['numberheadings'] = array( 'type' => 'toggle', - 'section' => 'rendering', + 'section' => 'rendering/advancedrendering', 'label-message' => 'tog-numberheadings', ); } - + static function editingPreferences( $user, &$defaultPreferences ) { + global $wgUseExternalEditor, $wgLivePreview, $wgAllowUserCssPrefs; + ## Editing ##################################### $defaultPreferences['cols'] = array( @@ -573,303 +690,366 @@ class Preferences { 'min' => 4, 'max' => 1000, ); + if( $wgAllowUserCssPrefs ){ + $defaultPreferences['editfont'] = + array( + 'type' => 'select', + 'section' => 'editing/advancedediting', + 'label-message' => 'editfont-style', + 'options' => array( + wfMsg( 'editfont-default' ) => 'default', + wfMsg( 'editfont-monospace' ) => 'monospace', + wfMsg( 'editfont-sansserif' ) => 'sans-serif', + wfMsg( 'editfont-serif' ) => 'serif', + ) + ); + } $defaultPreferences['previewontop'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-previewontop', ); $defaultPreferences['previewonfirst'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-previewonfirst', ); - $defaultPreferences['editsection'] = - array( - 'type' => 'toggle', - 'section' => 'editing', - 'label-message' => 'tog-editsection', - ); + if( $wgAllowUserCssPrefs ){ + $defaultPreferences['editsection'] = + array( + 'type' => 'toggle', + 'section' => 'editing/advancedediting', + 'label-message' => 'tog-editsection', + ); + } $defaultPreferences['editsectiononrightclick'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-editsectiononrightclick', ); $defaultPreferences['editondblclick'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-editondblclick', ); $defaultPreferences['editwidth'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-editwidth', ); $defaultPreferences['showtoolbar'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-showtoolbar', ); $defaultPreferences['minordefault'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-minordefault', ); - $defaultPreferences['externaleditor'] = - array( - 'type' => 'toggle', - 'section' => 'editing', - 'label-message' => 'tog-externaleditor', - ); - $defaultPreferences['externaldiff'] = - array( - 'type' => 'toggle', - 'section' => 'editing', - 'label-message' => 'tog-externaldiff', - ); + + if ( $wgUseExternalEditor ) { + $defaultPreferences['externaleditor'] = + array( + 'type' => 'toggle', + 'section' => 'editing/advancedediting', + 'label-message' => 'tog-externaleditor', + ); + $defaultPreferences['externaldiff'] = + array( + 'type' => 'toggle', + 'section' => 'editing/advancedediting', + 'label-message' => 'tog-externaldiff', + ); + } + $defaultPreferences['forceeditsummary'] = array( 'type' => 'toggle', - 'section' => 'editing', + 'section' => 'editing/advancedediting', 'label-message' => 'tog-forceeditsummary', ); - $defaultPreferences['uselivepreview'] = - array( - 'type' => 'toggle', - 'section' => 'editing', - 'label-message' => 'tog-uselivepreview', - ); + if ( $wgLivePreview ) { + $defaultPreferences['uselivepreview'] = + array( + 'type' => 'toggle', + 'section' => 'editing/advancedediting', + 'label-message' => 'tog-uselivepreview', + ); + } } - + static function rcPreferences( $user, &$defaultPreferences ) { - global $wgRCMaxAge, $wgUseRCPatrol; + global $wgRCMaxAge, $wgUseRCPatrol, $wgLang; ## RecentChanges ##################################### $defaultPreferences['rcdays'] = array( - 'type' => 'int', + 'type' => 'float', 'label-message' => 'recentchangesdays', - 'section' => 'rc', + 'section' => 'rc/display', 'min' => 1, - 'max' => ceil($wgRCMaxAge / (3600*24)), + 'max' => ceil( $wgRCMaxAge / ( 3600*24 ) ), + 'help' => wfMsgExt( 'recentchangesdays-max', array( 'parsemag' ), $wgLang->formatNum( ceil( $wgRCMaxAge / ( 3600*24 ) ) ) ), ); $defaultPreferences['rclimit'] = array( 'type' => 'int', 'label-message' => 'recentchangescount', - 'section' => 'rc', + 'help-message' => 'prefs-help-recentchangescount', + 'section' => 'rc/display', ); $defaultPreferences['usenewrc'] = array( 'type' => 'toggle', 'label-message' => 'tog-usenewrc', - 'section' => 'rc', + 'section' => 'rc/advancedrc', ); $defaultPreferences['hideminor'] = array( 'type' => 'toggle', 'label-message' => 'tog-hideminor', - 'section' => 'rc', + 'section' => 'rc/advancedrc', ); - - global $wgUseRCPatrol; - if ($wgUseRCPatrol) { + + if( $wgUseRCPatrol ) { $defaultPreferences['hidepatrolled'] = array( 'type' => 'toggle', - 'section' => 'rc', + 'section' => 'rc/advancedrc', 'label-message' => 'tog-hidepatrolled', ); $defaultPreferences['newpageshidepatrolled'] = array( 'type' => 'toggle', - 'section' => 'rc', + 'section' => 'rc/advancedrc', 'label-message' => 'tog-newpageshidepatrolled', ); } - + global $wgRCShowWatchingUsers; - if ($wgRCShowWatchingUsers) { + if( $wgRCShowWatchingUsers ) { $defaultPreferences['shownumberswatching'] = array( 'type' => 'toggle', - 'section' => 'rc', + 'section' => 'rc/advancedrc', 'label-message' => 'tog-shownumberswatching', ); } } - + static function watchlistPreferences( $user, &$defaultPreferences ) { - global $wgUseRCPatrol; + global $wgUseRCPatrol, $wgEnableAPI; ## Watchlist ##################################### - $defaultPreferences['wllimit'] = + $defaultPreferences['watchlistdays'] = array( - 'type' => 'int', + 'type' => 'float', 'min' => 0, - 'max' => 1000, - 'label-message' => 'prefs-watchlist-edits', - 'section' => 'watchlist' + 'max' => 7, + 'section' => 'watchlist/display', + 'help' => wfMsgHtml( 'prefs-watchlist-days-max' ), + 'label-message' => 'prefs-watchlist-days', ); - $defaultPreferences['watchlistdays'] = + $defaultPreferences['wllimit'] = array( 'type' => 'int', 'min' => 0, - 'max' => 7, - 'section' => 'watchlist', - 'label-message' => 'prefs-watchlist-days', + 'max' => 1000, + 'label-message' => 'prefs-watchlist-edits', + 'help' => wfMsgHtml( 'prefs-watchlist-edits-max' ), + 'section' => 'watchlist/display', ); $defaultPreferences['extendwatchlist'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-extendwatchlist', ); $defaultPreferences['watchlisthideminor'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthideminor', ); $defaultPreferences['watchlisthidebots'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthidebots', ); $defaultPreferences['watchlisthideown'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthideown', ); $defaultPreferences['watchlisthideanons'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthideanons', ); $defaultPreferences['watchlisthideliu'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthideliu', ); - + if ( $wgEnableAPI ) { + # Some random gibberish as a proposed default + $hash = sha1( mt_rand() . microtime( true ) ); + $defaultPreferences['watchlisttoken'] = + array( + 'type' => 'text', + 'section' => 'watchlist/advancedwatchlist', + 'label-message' => 'prefs-watchlist-token', + 'help' => wfMsgHtml( 'prefs-help-watchlist-token', $hash ) + ); + } + if ( $wgUseRCPatrol ) { $defaultPreferences['watchlisthidepatrolled'] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => 'tog-watchlisthidepatrolled', ); } - - $watchTypes = array( 'edit' => 'watchdefault', - 'move' => 'watchmoves', - 'delete' => 'watchdeletion' ); - + + $watchTypes = array( + 'edit' => 'watchdefault', + 'move' => 'watchmoves', + 'delete' => 'watchdeletion' + ); + // Kinda hacky if( $user->isAllowed( 'createpage' ) || $user->isAllowed( 'createtalk' ) ) { $watchTypes['read'] = 'watchcreations'; } - + foreach( $watchTypes as $action => $pref ) { if ( $user->isAllowed( $action ) ) { $defaultPreferences[$pref] = array( 'type' => 'toggle', - 'section' => 'watchlist', + 'section' => 'watchlist/advancedwatchlist', 'label-message' => "tog-$pref", ); } } } - + static function searchPreferences( $user, &$defaultPreferences ) { global $wgContLang; - + ## Search ##################################### $defaultPreferences['searchlimit'] = array( 'type' => 'int', 'label-message' => 'resultsperpage', - 'section' => 'searchoptions', + 'section' => 'searchoptions/display', 'min' => 0, ); $defaultPreferences['contextlines'] = array( 'type' => 'int', 'label-message' => 'contextlines', - 'section' => 'searchoptions', + 'section' => 'searchoptions/display', 'min' => 0, ); $defaultPreferences['contextchars'] = array( 'type' => 'int', 'label-message' => 'contextchars', - 'section' => 'searchoptions', + 'section' => 'searchoptions/display', 'min' => 0, + ); + global $wgEnableMWSuggest; + if( $wgEnableMWSuggest ) { + $defaultPreferences['disablesuggest'] = + array( + 'type' => 'toggle', + 'label-message' => 'mwsuggest-disable', + 'section' => 'searchoptions/display', + ); + } + + $defaultPreferences['searcheverything'] = + array( + 'type' => 'toggle', + 'label-message' => 'searcheverything-enable', + 'section' => 'searchoptions/advancedsearchoptions', ); - + // Searchable namespaces back-compat with old format $searchableNamespaces = SearchEngine::searchableNamespaces(); - + $nsOptions = array(); foreach( $wgContLang->getNamespaces() as $ns => $name ) { - if ($ns < 0) continue; + if( $ns < 0 ) continue; $displayNs = str_replace( '_', ' ', $name ); - - if (!$displayNs) $displayNs = wfMsg( 'blanknamespace' ); - + + if( !$displayNs ) $displayNs = wfMsg( 'blanknamespace' ); + + $displayNs = htmlspecialchars( $displayNs ); $nsOptions[$displayNs] = $ns; } - + $defaultPreferences['searchnamespaces'] = array( 'type' => 'multiselect', 'label-message' => 'defaultns', 'options' => $nsOptions, - 'section' => 'searchoptions', + 'section' => 'searchoptions/advancedsearchoptions', 'prefix' => 'searchNs', ); - - global $wgEnableMWSuggest; - if ($wgEnableMWSuggest) { - $defaultPreferences['disablesuggest'] = - array( - 'type' => 'toggle', - 'label-message' => 'mwsuggest-disable', - 'section' => 'searchoptions', - ); - } } - + static function miscPreferences( $user, &$defaultPreferences ) { ## Misc ##################################### $defaultPreferences['diffonly'] = array( 'type' => 'toggle', - 'section' => 'misc', + 'section' => 'misc/diffs', 'label-message' => 'tog-diffonly', ); $defaultPreferences['norollbackdiff'] = array( 'type' => 'toggle', - 'section' => 'misc', + 'section' => 'misc/diffs', 'label-message' => 'tog-norollbackdiff', ); + + // Stuff from Language::getExtraUserToggles() + global $wgContLang; + + $toggles = $wgContLang->getExtraUserToggles(); + + foreach( $toggles as $toggle ) { + $defaultPreferences[$toggle] = + array( + 'type' => 'toggle', + 'section' => 'personal/i18n', + 'label-message' => "tog-$toggle", + ); + } } - + + /** + * @param object $user The user object + * @return array Text/links to display as key; $skinkey as value + */ static function generateSkinOptions( $user ) { - global $wgDefaultSkin; + global $wgDefaultSkin, $wgLang, $wgAllowUserCss, $wgAllowUserJs; $ret = array(); - + $mptitle = Title::newMainPage(); - $previewtext = wfMsg( 'skin-preview' ); + $previewtext = wfMsgHtml( 'skin-preview' ); # Only show members of Skin::getSkinNames() rather than # $skinNames (skins is all skin names from Language.php) $validSkinNames = Skin::getUsableSkins(); @@ -878,84 +1058,94 @@ class Preferences { foreach ( $validSkinNames as $skinkey => &$skinname ) { $msgName = "skinname-{$skinkey}"; $localisedSkinName = wfMsg( $msgName ); - if ( !wfEmptyMsg( $msgName, $localisedSkinName ) ) { - $skinname = $localisedSkinName; + if ( !wfEmptyMsg( $msgName, $localisedSkinName ) ) { + $skinname = htmlspecialchars( $localisedSkinName ); } } - asort($validSkinNames); + asort( $validSkinNames ); $sk = $user->getSkin(); foreach( $validSkinNames as $skinkey => $sn ) { + $linkTools = array(); + + # Mark the default skin + if( $skinkey == $wgDefaultSkin ) { + $linkTools[] = wfMsgHtml( 'default' ); + } + + # Create preview link $mplink = htmlspecialchars( $mptitle->getLocalURL( "useskin=$skinkey" ) ); - $previewlink = "($previewtext)"; - $extraLinks = ''; - global $wgAllowUserCss, $wgAllowUserJs; + $linkTools[] = "$previewtext"; + + # Create links to user CSS/JS pages if( $wgAllowUserCss ) { - $cssPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.css' ); - $customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) ); - $extraLinks .= " ($customCSS)"; + $cssPage = Title::makeTitleSafe( NS_USER, $user->getName() . '/' . $skinkey . '.css' ); + $linkTools[] = $sk->link( $cssPage, wfMsgHtml( 'prefs-custom-css' ) ); } if( $wgAllowUserJs ) { - $jsPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.js' ); - $customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') ); - $extraLinks .= " ($customJS)"; + $jsPage = Title::makeTitleSafe( NS_USER, $user->getName() . '/' . $skinkey . '.js' ); + $linkTools[] = $sk->link( $jsPage, wfMsgHtml( 'prefs-custom-js' ) ); } - if( $skinkey == $wgDefaultSkin ) - $sn .= ' (' . wfMsg( 'default' ) . ')'; - $display = "$sn $previewlink{$extraLinks}"; + + $display = $sn . ' ' . wfMsg( 'parentheses', $wgLang->pipeList( $linkTools ) ); $ret[$display] = $skinkey; } - + return $ret; } - + static function getDateOptions() { global $wgLang; $dateopts = $wgLang->getDatePreferences(); - + $ret = array(); - - if ($dateopts) { + + if( $dateopts ) { + if ( !in_array( 'default', $dateopts ) ) { + $dateopts[] = 'default'; // Make sure default is always valid + // Bug 19237 + } + $idCnt = 0; - $epoch = '20010115161234'; # Wikipedia day + $epoch = wfTimestampNow(); foreach( $dateopts as $key ) { if( $key == 'default' ) { - $formatted = wfMsg( 'datedefault' ); + $formatted = wfMsgHtml( 'datedefault' ); } else { - $formatted = $wgLang->timeanddate( $epoch, false, $key ); + $formatted = htmlspecialchars( $wgLang->timeanddate( $epoch, false, $key ) ); } $ret[$formatted] = $key; } } return $ret; } - + static function getImageSizes() { global $wgImageLimits; - + $ret = array(); - + foreach ( $wgImageLimits as $index => $limits ) { - $display = "{$limits[0]}×{$limits[1]}" . wfMsg('unit-pixel'); + $display = "{$limits[0]}×{$limits[1]}" . wfMsg( 'unit-pixel' ); $ret[$display] = $index; } - + return $ret; } - + static function getThumbSizes() { global $wgThumbLimits; - + $ret = array(); - + foreach ( $wgThumbLimits as $index => $size ) { - $display = $size . wfMsg('unit-pixel'); + $display = $size . wfMsg( 'unit-pixel' ); $ret[$display] = $index; } - + return $ret; } - + static function validateSignature( $signature, $alldata ) { global $wgParser, $wgMaxSigChars, $wgLang; if( mb_strlen( $signature ) > $wgMaxSigChars ) { @@ -972,7 +1162,7 @@ class Preferences { return true; } } - + static function cleanSignature( $signature, $alldata ) { global $wgParser; if( $alldata['fancysig'] ) { @@ -981,39 +1171,37 @@ class Preferences { // When no fancy sig used, make sure ~{3,5} get removed. $signature = $wgParser->cleanSigInSig( $signature ); } - + return $signature; } - + static function validateEmail( $email, $alldata ) { - global $wgUser; // To check - - if ( $email && !$wgUser->isValidEmailAddr( $email ) ) { + if ( $email && !User::isValidEmailAddr( $email ) ) { return wfMsgExt( 'invalidemailaddress', 'parseinline' ); } - + global $wgEmailConfirmToEdit; if( $wgEmailConfirmToEdit && !$email ) { return wfMsgExt( 'noemailtitle', 'parseinline' ); } return true; } - + static function getFormObject( $user ) { $formDescriptor = Preferences::getPreferences( $user ); $htmlForm = new PreferencesForm( $formDescriptor, 'prefs' ); - - $htmlForm->setSubmitText( wfMsg('saveprefs') ); + + $htmlForm->setSubmitText( wfMsg( 'saveprefs' ) ); $htmlForm->setTitle( SpecialPage::getTitleFor( 'Preferences' ) ); $htmlForm->setSubmitID( 'prefsubmit' ); $htmlForm->setSubmitCallback( array( 'Preferences', 'tryFormSubmit' ) ); - + return $htmlForm; } - + static function getTimezoneOptions() { $opt = array(); - + global $wgLocalTZoffset; $opt[wfMsg( 'timezoneuseserverdefault' )] = "System|$wgLocalTZoffset"; @@ -1037,8 +1225,8 @@ class Preferences { $tzRegions['Indian'] = wfMsg( 'timezoneregion-indian' ); $tzRegions['Pacific'] = wfMsg( 'timezoneregion-pacific' ); asort( $tzRegions ); - - $prefill = array_fill_keys( array_values($tzRegions), array() ); + + $prefill = array_fill_keys( array_values( $tzRegions ), array() ); $opt = array_merge( $opt, $prefill ); $now = date_create( 'now' ); @@ -1065,7 +1253,7 @@ class Preferences { } return $opt; } - + static function filterTimezoneInput( $tz, $alldata ) { $data = explode( '|', $tz, 3 ); switch ( $data[0] ) { @@ -1094,102 +1282,102 @@ class Preferences { static function tryFormSubmit( $formData, $entryPoint = 'internal' ) { global $wgUser, $wgEmailAuthentication, $wgEnableEmail; - + $result = true; - + // Filter input - foreach( array_keys($formData) as $name ) { - if ( isset(self::$saveFilters[$name]) ) { + foreach( array_keys( $formData ) as $name ) { + if ( isset( self::$saveFilters[$name] ) ) { $formData[$name] = call_user_func( self::$saveFilters[$name], $formData[$name], $formData ); } } - + // Stuff that shouldn't be saved as a preference. $saveBlacklist = array( - 'realname', - 'emailaddress', - ); - + 'realname', + 'emailaddress', + ); + if( $wgEnableEmail ) { - $newadr = $formData['emailaddress']; - $oldadr = $wgUser->getEmail(); - if( ($newadr != '') && ($newadr != $oldadr) ) { + $newaddr = $formData['emailaddress']; + $oldaddr = $wgUser->getEmail(); + if( ( $newaddr != '' ) && ( $newaddr != $oldaddr ) ) { # the user has supplied a new email address on the login page # new behaviour: set this new emailaddr from login-page into user database record - $wgUser->setEmail( $newadr ); + $wgUser->setEmail( $newaddr ); # but flag as "dirty" = unauthenticated $wgUser->invalidateEmail(); - if ($wgEmailAuthentication) { + 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(); + $result = $wgUser->sendConfirmationMail( $oldaddr != '' ); if( WikiError::isError( $result ) ) { return wfMsg( 'mailerror', htmlspecialchars( $result->getMessage() ) ); - } elseif ($entryPoint == 'ui') { + } elseif( $entryPoint == 'ui' ) { $result = 'eauth'; } } } else { - $wgUser->setEmail( $newadr ); + $wgUser->setEmail( $newaddr ); } - if( $oldadr != $newadr ) { - wfRunHooks( 'PrefsEmailAudit', array( $wgUser, $oldadr, $newadr ) ); + if( $oldaddr != $newaddr ) { + wfRunHooks( 'PrefsEmailAudit', array( $wgUser, $oldaddr, $newaddr ) ); } } - + // Fortunately, the realname field is MUCH simpler - global $wgAllowRealName; - if ($wgAllowRealName) { + global $wgHiddenPrefs; + if ( !in_array( 'realname', $wgHiddenPrefs ) ) { $realName = $formData['realname']; $wgUser->setRealName( $realName ); } - + foreach( $saveBlacklist as $b ) unset( $formData[$b] ); - + // Keeps old preferences from interfering due to back-compat // code, etc. $wgUser->resetOptions(); - + foreach( $formData as $key => $value ) { $wgUser->setOption( $key, $value ); } - + $wgUser->saveSettings(); - + return $result; } - + public static function tryUISubmit( $formData ) { $res = self::tryFormSubmit( $formData, 'ui' ); - - if ($res) { + + if( $res ) { $urlOptions = array( 'success' ); - if ($res === 'eauth') + if( $res === 'eauth' ) $urlOptions[] = 'eauth'; - + $queryString = implode( '&', $urlOptions ); - + $url = SpecialPage::getTitleFor( 'Preferences' )->getFullURL( $queryString ); global $wgOut; $wgOut->redirect( $url ); } - + return true; } - + public static function loadOldSearchNs( $user ) { $searchableNamespaces = SearchEngine::searchableNamespaces(); // Back compat with old format $arr = array(); - + foreach( $searchableNamespaces as $ns => $name ) { if( $user->getOption( 'searchNs' . $ns ) ) { $arr[] = $ns; } } - + return $arr; } } @@ -1199,40 +1387,42 @@ class PreferencesForm extends HTMLForm { function wrapForm( $html ) { $html = Xml::tags( 'div', array( 'id' => 'preferences' ), $html ); - + return parent::wrapForm( $html ); } - + function getButtons() { $html = parent::getButtons(); - + global $wgUser; - + $sk = $wgUser->getSkin(); $t = SpecialPage::getTitleFor( 'Preferences', 'reset' ); - - $html .= "\n" . $sk->link( $t, wfMsg( 'restoreprefs' ) ); - + + $html .= "\n" . $sk->link( $t, wfMsgHtml( 'restoreprefs' ) ); + + $html = Xml::tags( 'div', array( 'class' => 'mw-prefs-buttons' ), $html ); + return $html; } - + function filterDataForSubmit( $data ) { // Support for separating MultiSelect preferences into multiple preferences // Due to lack of array support. foreach( $this->mFlatFields as $fieldname => $field ) { $info = $field->mParams; - if ($field instanceof HTMLMultiSelectField) { + if( $field instanceof HTMLMultiSelectField ) { $options = HTMLFormField::flattenOptions( $info['options'] ); - $prefix = isset($info['prefix']) ? $info['prefix'] : $fieldname; - + $prefix = isset( $info['prefix'] ) ? $info['prefix'] : $fieldname; + foreach( $options as $opt ) { $data["$prefix$opt"] = in_array( $opt, $data[$fieldname] ); } - + unset( $data[$fieldname] ); } } - + return $data; } }