X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=1ff86f45f9fc1816818da5a8987539ad87cfb4ef;hb=6bb119cb426a2ab3998a5c3dfe250d748f786a1c;hp=d8a74e6fd99056db7424bbbe7d1be0acc232e4cf;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index d8a74e6fd9..1ff86f45f9 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,19 +48,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'),
+			getPath(),
 			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'),
+			getPath(),
 			getConfig('usage_base'),
-			getRequestElement('type'),
-			getRequestElement('image')
+			getRequestParameter('type'),
+			getRequestParameter('image')
 		);
 	}
 
@@ -70,33 +71,30 @@ if (isGetRequestElementSet('image')) {
 		imagedestroy($image);
 	}
 	shutdown();
-} elseif (!isGetRequestElementSet('usage')) {
+} elseif (!isGetRequestParameterSet('usage')) {
 	$FQFN = sprintf("%s%s/index.html",
-		getConfig('PATH'),
+		getPath(),
 		getConfig('usage_base')
 	);
 } else {
 	$FQFN = sprintf("%s%s/usage_%s.html",
-		getConfig('PATH'),
+		getPath(),
 		getConfig('usage_base'),
-		getRequestElement('usage')
+		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
-	$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));
-
-	// @TODO Disabled due to too much trouble
-	//$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&url=http://", $content);
+	$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));
 	$test = strtolower($content);
 
 	// Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -110,8 +108,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, '{--ADMIN_USAGE_DIRECTORY_404--}');
 }
 
-//
+// [EOF]
 ?>