X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=332a3d2324e8db138c49751ea49ba89b70735b93;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=3706a5cb4fbef3636f99066fad21564f065f9d8e;hpb=82a12cd0751a641f9912864a623388f8820a9580;p=mailer.git

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 3706a5cb4f..332a3d2324 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -43,9 +41,11 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load the extension and maybe found language and function files.
-function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
-	// If this happens twice, we need the bug report from you, except for updates/tests
+function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0', $dry_run = false) {
+	// Loading an extension in same mode, but not test/update, twice is not
+	// good, so is the extension $ext_name already loaded in mode $ext_mode?
 	if ((isset($GLOBALS['loaded_extension'][$ext_name][$ext_mode])) && (!in_array($ext_mode, array('update', 'test')))) {
+		// If this happens twice, we need the bug report from you, except for updates/tests
 		debug_report_bug(__FUNCTION__, __LINE__, '() is called twice: ext_name=' . $ext_name . ', ext_mode='. $ext_mode . ',ext_sqls=' . print_r(getExtensionSqls(), true) . ', ext_register_running=' . print_r($GLOBALS['ext_register_running'], true) . ', ext_running_updates=' . print_r($GLOBALS['ext_running_updates'], true));
 	} // END - if
 
@@ -76,8 +76,8 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '', $dry_run = false) {
 
 		// In all but test-mode we need these messages to debug! Please report all (together, e.g.)
 		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));
+			// Abort here, this must now always be set!
+			debug_report_bug(__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
 	}
 
@@ -243,7 +243,7 @@ function registerExtension ($ext_name, $taskId, $dry_run = false, $logout = true
 
 	// Does this extension exists?
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName());
-	if (loadExtension(getCurrentExtensionName(), 'register', '', isExtensionDryRun())) {
+	if (loadExtension(getCurrentExtensionName(), 'register', '0.0', isExtensionDryRun())) {
 		// Set current extension name again
 		setCurrentExtensionName($ext_name);
 
@@ -456,7 +456,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 
 	// Load extension in detected mode
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name[' . $ext_id . ']=' . getCurrentExtensionName() . ',load_mode=' . $load_mode);
-	loadExtension(getCurrentExtensionName(), $load_mode, '', false);
+	loadExtension(getCurrentExtensionName(), $load_mode, '0.0', false);
 
 	// Init these SQLs
 	initSqls();
@@ -475,7 +475,7 @@ function doExtensionSqls ($ext_id, $load_mode) {
 	runFilterChain('extension_' . $load_mode);
 
 	// Remove cache file(s) if extension is active
-	if (((isExtensionActive('cache')) && ((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate'))) {
+	if (((isExtensionActive('cache')) && ((!SQL_HASZEROAFFECTED())) || ($sqlRan === true) || ($load_mode == 'activate') || ($load_mode == 'deactivate'))) {
 		// Run filters
 		runFilterChain('post_extension_run_sql', getCurrentExtensionName());
 	} // END - if
@@ -1200,8 +1200,8 @@ function isExtensionDeprecated () {
 }
 
 // Setter for EXT_UPDATE_DEPENDS flag
-function addExtensionUpdateDependency ($updateDepends) {
-	//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - ENTERED!');
+function addExtensionDependency ($updateDepends) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - ENTERED!');
 	// Is the update depency empty? (NEED TO BE FIXED!)
 	if (empty($updateDepends)) {
 		// Please report this bug!
@@ -1221,7 +1221,7 @@ function addExtensionUpdateDependency ($updateDepends) {
 
 	// Remember it in the list of running updates
 	$GLOBALS['ext_running_updates'][getCurrentExtensionName()][] = $updateDepends;
-	//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName=' . getCurrentExtensionName() . '/' . $updateDepends . ' - EXIT!');
 }
 
 // Getter for running updates
@@ -1336,7 +1336,7 @@ function countExtensionUpdateDependencies () {
 }
 
 // Removes given extension from update denpency list
-function removeExtensionUpdateDependency ($ext_name) {
+function removeExtensionDependency ($ext_name) {
 	// Look it up
 	$key = array_search($ext_name, getExtensionUpdateDependencies());
 
@@ -1467,7 +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);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . getCurrentExtensionName() . ',ext_version=' . getCurrentExtensionVersion() . ',sql=' . $sql);
 	$GLOBALS['ext_sqls'][getCurrentExtensionName()][getCurrentExtensionVersion()][] = $sql;
 }
 
@@ -1546,19 +1546,19 @@ function redirectOnUninstalledExtension ($ext_name) {
 // Filter for initialization of all extensions by loading them in 'init' mode
 function FILTER_INIT_EXTENSIONS () {
 	// Do we have some entries?
-	//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY!');
 	if (isset($GLOBALS['cache_array']['extension']['ext_name'])) {
 		// Load all found extensions if found
-		//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - START!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - START!');
 		foreach ($GLOBALS['cache_array']['extension']['ext_name'] as $key => $ext_name) {
 			// Load it
-			//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - START');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - START');
 			loadExtension($ext_name, 'init', getExtensionVersion($ext_name));
-			//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - END');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name='.$ext_name.' - END');
 		} // END - foreach
-		//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - END!');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHE - END!');
 	} // END - if
-	//* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'EXIT!');
 }
 
 // Setter for extension mode
@@ -1804,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,title=%s,active=%s detected.", $action, $what, $title, $active));
+		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Double guest menu action=%s,what=%s,title=%s,locked=%s,visible=%s detected.", $action, $what, $title, $locked, $visible));
 	}
 }
 
@@ -1894,7 +1894,7 @@ function isExtensionProductive ($ext_name = '') {
 	} // END - if
 
 	// Do we have cache?
-	if (!isset($GLOBALS['ext_is_productive'][$ext_name])) {
+	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
@@ -1902,14 +1902,14 @@ function isExtensionProductive ($ext_name = '') {
 		} // END - if
 
 		// Determine it
-		$GLOBALS['ext_is_productive'][$ext_name] = ((isset($GLOBALS['ext_productive'][$ext_name])) && ($GLOBALS['ext_productive'][$ext_name] === true));
+		$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['ext_is_productive'][$ext_name])));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ext_name=%s,isProductive=%s", $ext_name, intval($GLOBALS[__FUNCTION__][$ext_name])));
 
 	// Return result
-	return $GLOBALS['ext_is_productive'][$ext_name];
+	return $GLOBALS[__FUNCTION__][$ext_name];
 }
 
 // [EOF]