X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-logs.php;h=6d244e9656a9866efe8595bac7e1c5a3c9cf43fe;hb=16de7d9e8b98108627db01688bc095240b5ba8d2;hp=f2fded492112afa250a83e2ac3eeb04623e83c30;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850;p=mailer.git

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index f2fded4921..6d244e9656 100644
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -37,18 +37,17 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!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', __FILE__);
+addMenuDescription('admin', __FILE__);
 
-if (REQUEST_ISSET_GET('access')) {
+if (isGetRequestElementSet('access')) {
 	// Secure input and construct FQFN
-	$access = SQL_ESCAPE(strip_tags(REQUEST_GET('access')));
-	$target = sprintf("%slogs/%s", constant('PATH'), $access);
+	$access = SQL_ESCAPE(secureString(getRequestElement('access')));
+	$target = sprintf("%slogs/%s", getConfig('PATH'), $access);
 
 	// Is the file valid and readable?
 	if (isFileReadable($target)) {
@@ -73,10 +72,10 @@ if (REQUEST_ISSET_GET('access')) {
 			sendHeader('Content-Type: text/plain');
 		} else {
 			// Restore old content
-			OUTPUT_HTML($OUTPUT);
+			outputHtml($OUTPUT);
 
 			// Output message
-			LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
+			loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
 			return;
 		}
 
@@ -85,31 +84,33 @@ if (REQUEST_ISSET_GET('access')) {
 		shutdown();
 	} else {
 		// Not readable!
-		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
+		loadTemplate('admin_settings_saved', false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
 	}
 } else {
-	// List access logfiles
-	$dir = constant('PATH') . getConfig('logs_base') . '/';
-
 	// Is the directory there?
-	if (isDirectory($dir)) {
-		// logs directory does exist
-		OUTPUT_HTML("<ol>");
-		$handle = opendir($dir) or app_die(__FILE__, __LINE__, 'Cannot open directory '.getConfig('logs_base') . '!');
-		while ($file = readdir($handle)) {
-			// We currenly only like files with "access" as prefix, should be more flexible!
-			if (substr($file, 0, 6) == 'access') {
-				// Okay, let us print it out
-				OUTPUT_HTML("<li><a href=\"{!URL!}/modules.php?module=admin&amp;what=".getWhat()."&amp;access=".urlencode($file)."\">".$file."</a></li>");
-			}
-		}
-		closedir($handle);
-		OUTPUT_HTML("</ol>");
+	if (isDirectory(getConfig('PATH') . 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) {
+			// 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>');
+		} // END - foreach
+
+		// Finish list
+		outputHtml('</ol>');
 	} else {
 		// logs directory does not exist
-		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
+		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
 	}
 }
 
-//
+// [EOF]
 ?>