X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=840a4ffb7ecf99107f5de887d14076b6a8d7a80b;hb=cca98f57dff720b174d21d071cee8303462485d7;hp=8e930e83404bb0ad4d9fe8361dc8b57ff1bd4a89;hpb=0626c932e7b895a22f390523f4e6248ca77cfb98;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 8e930e8340..840a4ffb7e 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -41,7 +41,7 @@ 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...
@@ -100,7 +100,7 @@ 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
+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__);
@@ -124,7 +124,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 		// 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 +133,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
 
@@ -145,7 +145,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				} // 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);
@@ -229,7 +229,7 @@ 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",
+					$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);
@@ -275,7 +275,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);
@@ -300,7 +300,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 				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);
@@ -327,7 +327,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);
@@ -366,19 +366,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