X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=5f5ce559352180e148337f5a335e4061c64ea6f2;hp=c25ef8fe423ef792f06722c74ab76bddff663ed6;hb=6bb119cb426a2ab3998a5c3dfe250d748f786a1c;hpb=7e17864b7d07fb5123b1b1d68f83db28ea5394ef

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index c25ef8fe42..5f5ce55935 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -50,21 +50,32 @@ $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 = determineExtensionTaskId(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())) {
+} elseif ((isFormSent('change')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// De-/activate extensions
-	foreach (postRequestParameter('sel') as $ext_id => $active) {
+	foreach (postRequestParameter('sel') as $ext_id => $ext_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($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($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($ext_id), $active), __FILE__, __LINE__);
+				array($active, bigintval($ext_id), $ext_active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
 			doExtensionSqls($ext_id, getExtensionMode());
@@ -73,7 +84,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 	// 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())) {
+} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('modify'))) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
 	if (isPostRequestParameterSet('modify')) {
 		// Change entries
@@ -109,8 +120,8 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 				// Run embeded SQL commands
 				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());
@@ -160,7 +171,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 		loadTemplate('admin_extensions_edit', false, $OUT);
 		$do = 'edit';
 	}
-} elseif ((isPostRequestParameterSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$OUT = '';
 	foreach (postRequestParameter('sel') as $ext_id => $sel) {
@@ -176,7 +187,8 @@ if (isGetRequestParameterSet('reg_ext')) {
 			// Get extension name
 			$ext_name = getExtensionName($ext_id);
 
-			if (getConfig('verbose_sql') == 'Y') {
+			// Listing of SQLs enabled?
+			if (isVerboseSqlEnabled()) {
 				// Load SQL commands in remove mode
 				if (loadExtension($ext_name, 'remove', '', true)) {
 					// Generate extra table with loaded SQL commands
@@ -208,7 +220,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	// Load template
 	loadTemplate('admin_extensions_delete', false, $OUT);
 	$do = 'delete';
-} elseif ((isFormSent('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = '0';
 	foreach (postRequestParameter('sel') as $ext_id => $active) {
@@ -230,6 +242,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'))));
@@ -243,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
 
@@ -262,7 +290,7 @@ ORDER BY
 		} else {
 			// Load extension data without CSS informations
 			$result = SQL_QUERY("SELECT
-	`id` AS ext_id, `ext_name`, `ext_active, `ext_version`
+	`id` AS ext_id, `ext_name`, `ext_active`, `ext_version`
 FROM
 	`{?_MYSQL_PREFIX?}_extensions`
 ".$where."
@@ -271,7 +299,7 @@ ORDER BY
 		}
 
 		// Are there some entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Extensions are registered
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
@@ -298,18 +326,14 @@ 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 (($ext_id > 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($ext_id)), __FILE__, __LINE__);
+				array(bigintval($taskId)), __FILE__, __LINE__);
 			list($subject) = SQL_FETCHROW($result);
 
 			// Free result
@@ -327,24 +351,11 @@ ORDER BY
 				// 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' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
-								));
-							} else {
-								loadTemplate('admin_next_link', false, array(
-									'url'   => 'modules.php?module=admin',
-									'title' => '{--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));
@@ -374,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 {