X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=c73a57fe4c3bc0d2adbbc45b50623c868a5f61d3;hp=3ea8b87b0b143634d8fc1703c6ce4e8fc7a8e04a;hb=0cbe2bfe902d26f0e99be6005140a9d8c350f017;hpb=735545e765720a954a345bc068239e2fffa0dbe1

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 3ea8b87b0b..c73a57fe4c 100644
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/25/2009 *
- * ===============                              Last change: 10/25/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/25/2009 *
+ * ===================                          Last change: 10/25/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : extensions-functions.php                         *
@@ -226,7 +226,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 			incrementExtensionUpdateIterator();
 
 			// Check for required file
-			if (loadExtension($ext_update, 'register', '', getExtensionDryRun())) {
+			if ((!isExtensionInstalled($ext_update)) && (loadExtension($ext_update, 'register', '', getExtensionDryRun()))) {
 				// Set current extension name again
 				setCurrentExtensionName($ext_name);
 
@@ -254,12 +254,15 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru
 					} // END - if
 				} elseif ($ext_ver != getCurrentExtensionVersion()) {
 					// Ok, update this extension now
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().",ext_update=".$ext_update.",ext_ver=".$ext_ver."/".getCurrentExtensionVersion()."");
-					$GLOBALS['ext_backup'][$ext_update][$ext_ver] = getCurrentExtensionName();
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName='.getCurrentExtensionName().',currVer='.getCurrentExtensionVersion().'');
+					$GLOBALS['ext_backup_name'][$ext_update][$ext_ver] = getCurrentExtensionName();
+					$GLOBALS['ext_backup_ver'][$ext_update][$ext_ver] = getCurrentExtensionVersion();
 					updateExtension($ext_update, $ext_ver, getExtensionDryRun());
-					setCurrentExtensionName($GLOBALS['ext_backup'][$ext_update][$ext_ver]);
-					unset($GLOBALS['ext_backup'][$ext_update][$ext_ver]);
-					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName()."");
+					setCurrentExtensionName($GLOBALS['ext_backup_name'][$ext_update][$ext_ver]);
+					setCurrentExtensionVersion($GLOBALS['ext_backup_ver'][$ext_update][$ext_ver]);
+					unset($GLOBALS['ext_backup_name'][$ext_update][$ext_ver]);
+					unset($GLOBALS['ext_backup_ver'][$ext_update][$ext_ver]);
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'currName='.getCurrentExtensionName().',currVer='.getCurrentExtensionVersion().'');
 
 					// All okay!
 					$test = true;
@@ -475,19 +478,19 @@ function isExtensionActive ($ext_name) {
 	if ((isInstallationPhase()) || (empty($ext_name))) return false;
 
 	// Not active is the default
-	$active = 'N';
+	$data['ext_active'] = 'N';
 
 	// Check cache
 	if (isset($GLOBALS['cache_array']['extension']['ext_active'][$ext_name])) {
 		// Load from cache
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "CACHE! ext_name={$ext_name}");
-		$active = $GLOBALS['cache_array']['extension']['ext_active'][$ext_name];
+		$data['ext_active'] = $GLOBALS['cache_array']['extension']['ext_active'][$ext_name];
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
 	} elseif (isset($GLOBALS['ext_loaded'][$ext_name])) {
 		// @TODO Extension is loaded, what next?
-		app_die(__FUNCTION__, __LINE__, "LOADED:$ext_name");
+		app_die(__FUNCTION__, __LINE__, 'LOADED:' . $ext_name);
 	} elseif (($ext_name == 'cache') || (!isExtensionInstalled('cache'))) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
 		// Load from database
@@ -497,15 +500,15 @@ function isExtensionActive ($ext_name) {
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load entry
-			list($active) = SQL_FETCHROW($result);
+			$data = SQL_FETCHARRAY($result);
 		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
 
 		// Write cache array
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name."[DB]: {$active}");
-		$GLOBALS['cache_array']['extension']['ext_active'][$ext_name] = $active;
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name."[DB]: ".$data['ext_active']."");
+		$GLOBALS['cache_array']['extension']['ext_active'][$ext_name] = $data['ext_active'];
 	} else {
 		// Extension not active!
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name.": Not active!");
@@ -513,16 +516,16 @@ function isExtensionActive ($ext_name) {
 	}
 
 	// Debug message
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name={$ext_name},active={$active}");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name=".$ext_name.",active=".$data['ext_active']."");
 
 	// Is this extension activated? (For admins we always have active extensions...)
