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 a90fc640de3e64ae0bdf90c08e552a207abe9392..7d858559ddb223cda63404a7c4efc630da34a9fe 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -48,19 +48,19 @@ 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'),
-               getConfig('usage_base')
+                       constant('PATH'),
+                       getConfig('usage_base')
                 );
         } else {
                 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'),
-               REQUEST_GET(('type')),
-               REQUEST_GET(('image'))
+                       constant('PATH'),
+                       getConfig('usage_base'),
+                       REQUEST_GET('type'),
+                       REQUEST_GET('image')
                 );
         }
  
@@ -71,16 +71,16 @@ if (REQUEST_ISSET_GET(('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')
+               constant('PATH'),
+               getConfig('usage_base')
         );
  } else {
         $FQFN = sprintf("%s%s/usage_%s.html",
-       constant('PATH'),
-       getConfig('usage_base'),
-       REQUEST_GET(('usage'))
+               constant('PATH'),
+               getConfig('usage_base'),
+               REQUEST_GET('usage')
         );
  }
  
@@ -93,14 +93,14 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         // Until here...
  
         // Replace URLs
-       $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));
+       $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);
+       //$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?
@@ -111,9 +111,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         } // 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')));