X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=710d154398739c4a7650de14256415e063ae11fd;hb=16ec3c0b28ff8ac1b1e626cca9cc934433d2510f;hp=bed7a9c3ce66c1e0186c4284a981d8a6154ca9e4;hpb=62d16e4fb404fff968bfe380995db15955dff524;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index bed7a9c3ce..710d154398 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -102,7 +102,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
 			// Download functions file
 			loadIncludeOnce($funcsInclude);
 		} // END - if
-	} elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == '0') && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme') && (getExtensionMode() == 'test')) {
+	} elseif ((!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name])) && (isDebugModeEnabled()) && (getOutputMode() == 0) && ($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,
@@ -150,6 +150,9 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 	// Enable dry-run
 	enableExtensionDryRun($dry_run);
 
+	// By default all extensions are in productive phase
+	enableExtensionProductive();
+
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()." - ENTERED!");
 	// This shall never do a non-admin user or if the extension is active (already installed)
 	if ((!isAdmin()) || (isExtensionInstalled($ext_name))) {
@@ -534,7 +537,7 @@ function getExtensionVersion ($ext_name) {
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
-	} elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != '0')) {
+	} elseif ((!isCacheInstanceValid()) || (isset($GLOBALS['cache_array']['extension'])) || (getOutputMode() != 0)) {
 		// 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__);
@@ -676,9 +679,9 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 		$SW = 2;
 
 		// Get all SQLs
-		foreach (getExtensionSqls() as $idx => $sqls) {
+		foreach (getExtensionSqls() as $sqls) {
 			// New array format is recursive
-			foreach ($sqls as $sql) {
+			foreach ($sqls as $idx => $sql) {
 				// Trim out spaces
 				$sql = trim($sql);
 
@@ -1036,7 +1039,7 @@ function addExtensionNotes ($ver) {
 	$out = ''; $content = array();
 
 	// Is do we have verbose output enabled?
-	if ((getConfig('verbose_sql') == 'Y') || (!isExtensionActive('sql_patches'))) {
+	if ((!isExtensionActive('sql_patches')) || (getConfig('verbose_sql') == 'Y')) {
 		// Update notes found?
 		if (getExtensionUpdateNotes($ver) != '') {
 			// Update notes found
@@ -1391,9 +1394,9 @@ function FILTER_INIT_EXTENSIONS () {
 	// Do we have some entries?
 	//* DEBUG */ print __FUNCTION__.': ENTRY!<br />';
 	if (isset($GLOBALS['cache_array']['extension']['ext_name'])) {
-		//* DEBUG */ print __FUNCTION__.': CACHE - START!<br />';
 		// Load all found extensions if found
-		foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key=>$ext_name) {
+		//* DEBUG */ print __FUNCTION__.': CACHE - START!<br />';
+		foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key => $ext_name) {
 			// Load it
 			//* DEBUG */ print __FUNCTION__.': '.$ext_name.' - START<br />';
 			loadExtension($ext_name, 'init');
@@ -1708,5 +1711,17 @@ function addSponsorMenuSql ($action, $what, $title, $active, $sort) {
 	}
 }
 
+// Enables/disables productive mode for current extension (used only while
+// registration).
+function enableExtensionProductive ($isProductive = true) {
+	$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));
+}
+
 // [EOF]
 ?>