X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=27c9a11590503a3265c02848e45ea8baa0b86e26;hb=6d0f60f881e122cc495e027ed5cd21bde9aecf92;hp=2cd8a035afb13dd70bd3819fc8722b0af557c673;hpb=541036af17736c5b61b2b4b54fe1a75b57b94d40;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 2cd8a035af..27c9a11590 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -58,15 +58,24 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
 	// Set current extension name
 	setCurrentExtensionName($ext_name);
 
+	// By default all extensions are in productive phase
+	enableExtensionProductive();
+
 	if (!empty($ext_ver)) {
 		// Set current extension version
 		setCurrentExtensionVersion($ext_ver);
 	} else {
-		// Set it to 0.0
+		// Set it to 0.0 by default
 		setCurrentExtensionVersion('0.0');
 
+		// Is the extension installed?
+		if ((isExtensionInstalled($ext_name)) && ($ext_mode != 'register')) {
+			// Get extension's version
+			setCurrentExtensionVersion(getExtensionVersion($ext_name));
+		} // END - if
+
 		// In all but test-mode we need these messages to debug! Please report all (together, e.g.)
-		if ($ext_mode != 'test') {
+		if (($ext_mode != 'test') && (getCurrentExtensionVersion() == '0.0')) {
 			// Log empty versions not in test-mode, but maybe it is fine...
 			logDebugMessage(__FUNCTION__, __LINE__, 'Extension version is empty, setting to 0.0. ext_name=' . $ext_name . ', ext_mode=' . $ext_mode . ', dry_run=' . intval($dry_run));
 		} // END - if
@@ -125,7 +134,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
 			// Download functions file
 			loadIncludeOnce($funcsInclude);
 		} // END - if
-	} elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getScriptOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
+	} elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (isHtmlOutputMode()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
 		// No functions file is not so good...
 		logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no own functions file or we cannot read from it. mode=%s",
 			$ext_name,
@@ -338,7 +347,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 				setSqlsArray(getExtensionSqls());
 
 				// Run installation pre-installation filters
-				runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun()));
+				runFilterChain('pre_extension_installed', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
 
 				// Register extension
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'insert=' . getCurrentExtensionName() . '/' . getCurrentExtensionVersion() . ' - INSERT!');
@@ -365,6 +374,10 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 
 				// Use the insert id as extension id and cache it for early usage
 				$GLOBALS['cache_array']['extension']['ext_id'][getCurrentExtensionName()] = SQL_INSERTID();
+				$GLOBALS['cache_array']['extension']['ext_name'][SQL_INSERTID()] = getCurrentExtensionName();
+
+				// Mark it as installed
+				$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
 
 				// Remove cache file(s) if extension is active
 				runFilterChain('post_extension_installed', array(
@@ -377,9 +390,6 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 				initExtensionSqls(true);
 				initExtensionNotes(true);
 
-				// Mark it as installed
-				$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
-
 				// In normal mode return a true on success
 				$ret = true;
 			} elseif (isExtensionDryRun() === true) {
@@ -439,20 +449,23 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	} // END - if
 
 	// Init array
-	initExtensionSqls();
+	initExtensionSqls(true);
 
 	// By default no SQL has been executed
 	$sqlRan = false;
 
 	// Load extension in detected mode
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);
 	loadExtension(getCurrentExtensionName(), $load_mode, '', false);
 
 	// Init these SQLs
 	initSqls();
 	setSqlsArray(getExtensionSqls());
 
+	// Debug message
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQLs::count=' . countSqls());
+
+	// Do we have entries?
 	if (isSqlsValid()) {
 		// Run SQL commands...
 		runFilterChain('run_sqls');
@@ -503,6 +516,9 @@ function isExtensionInstalled ($ext_name) {
 		// Look in database
 		$ext_id = getExtensionId($ext_name);
 
+		// Log debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Extension ' . $ext_name . ' has ext_id=' . $ext_id);
+
 		// Do we have a record?
 		$isInstalled = ($ext_id > 0);
 
@@ -601,7 +617,7 @@ function getExtensionVersion ($ext_name, $force = false) {
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
-	} elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getScriptOutputMode() != 0)) {
+	} elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (!isHtmlOutputMode())) {
 		// Load from database
 		$result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
 			array($ext_name), __FUNCTION__, __LINE__);
