More misc fixes and rewrites (sorry, lame description)

[mailer.git] / admin.php

diff --git a/admin.php b/admin.php
index 29886806c58f3d5a2ff8180e9a53b96e73d47a48..410750546d207d7e17bcbf61f11ad16af14b7ac2 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -36,37 +36,30 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 

-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here

 require('inc/libs/security_functions.php');
 
 require('inc/libs/security_functions.php');
 

-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-

 // Set module
 $GLOBALS['module'] = 'admin';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 // Set module
 $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?
 
 // Is the script installed?

-if (isInstalled()) {
-       // Is the admin logged-in and no sql_patches installed?
-       if ((IS_ADMIN()) && (!EXT_IS_ACTIVE('sql_patches'))) {
-               // Extension 'sql_patches' is missing!
-               LOAD_URL("modules.php?module=admin&sql_patches=1");
-       } else {
-               // Default redirect
-               LOAD_URL("modules.php?module=admin");
-       }
-} else {
+if (!isInstalled()) {

        // You have to install first!
        // You have to install first!

-       LOAD_URL('install.php');
-}
+       redirectToUrl('install.php');
+} // END - if

 
 

-// Really all done here... ;-)
-shutdown();
+// 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');
+}

 
 

-//
+// [EOF]

 ?>
 ?>