Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[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 fbc84bf289552ea79a302c942c028b65496c3641..ee0ec97d5e74d81eb22f3933efca112229a81df7 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -50,7 +50,7 @@ $WHO = _ALL;
 $SQL2 = '';
 
 // Set offset an current page to default values
-if (!REQUEST_ISSET_GET('page'))   REQUEST_GET('page')   = "1";
+if (!REQUEST_ISSET_GET('page'))   REQUEST_SET_GET('page'  , '1');
 if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', getConfig('mails_page'));
 
 if ((EXT_IS_ACTIVE('bonus')) && ($WHO == getMessage('_ALL'))) {
@@ -96,12 +96,12 @@ if ((EXT_IS_ACTIVE('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
 
                        // Prepare content
                        $content = $bonus;
-                       $content['time']        = CREATE_FANCY_TIME($content['time']);
-                       $content['category']    = GET_CATEGORY($content['cat_id']);
+                       $content['time']        = createFancyTime($content['time']);
+                       $content['category']    = getCategory($content['cat_id']);
                        $content['receivers']   = str_replace(';', ", ", $content['receivers']);
-                       $content['type']        = TRANSLATE_POOL_TYPE($content['data_type']);
+                       $content['type']        = translatePoolType($content['data_type']);
                        $content['frametester'] = FRAMETESTER($content['url']);
-                       $content['timestamp']   = MAKE_DATETIME($content['timestamp'], "0");
+                       $content['timestamp']   = generateDateTime($content['timestamp'], '0');
 
                        // Load row template
                        $OUT .= LOAD_TEMPLATE("admin_list_notify_emails_row", true, $content);
@@ -109,7 +109,7 @@ if ((EXT_IS_ACTIVE('bonus')) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
 
                // Add navigation (without change box but with colspan=3)
                $content['nav'] = '';
-               if ($PAGES > 1) $content['nav'] = ADD_EMAIL_NAV($PAGES, getConfig('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;