X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=10008b064ecf6d30cfbfd5339ffca463611489e5;hb=00790481119eefa7a54a8dda1cb191fdf4f29226;hp=ed7f4adfb264a6669ed2fb591ea36b332a333f42;hpb=8e1fd7e3be3811cb108a074bece2eecd5bcced8f;p=mailer.git

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index ed7f4adfb2..10008b064e 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -52,21 +52,21 @@ $FQFN = sprintf("%s%s/index.html",
 	getConfig('usage_base')
 );
 
-if (isGetRequestParameterSet('image')) {
-	if (getRequestParameter('type') == 'usage') {
+if (isGetRequestElementSet('image')) {
+	if (getRequestElement('type') == 'usage') {
 		$FQFN = sprintf("%s%s/usage.png",
 			getPath(),
 			getConfig('usage_base')
 		);
 	} else {
-		if (strpos(getRequestParameter('image'), "\\") > 0) {
-			setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\")));
+		if (strpos(getRequestElement('image'), chr(92)) > 0) {
+			setGetRequestElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), chr(92))));
 		} // END - if
 		$FQFN = sprintf("%s%s/%s_usage_%s.png",
 			getPath(),
 			getConfig('usage_base'),
-			getRequestParameter('type'),
-			getRequestParameter('image')
+			getRequestElement('type'),
+			getRequestElement('image')
 		);
 	}
 
@@ -76,12 +76,12 @@ if (isGetRequestParameterSet('image')) {
 		imagepng($image);
 		imagedestroy($image);
 	} // END - if
-	shutdown();
-} elseif (isGetRequestParameterSet('usage')) {
+	doShutdown();
+} elseif (isGetRequestElementSet('usage')) {
 	$FQFN = sprintf("%s%s/usage_%s.html",
 		getPath(),
 		getConfig('usage_base'),
-		getRequestParameter('usage')
+		getRequestElement('usage')
 	);
 }
 
@@ -91,11 +91,28 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
 	// Until here...
 
 	// Replace URLs
-	$content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=usage&image=usage', $content);
-	$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(
+		// From:
+		array(
+			'usage.png',
+			'daily_usage_',
+			'hourly_usage_',
+			'ctry_usage_',
+			'usage_',
+			'.html',
+		),
+		// To:
+		array(
+			'{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=usage&image=usage',
+			'{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=daily&image=',
+			'{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=hourly&image=',
+			'{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=ctry&image=',
+			'{?URL?}/modules.php?module=admin&what=' . getWhat() . '&usage=',
+			'',
+		),
+		// Target to replace on:
+		$content
+	);
 	$test = strtolower($content);
 
 	// Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -108,7 +125,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
 	// Output code
 	outputHtml($content);
 } else {
-	// Nothing to load, then we have no directory 'usage'
+	// Nothing to load, then there is no directory 'usage'
 	displayMessage('{--ADMIN_USAGE_DIRECTORY_404--}');
 }