X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=31b89cb81e89c73add8eb227eb6b3d4135d30126;hp=36cf9c6f3fe6ffc09814ff0bbac6d2fb9946aa45;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=5071030af40e69ca4284642f44758964e18f5be8

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 36cf9c6f3f..31b89cb81e 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.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,26 +37,28 @@
  ************************************************************************/
 
 // 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();
 }
 
-function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
+// @TODO This function does also check for uncompleted tasks
+function outputStandardOverview (&$result_tasks) {
 	// First check for solved and not assigned tasks and assign them to current admin
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'",
-	array(getCurrentAdminId()), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'",
+		array(getCurrentAdminId()), __FILE__, __LINE__);
 
 	// We currently don't want to install an extension so let's find out if we need...
-	$EXT_LOAD_MODE = 'register';
+	setExtensionMode('test');
 	$jobsDone = true;
 
 	// Open the extension directory
-	$extensionList = getArrayFromDirectory("inc/extensions/", "ext-", false, false);
+	$extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false);
 	foreach ($extensionList as $file) {
+		// Only file name is required... :(
+		$file = basename($file);
+
 		// Is this file an extension?
-		if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == '.php')) {
-			//* DEBUG: */ echo $file."<br />\n";
+		if ((substr($file, 0, 4) == 'ext-') && (substr($file, -4) == '.php')) {
 			// Possible newly installed extension found so we extract extension's name
 			$ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
@@ -64,34 +66,38 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 			$result = false;
 
 			// Check if extension is installed or not
-			$ext_ver = GET_EXT_VERSION($ext_name);
+			$extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
 
 			// Is the extension not yet installed?
-			if (empty($ext_ver)) {
+			if ($extInstalled === false) {
 				// Generate subject line
 				$ext_subj = sprintf("[%s:]", $ext_name);
 
 				// We maybe want to install an extension so let's test-drive it...
-				if (LOAD_EXTENSION($ext_name, $EXT_LOAD_MODE)) {
+				if (loadExtension($ext_name, getExtensionMode(), '', true)) {
 					// Create a task for newly installed extension
-					CREATE_NEW_EXTENSION_TASK(getCurrentAdminId(), $ext_subj, $ext_name);
+					createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
 				} // END - if
 			} else {
 				// Test-drive extension in update mode
-				require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name));
+				loadExtension($ext_name, 'test');
+
+				// Get extension version
+				$ext_ver = getExtensionVersion($ext_name);
+				//* DEBUG: */ outputHtml($ext_name."=".$ext_ver."<br />");
 
 				// Update extension if extension is installed and outdated
-				//* DEBUG: */ print "ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."<br />\n";
-				if (EXT_GET_VERSION() > $ext_ver) {
+				//* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."<br />");
+				if (getThisExtensionVersion() > $ext_ver) {
 					// Update the extension
-					EXTENSION_UPDATE($ext_name, $ext_ver);
+					updateExtension($ext_name, $ext_ver);
 				} // END - if
 
 				if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
 					// Maybe we want to keept the current extension active?
-					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!EXT_IS_ACTIVE($ext_name))) {
+					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
 						// Reactivate this extension!
-						ACTIVATE_EXTENSION($ext_name);
+						doActivateExtension($ext_name);
 					} // END - if
 				} // END - if
 			}
@@ -99,11 +105,18 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 	} // END - foreach
 
 	// At last - but not least - check for own and new unassigned tasks...
