X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=09da0a61ee5b991fc1c2a9ca447fe2d6f92f20ea;hp=9fcbcaaeb49b1841b10778ecc294397862d41271;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 9fcbcaaeb4..09da0a61ee 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -38,61 +38,80 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Base directory (should be moved to database)
-$usage = "usage/";
+$usage = getConfig('usage_base')."/";
 
 if (!empty($_GET['image'])) {
 	if ($_GET['type'] == "usage") {
-		$file = sprintf("%s%susage.png", PATH, $usage);
+		$FQFN = sprintf("%s%s/usage.png",
+			constant('PATH'),
+			getConfig('usage_base')
+		);
 	} else {
 		if (strpos($_GET['image'], "\\") > 0) $_GET['image'] = substr($_GET['image'], 0, strpos($_GET['image'], "\\"));
-		$file = sprintf("%s%s%s_usage_%s.png", PATH, $usage, SQL_ESCAPE($_GET['type']), SQL_ESCAPE($_GET['image']));
+		$FQFN = sprintf("%s%s/%s_usage_%s.png",
+			constant('PATH'),
+			getConfig('usage_base'),
+			SQL_ESCAPE($_GET['type']),
+			SQL_ESCAPE($_GET['image'])
+		);
 	}
 
-	if (FILE_READABLE($file)) {
-		$image = imagecreatefrompng($file);
+	if (FILE_READABLE($FQFN)) {
+		$image = imagecreatefrompng($FQFN);
 		header("Content-type: image/png");
 		imagepng($image);
 		imagedestroy($image);
 	}
 	exit();
 } elseif (empty($_GET['usage'])) {
-	$file = sprintf("%s%sindex.html", PATH, $usage);
+	$FQFN = sprintf("%s%s/index.html",
+		constant('PATH'),
+		getConfig('usage_base')
+	);
 } else {
-	$file = sprintf("%s%susage_%s.html",
-		PATH,
-		$usage,
+	$FQFN = sprintf("%s%s/usage_%s.html",
+		constant('PATH'),
+		getConfig('usage_base'),
 		SQL_ESCAPE($_GET['usage'])
 	);
 }
 
-if (!empty($file)) {
-	if (FILE_READABLE($file)) {
-			$tmpl_file = implode("", file($file));
-			$tmpl_file = addslashes($tmpl_file);
-			$tmpl_file = "\$content=\"".$tmpl_file."\";";
-			eval($tmpl_file);
-			$content = str_replace("usage.png", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=usage&image=usage", $content);
-			$content = str_replace("daily_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
-			$content = str_replace("hourly_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
-			$content = str_replace("ctry_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
-			$content = str_replace("usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
-			// Disabled due to too much trouble
-			//$content = str_replace("HREF=\"http://", "href=\"".URL."/modules.php?module=loader&url=http://", $content);
-			$test = strtolower($content);
-			$body_start = strpos($test, "<body");
-			$body_end   = strpos($test, "</body>");
-			if (($body_start > 0) && ($body_end > 0))
-			{
-				$content = substr(substr($content, 0, $body_end), $body_start);
-				$content = substr($content, strpos($content, ">") + 1);
-				OUTPUT_HTML("<DIV align=\"left\">
+if ((!empty($FQFN)) && (FILE_READABLE($FQFN))) {
+	// @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php
+	$tmpl_file = READ_FILE($FQFN);
+	$tmpl_file = SQL_ESCAPE($tmpl_file);
+	$tmpl_file = "\$content=\"".$tmpl_file."\";";
+	eval($tmpl_file);
+	// Until here...
+
+	// Replace URLs
+	$content = str_replace("usage.png", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=usage&image=usage", $content);
+	$content = str_replace("daily_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=daily&image=", $content);
+	$content = str_replace("hourly_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=hourly&image=", $content);
+	$content = str_replace("ctry_usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&type=ctry&image=", $content);
+	$content = str_replace("usage_", "{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
+
+	// Disabled due to too much trouble
+	//$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&amp;url=http://", $content);
+	$test = strtolower($content);
+
+	// Do we need to strip out above and including <body> plus trailing </html> tag?
+	if ((strpos($test, "<body") > 0) && (strpos($test, "</body>") > 0)) {
+		// Okay, then do so.
+		$content = substr(substr($content, 0, $body_end), $body_start);
+		$content = substr($content, strpos($content, ">") + 1);
+	} // END - if
+
+	// Output code
+	OUTPUT_HTML("<div align=\"left\">
   ".$content."
-</DIV>");
-			}
-	}
+</div>");
+} else {
+	// Nothing to load, then we have no directory "usage"
+	LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_USAGE_DIRECTORY_404, getConfig('usage_base')));
 }
 
 //