-	return ($active == 'Y');
+	return ($data['ext_active'] == 'Y');
 }
 
 // Get version from extensions
 function getExtensionVersion ($ext_name, $force = false) {
 	// By default no extension is found
-	$ext_ver = 'false';
+	$data['ext_version'] = 'false';
 
 	// Empty extension name should be fixed!
 	if (empty($ext_name)) {
@@ -532,13 +535,13 @@ function getExtensionVersion ($ext_name, $force = false) {
 
 	// Extensions are all inactive during installation
 	if (isInstallationPhase()) return '';
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ext_name=".$ext_name."");
 
 	// Is the cache written?
 	if (isset($GLOBALS['cache_array']['extension']['ext_version'][$ext_name])) {
 		// Load data from cache
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": CACHE!");
-		$ext_ver = $GLOBALS['cache_array']['extension']['ext_version'][$ext_name];
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': CACHE!');
+		$data['ext_version'] = $GLOBALS['cache_array']['extension']['ext_version'][$ext_name];
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
@@ -546,33 +549,33 @@ function getExtensionVersion ($ext_name, $force = false) {
 		// 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__);
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $ext_name . ': DB - '.SQL_NUMROWS($result).'');
 
 		// Is the extension there?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load entry
-			list($ext_ver) = SQL_FETCHROW($result);
+			$data = SQL_FETCHARRAY($result);
 		} elseif (isDebugModeEnabled()) {
-			// Not found!
-			logDebugMessage(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name));
+			// Not found, please report all
+			debug_report_bug(sprintf(": Cannot find extension %s in database!", $ext_name));
 		}
 
 		// Free result
 		SQL_FREERESULT($result);
 
 		// Set cache
-		$GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $ext_ver;
+		$GLOBALS['cache_array']['extension']['ext_version'][$ext_name] = $data['ext_version'];
 	}
 
 	// Extension version should not be invalid
-	if (($ext_ver == 'false') && ($force === false)) {
+	if (($data['ext_version'] == 'false') && ($force === false)) {
 		// Please report this trouble
 		debug_report_bug(sprintf("Extension <strong>%s</strong> has empty version!", $ext_name));
 	} // END - if
 
 	// Return result
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$ext_ver}");
-	return $ext_ver;
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ": ret={$data['ext_version']}");
+	return $data['ext_version'];
 }
 
 // Updates a given extension with current extension version to latest version
