Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 076faa56f2d88f519300a1c722deb7cc1e4eb066..8ab0fd974f965a01490c21d904cbeaf3f9aa3b60 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -14,11 +14,9 @@
  * $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 - 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 *
@@ -43,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
@@ -64,13 +62,15 @@ 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();
 
-// Init message system
-initMessages();
+// Init repository data sub-system
+initRepositoryData();
 
 // Enable HTML templates by default
 enableTemplateHtml();
@@ -83,6 +83,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
+       // Init message system
+       initMessages();
+
        // CSS array
        initExtensionCssFiles();
 
@@ -97,7 +100,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
-                               // This is required for extension 'optimize' to work
+                               // Set database name (required for ext-optimize and isSqlTableCreated())
                                setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
                                // Remove MySQL array from namespace
@@ -105,31 +108,17 @@ 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--}');
+                               debug_report_bug(__FILE__, __LINE__, 'Wrong database selected.');
                        }
                } else {
                        // No link to database!
-                       addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
+                       debug_report_bug(__FILE__, __LINE__, 'Database link is not yet up.');
                }
        } else {
-               // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
+               // Maybe you forgot to enter your database login?
+               debug_report_bug(__FILE__, __LINE__, 'Database login is missing.');
        }
 } else {
        // Default output is 'direct' for HTML output
@@ -144,14 +133,23 @@ 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('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
+       // Check wether we are in installation routine
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+               // Redirect to the URL
+               redirectToUrl('install.php');
+       } // END - if
 }
 
 // Handle fatal errors