Several more constants rewritten to getConfig()

[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 f2fded492112afa250a83e2ac3eeb04623e83c30..c69492f710c279e2d39d7c2fffdc2268c314a0ee 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -48,7 +48,7 @@ ADD_DESCR('admin', __FILE__);
 if (REQUEST_ISSET_GET('access')) {
        // Secure input and construct FQFN
        $access = SQL_ESCAPE(strip_tags(REQUEST_GET('access')));
-       $target = sprintf("%slogs/%s", constant('PATH'), $access);
+       $target = sprintf("%slogs/%s", getConfig('PATH'), $access);
 
        // Is the file valid and readable?
        if (isFileReadable($target)) {
@@ -88,28 +88,30 @@ if (REQUEST_ISSET_GET('access')) {
                LOAD_TEMPLATE('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
+               OUTPUT_HTML('<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
+                       OUTPUT_HTML("<li><a href=\"{?URL?}/modules.php?module=admin&amp;what=".getWhat()."&amp;access=".urlencode($file)."\">".$file."</a></li>");
+               } // END - foreach
+
+               // Finish list
+               OUTPUT_HTML('</ol>');
        } else {
                // logs directory does not exist
                LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
        }
 }
 
-//
+// [EOF]
 ?>