| Index: trunk/phase3/config/index.php |
| — | — | @@ -907,16 +907,17 @@ |
| 908 | 908 | |
| 909 | 909 | <div class="config-section"> |
| 910 | 910 | <div class="config-input"> |
| 911 | | - <label class='column'>E-mail (general):</label> |
| | 911 | + <label class='column'>E-mail features (global):</label> |
| 912 | 912 | <ul class="plain"> |
| 913 | 913 | <li><?php aField( $conf, "Email", "Enabled", "radio", "email_enabled" ); ?></li> |
| 914 | 914 | <li><?php aField( $conf, "Email", "Disabled", "radio", "email_disabled" ); ?></li> |
| 915 | 915 | </ul> |
| 916 | 916 | </div> |
| 917 | 917 | <p class="config-desc"> |
| 918 | | - Use this to disable all e-mail functions (send a password reminder, user-to-user e-mail and e-mail notification), |
| 919 | | - if sending e-mails on your server doesn't work. |
| | 918 | + Use this to disable all e-mail functions (password reminders, user-to-user e-mail and e-mail notifications) |
| | 919 | + if sending mail doesn't work on your server. |
| 920 | 920 | </p> |
| | 921 | + |
| 921 | 922 | <div class="config-input"> |
| 922 | 923 | <label class='column'>User-to-user e-mail:</label> |
| 923 | 924 | <ul class="plain"> |
| — | — | @@ -925,45 +926,35 @@ |
| 926 | 927 | </ul> |
| 927 | 928 | </div> |
| 928 | 929 | <p class="config-desc"> |
| 929 | | - Use this to disable only the user-to-user e-mail function (EmailUser). |
| | 930 | + The user-to-user e-mail feature (Special:Emailuser) lets the wiki act as a relay to allow users to exchange e-mail without publicly advertising their e-mail address. |
| 930 | 931 | </p> |
| 931 | 932 | <div class="config-input"> |
| 932 | | - <label class='column'>E-mail notification:</label> |
| | 933 | + <label class='column'>E-mail notification about changes:</label> |
| 933 | 934 | <ul class="plain"> |
| 934 | 935 | <li><?php aField( $conf, "Enotif", "Disabled", "radio", "enotif_disabled" ); ?></li> |
| 935 | | - <li><?php aField( $conf, "Enotif", "Enabled for user_talk changes only", "radio", "enotif_usertalk" ); ?></li> |
| 936 | | - <li><?php aField( $conf, "Enotif", "Enabled for user_talk and watch list changes (not recommended for large wikis)", "radio", "enotif_allpages" ); ?></li> |
| | 936 | + <li><?php aField( $conf, "Enotif", "Enabled for changes to user discussion pages only", "radio", "enotif_usertalk" ); ?></li> |
| | 937 | + <li><?php aField( $conf, "Enotif", "Enabled for changes to user discussion pages, and to pages on watchlists (not recommended for large wikis)", "radio", "enotif_allpages" ); ?></li> |
| 937 | 938 | </ul> |
| 938 | 939 | </div> |
| 939 | 940 | <div class="config-desc"> |
| 940 | | - <p> |
| 941 | | - E-mail notification sends a notification e-mail to a user, when the user_talk page is changed |
| 942 | | - and/or when watch-listed pages are changed, depending on the above settings. |
| 943 | | - When testing this feature, be reminded, that obviously an e-mail address must be present in your preferences |
| 944 | | - and that your own changes never trigger notifications to be sent to yourself.</p> |
| | 941 | + <p> |
| | 942 | + For this feature to work, an e-mail address must be present for the user account, and the notification |
| | 943 | + options in the user's preferences must be enabled. Also note the |
| | 944 | + authentication option below. When testing the feature, keep in mind that your own changes will never trigger notifications to be sent to yourself.</p> |
| 945 | 945 | |
| 946 | | - <p>Users get corresponding options to select or deselect in their users' preferences. |
| 947 | | - The user options are not shown on the preference page, if e-mail notification is disabled.</p> |
| 948 | | - |
| 949 | | - <p>There are additional options for fine tuning in /includes/DefaultSettings.php .</p> |
| | 946 | + <p>There are additional options for fine tuning in /includes/DefaultSettings.php; copy these to your LocalSettings.php and edit them there to change them.</p> |
| 950 | 947 | </div> |
| 951 | 948 | |
| 952 | 949 | <div class="config-input"> |
| 953 | | - <label class='column'>E-mail authentication:</label> |
| | 950 | + <label class='column'>E-mail address authentication:</label> |
| 954 | 951 | <ul class="plain"> |
| 955 | 952 | <li><?php aField( $conf, "Eauthent", "Disabled", "radio", "eauthent_disabled" ); ?></li> |
| 956 | 953 | <li><?php aField( $conf, "Eauthent", "Enabled", "radio", "eauthent_enabled" ); ?></li> |
| 957 | 954 | </ul> |
| 958 | 955 | </div> |
| 959 | 956 | <div class="config-desc"> |
| 960 | | - <p>E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or changes his/her stored e-mail address |
| 961 | | - gets a link with a token mailed to that address. The stored e-mail address is authenticated at the moment the user comes back to the wiki via the link.</p> |
| 962 | | - |
| 963 | | - <p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated |
| 964 | | - on the user preference page.</p> |
| 965 | | - |
| 966 | | - <p>If the option is enabled, only authenticated e-mail addresses can receive EmailUser mails and/or |
| 967 | | - e-mail notification mails.</p> |
| | 957 | + <p>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 |
| | 958 | + change notification mails. Setting this option is <B>recommended</B> for public wikis because of potential abuse of the e-mail features above.</p> |
| 968 | 959 | </div> |
| 969 | 960 | |
| 970 | 961 | </div> |