[geeklog-hg] geeklog: User Login form now defaults to asking the user to logi...

[geeklog-cvs at lists.geeklog.net]

changeset 9266:6aad19730268
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6aad19730268
user: Tom <websitemaster at cogeco.net>
date: Sun Aug 25 16:57:54 2013 -0400
description:
User Login form now defaults to asking the user to login instead of assuming an error and asking the user to re-login.

diffstat:

 language/english.php       |  4 +++-
 language/english_utf-8.php |  4 +++-
 public_html/users.php      |  8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 26d84fe98459 -r 6aad19730268 language/english.php
--- a/language/english.php	Sun Aug 25 01:39:24 2013 -0400
+++ b/language/english.php	Sun Aug 25 16:57:54 2013 -0400
@@ -407,7 +407,9 @@
     165 => 'Use Advanced Editor', 
     166 => 'Re-synch Remote Account',
     167 => 'Remote login',
-    168 => 'You may also login with one on of the below remote authentication services'
+    168 => 'You may also login with one on of the below remote authentication services',
+    'user_login' => 'User Login', 
+    'user_login_message' => 'Please login below. You must enter both a username and password.'
 );
 
 ###############################################################################
diff -r 26d84fe98459 -r 6aad19730268 language/english_utf-8.php
--- a/language/english_utf-8.php	Sun Aug 25 01:39:24 2013 -0400
+++ b/language/english_utf-8.php	Sun Aug 25 16:57:54 2013 -0400
@@ -407,7 +407,9 @@
     165 => 'Use Advanced Editor', 
     166 => 'Re-synch Remote Account',
     167 => 'Remote login',
-    168 => 'You may also login with one on of the below remote authentication services'
+    168 => 'You may also login with one on of the below remote authentication services',
+    'user_login' => 'User Login', 
+    'user_login_message' => 'Please login below. You must enter both a username and password.'
 );
 
 ###############################################################################
diff -r 26d84fe98459 -r 6aad19730268 public_html/users.php
--- a/public_html/users.php	Sun Aug 25 01:39:24 2013 -0400
+++ b/public_html/users.php	Sun Aug 25 16:57:54 2013 -0400
@@ -321,7 +321,10 @@
         $cfg['message'] = $LANG04[117];
         $cfg['hide_forgotpw_link'] = true;
         $cfg['no_newreg_link']     = true;
-    } else {
+    } elseif ($userstatus == -2) { // No error user just visited page to login
+        $cfg['title']   = $LANG04['user_login'];
+        $cfg['message'] = $LANG04['user_login_message'];
+    } else { // Status should be -1 which is login error        
         $cfg['title']   = $LANG04[65];
         $cfg['message'] = $LANG04[66];
     }
@@ -923,7 +926,7 @@
 
         }        
     } else {
-        $status = -1;
+        $status = -2; // User just visited login page no error. -1 = error
     }
 
     if ($status == USER_ACCOUNT_ACTIVE) { // logged in AOK.
@@ -1089,6 +1092,7 @@
                         // main site page and need to control the login process
                         $display .= CUSTOM_loginErrorHandler($msg);
                     } else {
+                        echo "ha " . $status;
                         $display .= loginform(false, $status);
                     }
                 }