X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=a8196dd43ae8ce58e395b4167df5dfd19375fe50;hp=9458da05413f182e2fe0f63de86871738fa02828;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hpb=4dfa7b2274172717e7e5da373f8bb6bdc7b3d51b

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 9458da0541..a8196dd43a 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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')) {
+if (isGetRequestElementSet('reg_ext')) {
 	// We are about to register a new extension
-	$do = 'register'; $ext_id = bigintval(getRequestParameter('reg_ext'));
+	$do = 'register';
+	$taskId = determineExtensionTaskId(getRequestElement('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 (postRequestElement('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)));
+			displayMessage('{%message,ADMIN_EXTENSION_ALWAYS_ACTIVE=' . $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,12 +82,12 @@ 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')) || (isPostRequestElementSet('modify'))) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
-	if (isPostRequestParameterSet('modify')) {
+	if (isPostRequestElementSet('modify')) {
 		// Change entries
 		$cache_update = '0';
-		foreach (postRequestParameter('sel') as $ext_id => $sel) {
+		foreach (postRequestElement('sel') as $ext_id => $sel) {
 			// Secure id
 			$ext_id = bigintval($ext_id);
 
@@ -88,13 +97,13 @@ if (isGetRequestParameterSet('reg_ext')) {
 				setExtensionMode('modify');
 
 				// Get entry for 'active'
-				$active = postRequestParameter('active', $ext_id);
+				$active = postRequestElement('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', $ext_id), $active, $ext_id), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_has_css`='%s',`ext_active`='%s' WHERE `id`=%s LIMIT 1",
+						array(postRequestElement('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",
@@ -105,19 +114,19 @@ if (isGetRequestParameterSet('reg_ext')) {
 				switch ($active) {
 					case 'Y': setExtensionMode('activate');   break;
 					case 'N': setExtensionMode('deactivate'); break;
-				} // END - if
+				} // END - switch
 
 				// 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 = '';
-		foreach (postRequestParameter('sel') as $ext_id => $sel) {
+		$OUT = '';
+		foreach (postRequestElement('sel') as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
 				// Default is no CSS for non-updated mailers
@@ -125,12 +134,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",
+					$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__);
 					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",
+					$result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1",
 						array(bigintval($ext_id)), __FILE__, __LINE__);
 					list($active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
@@ -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,18 +162,17 @@ 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 ((isPostRequestElementSet('delete')) && (ifPostContainsSelections()) && (!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 (postRequestElement('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
 		initSqls();
@@ -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.0', true)) {
 					// Generate extra table with loaded SQL commands
 					$VERBOSE_OUT = addExtensionVerboseSqlTable();
 				} // END - if
@@ -188,10 +196,8 @@ 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),
 				'verbose'  => $VERBOSE_OUT
 			);
 
@@ -200,23 +206,21 @@ 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('do_delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = '0';
-	foreach (postRequestParameter('sel') as $ext_id => $active) {
+	foreach (postRequestElement('sel') as $ext_id => $active) {
 		// Secure id number
 		$ext_id = bigintval($ext_id);
 
@@ -229,27 +233,43 @@ if (isGetRequestParameterSet('reg_ext')) {
 
 	// Redirect to prevent missing cache in js.php
 	redirectToUrl('modules.php?module=admin&what=extensions&removed=' . countPostSelection());
-} elseif ((isGetRequestParameterSet('do')) && (!isDemoModeActive())) {
+} elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) {
 	// Other things to do
-	$do = SQL_ESCAPE(secureString(getRequestParameter('do')));
-} elseif (isGetRequestParameterSet('do')) {
+	$do = SQL_ESCAPE(secureString(getRequestElement('do')));
+} elseif (isGetRequestElementSet('do')) {
 	// Demo mode active!
 	$do = 'demo';
-} elseif (isGetRequestParameterSet('changed')) {
+} elseif (isGetRequestElementSet('registered')) {
 	// Extensions changed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
-} elseif (isGetRequestParameterSet('edited')) {
+	displayMessage('{%message,ADMIN_EXTENSION_REGISTERED=' . getExtensionName(getRequestElement('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 (isGetRequestElementSet('changed')) {
+	// Extensions changed
+	displayMessage('{%message,ADMIN_EXTENSION_CHANGED=' . bigintval(getRequestElement('changed')) . '%}');
+} elseif (isGetRequestElementSet('edited')) {
 	// Extensions changed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_EDITED', bigintval(getRequestParameter('edited'))));
-} elseif (isGetRequestParameterSet('removed')) {
+	displayMessage('{%message,ADMIN_EXTENSION_EDITED=' . bigintval(getRequestElement('edited')) . '%}');
+} elseif (isGetRequestElementSet('removed')) {
 	// Extensions changed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSIONS_REMOVED', bigintval(getRequestParameter('removed'))));
+	displayMessage('{%message,ADMIN_EXTENSIONS_REMOVED=' . bigintval(getRequestElement('removed')) . '%}');
 }
 
 // Shall we display active/inactive extensions?
 $where = '';
-if (isGetRequestParameterSet(('active'))) {
-	$where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestParameter('active'))));
+if (isGetRequestElementSet('active')) {
+	$where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestElement('active'))));
 } // END - if
 
 // Case selection
@@ -257,43 +277,48 @@ 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']);
+				if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
+					$cssSelection = '{%pipe,translateYesNo=' . $content['ext_css'] . '%}';
+				} // END - if
 
 				// 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);
@@ -302,23 +327,19 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 			loadTemplate('admin_extensions', false, $OUT);
 		} else {
 			// No extensions are registered
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_EXTENSION_REGISTERED--}');
+			displayMessage('{--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__);
+				array(bigintval($taskId)), __FILE__, __LINE__);
 			list($subject) = SQL_FETCHROW($result);
 
 			// Free result
@@ -336,27 +357,14 @@ 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' => '{--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));
+							displayMessage('{%message,ADMIN_EXTENSION_NOT_REGISTERED=' . $ext_name . '%}');
 						}
 
 						// Do we need to update cache file?
@@ -370,30 +378,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, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ALREADY--}');
+						displayMessage('{--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));
+						displayMessage('{%message,ADMIN_EXTENSION_REGISTRATION_FAILED_404=' . $ext_name . '%}');
 					}
 				} else {
 					// Motify the admin that we have a problem here...
-					loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}');
+					displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_DEPRECATED--}');
 				}
 			} else {
 				// Extension was not found in task management
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}');
+				displayMessage('{--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--}');
+			displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}');
 		} else {
 			// id is invalid
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}');
+			displayMessage('{--ADMIN_EXTENSION_REGISTRATION_FAILED_INVALID--}');
 		}
 		break;
 
 	case 'demo':
-		loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
+		displayMessage('{--SETTINGS_NOT_SAVED--}');
 		break;
 } // END - switch