From: Roland Häder Date: Fri, 25 Jan 2008 22:46:58 +0000 (+0000) Subject: Refactured X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=4d62ab22b0616cabb713929f8b661b5470b6018c;hp=2a252331b627de4ae28b11a60f82c63b75a8b758 Refactured --- diff --git a/0.2.1/inc/libs/task_functions.php b/0.2.1/inc/libs/task_functions.php index ee72a2a4c0..c16eca1421 100644 --- a/0.2.1/inc/libs/task_functions.php +++ b/0.2.1/inc/libs/task_functions.php @@ -32,8 +32,7 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ +if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } @@ -55,8 +54,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // Chheck for new extensions and updates $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_main); - if (!$JOBS_DONE) - { + if (!$JOBS_DONE) { // New extensions or updates found $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' AND status='NEW' AND task_type='EXTENSION_UPDATE'", array(GET_ADMIN_ID($_COOKIE['admin_login'])), __FILE__, __LINE__); @@ -64,17 +62,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define ('__TASK_UPDATE_VALUE', "".$value.""); - } - else - { + } else { define ('__TASK_UPDATE_VALUE', "0"); } - } - else - { + } else { define ('__TASK_UPDATE_VALUE', "0"); } @@ -86,40 +79,34 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__CONFIRMED_VALUE', "".$value.""); - } - else - { + } else { define('__CONFIRMED_VALUE', "0"); } + // Unconfirmed accounts $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='UNCONFIRMED'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__UNCONFIRMED_VALUE', "".$value.""); - } - else - { + } else { define('__UNCONFIRMED_VALUE', "0"); } + // And locked accounts $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='LOCKED'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__LOCKED_VALUE', "".$value.""); - } - else - { + } else { define('__LOCKED_VALUE', "0"); } + // // Unassigned tasks // @@ -127,14 +114,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__TASK_NEW_VALUE', "".$value.""); - } - else - { + } else { define('__TASK_NEW_VALUE', "0"); - } + } + // // Closed tasks // @@ -142,14 +127,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__TASK_CLOSED_VALUE', "".$value.""); - } - else - { + } else { define('__TASK_CLOSED_VALUE', "0"); - } + } + // // Deleted tasks // @@ -157,14 +140,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__TASK_DELETED_VALUE', "".$value.""); - } - else - { + } else { define('__TASK_DELETED_VALUE', "0"); - } + } + // // Solved tasks // @@ -173,14 +154,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__TASK_SOLVED_VALUE', "".$value.""); - } - else - { + } else { define('__TASK_SOLVED_VALUE', "0"); - } + } + // // Your tasks // @@ -189,14 +168,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__TASK_YOUR_VALUE', "".$value.""); - } - else - { + } else { define('__TASK_YOUR_VALUE', "0"); - } + } + // // Mails waiting to be approved // @@ -204,14 +181,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_ADMIN_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_ADMIN_VALUE', "0"); - } + } + // // Unfinished mail orders // @@ -219,14 +194,12 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_TEMP_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_TEMP_VALUE', "0"); - } + } + // // Sent mail orders // @@ -234,91 +207,69 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_SEND_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_SEND_VALUE', "0"); - } + } + // // Autopurged mails // - if (EXT_IS_ACTIVE("autopurge")) - { + if (EXT_IS_ACTIVE("autopurge")) { $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE data_type='DELETED'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_DELETED_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_DELETED_VALUE', "0"); - } + } + // // Autopurged bonus mails // - if (GET_EXT_VERSION("bonus") >= "0.1.8") - { + if (GET_EXT_VERSION("bonus") >= "0.1.8") { $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='DELETED'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_BONUS_AP_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_BONUS_AP_VALUE', "0"); } - } - elseif (EXT_IS_ACTIVE("bonus")) - { + } elseif (EXT_IS_ACTIVE("bonus")) { define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2); - } - else - { + } else { define('__MAIL_BONUS_AP_VALUE', "".ADMIN_EXT_BONUS_404.""); } - } - else - { + } else { define('__MAIL_BONUS_AP_VALUE', "".ADMIN_EXT_AUTOPURGE_404.""); define('__MAIL_DELETED_VALUE', "".ADMIN_EXT_AUTOPURGE_404.""); - } + } + // // Sent bonus mails // - if (GET_EXT_VERSION("bonus") >= "0.1.8") - { + if (GET_EXT_VERSION("bonus") >= "0.1.8") { $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='SEND'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); - if ($value > 0) - { + if ($value > 0) { define('__MAIL_BONUS_SEND_VALUE', "".$value.""); - } - else - { + } else { define('__MAIL_BONUS_SEND_VALUE', "0"); } - } - elseif (EXT_IS_ACTIVE("bonus")) - { + } elseif (EXT_IS_ACTIVE("bonus")) { define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2); - } - else - { + } else { define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_404); - } - if (EXT_IS_ACTIVE("autopurge")) - { + } + + if (EXT_IS_ACTIVE("autopurge")) { // Start finding them... $since = (time() - $CONFIG['ap_in_since']); $EXCLUDE_LIST = " AND d.userid != c.def_refid"; @@ -329,8 +280,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid"; // Check for new holiday system - if (GET_EXT_VERSION("holiday") >= "0.1.3") - { + if (GET_EXT_VERSION("holiday") >= "0.1.3") { $EXCLUDE_LIST .= " AND d.holiday_active = 'N'"; } @@ -343,17 +293,17 @@ ORDER BY d.userid"; $WHATs[] = "list_autopurge"; $DESCRs[] = TASK_ADMIN_INACTIVE_AUTOPURGE; $TITLEs[] = TASK_ADMIN_INACTIVE_AUTOPURGE_TITLE; - } - if (GET_EXT_VERSION("sql_patches") >= "0.3.4") - { + } + + if (GET_EXT_VERSION("sql_patches") >= "0.3.4") { // Check for accounts without referral $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid='0' ORDER BY userid"; $DESCRs[] = TAKS_ADMIN_LIST_ACCOUNT_NOREF; $TITLEs[] = TAKS_ADMIN_LIST_ACCOUNT_NOREF_TITLE; $WHATs[] = "list_norefs"; - } - if (EXT_IS_ACTIVE("payout")) - { + } + + if (EXT_IS_ACTIVE("payout")) { // List new payout requests $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_payouts WHERE status='NEW' ORDER BY userid"; $WHATs[] = "list_payouts"; @@ -363,28 +313,27 @@ ORDER BY d.userid"; $WHATs[] = "list_payouts"; $DESCRs[] = TASK_ADMIN_LIST_PAYOUTS_ALL; $TITLEs[] = TASK_ADMIN_LIST_PAYOUTS_ALL_TITLE; - } - if (EXT_IS_ACTIVE("wernis")) - { + } + + if (EXT_IS_ACTIVE("wernis")) { // List new wernis requests $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_wernis ORDER BY userid"; $WHATs[] = "list_wernis"; $DESCRs[] = TASK_ADMIN_LIST_WERNIS_ALL; $TITLEs[] = TASK_ADMIN_LIST_WERNIS_ALL_TITLE; - } - if (EXT_IS_ACTIVE("holiday")) - { + } + + if (EXT_IS_ACTIVE("holiday")) { // List holiday requests $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_holidays ORDER BY userid"; $WHATs[] = "list_holiday"; $DESCRs[] = TASK_ADMIN_LIST_HOLIDAYS; $TITLEs[] = TASK_ADMIN_LIST_HOLIDAYS_TITLE; - } - if (GET_EXT_VERSION("bonus") >= "0.2.3") - { + } + + if (GET_EXT_VERSION("bonus") >= "0.2.3") { // Active rallye - if (GET_EXT_VERSION("bonus") >= "0.6.9") - { + if (GET_EXT_VERSION("bonus") >= "0.6.9") { // Add more bonus points here $USE = "(0"; if ($CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus"; @@ -393,17 +342,14 @@ ORDER BY d.userid"; if ($CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats"; if ($CONFIG['bonus_ref_yn'] == "Y") $USE .= " + bonus_ref"; $USE .= ")"; - } - else - { + } else { // Old version ??? $USE = "turbo_bonus"; } // Autopurge installed? $LAST = ""; $ONLINE = ""; - if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) - { + if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) { // Use last online timestamp to keep inactive members away from here $LAST = " AND last_online >= "; $ONLINE = bigintval(time() - $CONFIG['ap_in_since']); @@ -416,14 +362,13 @@ ORDER BY active_bonus DESC, userid"; $DESCRs[] = TASK_ADMIN_LIST_BONUS; $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE; } - if (GET_EXT_VERSION("beg") >= "0.1.2") - { + + if (GET_EXT_VERSION("beg") >= "0.1.2") { // Begging rallye // Autopurge installed? $LAST = ""; $ONLINE = ""; - if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) - { + if ((EXT_IS_ACTIVE("autopurge")) && ($CONFIG['ap_inactive'] == "Y") && ($CONFIG['ap_in_since'] > 0)) { // Use last online timestamp to keep inactive members away from here $LAST = " AND last_online >= "; $ONLINE = bigintval(time() - $CONFIG['ap_in_since']); @@ -436,8 +381,8 @@ ORDER BY beg_points DESC, userid"; $DESCRs[] = TASK_ADMIN_LIST_BEG; $TITLEs[] = TASK_ADMIN_LIST_BEG_TITLE; } - if (EXT_IS_ACTIVE("doubler")) - { + + if (EXT_IS_ACTIVE("doubler")) { // List waiting payouts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_doubler WHERE completed='N' ORDER BY id"; $WHATs[] = "list_doubler&mode=waiting&select=all"; @@ -447,7 +392,8 @@ ORDER BY beg_points DESC, userid"; $WHATs[] = "list_doubler"; $DESCRs[] = TASK_ADMIN_LIST_DOUBLER_ALL; $TITLEs[] = TASK_ADMIN_LIST_DOUBLER_ALL_TITLE; - } + } + // // All referral banner // @@ -455,6 +401,7 @@ ORDER BY beg_points DESC, userid"; $WHATs[] = "refbanner"; $DESCRs[] = TASK_ADMIN_LIST_REFBANNER_ALL; $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ALL_TITLE; + // // All activated referral banner // @@ -462,6 +409,7 @@ ORDER BY beg_points DESC, userid"; $WHATs[] = "refbanner"; $DESCRs[] = TASK_ADMIN_LIST_REFBANNER_ACTIVE; $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ACTIVE_TITLE; + // // All extensions // @@ -469,6 +417,7 @@ ORDER BY beg_points DESC, userid"; $WHATs[] = "extensions"; $DESCRs[] = TASK_ADMIN_LIST_EXTENSIONS_ALL; $TITLEs[] = TASK_ADMIN_LIST_EXTENSIONS_ALL_TITLE; + // // All activated extensions // @@ -476,82 +425,90 @@ ORDER BY beg_points DESC, userid"; $WHATs[] = "extensions&active=Y"; $DESCRs[] = TASK_ADMIN_LIST_EXTENSIONS_ACTIVE; $TITLEs[] = TASK_ADMIN_LIST_EXTENSIONS_ACTIVE_TITLE; - // - if (EXT_IS_ACTIVE("engine")) - { + + if (EXT_IS_ACTIVE("engine")) { // List all export accounts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_engine_accounts ORDER BY id"; $WHATs[] = "list_engine"; $DESCRs[] = TASK_ADMIN_LIST_ENGINE; + // List all pending accounts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_engine_accounts WHERE status='UNCONFIRMED' ORDER BY id"; $WHATs[] = "unlock_engine"; $DESCRs[] = TASK_ADMIN_UNLOCK_ENGINE; + // List all safes $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_engine_safe ORDER BY id"; $WHATs[] = "list_engine&mode=safe"; $DESCRs[] = TASK_ADMIN_LIST_ENGINE_SAFES; + // List all export URLs $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_engine_urls ORDER BY id"; $WHATs[] = "engine_urls"; $DESCRs[] = TASK_ADMIN_LIST_ENGINE_URLS; - } - if (EXT_IS_ACTIVE("sponsor")) - { + } + + if (EXT_IS_ACTIVE("sponsor")) { // List all sponsors $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data ORDER BY id"; $WHATs[] = "list_sponsor"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_TITLE; + // List confirmed sponsor accounts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='CONFIRMED' ORDER BY id"; $WHATs[] = "list_sponsor"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED_TITLE; + // List unconfirmed sponsor accounts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='UNCONFIRMED' ORDER BY id"; $WHATs[] = "list_sponsor"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED_TITLE; + // List locked sponsor accounts $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='LOCKED' ORDER BY id"; $WHATs[] = "list_sponsor"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED_TITLE; + // List waiting sponsor accounts to be approved $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_data WHERE status='PENDING' ORDER BY id"; $WHATs[] = "unlock_sponsor"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_PENDING; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_PENDING_TITLE; + // Waiting payments $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_sponsor_orders WHERE pay_status='PENDING' ORDER BY id"; $WHATs[] = "list_sponsor_pays"; $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS; $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS_TITLE; - } - if (EXT_IS_ACTIVE("country")) - { + } + + if (EXT_IS_ACTIVE("country")) { // List country codes $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_countries ORDER BY id"; $WHATs[] = "list_country"; $DESCRs[] = TASK_ADMIN_LIST_COUNTRY; $TITLEs[] = TASK_ADMIN_LIST_COUNTRY_TITLE; - } - if (EXT_IS_ACTIVE("theme")) - { + } + + if (EXT_IS_ACTIVE("theme")) { // List all themes $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_themes ORDER BY id"; $WHATs[] = "theme_edit"; $DESCRs[] = TASK_ADMIN_LIST_THEME_ALL; $TITLEs[] = TASK_ADMIN_LIST_THEME_ALL_TITLE; + // List active themes $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_active='Y' ORDER BY id"; $WHATs[] = "theme_edit"; $DESCRs[] = TASK_ADMIN_LIST_THEME_ACTIVE; $TITLEs[] = TASK_ADMIN_LIST_THEME_ACTIVE_TITLE; - } - if (EXT_IS_ACTIVE("admins")) - { + } + + if (EXT_IS_ACTIVE("admins")) { // List all administrator logins $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_admins ORDER BY id"; $WHATs[] = "admins_edit"; @@ -570,13 +527,13 @@ ORDER BY beg_points DESC, userid"; // Simply load the template... :-) LOAD_TEMPLATE("admin_overview_task"); -} +} + // -function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs) -{ +function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){ + // Init $OUT = ""; $SW = 2; $MAX = sizeof($SQLs) - 1; - foreach ($SQLs as $key=>$sql) - { + foreach ($SQLs as $key=>$sql) { // Run SQL command, get line numbers and free memory $result = SQL_QUERY($sql, __FILE__, __LINE__); $value = SQL_NUMROWS($result); @@ -586,15 +543,13 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs) 'row_descr' => $DESCRs[$key], 'row_sw' => $SW, 'bottom' => "", - ); + ); + if ($key < $MAX) $content['bottom'] = "bottom2"; - if (($value > 0) && (!empty($WHATs[$key]))) - { + if (($value > 0) && (!empty($WHATs[$key]))) { if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE; $content['row_link'] = "".$value.""; - } - else - { + } else { $content['row_link'] = "0"; }