X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-logs.php;h=23c10716c380ae20cdf4bae5db7143795314d5f4;hp=b4e22c82340c6de86eea4b4dc00be395e281e6d1;hb=155492a5b96cec674846973a8524238b0365a848;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index b4e22c8234..23c10716c3 100644
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -39,64 +38,61 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isGetRequestElementSet('access')) {
 	// Secure input and construct FQFN
-	$access = SQL_ESCAPE(secureString(getRequestElement('access')));
-	$target = sprintf("%slogs/%s", getConfig('PATH'), $access);
+	$access = sqlEscapeString(getRequestElement('access'));
+	$target = sprintf("%slogs/%s", getPath(), $access);
 
 	// Is the file valid and readable?
 	if (isFileReadable($target)) {
 		// Load it directly
 		$content = readFromFile($target);
 
-		// Save old content
-		$OUTPUT = ob_get_contents();
-
-		// Clean content
-		clearOutputBuffer();
-
 		// Set header
 		if (substr($access, -3, 3) == 'log') {
 			// Output header
-			sendHeader('Content-Type: text/plain');
+			addHttpHeader('Content-Type: text/plain');
+
+			// Clean content
+			clearOutputBuffer();
 		} elseif (substr($access, -3, 3) == '.gz') {
 			// @TODO Fix content-type here
-			sendHeader('Content-Type: text/plain');
+			addHttpHeader('Content-Type: text/plain');
+
+			// Clean content
+			clearOutputBuffer();
 		} elseif (substr($access, -3, 3) == '.bz2') {
 			// @TODO Fix content-type here
-			sendHeader('Content-Type: text/plain');
-		} else {
-			// Restore old content
-			outputHtml($OUTPUT);
+			addHttpHeader('Content-Type: text/plain');
 
+			// Clean content
+			clearOutputBuffer();
+		} else {
 			// Output message
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access));
+			displayMessage('{%message,ADMIN_UNKNOWN_LOGFILE_FORMAT=' . $access . '%}');
 			return;
 		}
 
 		// Output the logfile's content and exit
 		print($content);
-		shutdown();
+		doShutdown();
 	} else {
 		// Not readable!
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('LOGFILE_NOT_READABLE', $access));
+		displayMessage('{%message,LOGFILE_NOT_READABLE=' . $access . '%}');
 	}
 } else {
 	// Is the directory there?
-	if (isDirectory(getConfig('PATH') . getConfig('logs_base'))) {
+	if (isDirectory(getPath() . getConfig('logs_base'))) {
 		// Logs directory does exist so begin the list
 		outputHtml('<ol>');
 
 		// Read all files
-		$files = getArrayFromDirectory(getConfig('logs_base'), 'access');
-
-		// And walk through them
-		foreach ($files as $file) {
+		foreach (getArrayFromDirectory(getConfig('logs_base'), 'access') as $file) {
 			// Cut dirname away
 			$file = basename($file);
 
@@ -108,7 +104,7 @@ if (isGetRequestElementSet('access')) {
 		outputHtml('</ol>');
 	} else {
 		// logs directory does not exist
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LOGS_DIR_404'));
+		displayMessage('{--ADMIN_LOGS_DIR_404--}');
 	}
 }