Renamed function so it might be more understandable

[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 069171dd7126c82688c3cd0661d757ef9cdd13ab..a887b87616351074b99bf45f2189ea0de22ca22d 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -14,8 +14,6 @@
   * $Date::                                                            $ *
   * $Tag:: 0.2.1-FINAL                                                 $ *
   * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
   * -------------------------------------------------------------------- *
   * Copyright (c) 2003 - 2009 by Roland Haeder                           *
   * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,24 +38,30 @@
  // Some security stuff...
  if ((!defined('__SECURITY')) || (!isAdmin())) {
         die();
-}
+} // END - if
  
  // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
  
  // Base directory (should be moved to database)
  $usage = getConfig('usage_base') . '/';
  
+// Init FQFN
+$FQFN = sprintf("%s%s/index.html",
+       getPath(),
+       getConfig('usage_base')
+);
+
  if (isGetRequestParameterSet('image')) {
         if (getRequestParameter('type') == 'usage') {
                 $FQFN = sprintf("%s%s/usage.png",
-                       getConfig('PATH'),
+                       getPath(),
                         getConfig('usage_base')
                 );
         } else {
                 if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\")));
                 $FQFN = sprintf("%s%s/%s_usage_%s.png",
-                       getConfig('PATH'),
+                       getPath(),
                         getConfig('usage_base'),
                         getRequestParameter('type'),
                         getRequestParameter('image')
@@ -66,19 +70,14 @@ if (isGetRequestParameterSet('image')) {
  
         if (isFileReadable($FQFN)) {
                 $image = imagecreatefrompng($FQFN);
-               sendHeader('Content-Type: image/png');
+               setContentType('image/png');
                 imagepng($image);
                 imagedestroy($image);
-       }
+       } // END - if
         shutdown();
-} elseif (!isGetRequestParameterSet('usage')) {
-       $FQFN = sprintf("%s%s/index.html",
-               getConfig('PATH'),
-               getConfig('usage_base')
-       );
-} else {
+} elseif (isGetRequestParameterSet('usage')) {
         $FQFN = sprintf("%s%s/usage_%s.html",
-               getConfig('PATH'),
+               getPath(),
                 getConfig('usage_base'),
                 getRequestParameter('usage')
         );
@@ -94,7 +93,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         $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));
+       $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?
@@ -108,7 +107,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
         outputHtml($content);
  } else {
         // Nothing to load, then we have no directory 'usage'
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_USAGE_DIRECTORY_404--}');
  }
  
  // [EOF]