More HTML improvements

[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 d8a74e6fd99056db7424bbbe7d1be0acc232e4cf..b693fd86c89ec9828e51180767d94fd8082d814c 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -47,19 +47,19 @@ addMenuDescription('admin', __FILE__);
  // Base directory (should be moved to database)
  $usage = getConfig('usage_base') . '/';
  
-if (isGetRequestElementSet('image')) {
-       if (getRequestElement('type') == 'usage') {
+if (isGetRequestParameterSet('image')) {
+       if (getRequestParameter('type') == 'usage') {
                 $FQFN = sprintf("%s%s/usage.png",
                         getConfig('PATH'),
                         getConfig('usage_base')
                 );
         } else {
-               if (strpos(getRequestElement('image'), "\\") > 0) setRequestGetElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), "\\")));
+               if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\")));
                 $FQFN = sprintf("%s%s/%s_usage_%s.png",
                         getConfig('PATH'),
                         getConfig('usage_base'),
-                       getRequestElement('type'),
-                       getRequestElement('image')
+                       getRequestParameter('type'),
+                       getRequestParameter('image')
                 );
         }
  
@@ -70,7 +70,7 @@ if (isGetRequestElementSet('image')) {
                 imagedestroy($image);
         }
         shutdown();
-} elseif (!isGetRequestElementSet('usage')) {
+} elseif (!isGetRequestParameterSet('usage')) {
         $FQFN = sprintf("%s%s/index.html",
                 getConfig('PATH'),
                 getConfig('usage_base')
@@ -79,7 +79,7 @@ if (isGetRequestElementSet('image')) {
         $FQFN = sprintf("%s%s/usage_%s.html",
                 getConfig('PATH'),
                 getConfig('usage_base'),
-               getRequestElement('usage')
+               getRequestParameter('usage')
         );
  }
  
@@ -89,14 +89,11 @@ 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));
-
-       // @TODO Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&amp;url=http://", $content);
+       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=usage&amp;image=usage', $content);
+       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=daily&amp;image='     , $content);
+       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=hourly&amp;image='    , $content);
+       $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=ctry&amp;image='      , $content);
+       $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;usage='                , str_replace('.html', '', $content));
         $test = strtolower($content);
  
         // Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -110,8 +107,8 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         outputHtml($content);
  } else {
         // Nothing to load, then we have no directory 'usage'
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404'));
  }
  
-//
+// [EOF]
  ?>