projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Some functions rewritten to hungarian notation, handling of array rewritten
[mailer.git] / inc / modules / admin.php
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index a117d14b8970864db74e0f9614b4f0a2520fa90e..9bb05dc9ec0814cf6ddd19103a2d8452f32abc84 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");
-}
+} // END - if
 
 // Load include file
 require_once(PATH."inc/modules/admin/admin-inc.php");
 
 // Load include file
 require_once(PATH."inc/modules/admin/admin-inc.php");
@@ -49,6 +49,10 @@ require_once(PATH."inc/modules/admin/admin-inc.php");
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
+// Init return value
+$ret = "init";
+
+// Is no admin registered?
 if (!isBooleanConstantAndTrue('admin_registered')) {
        // Admin is not registered so we have to inform the user
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
 if (!isBooleanConstantAndTrue('admin_registered')) {
        // Admin is not registered so we have to inform the user
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
@@ -57,10 +61,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                $hashedPass = md5($_POST['pass']);
 
                // Kill maybe existing session variables
                $hashedPass = md5($_POST['pass']);
 
                // Kill maybe existing session variables
-               set_session('admin_login'       , "");
-               set_session('admin_md5'         , "");
-               set_session('admin_last'        , "");
-               set_session('admin_to'          , "");
+               DESTROY_ADMIN_SESSION(false);
 
                // Do registration
                $ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
 
                // Do registration
                $ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
@@ -70,7 +71,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if (!_FATAL) {
                                // Registering is done
                        admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if (!_FATAL) {
                                // Registering is done
-                               LOAD_URL(URL."/modules.php?module=admin&amp;action=login&register=done");
+                               LOAD_URL("modules.php?module=admin&amp;action=login&register=done");
                        } else {
                                $ret = ADMIN_CANNOT_COMPLETE;
                        }
                        } else {
                                $ret = ADMIN_CANNOT_COMPLETE;
                        }
@@ -86,18 +87,20 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Admin does already exists!
                                $ret = ADMIN_LOGIN_ALREADY_REG;
                        } else {
                                // Admin does already exists!
                                $ret = ADMIN_LOGIN_ALREADY_REG;
                        } else {
-                               // Any other kind
+                               // Any other kind will be logged and interpreted as 'done'
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+                               // @TODO Why is this set to 'done'?
                                $ret = "done";
                        }
 
                                $ret = "done";
                        }
 
+                       // Admin still not registered?
                        if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Write to config that registration is done
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
                        if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Write to config that registration is done
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
-                               $URL = URL."/modules.php?module=admin&amp;action=login";
-                               LOAD_URL($URL);
-                       }
+                               LOAD_URL("modules.php?module=admin&amp;action=login");
+                       } // END - if
                        break;
                }
        }
                        break;
                }
        }
@@ -189,30 +192,31 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        // At leat one administrator account was created
        if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
                // Timeout for last login, we have to logout first!
        // At leat one administrator account was created
        if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
                // Timeout for last login, we have to logout first!
-               $URL = URL."/modules.php?module=admin&amp;action=login&amp;logout=1";
-               LOAD_URL($URL);
-       }
+               LOAD_URL("modules.php?module=admin&amp;action=login&amp;logout=1");
+       } // END - if
+
        if (!empty($_GET['register'])) {
                // Registration of first admin is done
                if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
        } // END - if
 
        // Check if the admin has submitted data or not
        if (!empty($_GET['register'])) {
                // Registration of first admin is done
                if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
        } // END - if
 
        // Check if the admin has submitted data or not
-       $ret = "";
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
                // All required data was entered so we check his account
                $ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
                // All required data was entered so we check his account
                $ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
+
+               // Which status do we have?
                switch ($ret)
                {
                case "done": // Admin and password are okay, so we log in now
                        // Construct URL and redirect
                switch ($ret)
                {
                case "done": // Admin and password are okay, so we log in now
                        // Construct URL and redirect
-                       $URL = URL."/modules.php?module=admin&amp;";
+                       $URL = "modules.php?module=admin&amp;";
 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == "overview") {
                                $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == "overview") {
                                $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
-                       }
+                       } // END - if
 
                        // Add data to URL
                        if (!empty($GLOBALS['what'])) $URL .= "what=".$GLOBALS['what'];
 
                        // Add data to URL
                        if (!empty($GLOBALS['what'])) $URL .= "what=".$GLOBALS['what'];
@@ -226,14 +230,22 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
                        $ret = ADMIN_NOT_FOUND;
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
                        $ret = ADMIN_NOT_FOUND;
+                       DESTROY_ADMIN_SESSION();
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+                       DESTROY_ADMIN_SESSION();
                        break;
                        break;
