Item13220: make better sense of the DISPLAY_IF options on the mail.

foswiki · Jan 29, 2015 · a8356b8 · a8356b8
1 parent 24abbda
commit a8356b8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.js b/ConfigurePlugin/pub/System/ConfigurePlugin/configure.uncompressed.js
@@ -834,7 +834,7 @@ if (0) {
                         add_dependency(
                             entry.DISPLAY_IF, $node, function ($n, tf) {
                                 if (tf) {
-                                    // Display if not expert
+                                    // Display if condition OK
                                     $n.removeClass('hidden_di');
                                 } else {
                                     $n.addClass('hidden_di');

diff --git a/core/lib/Foswiki.spec b/core/lib/Foswiki.spec
@@ -1784,18 +1784,31 @@ $Foswiki::cfg{MergeHeadAndScriptZones} = $FALSE;
 # what it changed.) These settings will only be made permanent when you save
 # the configuration.
 
-# **EMAILADDRESS 30 LABEL="Web-Master Email"**
-# Wiki administrator's e-mail address. For example =webmaster@example.com=
-# Must be a single valid email address.  This value is displayed using the =<nop>%WIKIWEBMASTER%= macro.
-$Foswiki::cfg{WebMasterEmail} = '';
-
-# **STRING 30 LABEL="Web-Master Name"**
-# Wiki administrator's name address.
-# For use in mails (first name and last name, for example =Fred Smith=).
-#  This value is displayed using the =<nop>%WIKIWEBMASTERNAME%= macro.
+# **BOOLEAN LABEL="Enable Email" FEEDBACK="label='Auto-configure Email'; wizard='AutoConfigureEmail'; method='autoconfigure'" FEEDBACK="label='Send Test Email';wizard='SendTestEmail'; method='send'"**
+# Enable email globally.  Un-check this option to disable all outgoing
+# email from Foswiki. If this option is enabled, email must be functional
+# for registration to be functional.
+#
+#
+# If you press the Auto-configure button, email will be automatically enabled if
+# autoconfiguration works. After Auto-configure finishes, press the "Send Test Email" button to send a test message.
+$Foswiki::cfg{EnableEmail} = $FALSE;
+
+# **EMAILADDRESS 30 LABEL="Webmaster Email"**
+# Wiki administrator (webmaster) e-mail address, used as the sender address
+# in emails sent by Foswiki. For example =webmaster@example.com=
+# Must be a single valid email address.
+# This value is displayed using the =<nop>%WIKIWEBMASTER%= macro.
+$Foswiki::cfg{WebMasterEmail} = 'user@example.com';
+
+# **STRING 30 LABEL="Webmaster Name"**
+# Wiki administrator (webmaster) name.
+# For use in mails sent by Foswiki (first name and last name, for
+#  example =Fred Smith=).  This value is displayed using the
+# =<nop>%WIKIWEBMASTERNAME%= macro.
 $Foswiki::cfg{WebMasterName} = 'Wiki Administrator';
 
-# **STRING 30 LABEL="SMTP Host" **
+# **STRING 30 LABEL="SMTP Host" DISPLAY_IF="{EnableEmail}"**
 # Optional mail host for outgoing mail, required if Net::SMTP is being used.
 # Examples: =mail.your.company= If the smtp server uses a different port
 # than the default 25, use the syntax =mail.your.company:portnumber=,
@@ -1810,26 +1823,16 @@ $Foswiki::cfg{WebMasterName} = 'Wiki Administrator';
 # auto-configuration.
 $Foswiki::cfg{SMTP}{MAILHOST} = '';
 
-# **STRING 30 LABEL="SMTP Username" DISPLAY_IF="{SMTP}{MAILHOST}!=''"**
+# **STRING 30 LABEL="SMTP Username" DISPLAY_IF="{EnableEmail}&&{SMTP}{MAILHOST}!=''"**
 # Username for SMTP. Only required if your mail server requires authentication.
 # If this is left blank, Foswiki will not attempt to authenticate the mail
 # sender.
 $Foswiki::cfg{SMTP}{Username} = '';
 
-# **PASSWORD 30 LABEL="SMTP Password" DISPLAY_IF="{SMTP}{MAILHOST}!=''"**
+# **PASSWORD 30 LABEL="SMTP Password" DISPLAY_IF="{EnableEmail}&&{SMTP}{MAILHOST}!=''"**
 # Password for your {SMTP}{Username}.
 $Foswiki::cfg{SMTP}{Password} = '';
 
-# **BOOLEAN LABEL="Enable Email" FEEDBACK="label='Auto-configure Email'; wizard='AutoConfigureEmail'; method='autoconfigure'" FEEDBACK="label='Send Test Email';wizard='SendTestEmail'; method='send'" DISPLAY_IF="{WebMasterEmail}!=''"**
-# Enable email globally.  Un-check this option to disable all outgoing
-# email from Foswiki. If this option is enabled, email must be functional
-# for registration to be functional.
-#
-#
-# If you press the Auto-configure button, email will be automatically enabled if
-# autoconfiguration works. After Auto-configure finishes, press the "Send Test Email" button to send a test message.
-$Foswiki::cfg{EnableEmail} = $FALSE;
-
 #---++ Advanced settings
 # These are settings for advanced or uncommon configurations, and for debugging.