X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=2a97db9b72320c527f547ab41e36d77f2a222dfd;hb=66b91ce490ab549425619c95fc12086e126d541b;hp=14944df068121621c3e0ebbf08f50ee901f19518;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 14944df068..2a97db9b72 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
require($INC);
}
-function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
+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(getCurrentAdminId()), __FILE__, __LINE__);
@@ -52,11 +52,13 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
$jobsDone = true;
// Open the extension directory
- $extensionList = getArrayFromDirectory("inc/extensions/", "ext-", false, false);
+ $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!!!
@@ -65,6 +67,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
// Check if extension is installed or not
$ext_ver = GET_EXT_VERSION($ext_name);
+ //* DEBUG: */ OUTPUT_HTML($ext_name."=".$ext_ver."
");
// Is the extension not yet installed?
if (empty($ext_ver)) {
@@ -78,10 +81,10 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
} // END - if
} else {
// Test-drive extension in update mode
- require(sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $ext_name));
+ loadInclude(sprintf("inc/extensions/ext-%s.php", $ext_name));
// Update extension if extension is installed and outdated
- //* DEBUG: */ print "ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."
\n";
+ //* DEBUG: */ OUTPUT_HTML("ext={$ext_name},ver={EXT_GET_VERSION()}/".GET_EXT_VERSION($ext_name)."
");
if (EXT_GET_VERSION() > $ext_ver) {
// Update the extension
EXTENSION_UPDATE($ext_name, $ext_ver);
@@ -103,7 +106,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
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__);
+ array(getCurrentAdminId()), __FILE__, __LINE__);
if (SQL_NUMROWS($result_tasks) > 0) {
// New jobs found!
@@ -128,15 +131,16 @@ 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);
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(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
+ array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
} // END - if
$add = '';
@@ -147,14 +151,25 @@ LIMIT 1",
$add = "
{--ADMIN_TASK_SUPPORT_MODE--}: ".$mode."";
} // END - if
+ // Is a userid assign?
if ($uid > 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($uid)), __FILE__, __LINE__);
+ array(bigintval($uid)), __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--}: ".generateUserProfileLink($uid)." (".translateGender($gender)." ".$sname." ".$fname.")";
- } // END - if
+ $add = "{--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($uid, 'user_data')." (".translateGender($gender)." ".$sname." ".$fname.")";
+ } else {
+ // Invalid userid, so log and zero it
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Invalid userid=' . $uid . '-> Not found!');
+ $uid = 0;
+ }
+
+ // Free result
+ SQL_FREERESULT($result_user);
} // END - if
// Decode entities of the text
@@ -164,13 +179,20 @@ LIMIT 1",
$text = LOAD_TEMPLATE('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'))) {
+ // OLD WAY: if (((GET_EXT_VERSION('sql_patches') != '') && (getConfig('verbose_sql') == 'Y')) || (!EXT_IS_ACTIVE('sql_patches'))) {
+ 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') {
+ // @TODO Should we init sql_notes here or inside REGISTER_EXTENSION()?
+ EXT_INIT_NOTES();
+
// Load SQL commands for registering
REGISTER_EXTENSION($ext_name, $id, true);
@@ -183,7 +205,7 @@ LIMIT 1",
// Prepare extension name and version
$ext_name = substr($ext_name, 7);
$ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
- $test = '[UPDATE-'.$ext_name.'-';
+ $test = '[UPDATE-' . $ext_name . '-';
$ext_ver = substr($subj, strlen($test));
$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
@@ -200,17 +222,21 @@ LIMIT 1",
$ext_name = '';
}
- // Add SQLs to a table
+ // Auto-init SQL handler
if (!IS_SQLS_VALID()) INIT_SQLS();
- if (empty($title)) $title = '';
+
+ // Add SQLs to a table
if ((!empty($ext_name)) && (GET_EXT_VERSION('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 .= EXTENSION_VERBOSE_TABLE($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 .= EXT_GET_NOTES();
+ } else {
+ // This should not normally happen!
+ debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . GET_EXT_VERSION('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
}
// Prepare array for the template
@@ -228,136 +254,139 @@ LIMIT 1",
// 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",
+ 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(
+ $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";
+ ));
+ } 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')) {
+ // Solve the task
+ runFilterChain('solve_task', $tid);
+ } // END - if
+ }
+ break;
- // Close task but not already closes or deleted or update tasks
- if (($status != 'CLOSED') && ($status != 'DELETED') && ($type != 'EXTENSION_UPDATE')) {
+ 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;
-
- 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 .= "".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."
\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
+ DEBUG_LOG(__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(
+ 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);
- } else {
- // Problem obtaining payout ID
- $OUT .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\n";
- }
- } else {
- // Extension is not installed
- $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",
- 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(
+ );
+ $OUT .= LOAD_TEMPLATE('admin_payout_overview_form', true, $content);
+ } else {
+ // Problem obtaining payout ID
+ $OUT .= "{--PAYOUT_OBTAIN_ID_FAILED--}
\n";
+ }
+ } else {
+ // Extension is not installed
+ $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",
+ 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);
- } else {
- // Problem obtaining wernis ID
- $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\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;
-
- 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;
-
- default: // Unknown task type
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
- $OUT .= "".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."
\n";
- break;
+ );
+ $OUT .= LOAD_TEMPLATE('admin_wernis_overview_form', true, $content);
+ } else {
+ // Problem obtaining wernis ID
+ $OUT .= "{--WERNIS_OBTAIN_ID_FAILED--}
\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;
+
+ 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;
+
+ default: // Unknown task type
+ DEBUG_LOG(__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);
@@ -371,19 +400,19 @@ LIMIT 1",
// 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), getCurrentAdminId()), __FILE__, __LINE__);
+ 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), getCurrentAdminId()), __FILE__, __LINE__);
+ 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(getCurrentAdminId()), __FILE__, __LINE__);
+ array(getCurrentAdminId()), __FILE__, __LINE__);
} // END - if
// There are uncompleted jobs!
@@ -396,12 +425,12 @@ LIMIT 1",
$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);
- 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;
}
// Get task type