mailer for session entries. :)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 3cf107659419d803e6af73886255440887e27ad8..ceb238175d7d41aeafa9446a3dc738eaa9db7dd5 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 *
@@ -67,8 +67,8 @@ if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 // Init fatal messages
 initFatalMessages();
 
-// Init message system
-initMessages();
+// Init repository data sub-system
+initRepositoryData();
 
 // Enable HTML templates by default
 enableTemplateHtml();
@@ -81,6 +81,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
+       // Init message system
+       initMessages();
+
        // CSS array
        initExtensionCssFiles();
 
@@ -103,20 +106,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--}');
@@ -126,7 +115,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                        addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
                }
        } else {
-               // Maybe you forgot to enter your MySQL data?
+               // Maybe you forgot to enter your database login?
                addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
@@ -142,8 +131,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // CFG: DATABASE-TYPE
        setConfigEntry('_DB_TYPE', 'mysql3');
 
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
+       // Init message system
+       initMessages();
+
        // Include more
-       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
+       foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
                // Load the include
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach