function OUTPUT_STANDARD_OVERVIEW(&$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';
$jobsDone = true;
// Open the extension directory
- $extensionList = GET_DIR_AS_ARRAY("inc/extensions/", "ext-", false, false);
+ $extensionList = getArrayFromDirectory("inc/extensions/", "ext-", false, false);
foreach ($extensionList as $file) {
// Is this file an extension?
if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
// We maybe want to install an extension so let's test-drive it...
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);
+ CREATE_NEW_EXTENSION_TASK(getCurrentAdminId(), $ext_subj, $ext_name);
} // END - if
} else {
// Test-drive extension in update mode
} // 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
+ $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__);
+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!
// 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__);
+ $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__);
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
- 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);
+ // @TODO Rewrite this to a filter
+ if ($type == 'SUPPORT_MEMBER') {
+ $mode = substr($text, 0, strpos($text, ':'));
+ $text = substr($text, strpos($text, ':') + 1);
$add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>".$mode."</strong></li>";
} // END - if
if (SQL_NUMROWS($result_user) == 1) {
list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
SQL_FREERESULT($result_user);
- $add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
+ $add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($uid)." (<a href=\"".generateMemberEmailLink($email, "user_data")."\">".translateGender($gender)." ".$sname." ".$fname."</a>)</strong></li>";
} // END - if
} // END - if
$text = decodeEntities($text);
// Compile and insert text from task into table template
- $text = LOAD_TEMPLATE("admin_extensions_text", true, $text);
+ $text = LOAD_TEMPLATE('admin_extensions_text', true, $text);
// Initialize variables (no title for SQL commands by default)
$ext_name = '';
// 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") {
+ $ext_name = substr($subj, 1, strpos($subj, ':') - 1);
+ if ($type == 'EXTENSION') {
// Load SQL commands for registering
REGISTER_EXTENSION($ext_name, $id, true);
// 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);
'subj' => $subj,
'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 .= 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
- $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",
+ 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") {
+ if ($lines == '0') {
// New extension found
- $OUT .= LOAD_TEMPLATE("admin_ext_reg_form", true, array(
+ $OUT .= LOAD_TEMPLATE('admin_ext_reg_form', true, array(
'id' => bigintval($id),
'ext_name' => $ext_name
));
$OUT .= "<div class=\"admin_failed\">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>\n";
// Close task but not already closes or deleted or update tasks
- if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
+ if (($status != 'CLOSED') && ($status != 'DELETED') && ($type != 'EXTENSION_UPDATE')) {
// Solve the task
runFilterChain('solve_task', $tid);
} // END - if
}
break;
- case "EXTENSION_UPDATE": // Extension update
+ case 'EXTENSION_UPDATE': // Extension update
// Extension updates are installed automatically
$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_EXTENSION_UPDATED--}</div>\n";
// Close task
- if (($status != "CLOSED") && ($status != "DELETED")) {
+ if (($status != 'CLOSED') && ($status != 'DELETED')) {
// Solve the task
runFilterChain('solve_task', $tid);
} // END - if
break;
- case "SUPPORT_MEMBER": // Assign on member's support request
+ case 'SUPPORT_MEMBER': // Assign on member's support request
// @TODO This may also be rewritten to include files
switch ($mode)
{
}
break;
- case "PAYOUT_REQUEST": // Payout requests
+ 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);
'pid' => $pid,
'tid' => $tid,
);
- $OUT .= LOAD_TEMPLATE("admin_payout_overview_form", true, $content);
+ $OUT .= LOAD_TEMPLATE('admin_payout_overview_form', true, $content);
} else {
// Problem obtaining payout ID
- $OUT .= "<div class=\"admin_failed medium\">".PAYOUT_OBTAIN_ID_FAILED."</div>\n";
+ $OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
}
} else {
// Extension is not installed
}
break;
- case "WERNIS_REQUEST": // Wernis requests
+ 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);
'pid' => $pid,
'tid' => $tid,
);
- $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content);
+ $OUT .= LOAD_TEMPLATE('admin_wernis_overview_form', true, $content);
} else {
// Problem obtaining wernis ID
$OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
}
break;
- case "HOLIDAY_REQUEST": // Holiday requests
- $OUT .= LOAD_TEMPLATE("admin_task_holiday", true, $uid);
+ case 'HOLIDAY_REQUEST': // Holiday requests
+ $OUT .= LOAD_TEMPLATE('admin_task_holiday', true, $uid);
break;
- case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions
+ 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);
'uid' => $uid,
'id' => $tid
);
- $OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content);
+ $OUT .= LOAD_TEMPLATE('admin_newsletter_tsk', true, $content);
} else {
// Already unsubscribed
$OUT .= "<div class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</div>\n";
define('__TASK_ROWS', $OUT);
// Load final template
- LOAD_TEMPLATE("admin_overview_list");
+ LOAD_TEMPLATE('admin_overview_list');
} else {
- if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
+ if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['task'][0] == '1'))) {
// Only unassign / delete tasks when there are selected tasks posted
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",
- array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+ 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'])) {
// 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__);
+ 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__);
}
}
// 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!
$content['infos'] = '---';
// Generate assign link
- $content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
+ $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
// Generate infos
switch ($content['task_type'])
{
- case "EXTENSION":
- case "EXTENSION_UPDATE":
- $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
+ case 'EXTENSION':
+ case 'EXTENSION_UPDATE':
+ $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
break;
}
if ($content['userid'] > 0) {
// Member found otherwise it's a system task
- $content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
+ $content['userid'] = generateUserProfileLink($content['userid']);
} else {
$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
}
'admin' => $content['assigned_admin'],
'uid' => $content['userid'],
'type' => $content['task_type_msg'],
- 'created' => MAKE_DATETIME($content['task_created'], "2")
+ 'created' => generateDateTime($content['task_created'], "2")
));
// Do we have extension task?
- if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
+ if (($content['task_type'] == 'EXTENSION') && (GET_EXT_VERSION($content['infos']) == '')) {
// Load extension row template
$OUT .= LOAD_TEMPLATE("admin_overview_list_ext_rows", true, $content);
} else {
projects / mailer.git / blobdiff