Introduced more wrappers

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 4184c6722ae2742475a671e5ea35ec8db72d85d5..b1243ce216ca3653d9701a2ff569eb9b8cb68832 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -100,7 +100,7 @@ function outputAdvancedOverview (&$result_main) {
        // Unconfirmed accounts
        $value = getTotalUnconfirmedUser();
        if ($value > 0) {
-               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=UNCONFIRMED%}">' . $value . '</a>';
+               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=unconfirmed%}">' . $value . '</a>';
        } // END - if
 
        // Locked accounts
@@ -247,21 +247,20 @@ function outputAdvancedOverview (&$result_main) {
        // Both extensions must be there
        if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
                // Start finding them...
-               $EXCLUDE_LIST = ' ';
+               $userExclusionSql = ' ';
+
+               // Exclude test accounts
+               $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
 
                // Check for more extensions
                // @TODO These can be rewritten to filter
-               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?}';
+               if (isValidUserId(getDefRefid()))              $userExclusionSql .= ' AND d.`userid` != {?def_refid?}';
+               if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND d.`userid` != {?beg_userid?}';
+               if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND d.`userid` != {?bonus_userid?}';
+               if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND d.`userid` != {?doubler_userid?}';
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // 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);
+                       $userExclusionSql .= " AND d.`holiday_active`='N'";
                } // END - if
 
                // Check for all accounts
@@ -270,14 +269,13 @@ function outputAdvancedOverview (&$result_main) {
        d.`email`,
        d.`last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-       d.`status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       d.`status`='CONFIRMED' 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."
+" . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC");
                $WHATs[]  = 'list_autopurge';
@@ -520,6 +518,14 @@ ORDER BY
                $TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
        } // END - if
 
+       if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
+               // Check for accounts without referral
+               addSql('SELECT `server_name_id` FROM `{?_MYSQL_PREFIX?}_server_name_log`');
+               $DESCRs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG--}';
+               $TITLEs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG_TITLE--}';
+               $WHATs[]  = 'list_server_name';
+       } // END - if
+
        // Generate extra overview rows
        $EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs);