X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=aad057e0f9e8776e69fa1f703092b0f14d9795e1;hb=4f089d36fcc801992932f3a1f47ab139b573a38d;hp=24f0716a65328389c254de5d0f2c4f0b660c1071;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;p=mailer.git

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 24f0716a65..aad057e0f9 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -50,24 +50,24 @@ $do = 'overview';
 
 if (isGetRequestParameterSet('reg_ext')) {
 	// We are about to register a new extension
-	$do = 'register'; $ext_id = bigintval(getRequestParameter('reg_ext'));
+	$do = 'register'; $taskId = bigintval(getRequestParameter('reg_ext'));
 	// The id comes from task management and it is - of course - *not* the extension's name!
 } elseif ((isFormSent('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// De-/activate extensions
-	foreach (postRequestParameter('sel') as $ext_id => $active) {
+	foreach (postRequestParameter('sel') as $taskId => $active) {
 		// Shall we keep the extension always active?
-		if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) {
+		if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)] == 'Y') && ($active == 'Y')) {
 			// Keep this extension active!
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($taskId)));
 		} else {
 			// De/activate extension
 			$ACT = 'N'; setExtensionMode('deactivate');
 			if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
 			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__);
+				array($ACT, bigintval($taskId), $active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
-			doExtensionSqls($ext_id, getExtensionMode());
+			doExtensionSqls($taskId, getExtensionMode());
 		}
 	} // END - foreach
 
@@ -78,9 +78,9 @@ if (isGetRequestParameterSet('reg_ext')) {
 	if (isPostRequestParameterSet('modify')) {
 		// Change entries
 		$cache_update = '0';
-		foreach (postRequestParameter('sel') as $ext_id => $sel) {
+		foreach (postRequestParameter('sel') as $taskId => $sel) {
 			// Secure id
-			$ext_id = bigintval($ext_id);
+			$taskId = bigintval($taskId);
 
 			// Change this extension?
 			if ($sel == 1) {
@@ -88,17 +88,17 @@ if (isGetRequestParameterSet('reg_ext')) {
 				setExtensionMode('modify');
 
 				// Get entry for 'active'
-				$active = postRequestParameter('active', $ext_id);
+				$active = postRequestParameter('active', $taskId);
 
 				// Update extension's record
 				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__);
+						array(postRequestParameter('css', $taskId), $active, $taskId), __FILE__, __LINE__);
 				} else {
 					// When extension is older than v0.0.6 there is no column for the CSS information
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s LIMIT 1",
-						array($active, $ext_id), __FILE__, __LINE__);
+						array($active, $taskId), __FILE__, __LINE__);
 				}
 
 				// Run SQLs on activation / deactivation
@@ -108,7 +108,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 				} // END - if
 
 				// Run embeded SQL commands
-				doExtensionSqls($ext_id, getExtensionMode());
+				doExtensionSqls($taskId, getExtensionMode());
 			}
 		}
 
@@ -116,8 +116,8 @@ if (isGetRequestParameterSet('reg_ext')) {
 		redirectToUrl('modules.php?module=admin&what=extensions&edited=' . countPostSelection());
 	} else {
 		// Edit selected entries
-		$SW = 2; $OUT = '';
-		foreach (postRequestParameter('sel') as $ext_id => $sel) {
+		$OUT = '';
+		foreach (postRequestParameter('sel') as $taskId => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
 				// Default is no CSS for non-updated mailers
@@ -126,12 +126,12 @@ if (isGetRequestParameterSet('reg_ext')) {
 				// Load required data
 				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__);
+						array(bigintval($taskId)), __FILE__, __LINE__);
 					list($css, $active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 				} else {
 					$result = SQL_QUERY_ESC("SELECT ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1",
-						array(bigintval($ext_id)), __FILE__, __LINE__);
+						array(bigintval($taskId)), __FILE__, __LINE__);
 					list($active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 					$css = 'X';
@@ -140,22 +140,20 @@ if (isGetRequestParameterSet('reg_ext')) {
 				// Prepare CSS column
 				$cssSelection = '---';
 				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
-					$cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
+					$cssSelection = addSelectionBox('yn', $css, 'css', $taskId);
 				} // 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),
+					'id'     => $taskId,
+					'name'   => getExtensionName($taskId),
+					'active' => addSelectionBox('yn', $active, 'active', $taskId),
 					'css'    => $cssSelection,
 				);
 
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_extensions_edit_row', true, $content);
-				$SW = 3 - $SW;
-			}
+			} // END - if
 		} // END - foreach
 
 		// Load template
