Fixes for stripped HTML tags, and false warnings in debug log

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

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index fb3bd33282d10f34a546ba848698092971b72dea..ad6282107095ae8e410f9e5dc3bd4dc7a633d51f 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -43,53 +43,59 @@ ADD_DESCR("admin", __FILE__);
 // Base directory (should be moved to database)
 $usage = getConfig('usage_base')."/";
 
-if (!empty($_GET['image'])) {
-       if ($_GET['type'] == "usage") {
-               $file = sprintf("%s%s/usage.png", PATH, getConfig('usage_base'));
+if (REQUEST_ISSET_GET(('image'))) {
+       if (REQUEST_GET('type') == "usage") {
+               $FQFN = sprintf("%s%s/usage.png",
+                       constant('PATH'),
+                       getConfig('usage_base')
+               );
        } else {
-               if (strpos($_GET['image'], "\\") > 0) $_GET['image'] = substr($_GET['image'], 0, strpos($_GET['image'], "\\"));
-               $file = sprintf("%s%s/%s_usage_%s.png",
-                       PATH,
+               if (strpos(REQUEST_GET('image'), "\\") > 0) REQUEST_SET_GET('image', substr(REQUEST_GET('image'), 0, strpos(REQUEST_GET('image'), "\\")));
+               $FQFN = sprintf("%s%s/%s_usage_%s.png",
+                       constant('PATH'),
                        getConfig('usage_base'),
-                       SQL_ESCAPE($_GET['type']),
-                       SQL_ESCAPE($_GET['image'])
+                       REQUEST_GET(('type')),
+                       REQUEST_GET(('image'))
                );
        }
 
-       if (FILE_READABLE($file)) {
-               $image = imagecreatefrompng($file);
+       if (FILE_READABLE($FQFN)) {
+               $image = imagecreatefrompng($FQFN);
                header("Content-type: image/png");
                imagepng($image);
                imagedestroy($image);
        }
        exit();
-} elseif (empty($_GET['usage'])) {
-       $file = sprintf("%s%s/index.html", PATH, getConfig('usage_base'));
+} elseif (!REQUEST_ISSET_GET(('usage'))) {
+       $FQFN = sprintf("%s%s/index.html",
+               constant('PATH'),
+               getConfig('usage_base')
+       );
 } else {
-       $file = sprintf("%s%s/usage_%s.html",
-               PATH,
+       $FQFN = sprintf("%s%s/usage_%s.html",
+               constant('PATH'),
                getConfig('usage_base'),
-               SQL_ESCAPE($_GET['usage'])
+               REQUEST_GET(('usage'))
        );
 }
 
-if ((!empty($file)) && (FILE_READABLE($file) {
+if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
        // @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php
-       $tmpl_file = READ_FILE($file);
-       $tmpl_file = addslashes($tmpl_file);
+       $tmpl_file = READ_FILE($FQFN);
+       $tmpl_file = SQL_ESCAPE($tmpl_file);
        $tmpl_file = "\$content=\"".$tmpl_file."\";";
        eval($tmpl_file);
        // Until here...
 
        // Replace URLs
-       $content = str_replace("usage.png", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=usage&image=usage", $content);
-       $content = str_replace("daily_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
-       $content = str_replace("hourly_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
-       $content = str_replace("ctry_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
-       $content = str_replace("usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
+       $content = str_replace("usage.png", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=usage&image=usage", $content);
+       $content = str_replace("daily_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
+       $content = str_replace("hourly_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
+       $content = str_replace("ctry_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
+       $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
 
        // Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"".URL."/modules.php?module=loader&url=http://", $content);
+       //$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?