Extension ext-network continued:

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index aed64ba5b1637628bb74d969077d41e59898bdfe..5f705a06b52fb653168ae7cf7a839569c769b63a 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -115,7 +115,7 @@ function outputAdvancedOverview (&$result_main) {
                // 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>';
+                       $content['random_refid'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;do=random_refid%}">' . $value . '</a>';
                } // END - if
        } // END - if
 
@@ -215,11 +215,11 @@ function outputAdvancedOverview (&$result_main) {
                } 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>';
        }
 
        //
@@ -273,11 +273,11 @@ ORDER BY
        }
 
        if ((isExtensionInstalledAndNewer('sql_patches', '0.3.4')) && (isExtensionActive('user'))) {
-               // Check for accounts without referal
+               // Check for accounts without referral
                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';
+               $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL--}';
+               $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NO_REFERRAL_TITLE--}';
+               $WHATs[]  = 'list_user&amp;do=norefs';
        } // END - if
 
        if (isExtensionActive('payout')) {
@@ -326,20 +326,14 @@ ORDER BY
 
        // 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
+               $USE = '`turbo_bonus`';
+               if (!empty($add)) {
+                       $USE = '(0' . $add . ')';
+               } // END - if
 
                // Init variable
                $lastOnline = '';
@@ -398,7 +392,7 @@ ORDER BY
        if (isExtensionActive('doubler')) {
                // List waiting payouts
                addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE `completed`='N' ORDER BY `id` ASC");
-               $WHATs[]  = 'list_doubler&amp;mode=waiting&amp;select=all';
+               $WHATs[]  = 'list_doubler&amp;do=waiting&amp;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');
@@ -408,7 +402,7 @@ ORDER BY
        } // END - if
 
        //
-       // All referal banner
+       // All referral banner
        //
        addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC');
        $WHATs[] = 'refbanner';
@@ -416,7 +410,7 @@ ORDER BY
        $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';