Changeset 13796 for trunk/core/lib/Foswiki/UI/Register.pm

Timestamp:

01/23/12 19:00:19 (4 months ago)

Author:

CrawfordCurrie

Message:

Item11458: simplify and streamline handling of password file; it now must exist for Foswiki to run, and will be created by =configure= if not. This lets us do enhanced checking in =configure= while reducing the runtime burden.

File:

• trunk/core/lib/Foswiki/UI/Register.pm (modified) (4 diffs)

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

@@ -101 +101 @@
     }
     elsif ( $action eq 'resetPassword' ) {
+        if ( !$session->inContext("passwords_modifyable") ) {
+            throw Foswiki::OopsException(
+                'attention',
+                web   => $session->{webName},
+                topic => $session->{topicName},
+                def   => 'passwords_disabled'
+            );
+        }
         require Foswiki::UI::Passwords;
         Foswiki::UI::Passwords::resetpasswd($session);
@@ -287 +295 @@
         my $cUID = $users->addUser(
             $row->{LoginName}, $row->{WikiName},
-            $row->{Password},  $row->{Email}
+            $session->inContext("passwords_modifyable") ? $row->{Password} : undef,
+            $row->{Email}
         );
         $log .=
@@ -837 +846 @@
     my $users = $session->{users};
     try {
-        unless ( defined( $data->{Password} ) ) {
+        unless ( !$session->inContext("passwords_modifyable") ||
+                 defined( $data->{Password} ) ) {
 
             # SMELL: should give consideration to disabling
@@ -855 +865 @@
         my $cUID = $users->addUser(
             $data->{LoginName}, $data->{WikiName},
-            $data->{Password},  $data->{Email}
+            $session->inContext("passwords_modifyable") ? $data->{Password} : undef,
+            $data->{Email}
         );
         my $log = _createUserTopic( $session, $data );