Fixes for a lot bug tickets. (Sorry for lame comment)

[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 efffe465da0aa292b4742f59af0f252d2f93ea31..c229c552f28c4b83152ff08644d799773959f1b6 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
@@ -46,7 +46,7 @@ if (!empty($_GET['access'])) {
        $target = sprintf("%slogs/%s", PATH, $access);
 
        // Is the file valid and readable?
-       if ((file_exists($target)) && (is_readable($target))) {
+       if (FILE_READABLE($target)) {
                // Load it directly
                $content = implode("", file($target));
 
@@ -86,9 +86,7 @@ if (!empty($_GET['access'])) {
                }
                @closedir($handle);
                OUTPUT_HTML("</OL>");
-       }
-        else
-       {
+       } else {
                // logs directory does not exist
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LOGS_DIR_404_1.LOGS_BASE.ADMIN_LOGS_DIR_404_2);
        }