X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=b8258a4d0d13dca5cb7d4d0ac73a926cea83efee;hp=5250de06cedf368c054cb66cbf7cb09180dc1028;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=1551e5820800685c80c19871a376986c0ad6f0f6 diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 5250de06ce..b8258a4d0d 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -14,12 +14,10 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -65,11 +63,11 @@ function outputAdvancedOverview (&$result_main) { // Init SQLs initSqls(); - // Init contentn + // Init content foreach ( array( // Member accounts - 'confirmed_members','unconfirmed_members','locked_members', + 'confirmed_members','unconfirmed_members','locked_members','random_refid','testers', // Tasks 'update_tasks','new_tasks','closed_tasks','your_tasks','deleted_tasks','solved_tasks', // Mail orders @@ -95,25 +93,38 @@ function outputAdvancedOverview (&$result_main) { // // Confirmed accounts $value = getTotalConfirmedUser(); - if ($value > 0) { $content['confirmed_members'] = '' . $value . ''; } // END - if // Unconfirmed accounts $value = getTotalUnconfirmedUser(); - if ($value > 0) { - $content['unconfirmed_members'] = '' . $value . ''; + $content['unconfirmed_members'] = '' . $value . ''; } // END - if - - // And locked accounts + // Locked accounts $value = getTotalLockedUser(); if ($value > 0) { $content['locked_members'] = '' . $value . ''; } // END - if + if (isExtensionInstalledAndNewer('user', '0.3.4')) { + // And random refid + $value = getTotalRandomRefidUser(); + if ($value > 0) { + $content['random_refid'] = '' . $value . ''; + } // END - if + + if (isExtensionInstalledAndNewer('user', '0.5.0')) { + // And tester accounts + $value = getTotalTesterUsers(); + if ($value > 0) { + $content['testers'] = '' . $value . ''; + } // END - if + } // END - if + } // END - if + // // Unassigned tasks // @@ -208,13 +219,13 @@ function outputAdvancedOverview (&$result_main) { $content['purged_bonus_mails'] = '' . $value . ''; } // END - if } elseif (isExtensionActive('bonus')) { - $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8'); + $content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}'; } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } } else { - $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; - $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; + $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}'; } // @@ -228,18 +239,19 @@ function outputAdvancedOverview (&$result_main) { $content['send_bonus_mails'] = '' . $value . ''; } // END - if } elseif (isExtensionActive('bonus')) { - $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8'); + $content['send_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}'; } else { $content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}'; } - if (isExtensionActive('autopurge')) { + // Both extensions must be there + if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) { // Start finding them... - $EXCLUDE_LIST = ''; + $EXCLUDE_LIST = ' '; // Check for more extensions // @TODO These can be rewritten to filter - if (getConfig('def_refid') > 0) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}'; + if (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}'; if (isExtensionActive('beg')) $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}'; if (isExtensionActive('bonus')) $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}'; if (isExtensionActive('doubler')) $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}'; @@ -247,32 +259,39 @@ function outputAdvancedOverview (&$result_main) { // Recent ext-holiday found $EXCLUDE_LIST .= " AND d.`holiday_active`='N'"; } // END - if + if (isExtensionInstalledAndNewer('user', '0.5.0')) { + // Exclude test accounts + $EXCLUDE_LIST = runFilterChain('user_exclusion_sql', $EXCLUDE_LIST); + } // END - if // Check for all accounts addSql("SELECT - d.userid, d.email, d.last_online + d.`userid`, + d.`email`, + d.`last_online` FROM `{?_MYSQL_PREFIX?}_user_data` AS d WHERE - d.`status`='CONFIRMED' AND - d.joined < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND - d.last_online < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND - d.ap_notified < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) + d.`status`='CONFIRMED' + " . runFilterChain('user_exclusion_sql', ' ') . " AND + (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND + (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND + (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?} ".$EXCLUDE_LIST." ORDER BY - d.userid ASC"); + d.`userid` ASC"); $WHATs[] = 'list_autopurge'; $DESCRs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE--}'; $TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}'; - } + } // END - if - if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) { - // Check for accounts without referal - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC"); - $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}'; - $WHATs[] = 'list_user&mode=norefs'; - } + if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) { + // Check for accounts without referral + addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ' . runFilterChain('user_exclusion_sql', ' ') . ' ORDER BY `userid` ASC'); + $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}'; + $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}'; + $WHATs[] = 'list_user&do=norefs'; + } // END - if if (isExtensionActive('payout')) { // List new payout requests @@ -280,35 +299,27 @@ ORDER BY $WHATs[] = 'list_payouts'; $DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE--}'; - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC"); + addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC'); $WHATs[] = 'list_payouts'; $DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}'; - } + } // END - if if (isExtensionActive('wernis')) { // List new wernis requests - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC"); + addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC'); $WHATs[] = 'list_wernis'; $DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}'; - } - - if (isExtensionActive('primera')) { - // List new primera requests - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC"); - $WHATs[] = 'list_primera'; - $DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}'; - } + } // END - if if (isExtensionActive('holiday')) { // List holiday requests - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC"); + addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC'); $WHATs[] = 'list_holiday'; $DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}'; - } + } // END - if if (isExtensionInstalledAndNewer('bonus', '0.8.7')) { // List all notifications @@ -318,36 +329,33 @@ ORDER BY $TITLEs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS_TITLE--}'; } // END - if - if (isExtensionInstalledAndNewer('bonus', '0.2.3')) { - // Active rallye - if (isExtensionInstalledAndNewer('bonus', '0.6.9')) { - // Add more bonus points here - $USE = '(0'; - if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`'; - if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`'; - if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`'; - if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`'; - if (getConfig('bonus_ref_yn') == 'Y') $USE .= ' + `bonus_ref`'; - $USE .= ')'; - } else { - // Old version ??? - $USE = 'turbo_bonus'; - } + // Both extensions must be there + if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) { + // Get more columns + $add = runFilterChain('add_bonus_points_user_columns', ''); - // Autopurge installed? + // Active rallye, so add more point columns, if not empty + $pointsColumns = '`turbo_bonus`'; + if (!empty($add)) { + $pointsColumns = '(0' . $add . ')'; + } // END - if + + // Init variable $lastOnline = ''; - if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) { + + // Autopurge installed? + if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) { // Use last online timestamp to keep inactive members away from here - $lastOnline = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})'; + $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}'; } // END - if addSql("SELECT - " . $USE . " AS points + " . $pointsColumns . " AS `points` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND - " . $USE . " > 0 + " . $pointsColumns . " > 0 " . $lastOnline . " ORDER BY `points` DESC, @@ -357,14 +365,17 @@ ORDER BY $TITLEs[] = '{--ADMIN_TASK_LIST_BONUS_TITLE--}'; } - if (isExtensionInstalledAndNewer('beg', '0.1.2')) { - // Begging rallye + // Again both extensions must be there + if ((isExtensionInstalledAndNewer('beg', '0.1.2')) && (isExtensionActive('user'))) { + // ----- Begging rallye ----- - // Autopurge installed? + // Init variable $lastOnline = ''; - if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) { + + // Autopurge installed? + if ((isExtensionActive('autopurge')) && (isAutopurgeInactiveEnabled()) && (getApInactiveSince() > 0)) { // Use last online timestamp to keep inactive members away from here - $lastOnline = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})'; + $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}'; } // END - if addSql("SELECT @@ -386,25 +397,25 @@ ORDER BY if (isExtensionActive('doubler')) { // List waiting payouts addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE `completed`='N' ORDER BY `id` ASC"); - $WHATs[] = 'list_doubler&mode=waiting&select=all'; + $WHATs[] = 'list_doubler&do=waiting&select=all'; $DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE--}'; - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC'); $WHATs[] = 'list_doubler'; $DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL_TITLE--}'; } // END - if // - // All referal banner + // All referral banner // - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC'); $WHATs[] = 'refbanner'; $DESCRs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}'; // - // All activated referal banner + // All activated referral banner // addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y' ORDER BY `id` ASC"); $WHATs[] = 'refbanner'; @@ -414,7 +425,7 @@ ORDER BY // // All extensions // - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC'); $WHATs[] = 'extensions'; $DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE--}'; @@ -427,35 +438,9 @@ ORDER BY $DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE--}'; - if (isExtensionActive('engine')) { - // List all export accounts - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` ORDER BY `id` ASC"); - $WHATs[] = 'list_engine'; - $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_TITLE--}'; - - // List all pending accounts - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` WHERE `status`='UNCONFIRMED' ORDER BY `id` ASC"); - $WHATs[] = 'unlock_engine'; - $DESCRs[] = '{--ADMIN_TASK_UNLOCK_ENGINE--}'; - $TITLEs[] = '{--ADMIN_TASK_UNLOCK_ENGINE_TITLE--}'; - - // List all safes - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_safe` ORDER BY `id` ASC"); - $WHATs[] = 'list_engine&mode=safe'; - $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES_TITLE--}'; - - // List all export URLs - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_urls` ORDER BY `id` ASC"); - $WHATs[] = 'engine_urls'; - $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS--}'; - $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS_TITLE--}'; - } // END - if - if (isExtensionActive('sponsor')) { // List all sponsors - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC'); $WHATs[] = 'list_sponsor'; $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_TITLE--}'; @@ -493,7 +478,7 @@ ORDER BY if (isExtensionActive('country')) { // List country codes - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC'); $WHATs[] = 'list_country'; $DESCRs[] = '{--ADMIN_TASK_LIST_COUNTRY--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_COUNTRY_TITLE--}'; @@ -501,7 +486,7 @@ ORDER BY if (isExtensionActive('theme')) { // List all themes - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC'); $WHATs[] = 'theme_edit'; $DESCRs[] = '{--ADMIN_TASK_LIST_THEME_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_THEME_ALL_TITLE--}'; @@ -515,7 +500,7 @@ ORDER BY if (isExtensionActive('admins')) { // List all administrator logins - addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC"); + addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC'); $WHATs[] = 'admins_edit'; $DESCRs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL_TITLE--}'; @@ -523,7 +508,7 @@ ORDER BY if (isExtensionActive('surfbar')) { // List all URLs in surfbar - addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC"); + addSql('SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC'); $WHATs[] = 'list_surfbar_urls'; $DESCRs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL--}'; $TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE--}'; @@ -539,7 +524,9 @@ ORDER BY $EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs); // If empty just keep a forced-space left for CSS issues - if (empty($EXTRAS)) $EXTRAS = ' '; + if (empty($EXTRAS)) { + $EXTRAS = ' '; + } // END - if // Add compiled string to constant for final template $content['extra_table'] = $EXTRAS; @@ -560,12 +547,6 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { // Run SQL command, get line numbers and free memory $result = SQL_QUERY($sql, __FUNCTION__, __LINE__); - // Get rows - $value = SQL_NUMROWS($result); - - // Free result - SQL_FREERESULT($result); - // Prepare array for output $content = array( 'row_descr' => $DESCRs[$key], @@ -573,15 +554,22 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { ); // Rewrite CSS class if not last entry is reached - if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom'; + if ($key < (count($sqls) - 1)) { + $content['bottom'] = 'bottom'; + } // END - if - if (($value > 0) && (!empty($WHATs[$key]))) { - if (empty($TITLEs[$key])) $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}'; - $content['row_link'] = '' . $value . ''; + if ((!SQL_HASZERONUMS($result)) && (!empty($WHATs[$key]))) { + if (empty($TITLEs[$key])) { + $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}'; + } // END - if + $content['row_link'] = '' . SQL_NUMROWS($result) . ''; } else { $content['row_link'] = '0'; } + // Free result + SQL_FREERESULT($result); + // And insert the final string into extras template $OUT .= loadTemplate('admin_overview_task_rows', true, $content); } // END- foreach @@ -591,5 +579,5 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { return loadTemplate('admin_overview_task_extras', true, $OUT); } -// +// [EOF] ?>