X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=b39e9a0c0c7ca2fa7727faa67316832a384391ff;hp=c55b3909b4fed0d88bb4c6831abfe6ab5c618f20;hb=59062ca942c8d3f32e3337663c1c053978b48501;hpb=efe6057fdb1c02a518172e985298e66accef90d0 diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index c55b3909b4..b39e9a0c0c 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -32,19 +32,17 @@ ************************************************************************/ // 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"; @@ -73,13 +71,10 @@ 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__); + array($ext), __FILE__, __LINE__); } // Is the extension not yet installed? @@ -87,33 +82,38 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) // Generate subject line $ext_subj = sprintf("[%s:]", $ext); - // Create a task for newly installed extension - CREATE_NEW_EXTENSION_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, $ext); - // We maybe want to install an extension so let's test-drive it... - include(PATH."inc/extensions/".$file); + 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)) { list($dummy, $ext_ver) = SQL_FETCHROW($result); SQL_FREERESULT($result); - } - - // Update extension - if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver); + } // 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); @@ -123,12 +123,12 @@ 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, task_created DESC", - array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); + 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); @@ -143,9 +143,9 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { 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=%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__); + 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); @@ -154,29 +154,31 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { 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=%s LIMIT 1", - array(GET_ADMIN_ID(get_session('admin_login')), bigintval($tid)), __FILE__, __LINE__); - } + array(GET_ADMIN_ID(get_session('admin_login')), 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."
    • "; - } + } // END - if if ($uid > 0) { - $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", + $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 = ""; @@ -195,7 +197,7 @@ 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!) + // Prepare extension name and version $ext_name = substr($ext_name, 7); $ext_name = substr($ext_name, 0, strpos($ext_name, "-")); $test = "[UPDATE-".$ext_name."-"; @@ -221,7 +223,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { 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"; - } + } // 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); @@ -263,7 +265,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { // Close task but not already closes or deleted or update tasks if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) { ADMIN_SOLVE_TASK($tid); - } + } // END - if } break; @@ -275,75 +277,64 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { 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=%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=%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"; } @@ -359,56 +350,46 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { 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) - { + 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) - { + 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__); } @@ -417,36 +398,31 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { // 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_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) @@ -456,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, @@ -476,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