X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=7636970fd7924d012a5f2c0f8689934a3dbc8ffe;hp=5250de06cedf368c054cb66cbf7cb09180dc1028;hb=0ee18ff2f17d096211666727d9e47f1528a4d885;hpb=1551e5820800685c80c19871a376986c0ad6f0f6 diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 5250de06ce..7636970fd7 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -14,11 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -65,7 +63,7 @@ function outputAdvancedOverview (&$result_main) { // Init SQLs initSqls(); - // Init contentn + // Init content foreach ( array( // Member accounts @@ -210,11 +208,11 @@ function outputAdvancedOverview (&$result_main) { } elseif (isExtensionActive('bonus')) { $content['purged_bonus_mails'] = getMaskedMessage('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--}'; } // @@ -239,7 +237,7 @@ function outputAdvancedOverview (&$result_main) { // 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?}'; @@ -280,7 +278,7 @@ 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--}'; @@ -288,7 +286,7 @@ ORDER BY 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--}'; @@ -296,7 +294,7 @@ ORDER BY if (isExtensionActive('primera')) { // List new primera requests - addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC"); + 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--}'; @@ -304,7 +302,7 @@ ORDER BY 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--}'; @@ -342,7 +340,7 @@ ORDER BY } // END - if addSql("SELECT - " . $USE . " AS points + " . $USE . " AS `points` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -389,7 +387,7 @@ ORDER BY $WHATs[] = 'list_doubler&mode=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--}'; @@ -398,7 +396,7 @@ ORDER BY // // All referal 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--}'; @@ -414,7 +412,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 +425,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 +465,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 +473,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 +487,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 +495,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 +511,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 +534,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 +541,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 +566,5 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) { return loadTemplate('admin_overview_task_extras', true, $OUT); } -// +// [EOF] ?>