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

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 4dd0b55cf7bec103ebfca561a49ce2840a78ad9a..0a4994c7ab6e490e3fd3a024052964eedd9de83d 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -113,7 +113,7 @@ if (!isAdminRegistered()) {
                if (REQUEST_ISSET_POST(('login'))) {
                        define('__LOGIN_VALUE', REQUEST_POST('login'));
                } else {
-                       define('__LOGIN_VALUE', "");
+                       define('__LOGIN_VALUE', '');
                }
 
                // Yet-another "Notice" fix
@@ -135,15 +135,15 @@ if (!isAdminRegistered()) {
                        define('__MSG_PASS',  LOAD_TEMPLATE("admin_login_msg", true, $passwdMessage));
 
                        // Reset variables
-                       $loginMessage = ""; $passwdMessage = "";
+                       $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_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
 
                // Load register template
                LOAD_TEMPLATE("admin_reg_form");
@@ -155,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'));
@@ -175,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
@@ -187,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
@@ -202,7 +202,7 @@ 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
@@ -241,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();
@@ -259,12 +259,12 @@ if (!isAdminRegistered()) {
                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
-                       $loginMessage = ""; $passwdMessage = "";
+                       $loginMessage = ''; $passwdMessage = '';
 
                        // No login entered?
                        if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
@@ -279,7 +279,7 @@ if (!isAdminRegistered()) {
                        if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (REQUEST_POST('ok') == "pass")) $passwdMessage = $ret;
+                       if ((!empty($ret)) && (REQUEST_POST('ok') == 'pass')) $passwdMessage = $ret;
 
                        // Load message template
                        define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $loginMessage));
@@ -290,8 +290,8 @@ if (!isAdminRegistered()) {
                        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
@@ -339,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'));
@@ -382,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'));