X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=e85fcc78a15fedd392cd2c135907dacbc6799fb3;hp=64ff666484733be25f7373db30eb8d3d10338774;hb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;hpb=d0d885e08aba45b77818d49bcf40396bf788c386

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 64ff666484..e85fcc78a1 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/22/2004 *
- * ================                             Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 03/22/2004 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-extentions.php                              *
@@ -55,8 +55,9 @@ if (isGetRequestElementSet('reg_ext')) {
 	// De-/activate extensions
 	foreach (postRequestElement('sel') as $ext_id => $active) {
 		// Shall we keep the extension always active?
-		if ((isset($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)] == 'Y') && ($active != 'Y')) {
+		if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) {
 			// Keep this extension active!
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
 		} else {
 			// De/activate extension
 			$ACT = 'N'; setExtensionMode('deactivate');
@@ -68,9 +69,9 @@ if (isGetRequestElementSet('reg_ext')) {
 			doExtensionSqls($ext_id, getExtensionMode());
 		}
 	}
-} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
-	if (isPostRequestElementSet(('modify'))) {
+	if (isPostRequestElementSet('modify')) {
 		// Change entries
 		$cache_update = '0';
 		foreach (postRequestElement('sel') as $ext_id => $sel) {
@@ -221,7 +222,7 @@ if (isGetRequestElementSet('reg_ext')) {
 	} // END - foreach
 
 	// Extensions removed
-	loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), countPostSelection()));
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', countPostSelection()));
 } elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) {
 	// Other things to do
 	$do = SQL_ESCAPE(secureString(getRequestElement('do')));
@@ -260,7 +261,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Prepare CSS selection output
 				$cssSelection = '---';
-				if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']);
+				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
 				// Prepare data for the row template
 				$content = array(
@@ -303,6 +304,8 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 			$result = SQL_QUERY_ESC("SELECT `subject` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
 				array(bigintval($ext_id)), __FILE__, __LINE__);
 			list($subj) = SQL_FETCHROW($result);
+
+			// Free result
 			SQL_FREERESULT($result);
 
 			// Disable cache update by default
@@ -321,7 +324,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 						// Errors?
 						if (getTotalFatalErrors() == '0') {
 							// Extension was found and successfully registered
-							loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_REGISTERED'), $ext_name));
+							loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', $ext_name));
 
 							// Show next link
 							if (isExtensionActive('task')) {
@@ -337,7 +340,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 							}
 						} else {
 							// Errors detected!
-							loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_NOT_REGISTERED'), $ext_name));
+							loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name));
 						}
 
 						// Do we need to update cache file?
@@ -353,7 +356,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 						loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
 					} else {
 						// Notify the admin that we have a problem here...
-						loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name));
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_REG_FAILED_404', $ext_name));
 					}
 				} else {
 					// Motify the admin that we have a problem here...