X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=6bcae05430d7de23000b7efa94aa674a3dc0b844;hb=9cfe8dd2ab2dc5b3abb38789c8819adcb797155f;hp=e354d7c9c675c4f32590e7811b4c23da9d5a5649;hpb=f74581eca45c393033acfd9d7798b958031bc625;p=mailer.git
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e354d7c9c6..6bcae05430 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Verbindet zu Ihrer Datenbank *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $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 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,50 +38,40 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
-// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
-define('DEBUG_SQL', false);
-
// Non-database functions
-require("inc/functions.php");
+require('inc/functions.php');
// Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
// Load special functions
- LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
+ LOAD_INC_ONCE('inc/' . $lib . '.php');
} // END - foreach
// Set error handler
set_error_handler('__errorHandler');
-// Register shutdown hook
-register_shutdown_function('__SHUTDOWN_HOOK');
-
// Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) {
+if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
// No login entered and outside installation mode
OUTPUT_HTML("{--LANG_WARNING--}: ");
if (isInstalled()) {
// You have changed my configuration file!
- mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
+ app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
} else {
// Please run the installation script (maybe again)
- mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
+ app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
}
-} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
// No database password entered!!!
OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
}
-// Set dummy $_CONFIG array
-$_CONFIG = array(
- 'code_length' => 0,
- 'patch_level' => 0,
- 'last_update' => time()
-);
+// Set dummy config array
+initConfig();
// Set important header_sent
$GLOBALS['header_sent'] = 0;
@@ -87,7 +82,8 @@ initFatalMessages();
// Check if this file is writeable or read-only and warn the user
if ((!isInstalling()) && (isInstalled())) {
// Check for write-permission for config.php and inc directory
- if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
+ if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
+ if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'index';
// CSS array
EXT_INIT_CSS_FILES();
@@ -107,99 +103,90 @@ if ((!isInstalling()) && (isInstalled())) {
unset($MySQL);
// Load configuration stuff
- mergeConfig(LOAD_CONFIG());
+ loadConfiguration();
// Load "databases" aka static arrays
- LOAD_INC_ONCE("inc/databases.php");
+ LOAD_INC_ONCE('inc/databases.php');
+
+ // Init session
+ LOAD_INC_ONCE('inc/session.php');
+
+ // Load versions
+ LOAD_INC_ONCE('inc/versions.php');
// Loading patching system is required here...
- LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
+ LOAD_INC_ONCE('inc/patch-system.php'); // Initialize patch system
// Run daily reset
- LOAD_INC_ONCE("inc/check-reset.php");
+ LOAD_INC_ONCE('inc/check-reset.php');
// Load admin include file if he is admin
if (IS_ADMIN()) {
// Administrative functions
- LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
+ LOAD_INC_ONCE('inc/modules/admin/admin-inc.php');
} // END - if
- //* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
+ //* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
//* DEBUG: */ die();
// Get all values
if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
- if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty";
+ if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'empty';
if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']);
if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
} else {
// Set action/what to empty
- $GLOBALS['action'] = "";
- $GLOBALS['what'] = "";
+ $GLOBALS['action'] = '';
+ $GLOBALS['what'] = '';
}
// Run the init filter chain
- RUN_FILTER('init');
+ runFilterChain('init');
// Set default 'what' value
//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
- if ($GLOBALS['module'] == "admin") {
+ if ($GLOBALS['module'] == 'admin') {
// Set 'action' value to 'login' in admin menu
$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- } elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) {
+ } elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
// Set 'what' value to 'welcome' in guest and member menu
- $GLOBALS['what'] = "welcome";
- if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
+ $GLOBALS['what'] = 'welcome';
+ if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
} else {
// Anything else like begging link
- $GLOBALS['what'] = "";
+ $GLOBALS['what'] = '';
}
} // END - if
// Update sending pool
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
+ if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) LOAD_INC_ONCE('inc/pool-update.php'); // Sends out mails in configureable steps
// Load all active extension including language files when not upgrading.
// Check module for testing and count one click
- $dummy = CHECK_MODULE($GLOBALS['module']);
- if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
- unset($dummy);
+ if (checkModulePermissions($GLOBALS['module']) == 'done') countModuleHit($GLOBALS['module']);
// Shall we activate the exchange?
if (getConfig('activate_xchange') > 0) activateExchange();
// Is the extension sql_patches installed and at least 0.3.6?
- if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+ if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
// Generate random number
- if (isset($GLOBALS['userid'])) {
- define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
- } else {
- define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
- }
+ define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
} else {
// Generate weak (!!!) code
define('RAND_NUMBER', mt_rand(1000000, 9999999));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// Wrong database?
- addFatalMessage(getMessage('WRONG_DB_SELECTED'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// No link to database!
- addFatalMessage(getMessage('NO_DB_LINK'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// Maybe you forgot to enter your MySQL data?
- addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
}
} else {
///////////////////////////////////////////////////
@@ -207,37 +194,49 @@ if ((!isInstalling()) && (isInstalled())) {
///////////////////////////////////////////////////
// Set other missing variables
- if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
+ if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
// Include databases.php
- LOAD_INC_ONCE("inc/databases.php");
+ LOAD_INC_ONCE('inc/databases.php');
+
+ // Init session
+ LOAD_INC_ONCE('inc/session.php');
+
+ // Load versions
+ LOAD_INC_ONCE('inc/versions.php');
// Check if we are in installation routine
- if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
+ if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
// Redirect to the installation system
- LOAD_URL("install.php");
+ LOAD_URL('install.php');
} // END - if
// Double-check installation mode
if ((!isInstalled()) || (!isAdminRegistered())) {
// Check for file permissions
- if (!IS_INC_WRITEABLE("config")) {
- addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
+ if (!IS_INC_WRITEABLE('config')) {
+ addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
} // END - if
- if (!IS_INC_WRITEABLE("dummy")) {
- addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
+ if (!IS_INC_WRITEABLE('dummy')) {
+ addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
} // END - if
- if (!IS_INC_WRITEABLE(".secret/dummy")) {
- addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
+ if (!IS_INC_WRITEABLE('.secret/dummy')) {
+ addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
} // END - if
} // END - if
+
+ // Run the init filter chain
+ runFilterChain('init');
+
+ // Load extension 'sql_patches'
+ LOAD_EXTENSION('sql_patches');
}
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
// One or more fatal error(s) occur during connect...
- LOAD_INC_ONCE("inc/header.php");
- LOAD_INC_ONCE("inc/fatal_errors.php");
- LOAD_INC_ONCE("inc/footer.php");
+ LOAD_INC_ONCE('inc/header.php');
+ LOAD_INC_ONCE('inc/fatal_errors.php');
+ LOAD_INC_ONCE('inc/footer.php');
} // END - if
//