A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

[mailer.git] / inc / modules / admin.php

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 42a9860dcbb5c8358a052c86755c04d28ec14427..df7b6b569307515b038657295c35ca9d8e857137 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -113,35 +113,38 @@ if (!isAdminRegistered()) {
                if (REQUEST_ISSET_POST(('login'))) {
                        define('__LOGIN_VALUE', REQUEST_POST('login'));
                } else {
-                       define('__LOGIN_VALUE', "");
+                       define('__LOGIN_VALUE', '');
                }
 
                // Yet-another "Notice" fix
                if ((IS_FORM_SENT()) && (REQUEST_POST('ok') == "***")) {
                        // No login entered?
-                       if (!REQUEST_ISSET_POST(('login'))) $MSG1 = getMessage('ADMIN_NO_LOGIN');
+                       if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // An error comes back from registration?
-                       if (!empty($ret)) $MSG1 = $ret;
+                       if (!empty($ret)) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!REQUEST_ISSET_POST(('pass'))) $MSG2 = getMessage('ADMIN_NO_PASS');
+                       if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
                        // Or password too short?
-                       if (strlen(REQUEST_POST('pass')) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
+                       if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
                        // Output error messages
-                       define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
-                       define('__MSG_PASS',  LOAD_TEMPLATE("admin_login_msg", true, $MSG2));
+                       define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $loginMessage));
+                       define('__MSG_PASS',  LOAD_TEMPLATE("admin_login_msg", true, $passwdMessage));
 
                        // Reset variables
-                       $MSG1 = ""; $MSG2 = "";
-               } else {
+                       $loginMessage = ''; $passwdMessage = '';
+               } else {
                        // Reset values to nothing
-                       define('__MSG_LOGIN', "");
-                       define('__MSG_PASS' , "");
+                       define('__MSG_LOGIN', '');
+                       define('__MSG_PASS' , '');
                }
 
+               // Output message in seperate template
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+
                // Load register template
                LOAD_TEMPLATE("admin_reg_form");
        }
@@ -152,7 +155,7 @@ if (!isAdminRegistered()) {
                $OUT = ADMIN_SEND_PASSWORD_RESET_LINK(REQUEST_POST('email'));
 
                // Output result
-               LOAD_TEMPLATE("admin_settings_saved", false, $OUT);
+               LOAD_TEMPLATE('admin_settings_saved', false, $OUT);
        } elseif (REQUEST_ISSET_GET(('hash'))) {
                // Output form for hash validation
                LOAD_TEMPLATE("admin_validate_reset_hash_form", false, REQUEST_GET('hash'));
@@ -172,7 +175,7 @@ if (!isAdminRegistered()) {
                        LOAD_TEMPLATE("admin_reset_password_form", false, $content);
                } else {
                        // Cannot validate the login data and hash
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
                }
        } elseif ((REQUEST_ISSET_POST(('reset_pass'))) && (REQUEST_ISSET_POST(('hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
@@ -184,7 +187,7 @@ if (!isAdminRegistered()) {
                        LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
                } else {
                        // Validation failed
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
                }
        } else {
                // Output reset password form
@@ -199,13 +202,13 @@ if (!isAdminRegistered()) {
 
        if (REQUEST_ISSET_GET(('register'))) {
                // Registration of first admin is done
-               if (REQUEST_GET('register') == "done") LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REGISTER_DONE'));
+               if (REQUEST_GET('register') == "done") LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
        } // END - if
 
        // Check if the admin has submitted data or not
        if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
                REQUEST_SET_POST('ok', "***");
-       }
+       } // END - if
 
        if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != "***")) {
                // All required data was entered so we check his account
@@ -238,7 +241,7 @@ if (!isAdminRegistered()) {
                        destroyAdminSession();
                        break;
 
-               case "pass": // Wrong password
+               case 'pass': // Wrong password
                        REQUEST_SET_POST('ok', $ret);
                        $ret = "{--WRONG_PASS--} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{--ADMIN_RESET_PASS--}</a>]\n";
                        destroyAdminSession();
@@ -251,42 +254,44 @@ if (!isAdminRegistered()) {
        } // END - if
 
        // Error detected?
+       // @TODO Rewrite all these constants
        if ($ret != "done") {
                if (REQUEST_ISSET_POST(('login'))) {
                        define('__LOGIN_VALUE', REQUEST_POST('login'));
                } else {
-                       define('__LOGIN_VALUE', "");
+                       define('__LOGIN_VALUE', '');
                }
 
                if (IS_FORM_SENT()) {
                        // Set messages to zero
-                       $MSG1 = ""; $MSG2 = "";
+                       $loginMessage = ''; $passwdMessage = '';
 
                        // No login entered?
-                       if (!REQUEST_ISSET_POST(('login'))) $MSG1 = getMessage('ADMIN_NO_LOGIN');
+                       if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (REQUEST_POST('ok') == "404")) $MSG1 = $ret;
+                       if ((!empty($ret)) && (REQUEST_POST('ok') == "404")) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!REQUEST_ISSET_POST(('pass'))) $MSG2 = getMessage('ADMIN_NO_PASS');
+                       if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
                        // Or password too short?
-                       if (strlen(REQUEST_POST('pass')) < 4) $MSG2 = getMessage('ADMIN_SHORT_PASS');
+                       if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (REQUEST_POST('ok') == "pass")) $MSG2 = $ret;
+                       if ((!empty($ret)) && (REQUEST_POST('ok') == 'pass')) $passwdMessage = $ret;
 
                        // Load message template
-                       define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
-                       define('__MSG_PASS' , LOAD_TEMPLATE("admin_login_msg", true, $MSG2));
+                       define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $loginMessage));
+                       define('__MSG_PASS' , LOAD_TEMPLATE("admin_login_msg", true, $passwdMessage));
 
                        // Reset variables
-                       $MSG1 = ""; $MSG2 = "";
-               } else {
+                       unset($loginMessage);
+                       unset($passwdMessage);
+               } else {
                        // Set constants to empty for hiding them
-                       define('__MSG_LOGIN', "");
-                       define('__MSG_PASS' , "");
+                       define('__MSG_LOGIN', '');
+                       define('__MSG_PASS' , '');
                }
 
                // Load login form
@@ -334,7 +339,7 @@ if (!isAdminRegistered()) {
                }
        } else {
                // Something went wrong here...
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">{--ADMIN_LOGOUT_FAILED--}</div>");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_fatal\">{--ADMIN_LOGOUT_FAILED--}</div>");
 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
@@ -377,7 +382,7 @@ if (!isAdminRegistered()) {
                addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_NOT_FOUND'));
                break;
 
-       case "pass": // Wrong password
+       case 'pass': // Wrong password
                REQUEST_SET_POST('ok', $ret);
                destroyAdminSession();
                addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));