X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=fe040c30e302ddb8e2e601f2599d7f388ddf1349;hb=9b93cb80c13ee59fbd935b2988127cf4a1135000;hp=b693fd86c89ec9828e51180767d94fd8082d814c;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index b693fd86c8..fe040c30e3 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -14,10 +14,9 @@
  * $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 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,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')
@@ -65,27 +70,22 @@ 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')
 	);
 }
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
-	// @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
-	eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
+	// @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
+	eval('$content="' . SQL_ESCAPE(readFromFile($FQFN)) . '";');
 	// Until here...
 
 	// Replace URLs
@@ -93,7 +93,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
 	$content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=daily&image='     , $content);
 	$content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=hourly&image='    , $content);
 	$content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=ctry&image='      , $content);
-	$content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&usage='                , str_replace('.html', '', $content));
+	$content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&usage='                    , str_replace('.html', '', $content));
 	$test = strtolower($content);
 
 	// Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -107,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'));
+	displayMessage('{--ADMIN_USAGE_DIRECTORY_404--}');
 }
 
 // [EOF]