X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=a2b8eb36a5036c07ecc8c069167b09ef0e907ab7;hp=4046acd7536c21c8906698aacfb45142eacb307f;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=4ef4c88fc481335dc0631b223111c15a84cccb51

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 4046acd753..a2b8eb36a5 100644
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Automatische Erkennung der Aufrufstatistiken     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,71 +37,81 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
 // Base directory (should be moved to database)
-$usage = "usage/";
-
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
+$usage = getConfig('usage_base') . '/';
 
-if (!empty($_GET['image'])) {
-	if ($_GET['type'] == "usage") {
-		$file = sprintf("%s%susage.png", PATH, $usage);
+if (isGetRequestElementSet('image')) {
+	if (getRequestElement('type') == 'usage') {
+		$FQFN = sprintf("%s%s/usage.png",
+			getConfig('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']));
+		if (strpos(getRequestElement('image'), "\\") > 0) setRequestGetElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), "\\")));
+		$FQFN = sprintf("%s%s/%s_usage_%s.png",
+			getConfig('PATH'),
+			getConfig('usage_base'),
+			getRequestElement('type'),
+			getRequestElement('image')
+		);
 	}
 
-	if (FILE_READABLE($file)) {
-		$image = imagecreatefrompng($file);
-		header("Content-type: image/png");
+	if (isFileReadable($FQFN)) {
+		$image = imagecreatefrompng($FQFN);
+		sendHeader('Content-Type: image/png');
 		imagepng($image);
 		imagedestroy($image);
 	}
-	exit();
-} elseif (empty($_GET['usage'])) {
-	$file = sprintf("%s%sindex.html", PATH, $usage);
+	shutdown();
+} elseif (!isGetRequestElementSet('usage')) {
+	$FQFN = sprintf("%s%s/index.html",
+		getConfig('PATH'),
+		getConfig('usage_base')
+	);
 } else {
-	$file = sprintf("%s%susage_%s.html",
-		PATH,
-		$usage,
-		SQL_ESCAPE($_GET['usage'])
+	$FQFN = sprintf("%s%s/usage_%s.html",
+		getConfig('PATH'),
+		getConfig('usage_base'),
+		getRequestElement('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\">
-  ".$content."
-</DIV>");
-			}
-	}
+if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
+	// @TODO This code is double, see LOAD_TEMPLATE 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&amp;what='.getWhat().'&type=usage&image=usage', $content);
+	$content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=daily&image='     , $content);
+	$content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=hourly&image='    , $content);
+	$content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=ctry&image='      , $content);
+	$content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;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&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
+	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')));
 }
 
-CLOSE_TABLE();
 //
 ?>