X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=f89233a146abd1604cbb8917b369c0b84e87bb73;hp=59e2e95ded0f601a09d53dabb77eed19b259741c;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 59e2e95ded..f89233a146 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -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))) {
@@ -236,7 +239,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 
 				// Extension version set? If empty the extension is not registered
 				if (empty($ext_ver)) {
-					// Extension not registered so far so first load task's ID...
+					// Extension not registered so far so first load task's id...
 					$task = determineExtensionTaskId($ext_update);
 
 					// Entry found?
@@ -322,6 +325,9 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 				// Remove all SQL commands
 				unsetSqls();
 
+				// Mark it as installed
+				$GLOBALS['ext_is_installed'][getCurrentExtensionName()] = true;
+
 				// In normal mode return a true on success
 				$ret = true;
 			} elseif (getExtensionDryRun() === true) {
@@ -431,7 +437,10 @@ function isExtensionInstalled ($ext_name) {
 	$isInstalled = false;
 
 	// Check if there is a cache entry
-	if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
+	if (isset($GLOBALS['ext_is_installed'][$ext_name])) {
+		// Use cache built from below queries
+		$isInstalled = $GLOBALS['ext_is_installed'][$ext_name];
+	} elseif (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
 		// Found!
 		$isInstalled = true;
 
@@ -449,12 +458,15 @@ function isExtensionInstalled ($ext_name) {
 
 		// Is it installed, then cache the entry
 		if ($isInstalled === true) {
-			// Dummy call
+			// Dummy call (get is okay here)
 			getExtensionId($ext_name, true);
 		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
+
+		// Remember the status
+		$GLOBALS['ext_is_installed'][$ext_name] = $isInstalled;
 	}
 
 	// Return status
@@ -676,9 +688,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);
 
@@ -758,7 +770,7 @@ function getExtensionName ($ext_id) {
 
 // Get extension id from name
 function getExtensionId ($ext_name, $forceDb = false) {
-	// Init ID number
+	// Init id number
 	$ret = 0;
 
 	if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
@@ -776,13 +788,13 @@ function getExtensionId ($ext_name, $forceDb = false) {
 		if (SQL_NUMROWS($result) == 1) {
 			// Get the extension's id from database
 			list($ret) = SQL_FETCHROW($result);
-
-			// Cache it
-			$GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret;
 		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
+
+		// Cache it
+		$GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret;
 	}
 
 	if ($ret == 0) {
@@ -997,7 +1009,7 @@ function determineExtensionTaskId ($ext_name) {
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
-		// Task found so load task's ID and register extension...
+		// Task found so load task's id and register extension...
 		list($task_id) = SQL_FETCHROW($result);
 	} // END - if
 
@@ -1019,7 +1031,7 @@ function determineTaskIdBySubject ($subject) {
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
-		// Task found so load task's ID and register extension...
+		// Task found so load task's id and register extension...
 		list($task_id) = SQL_FETCHROW($result);
 	} // END - if
 
@@ -1036,7 +1048,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 +1403,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 +1720,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]
 ?>