X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=c00272e2870ccad4d9b9eadf41dd1edfca2d26b6;hb=427719103e37ed2e27803b833dc5db5841e4dec9;hp=5ac8fff0b1f45e0df1878483ad575b3524eda804;hpb=43885129ac24cee5545a8a5ad51e90aa182fdf46;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 5ac8fff0b1..c00272e287 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
@@ -41,7 +41,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 $whereStatement = "";
 if (empty($_GET['type'])) $_GET['type'] = "your";
@@ -81,48 +81,35 @@ if (!empty($whereStatement))
 {
 	$SEL = 0;
 	if (isset($_POST['task'])) $SEL = SELECTION_COUNT($_POST['task']);
-	if ((isset($_POST['assign'])) && ($SEL > 0))
-	{
+	if ((isset($_POST['assign'])) && ($SEL > 0)) {
 		// Assign / do tasks
 		require_once(PATH."inc/modules/admin/overview-inc.php");
 		if (empty($dmy)) $dmy = "";
 		OUTPUT_SELECTED_TASKS($_POST, $dmy);
-	}
-	 else
-	{
+	} else {
 		// Start listing tasks matching selected filter
 		$result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
 FROM "._MYSQL_PREFIX."_task_system
 WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
-		if (($SEL > 0) && (!IS_DEMO()))
-		{
+		if (($SEL > 0) && (!IS_DEMO())) {
 			// Only unassign / delete tasks when there are selected tasks posted
-			if (isset($_POST['unassign']))
-			{
+			if (isset($_POST['unassign'])) {
 				// Unassign from tasks
-				foreach ($_POST['task'] as $id=>$sel)
-				{
-					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='0' WHERE id=%s AND assigned_admin='%s' LIMIT 1",
+				foreach ($_POST['task'] as $id => $sel) {
+					$result = 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_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 				}
-			}
-			 elseif (isset($_POST['del']))
-			{
+			} elseif (isset($_POST['del'])) {
 				// Delete tasks
-				foreach ($_POST['task'] as $id=>$sel)
-				{
-					if ($_GET['type'] == "deleted")
-					{
+				foreach ($_POST['task'] as $id => $sel) {
+					if ($_GET['type'] == "deleted") {
 						// Delete task immediately
 						$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
 						 array(bigintval($id)),__FILE__, __LINE__);
-					}
-					 else
-					{
+					} else {
 						// Mark task as to be deleted (purged by autppurge extension)
-						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='DELETED' WHERE id=%s LIMIT 1",
-						 array(bigintval($id)), __FILE__, __LINE__);
+						ADMIN_DELETE_TASK($id);
 					}
 				}
 			}
@@ -132,8 +119,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 		}
 
 		// There are uncompleted jobs!
-		$eval = "\$type = ADMIN_OVERVIEW_TASK_".strtoupper($_GET['type'])."_TYPE;";
-		eval($eval);
+		$type = constant('ADMIN_OVERVIEW_TASK_'.strtoupper($_GET['type']).'_TYPE');
 		LOAD_TEMPLATE("admin_overview_header_task", false, array(
 			'message' => $type,
 			'type'    => $_GET['type']
@@ -162,8 +148,10 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 					$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
 				}
 			}
-			$evl = "\$type_out = ADMIN_TASK_IS_".strtoupper($type).";";
-			eval($evl);
+
+			// Get admin task
+			$type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+
 			$type2 = substr($text, 0, strpos($text, ":"));
 			// Generate infos
 			switch ($type)