X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=d823fd4676e2393291a5e4d31139c963f70a04d8;hb=4c83f0cc7459cad9ec9c1c68963f5365155ee935;hp=aea6083994e492ec4d636c36cb18a8d00b84fe69;hpb=97eb53f4fdcc3f433dea23d09efde744d52a3740;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index aea6083994..d823fd4676 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -38,10 +38,8 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
-	global $cacheArray, $_CONFIG;
-
 	// 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'",
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
 		array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
 	// We currently don't want to install an extension so let's find out if we need...
@@ -49,7 +47,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 	$JOBS_DONE = true;
 
 	// Open the extension directory
-	$handle = opendir(PATH."inc/extensions/") or mxchange_die("Cannot read extension directory!");
+	$handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!");
 	while ($file = readdir($handle)) {
 		// Is this file an extension?
 		if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
@@ -75,7 +73,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 				} // END - if
 			} else {
 				// Test-drive extension in update mode
-				require(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name));
+				require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name));
 
 				// Update extension if extension is installed and outdated
 				//* DEBUG: */ print "ext={$ext_name},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext_name)."<br />\n";
@@ -84,9 +82,9 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 					EXTENSION_UPDATE($ext_name, $ext_ver);
 				} // END - if
 
-				if (isset($cacheArray['active_extensions'][$ext_name])) {
+				if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
 					// Maybe we want to keept the current extension active?
-					if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
+					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
 						// Reactivate this extension!
 						ACTIVATE_EXTENSION($ext_name);
 					} // END - if
@@ -100,8 +98,8 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 
 	// 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')
+FROM `{!_MYSQL_PREFIX!}_task_system`
+WHERE assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
 		array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
@@ -119,12 +117,12 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
 
 // Outputs selected tasks
 function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
-	global $_CONFIG, $NOTES;
+	global $NOTES;
 	if ((isset($POST['assign'])) && (count($POST['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')) LIMIT 1",
+			$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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result_task) == 1) {
 				// Task is valid...
@@ -133,7 +131,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
 				if ($aid == "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(GET_CURRENT_ADMIN_ID(), bigintval($tid)), __FILE__, __LINE__);
 				} // END - if
 
@@ -141,28 +139,28 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				if ($type == "SUPPORT_MEMBER") {
 					$mode = substr($text, 0, strpos($text, ":"));
 					$text = substr($text, strpos($text, ":") + 1);
-					$ADD = "<li>".ADMIN_TASK_SUPPORT_MODE.": <strong>".$mode."</strong></li>";
+					$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",
+					$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>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
+						$ADD = "<li>{--ADMIN_MEMBER_UID--}: <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
 					} // END - if
 				} // END - if
 
 				// Decode entities of the text
-				$text = html_entity_decode($text);
+				$text = decodeEntities($text);
 
 				// Compile and insert text from task into table template
 				$text = LOAD_TEMPLATE("admin_extensions_text", true, $text);
 
 				// Initialize variables (no title for SQL commands by default)
 				$ext_name = "";
-				$title = TASK_NO_TITLE;
+				$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"))) {
@@ -175,7 +173,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						$text .= $NOTES;
 
 						// Set title
-						$title = ADMIN_SQLS_EXECUTED_ON_REGISTER;
+						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
 					} elseif ($type == "EXTENSION_UPDATE") {
 						// Prepare extension name and version
 						$ext_name = substr($ext_name, 7);
@@ -191,7 +189,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						$text .= $NOTES;
 
 						// Set title
-						$title = ADMIN_SQLS_EXECUTED_ON_UPDATE;
+						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
 					} else {
 						// Remove extension's name
 						$ext_name = "";
@@ -229,8 +227,8 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				{
 				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") {
@@ -241,7 +239,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						));
 					} else {
 						// Task is closed so nothing is todo
-						$OUT .= "<div class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</div>\n";
+						$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")) {
@@ -253,7 +251,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
 				case "EXTENSION_UPDATE": // Extension update
 					// Extension updates are installed automatically
-					$OUT .= "<div class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</div>\n";
+					$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_EXTENSION_UPDATED--}</div>\n";
 
 					// Close task
 					if (($status != "CLOSED") && ($status != "DELETED")) {
@@ -263,6 +261,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					break;
 
 				case "SUPPORT_MEMBER": // Assign on member's support request
+					// @TODO This may also be rewritten to include files
 					switch ($mode)
 					{
 					default: // @TODO Unknown support mode
@@ -275,7 +274,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				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",
+						$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);
@@ -293,14 +292,14 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						}
 					} else {
 						// Extension is not installed
-						$OUT .= "<div class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</div>\n";
+						$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",
+						$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);
@@ -314,11 +313,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 							$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";
+							$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";
+						$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>\n";
 					}
 					break;
 
@@ -327,7 +326,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					break;
 
 				case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions
-					$result = SQL_QUERY_ESC("SELECT nl_timespan FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+					$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);
@@ -350,9 +349,9 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					$OUT .= "<div class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</div>\n";
 					break;
 				}
-				$OUT .= "  </TD>
-  <TD width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</TD>
-</TR>\n";
+				$OUT .= "  </td>
+  <td width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</td>
+</tr>\n";
 			} // END - if
 			$SW = 3 - $SW;
 		} // END - foreach
@@ -366,19 +365,19 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 			if (!empty($POST['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",
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
 						array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 				}
 			} elseif (isset($POST['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",
+					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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 				}
 			}
 
 			// 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",
+			$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(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 		} // END - if
 
@@ -386,21 +385,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 		LOAD_TEMPLATE("admin_overview_header");
 		$SW = 2;
 		while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
+			// Init infos
 			$infos = "---";
-			if ($admin == "0") {
-				// No admin currently is assigned
-				$admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
-			} else {
-				// Load admin's data
-				$login = GET_ADMIN_LOGIN($admin);
-				if ($login != "***") {
-					// Admin found
-					$admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
-				} else {
-					// Maybe deleted?
-					$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
-				}
-			}
+
+			// Generate assign link
+			$admin = GENERATE_AID_LINK($admin);
 
 			// Get task type
 			$type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
@@ -419,7 +408,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				// Member found otherwise it's a system task
 				$uid = ADMIN_USER_PROFILE_LINK($uid);
 			} else {
-				$uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
+				$uid = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
 			}
 
 			// Prepare content