Even more rewrites/fixes from EL branch (please report any broken part after you...

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index f59554b1e374fb9dbf67c0b850dc2802586850b2..16ea671c73367af7d995b6d4efd08013d7734784 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 08/03/2004 *
- * ================                             Last change: 11/19/2005 *
+ * ===================                          Last change: 11/19/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : task_functions.php                               *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -86,7 +87,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
 
        if ($value > 0) {
-               $content['update_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>";
+               $content['update_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -96,21 +97,21 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
 
        if ($value > 0) {
-               $content['confirmed_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>";
+               $content['confirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=confirmed%}">' . $value . '</a>';
        } // END - if
 
        // Unconfirmed accounts
        $value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
 
        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=chk_regs%}">' . $value . '</a>';
        } // END - if
 
 
        // And locked accounts
        $value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
        if ($value > 0) {
-               $content['locked_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>";
+               $content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -119,7 +120,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
 
        if ($value > 0) {
-               $content['new_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>";
+               $content['new_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -128,7 +129,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
 
        if ($value > 0) {
-               $content['closed_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>";
+               $content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -137,7 +138,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
 
        if ($value > 0) {
-               $content['deleted_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>";
+               $content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -146,7 +147,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
 
        if ($value > 0) {
-               $content['solved_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>";
+               $content['solved_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -155,7 +156,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
 
        if ($value > 0) {
-               $content['your_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task\">".$value."</a>";
+               $content['your_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -164,7 +165,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['pending_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>";
+               $content['pending_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=unlock_emails%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -173,7 +174,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['canceled_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+               $content['canceled_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -182,7 +183,7 @@ function outputAdvancedOverview (&$result_main) {
        $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
 
        if ($value > 0) {
-               $content['send_emails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>";
+               $content['send_emails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_archiv%}">' . $value . '</a>';
        } // END - if
 
        //
@@ -193,7 +194,7 @@ function outputAdvancedOverview (&$result_main) {
                $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
 
                if ($value > 0) {
-                       $content['purged_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                       $content['purged_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
                } // END - if
 
                //
@@ -204,16 +205,16 @@ function outputAdvancedOverview (&$result_main) {
                        $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
 
                        if ($value > 0) {
-                               $content['purged_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                               $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'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
+                       $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
                } else {
-                       $content['purged_bonus_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_BONUS_404--}</span>";
+                       $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_BONUS_404--}</span>';
                }
        } else {
-               $content['purged_bonus_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>";
-               $content['purged_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>";
+               $content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+               $content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
        }
 
        //
@@ -224,12 +225,12 @@ function outputAdvancedOverview (&$result_main) {
                $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
 
                if ($value > 0) {
-                       $content['send_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+                       $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'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
+               $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
        } else {
-               $content['send_bonus_mails'] = getMessage('ADMIN_EXT_BONUS_404');
+               $content['send_bonus_mails'] = getMessage('ADMIN_EXTENSION_BONUS_404');
        }
 
        if (isExtensionActive('autopurge')) {
@@ -245,7 +246,7 @@ function outputAdvancedOverview (&$result_main) {
                if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
                if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
                if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
-               if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+               if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
                        $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
                } // END - if
@@ -322,7 +323,7 @@ ORDER BY
 
        if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
                // Active rallye
-               if (getExtensionVersion('bonus') >= '0.6.9') {
+               if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
                        // Add more bonus points here
                        $USE = '(0';
                        if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
@@ -357,7 +358,7 @@ ORDER BY
                $TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
        }
 
-       if ((isExtensionActive('beg')) && (getExtensionVersion('beg') >= '0.1.2')) {
+       if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
                // Begging rallye
 
                // Autopurge installed?
@@ -523,13 +524,13 @@ ORDER BY
 
        if (isExtensionActive('surfbar')) {
                // List all URLs in surfbar
-               addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `id` ASC");
+               addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC");
                $WHATs[]  = 'list_surfbar_urls';
                $DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL');
                $TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE');
 
                // List all pending URLs in surfbar
-               addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE `status`='PENDING' ORDER BY `id` ASC");
+               addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE `url_status`='PENDING' ORDER BY `url_id` ASC");
                $WHATs[]  = 'unlock_surfbar_urls';
                $DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING');
                $TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE');
@@ -574,11 +575,11 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                        );
 
                        // Rewrite CSS class if not last entry is reached
-                       if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom2';
+                       if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
 
                        if (($value > 0) && (!empty($WHATs[$key]))) {
                                if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
-                               $content['row_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
+                               $content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . $value . '</a>';
                        } else {
                                $content['row_link'] = '0';
                        }