Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / admin.php

diff --git a/admin.php b/admin.php
index f73daff9086a152e9fb56ffc18ec297748ce9a27..410750546d207d7e17bcbf61f11ad16af14b7ac2 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Administrationsbereich                           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                  *
@@ -31,31 +36,30 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
-
-// Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+// Load security stuff here
+require('inc/libs/security_functions.php');
 
 // Set module
-$GLOBALS['module'] = "admin"; $CSS = -1;
+$GLOBALS['module'] = 'admin';
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require('inc/config-global.php');
 
 // Is the script installed?
-if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed')))
-{
-       // Simply redirect... :-)
-       LOAD_URL("modules.php?module=admin&action=login");
-       // Redirection should be done here
-}
- else
-{
-       // You have to configure first!
-       LOAD_URL("install.php");
+if (!isInstalled()) {
+       // You have to install first!
+       redirectToUrl('install.php');
+} // END - if
+
+// Is the admin logged-in and no sql_patches installed?
+if ((IS_ADMIN()) && (!EXT_IS_ACTIVE('sql_patches'))) {
+       // Extension 'sql_patches' is missing!
+       redirectToUrl('modules.php?module=admin&sql_patches=1');
+} else {
+       // Default redirect
+       redirectToUrl('modules.php?module=admin');
 }
 
-// Really all done here... ;-)
+// [EOF]
 ?>