@@ -720,7 +736,7 @@ function updateExtension ($ext_name, $ext_ver, $dry_run = false) {
 		setSqlsArray(getExtensionSqls());
 
 		// Run SQLs
-		runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun()));
+		runFilterChain('run_sqls', array('dry_run' => isExtensionDryRun(), 'enable_codes' => false));
 
 		if (isExtensionDryRun() === false) {
 			// Run filters on success extension update
@@ -741,7 +757,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 	$OUT = '';
 
 	// Do we have queries?
-	if ((isExtensionInstalledAndNewer('sql_patches', '0.0.7')) && (getConfig('verbose_sql') == 'Y')) {
+	if (isVerboseSqlEnabled()) {
 		// Do we have entries?
 		if (countExtensionSqls() > 0) {
 			// Init counter
@@ -758,7 +774,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 						// Prepare output for template
 						$content = array(
 							'i'   => ($idx + 1),
-							'sql' => $sql
+							'sql' => str_replace('{', '{', str_replace('}', '}', encodeEntities($sql)))
 						);
 
 						// Load row template
@@ -899,38 +915,44 @@ function isExtensionIdValid ($ext_id) {
 
 // Activate given extension
 function doActivateExtension ($ext_name) {
+	// Is the extension installed?
+	if (!isExtensionInstalled($ext_name)) {
+		// Non-installed extensions cannot be activated
+		debug_report_bug(__FUNCTION__, __LINE__, 'Tried to activate non-installed extension ' . $ext_name);
+	} // END - if
+
 	// Activate the extension
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='Y' WHERE `ext_name`='%s' LIMIT 1",
 		array($ext_name), __FUNCTION__, __LINE__);
 
-	// Extension has been activated?
-	if (SQL_AFFECTEDROWS() == 1) {
-		// Then run all queries
-		doExtensionSqls(getExtensionId($ext_name), 'activate');
-	} // END - if
+	// Then run all queries
+	doExtensionSqls(getExtensionId($ext_name), 'activate');
 }
 
 // Deactivate given extension
-function doDeactivateExtension($ext_name) {
+function doDeactivateExtension ($ext_name) {
+	// Is the extension installed?
+	if (!isExtensionInstalled($ext_name)) {
+		// Non-installed extensions cannot be activated
+		debug_report_bug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name);
+	} // END - if
+
 	// Activate the extension
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='%s' LIMIT 1",
 		array($ext_name), __FUNCTION__, __LINE__);
 
-	// Extension has been activated?
-	if (SQL_AFFECTEDROWS() == 1) {
-		// Then run all queries
-		doExtensionSqls(getExtensionId($ext_name), 'deactivate');
+	// Then run all queries
+	doExtensionSqls(getExtensionId($ext_name), 'deactivate');
 
-		// Create new task (we ignore the task id here)
-		createExtensionDeactivationTask($ext_name);
+	// Create new task (we ignore the task id here)
+	createExtensionDeactivationTask($ext_name);
 
-		// Notify the admin
-		sendAdminNotification(
-			'{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
-			'admin_extension_deactivated',
-			array('ext_name' => $ext_name)
-		);
-	} // END - if
+	// Notify the admin
+	sendAdminNotification(
+		'{--ADMIN_EXTENSION_DEACTIVATED_SUBJECT--}',
+		'admin_extension_deactivated',
+		array('ext_name' => $ext_name)
+	);
 }
 
 // Checks wether the extension is older than given
@@ -1076,7 +1098,7 @@ function addExtensionNotes ($ext_ver) {
 	$content = array();
 
 	// Is do we have verbose output enabled?
-	if ((!isExtensionActive('sql_patches')) || (getConfig('verbose_sql') == 'Y')) {
+	if ((!isExtensionActive('sql_patches')) || (isVerboseSqlEnabled())) {
 		// Update notes found?
 		if (isExtensionUpdateNoteSet($ext_ver)) {
 			// Update notes found
@@ -1445,6 +1467,7 @@ function initExtensionSqls ($force = false) {
 // Adds SQLs to the SQLs array but "assigns" it with current extension name
 function addExtensionSql ($sql) {
 	// Add it
+	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
 	$GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()][] = $sql;
 }
 
@@ -1649,7 +1672,7 @@ function ifExtensionHasLanguageFile ($ext_name) {
 		} // END - if
 
 		// Put it in cache
-		$GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = 'Y';
+		$GLOBALS['cache_array']['extension']['ext_lang'][$ext_name] = $readable;
 	}
 
 	// Return result
@@ -1747,7 +1770,7 @@ function addAdminMenuSql ($action, $what, $title, $descr, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s, what=%s detected.", $action, $what));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double admin menu action=%s,what=%s,title=%s detected.", $action, $what, $title));
 	}
 }
 
@@ -1781,7 +1804,7 @@ function addGuestMenuSql ($action, $what, $title, $visible, $locked, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s, what=%s detected.", $action, $what));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active));
 	}
 }
 
@@ -1815,7 +1838,7 @@ function addMemberMenuSql ($action, $what, $title, $visible, $locked, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s, what=%s detected.", $action, $what));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double member menu action=%s,what=%s,title=%s,visivle=%s,locked=%s detected.", $action, $what, $title, $visible, $locked));
 	}
 }
 
@@ -1847,20 +1870,46 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 		addExtensionSql($sql);
 	} elseif (isDebugModeEnabled()) {
 		// Double menus should be located and fixed!
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s, what=%s detected.", $action, $what));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double sponsor menu action=%s,what=%s,title=%s,active=%s detected.", $action, $what, $title, $active));
 	}
 }
 
 // Enables/disables productive mode for current extension (used only while
 // registration).
 function enableExtensionProductive ($isProductive = true) {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%d", getCurrentExtensionName(), intval($isProductive)));
+
+	// Set it
 	$GLOBALS['ext_productive'][getCurrentExtensionName()] = (bool) $isProductive;
 }
 
 // Checks wether the extension is in productive phase. If not set, development
 // phase (=false) is assumed.
-function isExtensionProductive () {
-	return ((isset($GLOBALS['ext_productive'][getCurrentExtensionName()])) && ($GLOBALS['ext_productive'][getCurrentExtensionName()] === true));
+function isExtensionProductive ($ext_name = '') {
+	// Is the extension name empty? Then use current
+	if (empty($ext_name)) {
+		// Get current extension name
+		$ext_name = getCurrentExtensionName();
+	} // END - if
+
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$ext_name])) {
+		// Load extension only if not yet loaded
+		if (!isset($GLOBALS['ext_productive'][$ext_name])) {
+			// Load extension in test mode
+			loadExtension($ext_name, 'test');
+		} // END - if
+
+		// Determine it
+		$GLOBALS[__FUNCTION__][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true));
+	} // END - if
+
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%s", $ext_name, intval($GLOBALS[__FUNCTION__][$ext_name])));
+
+	// Return result
+	return $GLOBALS[__FUNCTION__][$ext_name];
 }
 
 // [EOF]