-	$result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
-FROM `{!_MYSQL_PREFIX!}_task_system`
-WHERE `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')
-ORDER BY `userid` DESC, `task_type` DESC, `subject` ASC, `task_created` DESC",
-	array(getCurrentAdminId()), __FILE__, __LINE__);
+	$result_tasks = SQL_QUERY_ESC("SELECT
+	`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+FROM
+	`{?_MYSQL_PREFIX?}_task_system`
+WHERE
+	`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')
+ORDER BY
+	`userid` DESC,
+	`task_type` DESC,
+	`subject` ASC,
+	`task_created` DESC",
+		array(getCurrentAdminId()), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result_tasks) > 0) {
 		// New jobs found!
@@ -118,24 +131,28 @@ ORDER BY `userid` DESC, `task_type` DESC, `subject` ASC, `task_created` DESC",
 }
 
 // Outputs selected tasks
-function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
-	if ((isset($POST['assign'])) && (count($POST['task']) > 0)) {
+function outputSeletectedTasks ($postData, $result_tasks) {
+	if ((isset($postData['assign'])) && (count($postData['task']) > 0)) {
 		// Assign / do tasks
 		$OUT = ''; $SW = 2;
-		foreach ($POST['task'] as $id => $sel) {
-			$result_task = SQL_QUERY_ESC("SELECT `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
-FROM `{!_MYSQL_PREFIX!}_task_system`
-WHERE `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
+		foreach ($postData['task'] as $id => $sel) {
+			$result_task = SQL_QUERY_ESC("SELECT
+	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
+FROM
+	`{?_MYSQL_PREFIX?}_task_system`
+WHERE
+	`id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
 LIMIT 1",
