File renamed to naming convention, ext-repair continued:

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 7636970fd7924d012a5f2c0f8689934a3dbc8ffe..47d9f1cd55552040cb6d6c625010e1294cac918a 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -67,7 +67,7 @@ function outputAdvancedOverview (&$result_main) {
        foreach (
                array(
                        // Member accounts
-                       'confirmed_members','unconfirmed_members','locked_members',
+                       'confirmed_members','unconfirmed_members','locked_members','random_refid',
                        // Tasks
                        'update_tasks','new_tasks','closed_tasks','your_tasks','deleted_tasks','solved_tasks',
                        // Mail orders
@@ -102,16 +102,23 @@ function outputAdvancedOverview (&$result_main) {
        $value = getTotalUnconfirmedUser();
 
        if ($value > 0) {
-               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=chk_regs%}">' . $value . '</a>';
+               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=UNCONFIRMED%}">' . $value . '</a>';
        } // END - if
 
-
        // And locked accounts
        $value = getTotalLockedUser();
        if ($value > 0) {
                $content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
        } // END - if
 
+       if (isExtensionInstalledAndNewer('user', '0.3.4')) {
+               // And random refid
+               $value = getTotalRandomRefidUser();
+               if ($value > 0) {
+                       $content['random_refid'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;mode=random_refid%}">' . $value . '</a>';
+               } // END - if
+       } // END - if
+
        //
        // Unassigned tasks
        //
@@ -206,7 +213,7 @@ function outputAdvancedOverview (&$result_main) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                        } // 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'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
                }
@@ -226,12 +233,13 @@ function outputAdvancedOverview (&$result_main) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                } // 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 = '';
 
@@ -253,9 +261,9 @@ 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?})
+       (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");
@@ -264,13 +272,13 @@ ORDER BY
                $TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}';
        }
 
-       if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
+       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 ORDER BY `userid` ASC");
+               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&amp;mode=norefs';
-       }
+       } // END - if
 
        if (isExtensionActive('payout')) {
                // List new payout requests
@@ -316,7 +324,8 @@ ORDER BY
                $TITLEs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS_TITLE--}';
        } // END - if
 
-       if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
+       // 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
@@ -332,11 +341,13 @@ ORDER BY
                        $USE = 'turbo_bonus';
                }
 
-               // 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
@@ -355,14 +366,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