X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=f2f05f97b0bfc4a4b47ae8d874758042f691a4f0;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;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..f2f05f97b0 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... @@ -75,7 +75,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)."
\n"; @@ -100,8 +100,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__); @@ -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 @@ -141,16 +141,16 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { if ($type == "SUPPORT_MEMBER") { $mode = substr($text, 0, strpos($text, ":")); $text = substr($text, strpos($text, ":") + 1); - $ADD = "
  • ".ADMIN_TASK_SUPPORT_MODE.": ".$mode."
    • "; + $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", + $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 = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; + $ADD = "
  • {--ADMIN_MEMBER_UID--}: ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; } // END - if } // END - if @@ -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); @@ -241,7 +241,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { )); } 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")) { @@ -253,7 +253,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { 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")) { @@ -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); @@ -293,14 +293,14 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { } } 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")) { // 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 +314,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content); } else { // Problem obtaining wernis ID - $OUT .= "
    ".WERNIS_OBTAIN_ID_FAILED."
    \n"; + $OUT .= "
    {--WERNIS_OBTAIN_ID_FAILED--}
    \n"; } } else { // Extension is not installed - $OUT .= "
    ".ADMIN_WERNIS_NOT_INSTALLED."
    \n"; + $OUT .= "
    {--ADMIN_WERNIS_NOT_INSTALLED--}
    \n"; } break; @@ -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); @@ -350,9 +350,9 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $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 @@ -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 @@ -386,21 +386,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 = "
    ".ADMIN_NO_ADMIN_ASSIGNED."
    "; - } else { - // Load admin's data - $login = GET_ADMIN_LOGIN($admin); - if ($login != "***") { - // Admin found - $admin = "".$login.""; - } else { - // Maybe deleted? - $admin = "
    ".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."
    "; - } - } + + // Generate assign link + $admin = GENERATE_AID_LINK($admin); // Get task type $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).''); @@ -419,7 +409,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { // Member found otherwise it's a system task $uid = ADMIN_USER_PROFILE_LINK($uid); } else { - $uid = "".ADMIN_IS_SYSTEM_TASK.""; + $uid = "{--ADMIN_IS_SYSTEM_TASK--}"; } // Prepare content