X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=admin.php;h=3f69ae14fadc40c9c11989327c7def1f4716edc4;hb=b6a10f5ccfe2ff6e9e5c43f42e33966ae25ffbaa;hp=9ae71294abbc7626a6f0edbb36e9f74ccbd50195;hpb=05e9ddd952a47d42b9970a9d2afef20d77d3aecf;p=mailer.git

diff --git a/admin.php b/admin.php
index 9ae71294ab..3f69ae14fa 100644
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/27/2004 *
- * ===============                              Last change: 04/26/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 03/27/2004 *
+ * ===================                          Last change: 04/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin.php                                        *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,34 +40,24 @@
 // Load security stuff here
 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)
-require('inc/config.php');
+require('inc/config-global.php');
+
+// Set content type for e.g. search engines
+setContentType('text/html');
 
-// 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!
-		redirectToUrl('modules.php?module=admin&amp;sql_patches=1');
-	} else {
-		// Default redirect
-		redirectToUrl('modules.php?module=admin');
-	}
+// Is the admin logged-in and no sql_patches installed?
+if ((isAdmin()) && (!isExtensionActive('sql_patches'))) {
+	// Extension 'sql_patches' is missing!
+	redirectToUrl('modules.php?module=admin&amp;sql_patches=1');
 } else {
-	// You have to install first!
-	redirectToUrl('install.php');
+	// Default redirect
+	redirectToUrl('modules.php?module=admin');
 }
 
-// Really all done here... ;-)
-shutdown();
-
-//
+// [EOF]
 ?>