Some functions rewritten to hungarian notation, handling of array rewritten

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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 31de75a568e6b3037d2ca095c0ba301448b7ba09..fe98128a1ecfdf694383b0bd41b77988cf1888c2 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -202,13 +202,13 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
        // Now set all session variables and return the result
        return (
                (
-                       set_session("admin_md5", generatePassString($passHash))
+                       set_session('admin_md5', generatePassString($passHash))
                ) && (
-                       set_session("admin_login", $adminLogin)
+                       set_session('admin_login', $adminLogin)
                ) && (
-                       set_session("admin_last", time())
+                       set_session('admin_last', time())
                ) && (
-                       set_session("admin_to", bigintval($_POST['timeout']))
+                       set_session('admin_to', bigintval($_POST['timeout']))
                )
        );
 }
@@ -356,16 +356,16 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
-                       ADD_FATAL(ADMIN_ACCESS_DENIED);
+                       addFatalMessage(ADMIN_ACCESS_DENIED);
                } else {
                        // Include file not found! :-(
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
-                       ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+                       addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
                }
        } else {
                // Invalid action/what pair found!
                LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);
-               ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+               addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
        }
 
        // Free memory