@@ -164,19 +162,19 @@ 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;
-	foreach (postRequestParameter('sel') as $ext_id => $sel) {
+	$OUT = '';
+	foreach (postRequestParameter('sel') as $taskId => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
 		initSqls();
 
 		// Secure id number
-		$ext_id = bigintval($ext_id);
+		$taskId = bigintval($taskId);
 
 		// Is the id valid?
-		if (isExtensionIdValid($ext_id)) {
+		if (isExtensionIdValid($taskId)) {
 			// Get extension name
-			$ext_name = getExtensionName($ext_id);
+			$ext_name = getExtensionName($taskId);
 
 			if (getConfig('verbose_sql') == 'Y') {
 				// Load SQL commands in remove mode
@@ -188,8 +186,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 			// Prepare data for the row template
 			$content = array(
-				'sw'       => $SW,
-				'id'       => $ext_id,
+				'id'       => $taskId,
 				'ext_name' => $ext_name,
 				'ext_ver'  => getExtensionVersion($ext_name),
 				'verbose'  => $VERBOSE_OUT
@@ -200,14 +197,12 @@ if (isGetRequestParameterSet('reg_ext')) {
 		} else {
 			// Prepare data for the row template
 			$content = array(
-				'sw'       => $SW,
-				'id'       => $ext_id
+				'id'       => $taskId
 			);
 
 			// Not valid!
 			$OUT .= loadTemplate('admin_extensions_delete_row_404', true, $content);
 		}
-		$SW = 3 - $SW;
 	} // END - foreach
 
 	// Load template
@@ -216,14 +211,14 @@ if (isGetRequestParameterSet('reg_ext')) {
 } 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) {
+	foreach (postRequestParameter('sel') as $taskId => $active) {
 		// Secure id number
-		$ext_id = bigintval($ext_id);
+		$taskId = bigintval($taskId);
 
 		// Is this extension selected and id valid?
-		if (($active == 1) && (isExtensionIdValid($ext_id))) {
+		if (($active == 1) && (isExtensionIdValid($taskId))) {
 			// Run embeded SQL commands
-			doExtensionSqls($ext_id, 'remove');
+			doExtensionSqls($taskId, 'remove');
 		} // END - if
 	} // END - foreach
 
@@ -235,6 +230,22 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif (isGetRequestParameterSet('do')) {
 	// Demo mode active!
 	$do = 'demo';
+} elseif (isGetRequestParameterSet('registered')) {
+	// Extensions changed
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', getExtensionName(getRequestParameter('registered'))));
+
+	// Show next link
+	if (isExtensionActive('task')) {
+		loadTemplate('admin_next_link', false, array(
+			'url'   => 'modules.php?module=admin&what=list_task',
+			'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
+		));
+	} else {
+		loadTemplate('admin_next_link', false, array(
+			'url'   => 'modules.php?module=admin',
+			'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
+		));
+	}
 } elseif (isGetRequestParameterSet('changed')) {
 	// Extensions changed
 	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
@@ -257,43 +268,39 @@ switch ($do) {
 	case 'overview': // List all registered extensions
 		if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
 			// Load extension data with CSS informations
-			$result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version`
-FROM `{?_MYSQL_PREFIX?}_extensions`
+			$result = SQL_QUERY("SELECT
+	`id` AS ext_id, `ext_name`, `ext_active`, `ext_has_css` AS ext_css, `ext_version`
+FROM
+	`{?_MYSQL_PREFIX?}_extensions`
 ".$where."
-ORDER BY `ext_name` ASC", __FILE__, __LINE__);
+ORDER BY
+	`ext_name` ASC", __FILE__, __LINE__);
 		} else {
 			// Load extension data without CSS informations
-			$result = SQL_QUERY("SELECT `id` AS ext_id, `ext_name`, `ext_active`, `id`, `ext_version`
-FROM `{?_MYSQL_PREFIX?}_extensions`
+			$result = SQL_QUERY("SELECT
+	`id` AS ext_id, `ext_name`, `ext_active, `ext_version`
+FROM
+	`{?_MYSQL_PREFIX?}_extensions`
 ".$where."
-ORDER BY `ext_name` ASC", __FILE__, __LINE__);
+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']),
-					'act_val' => $content['ext_active'],
-					'css'     => $cssSelection,
-					'ver'     => $content['ext_version'],
-				);
+				$content['ext_css'] = $cssSelection;
 
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_extensions_row', true, $content);
-				$SW = 3 - $SW;
-			}
+			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
@@ -315,20 +322,20 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 		SQL_FREERESULT($result);
 
 		// Is the id number valid and the task was found?
-		if (($ext_id > 0) && ($task_found == 1)) {
+		if (($taskId > 0) && ($task_found == 1)) {
 			// 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);
+				array(bigintval($taskId)), __FILE__, __LINE__);
+			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');
@@ -336,24 +343,11 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 				// Is the extension deprecated?
 				if (!isExtensionDeprecated()) {
 					// ... so we can finally register and load it in registration mode
-					if (registerExtension($ext_name, $ext_id)) {
+					if (registerExtension($ext_name, $taskId)) {
 						// Errors?
 						if (!ifFatalErrorsDetected()) {
 							// Extension was found and successfully registered
-							loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', $ext_name));
-
-							// Show next link
-							if (isExtensionActive('task')) {
-								loadTemplate('admin_next_link', false, array(
-									'url'   => 'modules.php?module=admin&what=list_task',
-									'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
-								));
-							} else {
-								loadTemplate('admin_next_link', false, array(
-									'url'   => 'modules.php?module=admin',
-									'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
-								));
-							}
+							redirectToUrl('modules.php?module=admin&what=extensions&registered=' . getExtensionId($ext_name));
 						} else {
 							// Errors detected!
 							loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name));