X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-extensions.php;h=c9421a7cf65a586e51c38c21e217692037eea521;hp=b159ab3d45f43775a758dbb2e9a5253accba9776;hb=671f0fea4b23b0fc2e571dd2b1b949db223dade8;hpb=06a24901c58897845bafc1e5b428fee99024bc64

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index b159ab3d45..c9421a7cf6 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,214 +37,227 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Normally we want the overview of all registered extensions
 $do = 'overview';
 $SEL = 0;
 
 // Are some extensions submitted?
-if (REQUEST_ISSET_POST('sel')) {
+if (isPostRequestElementSet('sel')) {
 	// Then count all
 	$SEL = countPostSelection();
 } // END - if
 
-if (REQUEST_ISSET_GET('reg_ext')) {
+if (isGetRequestElementSet('reg_ext')) {
 	// We are about to register a new extension
-	$do = 'register'; $ext_id = bigintval(REQUEST_GET('reg_ext'));
+	$do = 'register'; $ext_id = bigintval(getRequestElement('reg_ext'));
 	// The ID comes from task management and it is - of course - *not* the extension's name!
-} elseif ((REQUEST_ISSET_POST('change')) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((isPostRequestElementSet('change')) && ($SEL > 0) && (!isDemoModeActive())) {
 	// De-/activate extensions
-	foreach (REQUEST_POST('sel') as $ext_id => $active) {
+	foreach (postRequestElement('sel') as $ext_id => $active) {
 		// Shall we keep the extension always active?
-		if ((isset($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)] == 'Y') && ($active == 'N')) {
+		if ((isset($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][getExtensionName($ext_id)] == 'Y') && ($active != 'Y')) {
 			// Keep this extension active!
 		} else {
 			// De/activate extension
-			$ACT = 'N'; $EXT_LOAD_MODE = 'deactivate';
-			if ($active == 'N') { $ACT = 'Y'; $EXT_LOAD_MODE = 'activate'; }
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
-			array(bigintval($ext_id), $active), __FILE__, __LINE__);
+			$ACT = 'N'; setExtensionMode('deactivate');
+			if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='".$ACT."' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
+				array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
 			// Run embeded SQL commands
-			EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
+			doExtensionSqls($ext_id, getExtensionMode());
 		}
 	}
-} elseif (((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST(('modify')))) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet(('modify')))) && ($SEL > 0) && (!isDemoModeActive())) {
 	// Change settings like CSS file load
-	if (REQUEST_ISSET_POST(('modify'))) {
+	if (isPostRequestElementSet(('modify'))) {
 		// Change entries
 		$cache_update = 0;
-		foreach (REQUEST_POST('sel') as $ext_id => $sel) {
+		foreach (postRequestElement('sel') as $ext_id => $sel) {
 			// Secure ID
 			$ext_id = bigintval($ext_id);
 
 			// Change this extension?
 			if ($sel == 1) {
 				// Load mode is modify
-				$EXT_LOAD_MODE = 'modify';
+				setExtensionMode('modify');
 
 				// Get entry for 'active'
-				$active = REQUEST_POST('active', $ext_id);
+				$active = postRequestElement('active', $ext_id);
 
 				// Update extension's record
-				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
+				if (getExtensionVersion('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(REQUEST_POST('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",
-					array($active, $ext_id), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s LIMIT 1",
+						array($active, $ext_id), __FILE__, __LINE__);
 				}
 
 				// Run SQLs on activation / deactivation
 				switch ($active) {
-					case 'Y': $EXT_LOAD_MODE = 'activate';   break;
-					case 'N': $EXT_LOAD_MODE = 'deactivate'; break;
-				}
+					case 'Y': setExtensionMode('activate');   break;
+					case 'N': setExtensionMode('deactivate'); break;
+				} // END - if
 
 				// Run embeded SQL commands
-				EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
+				doExtensionSqls($ext_id, getExtensionMode());
 			}
 		}
 
 		// Extensions changed
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXT_CHANGED'));
 	} else {
 		// Edit selected entries
 		$SW = 2; $OUT = '';
-		foreach (REQUEST_POST('sel') as $ext_id => $sel) {
+		foreach (postRequestElement('sel') as $ext_id => $sel) {
 			// Edit this extension?
-			if (($sel == 'Y') || ($sel == 'N')) {
+			if (($sel == 'Y') || ($sel != 'Y')) {
+				// Default is no CSS for non-updated mailers
+				$css = 'N';
+
 				// Load required data
-				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
-					$result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `id`=%s LIMIT 1",
-					array(bigintval($ext_id)), __FILE__, __LINE__);
-					list($name, $css, $active) = SQL_FETCHROW($result);
+				if (getExtensionVersion('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($ext_id)), __FILE__, __LINE__);
+					list($css, $active) = SQL_FETCHROW($result);
 					SQL_FREERESULT($result);
 				} else {
-					$result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `id`=%s LIMIT 1",
-					array(bigintval($ext_id)), __FILE__, __LINE__);
-					list($name, $active) = SQL_FETCHROW($result);
+					$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);
 					$css = 'X';
 				}
 
 				// Output row
 				$cssSelection = '---';
-				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = ADD_SELECTION('yn', $css, 'css', $ext_id);
+				if (getExtensionVersion('sql_patches') >= '0.0.6') $cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
 
 				// Prepare data for the row template
 				$content = array(
 					'sw'     => $SW,
 					'id'     => $ext_id,
-					'name'   => $name,
-					'active' => ADD_SELECTION('yn', $active, 'active', $ext_id),
+					'name'   => getExtensionName($ext_id),
+					'active' => addSelectionBox('yn', $active, 'active', $ext_id),
 					'css'    => $cssSelection,
 				);
 
 				// Load row template and switch color
-				$OUT .= LOAD_TEMPLATE('admin_extensions_edit_row', true, $content);
+				$OUT .= loadTemplate('admin_extensions_edit_row', true, $content);
 				$SW = 3 - $SW;
 			}
 		} // END - foreach
 
-		// @TODO Rewrite this constant
-		define('__EXTENSIONS_ROWS', $OUT);
-
 		// Load template
-		LOAD_TEMPLATE('admin_extensions_edit');
+		loadTemplate('admin_extensions_edit', false, $OUT);
 		$do = 'edit';
 	}
-} elseif ((REQUEST_ISSET_POST('delete')) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((isPostRequestElementSet('delete')) && ($SEL > 0) && (!isDemoModeActive())) {
 	// List extensions and when verbose is enabled SQL statements which will be executed
 	$OUT = ''; $SW = 2;
-	foreach (REQUEST_POST('sel') as $ext_id => $sel) {
+	foreach (postRequestElement('sel') as $ext_id => $sel) {
 		// Init variables
 		$VERBOSE_OUT = '';
-		INIT_SQLS();
+		initSqls();
 
 		// Secure id number
 		$ext_id = bigintval($ext_id);
 
-		// Get extension name
-		$ext_name = GET_EXT_NAME($ext_id);
-
-		if (getConfig('verbose_sql') == 'Y') {
-			// Load SQL commands in remove mode
-			if (LOAD_EXTENSION($ext_name, 'remove', '', true)) {
-				// Generate extra table with loaded SQL commands
-				$VERBOSE_OUT = EXTENSION_VERBOSE_TABLE();
+		// Is the id valid?
+		if (isExtensionIdValid($ext_id)) {
+			// Get extension name
+			$ext_name = getExtensionName($ext_id);
+
+			if (getConfig('verbose_sql') == 'Y') {
+				// Load SQL commands in remove mode
+				if (loadExtension($ext_name, 'remove', '', true)) {
+					// Generate extra table with loaded SQL commands
+					$VERBOSE_OUT = addExtensionVerboseSqlTable();
+				} // END - if
 			} // END - if
-		} // END - if
 
-		// Prepare data for the row template
-		$content = array(
-			'sw'       => $SW,
-			'id'       => $ext_id,
-			'ext_name' => $ext_name,
-			'ext_ver'  => GET_EXT_VERSION($ext_name),
-			'verbose'  => $VERBOSE_OUT
-		);
-
-		// Load row template and switch color
-		$OUT .= LOAD_TEMPLATE('admin_extensions_delete_row', true, $content);
+			// 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
+			);
+
+			// Load row template and switch color
+			$OUT .= loadTemplate('admin_extensions_delete_row', true, $content);
+		} 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
-	define('__EXTENSIONS_ROWS', $OUT);
 
 	// Load template
-	LOAD_TEMPLATE('admin_extensions_delete');
+	loadTemplate('admin_extensions_delete', false, $OUT);
 	$do = 'delete';
-} elseif ((REQUEST_ISSET_POST('remove')) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((isPostRequestElementSet('remove')) && ($SEL > 0) && (!isDemoModeActive())) {
 	// Remove extensions from DB (you have to delete all files manually!)
 	$cache_update = 0;
-	foreach (REQUEST_POST('sel') as $ext_id => $active) {
+	foreach (postRequestElement('sel') as $ext_id => $active) {
 		// Secure ID number
 		$ext_id = bigintval($ext_id);
 
-		// Is this extension selected?
-		if ($active == 1) {
+		// Is this extension selected and id valid?
+		if (($active == 1) && (isExtensionIdValid($ext_id))) {
 			// Run embeded SQL commands
-			EXTENSION_RUN_SQLS($ext_id, 'remove');
+			doExtensionSqls($ext_id, 'remove');
 		} // END - if
 	} // END - foreach
-} elseif ((REQUEST_ISSET_GET('do')) && (!IS_DEMO())) {
+
+	// Extensions removed
+	loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSIONS_REMOVED'), $SEL));
+} elseif ((isGetRequestElementSet('do')) && (!isDemoModeActive())) {
 	// Other things to do
-	$do = SQL_ESCAPE(strip_tags(REQUEST_GET('do')));
-} elseif (REQUEST_ISSET_GET('do')) {
+	$do = SQL_ESCAPE(secureString(getRequestElement('do')));
+} elseif (isGetRequestElementSet('do')) {
 	// Demo mode active!
 	$do = 'demo';
 }
 
 // Shall we display active/inactive extensions?
 $where = '';
-if (REQUEST_ISSET_GET(('active'))) {
-	$where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(strip_tags(REQUEST_GET('active'))));
+if (isGetRequestElementSet(('active'))) {
+	$where = sprintf("WHERE `ext_active`='%s'", SQL_ESCAPE(secureString(getRequestElement('active'))));
 } // END - if
 
 // Case selection
 switch ($do) {
 	case 'overview': // List all registered extensions
-		if (GET_EXT_VERSION('sql_patches') >= '0.0.6') {
+		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", __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`, `id`, `ext_version`
+FROM `{?_MYSQL_PREFIX?}_extensions`
 ".$where."
-ORDER BY ext_name", __FILE__, __LINE__);
+ORDER BY `ext_name` ASC", __FILE__, __LINE__);
 		}
 
 		// Are there some entries?
@@ -254,41 +267,38 @@ ORDER BY ext_name", __FILE__, __LINE__);
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Prepare CSS selection output
 				$cssSelection = '---';
-				if (GET_EXT_VERSION('sql_patches') >= '0.0.6') $cssSelection = translateYesNo($content['ext_css']);
+				if (getExtensionVersion('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'],
+					'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'],
 				);
 
 				// Load row template and switch color
-				$OUT .= LOAD_TEMPLATE("admin_extensions_row", true, $content);
+				$OUT .= loadTemplate('admin_extensions_row', true, $content);
 				$SW = 3 - $SW;
 			}
 
 			// Free memory
 			SQL_FREERESULT($result);
 
-			// Remember rows in constant for the template
-			define('__EXT_ROWS', $OUT);
-
 			// Load template
-			LOAD_TEMPLATE("admin_extensions");
+			loadTemplate('admin_extensions', false, $OUT);
 		} else {
 			// No extensions are registered
-			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_EXTENSION_REGISTERED'));
+			loadTemplate('admin_settings_saved', false, getMessage('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__);
+		$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
@@ -297,8 +307,8 @@ ORDER BY ext_name", __FILE__, __LINE__);
 		// Is the ID number valid and the task was found?
 		if (($ext_id > 0) && ($task_found == 1)) {
 			// 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__);
+			$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);
 			SQL_FREERESULT($result);
 
@@ -309,63 +319,70 @@ ORDER BY ext_name", __FILE__, __LINE__);
 				$ext_name = trim(substr($subj, 1, strpos($subj, ':') - 1));
 
 				// Test the extension for deprecation
-				LOAD_EXTENSION($ext_name, 'test');
+				loadExtension($ext_name, 'test');
 
 				// Is the extension deprecated?
-				if (EXT_GET_DEPRECATED() == 'N') {
+				if (!isExtensionDeprecated()) {
 					// ... so we can finally register and load it in registration mode
-					if (REGISTER_EXTENSION($ext_name, $ext_id)) {
-						// Extension was found and successfully registered
-						LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_EXTENSION_REGISTERED'));
-
-						// Show next link
-						if (EXT_IS_ACTIVE('task')) {
-							LOAD_TEMPLATE('admin_next_link', false, array(
-							'url'   => 'modules.php?module=admin&what=list_task',
-							'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
-							));
+					if (registerExtension($ext_name, $ext_id)) {
+						// Errors?
+						if (getTotalFatalErrors() == 0) {
+							// Extension was found and successfully registered
+							loadTemplate('admin_settings_saved', false, sprintf(getMessage('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_EXT_REGISTER_NEXT_LINK')
+								));
+							} else {
+								loadTemplate('admin_next_link', false, array(
+									'url'   => 'modules.php?module=admin',
+									'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+								));
+							}
 						} else {
-							LOAD_TEMPLATE('admin_next_link', false, array(
-							'url'   => 'modules.php?module=admin',
-							'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
-							));
+							// Errors detected!
+							loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_EXTENSION_NOT_REGISTERED'), $ext_name));
 						}
 
 						// Do we need to update cache file?
 						// @TODO Rewrite this to a filter
-						if ((EXT_IS_ACTIVE('cache')) && ($GLOBALS['cache_mode'] != 'no')) {
+						if (isExtensionActive('cache')) {
 							// Remove cache file (will be auto-created again!)
-							if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->destroyCacheFile();
-							if ($GLOBALS['cache_instance']->loadCacheFile('extensions', true)) $GLOBALS['cache_instance']->destroyCacheFile();
-							if ($GLOBALS['cache_instance']->loadCacheFile('modreg')) $GLOBALS['cache_instance']->destroyCacheFile();
+							if ($GLOBALS['cache_instance']->loadCacheFile('config'))    $GLOBALS['cache_instance']->removeCacheFile();
+							if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile();
+							if ($GLOBALS['cache_instance']->loadCacheFile('modules'))   $GLOBALS['cache_instance']->removeCacheFile();
 						} // END - if
-					} elseif (GET_EXT_VERSION($ext_name) != '') {
+					} elseif (getExtensionVersion($ext_name) != '') {
 						// Notify the admin that we have a problem here...
-						LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
+						loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ALREADY'));
 					} else {
 						// Notify the admin that we have a problem here...
-						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name));
+						loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_REG_FAILED_404'), $ext_name));
 					}
 				} else {
 					// Motify the admin that we have a problem here...
-					LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));
+					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));
 				}
 			} else {
 				// Extension was not found in task management
-				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404'));
+				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ID_404'));
 			}
-		} elseif ($task_found == '0') {
+		} elseif ($task_found == 0) {
 			// No longer assigned or old task
-			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
+			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
 		} else {
 			// ID is invalid
-			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID'));
+			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REG_FAILED_INVALID'));
 		}
 		break;
 
 	case 'demo':
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
+		loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 		break;
 }
-//
+
+// [EOF]
 ?>