| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.i18n.php |
| — | — | @@ -18,6 +18,7 @@ |
| 19 | 19 | 'prefswitch-survey-true' => 'Yes', |
| 20 | 20 | 'prefswitch-survey-false' => 'No', |
| 21 | 21 | 'prefswitch-survey-submit-off' => 'Turn new features off', |
| | 22 | + 'prefswitch-survey-submit-global-off' => 'Turn new features off on all wikis', |
| 22 | 23 | 'prefswitch-survey-cancel-off' => 'If you would like to continue using the new features, you can return to $1.', |
| 23 | 24 | 'prefswitch-survey-submit-feedback' => 'Send feedback', |
| 24 | 25 | 'prefswitch-survey-cancel-feedback' => 'If you do not want to provide feedback, you can return to $1.', |
| — | — | @@ -161,6 +162,7 @@ |
| 162 | 163 | 'prefswitch-main-feedback' => 'Entry asking for feedback in a local page.', |
| 163 | 164 | 'prefswitch-main-anon' => 'Is used on Special:UsabilityInitiativePrefSwitch at Wikimedia.org.', |
| 164 | 165 | 'prefswitch-feedbackpage' => '{{doc-important|The name of the user experience feedback page on this wiki. Should only be translated for ja, es, de, fr, it, ru, pl, pt, nl for now. Do not translate "Project:"}}', |
| | 166 | + 'prefswitch-survey-submit-global-off' => 'This message may still change', |
| 165 | 167 | ); |
| 166 | 168 | |
| 167 | 169 | /** Afrikaans (Afrikaans) |
| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/PrefSwitch.php |
| — | — | @@ -38,6 +38,9 @@ |
| 39 | 39 | ), |
| 40 | 40 | ); |
| 41 | 41 | |
| | 42 | +// Allow global opt-outs. Depends on CentralAuth |
| | 43 | +$wgPrefSwitchGlobalOptOut = false; |
| | 44 | + |
| 42 | 45 | // Survey questions to ask when users switch prefs |
| 43 | 46 | // array( |
| 44 | 47 | // survey-id => array( |
| — | — | @@ -62,6 +65,7 @@ |
| 63 | 66 | $wgPrefSwitchSurveys['feedback'] = array( |
| 64 | 67 | 'submit-msg' => 'prefswitch-survey-submit-feedback', |
| 65 | 68 | 'updatable' => true, |
| | 69 | + 'global' => false, |
| 66 | 70 | 'questions' => array( |
| 67 | 71 | 'like' => array( |
| 68 | 72 | 'question' => 'prefswitch-survey-question-like', |
| — | — | @@ -76,6 +80,8 @@ |
| 77 | 81 | $wgPrefSwitchSurveys['off'] = array( |
| 78 | 82 | 'submit-msg' => 'prefswitch-survey-submit-off', |
| 79 | 83 | 'updatable' => false, |
| | 84 | + 'global' => true, |
| | 85 | + 'submit-global-msg' => 'prefswitch-survey-submit-global-off', |
| 80 | 86 | 'questions' => array_merge( |
| 81 | 87 | $wgPrefSwitchSurveys['feedback']['questions'], |
| 82 | 88 | array( |
| Index: trunk/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php |
| — | — | @@ -67,10 +67,30 @@ |
| 68 | 68 | $user->saveSettings(); |
| 69 | 69 | } |
| 70 | 70 | /** |
| 71 | | - * Switches a user's prefernces off |
| | 71 | + * Switches a user's preferences off |
| 72 | 72 | * @param $user User object to set preferences for |
| | 73 | + * @param $global bool Whether to apply this change on all wikis in $wgPrefSwitchWikis |
| 73 | 74 | */ |
| 74 | | - public static function switchOff( $user ) { |
| | 75 | + public static function switchOff( $user, $global = false ) { |
| | 76 | + self::switchOffUser( $user ); |
| | 77 | + if ( $global ) { |
| | 78 | + $globalUser = new CentralAuthUser( $user->getName() ); |
| | 79 | + if ( !$globalUser->exists() ) { |
| | 80 | + return; |
| | 81 | + } |
| | 82 | + $accounts = $globalUser->queryAttached(); |
| | 83 | + foreach ( $accounts as $account ) { |
| | 84 | + $remoteUser = UserRightsProxy::newFromName( |
| | 85 | + $account['wiki'], |
| | 86 | + $globalUser->getName(), |
| | 87 | + true |
| | 88 | + ); |
| | 89 | + self::switchOffUser( $remoteUser ); |
| | 90 | + } |
| | 91 | + } |
| | 92 | + } |
| | 93 | + |
| | 94 | + private static function switchOffUser( $user ) { |
| 75 | 95 | global $wgPrefSwitchPrefs; |
| 76 | 96 | foreach ( $wgPrefSwitchPrefs['off'] as $pref => $value ) { |
| 77 | 97 | $user->setOption( $pref, $value ); |
| — | — | @@ -85,7 +105,7 @@ |
| 86 | 106 | wfLoadExtensionMessages( 'PrefSwitch' ); |
| 87 | 107 | } |
| 88 | 108 | public function execute( $par ) { |
| 89 | | - global $wgRequest, $wgOut, $wgUser, $wgPrefSwitchSurveys, $wgPrefSwitchStyleVersion; |
| | 109 | + global $wgRequest, $wgOut, $wgUser, $wgPrefSwitchSurveys, $wgPrefSwitchStyleVersion, $wgPrefSwitchGlobalOptOut; |
| 90 | 110 | // Get the origin from the request |
| 91 | 111 | $par = $wgRequest->getVal( 'from', $par ); |
| 92 | 112 | $this->originTitle = Title::newFromText( $par ); |
| — | — | @@ -126,7 +146,7 @@ |
| 127 | 147 | case 'off': |
| 128 | 148 | // Switch off |
| 129 | 149 | if ( self::checkToken() && self::isSwitchedOn( $wgUser ) && $wgRequest->wasPosted() ) { |
| 130 | | - self::switchOff( $wgUser ); |
| | 150 | + self::switchOff( $wgUser, $wgRequest->getCheck( 'global' ) && $wgPrefSwitchGlobalOptOut ); |
| 131 | 151 | PrefSwitchSurvey::save( 'off', $wgPrefSwitchSurveys['feedback'] ); |
| 132 | 152 | $wgOut->addWikiMsg( 'prefswitch-success-off' ); |
| 133 | 153 | } else if ( !self::isSwitchedOn( $wgUser ) ) { |
| — | — | @@ -199,7 +219,7 @@ |
| 200 | 220 | /* Private Functions */ |
| 201 | 221 | |
| 202 | 222 | private function render( $mode = null ) { |
| 203 | | - global $wgUser, $wgOut, $wgPrefSwitchSurveys, $wgAllowUserCss, $wgAllowUserJs; |
| | 223 | + global $wgUser, $wgOut, $wgPrefSwitchSurveys, $wgPrefSwitchGlobalOptOut, $wgAllowUserCss, $wgAllowUserJs; |
| 204 | 224 | // Make sure links will retain the origin |
| 205 | 225 | $query = array( 'from' => $this->origin, 'fromquery' => $this->originQuery ); |
| 206 | 226 | if ( isset( $wgPrefSwitchSurveys[$mode] ) ) { |
| — | — | @@ -229,6 +249,15 @@ |
| 230 | 250 | wfMsg( $wgPrefSwitchSurveys[$mode]['submit-msg'] ), |
| 231 | 251 | array( 'id' => "prefswitch-survey-submit-{$mode}", 'class' => 'prefswitch-survey-submit' ) |
| 232 | 252 | ); |
| | 253 | + if ( $wgPrefSwitchSurveys[$mode]['global'] && $wgPrefSwitchGlobalOptOut ) { |
| | 254 | + $html .= Xml::submitButton( |
| | 255 | + wfMsg( $wgPrefSwitchSurveys[$mode]['submit-global-msg'] ), |
| | 256 | + array( 'id' => "prefswitch-survey-submit-global-{$mode}", |
| | 257 | + 'class' => 'prefswitch-survey-submit', |
| | 258 | + 'name' => 'global', |
| | 259 | + ) |
| | 260 | + ); |
| | 261 | + } |
| 233 | 262 | $html .= Xml::closeElement( 'dt' ); |
| 234 | 263 | $html .= Xml::closeElement( 'form' ); |
| 235 | 264 | $wgOut->addHtml( $html ); |