@@ -730,12 +733,12 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false
 // Get extension name from id
 function getExtensionName ($ext_id) {
 	// Init extension name
-	$ret = '';
+	$data['ext_name'] = '';
 
 	// Is cache there?
 	if (isset($GLOBALS['cache_array']['extension']['ext_name'][$ext_id])) {
 		// Load from cache
-		$ret = $GLOBALS['cache_array']['extension']['ext_name'][$ext_id];
+		$data['ext_name'] = $GLOBALS['cache_array']['extension']['ext_name'][$ext_id];
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
@@ -747,7 +750,7 @@ function getExtensionName ($ext_id) {
 		// Is the entry there?
 		if (SQL_NUMROWS($result) == 1) {
 			// Get the extension's name from database
-			list($ret) = SQL_FETCHROW($result);
+			$data = SQL_FETCHARRAY($result);
 		} // END - if
 
 		// Free result
@@ -755,47 +758,47 @@ function getExtensionName ($ext_id) {
 	}
 
 	// Did we find some extension?
-	if (empty($ret)) {
+	if (empty($data['ext_name'])) {
 		// We should fix these all!
 		debug_report_bug(__FUNCTION__ . ': ext_name is empty. ext_id=' . $ext_id);
 	} // END - if
 
 	// Return the extension name
-	return $ret;
+	return $data['ext_name'];
 }
 
 // Get extension id from name
 function getExtensionId ($ext_name) {
 	// Init id number
-	$ret = '0';
+	$data['ext_id'] = '0';
 
 	// Do we have cache?
 	if (isset($GLOBALS['cache_array']['extension']['ext_id'][$ext_name])) {
 		// Load from cache
-		$ret = $GLOBALS['cache_array']['extension']['ext_id'][$ext_name];
+		$data['ext_id'] = $GLOBALS['cache_array']['extension']['ext_id'][$ext_name];
 
 		// Count cache hits
 		incrementStatsEntry('cache_hits');
 	} else {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `id` AS ext_id FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
 			array($ext_name), __FUNCTION__, __LINE__);
 
 		// Is the entry there?
 		if (SQL_NUMROWS($result) == 1) {
 			// Get the extension's id from database
-			list($ret) = SQL_FETCHROW($result);
+			$data = SQL_FETCHARRAY($result);
 		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
 
 		// Cache it
-		$GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $ret;
+		$GLOBALS['cache_array']['extension']['ext_id'][$ext_name] = $data['ext_id'];
 	}
 
 	// Return value
-	return $ret;
+	return $data['ext_id'];
 }
 
 // Determines wether the given extension name is valid
@@ -906,7 +909,7 @@ function createNewExtensionTask ($adminId, $subject, $ext) {
 	// Not installed and do we have created a task for the admin?
 	if ((determineTaskIdBySubject($subject) == '0') && (!isExtensionInstalled($ext))) {
 		// Set default message if ext-foo is missing
-		$message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext);
+		$message = getMaskedMessage('ADMIN_EXT_TEXT_FILE_MISSING', $ext);
 
 		// Template file
 		$tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
@@ -946,7 +949,7 @@ function ifModuleHasMenu ($mod, $forceDb = false) {
 	// All is false by default
 	$ret = false;
 
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "mod={$mod},cache=".getExtensionVersion('cache'));
+	// Extension installed and newer than or has version 0.1.2?
 	if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
 		// Cache version is okay, so let's check the cache!
 		if (isset($GLOBALS['cache_array']['modules']['has_menu'][$mod])) {
@@ -969,13 +972,13 @@ function ifModuleHasMenu ($mod, $forceDb = false) {
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load "has_menu" column
-			list($has_menu) = SQL_FETCHROW($result);
+			$data = SQL_FETCHARRAY($result);
 
 			// Fake cache... ;-)
-			$GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $has_menu;
+			$GLOBALS['cache_array']['extension']['ext_menu'][$mod] = $data['has_menu'];
 
 			// Does it have a menu?
-			$ret = ($has_menu == 'Y');
+			$ret = ($data['has_menu'] == 'Y');
 		} // END  - if
 
 		// Free memory
@@ -986,52 +989,51 @@ function ifModuleHasMenu ($mod, $forceDb = false) {
 	}
 
 	// Return status
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "currName=".getCurrentExtensionName().intval($ret));
 	return $ret;
 }
 
 // Determines the task id for given extension
 function determineExtensionTaskId ($ext_name) {
 	// Default is not found
-	$task_id = '0';
+	$data['task_id'] = '0';
 
 	// Search for extension task's id
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id` AS task_id FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1",
 		array($ext_name), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
 		// Task found so load task's id and register extension...
-		list($task_id) = SQL_FETCHROW($result);
+		$data = SQL_FETCHARRAY($result);
 	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
 
 	// Return it
-	return $task_id;
+	return $data['task_id'];
 }
 
 // Determines the task id for given subject
 function determineTaskIdBySubject ($subject) {
 	// Default is not found
-	$task_id = '0';
+	$data['task_id'] = '0';
 
 	// Search for task id
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id` AS task_id FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
 		array($subject), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
 		// Task found so load task's id and register extension...
-		list($task_id) = SQL_FETCHROW($result);
+		$data = SQL_FETCHARRAY($result);
 	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
 
 	// Return it
-	return $task_id;
+	return $data['task_id'];
 }
 
 // Add updates notes for given version
@@ -1141,7 +1143,7 @@ function addExtensionUpdateDependency ($updateDepends) {
 	// Is the update depency empty? (NEED TO BE FIXED!)
 	if (empty($updateDepends)) {
 		// Please report this bug!
-		debug_report_bug("updateDepends is left empty!");
+		debug_report_bug('updateDepends is left empty!');
 	} // END - if
 
 	// Is it not yet added?
@@ -1451,7 +1453,7 @@ function removeExtensionFromArray () {
 	$ext_name = getCurrentExtensionName();
 
 	// Now loop through the whole cache
-	foreach ($GLOBALS['cache_array']['extension'] as $cacheName=>$cacheArray) {
+	foreach ($GLOBALS['cache_array']['extension'] as $cacheName => $cacheArray) {
 		// Is it an element?
 		if (isset($cacheArray[$ext_name])) {
 			// Array element
@@ -1553,7 +1555,7 @@ function isExtensionIncludeReadable ($ext_name = '') {
 	} // END - if
 
 	// Return result
-	//* DEBUG: */ print __FUNCTION__.': '.$ext_name.'='.intval($GLOBALS['ext_inc_readable'][$ext_name]).'<br />';
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',realable='.intval($GLOBALS['ext_inc_readable'][$ext_name]));
 	return $GLOBALS['ext_inc_readable'][$ext_name];
 }