-			array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+				array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+
+			// Task is found?
 			if (SQL_NUMROWS($result_task) == 1) {
 				// Task is valid...
-				list($tid, $uid, $type, $subj, $text, $created, $status, $aid) = SQL_FETCHROW($result_task);
-				SQL_FREERESULT($result_task);
+				list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
 
-				if ($aid == '0') {
+				if ($adminId == '0') {
 					// Assgin current admin to unassgigned task
-					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
 					array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
 				} // END - if
 
@@ -147,35 +164,53 @@ LIMIT 1",
 					$add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>".$mode."</strong></li>";
 				} // END - if
 
-				if ($uid > 0) {
-					$result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-					array(bigintval($uid)), __FILE__, __LINE__);
-					if (SQL_NUMROWS($result_user) == 1) {
-						list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
-						SQL_FREERESULT($result_user);
-						$add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($uid)." (<a href=\"".generateMemberEmailLink($email, "user_data")."\">".translateGender($gender)." ".$sname." ".$fname."</a>)</strong></li>";
-					} // END - if
+				// Is a userid assign?
+				if ($userid > 0) {
+					// Then load his data!
+					if (fetchUserData($userid)) {
+						// Fetch row
+						$content = getUserDataArray();
+
+						// Generate HTML list entry
+						$add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($userid, 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>)</strong></li>";
+					} else {
+						// Invalid userid, so log and zero it
+						logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
+						$userid = '0';
+					}
 				} // END - if
 
 				// Decode entities of the text
 				$text = decodeEntities($text);
 
 				// Compile and insert text from task into table template
-				$text = LOAD_TEMPLATE('admin_extensions_text', true, $text);
+				$text = loadTemplate('admin_extensions_text', true, $text);
 
 				// Initialize variables (no title for SQL commands by default)
-				$ext_name = '';
+				$ext_name = ''; $ext_ver = '';
 				$title = getMessage('TASK_NO_TITLE');
 
 				// Shall I list SQL commands assigned to an extension installation or update task?
-				if (((GET_EXT_VERSION('sql_patches') != '') && (getConfig('verbose_sql') == 'Y')) || (!EXT_IS_ACTIVE('sql_patches'))) {
+				if ((getConfig('verbose_sql') == 'Y')) {
+					// Extract extension name from subject
 					$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
-					if ($type == 'EXTENSION') {
-						// Load SQL commands for registering
-						REGISTER_EXTENSION($ext_name, $id, true);
+
+					// Update task or extension task?
+					if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
+						// Load SQL commands for registering in dry-run
+						registerExtension($ext_name, $id, true);
+
+						// Is this non-productive?
+						if (isExtensionProductive() === false) {
+							// Issue warning
+							$text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name));
+						} // END - if
+
+						// Set current extension name
+						setCurrentExtensionName($ext_name);
 
 						// Add notes to text
-						$text .= EXT_GET_NOTES();
+						$text .= getExtensionNotes();
 
 						// Set title
 						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
@@ -183,15 +218,18 @@ LIMIT 1",
 						// Prepare extension name and version
 						$ext_name = substr($ext_name, 7);
 						$ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
-						$test = '[UPDATE-'.$ext_name.'-';
+						$test = '[UPDATE-' . $ext_name . '-';
 						$ext_ver = substr($subj, strlen($test));
 						$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
 
 						// Load SQLs from file
-						EXTENSION_UPDATE($ext_name, $ext_ver, true);
+						updateExtension($ext_name, $ext_ver, true);
+
+						// Set current extension name
+						setCurrentExtensionName($ext_name);
 
 						// Add notes to text
-						$text .= EXT_GET_NOTES();
+						$text .= getExtensionNotes();
 
 						// Set title
 						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
@@ -201,53 +239,58 @@ LIMIT 1",
 					}
 
 					// Add SQLs to a table
-					if (!IS_SQLS_VALID()) INIT_SQLS();
-					if (empty($title)) $title = '';
-					if ((!empty($ext_name)) && (GET_EXT_VERSION('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
+					if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
 						// Add verbose SQL table
-						$text .= EXTENSION_VERBOSE_TABLE($title, " class=\"admin_table top2 left2 right2\"", true, "100%")."<br />\n";
+						$text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "<br />\n";
 					} // END - if
-				} else {
+				} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
 					// Run SQL commands in dry mode but only return the notes
-					EXTENSION_UPDATE($ext_name, $ext_ver, true);
-					$text .= EXT_GET_NOTES();
+					updateExtension($ext_name, $ext_ver, true);
+
+					// Set current extension name
+					setCurrentExtensionName($ext_name);
+
+					// Get notes
+					$text .= getExtensionNotes();
+				} else {
+					// This should not normally happen!
+					debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
 				}
 
 				// Prepare array for the template
 				$content = array(
 					'sw'        => $SW,
-					'subj'      => $subj,
+					'subject'   => $subj,
 					'add'       => $add,
 					'text'      => $text,
-					'created'   => generateDateTime($created, '1'),
+					'created'   => generateDateTime($created, 1),
 					'extension' => $ext_name
 				);
 
 				// Load template
-				$OUT .= LOAD_TEMPLATE('admin_overview_row', true, $content);
+				$OUT .= loadTemplate('admin_overview_row', true, $content);
 
 				// Which task do we actually have here?
 				// @TODO Rewrite this to something with include files
-				switch ($type)
-				{
+				switch ($type) {
 					case 'EXTENSION': // Install new extensions
 						$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
-						$result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-						array($ext_name), __FILE__, __LINE__);
+						$result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
+							array($ext_name), __FILE__, __LINE__);
 						$lines = SQL_NUMROWS($result_lines);
 						SQL_FREERESULT($result_lines);
 						if ($lines == '0') {
 							// New extension found
-							$OUT .= LOAD_TEMPLATE('admin_ext_reg_form', true, array(
-							'id'       => bigintval($id),
-							'ext_name' => $ext_name
+							$OUT .= loadTemplate('admin_ext_reg_form', true, array(
+								'id'       => bigintval($id),
+								'ext_name' => $ext_name
 							));
 						} else {
 							// Task is closed so nothing is todo
 							$OUT .= "<div class=\"admin_failed\">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>\n";
 
 							// Close task but not already closes or deleted or update tasks
-							if (($status != 'CLOSED') && ($status != 'DELETED') && ($type != 'EXTENSION_UPDATE')) {
+							if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
 								// Solve the task
 								runFilterChain('solve_task', $tid);
 							} // END - if
@@ -267,123 +310,114 @@ LIMIT 1",
 
 					case 'SUPPORT_MEMBER': // Assign on member's support request
 						// @TODO This may also be rewritten to include files
-						switch ($mode)
-						{
+						switch ($mode) {
 							default: // @TODO Unknown support mode
-							DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
+							logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
 							$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."</div>\n";
 							break;
 						}
 						break;
 
-							case 'PAYOUT_REQUEST': // Payout requests
-								if (EXT_IS_ACTIVE('payout')) {
-									// Extension is installed so let him send a notification to the user
-									$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE userid=%s AND payout_timestamp=%s LIMIT 1",
-									array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
-									list($pid) = SQL_FETCHROW($result_pay);
-									SQL_FREERESULT($result_pay);
-
-									if ((!empty($pid)) && ($pid > 0)) {
-										// Payout ID can be obtained
-										$content = array(
-								'pid' => $pid,
-								'tid' => $tid,
-										);
-										$OUT .= LOAD_TEMPLATE('admin_payout_overview_form', true, $content);
-									} else {
-										// Problem obtaining payout ID
-										$OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
-									}
-								} else {
-									// Extension is not installed
-									$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>\n";
-								}
-								break;
-
-							case 'WERNIS_REQUEST': // Wernis requests
-								if (EXT_IS_ACTIVE('wernis')) {
-									// Extension is installed so let him send a notification to the user
-									$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_wernis` WHERE userid=%s AND wernis_timestamp=%s LIMIT 1",
-									array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
-									list($pid) = SQL_FETCHROW($result_pay);
-									SQL_FREERESULT($result_pay);
-
-									if ((!empty($pid)) && ($pid > 0)) {
-										// Payout ID can be obtained
-										$content = array(
-								'pid' => $pid,
-								'tid' => $tid,
-										);
-										$OUT .= LOAD_TEMPLATE('admin_wernis_overview_form', true, $content);
-									} else {
-										// Problem obtaining wernis ID
-										$OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
-									}
-								} else {
-									// Extension is not installed
-									$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>\n";
-								}
-								break;
-
-							case 'HOLIDAY_REQUEST': // Holiday requests
-								$OUT .= LOAD_TEMPLATE('admin_task_holiday', true, $uid);
-								break;
-
-							case 'NL_UNSUBSCRIBE': // Newsletter unsubscriptions
-								$result = SQL_QUERY_ESC("SELECT nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-								array(bigintval($uid)), __FILE__, __LINE__);
-								list($span) = SQL_FETCHROW($result);
-								SQL_FREERESULT($result);
-
-								if ($span > 0) {
-									// Undone unscubscribe request
-									$content = array(
-							'uid' => $uid,
-							'id'  => $tid
-									);
-									$OUT .= LOAD_TEMPLATE('admin_newsletter_tsk', true, $content);
-								} else {
-									// Already unsubscribed
-									$OUT .= "<div class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</div>\n";
-								}
-								break;
-
-							default: // Unknown task type
-								DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
-								$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."</div>\n";
-								break;
+					case 'PAYOUT_REQUEST': // Payout requests
+						if (isExtensionActive('payout')) {
+							// Extension is installed so let him send a notification to the user
+							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND payout_timestamp=%s LIMIT 1",
+								array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+							list($pid) = SQL_FETCHROW($result_pay);
+							SQL_FREERESULT($result_pay);
+
+							if ((!empty($pid)) && ($pid > 0)) {
+								// Payout id can be obtained
+								$content = array(
+									'pid' => $pid,
+									'tid' => $tid,
+								);
+								$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
+							} else {
+								// Problem obtaining payout id
+								$OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
+							}
+						} else {
+							// Extension is not installed
+							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>\n";
+						}
+						break;
+
+					case 'WERNIS_REQUEST': // Wernis requests
+						if (isExtensionActive('wernis')) {
+							// Extension is installed so let him send a notification to the user
+							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
+							array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+							list($pid) = SQL_FETCHROW($result_pay);
+							SQL_FREERESULT($result_pay);
+
+							if ((!empty($pid)) && ($pid > 0)) {
+								// Payout id can be obtained
+								$content = array(
+									'pid' => $pid,
+									'tid' => $tid,
+								);
+								$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
+							} else {
+								// Problem obtaining wernis id
+								$OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
+							}
+						} else {
+							// Extension is not installed
+							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>\n";
+						}
+						break;
+
+					case 'HOLIDAY_REQUEST': // Holiday requests
+						$OUT .= loadTemplate('admin_task_holiday', true, $userid);
+						break;
+
+					case 'MEMBER_ORDER': // Member mail orders
+						$OUT .= loadTemplate('admin_task_order', true, $id);
+						break;
+
+					default: // Unknown task type
+						logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
+						$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."</div>\n";
+						break;
 				}
 				$OUT .= "  </td>
   <td width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</td>
 </tr>\n";
 			} // END - if
+
+			// Free result
+			SQL_FREERESULT($result_task);
+
+			// Switch colors
 			$SW = 3 - $SW;
 		} // END - foreach
-		define('__TASK_ROWS', $OUT);
 
 		// Load final template
-		LOAD_TEMPLATE('admin_overview_list');
+		loadTemplate('admin_overview_list', false, $OUT);
 	} else {
-		if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['task'][0] == '1'))) {
+		if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == 1))) {
 			// Only unassign / delete tasks when there are selected tasks posted
-			if (!empty($POST['unassign'])) {
+			if (!empty($postData['unassign'])) {
 				// Unassign from tasks
-				foreach ($POST['task'] as $id => $sel) {
-					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
-					array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+				foreach ($postData['task'] as $id => $sel) {
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				}
-			} elseif (isset($POST['del'])) {
+			} elseif (isset($postData['del'])) {
 				// Delete tasks
-				foreach ($POST['task'] as $id => $sel) {
-					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `id`=%s AND assigned_admin IN (%s,0) LIMIT 1",
-					array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+				foreach ($postData['task'] as $id => $sel) {
+					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND assigned_admin IN (%s,0) LIMIT 1",
+						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				}
+			} else {
+				// Unknown action
+				debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
 			}
 
 			// Update query
-			$result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') ORDER BY task_created DESC",
-			array(getCurrentAdminId()), __FILE__, __LINE__);
+			$result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') ORDER BY `task_created` DESC",
+				array(getCurrentAdminId()), __FILE__, __LINE__);
 		} // END - if
 
 		// There are uncompleted jobs!
@@ -396,8 +430,8 @@ LIMIT 1",
 			$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
 
 			// Generate infos
-			switch ($content['task_type'])
-			{
+			// @TODO Try to move this in includes
+			switch ($content['task_type']) {
 				case 'EXTENSION':
 				case 'EXTENSION_UPDATE':
 					$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
@@ -415,34 +449,34 @@ LIMIT 1",
 			}
 
 			// Prepare content
-			// @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
 			$content = merge_array($content, array(
-				'sw'      => $SW,
-				'admin'   => $content['assigned_admin'],
-				'uid'     => $content['userid'],
-				'type'    => $content['task_type_msg'],
-				'created' => generateDateTime($content['task_created'], '2')
+				'sw'             => $SW,
+				'assigned_admin' => $content['assigned_admin'],
+				'userid'         => $content['userid'],
+				'task_type_msg'  => $content['task_type_msg'],
+				'created'        => generateDateTime($content['task_created'], 2)
 			));
 
 			// Do we have extension task?
-			if (($content['task_type'] == 'EXTENSION') && (GET_EXT_VERSION($content['infos']) == '')) {
+			if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
 				// Load extension row template
-				$OUT .= LOAD_TEMPLATE("admin_overview_list_ext_rows", true, $content);
+				$OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
 			} else {
 				// Load default row template
-				$OUT .= LOAD_TEMPLATE("admin_overview_list_rows", true, $content);
+				$OUT .= loadTemplate('admin_overview_list_rows', true, $content);
 			}
 
 			// Switch color
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_tasks);
 
 		// Load footer template
-		LOAD_TEMPLATE("admin_overview_table", false, $OUT);
+		loadTemplate('admin_overview_table', false, $OUT);
 	}
 }
-//
+
+// [EOF]
 ?>