Fixes some HTML errors, shell scripts cleaned up

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index bf5eab0d17391b52d36974519a19eb4418a79c9d..13f64f1146c8cbad1b3e97e067f7adef79d546d1 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -72,7 +72,7 @@ if (!isAdminRegistered()) {
                // Check if registration wents fine
                switch ($ret) {
                        case 'done':
-                               $done = changeDataInFile(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+                               $done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
                                if ($done === true) {
                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
@@ -354,7 +354,7 @@ if (!isAdminRegistered()) {
        }
 } else {
        // Maybe an Admin want's to login?
-       $ret = ifAdminCookiesAreValid(getSession('admin_id'), getSession('admin_md5'));
+       $ret = ifAdminCookiesAreValid(getCurrentAdminId(), getAdminMd5());
 
        // Check status
        switch ($ret) {
@@ -384,7 +384,7 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_id')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
                        destroyAdminSession();
                        break;