X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=3d00c3ca4643ee255b9ae45674e5d8a745c6d136;hb=8454545089b9b77695498cd855cf50075151d957;hp=9db7dff257043192bb2cfd845fb5973c552fe54b;hpb=c14a130863bb037b00fceabd099a202eb4a5b2d8;p=mailer.git
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 9db7dff257..3d00c3ca46 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,18 +40,17 @@ if (!defined('__SECURITY')) {
// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
define('DEBUG_SQL', false);
-// Default is not a frameset
-global $isFrameset;
-$isFrameset = false;
-
-// Load library
+// Load database library
require_once(PATH."inc/db/lib.php");
-// Load general functions
-require_once(PATH."inc/functions.php"); // Non-database functions
+// Non-database functions
+require_once(PATH."inc/functions.php");
+
+// Filter functions
+require_once(PATH."inc/filters.php");
-// Load more include files
-require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database
+// Functions which interact with the database
+require_once(PATH."inc/mysql-manager.php");
// Load extensions and language
require_once(PATH."inc/extensions.php");
@@ -75,7 +74,7 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
die("Error message written to debug.log. Please try to call the main page to continue.");
} else {
// No debug extension found
- print("Please report this error at forum.mxchange.org:");
+ print("Please report this error at bugs.mxchange.org:");
debug_print_backtrace();
die("Thank you for your help finding bugs.");
}
@@ -84,6 +83,25 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
// Set error handler
set_error_handler('__errorHandler');
+// Call-back function for running shutdown functions and close database connection
+function __SHUTDOWN_HOOK () {
+ global $link;
+
+ // Call the filter chain 'shutdown'
+ RUN_FILTER('shutdown', null, false);
+
+ if (is_resource($link)) {
+ // Close link
+ SQL_CLOSE($link, __FILE__, __LINE__);
+ } else {
+ // No database link
+ ADD_FATAL(NO_DB_LINK);
+ }
+}
+
+// Register shutdown hook
+register_shutdown_function('__SHUTDOWN_HOOK');
+
// Check if the user setups his MySQL stuff...
if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// No login entered and outside installation mode
@@ -95,11 +113,18 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
// Please run the installation script (maybe again)
die(DIE_RUN_INSTALL_MYSQL);
}
-} elseif ((!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
// No database password entered!!!
echo "".LANG_WARNING.": ".WARN_NULL_PASSWORD;
}
+// Set dummy $_CONFIG array
+$_CONFIG = array(
+ 'code_length' => 0,
+ 'patch_level' => 0,
+ 'last_update' => time()
+);
+
// Check if this file is writeable or read-only and warn the user
if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// Check for write-permission for config.php and inc directory
@@ -121,12 +146,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Is it a valid resource?
if ($db === true) {
- // Remove MySQL array from namespace
+ // This is required for extension 'optimize' to work
define('__DB_NAME', $MySQL['dbase']);
+
+ // Remove MySQL array from namespace
unset($MySQL);
// Load configuration stuff
- $_CONFIG = LOAD_CONFIG();
+ $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
// Initialize include-file-pool
$INC_POOL = array();
@@ -137,8 +164,17 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Loading patching system is required here...
require_once(PATH."inc/patch-system.php"); // Initialize patch system
- // Functions which are related to themes
- require_once(PATH."inc/theme-manager.php");
+ // Create missing configuration file
+ if (!function_exists('GET_CURR_THEME')) {
+ // Load dummy theme functions
+ require_once(PATH."inc/theme-dummy.php");
+ } // END - if
+
+ // Session management
+ require_once(PATH."inc/session.php");
+
+ // Init filter system
+ INIT_FILTER_SYSTEM();
// Run daily reset
require_once(PATH."inc/check-reset.php");
@@ -148,7 +184,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Administrative functions
require_once(PATH."inc/modules/admin/admin-inc.php");
} // END - if
- //* DEBUG: */ ADD_POINTS_REFSYSTEM(36,1000);
+ //* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
//* DEBUG: */ die();
// Get all values
@@ -162,11 +198,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
$GLOBALS['what'] = "";
}
- // Secure and validate user ID from cookie
- UPDATE_LOGIN_DATA();
-
- // Update online list
- UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
+ // Run the init filter chain
+ RUN_FILTER('init');
// Set default 'what' value
//* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n";
@@ -177,7 +210,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
} elseif (($GLOBALS['module'] == "index") || ($GLOBALS['module'] == "login")) {
// Set 'what' value to 'welcome' in guest and member menu
$GLOBALS['what'] = "welcome";
- if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+ if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
} else {
// Anything else like begging link
$GLOBALS['what'] = "";
@@ -194,7 +227,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
unset($dummy);
// Shall we activate the exchange?
- if ($_CONFIG['activate_xchange'] > 0) activateExchange();
+ 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") {
@@ -235,17 +268,18 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Include neccessary functions for installation //
///////////////////////////////////////////////////
- // Set CONFIG array
- $_CONFIG = array(
- 'code_length' => 0
- );
-
// Set other missing variables
$link = false; // No database link by default
// Include required files
require_once(PATH."inc/databases.php");
- require_once(PATH."inc/theme-manager.php");
+ require_once(PATH."inc/session.php");
+
+ // Create missing configuration file
+ if (!function_exists('GET_CURR_THEME')) {
+ // Load dummy theme functions
+ require_once(PATH."inc/theme-dummy.php");
+ } // END - if
// Check if we are in installation routine
$installPhp = basename($_SERVER['PHP_SELF']);
@@ -257,29 +291,28 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Double-check installation mode
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
// Check for file permissions
- if (!is_INCWritable("config")) {
+ if (!IS_INC_WRITEABLE("config")) {
ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
- }
- if (!is_INCWritable("dummy")) {
+ } // END - if
+ if (!IS_INC_WRITEABLE("dummy")) {
ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
- }
- if (!is_INCWritable(".secret/dummy")) {
+ } // END - if
+ if (!IS_INC_WRITEABLE(".secret/dummy")) {
ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
- }
+ } // END - if
} // END - if
}
// Any fatal messages?
if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1"))
-{
+if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
// One or more fatal error(s) occur during connect...
include (PATH."inc/header.php");
include (PATH."inc/fatal_errors.php");
unset($FATAL);
include (PATH."inc/footer.php");
exit;
-}
+} // END - if
//
?>