-               }
-       }
+
+               default: // Others will be logged
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+                       break;
+               } // END - switch
+       } // END - if
+
+       // Error detected?
        if ($ret != "done") {
                if (!empty($_POST['login'])) {
                        define('__LOGIN_VALUE', $_POST['login']);
        if ($ret != "done") {
                if (!empty($_POST['login'])) {
                        define('__LOGIN_VALUE', $_POST['login']);
@@ -243,8 +255,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                if (isset($_POST['ok'])) {
                        // Set messages to zero
 
                if (isset($_POST['ok'])) {
                        // Set messages to zero
-
                        $MSG1 = ""; $MSG2 = "";
                        $MSG1 = ""; $MSG2 = "";
+
                        // No login entered?
                        if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
 
                        // No login entered?
                        if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
 
@@ -294,19 +306,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                // Load login form template
                LOAD_TEMPLATE("admin_login_form", false, $content);
 
                // Load login form template
                LOAD_TEMPLATE("admin_login_form", false, $content);
-       }
+       } // END - if
 } elseif (isset($_GET['logout'])) {
        // Only try to remove cookies
 } elseif (isset($_GET['logout'])) {
        // Only try to remove cookies
-       if (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) {
-               // Also remove array elements
-               set_session('admin_login', "");
-               set_session('admin_md5'  , "");
-               set_session('admin_last' , "");
-               set_session('admin_to'   , "");
-
-               // Destroy session
-               @session_destroy();
-
+       if (DESTROY_ADMIN_SESSION()) {
                // Load logout template
                if (isset($_GET['register'])) {
                        // Secure input
                // Load logout template
                if (isset($_GET['register'])) {
                        // Secure input
@@ -329,7 +332,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message
-               ADD_FATAL(CANNOT_UNREG_SESS);
+               addFatalMessage(CANNOT_UNREG_SESS);
        }
 } else {
        // Maybe an Admin want's to login?
        }
 } else {
        // Maybe an Admin want's to login?
@@ -337,69 +340,49 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        switch ($ret)
        {
        case "done":
        switch ($ret)
        {
        case "done":
-               // Cookie-Data accepted
-               if ((set_session("admin_md5", get_session('admin_md5'))) && (set_session("admin_login", get_session('admin_login'))) && (set_session("admin_last", time())) && (set_session("admin_to", bigintval(get_session('admin_to'))))) {
-                       // Ok, Cookie-Update done
-                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
-                               // Check if action GET variable was set
-                               $act = SQL_ESCAPE($GLOBALS['action']);
-                               if (!empty($GLOBALS['what'])) {
-                                       // Get action value by what-value
-                                       $act = GET_ACTION("admin", $GLOBALS['what']);
-                               }
-
-                               // Check for access control line of current menu entry
-                               define('__ACL_ALLOW', ADMINS_CHECK_ACL($act, $GLOBALS['what']));
-                       } else {
-                               // Extension not installed so it's always allowed to access everywhere!
-                               define('__ACL_ALLOW', true);
-                       }
+               // Check for access control line of current menu entry
+               define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));
 
 
-                       // When type of admin menu is not set fallback to old menu system
-                       if (empty($_CONFIG['admin_menu'])) $_CONFIG['admin_menu'] = "OLD";
+               // When type of admin menu is not set fallback to old menu system
+               if (getConfig('admin_menu') == null) $_CONFIG['admin_menu'] = "OLD";
 
 
-                       // Check for version and switch between old menu system and new "intelligent menu system"
-                       if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (file_exists(PATH."inc/modules/admin/la_sys-inc.php"))) {
-                               // Default area is the entrance, of course
-                               $area = "entrance";
+               // Check for version and switch between old menu system and new "intelligent menu system"
+               if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
+                       // Default area is the entrance, of course
+                       $area = "entrance";
 
 
-                               // Check for similar URL variable
-                               if (!empty($_GET['area'])) $area = $_GET['area'];
+                       // Check for similar URL variable
+                       if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
 
 
-                               // Load "logical-area menu-system" file
-                               require_once(PATH."inc/modules/admin/la_sys-inc.php");
+                       // Load "logical-area menu-system" file
+                       require_once(PATH."inc/modules/admin/lasys-inc.php");
 
 
-                               // Create new-style menu system will "logical areas"
-                               ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
-                       } else {
-                               // This little call constructs the whole default old and lacky menu system
-                               // on left side
-                               ADMIN_DO_ACTION($GLOBALS['what']);
-                       }
+                       // Create new-style menu system will "logical areas"
+                       ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
                } else {
                } else {
-                       // Login failed (cookies enabled?)
-                       OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
-                       ADD_FATAL(CANNOT_RE_REGISTER_SESS);
+                       // This little call constructs the whole default old and lacky menu system
+                       // on left side
+                       ADMIN_DO_ACTION($GLOBALS['what']);
                }
                break;
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                }
                break;
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
-               ADD_FATAL(ADMIN_NOT_FOUND);
+               DESTROY_ADMIN_SESSION();
+               addFatalMessage(ADMIN_NOT_FOUND);
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
-               ADD_FATAL(WRONG_PASS);
+               DESTROY_ADMIN_SESSION();
+               addFatalMessage(WRONG_PASS);
+               break;
+
+       default: // Others will be logged
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
                break;
        }
 }
 
                break;
        }
 }
 
-if (isBooleanConstantAndTrue('admin_registered'))
-{
-       // Check config.php and inc directory for right access rights
-       if (is_INCWritable("config"))     ADD_FATAL(FATAL_CONFIG_WRITABLE);
-       if (is_INCWritable("dummy"))      ADD_FATAL(FATAL_INC_WRITABLE);
-}
 //
 ?>
 //
 ?>
Mailer-Project repository