X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=d02865c36c2c3783d427069ee8a80c83b0a11f67;hp=e71856915b9387911a13caa413fdf49d9e104620;hb=524c58a61b0a074fed8d7c9dc2f9ddab7f653595;hpb=51551e6c2aaee0d2c357e000b876c64589a008a1 diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index e71856915b..d02865c36c 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -32,10 +32,11 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // // The advanced overview shows detailed informations to your exchange script: // - Unconfirmed / locked accounts @@ -254,7 +255,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) // Sent bonus mails // if (GET_EXT_VERSION("bonus") >= "0.1.8") { - $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='SEND'", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE data_type='SEND' AND is_notify='N'", __FILE__, __LINE__); $value = SQL_NUMROWS($result); SQL_FREERESULT($result); @@ -271,23 +272,19 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) if (EXT_IS_ACTIVE("autopurge")) { // Start finding them... - $since = (time() - $_CONFIG['ap_in_since']); - $EXCLUDE_LIST = " AND d.userid != c.def_refid"; + $since = $_CONFIG['ap_inactive_since']; + $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'].""; // Check for more extensions - if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; - if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid"; - 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") { - $EXCLUDE_LIST .= " AND d.holiday_active = 'N'"; - } + if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['beg_uid'].""; + if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['bonus_uid'].""; + if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['doubler_uid'].""; + if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'"; // Check for all accounts $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online -FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c -WHERE d.status='CONFIRMED' AND d.joined < ".$since." AND d.last_online < ".$since." AND d.ap_notified < ".$since." +FROM "._MYSQL_PREFIX."_user_data AS d +WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < ".$since." AND d.ap_notified < ".$since." ".$EXCLUDE_LIST." ORDER BY d.userid"; $WHATs[] = "list_autopurge"; @@ -296,7 +293,7 @@ ORDER BY d.userid"; } if (GET_EXT_VERSION("sql_patches") >= "0.3.4") { - // Check for accounts without referral + // Check for accounts without referal $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid='0' ORDER BY userid"; $DESCRs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF; $TITLEs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE; @@ -356,34 +353,41 @@ ORDER BY d.userid"; } // Autopurge installed? - $LAST = ""; $ONLINE = ""; - if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_in_since'] > 0)) { + $LAST = ""; + if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { // Use last online timestamp to keep inactive members away from here - $LAST = " AND last_online >= "; - $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']); + $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']); } - $SQLs[] = "SELECT ".$USE." AS active_bonus FROM "._MYSQL_PREFIX."_user_data -WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."".$ONLINE." + $SQLs[] = "SELECT ".$USE." AS active_bonus +FROM "._MYSQL_PREFIX."_user_data +WHERE status='CONFIRMED' AND ".$USE.">0".$LAST." ORDER BY active_bonus DESC, userid"; $WHATs[] = "list_bonus"; $DESCRs[] = TASK_ADMIN_LIST_BONUS; $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE; + + if (GET_EXT_VERSION("bonus") >= "0.8.7") { + // List all notifications + $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE is_notify='Y' ORDER BY timestamp DESC"; + $WHATs[] = "list_notifications"; + $DESCRs[] = TASK_ADMIN_LIST_NOTIFICATIONS; + $TITLEs[] = TASK_ADMIN_LIST_NOTIFICATIONS_TITLE; + } } 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)) { + $LAST = ""; + if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { // Use last online timestamp to keep inactive members away from here - $LAST = " AND last_online >= "; - $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']); + $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']); } $SQLs[] = "SELECT userid FROM "._MYSQL_PREFIX."_user_data -WHERE status='CONFIRMED' AND beg_points>0".$LAST."".$ONLINE." +WHERE status='CONFIRMED' AND beg_points>0".$LAST." ORDER BY beg_points DESC, userid"; $WHATs[] = "list_beg"; $DESCRs[] = TASK_ADMIN_LIST_BEG; @@ -403,7 +407,7 @@ ORDER BY beg_points DESC, userid"; } // - // All referral banner + // All referal banner // $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_refbanner ORDER BY id"; $WHATs[] = "refbanner"; @@ -411,7 +415,7 @@ ORDER BY beg_points DESC, userid"; $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ALL_TITLE; // - // All activated referral banner + // All activated referal banner // $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_refbanner WHERE visible='Y' ORDER BY id"; $WHATs[] = "refbanner"; @@ -555,10 +559,14 @@ ORDER BY beg_points DESC, userid"; 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__); + + // Get rows $value = SQL_NUMROWS($result); + + // Free result SQL_FREERESULT($result); $content = array( @@ -572,7 +580,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){ if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE; $content['row_link'] = "".$value.""; } else { - $content['row_link'] = "0"; + $content['row_link'] = 0; } // Switch color @@ -580,7 +588,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){ // And insert the final string into extras template $OUT .= LOAD_TEMPLATE("admin_overview_task_rows", true, $content); - } + } // END - if // Return output return LOAD_TEMPLATE("admin_overview_task_extras", true, $OUT);