Again more fixes from bugtracker, thanks to profi-concept

[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 55d0bb06e3b86ade13f0859120acbc1d3f5c7e94..a5ce46945d6df2bd49cd4bc291a4646534fdf84e 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['access'])) {
        // Secure input and construct FQFN
@@ -48,21 +48,33 @@ if (!empty($_GET['access'])) {
        // Is the file valid and readable?
        if (FILE_READABLE($target)) {
                // Load it directly
-               $content = implode("", file($target));
+               $content = READ_FILE($target);
+
+               // Save old content
+               $OUTPUT = ob_get_contents();
+
+               // Clean content
+               ob_end_clean();
 
                // Set header
                if (substr($access, -3, 3) == "log") {
+                       // Output header
                        header("Content-Type: text/plain");
                } elseif (substr($access, -3, 3) == ".gz") {
+                       // @TODO Fix content-type here
+                       header("Content-Type: text/plain");
+               } elseif (substr($access, -3, 3) == ".bz2") {
+                       // @TODO Fix content-type here
                        header("Content-Type: text/plain");
                } else {
+                       // Restore old content
+                       OUTPUT_HTML($OUTPUT);
+
+                       // Output message
                        LOAD_TEMPLATE("admin_settings_saved", false, UNKNOWN_LOGFILE_FORMAT_1.$access.UNKNOWN_LOGFILE_FORMAT_2);
                        return;
                }
 
-               // Clean content
-               ob_end_clean();
-
                // Output the logfile's content and exit
                print($content);
                exit;
@@ -72,25 +84,23 @@ if (!empty($_GET['access'])) {
        }
 } else {
        // List access logfiles
-       $dir = PATH.LOGS_BASE."/";
+       $dir = PATH.getConfig('logs_base')."/";
        if (is_dir($dir)) {
                // logs directory does exist
-               OUTPUT_HTML("<OL>");
-               $handle = @opendir($dir) or mxchange_die("Cannot open directory ".LOGS_BASE."!");
-               while($file = @readdir($handle)) {
+               OUTPUT_HTML("<ol>");
+               $handle = opendir($dir) or mxchange_die("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=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</A></LI>");
+                               OUTPUT_HTML("<li><a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</a></li>");
                        }
                }
-               @closedir($handle);
-               OUTPUT_HTML("</OL>");
-       }
-        else
-       {
+               closedir($handle);
+               OUTPUT_HTML("</ol>");
+       } else {
                // logs directory does not exist
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LOGS_DIR_404_1.LOGS_BASE.ADMIN_LOGS_DIR_404_2);
+               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LOGS_DIR_404_1.getConfig('logs_base').ADMIN_LOGS_DIR_404_2);
        }
 }