Renamed templates, more usage of EL

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 7369be9ae6517cdc3d51edbbc2f02b3037f59c96..d10f8b3dc00c64cfe6f66492b2b3a6f2179c900a 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.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 *
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -62,7 +62,9 @@ initRequest();
 initMemberId();
 
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
+if (!isset($GLOBALS['header_sent'])) {
+       $GLOBALS['header_sent'] = '0';
+} // END - if
 
 // Init fatal messages
 initFatalMessages();
@@ -106,20 +108,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
                                // Load cache
                                loadIncludeOnce('inc/load_cache.php');
-
-                               // Check module for permissions
-                               $checkModule = checkModulePermissions();
-
-                               // Admin module should be accessable by guests to login
-                               if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
-                                       // This is fine and can be ignored
-                               } elseif ($checkModule != 'done') {
-                                       // Not fine!
-                                       logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s",
-                                               getModule(),
-                                               $checkModule
-                                       ));
-                               }
                        } else {
                                // Wrong database?
                                addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');