Used EL code {%template,LoadTemplate=foo%} instead of loadTemplate('foo', TRUE);

[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 49228e9cf397cb6e8a404bc2f423a6744a2b42eb..566fc5ae6cf1b34cac8bfc8bb1d2677f146f13aa 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -49,9 +49,9 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Initialize variables
+// Initialize variables as not logged in
 $errorCode = '0';
-$userid = false;
+$userid = NULL;
 $hash = '';
 $url = '';
 $add = '';
@@ -76,7 +76,7 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
                // Email is set
                $userid = SQL_ESCAPE(postRequestElement('email'));
        } elseif (isPostRequestElementSet('id')) {
-               // Do we have nickname or userid?
+               // Is there nickname or userid?
                if (isNicknameUsed(postRequestElement('id'))) {
                        // Nickname entered
                        $userid = SQL_ESCAPE(postRequestElement('id'));
@@ -85,10 +85,6 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
                        $userid  = bigintval(postRequestElement('id'));
                }
        } // END - if
-} else {
-       // Not logged in
-       $userid = NULL;
-       $hash = '';
 }
 
 if (isMember()) {
@@ -125,21 +121,21 @@ $content['message'] = '';
 
 // Login problems?
 if (!empty($errorCode)) {
-       // Do we have a userid set?
+       // Is there a userid set?
        if (isSessionVariableSet('userid')) {
                // Then prefetch data for this account
                fetchUserData(getSession('userid'));
        } // END - if
 
-       // @TODO Move this HTML code into a template
-       $content['message'] = loadTemplate('guest_login_error_message', true, $errorCode);
+       // Add message code
+       $content['message'] = loadTemplate('guest_login_error_message', TRUE, $errorCode);
 } // END - if
 
 // Display login form with resend-password form
 if (isExtensionActive('nickname')) {
-       loadTemplate('guest_nickname_login', false, $content);
+       loadTemplate('guest_nickname_login', FALSE, $content);
 } else {
-       loadTemplate('guest_login', false, $content);
+       loadTemplate('guest_login', FALSE, $content);
 }
 
 // Was an URL constructed?