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

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index de109ba218..a8196dd43a 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -46,19 +46,19 @@ 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';
-	$taskId = determineExtensionTaskId(getRequestParameter('reg_ext'));
+	$taskId = determineExtensionTaskId(getRequestElement('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 $ext_id => $ext_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') && ($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 {
 			// Deactivation is default
 			$active = 'N';
@@ -82,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'))) && (ifPostContainsSelections()) && (!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);
 
@@ -97,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",
@@ -114,7 +114,7 @@ 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());
@@ -126,7 +126,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 	} else {
 		// Edit selected entries
 		$OUT = '';
-		foreach (postRequestParameter('sel') as $ext_id => $sel) {
+		foreach (postRequestElement('sel') as $ext_id => $sel) {
 			// Edit this extension?
 			if (($sel == 'Y') || ($sel != 'Y')) {
 				// Default is no CSS for non-updated mailers
@@ -134,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);
@@ -169,10 +169,10 @@ if (isGetRequestParameterSet('reg_ext')) {
 		loadTemplate('admin_extensions_edit', false, $OUT);
 		$do = 'edit';
 	}
-} elseif ((isPostRequestParameterSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$OUT = '';
-	foreach (postRequestParameter('sel') as $ext_id => $sel) {
+	foreach (postRequestElement('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
 		initSqls();
@@ -188,7 +188,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 			// Listing of SQLs enabled?
 			if (isVerboseSqlEnabled()) {
 				// Load SQL commands in remove mode
-				if (loadExtension($ext_name, 'remove', '0.0', true)) {
+				if (loadExtension($ext_name, 'remove', '0.0.0', true)) {
 					// Generate extra table with loaded SQL commands
 					$VERBOSE_OUT = addExtensionVerboseSqlTable();
 				} // END - if
@@ -198,7 +198,6 @@ if (isGetRequestParameterSet('reg_ext')) {
 			$content = array(
 				'id'       => $ext_id,
 				'ext_name' => $ext_name,
-				'ext_ver'  => getExtensionVersion($ext_name),
 				'verbose'  => $VERBOSE_OUT
 			);
 
@@ -218,10 +217,10 @@ if (isGetRequestParameterSet('reg_ext')) {
 	// Load template
 	loadTemplate('admin_extensions_delete', false, $OUT);
 	$do = 'delete';
-} elseif ((isFormSent('remove')) && (ifPostContainsSelections()) && (!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);
 
@@ -234,15 +233,15 @@ 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('registered')) {
+} elseif (isGetRequestElementSet('registered')) {
 	// Extensions changed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', getExtensionName(getRequestParameter('registered'))));
+	displayMessage('{%message,ADMIN_EXTENSION_REGISTERED=' . getExtensionName(getRequestElement('registered')) . '%}');
 
 	// Show next link
 	if (isExtensionActive('task')) {
@@ -256,21 +255,21 @@ if (isGetRequestParameterSet('reg_ext')) {
 			'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
 		));
 	}
-} elseif (isGetRequestParameterSet('changed')) {
+} elseif (isGetRequestElementSet('changed')) {
 	// Extensions changed
-	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
-} elseif (isGetRequestParameterSet('edited')) {
+	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
@@ -279,7 +278,11 @@ switch ($do) {
 		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`
+	`id` AS `ext_id`,
+	`ext_name`,
+	`ext_active`,
+	`ext_has_css` AS `ext_css`,
+	`ext_version`
 FROM
 	`{?_MYSQL_PREFIX?}_extensions`
 ".$where."
@@ -288,7 +291,10 @@ 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."
@@ -303,7 +309,9 @@ ORDER BY
 			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
 				$content['ext_css'] = $cssSelection;
@@ -319,7 +327,7 @@ ORDER BY
 			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;
 
@@ -356,7 +364,7 @@ ORDER BY
 							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
 						} // 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 ($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