X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-logs.php;h=590242e06832b08ad6063c096dc306dd6fb429cb;hb=803b63e8ceff7392a9eae4992dd6e59c1da247cd;hp=b4e22c82340c6de86eea4b4dc00be395e281e6d1;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;p=mailer.git diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index b4e22c8234..590242e068 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -18,6 +18,7 @@ * 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 * @@ -44,36 +45,36 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // 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, getMaskedMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT', $access)); return; @@ -88,15 +89,12 @@ if (isGetRequestElementSet('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('
    '); // 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 +106,7 @@ if (isGetRequestElementSet('access')) { outputHtml('
'); } else { // logs directory does not exist - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LOGS_DIR_404')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_LOGS_DIR_404--}'); } }