if (self::$defaultPreferences)
return self::$defaultPreferences;
- global $wgLang, $wgRCMaxAge;
-
+ global $wgRCMaxAge;
+
$defaultPreferences = array();
self::profilePreferences( $user, $defaultPreferences );
self::skinPreferences( $user, $defaultPreferences );
- self::mathPreferences( $user, $defaultPreferences );
self::filesPreferences( $user, $defaultPreferences );
+ self::mathPreferences( $user, $defaultPreferences );
self::datetimePreferences( $user, $defaultPreferences );
self::renderingPreferences( $user, $defaultPreferences );
self::editingPreferences( $user, $defaultPreferences );
self::watchlistPreferences( $user, $defaultPreferences );
self::searchPreferences( $user, $defaultPreferences );
self::miscPreferences( $user, $defaultPreferences );
-
+
wfRunHooks( 'GetPreferences', array( $user, &$defaultPreferences ) );
-
+
## Prod in defaults from the user
global $wgDefaultUserOptions;
foreach( $defaultPreferences as $name => &$info ) {
'type' => 'info',
'label-message' => 'username',
'default' => $user->getName(),
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
$defaultPreferences['userid'] =
'type' => 'info',
'label-message' => 'uid',
'default' => $user->getId(),
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
# Get groups to which the user belongs
count($userEffectiveGroupsArray) ),
'default' => $wgLang->commaList( $userEffectiveGroupsArray ),
'raw' => true,
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
$defaultPreferences['editcount'] =
'type' => 'info',
'label-message' => 'prefs-edits',
'default' => $user->getEditCount(),
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
if ($user->getRegistration()) {
'type' => 'info',
'label-message' => 'prefs-registration',
'default' => $wgLang->timeanddate( $user->getRegistration() ),
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
}
// Actually changeable stuff
- global $wgAllowRealName;
+ global $wgAllowRealName, $wgAuth;
if ($wgAllowRealName) {
$defaultPreferences['realname'] =
array(
- 'type' => 'text',
+ 'type' => $wgAuth->allowRealNameChange() ? 'text' : 'info',
'default' => $user->getRealName(),
- 'section' => 'personal',
+ 'section' => 'personal/info',
'label-message' => 'yourrealname',
'help-message' => 'prefs-help-realname',
);
}
- global $wgAuth;
+
+ $defaultPreferences['gender'] =
+ array(
+ 'type' => 'select',
+ 'section' => 'personal/info',
+ 'options' => array(
+ wfMsg('gender-male') => 'male',
+ wfMsg('gender-female') => 'female',
+ wfMsg('gender-unknown') => 'unknown',
+ ),
+ 'label-message' => 'yourgender',
+ 'help-message' => 'prefs-help-gender',
+ );
+
if ($wgAuth->allowPasswordChange()) {
global $wgUser; // For skin.
$link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'ResetPass' ),
'raw' => true,
'default' => $link,
'label-message' => 'yourpassword',
- 'section' => 'personal',
+ 'section' => 'personal/info',
);
}
- $defaultPreferences['gender'] =
+ $defaultPreferences['rememberpassword'] =
array(
- 'type' => 'select',
- 'section' => 'personal',
- 'options' => array(
- wfMsg('gender-male') => 'male',
- wfMsg('gender-female') => 'female',
- wfMsg('gender-unknown') => 'unknown',
- ),
- 'label-message' => 'yourgender',
- 'help-message' => 'prefs-help-gender',
+ 'type' => 'toggle',
+ 'label-message' => 'tog-rememberpassword',
+ 'section' => 'personal/info',
);
// Language
$defaultPreferences['language'] =
array(
'type' => 'select',
- 'section' => 'personal',
+ 'section' => 'personal/i18n',
'options' => $options,
'label-message' => 'yourlanguage',
);
'label-message' => 'yourvariant',
'type' => 'select',
'options' => $options,
- 'section' => 'personal',
+ 'section' => 'personal/i18n',
);
}
}
$defaultPreferences['noconvertlink'] =
array(
'type' => 'toggle',
- 'section' => 'misc',
+ 'section' => 'personal/i18n',
'label-message' => 'tog-noconvertlink',
);
}
global $wgMaxSigChars;
$defaultPreferences['nickname'] =
array(
- 'type' => 'text',
+ 'type' => $wgAuth->allowNickChange() ? 'text' : 'info',
'maxlength' => $wgMaxSigChars,
'label-message' => 'yournick',
'validation-callback' =>
array( 'Preferences', 'validateSignature' ),
- 'section' => 'personal',
+ 'section' => 'personal/signature',
'filter-callback' => array( 'Preferences', 'cleanSignature' ),
);
$defaultPreferences['fancysig'] =
array(
'type' => 'toggle',
'label-message' => 'tog-fancysig',
- 'section' => 'personal'
- );
-
- $defaultPreferences['rememberpassword'] =
- array(
- 'type' => 'toggle',
- 'label-message' => 'tog-rememberpassword',
- 'section' => 'personal',
+ 'section' => 'personal/signature'
);
## Email stuff
$defaultPreferences['emailaddress'] =
array(
- 'type' => 'text',
+ 'type' => $wgAuth->allowEmailChange() ? 'text' : 'info',
'default' => $user->getEmail(),
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'youremail',
'help-message' => $wgEmailConfirmToEdit
? 'prefs-help-email-required'
global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
+ $disableEmailPrefs = false;
+
if ( $wgEmailAuthentication ) {
if ( $user->getEmail() ) {
if( $user->getEmailAuthenticationTimestamp() ) {
wfMsg( 'emailconfirmlink' ) ) . '<br />';
}
} else {
+ $disableEmailPrefs = true;
$emailauthenticated = wfMsg( 'noemailprefs' );
}
array(
'type' => 'info',
'raw' => true,
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'prefs-emailconfirm-label',
'default' => $emailauthenticated,
);
array(
'type' => 'toggle',
'invert' => true,
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'allowemail',
+ 'disabled' => $disableEmailPrefs,
);
$defaultPreferences['ccmeonemails'] =
array(
'type' => 'toggle',
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'tog-ccmeonemails',
+ 'disabled' => $disableEmailPrefs,
);
}
$defaultPreferences['enotifwatchlistpages'] =
array(
'type' => 'toggle',
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'tog-enotifwatchlistpages',
+ 'disabled' => $disableEmailPrefs,
);
$defaultPreferences['enotifusertalkpages'] =
array(
'type' => 'toggle',
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'tog-enotifusertalkpages',
+ 'disabled' => $disableEmailPrefs,
);
$defaultPreferences['enotifminoredits'] =
array(
'type' => 'toggle',
- 'section' => 'personal',
+ 'section' => 'personal/email',
'label-message' => 'tog-enotifminoredits',
+ 'disabled' => $disableEmailPrefs,
);
$defaultPreferences['enotifrevealaddr'] =
array(
'type' => 'toggle',
- 'section' => 'personal',
- 'label-message' => 'tog-enotifrevealaddr'
+ 'section' => 'personal/email',
+ 'label-message' => 'tog-enotifrevealaddr',
+ 'disabled' => $disableEmailPrefs,
);
}
}
'type' => 'radio',
'options' => self::generateSkinOptions( $user ),
'label' => ' ',
- 'section' => 'skin',
+ 'section' => 'rendering/skin',
);
}
'options' =>
array_flip( array_map( 'wfMsg', $wgLang->getMathNames() ) ),
'label' => ' ',
- 'section' => 'math',
+ 'section' => 'rendering/math',
);
}
}
'type' => 'select',
'options' => self::getImageSizes(),
'label-message' => 'imagemaxsize',
- 'section' => 'files',
+ 'section' => 'rendering/files',
);
$defaultPreferences['thumbsize'] =
array(
'type' => 'select',
'options' => self::getThumbSizes(),
'label-message' => 'thumbsize',
- 'section' => 'files',
+ 'section' => 'rendering/files',
);
}
array(
'type' => 'int',
'label-message' => 'columns',
- 'section' => 'editing',
+ 'section' => 'editing/textboxsize',
'min' => 4,
'max' => 1000,
);
array(
'type' => 'int',
'label-message' => 'rows',
- 'section' => 'editing',
+ 'section' => 'editing/textboxsize',
'min' => 4,
'max' => 1000,
);
'label-message' => 'contextchars',
'section' => 'searchoptions',
'min' => 0,
- );
+ );
+ global $wgEnableMWSuggest;
+ if ($wgEnableMWSuggest) {
+ $defaultPreferences['disablesuggest'] =
+ array(
+ 'type' => 'toggle',
+ 'label-message' => 'mwsuggest-disable',
+ 'section' => 'searchoptions',
+ );
+ }
// Searchable namespaces back-compat with old format
$searchableNamespaces = SearchEngine::searchableNamespaces();
'section' => 'searchoptions',
'prefix' => 'searchNs',
);
-
- global $wgEnableMWSuggest;
- if ($wgEnableMWSuggest) {
- $defaultPreferences['disablesuggest'] =
- array(
- 'type' => 'toggle',
- 'label-message' => 'mwsuggest-disable',
- 'section' => 'searchoptions',
- );
- }
}
static function miscPreferences( $user, &$defaultPreferences ) {
global $wgAllowUserCss, $wgAllowUserJs;
if( $wgAllowUserCss ) {
$cssPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.css' );
- $customCSS = $sk->makeLinkObj( $cssPage, wfMsgExt('prefs-custom-css', array() ) );
+ $customCSS = $sk->link( $cssPage, wfMsgExt( 'prefs-custom-css', array() ) );
$extraLinks .= " ($customCSS)";
}
if( $wgAllowUserJs ) {
$jsPage = Title::makeTitleSafe( NS_USER, $user->getName().'/'.$skinkey.'.js' );
- $customJS = $sk->makeLinkObj( $jsPage, wfMsgHtml('prefs-custom-js') );
+ $customJS = $sk->link( $jsPage, wfMsgHtml( 'prefs-custom-js' ) );
$extraLinks .= " ($customJS)";
}
if( $skinkey == $wgDefaultSkin )
}
static function validateEmail( $email, $alldata ) {
- global $wgUser; // To check
-
- if ( $email && !$wgUser->isValidEmailAddr( $email ) ) {
+ if ( $email && !User::isValidEmailAddr( $email ) ) {
return wfMsgExt( 'invalidemailaddress', 'parseinline' );
}
$html .= "\n" . $sk->link( $t, wfMsg( 'restoreprefs' ) );
+ $html = Xml::tags( 'div', array( 'class' => 'mw-prefs-buttons' ), $html );
+
return $html;
}
dépôts / lhc / web / wiklou.git / blobdiff