Heavy rewrite:

[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 bd1a7e0378db7f35c3d1bf29b8d66abc094c1b17..7d858559ddb223cda63404a7c4efc630da34a9fe 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -48,7 +48,7 @@ ADD_DESCR('admin', __FILE__);
  // Base directory (should be moved to database)
  $usage = getConfig('usage_base') . '/';
  
-if (REQUEST_ISSET_GET(('image'))) {
+if (REQUEST_ISSET_GET('image')) {
         if (REQUEST_GET('type') == 'usage') {
                 $FQFN = sprintf("%s%s/usage.png",
                         constant('PATH'),
@@ -59,19 +59,19 @@ if (REQUEST_ISSET_GET(('image'))) {
                 $FQFN = sprintf("%s%s/%s_usage_%s.png",
                         constant('PATH'),
                         getConfig('usage_base'),
-                       REQUEST_GET(('type')),
-                       REQUEST_GET(('image'))
+                       REQUEST_GET('type'),
+                       REQUEST_GET('image')
                 );
         }
  
         if (isFileReadable($FQFN)) {
                 $image = imagecreatefrompng($FQFN);
-               sendHeader("Content-type: image/png");
+               sendHeader('Content-type: image/png');
                 imagepng($image);
                 imagedestroy($image);
         }
         shutdown();
-} elseif (!REQUEST_ISSET_GET(('usage'))) {
+} elseif (!REQUEST_ISSET_GET('usage')) {
         $FQFN = sprintf("%s%s/index.html",
                 constant('PATH'),
                 getConfig('usage_base')
@@ -80,7 +80,7 @@ if (REQUEST_ISSET_GET(('image'))) {
         $FQFN = sprintf("%s%s/usage_%s.html",
                 constant('PATH'),
                 getConfig('usage_base'),
-               REQUEST_GET(('usage'))
+               REQUEST_GET('usage')
         );
  }
  
@@ -93,27 +93,25 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         // Until here...
  
         // Replace URLs
-       $content = str_replace("usage.png", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=usage&image=usage", $content);
-       $content = str_replace("daily_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=daily&image=", $content);
-       $content = str_replace("hourly_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=hourly&image=", $content);
-       $content = str_replace("ctry_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=ctry&image=", $content);
-       $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&usage=", str_replace(".html", '', $content));
+       $content = str_replace('usage.png'    , '{!URL!}/modules.php?module=admin&amp;what='.getWhat().'&type=usage&image=usage', $content);
+       $content = str_replace('daily_usage_' , '{!URL!}/modules.php?module=admin&amp;what='.getWhat().'&type=daily&image='     , $content);
+       $content = str_replace('hourly_usage_', '{!URL!}/modules.php?module=admin&amp;what='.getWhat().'&type=hourly&image='    , $content);
+       $content = str_replace('ctry_usage_'  , '{!URL!}/modules.php?module=admin&amp;what='.getWhat().'&type=ctry&image='      , $content);
+       $content = str_replace('usage_'       , '{!URL!}/modules.php?module=admin&amp;what='.getWhat().'&usage='                , str_replace('.html', '', $content));
  
         // Disabled due to too much trouble
         //$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&amp;url=http://", $content);
         $test = strtolower($content);
  
         // Do we need to strip out above and including <body> plus trailing </html> tag?
-       if ((strpos($test, "<body") > 0) && (strpos($test, "</body>") > 0)) {
+       if ((strpos($test, '<body') > 0) && (strpos($test, '</body>') > 0)) {
                 // Okay, then do so.
                 $content = substr(substr($content, 0, $body_end), $body_start);
-               $content = substr($content, strpos($content, ">") + 1);
+               $content = substr($content, strpos($content, '>') + 1);
         } // END - if
  
         // Output code
-       OUTPUT_HTML("<div align=\"left\">
-  ".$content."
-</div>");
+       OUTPUT_HTML($content);
  } else {
         // Nothing to load, then we have no directory 'usage'
         LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));