Even more rewrites/fixes from EL branch (please report any broken part after you...

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 94904e1be4459483357de4321a660e83b2585e9a..b3e272c6c57a42851b016cc1ce1bcca3f5351138 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,26 +55,26 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 $errorCode = '0';
 $userid = false;
 $hash = '';
-$URL = '';
+$url = '';
 $add = '';
 
 // Already logged in?
 if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $userid = getMemberId();
-} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
+} elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestElement('id')))) {
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
                // Nickname entered
-               $userid = SQL_ESCAPE(postRequestElement('id'));
+               $userid = SQL_ESCAPE(postRequestParameter('id'));
        } else {
                // Direct userid entered
-               $userid  = bigintval(postRequestElement('id'));
+               $userid  = bigintval(postRequestParameter('id'));
        }
-} elseif (isPostRequestElementSet('new_pass')) {
+} elseif (isPostRequestParameterSet('new_pass')) {
        // New password requested
        $userid = '0';
-       if ((isPostRequestElementSet('id')) && (postRequestElement('id') > 0)) $userid = bigintval(postRequestElement('id'));
+       if ((isPostRequestParameterSet('id')) && (postRequestParameter('id') > 0)) $userid = bigintval(postRequestParameter('id'));
 } else {
        // Not logged in
        $userid = '0'; $hash = '';
@@ -81,22 +82,22 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 
 if (isMember()) {
        // Login immidiately...
-       $URL = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
+       $url = 'modules.php?module=login';
+} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('id') . '')) {
        // Invalid input (no nickname extension installed but nickname entered)
        $errorCode = getCode('EXTENSION_PROBLEM');
 } elseif (isFormSent()) {
        // Try the login (see inc/libs/user_functions.php)
-       $URL = doUserLogin(postRequestElement('id'), postRequestElement('password'));
-} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) {
+       $url = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
+} elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
        // Try the userid/email lookup (see inc/libs/user_functions.php)
-       $errorCode = doNewUserPassword(postRequestElement('email'), $userid);
+       $errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
 }
 
 // Login problems?
-if (isGetRequestElementSet('login')) {
+if (isGetRequestParameterSet('login')) {
        // Use code from URL
-       $errorCode = getRequestElement('login');
+       $errorCode = getRequestParameter('login');
 } // END  - if
 
 // No problems, no output by detault
@@ -106,17 +107,21 @@ $content['message'] = '';
 if (!empty($errorCode)) {
        // @TODO Move this HTML code into a template
        $message = "<tr>
-  <td width=\"10\" class=\"seperator\">&nbsp;</td>
-  <td colspan=\"7\" align=\"center\">
+  <td colspan=\"4\" align=\"center\">
     <span class=\"guest_failed\">";
 
+       // Do we have a userid set?
+       if (isSessionVariableSet('current_userid')) {
+               // Then prefetch data for this account
+               fetchUserData(getSession('current_userid'));
+       } // END - if
+
        // Convert the code to message
        $message .= getMessageFromErrorCode($errorCode);
 
        // Continue with HTML
        $message .= "</span>
   </td>
-  <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
        $content['message'] = $message;
 } // END - if
@@ -129,14 +134,14 @@ if (isExtensionActive('nickname')) {
 }
 
 // Was an URL constructed?
-if (!empty($URL)) {
+if (!empty($url)) {
        // URL was constructed
-       if (getTotalFatalErrors() > 0) {
+       if (ifFatalErrorsDetected()) {
                // Handle fatal errors
                runFilterChain('handle_fatal_errors');
        } else {
                // Load URL
-               redirectToUrl($URL);
+               redirectToUrl($url);
        }
 } // END - if