X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=bfba5b7929f53cbb62a641a71ff760bdbf21f25c;hp=1b26990c868821c931e034825ff2e7c92406ec70;hb=c3b4eaf29946349ff058691db2dcb615a5379bb2;hpb=7720eafcce1bf3996657d7cb1a748b51a706b425

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 1b26990c86..bfba5b7929 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,28 +41,39 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Normally we want the overview of all registered extensions
 $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 +82,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,14 +118,14 @@ 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());
 	} else {
 		// Edit selected entries
-		$SW = 2; $OUT = '';
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
@@ -145,7 +154,6 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 				// Prepare data for the row template
 				$content = array(
-					'sw'     => $SW,
 					'id'     => $ext_id,
 					'name'   => getExtensionName($ext_id),
 					'active' => addSelectionBox('yn', $active, 'active', $ext_id),
@@ -154,17 +162,16 @@ 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
 		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 = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestParameter('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
@@ -178,9 +185,10 @@ 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)) {
+				if (loadExtension($ext_name, 'remove', '0.0', true)) {
 					// Generate extra table with loaded SQL commands
 					$VERBOSE_OUT = addExtensionVerboseSqlTable();
 				} // END - if
@@ -188,7 +196,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),
@@ -200,20 +207,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 ((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) {
@@ -235,6 +240,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'))));
@@ -248,7 +269,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
 
@@ -257,42 +278,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) {
+		if (!SQL_HASZERONUMS($result)) {
 			// 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
-				$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);
@@ -301,33 +319,29 @@ 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;
 
 	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__);
-			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');
@@ -335,24 +349,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));
@@ -369,30 +370,30 @@ 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_EXTENSION_REGISTRATION_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_EXTENSION_REGISTRATION_FAILED_404', $ext_name));
 					}
 				} else {
 					// Motify the admin that we have a problem here...
-					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_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_EXTENSION_REGISTRATION_FAILED_ID_404'));
+				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, getMessage('ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}');
 		} else {
 			// id is invalid
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTRATION_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