Fixed logfile writing in installation phase, .revision is now ignored

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 13924963bdc1a24a0eb83f93205ec93f9bdd2bc8..84c86d8c028c89a9271f1e876938ed9558085309 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Administrationsmodul                             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -61,14 +66,14 @@ if (!isAdminRegistered()) {
                destroyAdminSession(false);
 
                // Do registration
-               $ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass);
+               $ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
                switch ($ret)
                {
                case "done":
                        $done = changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if ($done === true) {
                                // Registering is done
-                               LOAD_URL("modules.php?module=admin&action=login&register=done");
+                               LOAD_URL("modules.php?module=admin&register=done");
                        } else {
                                $ret = getMessage('ADMIN_CANNOT_COMPLETE');
                        }
@@ -96,7 +101,7 @@ if (!isAdminRegistered()) {
                                changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
-                               LOAD_URL("modules.php?module=admin&action=login");
+                               LOAD_URL("modules.php?module=admin");
                        } // END - if
                        break;
                }
@@ -189,7 +194,7 @@ if (!isAdminRegistered()) {
        // 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!
-               LOAD_URL("modules.php?module=admin&action=login&logout=1");
+               LOAD_URL("modules.php?module=admin&logout=1");
        } // END - if
 
        if (REQUEST_ISSET_GET(('register'))) {
@@ -341,7 +346,7 @@ if (!isAdminRegistered()) {
        {
        case "done":
                // Check for access control line of current menu entry
-               $GLOBALS['acl_allow'] = RUN_FILTER('check_admin_acl');
+               $GLOBALS['acl_allow'] = runFilterChain('check_admin_acl');
 
                // When type of admin menu is not set fallback to old menu system
                if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', "OLD");