X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=8e930e83404bb0ad4d9fe8361dc8b57ff1bd4a89;hp=605f525a1b1acffc171de080f05fe625175a667e;hb=0626c932e7b895a22f390523f4e6248ca77cfb98;hpb=8383fc52cd2340ea1756f9e1808fa3589e27c341 diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 605f525a1b..8e930e8340 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -32,22 +32,21 @@ ************************************************************************/ // 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); } -function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) -{ - global $cacheArray, $cacheArray; +function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) { + global $cacheArray, $_CONFIG; // First check for solved and not assigned tasks and assign them to current admin - $result_task = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'", - array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); + 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... - $EXT_LOAD_MODE = "register"; $JOBS_DONE = true; + $EXT_LOAD_MODE = "register"; + $JOBS_DONE = true; // Open the extension directory $handle = opendir(PATH."inc/extensions/") or mxchange_die("Cannot read extension directory!"); @@ -56,99 +55,45 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) { //* DEBUG: */ echo $file."
\n"; // Possible newly installed extension found so we extract extension's name - $ext = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!! + $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!! - // Check if extension is installed or not - $ext_ver = ""; - if ((!is_array($cacheArray['extensions']['ext_version'])) || (empty($cacheArray['extensions']['ext_version'][$ext]))) { - // Load data from database - $result = SQL_QUERY_ESC("SELECT id, ext_version FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1", - array($ext), __FILE__, __LINE__); - } else { - // Load version from cache - if (!empty($cacheArray['extensions']['ext_version'][$ext])) { - // Extension is installed so we can get it's version number - $ext_ver = $cacheArray['extensions']['ext_version'][$ext]; - } else { - // Extension is not installed so no version number was found - $ext_ver = ""; - } + // Init variables + $result = false; - // Disable load from database - $result = false; - } + // Check if extension is installed or not + $ext_ver = GET_EXT_VERSION($ext_name); // Is the extension not yet installed? - if ((SQL_NUMROWS($result) == 0) && (empty($ext_ver))) { - // Not installed and do we have created a task for the admin? - $ext_subj = "[".$ext.":] ".ADMIN_NEW_EXT_SUBJ; - //* DEBUG: */ echo $ext.":".$ext_ver."="; - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE subject='%s' LIMIT 1", - array($ext_subj), __FILE__, __LINE__); - //* DEBUG: */ echo SQL_NUMROWS($result)."
\n"; - if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == "")) - { - // Template file - $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", - PATH, - GET_LANGUAGE(), - $ext - ); - - // Load text for task - if ((file_exists($tpl)) && (is_readable($tpl))) - { - // Load extension's own text template (HTML!) - $MSG = LOAD_TEMPLATE("ext_".$ext, true); - } - else - { - // Load default message - $MSG = LOAD_EMAIL_TEMPLATE("admin_new_ext","", 0); - } - - // Task not created so it's a brand-new extension which we need to register and create a task for! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) -VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())", - array( - GET_ADMIN_ID(get_session('admin_login')), - $ext_subj, - addslashes($MSG), -), __FILE__, __LINE__, true, false); - } - - // Free memory - SQL_FREERESULT($result); + if (empty($ext_ver)) { + // Generate subject line + $ext_subj = sprintf("[%s:]", $ext_name); // We maybe want to install an extension so let's test-drive it... - include(PATH."inc/extensions/".$file); - } - else - { - // Maybe we want to update? - if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1)) - { - list($dummy, $ext_ver) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - } + if (LOAD_EXTENSION($ext_name, $EXT_LOAD_MODE)) { + // Create a task for newly installed extension + CREATE_NEW_EXTENSION_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, $ext_name); + } // END - if + } else { + // Test-drive extension in update mode + require(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name)); - // Update extension - if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver); + // Update extension if extension is installed and outdated + //* DEBUG: */ print "ext={$ext_name},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext_name)."
\n"; + if ($EXT_VERSION > $ext_ver) { + // Update the extension + EXTENSION_UPDATE($ext_name, $ext_ver); + } // END - if - if (!empty($cacheArray['active_extensions'][$ext])) - { + if (isset($cacheArray['active_extensions'][$ext_name])) { // Maybe we want to keept the current extension active? - if (($cacheArray['active_extensions'][$ext] == 'Y') && (!EXT_IS_ACTIVE($ext, true, true))) - { + if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) { // Reactivate this extension! - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1", - array($ext), __FILE__, __LINE__); - EXTENSION_RUN_SQLS(GET_EXT_ID($ext), "activate"); - } - } + ACTIVATE_EXTENSION($ext_name); + } // END - if + } // END - if } - } - } + } // END - if + } // END - while // Close directory handle closedir($handle); @@ -158,70 +103,71 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())", 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_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); - if (SQL_NUMROWS($result_tasks) > 0) - { + array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + + if (SQL_NUMROWS($result_tasks) > 0) { // New jobs found! $JOBS_DONE = false; - } + } // END - if + // Free the result + SQL_FREERESULT($result); + + // Return status return $JOBS_DONE; } -// -function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) -{ + +// Outputs selected tasks +function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { global $_CONFIG, $NOTES; - if ((isset($_POST['assign'])) && (count($_POST['task']) > 0)) - { + 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=%d AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1", - array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); - if (SQL_NUMROWS($result_task) == 1) - { + 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", + array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + 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); - if ($aid == "0") - { + + if ($aid == "0") { // Assgin current admin to unassgigned task - $result_assign = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE id=%d LIMIT 1", - array(GET_ADMIN_ID(get_session('admin_login')), bigintval($tid)), __FILE__, __LINE__); - } + 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 + $ADD = ""; - if ($type == "SUPPORT_MEMBER") - { + if ($type == "SUPPORT_MEMBER") { $mode = substr($text, 0, strpos($text, ":")); $text = substr($text, strpos($text, ":") + 1); - $ADD = "
  • ".ADMIN_TASK_SUPPORT_MODE.": ".$mode."
    • "; - } - if ($uid > 0) - { - $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1", + $ADD = "
  • ".ADMIN_TASK_SUPPORT_MODE.": ".$mode."
    • "; + } // 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($sex, $sname, $fname, $email) = SQL_FETCHROW($result_user); + if (SQL_NUMROWS($result_user) == 1) { + list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user); SQL_FREERESULT($result_user); - $ADD = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_SEX($sex)." ".$sname." ".$fname.")
    • "; - } - } + $ADD = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; + } // END - if + } // END - if + + // Decode entities of the text + $text = html_entity_decode($text); // Compile and insert text from task into table template - $text = LOAD_TEMPLATE("admin_extensions_text", true, COMPILE_CODE($text)); + $text = LOAD_TEMPLATE("admin_extensions_text", true, $text); // Initialize variables (no title for SQL commands by default) $ext_name = ""; $title = TASK_NO_TITLE; // Shall I list SQL commands assigned to an extension installation or update task? - if (((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['verbose_sql'] == 'Y')) || (!EXT_IS_ACTIVE("sql_patches"))) - { + if (((GET_EXT_VERSION("sql_patches") != '') && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) { $ext_name = substr($subj, 1, strpos($subj, ":") - 1); - if ($type == "EXTENSION") - { + if ($type == "EXTENSION") { // Load SQL commands for registering $SQLs = EXTENSION_REGISTER($ext_name, $id, true); @@ -230,10 +176,8 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) // Set title $title = ADMIN_SQLS_EXECUTED_ON_REGISTER; - } - elseif ($type == "EXTENSION_UPDATE") - { - // Load SQL commands for update (already done!) + } elseif ($type == "EXTENSION_UPDATE") { + // Prepare extension name and version $ext_name = substr($ext_name, 7); $ext_name = substr($ext_name, 0, strpos($ext_name, "-")); $test = "[UPDATE-".$ext_name."-"; @@ -241,16 +185,14 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ":")); // Load SQLs from file - $SQLs = EXTENSION_UPDATE("ext-".$ext_name.".php", $ext_name, $ext_ver, true); + $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true); // Add notes to text $text .= $NOTES; // Set title $title = ADMIN_SQLS_EXECUTED_ON_UPDATE; - } - else - { + } else { // Remove extension's name $ext_name = ""; } @@ -258,15 +200,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) // Add SQLs to a table if (empty($SQLs)) $SQLs = array(); if (empty($title)) $title = ""; - if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == 'Y')) { + if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && (getConfig('verbose_sql') == "Y")) { // Add verbose SQL table $text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."
    \n"; - } - } - else - { + } // END - if + } else { // Run SQL commands in dry mode but only return the notes - $SQLs = EXTENSION_UPDATE("ext-".$ext_name.".php", $ext_name, $ext_ver, true); + $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true); $text .= $NOTES; } @@ -284,6 +224,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) $OUT .= LOAD_TEMPLATE("admin_overview_row", true, $content); // Which task do we actually have here? + // @TODO Rewrite this to something with include files switch ($type) { case "EXTENSION": // Install new extensions @@ -292,108 +233,92 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) array($ext_name), __FILE__, __LINE__); $lines = SQL_NUMROWS($result_lines); SQL_FREERESULT($result_lines); - if ($lines == "0") - { + if ($lines == "0") { // New extension found $OUT .= LOAD_TEMPLATE("admin_ext_reg_form", true, array( 'id' => bigintval($id), 'ext_name' => $ext_name )); - } - else - { + } else { // Task is closed so nothing is todo - $OUT .= "".ADMIN_EXT_ALREADY_REGISTERED."\n"; + $OUT .= "
    ".ADMIN_EXT_ALREADY_REGISTERED."
    \n"; // Close task but not already closes or deleted or update tasks - if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) - { - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%d LIMIT 1", - array(bigintval($tid)), __FILE__, __LINE__); - } + if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) { + // Solve the task + RUN_FILTER('solve_task', $tid); + } // END - if } break; - case "EXTENSION_UPDATE": + case "EXTENSION_UPDATE": // Extension update // Extension updates are installed automatically - $OUT .= "".ADMIN_EXTENSION_UPDATED."\n"; + $OUT .= "
    ".ADMIN_EXTENSION_UPDATED."
    \n"; // Close task - if (($status != "CLOSED") && ($status != "DELETED")) - { - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%d LIMIT 1", - array(bigintval($tid)), __FILE__, __LINE__); - } + if (($status != "CLOSED") && ($status != "DELETED")) { + // Solve the task + RUN_FILTER('solve_task', $tid); + } // END - if break; case "SUPPORT_MEMBER": // Assign on member's support request switch ($mode) { - default: // Unknown support mode - $OUT .= "".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."\n"; + default: // @TODO Unknown support mode + DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode)); + $OUT .= "
    ".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."
    \n"; break; } break; case "PAYOUT_REQUEST": // Payout requests - if (EXT_IS_ACTIVE("payout")) - { + 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=%d AND payout_timestamp=%d LIMIT 1", - array(bigintval($uid), bigintval($created)), __FILE__, __LINE__); + $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)) - { + 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 - { + } else { // Problem obtaining payout ID - $OUT .= "".PAYOUT_OBTAIN_ID_FAILED."\n"; + $OUT .= "
    ".PAYOUT_OBTAIN_ID_FAILED."
    \n"; } - } - else - { + } else { // Extension is not installed - $OUT .= "".ADMIN_PAYOUT_NOT_INSTALLED."\n"; + $OUT .= "
    ".ADMIN_PAYOUT_NOT_INSTALLED."
    \n"; } break; case "WERNIS_REQUEST": // Wernis requests - if (EXT_IS_ACTIVE("wernis")) - { + 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=%d AND wernis_timestamp=%d LIMIT 1", - array(bigintval($uid), bigintval($created)), __FILE__, __LINE__); + $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)) - { + 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 - { + } else { // Problem obtaining wernis ID - $OUT .= "".WERNIS_OBTAIN_ID_FAILED."\n"; + $OUT .= "
    ".WERNIS_OBTAIN_ID_FAILED."
    \n"; } - } - else - { + } else { // Extension is not installed - $OUT .= "".ADMIN_WERNIS_NOT_INSTALLED."\n"; + $OUT .= "
    ".ADMIN_WERNIS_NOT_INSTALLED."
    \n"; } break; @@ -402,99 +327,84 @@ 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=%d LIMIT 1", - array(bigintval($uid)), __FILE__, __LINE__); + $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) - { + if ($span > 0) { // Undone unscubscribe request $content = array( 'uid' => $uid, 'id' => $tid ); $OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content); - } - else - { + } else { // Already unsubscribed - $OUT .= "".ADMIN_NL_UNSUBSCRIBE_ALREADY."\n"; + $OUT .= "
    ".ADMIN_NL_UNSUBSCRIBE_ALREADY."
    \n"; } break; default: // Unknown task type - $OUT .= "".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."\n"; + DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type)); + $OUT .= "
    ".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."
    \n"; break; } - $OUT .= " -   -\n"; - } + $OUT .= " +   +\n"; + } // END - if $SW = 3 - $SW; - } + } // END - foreach define('__TASK_ROWS', $OUT); // Load final template LOAD_TEMPLATE("admin_overview_list"); - } - else - { - if ((isset($_POST['task'])) && ((sizeof($_POST['task']) > 0) || ($_POST['task'][0] == "1"))) - { + } else { + if ((isset($POST['task'])) && ((sizeof($POST['task']) > 0) || ($POST['task'][0] == "1"))) { // Only unassign / delete tasks when there are selected tasks posted - if (!empty($_POST['unassign'])) - { + if (!empty($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=%d AND assigned_admin='%s' LIMIT 1", - array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); + 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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); } - } - elseif (isset($_POST['del'])) - { + } elseif (isset($POST['del'])) { // Delete tasks - foreach ($_POST['task'] as $id=>$sel) - { - $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%d AND (assigned_admin='%s' OR assigned_admin='0') LIMIT 1", - array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); + 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), 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", - array(GET_ADMIN_ID(get_session('admin_login'))), __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(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + } // END - if // There are uncompleted jobs! LOAD_TEMPLATE("admin_overview_header"); $SW = 2; - while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) - { + while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) { $infos = "---"; - if ($admin == "0") - { + if ($admin == "0") { // No admin currently is assigned - $admin = "".ADMIN_NO_ADMIN_ASSIGNED.""; - } - else - { + $admin = "
    ".ADMIN_NO_ADMIN_ASSIGNED."
    "; + } else { // Load admin's data $login = GET_ADMIN_LOGIN($admin); - if ($login != "***") - { + if ($login != "***") { // Admin found - $admin = "".$login.""; - } - else - { + $admin = "".$login.""; + } else { // Maybe deleted? - $admin = "".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2.""; + $admin = "
    ".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."
    "; } } - $evl = "\$type_out = ADMIN_TASK_IS_".strtoupper($type).";"; - eval($evl); + + // Get task type + $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).''); + $type2 = substr($text, 0, strpos($text, ":")); // Generate infos switch ($type) @@ -504,16 +414,15 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) $infos = substr($subj, 1, strpos($subj, ":") - 1); break; } - if ($uid > 0) - { + + if ($uid > 0) { // Member found otherwise it's a system task $uid = ADMIN_USER_PROFILE_LINK($uid); - } - else - { - $uid = "".ADMIN_IS_SYSTEM_TASK.""; + } else { + $uid = "".ADMIN_IS_SYSTEM_TASK.""; } + // Prepare content $content = array( 'sw' => $SW, 'id' => $id, @@ -524,7 +433,16 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) 'created' => MAKE_DATETIME($created, "2") ); - LOAD_TEMPLATE("admin_overview_list_rows", false, $content); + // Do we have extension task? + if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) { + // Load extension row template + LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content); + } else { + // Load default row template + LOAD_TEMPLATE("admin_overview_list_rows", false, $content); + } + + // Switch color $SW = 3 - $SW; } // Free memory