X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=1b26990c868821c931e034825ff2e7c92406ec70;hb=42d36ab276be084305ebdb57feb4e60c6b3ec916;hp=d762d360882016b93ae46d21fff33296edc50bac;hpb=18e32f1a8971b18bace4f051094acf27800bd7d9;p=mailer.git

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index d762d36088..1b26990c86 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -63,13 +63,16 @@ 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());
 		}
-	}
+	} // 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')) {
@@ -109,8 +112,8 @@ 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 = '';
@@ -224,14 +227,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?
@@ -333,12 +345,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' => getMessage('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' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
 								));
 							}
 						} else {
@@ -357,32 +369,32 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 						} // END - if
 					} 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, getMessage('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, getMessage('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, getMessage('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, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED'));
 		} else {
 			// id is invalid
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID'));
+			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID'));
 		}
 		break;
 
 	case 'demo':
 		loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 		break;
-}
+} // END - switch
 
 // [EOF]
 ?>