X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=6e257ae8042df648001cd7537f94dedb6b0c2880;hp=6bcae05430d7de23000b7efa94aa674a3dc0b844;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=aea4f2a51ffa6f483056c6ce167c8c6fd8ca6129;ds=sidebyside

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6bcae05430..6e257ae804 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -48,7 +48,7 @@ require('inc/functions.php');
 // Load more function libraries or includes
 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('inc/' . $lib . '.php');
+	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
 
 // Set error handler
@@ -106,24 +106,24 @@ if ((!isInstalling()) && (isInstalled())) {
 				loadConfiguration();
 
 				// Load "databases" aka static arrays
-				LOAD_INC_ONCE('inc/databases.php');
+				loadIncludeOnce('inc/databases.php');
 
 				// Init session
-				LOAD_INC_ONCE('inc/session.php');
+				loadIncludeOnce('inc/session.php');
 
 				// Load versions
-				LOAD_INC_ONCE('inc/versions.php');
+				loadIncludeOnce('inc/versions.php');
 
 				// Loading patching system is required here...
-				LOAD_INC_ONCE('inc/patch-system.php'); // Initialize patch system
+				loadIncludeOnce('inc/patch-system.php'); // Initialize patch system
 
 				// Run daily reset
-				LOAD_INC_ONCE('inc/check-reset.php');
+				loadIncludeOnce('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');
+					loadIncludeOnce('inc/modules/admin/admin-inc.php');
 				} // END - if
 				//* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
 				//* DEBUG: */ die();
@@ -131,8 +131,8 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Get all values
 				if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
 					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']);
+					if (empty($GLOBALS['what']))    $GLOBALS['what']   = getWhatFromModule($GLOBALS['module']);
+					if (empty($GLOBALS['action']))  $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
 				} else {
 					// Set action/what to empty
 					$GLOBALS['action'] = '';
@@ -143,11 +143,11 @@ if ((!isInstalling()) && (isInstalled())) {
 				runFilterChain('init');
 
 				// Set default 'what' value
-				//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
+				//* DEBUG: */ OUTPUT_HTML('-'.$GLOBALS['module'].'/'.$GLOBALS['what']."-<br />");
 				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
 					if ($GLOBALS['module'] == 'admin') {
 						// Set 'action' value to 'login' in admin menu
-						$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
+						$GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
 					} elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
 						// Set 'what' value to 'welcome' in guest and member menu
 						$GLOBALS['what'] = 'welcome';
@@ -159,7 +159,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				} // 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')) loadIncludeOnce('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
@@ -197,30 +197,30 @@ if ((!isInstalling()) && (isInstalled())) {
 	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
 
 	// Include databases.php
-	LOAD_INC_ONCE('inc/databases.php');
+	loadIncludeOnce('inc/databases.php');
 
 	// Init session
-	LOAD_INC_ONCE('inc/session.php');
+	loadIncludeOnce('inc/session.php');
 
 	// Load versions
-	LOAD_INC_ONCE('inc/versions.php');
+	loadIncludeOnce('inc/versions.php');
 
 	// Check if we are in installation routine
 	if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
 		// Redirect to the installation system
-		LOAD_URL('install.php');
+		redirectToUrl('install.php');
 	} // END - if
 
 	// Double-check installation mode
 	if ((!isInstalled()) || (!isAdminRegistered())) {
 		// Check for file permissions
-		if (!IS_INC_WRITEABLE('config')) {
+		if (!isIncludeWriteable('config')) {
 			addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
 		} // END - if
-		if (!IS_INC_WRITEABLE('dummy')) {
+		if (!isIncludeWriteable('dummy')) {
 			addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
 		} // END - if
-		if (!IS_INC_WRITEABLE('.secret/dummy')) {
+		if (!isIncludeWriteable('.secret/dummy')) {
 			addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
 		} // END - if
 	} // END - if
@@ -234,9 +234,9 @@ if ((!isInstalling()) && (isInstalled())) {
 
 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');
+	loadIncludeOnce('inc/header.php');
+	loadIncludeOnce('inc/fatal_errors.php');
+	loadIncludeOnce('inc/footer.php');
 } // END - if
 
 //