X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-sql_patches.php;h=a4b5179c539057bbb149378c517aa65f8d919b06;hp=c2c69b44947a4548f5cbba3eb7d3a54d7b3701c0;hb=58b29a924c48e7c1ce38c435c92e541b53984c56;hpb=c7f21c9eb494d8466447c1a199ec5621440d7ac8

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index c2c69b4494..a4b5179c53 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -39,13 +39,13 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])))
 }
 
 // Version number
-$EXT_VERSION = "0.4.1";
+$EXT_VERSION = "0.4.2";
 
 // Auto-set extension version
 if (!isset($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1", "0.4.2");
 
 switch ($EXT_LOAD_MODE)
 {
@@ -477,7 +477,7 @@ PRIMARY KEY (id)
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rand_no bigint(20) not null default '0'";
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD file_hash varchar(255) not null default ''";
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD master_salt varchar(255) not null default ''";
-		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_config SET rand_no=(ROUND(RAND() * 99999) + 100000) WHERE config='0' LIMIT 1";
+		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_config SET rand_no=(ROUND(RAND() * 99999) + 100000) WHERE config=0 LIMIT 1";
 		$SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_mod_reg ADD has_menu enum('Y', 'N') NOT NULL default 'N'";
 		$SQLs[] = "UPDATE "._MYSQL_PREFIX."_mod_reg SET has_menu='Y' WHERE module='admin' OR module='index' OR module='login' LIMIT 3";
 
@@ -521,50 +521,54 @@ PRIMARY KEY (id)
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Tabellen-Schlüssel neu gesetzt und Parsing-Zeit im Footer eingeblendet.";
 		break;
+
+	case "0.4.2": // SQL queries for v0.4.2
+		$SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_online` ADD INDEX `admin_member` (`is_admin`, `is_member`)";
+		break;
 	}
 	break;
 
 default: // Do stuff when extension is loaded
-	$DUMMY = LOAD_CONFIG("0");
+	$dummy = LOAD_CONFIG();
 
 	// When the sql_patches is not installed we cannot load it's configuration... *sigh*
 	if (GET_EXT_VERSION("sql_patches") != "") {
-		$CONFIG['ext_autopurge']     = $DUMMY['ext_autopurge'];
-		$CONFIG['mails_page']        = $DUMMY['mails_page'];
-		$CONFIG['index_home']        = $DUMMY['index_home'];
-		$CONFIG['verbose_sql']       = $DUMMY['verbose_sql'];
-		$CONFIG['middot']            = $DUMMY['menu_blur_spacer'];
-		$CONFIG['reg_points_mode']   = $DUMMY['reg_points_mode'];
-		$CONFIG['index_delay']       = $DUMMY['index_delay'];
-		$CONFIG['index_cookie']      = $DUMMY['index_cookie'];
-		$CONFIG['def_refid']         = $DUMMY['def_refid'];
-		$CONFIG['refid_target']      = $DUMMY['refid_target'];
-		$CONFIG['default_theme']     = $DUMMY['default_theme'];
-		$CONFIG['title_decoration']  = $DUMMY['enable_title_deco'];
-		$CONFIG['title_mod_show']    = $DUMMY['enable_mod_title'];
-		$CONFIG['title_what_show']   = $DUMMY['enable_what_title'];
-		$CONFIG['title_left']        = $DUMMY['title_left'];
-		$CONFIG['title_middle']      = $DUMMY['title_middle'];
-		$CONFIG['title_right']       = $DUMMY['title_right'];
-		$CONFIG['mad_counter']       = $DUMMY['mad_count'];
-		$CONFIG['last_mad']          = $DUMMY['mad_timestamp'];
-		$CONFIG['css_php']           = $DUMMY['css_php'];
-		$CONFIG['guest_menu']        = $DUMMY['guest_menu'];
-		$CONFIG['member_menu']       = $DUMMY['member_menu'];
-		$CONFIG['youre_here']        = $DUMMY['youre_here'];
-		$CONFIG['img_type']          = $DUMMY['img_type'];
-		$CONFIG['stats_limit']       = $DUMMY['stats_limit'];
-		$CONFIG['admin_menu']        = $DUMMY['admin_menu'];
-		$CONFIG['admin_menu_sorter'] = $DUMMY['admin_menu_sorter'];
-		$CONFIG['salt_length']       = $DUMMY['salt_length'];
-		$CONFIG['pass_scramble']     = trim($DUMMY['pass_scramble']);
-		$CONFIG['file_hash']         = trim($DUMMY['file_hash']);
-		$CONFIG['master_salt']       = trim($DUMMY['master_salt']);
-		$CONFIG['secret_key']        = "";
-		$CONFIG['show_timings']      = $DUMMY['show_timings'];
+		$_CONFIG['ext_autopurge']     = $dummy['ext_autopurge'];
+		$_CONFIG['mails_page']        = $dummy['mails_page'];
+		$_CONFIG['index_home']        = $dummy['index_home'];
+		$_CONFIG['verbose_sql']       = $dummy['verbose_sql'];
+		$_CONFIG['middot']            = $dummy['menu_blur_spacer'];
+		$_CONFIG['reg_points_mode']   = $dummy['reg_points_mode'];
+		$_CONFIG['index_delay']       = $dummy['index_delay'];
+		$_CONFIG['index_cookie']      = $dummy['index_cookie'];
+		$_CONFIG['def_refid']         = $dummy['def_refid'];
+		$_CONFIG['refid_target']      = $dummy['refid_target'];
+		$_CONFIG['default_theme']     = $dummy['default_theme'];
+		$_CONFIG['title_decoration']  = $dummy['enable_title_deco'];
+		$_CONFIG['title_mod_show']    = $dummy['enable_mod_title'];
+		$_CONFIG['title_what_show']   = $dummy['enable_what_title'];
+		$_CONFIG['title_left']        = $dummy['title_left'];
+		$_CONFIG['title_middle']      = $dummy['title_middle'];
+		$_CONFIG['title_right']       = $dummy['title_right'];
+		$_CONFIG['mad_counter']       = $dummy['mad_count'];
+		$_CONFIG['last_mad']          = $dummy['mad_timestamp'];
+		$_CONFIG['css_php']           = $dummy['css_php'];
+		$_CONFIG['guest_menu']        = $dummy['guest_menu'];
+		$_CONFIG['member_menu']       = $dummy['member_menu'];
+		$_CONFIG['youre_here']        = $dummy['youre_here'];
+		$_CONFIG['img_type']          = $dummy['img_type'];
+		$_CONFIG['stats_limit']       = $dummy['stats_limit'];
+		$_CONFIG['admin_menu']        = $dummy['admin_menu'];
+		$_CONFIG['admin_menu_sorter'] = $dummy['admin_menu_sorter'];
+		$_CONFIG['salt_length']       = $dummy['salt_length'];
+		$_CONFIG['pass_scramble']     = trim($dummy['pass_scramble']);
+		$_CONFIG['file_hash']         = trim($dummy['file_hash']);
+		$_CONFIG['master_salt']       = trim($dummy['master_salt']);
+		$_CONFIG['secret_key']        = "";
+		$_CONFIG['show_timings']      = $dummy['show_timings'];
 
 		// Read key from secret file
-		if ((empty($CONFIG['file_hash'])) || (empty($CONFIG['master_salt'])) || (empty($CONFIG['pass_scramble'])))
+		if ((empty($_CONFIG['file_hash'])) || (empty($_CONFIG['master_salt'])) || (empty($_CONFIG['pass_scramble'])))
 		{
 			// Maybe need setup of secret key!
 			require_once(PATH."inc/gen_sql_patches.php");
@@ -574,46 +578,46 @@ default: // Do stuff when extension is loaded
 				// Remove extensions and mod_reg cache file
 				require_once(PATH."inc/libs/cache_functions.php");
 				require_once(PATH."inc/extensions/ext-cache.php");
-				if ($CACHE->cache_file("extensions", true)) $CACHE->cache_destroy();
-				if ($CACHE->cache_file("mod_reg", true)) $CACHE->cache_destroy();
+				if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
+				if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
 			}
 		}
 
 		// Test again
-		if ((!empty($CONFIG['file_hash'])) && (!empty($CONFIG['master_salt'])) && (!empty($CONFIG['pass_scramble'])))
+		if ((!empty($_CONFIG['file_hash'])) && (!empty($_CONFIG['master_salt'])) && (!empty($_CONFIG['pass_scramble'])))
 		{
 			// File hash fas generated so we can also file the secret file... hopefully.
-			if ((file_exists(PATH."inc/.secret/.".$CONFIG['file_hash'])) && (is_readable(PATH."inc/.secret/.".$CONFIG['file_hash'])))
+			if ((file_exists(PATH."inc/.secret/.".$_CONFIG['file_hash'])) && (is_readable(PATH."inc/.secret/.".$_CONFIG['file_hash'])))
 			{
-				$CONFIG['secret_key'] = implode("", file(PATH."inc/.secret/.".$CONFIG['file_hash']));
+				$_CONFIG['secret_key'] = implode("", file(PATH."inc/.secret/.".$_CONFIG['file_hash']));
 			}
 			 else
 			{
 				// Cannot read secret file!
-				die("Cannot read secret file!");
+				mxchange_die("Cannot read secret file!");
 			}
 		}
 
 		// Transfer words/numbers to constants
-		define('POINTS'  , $DUMMY['points_word']);
-		define('MT_WORD' , $DUMMY['mt_word']);
-		define('MT_WORD2', $DUMMY['mt_word2']);
-		define('MT_WORD3', $DUMMY['mt_word3']);
-		define('_MAX'    , $DUMMY['rand_no']);
+		define('POINTS'  , $dummy['points_word']);
+		define('MT_WORD' , $dummy['mt_word']);
+		define('MT_WORD2', $dummy['mt_word2']);
+		define('MT_WORD3', $dummy['mt_word3']);
+		define('_MAX'    , $dummy['rand_no']);
 	} else {
 	   	// Set some lame ;-) default settings
-		$CONFIG['def_refid'] = 0;
-		$CONFIG['title_decoration'] = 'N';
-		$CONFIG['title_mod_show']   = 'Y';
-		$CONFIG['title_middle']     = "-";
-		//$CONFIG['verbose_sql']      = 'N';
+		$_CONFIG['def_refid'] = 0;
+		$_CONFIG['title_decoration'] = 'N';
+		$_CONFIG['title_mod_show']   = 'Y';
+		$_CONFIG['title_middle']     = "-";
+		//$_CONFIG['verbose_sql']      = 'N';
 		define('MT_WORD' , DEFAULT_MT_WORD );
 		define('MT_WORD2', DEFAULT_MT_WORD2);
 		define('POINTS'  , DEFAULT_POINTS);
 	}
 
 	// Remove dummy config array
-	unset($DUMMY);
+	unset($dummy);
 	break;
 }