X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=5f5ce559352180e148337f5a335e4061c64ea6f2;hb=4b9887f734067dc52a1730468e25ba066036a3e1;hp=12aeec675fdb1dc68cd045f349227c59e7a59f63;hpb=b64f960124452301abd69ae3bd7ac4daee420550;p=mailer.git

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 12aeec675f..5f5ce55935 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -50,24 +50,35 @@ $do = 'overview';
 
 if (isGetRequestParameterSet('reg_ext')) {
 	// We are about to register a new extension
-	$do = 'register'; $taskId = bigintval(getRequestParameter('reg_ext'));
+	$do = 'register';
+	$taskId = determineExtensionTaskId(getRequestParameter('reg_ext'));
+
 	// The id comes from task management and it is - of course - *not* the extension's name!
 } elseif ((isFormSent('change')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// De-/activate extensions
-	foreach (postRequestParameter('sel') as $taskId => $active) {
+	foreach (postRequestParameter('sel') as $ext_id => $ext_active) {
 		// Shall we keep the extension always active?
-		if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)] == 'Y') && ($active == 'Y')) {
+		if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($ext_active == 'Y')) {
 			// Keep this extension active!
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($taskId)));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
 		} else {
-			// De/activate extension
-			$ACT = 'N'; setExtensionMode('deactivate');
-			if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
+			// Deactivation is default
+			$active = 'N';
+			setExtensionMode('deactivate');
+
+			// Is the extension deactivated?
+			if ($ext_active != 'Y') {
+				// Then we can activate it
+				$active = 'Y';
+				setExtensionMode('activate');
+			} // END - if
+
+			// Update database
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
-				array($ACT, bigintval($taskId), $active), __FILE__, __LINE__);
+				array($active, bigintval($ext_id), $ext_active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
-			doExtensionSqls($taskId, getExtensionMode());
+			doExtensionSqls($ext_id, getExtensionMode());
 		}
 	} // END - foreach
 
