X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=97679cc87bc51d8c332a4131d6cedc76529d2a68;hb=eb301334eb0960dd060cc0d59e6021260a41f835;hp=ed718d441a6107c7209ac124291fd8ee239f6df8;hpb=1f2d89e3a6abd36ae030e3bf7ef2e194e5d8f35c;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index ed718d441a..97679cc87b 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -10,9 +10,14 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Standart-Aufgaben-Management ausgeben *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -32,26 +37,28 @@
************************************************************************/
// Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
- require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+ die();
}
-function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
+// @TODO This function does also check for uncompleted tasks
+function outputStandardOverview (&$result_tasks) {
// 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'",
- array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'",
+ array(getCurrentAdminId()), __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;
+ setExtensionMode('register');
+ $jobsDone = true;
// Open the extension directory
- $handle = opendir(constant('PATH')."inc/extensions/") or mxchange_die("Cannot read extension directory!");
- while ($file = readdir($handle)) {
+ $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false);
+ foreach ($extensionList as $file) {
+ // Only file name is required... :(
+ $file = basename($file);
+
// Is this file an extension?
- if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
- //* DEBUG: */ echo $file."
\n";
+ if ((substr($file, 0, 4) == 'ext-') && (substr($file, -4) == '.php')) {
// Possible newly installed extension found so we extract extension's name
$ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
@@ -59,387 +66,414 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
$result = false;
// Check if extension is installed or not
- $ext_ver = GET_EXT_VERSION($ext_name);
+ $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
// Is the extension not yet installed?
- if (empty($ext_ver)) {
+ if ($extInstalled === false) {
// Generate subject line
$ext_subj = sprintf("[%s:]", $ext_name);
// We maybe want to install an extension so let's test-drive it...
- if (LOAD_EXTENSION($ext_name, $EXT_LOAD_MODE)) {
+ if (loadExtension($ext_name, getExtensionMode(), '', true)) {
// Create a task for newly installed extension
- CREATE_NEW_EXTENSION_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, $ext_name);
+ createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
} // END - if
} else {
// Test-drive extension in update mode
- require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name));
+ loadExtension($ext_name, 'test');
+
+ // Get extension version
+ $ext_ver = getExtensionVersion($ext_name);
+ //* DEBUG: */ outputHtml($ext_name."=".$ext_ver."
");
// Update extension if extension is installed and outdated
- //* DEBUG: */ print "ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."
\n";
- if (EXT_GET_VERSION() > $ext_ver) {
+ //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
");
+ if (getThisExtensionVersion() > $ext_ver) {
// Update the extension
- EXTENSION_UPDATE($ext_name, $ext_ver);
+ updateExtension($ext_name, $ext_ver);
} // END - if
if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
// Maybe we want to keept the current extension active?
- if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
+ if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
// Reactivate this extension!
- ACTIVATE_EXTENSION($ext_name);
+ doActivateExtension($ext_name);
} // END - if
} // END - if
}
} // END - if
- } // END - while
-
- // Close directory handle
- closedir($handle);
+ } // END - foreach
// 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')
-ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
- array(GET_CURRENT_ADMIN_ID()), __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
+ `userid` DESC,
+ `task_type` DESC,
+ `subject` ASC,
+ `task_created` DESC",
+ array(getCurrentAdminId()), __FILE__, __LINE__);
if (SQL_NUMROWS($result_tasks) > 0) {
// New jobs found!
- $JOBS_DONE = false;
+ $jobsDone = false;
} // END - if
// Free the result
SQL_FREERESULT($result);
// Return status
- return $JOBS_DONE;
+ return $jobsDone;
}
// Outputs selected tasks
-function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
- global $NOTES;
- if ((isset($POST['assign'])) && (count($POST['task']) > 0)) {
+function outputSeletectedTasks ($postData, $result_tasks) {
+ if ((isset($postData['assign'])) && (count($postData['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=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')) LIMIT 1",
- array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ $OUT = ''; $SW = 2;
+ foreach ($postData['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), getCurrentAdminId()), __FILE__, __LINE__);
+
+ // Task is found?
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);
+ list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
- if ($aid == "0") {
+ if ($adminId == '0') {
// Assgin current admin to unassgigned task
- 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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
+ array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
} // END - if
- $ADD = "";
- if ($type == "SUPPORT_MEMBER") {
- $mode = substr($text, 0, strpos($text, ":"));
- $text = substr($text, strpos($text, ":") + 1);
- $ADD = "
{--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."";
+ $add = '';
+ // @TODO Rewrite this to a filter
+ if ($type == 'SUPPORT_MEMBER') {
+ $mode = substr($text, 0, strpos($text, ':'));
+ $text = substr($text, strpos($text, ':') + 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__);
+ // Is a userid assign?
+ if ($userid > 0) {
+ // Then load his data!
+ // @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
+ $result_user = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+ array(bigintval($userid)), __FILE__, __LINE__);
+
+ // Entry found?
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.")";
- } // END - if
+ // Fetch row
+ $content = SQL_FETCHARRAY($result_user);
+ // Generate HTML list entry
+ $add = "{--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($userid, 'user_data')." (".translateGender($content['gender'])." ".$content['surname']." ".$content['family'].")";
+ } else {
+ // Invalid userid, so log and zero it
+ logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
+ $userid = 0;
+ }
+
+ // Free result
+ SQL_FREERESULT($result_user);
} // END - if
// Decode entities of the text
$text = decodeEntities($text);
// Compile and insert text from task into table template
- $text = LOAD_TEMPLATE("admin_extensions_text", true, $text);
+ $text = loadTemplate('admin_extensions_text', true, $text);
// Initialize variables (no title for SQL commands by default)
- $ext_name = "";
+ $ext_name = ''; $ext_ver = '';
$title = getMessage('TASK_NO_TITLE');
// Shall I list SQL commands assigned to an extension installation or update task?
- 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 ((getConfig('verbose_sql') == 'Y')) {
+ // Extract extension name from subject
+ $ext_name = substr($subj, 1, strpos($subj, ':') - 1);
+
+ // Update task or extension task?
+ if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
// Load SQL commands for registering
- SET_SQLS(EXTENSION_REGISTER($ext_name, $id, true));
+ registerExtension($ext_name, $id, true);
+
+ // Set current extension name
+ setCurrentExtensionName($ext_name);
// Add notes to text
- $text .= $NOTES;
+ $text .= getExtensionNotes();
// Set title
$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
- } elseif ($type == "EXTENSION_UPDATE") {
+ } 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."-";
+ $ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
+ $test = '[UPDATE-' . $ext_name . '-';
$ext_ver = substr($subj, strlen($test));
- $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ":"));
+ $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
// Load SQLs from file
- EXTENSION_UPDATE($ext_name, $ext_ver, true);
+ updateExtension($ext_name, $ext_ver, true);
+
+ // Set current extension name
+ setCurrentExtensionName($ext_name);
// Add notes to text
- $text .= $NOTES;
+ $text .= getExtensionNotes();
// Set title
$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
} else {
// Remove extension's name
- $ext_name = "";
+ $ext_name = '';
}
// Add SQLs to a table
- if (!IS_SQLS_VALID()) INIT_SQLS();
- if (empty($title)) $title = "";
- if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && (getConfig('verbose_sql') == "Y")) {
+ if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
// Add verbose SQL table
- $text .= EXTENSION_VERBOSE_TABLE($title, " class=\"admin_table top2 left2 right2\"", true, "100%")."
\n";
+ $text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "
\n";
} // END - if
- } else {
+ } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
// Run SQL commands in dry mode but only return the notes
- EXTENSION_UPDATE($ext_name, $ext_ver, true);
- $text .= $NOTES;
+ updateExtension($ext_name, $ext_ver, true);
+
+ // Set current extension name
+ setCurrentExtensionName($ext_name);
+
+ // Get notes
+ $text .= getExtensionNotes();
+ } else {
+ // This should not normally happen!
+ debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
}
// Prepare array for the template
$content = array(
'sw' => $SW,
'subj' => $subj,
- 'add' => $ADD,
+ 'add' => $add,
'text' => $text,
- 'created' => MAKE_DATETIME($created, "1"),
+ 'created' => generateDateTime($created, '1'),
'extension' => $ext_name
);
// Load template
- $OUT .= LOAD_TEMPLATE("admin_overview_row", true, $content);
+ $OUT .= loadTemplate('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
- $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",
- array($ext_name), __FILE__, __LINE__);
- $lines = SQL_NUMROWS($result_lines);
- SQL_FREERESULT($result_lines);
- if ($lines == "0") {
- // New extension found
- $OUT .= LOAD_TEMPLATE("admin_ext_reg_form", true, array(
- 'id' => bigintval($id),
- 'ext_name' => $ext_name
- ));
- } else {
- // Task is closed so nothing is todo
- $OUT .= "{--ADMIN_EXT_ALREADY_REGISTERED--}
\n";
+ switch ($type) {
+ 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",
+ array($ext_name), __FILE__, __LINE__);
+ $lines = SQL_NUMROWS($result_lines);
+ SQL_FREERESULT($result_lines);
+ if ($lines == '0') {
+ // New extension found
+ $OUT .= loadTemplate('admin_ext_reg_form', true, array(
+ 'id' => bigintval($id),
+ 'ext_name' => $ext_name
+ ));
+ } 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 ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
+ // Solve the task
+ runFilterChain('solve_task', $tid);
+ } // END - if
+ }
+ break;
+
+ case 'EXTENSION_UPDATE': // Extension update
+ // Extension updates are installed automatically
+ $OUT .= "{--ADMIN_EXTENSION_UPDATED--}
\n";
- // Close task but not already closes or deleted or update tasks
- if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
+ // Close task
+ if (($status != 'CLOSED') && ($status != 'DELETED')) {
// Solve the task
runFilterChain('solve_task', $tid);
} // END - if
- }
- break;
-
- case "EXTENSION_UPDATE": // Extension update
- // Extension updates are installed automatically
- $OUT .= "{--ADMIN_EXTENSION_UPDATED--}
\n";
-
- // Close task
- if (($status != "CLOSED") && ($status != "DELETED")) {
- // Solve the task
- runFilterChain('solve_task', $tid);
- } // END - if
- break;
+ break;
- case "SUPPORT_MEMBER": // Assign on member's support request
- // @TODO This may also be rewritten to include files
- switch ($mode)
- {
- 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";
+ case 'SUPPORT_MEMBER': // Assign on member's support request
+ // @TODO This may also be rewritten to include files
+ switch ($mode) {
+ default: // @TODO Unknown support mode
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
+ $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."
\n";
+ break;
+ }
break;
- }
- break;
- 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",
- array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
- list($pid) = SQL_FETCHROW($result_pay);
- SQL_FREERESULT($result_pay);
-
- 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);
+ case 'PAYOUT_REQUEST': // Payout requests
+ if (isExtensionActive('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",
+ array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+ list($pid) = SQL_FETCHROW($result_pay);
+ SQL_FREERESULT($result_pay);
+
+ if ((!empty($pid)) && ($pid > 0)) {
+ // Payout ID can be obtained
+ $content = array(
+ 'pid' => $pid,
+ 'tid' => $tid,
+ );
+ $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
+ } else {
+ // Problem obtaining payout ID
+ $OUT .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\n";
+ }
} else {
- // Problem obtaining payout ID
- $OUT .= "".PAYOUT_OBTAIN_ID_FAILED."
\n";
+ // Extension is not installed
+ $OUT .= "{--ADMIN_PAYOUT_NOT_INSTALLED--}
\n";
}
- } else {
- // Extension is not installed
- $OUT .= "{--ADMIN_PAYOUT_NOT_INSTALLED--}
\n";
- }
- break;
+ 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",
- array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
- list($pid) = SQL_FETCHROW($result_pay);
- SQL_FREERESULT($result_pay);
-
- 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);
+ case 'WERNIS_REQUEST': // Wernis requests
+ if (isExtensionActive('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",
+ array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+ list($pid) = SQL_FETCHROW($result_pay);
+ SQL_FREERESULT($result_pay);
+
+ if ((!empty($pid)) && ($pid > 0)) {
+ // Payout ID can be obtained
+ $content = array(
+ 'pid' => $pid,
+ 'tid' => $tid,
+ );
+ $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
+ } else {
+ // Problem obtaining wernis ID
+ $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
+ }
} else {
- // Problem obtaining wernis ID
- $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\n";
+ // Extension is not installed
+ $OUT .= "{--ADMIN_WERNIS_NOT_INSTALLED--}
\n";
}
- } else {
- // Extension is not installed
- $OUT .= "{--ADMIN_WERNIS_NOT_INSTALLED--}
\n";
- }
- break;
-
- case "HOLIDAY_REQUEST": // Holiday requests
- $OUT .= LOAD_TEMPLATE("admin_task_holiday", true, $uid);
- break;
+ break;
- case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions
- $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) {
- // Undone unscubscribe request
- $content = array(
- 'uid' => $uid,
- 'id' => $tid
- );
- $OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content);
- } else {
- // Already unsubscribed
- $OUT .= "".ADMIN_NL_UNSUBSCRIBE_ALREADY."
\n";
- }
- break;
+ case 'HOLIDAY_REQUEST': // Holiday requests
+ $OUT .= loadTemplate('admin_task_holiday', true, $userid);
+ 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;
+ default: // Unknown task type
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
+ $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
+ break;
}
$OUT .= "
|
\n";
} // END - if
+
+ // Free result
+ SQL_FREERESULT($result_task);
+
+ // Switch colors
$SW = 3 - $SW;
} // END - foreach
- define('__TASK_ROWS', $OUT);
// Load final template
- LOAD_TEMPLATE("admin_overview_list");
+ loadTemplate('admin_overview_list', false, $OUT);
} else {
- if ((isset($POST['task'])) && ((sizeof($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
+ if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == '1'))) {
// Only unassign / delete tasks when there are selected tasks posted
- if (!empty($POST['unassign'])) {
+ if (!empty($postData['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",
- array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ foreach ($postData['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), getCurrentAdminId()), __FILE__, __LINE__);
}
- } elseif (isset($POST['del'])) {
+ } elseif (isset($postData['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",
- array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ foreach ($postData['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), getCurrentAdminId()), __FILE__, __LINE__);
}
+ } else {
+ // Unknown action
+ debug_report_bug(sprintf("Unknown task action performed. data=%s
", print_r($postData, true)));
}
// 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_CURRENT_ADMIN_ID()), __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(getCurrentAdminId()), __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)) {
+ $OUT = ''; $SW = 2;
+ while ($content = SQL_FETCHARRAY($result_tasks)) {
// Init infos
- $infos = "---";
+ $content['infos'] = '---';
// Generate assign link
- $admin = GENERATE_AID_LINK($admin);
+ $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
- // Get task type
- $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
-
- $type2 = substr($text, 0, strpos($text, ":"));
// Generate infos
- switch ($type)
- {
- case "EXTENSION":
- case "EXTENSION_UPDATE":
- $infos = substr($subj, 1, strpos($subj, ":") - 1);
- break;
+ // @TODO Try to move this in includes
+ switch ($content['task_type']) {
+ case 'EXTENSION':
+ case 'EXTENSION_UPDATE':
+ $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
+ break;
}
- if ($uid > 0) {
+ // Get task type
+ $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+
+ if ($content['userid'] > 0) {
// Member found otherwise it's a system task
- $uid = ADMIN_USER_PROFILE_LINK($uid);
+ $content['userid'] = generateUserProfileLink($content['userid']);
} else {
- $uid = "{--ADMIN_IS_SYSTEM_TASK--}";
+ $content['userid'] = "{--ADMIN_IS_SYSTEM_TASK--}";
}
// Prepare content
- $content = array(
- 'sw' => $SW,
- 'id' => $id,
- 'admin' => $admin,
- 'infos' => $infos,
- 'uid' => $uid,
- 'type' => $type_out,
- 'created' => MAKE_DATETIME($created, "2")
- );
+ $content = merge_array($content, array(
+ 'sw' => $SW,
+ 'assigned_admin' => $content['assigned_admin'],
+ 'userid' => $content['userid'],
+ 'task_type_msg' => $content['task_type_msg'],
+ 'created' => generateDateTime($content['task_created'], '2')
+ ));
// Do we have extension task?
- if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+ if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
// Load extension row template
- LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
+ $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
} else {
// Load default row template
- LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+ $OUT .= loadTemplate('admin_overview_list_rows', true, $content);
}
// Switch color
$SW = 3 - $SW;
- }
+ } // END - while
+
// Free memory
SQL_FREERESULT($result_tasks);
// Load footer template
- LOAD_TEMPLATE("admin_overview_footer");
+ loadTemplate('admin_overview_table', false, $OUT);
}
}
-//
+
+// [EOF]
?>