X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=bdd3334894fd11e6522e6692b903282fa0244119;hp=4ba25cae160f45e43764803d108fdd77752e3006;hb=e79e1454e88271e35086963a0422a51cc243e67a;hpb=0e899620c7a065952d6787c236fb2b33ae337d6a
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 4ba25cae16..bdd3334894 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -47,7 +47,8 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
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!");
@@ -80,14 +81,15 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
// Is the extension not yet installed?
if ((SQL_NUMROWS($result) == 0) && (empty($ext_ver))) {
+ // Generate subject line
+ $ext_subj = sprintf("[%s:]", $ext);
+
// 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",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
array($ext_subj), __FILE__, __LINE__);
//* DEBUG: */ echo SQL_NUMROWS($result)."
\n";
- if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == ""))
- {
+ if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == "")) {
// Template file
$tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
PATH,
@@ -96,25 +98,22 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
);
// Load text for task
- if ((file_exists($tpl)) && (is_readable($tpl)))
- {
+ if ((file_exists($tpl)) && (is_readable($tpl))) {
// Load extension's own text template (HTML!)
$MSG = LOAD_TEMPLATE("ext_".$ext, true);
- }
- else
- {
+ } 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)
+ $result_insert = 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);
+ array(
+ GET_ADMIN_ID(get_session('admin_login')),
+ $ext_subj,
+ addslashes($MSG),
+ ), __FILE__, __LINE__, true, false);
}
// Free memory
@@ -122,12 +121,9 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
// We maybe want to install an extension so let's test-drive it...
include(PATH."inc/extensions/".$file);
- }
- else
- {
+ } 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);
}
@@ -135,11 +131,9 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
// Update extension
if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver);
- if (!empty($cacheArray['active_extensions'][$ext]))
- {
+ 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, true, true))) {
// 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__);
@@ -159,46 +153,47 @@ 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)
- {
+
+ if (SQL_NUMROWS($result_tasks) > 0) {
// New jobs found!
$JOBS_DONE = false;
}
+ // 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)
- {
+ 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)
- {
+ 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__);
}
+
$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)
- {
+
+ if ($uid > 0) {
$result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
array(bigintval($uid)), __FILE__, __LINE__);
if (SQL_NUMROWS($result_user) == 1)
@@ -217,11 +212,9 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
$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,9 +223,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
// Set title
$title = ADMIN_SQLS_EXECUTED_ON_REGISTER;
- }
- elseif ($type == "EXTENSION_UPDATE")
- {
+ } elseif ($type == "EXTENSION_UPDATE") {
// Load SQL commands for update (already done!)
$ext_name = substr($ext_name, 7);
$ext_name = substr($ext_name, 0, strpos($ext_name, "-"));
@@ -248,9 +239,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
// Set title
$title = ADMIN_SQLS_EXECUTED_ON_UPDATE;
- }
- else
- {
+ } else {
// Remove extension's name
$ext_name = "";
}
@@ -262,9 +251,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
// Add verbose SQL table
$text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."
\n";
}
- }
- else
- {
+ } 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,16 +279,13 @@ 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";
@@ -319,8 +303,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks)
$OUT .= "".ADMIN_EXTENSION_UPDATED."\n";
// Close task
- if (($status != "CLOSED") && ($status != "DELETED"))
- {
+ 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__);
}