| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3312,6 +3312,14 @@ |
| 3313 | 3313 | 'config-email-settings', |
| 3314 | 3314 | 'config-enable-email', |
| 3315 | 3315 | 'config-enable-email-help', |
| | 3316 | + 'config-email-user', |
| | 3317 | + 'config-email-user-help', |
| | 3318 | + 'config-email-usertalk', |
| | 3319 | + 'config-email-usertalk-help', |
| | 3320 | + 'config-email-watchlist', |
| | 3321 | + 'config-email-watchlist-help', |
| | 3322 | + 'config-email-auth', |
| | 3323 | + 'config-email-auth-help', |
| 3316 | 3324 | 'config-email-sender', |
| 3317 | 3325 | 'config-email-sender-help', |
| 3318 | 3326 | 'config-upload-settings', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1202,7 +1202,7 @@ |
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | 1205 | $licenseJs = 'showControlArray("config__LicenseCode_cc-choose", ["config-cc-wrapper"]);'; |
| 1206 | | - $emailJs = 'enableControlArray("config_wgEnableEmail", ["config_wgPasswordSender"]);'; |
| | 1206 | + $emailJs = 'enableControlArray("config_wgEnableEmail", ["config_wgPasswordSender", "config_wgEnableUserEmail", "config_wgEnotifUserTalk", "config_wgEnotifWatchlist", "config_wgEmailAuthentication"]);'; |
| 1207 | 1207 | $uploadJs = 'enableControlArray("config_wgEnableUploads", ["config_wgDeletedDirectory"]);'; |
| 1208 | 1208 | |
| 1209 | 1209 | $this->startForm(); |
| — | — | @@ -1240,6 +1240,26 @@ |
| 1241 | 1241 | 'label' => 'config-email-sender' |
| 1242 | 1242 | ) ) . |
| 1243 | 1243 | $this->parent->getHelpBox( 'config-email-sender-help' ) . |
| | 1244 | + $this->parent->getCheckBox( array( |
| | 1245 | + 'var' => 'wgEnableUserEmail', |
| | 1246 | + 'label' => 'config-email-user', |
| | 1247 | + ) ) . |
| | 1248 | + $this->parent->getHelpBox( 'config-email-user-help' ) . |
| | 1249 | + $this->parent->getCheckBox( array( |
| | 1250 | + 'var' => 'wgEnotifUserTalk', |
| | 1251 | + 'label' => 'config-email-usertalk', |
| | 1252 | + ) ) . |
| | 1253 | + $this->parent->getHelpBox( 'config-email-usertalk-help' ) . |
| | 1254 | + $this->parent->getCheckBox( array( |
| | 1255 | + 'var' => 'wgEnotifWatchlist', |
| | 1256 | + 'label' => 'config-email-watchlist', |
| | 1257 | + ) ) . |
| | 1258 | + $this->parent->getHelpBox( 'config-email-watchlist-help' ) . |
| | 1259 | + $this->parent->getCheckBox( array( |
| | 1260 | + 'var' => 'wgEmailAuthentication', |
| | 1261 | + 'label' => 'config-email-auth', |
| | 1262 | + ) ) . |
| | 1263 | + $this->parent->getHelpBox( 'config-email-auth-help' ) . |
| 1244 | 1264 | $this->parent->getFieldsetEnd() |
| 1245 | 1265 | ); |
| 1246 | 1266 | |
| — | — | @@ -1372,7 +1392,9 @@ |
| 1373 | 1393 | |
| 1374 | 1394 | function submit() { |
| 1375 | 1395 | $this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode', |
| 1376 | | - 'wgEnableEmail', 'wgPasswordSender', 'wgEnableUpload', 'wgLogo' ) ); |
| | 1396 | + 'wgEnableEmail', 'wgPasswordSender', 'wgEnableUpload', 'wgLogo', |
| | 1397 | + 'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist', |
| | 1398 | + 'wgEmailAuthentication') ); |
| 1377 | 1399 | |
| 1378 | 1400 | if ( !in_array( $this->getVar( '_RightsProfile' ), |
| 1379 | 1401 | array_keys( $this->parent->rightsProfiles ) ) ) |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -21,7 +21,11 @@ |
| 22 | 22 | 'wgRightsText', |
| 23 | 23 | 'wgRightsUrl', |
| 24 | 24 | 'wgMainCacheType', |
| 25 | | - 'wgEnableEmail', |
| | 25 | + 'wgEnableEmail', |
| | 26 | + 'wgEnableUserEmail', |
| | 27 | + 'wgEnotifUserTalk', |
| | 28 | + 'wgEnotifWatchlist', |
| | 29 | + 'wgEmailAuthentication', |
| 26 | 30 | 'wgDBtype', |
| 27 | 31 | 'wgDiff3', |
| 28 | 32 | 'wgImageMagickConvertCommand', |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4391,7 +4391,16 @@ |
| 4392 | 4392 | 'config-email-settings' => 'Email settings', |
| 4393 | 4393 | 'config-enable-email' => 'Enable outbound email', |
| 4394 | 4394 | 'config-enable-email-help' => "If you want email to work, [http://au2.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly. |
| 4395 | | -If you don't want any email features, you can disable it here.", |
| | 4395 | +If you don't want any email features, you can disable it here.", |
| | 4396 | +'config-email-user' => 'Enable user-to-user e-mail', |
| | 4397 | +'config-email-user-help' => "All users to send each other e-mail, if they've enabled it in their preferences", |
| | 4398 | +'config-email-usertalk' => 'Enable usertalk notification', |
| | 4399 | +'config-email-usertalk-help' => "Allow users to receive notifications on user talk changes, if they've enabled it in their preferences", |
| | 4400 | +'config-email-watchlist' => 'Enable watchlist notification', |
| | 4401 | +'config-email-watchlist-help' => "Allow users to receive notifications to their watched pages, if they've enabled it in their preferences", |
| | 4402 | +'config-email-auth' => 'Enable e-mail authentication', |
| | 4403 | +'config-email-auth-help' => "If this option is enabled, users have to confirm their e-mail address using a magic link sent to them whenever they set or change it, and only authenticated e-mail addresses can receive mails from other users and/or |
| | 4404 | +change notification mails. Setting this option is '''recommended''' for public wikis because of potential abuse of the e-mail features above.", |
| 4396 | 4405 | 'config-email-sender' => 'Return address:', |
| 4397 | 4406 | 'config-email-sender-help' => 'Enter the email address to use as the return address on outbound email. |
| 4398 | 4407 | This is where bounces will be sent. |