X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=5c12d48717407748847973276a54751fdb0f76e8;hp=a9403850a7f71d8f408bb2a1ab5cab0998a9e4b0;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index a9403850a7..5c12d48717 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -52,7 +52,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	// We are about to register a new extension
 	$do = 'register'; $ext_id = bigintval(getRequestParameter('reg_ext'));
 	// The id comes from task management and it is - of course - *not* the extension's name!
-} elseif ((isPostRequestParameterSet('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// De-/activate extensions
 	foreach (postRequestParameter('sel') as $ext_id => $active) {
 		// Shall we keep the extension always active?
@@ -63,14 +63,17 @@ if (isGetRequestParameterSet('reg_ext')) {
 			// De/activate extension
 			$ACT = 'N'; setExtensionMode('deactivate');
 			if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
-				array(bigintval($ext_id), $active), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
+				array($ACT, bigintval($ext_id), $active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
 			doExtensionSqls($ext_id, getExtensionMode());
 		}
-	}
-} elseif (((isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+	} // END - foreach
+
+	// Redirect to prevent missing cache in js.php
+	redirectToUrl('modules.php?module=admin&what=extensions&changed=' . countPostSelection());
+} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
 	if (isPostRequestParameterSet('modify')) {
 		// Change entries
@@ -88,7 +91,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 				$active = postRequestParameter('active', $ext_id);
 
 				// Update extension's record
-				if (getExtensionVersion('sql_patches') >= '0.0.6') {
+				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
 					// Update also CSS column when extensions sql_patches is newer or exact v0.0.6
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_has_css`='%s', `ext_active`='%s' WHERE `id`=%s LIMIT 1",
 						array(postRequestParameter('css', $ext_id), $active, $ext_id), __FILE__, __LINE__);
@@ -109,11 +112,11 @@ if (isGetRequestParameterSet('reg_ext')) {
 			}
 		}
 
-		// Extensions changed
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED'));
+		// Redirect to prevent missing cache in js.php
+		redirectToUrl('modules.php?module=admin&what=extensions&edited=' . countPostSelection());
 	} else {
 		// Edit selected entries
-		$SW = 2; $OUT = '';
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
@@ -121,7 +124,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 				$css = 'N';
 
 				// Load required data
-				if (getExtensionVersion('sql_patches') >= '0.0.6') {
+				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
 					$result = SQL_QUERY_ESC("SELECT ext_has_css, ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1",
 						array(bigintval($ext_id)), __FILE__, __LINE__);
 					list($css, $active) = SQL_FETCHROW($result);
@@ -134,13 +137,14 @@ if (isGetRequestParameterSet('reg_ext')) {
 					$css = 'X';
 				}
 
-				// Output row
+				// Prepare CSS column
 				$cssSelection = '---';
-				if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
+				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
+					$cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
+				} // END - if
 
 				// Prepare data for the row template
 				$content = array(
-					'sw'     => $SW,
 					'id'     => $ext_id,
 					'name'   => getExtensionName($ext_id),
 					'active' => addSelectionBox('yn', $active, 'active', $ext_id),
@@ -149,8 +153,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_extensions_edit_row', true, $content);
-				$SW = 3 - $SW;
-			}
+			} // END - if
 		} // END - foreach
 
 		// Load template
@@ -159,7 +162,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	}
 } elseif ((isPostRequestParameterSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestParameter('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
@@ -183,7 +186,6 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 			// Prepare data for the row template
 			$content = array(
-				'sw'       => $SW,
 				'id'       => $ext_id,
 				'ext_name' => $ext_name,
 				'ext_ver'  => getExtensionVersion($ext_name),
@@ -195,20 +197,18 @@ if (isGetRequestParameterSet('reg_ext')) {
 		} else {
 			// Prepare data for the row template
 			$content = array(
-				'sw'       => $SW,
 				'id'       => $ext_id
 			);
 
 			// Not valid!
 			$OUT .= loadTemplate('admin_extensions_delete_row_404', true, $content);
 		}
-		$SW = 3 - $SW;
 	} // END - foreach
 
 	// Load template
 	loadTemplate('admin_extensions_delete', false, $OUT);
 	$do = 'delete';
-} elseif ((isPostRequestParameterSet('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = '0';
 	foreach (postRequestParameter('sel') as $ext_id => $active) {
@@ -222,14 +222,23 @@ if (isGetRequestParameterSet('reg_ext')) {
 		} // END - if
 	} // END - foreach
 
-	// Extensions removed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', countPostSelection()));
+	// Redirect to prevent missing cache in js.php
+	redirectToUrl('modules.php?module=admin&what=extensions&removed=' . countPostSelection());
 } elseif ((isGetRequestParameterSet('do')) && (!isDemoModeActive())) {
 	// Other things to do
 	$do = SQL_ESCAPE(secureString(getRequestParameter('do')));
 } elseif (isGetRequestParameterSet('do')) {
 	// Demo mode active!
 	$do = 'demo';
+} elseif (isGetRequestParameterSet('changed')) {
+	// Extensions changed
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
+} elseif (isGetRequestParameterSet('edited')) {
+	// Extensions changed
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited'))));
+} elseif (isGetRequestParameterSet('removed')) {
+	// Extensions changed
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed'))));
 }
 
 // Shall we display active/inactive extensions?
@@ -258,15 +267,15 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 		// Are there some entries?
 		if (SQL_NUMROWS($result) > 0) {
 			// Extensions are registered
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Prepare CSS selection output
 				$cssSelection = '---';
 				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $cssSelection = translateYesNo($content['ext_css']);
 
 				// Prepare data for the row template
+				// @TODO Rewrite in template: id->ext_id,name->ext_name,active->ext_active,ver->ext_ver
 				$content = array(
-					'sw'      => $SW,
 					'id'      => $content['ext_id'],
 					'name'    => $content['ext_name'],
 					'active'  => translateYesNo($content['ext_active']),
@@ -277,8 +286,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_extensions_row', true, $content);
-				$SW = 3 - $SW;
-			}
+			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
@@ -287,7 +295,7 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 			loadTemplate('admin_extensions', false, $OUT);
 		} else {
 			// No extensions are registered
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_EXTENSION_REGISTERED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_EXTENSION_REGISTERED--}');
 		}
 		break;
 
@@ -304,16 +312,16 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 			// id is valid so begin with registration, we first want to it's real name from task management (subject column)
 			$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);
+			list($subject) = SQL_FETCHROW($result);
 
 			// Free result
 			SQL_FREERESULT($result);
 
 			// Disable cache update by default
 			$cache_update = '0';
-			if (!empty($subj)) {
+			if (!empty($subject)) {
 				// Extract extension's name from subject...
-				$ext_name = trim(substr($subj, 1, strpos($subj, ':') - 1));
+				$ext_name = trim(substr($subject, 1, strpos($subject, ':') - 1));
 
 				// Test the extension for deprecation
 				loadExtension($ext_name, 'test');
@@ -331,12 +339,12 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 							if (isExtensionActive('task')) {
 								loadTemplate('admin_next_link', false, array(
 									'url'   => 'modules.php?module=admin&what=list_task',
-									'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+									'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
 								));
 							} else {
 								loadTemplate('admin_next_link', false, array(
 									'url'   => 'modules.php?module=admin',
-									'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+									'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
 								));
 							}
 						} else {
@@ -350,36 +358,37 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 							// Remove cache file (will be auto-created again!)
 							if ($GLOBALS['cache_instance']->loadCacheFile('config'))    $GLOBALS['cache_instance']->removeCacheFile();
 							if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile();
+							if ($GLOBALS['cache_instance']->loadCacheFile('filter'))    $GLOBALS['cache_instance']->removeCacheFile();
 							if ($GLOBALS['cache_instance']->loadCacheFile('modules'))   $GLOBALS['cache_instance']->removeCacheFile();
 						} // END - if
-					} elseif (getExtensionVersion($ext_name) != '') {
+					} elseif (isExtensionInstalled($ext_name)) {
 						// Notify the admin that we have a problem here...
-						loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
+						loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}');
 					} else {
 						// Notify the admin that we have a problem here...
-						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_REG_FAILED_404', $ext_name));
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_404', $ext_name));
 					}
 				} else {
 					// Motify the admin that we have a problem here...
-					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));
+					loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}');
 				}
 			} else {
 				// Extension was not found in task management
-				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404'));
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}');
 			}
 		} elseif ($task_found == '0') {
 			// No longer assigned or old task
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}');
 		} else {
 			// id is invalid
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}');
 		}
 		break;
 
 	case 'demo':
-		loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+		loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
 		break;
-}
+} // END - switch
 
 // [EOF]
 ?>