X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=d721f6f0f03ce092ab0799c09a3400d253398630;hp=649aec6ab3f7c3b49cac6f06e741533622c73f49;hb=6560179e7c8dc565485503f374d4e31f333ffd0e;hpb=ee3a0b42f93de7676fca549c866c1c2e6f3f0576 diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 649aec6ab3..d721f6f0f0 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * 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 * @@ -75,7 +75,22 @@ if (isGetRequestElementSet('userid')) { // Does the account exists? $result_user = SQL_QUERY_ESC("SELECT - `userid`,`country`,`email`,`birth_day`,`birth_month`,`birth_year`,`last_online`,`used_points`,`emails_sent`,`joined`,`last_update`,`last_profile_sent`,`notified`,`emails_received`,`mails_confirmed`".$MORE." + `userid`, + `country`, + `email`, + `birth_day`, + `birth_month`, + `birth_year`, + `last_online`, + `used_points`, + `emails_sent`, + `joined`, + `last_update`, + `last_profile_sent`, + `notified`, + `emails_received`, + `mails_confirmed` + ".$MORE." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -94,9 +109,15 @@ LIMIT 1", $content['links'] = getTotalUnconfirmedMails($userid); // Add links to the numbers - if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; + if ($content['links'] > 0) { + $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; + } // END - if + if ($content['refs'] > 0) { + $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; + } // END - if + if ($content['cats'] > 0) { + $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; + } // END - if // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']); @@ -116,7 +137,6 @@ LIMIT 1", $content['joined'] = generateDateTime($content['joined'], '2'); $content['last_update'] = generateDateTime($content['last_update'], '2'); $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '2'); - $content['total_points'] = getTotalPoints($content['userid']); $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); // Prepare array for filter @@ -204,31 +224,56 @@ LIMIT 1", } break; + case 'testers': // Test accounts + // Add statement through filter + $whereStatement = runFilterChain('user_inclusion_sql', $whereStatement); + break; + default: // Invalid list mode - debug_report_bug(__FILE__, __LINE__, sprintf("Invalid do %s detected.", getRequestElement('do'))); + reportBug(__FILE__, __LINE__, sprintf("Invalid do %s detected.", SQL_ESCAPE(secureString(getRequestElement('do'))))); break; } // END - switch + + // If it is not 'testers', add exclusion SQL + if (getRequestElement('do') != 'testers') { + // Exclude tester users + $whereStatement = runFilterChain('user_exclusion_sql', $whereStatement); + } // END - if } // END - if // Generate master query string - $sql = sprintf("SELECT `userid`,`email`,`emails_sent`,`mails_confirmed`,`emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC", + $sql = sprintf("SELECT + `userid`, + `email`, + `emails_sent`, + `mails_confirmed`, + `emails_received` + " . $MORE . " +FROM + `{?_MYSQL_PREFIX?}_user_data` +" . $whereStatement . " +ORDER BY + `%s` ASC", getRequestElement('sortby') ); // Prepare SQL and run it $result_master = SQL_QUERY($sql, __FILE__, __LINE__); - // Calculate page count (0.5 fixes a bug with page count) - if (getConfig('user_limit') == '0') { + // Is the user limit zero? + if (getUserLimit() == '0') { + // Then set it to default ... setConfigEntry('user_limit', 100); + + // ... but output warning displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}'); } // END - if - // Activate the extension please! - $numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5); + // Calculate page count (0.5 fixes a bug with page count) + $numPages = round(SQL_NUMROWS($result_master) / getUserLimit() + 0.5); if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 1); - if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getConfig('user_limit')); + if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', getUserLimit()); // Add limitation to SQL string and run him again $sql .= ' LIMIT ' . (getRequestElement('offset') * getRequestElement('page') - getRequestElement('offset')) . ', ' . getRequestElement('offset'); @@ -236,9 +281,6 @@ LIMIT 1", // Are there some entries? if (!SQL_HASZERONUMS($result_master)) { - // We have some (new?) registrations! - $templateContent['user_count'] = getTotalConfirmedUser(); - // Sorting links and number of pages $templateContent['sort_links'] = addSortLinks(getRequestElement('letter'), getRequestElement('sortby')); $templateContent['num_pages'] = $numPages; @@ -278,8 +320,30 @@ LIMIT 1", $content['email'] = '[' . $content['email'] . ']'; $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2'); $content['refs'] = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true); - $content['own_points'] = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points'); - $content['locked_points'] = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points'); + + // Prepare array for filter + $data = array( + 'userid' => $content['userid'], + 'points' => 0 + ); + + // Run the filter chain + $data = runFilterChain('get_own_points', $data); + + // Copy points + $content['own_points'] = $data['points']; + + // Prepare array for filter again + $data = array( + 'userid' => $content['userid'], + 'points' => 0 + ); + + // Run the filter chain + $data = runFilterChain('get_locked_points', $data); + + // Copy points + $content['locked_points'] = $data['points']; // If we have at least one referral, make it clickable to referral list if ($content['refs'] > 0) {