Item13936: Move new cfg keys to {Email}...

foswiki · Nov 12, 2016 · ddb5ecf · ddb5ecf
1 parent 5e586cb
commit ddb5ecf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -419,10 +419,12 @@ BEGIN {
     $macros{WIKIUSERSTOPIC}    = sub { $Foswiki::cfg{UsersTopicName} };
     $macros{WIKIWEBMASTER}     = sub { $Foswiki::cfg{WebMasterEmail} };
     $macros{WIKIWEBMASTERNAME} = sub { $Foswiki::cfg{WebMasterName} };
-    $macros{WIKIAGENTEMAIL} =
-      sub { $Foswiki::cfg{WikiAgentEmail} || $Foswiki::cfg{WebMasterEmail} };
-    $macros{WIKIAGENTNAME} =
-      sub { $Foswiki::cfg{WikiAgentName} || $Foswiki::cfg{WebMasterName} };
+    $macros{WIKIAGENTEMAIL}    = sub {
+        $Foswiki::cfg{Email}{WikiAgentEmail} || $Foswiki::cfg{WebMasterEmail};
+    };
+    $macros{WIKIAGENTNAME} = sub {
+        $Foswiki::cfg{Email}{WikiAgentName} || $Foswiki::cfg{WebMasterName};
+    };
 
     # locale setup
     #

diff --git a/core/lib/Foswiki.spec b/core/lib/Foswiki.spec
@@ -1810,13 +1810,13 @@ $Foswiki::cfg{WebMasterEmail} = '';
 # Used as part of the From: email address and defaults to ={WebMasterName}= if not configured.
 # For use in mails sent by Foswiki. For example: "Wiki Gnome".  This value is displayed using the
 # =<nop>%WIKIAGENTNAME%= macro.
-$Foswiki::cfg{WikiAgentName} = '';
+$Foswiki::cfg{Email}{WikiAgentName} = '';
 
 # **EMAILADDRESS 30 LABEL="Wiki Agent Email" EXPERT**
 # Email address used by Foswiki as the From: address for email messages, such as messages from the 
 # RegistrationAgent. The ={WebMasterEmail}= is used if this item is not configured.
 # Configure this entry if your email server refuses to accept messages from and too the same address.
-$Foswiki::cfg{WikiAgentEmail} = '';
+$Foswiki::cfg{Email}{WikiAgentEmail} = '';
 
 # **STRING 30 LABEL="SMTP Host"\
 #         FEEDBACK="icon='ui-icon-mail-closed';label='Auto-configure Email';\