X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=f0e1ed2cd71bb0ba0924ce67874f49b8c88629f2;hp=d02865c36c2c3783d427069ee8a80c83b0a11f67;hb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672;hpb=524c58a61b0a074fed8d7c9dc2f9ddab7f653595 diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index d02865c36c..f0e1ed2cd7 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -50,21 +50,22 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) global $_CONFIG; // Init variables/arrays - $EXTRAS = ""; $OUT = ""; $SQLs = array(); $WHATs = array(); $DESCRs = array(); $TITLEs = array(); + $EXTRAS = ""; + $OUT = ""; + $SQLs = array(); + $WHATs = array(); + $DESCRs = array(); + $TITLEs = array(); // Chheck for new extensions and updates $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_main); 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(get_session('admin_login'))), __FILE__, __LINE__); - - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'"); if ($value > 0) { - define('__TASK_UPDATE_VALUE', "".$value.""); + define('__TASK_UPDATE_VALUE', "".$value.""); } else { define('__TASK_UPDATE_VALUE', "0"); } @@ -76,34 +77,28 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // First check for all account status seperately // // Confirmed accounts - $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true); if ($value > 0) { - define('__CONFIRMED_VALUE', "".$value.""); + define('__CONFIRMED_VALUE', "".$value.""); } 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); + $value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true); if ($value > 0) { - define('__UNCONFIRMED_VALUE', "".$value.""); + define('__UNCONFIRMED_VALUE', "".$value.""); } 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); + $value = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true); if ($value > 0) { - define('__LOCKED_VALUE', "".$value.""); + define('__LOCKED_VALUE', "".$value.""); } else { define('__LOCKED_VALUE', "0"); } @@ -111,12 +106,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Unassigned tasks // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='0' AND status != 'DELETED'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("0", "task_system", "id", "assigned_admin", true, " AND `status` != 'DELETED'"); if ($value > 0) { - define('__TASK_NEW_VALUE', "".$value.""); + define('__TASK_NEW_VALUE', "".$value.""); } else { define('__TASK_NEW_VALUE', "0"); } @@ -124,12 +117,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Closed tasks // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE status = 'CLOSED'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("CLOSED", "task_system", "id", "status", true); if ($value > 0) { - define('__TASK_CLOSED_VALUE', "".$value.""); + define('__TASK_CLOSED_VALUE', "".$value.""); } else { define('__TASK_CLOSED_VALUE', "0"); } @@ -137,12 +128,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Deleted tasks // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE status = 'DELETED'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("DELETED", "task_system", "id", "status", true); if ($value > 0) { - define('__TASK_DELETED_VALUE', "".$value.""); + define('__TASK_DELETED_VALUE', "".$value.""); } else { define('__TASK_DELETED_VALUE', "0"); } @@ -150,13 +139,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Solved tasks // - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE status = 'SOLVED' AND assigned_admin='%s'", - array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("SOLVED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_CURRENT_ADMIN_ID())); if ($value > 0) { - define('__TASK_SOLVED_VALUE', "".$value.""); + define('__TASK_SOLVED_VALUE', "".$value.""); } else { define('__TASK_SOLVED_VALUE', "0"); } @@ -164,13 +150,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Your tasks // - $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(get_session('admin_login'))), __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'"); if ($value > 0) { - define('__TASK_YOUR_VALUE', "".$value.""); + define('__TASK_YOUR_VALUE', "".$value.""); } else { define('__TASK_YOUR_VALUE', "0"); } @@ -178,12 +161,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Mails waiting to be approved // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE data_type='ADMIN'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("ADMIN", "pool", "id", "data_type", true); if ($value > 0) { - define('__MAIL_ADMIN_VALUE', "".$value.""); + define('__MAIL_ADMIN_VALUE', "".$value.""); } else { define('__MAIL_ADMIN_VALUE', "0"); } @@ -191,12 +172,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Unfinished mail orders // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE data_type='TEMP'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("TEMP", "pool", "id", "data_type", true); if ($value > 0) { - define('__MAIL_TEMP_VALUE', "".$value.""); + define('__MAIL_TEMP_VALUE', "".$value.""); } else { define('__MAIL_TEMP_VALUE', "0"); } @@ -204,12 +183,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // // Sent mail orders // - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE data_type='SEND'", __FILE__, __LINE__); - $value = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $value = GET_TOTAL_DATA("SEND", "pool", "id", "data_type", true); if ($value > 0) { - define('__MAIL_SEND_VALUE', "".$value.""); + define('__MAIL_SEND_VALUE', "".$value.""); } else { define('__MAIL_SEND_VALUE', "0"); } @@ -218,12 +195,11 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // Autopurged mails // 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); + // Get auto-purged mails + $value = GET_TOTAL_DATA("DELETED", "pool", "id", "data_type", true); if ($value > 0) { - define('__MAIL_DELETED_VALUE', "".$value.""); + define('__MAIL_DELETED_VALUE', "".$value.""); } else { define('__MAIL_DELETED_VALUE', "0"); } @@ -232,35 +208,33 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // Autopurged bonus mails // 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); + // Get auto-purged bonus mails + $value = GET_TOTAL_DATA("DELETED", "bonus", "id", "data_type", true); if ($value > 0) { - define('__MAIL_BONUS_AP_VALUE', "".$value.""); + define('__MAIL_BONUS_AP_VALUE', "".$value.""); } else { define('__MAIL_BONUS_AP_VALUE', "0"); } } elseif (EXT_IS_ACTIVE("bonus")) { define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2); } else { - define('__MAIL_BONUS_AP_VALUE', "".ADMIN_EXT_BONUS_404.""); + define('__MAIL_BONUS_AP_VALUE', "