<?php
+/**
+ * We're now using the HTMLForm object with some customisation to generate the
+ * Preferences form. This object handles generic submission, CSRF protection,
+ * layout and other logic in a reusable manner. We subclass it as a PreferencesForm
+ * to make some minor customisations.
+ *
+ * In order to generate the form, the HTMLForm object needs an array structure
+ * detailing the form fields available, and that's what this class is for. Each
+ * element of the array is a basic property-list, including the type of field,
+ * the label it is to be given in the form, callbacks for validation and
+ * 'filtering', and other pertinent information. Note that the 'default' field
+ * is named for generic forms, and does not represent the preference's default
+ * (which is stored in $wgDefaultUserOptions), but the default for the form
+ * field, which should be whatever the user has set for that preference. There
+ * is no need to override it unless you have some special storage logic (for
+ * instance, those not presently stored as options, but which are best set from
+ * the user preferences view).
+ *
+ * Field types are implemented as subclasses of the generic HTMLFormField
+ * object, and typically implement at least getInputHTML, which generates the
+ * HTML for the input field to be placed in the table.
+ *
+ * Once fields have been retrieved and validated, submission logic is handed
+ * over to the tryUISubmit static method of this class.
+ */
class Preferences {
static $defaultPreferences = null;
static $saveFilters =
array(
'timecorrection' => array( 'Preferences', 'filterTimezoneInput' ),
);
-
+
static function getPreferences( $user ) {
- if (self::$defaultPreferences)
+ if ( self::$defaultPreferences )
return self::$defaultPreferences;
-
+
global $wgRCMaxAge;
$defaultPreferences = array();
global $wgHiddenPrefs;
foreach ( $wgHiddenPrefs as $pref ) {
if ( isset( $defaultPreferences[$pref] ) ) {
- unset( $defaultPreferences[ $pref ] );
+ unset( $defaultPreferences[$pref] );
}
}
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;
## User info #####################################
'default' => $user->getName(),
'section' => 'personal/info',
);
-
+
$defaultPreferences['userid'] =
array(
'type' => 'info',
'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 $wgAuth;
$defaultPreferences['realname'] =
'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',
);
- if ($wgAuth->allowPasswordChange()) {
+ if( $wgAuth->allowPasswordChange() ) {
global $wgUser; // For skin.
$link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'Resetpass' ),
- wfMsgHtml( 'prefs-resetpass' ), array() ,
- array('returnto' => SpecialPage::getTitleFor( 'Preferences') ) );
-
+ wfMsgHtml( 'prefs-resetpass' ), array(),
+ array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) );
+
$defaultPreferences['password'] =
array(
'type' => 'info',
'section' => 'personal/info',
);
}
-
+
$defaultPreferences['rememberpassword'] =
array(
'type' => 'toggle',
'label-message' => 'tog-rememberpassword',
'section' => 'personal/info',
);
-
+
// Language
global $wgContLanguageCode;
$languages = array_reverse( Language::getLanguageNames( false ) );
$languages[$wgContLanguageCode] = $wgContLanguageCode;
}
ksort( $languages );
-
+
$options = array();
foreach( $languages as $code => $name ) {
- $display = "$code - $name";
+ $display = wfBCP47( $code ) . ' - ' . $name;
$options[$display] = $code;
}
$defaultPreferences['language'] =
'options' => $options,
'label-message' => 'yourlanguage',
);
-
- global $wgContLang, $wgEnableVariants;
+
+ global $wgContLang, $wgDisableLangConversion;
+ global $wgDisableTitleConversion;
/* see if there are multiple language variants to choose from*/
$variantArray = array();
- if($wgEnableVariants) {
+ 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];
$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',
);
}
}
-
- if( count($variantArray) > 1 && $wgEnableVariants && !$wgDisableTitleConversion ) {
+
+ if( count( $variantArray ) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion ) {
$defaultPreferences['noconvertlink'] =
array(
'type' => 'toggle',
'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' => $wgAuth->allowPropChange( 'nickname' ) ? 'text' : 'info',
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' => $wgAuth->allowPropChange( 'emailaddress' ) ? 'text' : '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 $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
-
- $disableEmailPrefs = false;
+ 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 = htmlspecialchars(wfMsg('emailauthenticated', $time, $d, $t )).'<br />';
- $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 ) ) . '<br />';
+ $disableEmailPrefs = false;
+ } else {
+ $disableEmailPrefs = true;
+ global $wgUser; // wgUser is okay here, it's for display
+ $skin = $wgUser->getSkin();
+ $emailauthenticated = wfMsgExt( 'emailnotauthenticated', 'parseinline' ) . '<br />' .
+ $skin->link(
+ SpecialPage::getTitleFor( 'Confirmemail' ),
+ wfMsg( 'emailconfirmlink' ),
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ ) . '<br />';
+ }
} else {
$disableEmailPrefs = true;
- global $wgUser; // wgUser is okay here, it's for display
- $skin = $wgUser->getSkin();
- $emailauthenticated = wfMsgHtml('emailnotauthenticated').'<br />' .
- $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Confirmemail' ),
- wfMsg( 'emailconfirmlink' ) ) . '<br />';
+ $emailauthenticated = wfMsgHtml( 'noemailprefs' );
}
- } else {
- $disableEmailPrefs = true;
- $emailauthenticated = wfMsgHtml( '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',
);
}
- $defaultPreferences['enotifwatchlistpages'] =
- array(
- 'type' => 'toggle',
- 'section' => 'personal/email',
- 'label-message' => 'tog-enotifwatchlistpages',
- 'disabled' => $disableEmailPrefs,
- );
- $defaultPreferences['enotifusertalkpages'] =
- array(
- 'type' => 'toggle',
- 'section' => 'personal/email',
- 'label-message' => 'tog-enotifusertalkpages',
- 'disabled' => $disableEmailPrefs,
- );
- $defaultPreferences['enotifminoredits'] =
- array(
- 'type' => 'toggle',
- 'section' => 'personal/email',
- 'label-message' => 'tog-enotifminoredits',
- 'disabled' => $disableEmailPrefs,
- );
+ 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,
+ );
+ }
$defaultPreferences['enotifrevealaddr'] =
array(
'type' => 'toggle',
);
}
}
-
+
static function skinPreferences( $user, &$defaultPreferences ) {
## Skin #####################################
$defaultPreferences['skin'] =
'label' => ' ',
'section' => 'rendering/skin',
);
-
+
$selectedSkin = $user->getOption( 'skin' );
if ( in_array( $selectedSkin, array( 'cologneblue', 'standard' ) ) ) {
global $wgLang;
- $settings = array_flip($wgLang->getQuickbarSettings());
-
+ $settings = array_flip( $wgLang->getQuickbarSettings() );
+
$defaultPreferences['quickbar'] =
array(
'type' => 'radio',
);
}
}
-
+
static function mathPreferences( $user, &$defaultPreferences ) {
## Math #####################################
global $wgUseTeX, $wgLang;
- if ($wgUseTeX) {
+ if( $wgUseTeX ) {
$defaultPreferences['math'] =
array(
'type' => 'radio',
);
}
}
-
+
static function filesPreferences( $user, &$defaultPreferences ) {
## Files #####################################
$defaultPreferences['imagesize'] =
'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',
'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',
'default' => $nowserver,
'section' => 'datetime/timeoffset',
);
-
+
$defaultPreferences['nowlocal'] =
array(
'type' => 'info',
'default' => $nowlocal,
'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,
+ 'size' => 20,
'section' => 'datetime/timeoffset',
);
}
-
+
static function renderingPreferences( $user, &$defaultPreferences ) {
## Page Rendering ##############################
$defaultPreferences['underline'] =
'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/advancedrendering',
'options' => $stubThresholdOptions,
- 'label' => wfMsg('stub-threshold'), // Raw HTML message. Yay?
+ 'size' => 20,
+ 'label' => wfMsg( 'stub-threshold' ), // Raw HTML message. Yay?
);
$defaultPreferences['highlightbroken'] =
array(
'type' => 'toggle',
'section' => 'rendering/advancedrendering',
- 'label' => wfMsg('tog-highlightbroken'), // Raw HTML
+ 'label' => wfMsg( 'tog-highlightbroken' ), // Raw HTML
);
$defaultPreferences['showtoc'] =
array(
'label-message' => 'tog-numberheadings',
);
}
-
+
static function editingPreferences( $user, &$defaultPreferences ) {
+ global $wgUseExternalEditor, $wgLivePreview;
+
## Editing #####################################
$defaultPreferences['cols'] =
array(
'min' => 4,
'max' => 1000,
);
+
+ $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/advancedediting',
'label-message' => 'tog-minordefault',
);
- $defaultPreferences['externaleditor'] =
- array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- 'label-message' => 'tog-externaleditor',
- );
- $defaultPreferences['externaldiff'] =
- array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- '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/advancedediting',
'label-message' => 'tog-forceeditsummary',
);
- $defaultPreferences['uselivepreview'] =
- array(
- 'type' => 'toggle',
- 'section' => 'editing/advancedediting',
- '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/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(
'label-message' => 'tog-hideminor',
'section' => 'rc/advancedrc',
);
-
+
global $wgUseRCPatrol;
- if ($wgUseRCPatrol) {
+ if( $wgUseRCPatrol ) {
$defaultPreferences['hidepatrolled'] =
array(
'type' => 'toggle',
'label-message' => 'tog-newpageshidepatrolled',
);
}
-
+
global $wgRCShowWatchingUsers;
- if ($wgRCShowWatchingUsers) {
+ if( $wgRCShowWatchingUsers ) {
$defaultPreferences['shownumberswatching'] =
array(
'type' => 'toggle',
);
}
}
-
+
static function watchlistPreferences( $user, &$defaultPreferences ) {
- global $wgUseRCPatrol;
+ global $wgUseRCPatrol, $wgEnableAPI;
## Watchlist #####################################
$defaultPreferences['watchlistdays'] =
array(
- 'type' => 'int',
+ 'type' => 'float',
'min' => 0,
'max' => 7,
'section' => 'watchlist/display',
+ 'help' => wfMsgHtml( 'prefs-watchlist-days-max' ),
'label-message' => 'prefs-watchlist-days',
);
$defaultPreferences['wllimit'] =
'min' => 0,
'max' => 1000,
'label-message' => 'prefs-watchlist-edits',
- 'section' => 'watchlist/display'
+ 'help' => wfMsgHtml( 'prefs-watchlist-edits-max' ),
+ 'section' => 'watchlist/display',
);
$defaultPreferences['extendwatchlist'] =
array(
'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(
'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(
}
}
}
-
+
static function searchPreferences( $user, &$defaultPreferences ) {
global $wgContLang;
-
+
## Search #####################################
$defaultPreferences['searchlimit'] =
array(
'min' => 0,
);
global $wgEnableMWSuggest;
- if ($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',
'prefix' => 'searchNs',
);
}
-
+
static function miscPreferences( $user, &$defaultPreferences ) {
## Misc #####################################
$defaultPreferences['diffonly'] =
'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 = wfMsgHtml( 'skin-preview' );
# Only show members of Skin::getSkinNames() rather than
foreach ( $validSkinNames as $skinkey => &$skinname ) {
$msgName = "skinname-{$skinkey}";
$localisedSkinName = wfMsg( $msgName );
- if ( !wfEmptyMsg( $msgName, $localisedSkinName ) ) {
- $skinname = htmlspecialchars($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 = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
- $extraLinks = '';
- global $wgAllowUserCss, $wgAllowUserJs;
+ $linkTools[] = "<a target='_blank' href=\"$mplink\">$previewtext</a>";
+
+ # Create links to user CSS/JS pages
if( $wgAllowUserCss ) {
- $cssPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.css' );
- $customCSS = $sk->link( $cssPage, wfMsgHtml( 'prefs-custom-css' ) );
- $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->link( $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 .= ' (' . wfMsgHtml( '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 = wfMsgHtml( 'datedefault' );
} else {
- $formatted = htmlspecialchars($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 ) {
return true;
}
}
-
+
static function cleanSignature( $signature, $alldata ) {
global $wgParser;
if( $alldata['fancysig'] ) {
// When no fancy sig used, make sure ~{3,5} get removed.
$signature = $wgParser->cleanSigInSig( $signature );
}
-
+
return $signature;
}
-
+
static function validateEmail( $email, $alldata ) {
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";
$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' );
}
return $opt;
}
-
+
static function filterTimezoneInput( $tz, $alldata ) {
$data = explode( '|', $tz, 3 );
switch ( $data[0] ) {
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) ) {
+ if( ( $newadr != '' ) && ( $newadr != $oldadr ) ) {
# 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 );
# 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();
if( WikiError::isError( $result ) ) {
return wfMsg( 'mailerror', htmlspecialchars( $result->getMessage() ) );
- } elseif ($entryPoint == 'ui') {
+ } elseif( $entryPoint == 'ui' ) {
$result = 'eauth';
}
}
wfRunHooks( 'PrefsEmailAudit', array( $wgUser, $oldadr, $newadr ) );
}
}
-
+
// Fortunately, the realname field is MUCH simpler
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;
}
}
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, 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;
}
}
dépôts / lhc / web / wiklou.git / blobdiff