* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 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 *
foreach (
array(
// Member accounts
- 'confirmed_members','unconfirmed_members','locked_members','random_refid',
+ 'confirmed_members','unconfirmed_members','locked_members','random_refid','testers',
// Tasks
'update_tasks','new_tasks','closed_tasks','your_tasks','deleted_tasks','solved_tasks',
// Mail orders
//
// Confirmed accounts
$value = getTotalConfirmedUser();
-
if ($value > 0) {
$content['confirmed_members'] = '<a href="{%url=modules.php?module=admin&what=list_user&status=confirmed%}">' . $value . '</a>';
} // END - if
// Unconfirmed accounts
$value = getTotalUnconfirmedUser();
-
if ($value > 0) {
$content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&what=list_user&status=UNCONFIRMED%}">' . $value . '</a>';
} // END - if
- // And locked accounts
+ // Locked accounts
$value = getTotalLockedUser();
if ($value > 0) {
$content['locked_members'] = '<a href="{%url=modules.php?module=admin&what=list_user&status=locked%}">' . $value . '</a>';
// And random refid
$value = getTotalRandomRefidUser();
if ($value > 0) {
- $content['random_refid'] = '<a href="{%url=modules.php?module=admin&what=list_user&mode=random_refid%}">' . $value . '</a>';
+ $content['random_refid'] = '<a href="{%url=modules.php?module=admin&what=list_user&do=random_refid%}">' . $value . '</a>';
+ } // END - if
+
+ if (isExtensionInstalledAndNewer('user', '0.5.0')) {
+ // And tester accounts
+ $value = getTotalTesterUsers();
+ if ($value > 0) {
+ $content['testers'] = '<a href="{%url=modules.php?module=admin&what=list_user&do=testers%}">' . $value . '</a>';
+ } // END - if
} // END - if
} // END - if
} elseif (isExtensionActive('bonus')) {
$content['purged_bonus_mails'] = '{%message,ADMIN_EXTENSION_BONUS_OUTDATED=0.1.8%}';
} else {
- $content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
+ $content['purged_bonus_mails'] = '<span class="bad">{--ADMIN_EXTENSION_BONUS_404--}</span>';
}
} else {
- $content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
- $content['purged_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+ $content['purged_bonus_mails'] = '<span class="bad">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+ $content['purged_mails'] = '<span class="bad">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
}
//
// 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
// 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.`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')) && (isExtensionActive('user'))) {
- // Check for accounts without referal
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 OR `refid` IS NULL ORDER BY `userid` ASC");
- $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
- $WHATs[] = 'list_user&mode=norefs';
+ // 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')) {
$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
$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
$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
// Both extensions must be there
if ((isExtensionInstalledAndNewer('bonus', '0.2.3')) && (isExtensionActive('user'))) {
- // 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';
- }
+ // Get more columns
+ $add = runFilterChain('add_bonus_points_user_columns', '');
+
+ // Active rallye, so add more point columns, if not empty
+ $pointsColumns = '`turbo_bonus`';
+ if (!empty($add)) {
+ $pointsColumns = '(0' . $add . ')';
+ } // END - if
// Init variable
$lastOnline = '';
} // 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,
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');
} // END - if
//
- // All referal banner
+ // All referral banner
//
addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC');
$WHATs[] = 'refbanner';
$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';
projects / mailer.git / blobdiff