A lot fixes to templates and missing functions added, more rewrites

[mailer.git] / inc / modules / admin / what-list_notifications.php

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index 61a085d77aece3d9863d79172e6f20f75e7207f9..cfee49da761ff398d7acf51f37e98f644e95e15c 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -38,21 +38,21 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Init variables
 $WHO = _ALL;
 $SQL2 = "";
 
 // Set offset an current page to default values
-if (empty($_GET['page']))   $_GET['page']   = "1";
-if (empty($_GET['offset'])) $_GET['offset'] = $_CONFIG['mails_page'];
+if (!REQUEST_ISSET_GET(('page')))   REQUEST_GET('page')   = "1";
+if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
-if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
+if ((EXT_IS_ACTIVE("bonus")) && ($WHO == getMessage('_ALL'))) {
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
-FROM "._MYSQL_PREFIX."_bonus
+FROM `{!_MYSQL_PREFIX!}_bonus`
 WHERE is_notify='Y'
 ORDER BY timestamp DESC";
 
@@ -63,7 +63,7 @@ ORDER BY timestamp DESC";
 }
 
 // Create limitation line
-$ADD = " LIMIT ".(bigintval($_GET['offset']) * bigintval($_GET['page']) - bigintval($_GET['offset'])).", ".bigintval($_GET['offset']);
+$ADD = " LIMIT ".(bigintval(REQUEST_GET('offset')) * bigintval(REQUEST_GET('page')) - bigintval(REQUEST_GET('offset'))).", ".bigintval(REQUEST_GET('offset'));
 
 // Add limitation
 if (!empty($SQL2)) $SQL2 .= $ADD;
@@ -75,7 +75,7 @@ if ((EXT_IS_ACTIVE("bonus")) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
        // Load bonus mails only when extension is active
        if (SQL_NUMROWS($result_bonus) > 0) {
                // Calculate pages
-               $PAGES = round(SQL_NUMROWS($result_bonus) / $_CONFIG['mails_page'] + 0.5);
+               $PAGES = round(SQL_NUMROWS($result_bonus) / getConfig('mails_page') + 0.5);
 
                // List emails
                $OUT = ""; $content = array();
@@ -86,7 +86,7 @@ if ((EXT_IS_ACTIVE("bonus")) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
-                               $bonus['unconfirmed'] = "<STRONG><A href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</A></STRONG>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
                        } // END - if
 
                        // Prepare content
@@ -99,12 +99,12 @@ if ((EXT_IS_ACTIVE("bonus")) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
                        $content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
 
                        // Load row template
-                       $OUT .= LOAD_TEMPLATE("admin_list_bonus_emails_row", true, $content);
+                       $OUT .= LOAD_TEMPLATE("admin_list_notify_emails_row", true, $content);
                }
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = "";
-               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, $_CONFIG['mails_page'], false, "3", true);
+               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('mails_page'), false, "3", true);
 
                // Prepare content
                $content['rows'] = $OUT;