addslashes() did escape also single quotes (') which breaks some banner rotation...

[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 03c05a6a87a71b96848ed9833448b5962d120ce2..da708d588231593c4364baff469fa34c8a7df9e0 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -51,19 +51,19 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 } // END - if
 
 // Initialize variables
-$errorCode = 0;
+$errorCode = '0';
 $userid = false;
 $hash = '';
 $URL = '';
 $add = '';
 
 // Already logged in?
-if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
+if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
-       $userid = getUserId();
+       $userid = getMemberId();
 } elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if ((isExtensionActive('nickname')) && (isNicknameOrUserid(postRequestElement('id')))) {
+       if (isNicknameUsed(postRequestElement('id'))) {
                // Nickname entered
                $userid = SQL_ESCAPE(postRequestElement('id'));
        } else {
@@ -72,11 +72,11 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        }
 } elseif (isPostRequestElementSet('new_pass')) {
        // New password requested
-       $userid = 0;
+       $userid = '0';
        if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id'));
 } else {
        // Not logged in
-       $userid = 0; $hash = '';
+       $userid = '0'; $hash = '';
 }
 
 if (isMember()) {
@@ -133,7 +133,7 @@ if (!empty($URL)) {
        // URL was constructed
        if (getTotalFatalErrors() > 0) {
                // Handle fatal errors
-               handleFatalErrors();
+               runFilterChain('handle_fatal_errors');
        } else {
                // Load URL
                redirectToUrl($URL);