X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=5610c3a6cddd68b385c0ad82e2612edc3b15720b;hb=ad851a23313d8ac6489a759a0f3d62e3bc6f4682;hp=4ba25cae160f45e43764803d108fdd77752e3006;hpb=0e899620c7a065952d6787c236fb2b33ae337d6a;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 4ba25cae16..5610c3a6cd 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__);
+ array(GET_ADMIN_ID(get_session('admin_login'))), __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!");
@@ -58,13 +57,12 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
// Possible newly installed extension found so we extract extension's name
$ext = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
- // Check if extension is installed or not
+ // Init variables
$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 {
+ $result = false;
+
+ // Check if extension is installed or not
+ if ((is_array($cacheArray['extensions']['ext_version'])) && (isset($cacheArray['extensions']['ext_version'][$ext]))) {
// Load version from cache
if (!empty($cacheArray['extensions']['ext_version'][$ext])) {
// Extension is installed so we can get it's version number
@@ -73,82 +71,49 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
// Extension is not installed so no version number was found
$ext_ver = "";
}
-
- // Disable load from database
- $result = false;
+ } elseif (!EXT_IS_ACTIVE("cache")) {
+ // 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__);
}
// 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);
+ // Generate subject line
+ $ext_subj = sprintf("[%s:]", $ext);
// We maybe want to install an extension so let's test-drive it...
- include(PATH."inc/extensions/".$file);
- }
- else
- {
+ if (LOAD_EXTENSION($ext, $EXT_LOAD_MODE)) {
+ // Create a task for newly installed extension
+ CREATE_NEW_EXTENSION_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, $ext);
+ } // END - if
+ } else {
// Maybe we want to update?
- if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1))
- {
+ if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1)) {
list($dummy, $ext_ver) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
- }
-
- // Update extension
- if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver);
-
- if (!empty($cacheArray['active_extensions'][$ext]))
- {
+ } // END - if
+
+ // Test-drive extension in update mode
+ include(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext));
+
+ // Update extension if extension is installed and outdated
+ //* DEBUG: */ print "ext={$ext},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext)."
\n";
+ if ($EXT_VERSION > GET_EXT_VERSION($ext)) {
+ // Update the extension
+ EXTENSION_UPDATE($file, $ext, $ext_ver);
+ } // END - if
+
+ if (!empty($cacheArray['active_extensions'][$ext])) {
// 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] == "Y") && (!EXT_IS_ACTIVE($ext))) {
// 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);
+ } // END - if
+ } // END - if
}
- }
- }
+ } // END - if
+ } // END - while
// Close directory handle
closedir($handle);
@@ -158,70 +123,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_ADMIN_ID(get_session('admin_login'))), __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)
-{
+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_ADMIN_ID(get_session('admin_login'))), __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__);
- }
+ $result_assign = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE id=%s LIMIT 1",
+ array(GET_ADMIN_ID(get_session('admin_login')), 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",
+ } // 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") != '') && ($_CONFIG['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 +196,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."-";
@@ -248,9 +212,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
// Set title
$title = ADMIN_SQLS_EXECUTED_ON_UPDATE;
- }
- else
- {
+ } else {
// Remove extension's name
$ext_name = "";
}
@@ -258,13 +220,11 @@ 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")) && ($_CONFIG['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);
$text .= $NOTES;
@@ -292,25 +252,20 @@ 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";
// 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")) {
+ ADMIN_SOLVE_TASK($tid);
+ } // END - if
}
break;
@@ -319,79 +274,67 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
$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
+ ADMIN_SOLVE_TASK($tid);
+ } // END - if
break;
case "SUPPORT_MEMBER": // Assign on member's support request
switch ($mode)
{
default: // 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",
+ $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";
}
- }
- else
- {
+ } else {
// Extension is not installed
$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";
}
- }
- else
- {
+ } else {
// Extension is not installed
$OUT .= "".ADMIN_WERNIS_NOT_INSTALLED."\n";
}
@@ -402,99 +345,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";
}
break;
default: // Unknown task type
+ 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";
- }
+ } // 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",
+ 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)
- {
- $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",
+ foreach ($_POST['task'] as $id => $sel) {
+ $result = 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_ADMIN_ID(get_session('admin_login'))), __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_ADMIN_ID(get_session('admin_login'))), __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
- {
+ } else {
// Load admin's data
$login = GET_ADMIN_LOGIN($admin);
- if ($login != "***")
- {
+ if ($login != "***") {
// Admin found
$admin = "".$login."";
- }
- else
- {
+ } else {
// Maybe deleted?
$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 +432,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
- {
+ } else {
$uid = "".ADMIN_IS_SYSTEM_TASK."";
}
+ // Prepare content
$content = array(
'sw' => $SW,
'id' => $id,
@@ -524,7 +451,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