X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-logs.php;h=2c399f6f28fd8159a26b848428a8e2e4c5c3e4a9;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=385aa6fbdab0a3c0099060132693721767ba751f;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index 385aa6fbda..2c399f6f28 100644
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -14,10 +14,9 @@
  * $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                           *
+ * 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 *
@@ -39,43 +38,43 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestElementSet('access')) {
+if (isGetRequestParameterSet('access')) {
 	// Secure input and construct FQFN
-	$access = SQL_ESCAPE(secureString(getRequestElement('access')));
-	$target = sprintf("%slogs/%s", getConfig('PATH'), $access);
+	$access = SQL_ESCAPE(secureString(getRequestParameter('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');
+
+			// Clean content
+			clearOutputBuffer();
 		} elseif (substr($access, -3, 3) == '.gz') {
 			// @TODO Fix content-type here
 			sendHeader('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);
 
+			// Clean content
+			clearOutputBuffer();
+		} else {
 			// Output message
-			loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access));
 			return;
 		}
 
@@ -84,31 +83,28 @@ if (isGetRequestElementSet('access')) {
 		shutdown();
 	} else {
 		// Not readable!
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('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);
 
 			// Okay, add it
-			outputHtml('<li><a href="{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;access=' . urlencode($file) . '">' . $file . '</a></li>');
+			outputHtml('<li><a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;access=' . urlencode($file) . '%}">' . $file . '</a></li>');
 		} // END - foreach
 
 		// Finish list
 		outputHtml('</ol>');
 	} else {
 		// logs directory does not exist
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_LOGS_DIR_404--}');
 	}
 }