Item12162: Disable password reset if email disabled.

Found this task during review of 1.2 tasks for release notes.
foswiki · Mar 15, 2015 · 758f1d3 · 758f1d3
1 parent aeeb9a8
commit 758f1d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/TopicUserMappingContrib/data/System/ResetPassword.txt b/TopicUserMappingContrib/data/System/ResetPassword.txt
@@ -3,7 +3,7 @@
 ---+ %MAKETEXT{"Reset Password"}%
 
 %IF{
-  "context passwords_modifyable"
+  "{EnableEmail} AND context passwords_modifyable"
   then="$percentINCLUDE{\"%TOPIC%\" section=\"resetPassword\"}$percent"
   else="%CHANGEPASSWORDDISABLEDMESSAGE%"
 }%

diff --git a/core/data/System/DefaultPreferences.txt b/core/data/System/DefaultPreferences.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1426281043" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1426431164" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminToolsCategory"}%
 ---+!! <nop>%WIKITOOLNAME% Site-Level Preferences
 
@@ -201,8 +201,8 @@ Note, this feature also must be enabled on the UserRegistration page by adding
 
 ---+++ Change of Password Message
 
-   * If password management is not handled by Foswiki this message will be displayed on %SYSTEMWEB%.ChangePassword and %SYSTEMWEB%.ResetPassword. Replace this generic text with a reference to how to change or reset password within your organisation.
-      * Set CHANGEPASSWORDDISABLEDMESSAGE = %MAKETEXT{"Resetting and setting password is not handled by Foswiki"}%
+   * If password management is not handled by Foswiki, this message will be displayed on %SYSTEMWEB%.ChangePassword and %SYSTEMWEB%.ResetPassword. If email is disabled, it will also be displayed on %SYSTEMWEB%.ResetPassword. Replace this generic text with a reference to how to change or reset password within your organisation.
+      * Set CHANGEPASSWORDDISABLEDMESSAGE = %MAKETEXT{"Resetting and setting password is not available."}%
 
 ---+++ HTTP-<nop>EQUIV Settings
 

diff --git a/core/lib/Foswiki.spec b/core/lib/Foswiki.spec
@@ -879,6 +879,7 @@ $Foswiki::cfg{AccessibleCFG} = [
     '{DefaultUrlHost}',
     '{DenyDotDotInclude}',
     '{DisplayTimeValues}',
+    '{EnableEmail}',
     '{EnableHierarchicalWebs}',
     '{FormTypes}',
     '{HomeTopicName}',