A lot rewrites from double-quote to single-quote, some fixes for extension handling...

[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 bcea77ddb74a573b2211d33112a8967fad3c92f7..822a6f6f5a92f52d30d5210c49756fe7e4492400 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -41,13 +41,13 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("user")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
+} elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user');
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+ADD_DESCR('guest', __FILE__);
 
 global $DATA;
 
@@ -55,9 +55,9 @@ global $DATA;
 $errorCode = 0;
 $probe_nickname = false;
 $uid = false;
-$hash = "";
-$URL = "";
-$add = "";
+$hash = '';
+$URL = '';
+$add = '';
 
 // Already logged in?
 if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
@@ -65,7 +65,7 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        $uid = getUserId();
 } elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
        // Set userid and crypt password when login data was submitted
-       if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
+       if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
                // Nickname entered
                $uid = SQL_ESCAPE(REQUEST_POST('id'));
        } else {
@@ -78,12 +78,12 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        if (REQUEST_ISSET_POST(('id'))) $uid = REQUEST_POST('id');
 } else {
        // Not logged in
-       $uid = 0; $hash = "";
+       $uid = 0; $hash = '';
 }
 
 // Set unset variables
-if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', "");
-if (!REQUEST_ISSET_GET(('login')))     REQUEST_SET_GET('login'    , "");
+if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', '');
+if (!REQUEST_ISSET_GET(('login')))     REQUEST_SET_GET('login'    , '');
 
 if (IS_MEMBER()) {
        // Login immidiately...
@@ -136,7 +136,7 @@ if (!empty($errorCode)) {
 
                case getCode('EXTENSION_PROBLEM'):
                        if (IS_ADMIN()) {
-                               $message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
+                               $message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'nickname');
                        } else {
                                $message .= getMessage('LOGIN_WRONG_ID');
                        }
@@ -154,11 +154,11 @@ if (!empty($errorCode)) {
                define('LOGIN_FAILURE_MSG', $message);
 } else {
        // No problems, no output
-       define('LOGIN_FAILURE_MSG', "");
+       define('LOGIN_FAILURE_MSG', '');
 }
 
 // Display login form with resend-password form
-if (EXT_IS_ACTIVE("nickname")) {
+if (EXT_IS_ACTIVE('nickname')) {
        LOAD_TEMPLATE("guest_nickname_login");
 } else {
        LOAD_TEMPLATE("guest_login");