@@ -78,9 +89,9 @@ if (isGetRequestParameterSet('reg_ext')) {
 	if (isPostRequestParameterSet('modify')) {
 		// Change entries
 		$cache_update = '0';
-		foreach (postRequestParameter('sel') as $taskId => $sel) {
+		foreach (postRequestParameter('sel') as $ext_id => $sel) {
 			// Secure id
-			$taskId = bigintval($taskId);
+			$ext_id = bigintval($ext_id);
 
 			// Change this extension?
 			if ($sel == 1) {
@@ -88,17 +99,17 @@ if (isGetRequestParameterSet('reg_ext')) {
 				setExtensionMode('modify');
 
 				// Get entry for 'active'
-				$active = postRequestParameter('active', $taskId);
+				$active = postRequestParameter('active', $ext_id);
 
 				// 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', $taskId), $active, $taskId), __FILE__, __LINE__);
+						array(postRequestParameter('css', $ext_id), $active, $ext_id), __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, $taskId), __FILE__, __LINE__);
+						array($active, $ext_id), __FILE__, __LINE__);
 				}
 
 				// Run SQLs on activation / deactivation
@@ -108,16 +119,16 @@ if (isGetRequestParameterSet('reg_ext')) {
 				} // END - if
 
 				// Run embeded SQL commands
-				doExtensionSqls($taskId, getExtensionMode());
-			}
-		}
+				doExtensionSqls($ext_id, getExtensionMode());
+			} // END - if
+		} // END - foreach
 
 		// Redirect to prevent missing cache in js.php
 		redirectToUrl('modules.php?module=admin&what=extensions&edited=' . countPostSelection());
 	} else {
 		// Edit selected entries
 		$OUT = '';
-		foreach (postRequestParameter('sel') as $taskId => $sel) {
+		foreach (postRequestParameter('sel') as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
 				// Default is no CSS for non-updated mailers
@@ -126,12 +137,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($taskId)), __FILE__, __LINE__);
+						array(bigintval($ext_id)), __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($taskId)), __FILE__, __LINE__);
+						array(bigintval($ext_id)), __FILE__, __LINE__);
 					list($active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 					$css = 'X';
@@ -140,14 +151,14 @@ if (isGetRequestParameterSet('reg_ext')) {
 				// Prepare CSS column
 				$cssSelection = '---';
 				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
-					$cssSelection = addSelectionBox('yn', $css, 'css', $taskId);
+					$cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
 				} // END - if
 
 				// Prepare data for the row template
 				$content = array(
-					'id'     => $taskId,
-					'name'   => getExtensionName($taskId),
-					'active' => addSelectionBox('yn', $active, 'active', $taskId),
+					'id'     => $ext_id,
+					'name'   => getExtensionName($ext_id),
+					'active' => addSelectionBox('yn', $active, 'active', $ext_id),
 					'css'    => $cssSelection,
 				);
 
@@ -163,19 +174,20 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif ((isPostRequestParameterSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$OUT = '';
-	foreach (postRequestParameter('sel') as $taskId => $sel) {
+	foreach (postRequestParameter('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
 		initSqls();
 
 		// Secure id number
-		$taskId = bigintval($taskId);
+		$ext_id = bigintval($ext_id);
 
 		// Is the id valid?
-		if (isExtensionIdValid($taskId)) {
+		if (isExtensionIdValid($ext_id)) {
 			// Get extension name
-			$ext_name = getExtensionName($taskId);
+			$ext_name = getExtensionName($ext_id);
 
+			// Listing of SQLs enabled?
 			if (isVerboseSqlEnabled()) {
 				// Load SQL commands in remove mode
 				if (loadExtension($ext_name, 'remove', '', true)) {
@@ -186,7 +198,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 			// Prepare data for the row template
 			$content = array(
-				'id'       => $taskId,
+				'id'       => $ext_id,
 				'ext_name' => $ext_name,
 				'ext_ver'  => getExtensionVersion($ext_name),
 				'verbose'  => $VERBOSE_OUT
@@ -197,7 +209,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 		} else {
 			// Prepare data for the row template
 			$content = array(
-				'id'       => $taskId
+				'id'       => $ext_id
 			);
 
 			// Not valid!
@@ -211,14 +223,14 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = '0';
-	foreach (postRequestParameter('sel') as $taskId => $active) {
+	foreach (postRequestParameter('sel') as $ext_id => $active) {
 		// Secure id number
-		$taskId = bigintval($taskId);
+		$ext_id = bigintval($ext_id);
 
 		// Is this extension selected and id valid?
-		if (($active == 1) && (isExtensionIdValid($taskId))) {
+		if (($active == 1) && (isExtensionIdValid($ext_id))) {
 			// Run embeded SQL commands
-			doExtensionSqls($taskId, 'remove');
+			doExtensionSqls($ext_id, 'remove');
 		} // END - if
 	} // END - foreach
 
@@ -259,7 +271,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 // Shall we display active/inactive extensions?
 $where = '';
-if (isGetRequestParameterSet(('active'))) {
+if (isGetRequestParameterSet('active')) {
 	$where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestParameter('active'))));
 } // END - if
 
@@ -314,15 +326,11 @@ ORDER BY
 		break;
 
 	case 'register': // Register new extension
-		$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s AND `task_type`='EXTENSION' LIMIT 1",
-			array(getCurrentAdminId()), __FILE__, __LINE__);
-		$task_found = SQL_NUMROWS($result);
-
-		// Free result
-		SQL_FREERESULT($result);
+		// Do we have some tasks?
+		$numTasks = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, "AND `task_type`='EXTENSION'");
 
 		// Is the id number valid and the task was found?
-		if (($taskId > 0) && ($task_found == 1)) {
+		if (($taskId > 0) && ($numTasks > 0)) {
 			// 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($taskId)), __FILE__, __LINE__);
@@ -377,7 +385,7 @@ ORDER BY
 				// Extension was not found in task management
 				loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}');
 			}
-		} elseif ($task_found == '0') {
+		} elseif ($numTasks == '0') {
 			// No longer assigned or old task
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}');
 		} else {