Way more usage of EL code:

[mailer.git] / inc / modules / admin / what-logs.php

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index 829bc839bad52f457e7c92aa847fe296b65bd41a..93e2d1c8f3d003613db432132b4ed0e6b971d48a 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -14,11 +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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,43 +38,43 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isGetRequestParameterSet('access')) {
        // Secure input and construct FQFN
        $access = SQL_ESCAPE(secureString(getRequestParameter('access')));
-       $target = sprintf("%slogs/%s", getConfig('PATH'), $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, getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access));
+                       displayMessage('{%message,ADMIN_UNKNOWN_LOGFILE_FORMAT=' . $access . '%}');
                        return;
                }
 
@@ -85,19 +83,16 @@ if (isGetRequestParameterSet('access')) {
                shutdown();
        } 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);
 
@@ -109,7 +104,7 @@ if (isGetRequestParameterSet('access')) {
                outputHtml('</ol>');
        } else {
                // logs directory does not exist
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_LOGS_DIR_404--}');
+               displayMessage('{--ADMIN_LOGS_DIR_404--}');
        }
 }