[freeside-commits] branch master updated. d54644e17fc84f3853ca020ae68605e7900855fb

[Carl J. Adams-Collier]

The branch, master has been updated
       via  d54644e17fc84f3853ca020ae68605e7900855fb (commit)
      from  dd03181dde5f641d81b5e50643bbd0f81ca09877 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d54644e17fc84f3853ca020ae68605e7900855fb
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Thu Sep 18 11:35:38 2014 -0700

    including error message, and moving session_id reset outside of the conditional block

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 5c0190f..0226d11 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -124,14 +124,16 @@ unless ( $nologin_actions{$action} ) {
           'email'    => $email,
           'password' => $password
         );
+
 	if ( $login_rv->{'error'} ) {
 	  my $ip = $cgi->remote_addr();
-	  warn("login failure [email $email] [ip $ip]");
+	  warn("login failure [email $email] [ip $ip] [error $login_rv->{error}]");
 	} else {
 	  #successful login
-	  $session_id = $login_rv->{'session_id'};
 	}
 
+	$session_id = $login_rv->{'session_id'};
+
       } else {
 
         $cgi->param('username') =~ /^\s*([a-z0-9_\-\.\&]{0,$form_max})\s*$/i;

-----------------------------------------------------------------------

Summary of changes:
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)