Changeset 8607

Timestamp:

08/19/10 23:28:26 (3 years ago)

Author:

CrawfordCurrie

Message:

Item9508: control display of extra password confirmation field; not required where the password is only used to verify an existing user for user profile data capture

Location:

trunk/core/lib

Files:

• Foswiki.spec (modified) (2 diffs)
• Foswiki/UI/Register.pm (modified) (1 diff)

trunk/core/lib/Foswiki.spec

@@ -472 +472 @@
 # a link sent in an email to the user's registered email address
 $Foswiki::cfg{Register}{NeedVerification} = $FALSE;
+
+# **BOOLEAN EXPERT**
+# Controls whether the user password has to be entered twice on the
+# registration page or not. The default is to require confirmation. If
+# true, the same password must be provided in the Twk1Password and
+# Twk1Confirm inputs.
+$Foswiki::cfg{Register}{RequirePasswordConfirmation} = $TRUE;
 
 # **BOOLEAN EXPERT**
@@ -550 +557 @@
 # a filter in because while the bulk of configuration items are quite innocent,
 # it's better to be a bit paranoid.
-$Foswiki::cfg{AccessibleCFG} = [ qw( {ScriptSuffix} {LoginManager} {AuthScripts} {LoginNameFilterIn} {AdminUserLogin} {AdminUserWikiName} {SuperAdminGroup} {UsersTopicName} {AuthRealm} {MinPasswordLength} {Register}{AllowLoginName} {Register}{EnableNewUserRegistration} {Register}{NeedVerification} {Register}{RegistrationAgentWikiName} {AllowInlineScript} {DenyDotDotInclude} {UploadFilter} {NameFilter} {AccessibleCFG} {AntiSpam}{EmailPadding} {AntiSpam}{HideUserDetails} {AntiSpam}{RobotsAreWelcome} {Stats}{TopViews} {Stats}{TopContrib} {Stats}{TopicName} {UserInterfaceInternationalisation} {UseLocale} {Site}{Locale} {Site}{CharSet} {DisplayTimeValues} {DefaultDateFormat} {Site}{LocaleRegexes} {UpperNational} {LowerNational} {PluralToSingular} {EnableHierarchicalWebs} {WebMasterEmail} {WebMasterName} {NotifyTopicName} {SystemWebName} {TrashWebName} {SitePrefsTopicName} {LocalSitePreferences} {HomeTopicName} {WebPrefsTopicName} {UsersWebName} {TemplatePath} {LinkProtocolPattern} {NumberOfRevisions} {MaxRevisionsInADiff} {ReplaceIfEditedAgainWithin} {LeaseLength} {LeaseLengthLessForceful} {Plugins}{WebSearchPath} {PluginsOrder} {Cache}{Enabled} {Validation}{Method} ) ];
+$Foswiki::cfg{AccessibleCFG} = [ '{ScriptSuffix}', '{LoginManager}', '{AuthScripts}', '{LoginNameFilterIn}', '{AdminUserLogin}', '{AdminUserWikiName}', '{SuperAdminGroup}', '{UsersTopicName}', '{AuthRealm}', '{MinPasswordLength}', '{Register}{AllowLoginName}', '{Register}{EnableNewUserRegistration}', '{Register}{NeedVerification}', '{Register}{RegistrationAgentWikiName}', '{AllowInlineScript}', '{DenyDotDotInclude}', '{UploadFilter}', '{NameFilter}', '{AccessibleCFG}', '{AntiSpam}{EmailPadding}', '{AntiSpam}{HideUserDetails}', '{AntiSpam}{RobotsAreWelcome}', '{Stats}{TopViews}', '{Stats}{TopContrib}', '{Stats}{TopicName}', '{UserInterfaceInternationalisation}', '{UseLocale}', '{Site}{Locale}', '{Site}{CharSet}', '{DisplayTimeValues}', '{DefaultDateFormat}', '{Site}{LocaleRegexes}', '{UpperNational}', '{LowerNational}', '{PluralToSingular}', '{EnableHierarchicalWebs}', '{WebMasterEmail}', '{WebMasterName}', '{NotifyTopicName}', '{SystemWebName}', '{TrashWebName}', '{SitePrefsTopicName}', '{LocalSitePreferences}', '{HomeTopicName}', '{WebPrefsTopicName}', '{UsersWebName}', '{TemplatePath}', '{LinkProtocolPattern}', '{NumberOfRevisions}', '{MaxRevisionsInADiff}', '{ReplaceIfEditedAgainWithin}', '{LeaseLength}', '{LeaseLengthLessForceful}', '{Plugins}{WebSearchPath}', '{PluginsOrder}', '{Cache}{Enabled}', '{Validation}{Method}', '{Register}{RequirePasswordConfirmation}' ];
 
 # **BOOLEAN**

trunk/core/lib/Foswiki/UI/Register.pm

@@ -1328 +1328 @@
 
         # check if passwords are identical
-        if ( $data->{Password} ne $data->{Confirm} ) {
+        if ( $Foswiki::cfg{Register}{RequirePasswordConfirmation}
+               && $data->{Password} ne $data->{Confirm} ) {
             throw Foswiki::OopsException(
                 'attention',