More HTML code swapped into templates (#68 again)

[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 c69492f710c279e2d39d7c2fffdc2268c314a0ee..6d244e9656a9866efe8595bac7e1c5a3c9cf43fe 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,17 +37,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
-if (REQUEST_ISSET_GET('access')) {
+if (isGetRequestElementSet('access')) {
        // Secure input and construct FQFN
-       $access = SQL_ESCAPE(strip_tags(REQUEST_GET('access')));
+       $access = SQL_ESCAPE(secureString(getRequestElement('access')));
        $target = sprintf("%slogs/%s", getConfig('PATH'), $access);
 
        // Is the file valid and readable?
@@ -73,10 +72,10 @@ if (REQUEST_ISSET_GET('access')) {
                        sendHeader('Content-Type: text/plain');
                } else {
                        // Restore old content
-                       OUTPUT_HTML($OUTPUT);
+                       outputHtml($OUTPUT);
 
                        // Output message
-                       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNKNOWN_LOGFILE_FORMAT'), $access));
                        return;
                }
 
@@ -85,13 +84,13 @@ if (REQUEST_ISSET_GET('access')) {
                shutdown();
        } else {
                // Not readable!
-               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
+               loadTemplate('admin_settings_saved', false, sprintf(getMessage('LOGFILE_NOT_READABLE'), $access));
        }
 } else {
        // Is the directory there?
        if (isDirectory(getConfig('PATH') . getConfig('logs_base'))) {
                // Logs directory does exist so begin the list
-               OUTPUT_HTML('<ol>');
+               outputHtml('<ol>');
 
                // Read all files
                $files = getArrayFromDirectory(getConfig('logs_base'), 'access');
@@ -102,14 +101,14 @@ if (REQUEST_ISSET_GET('access')) {
                        $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>");
+                       outputHtml('<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>');
+               outputHtml('</ol>');
        } else {
                // logs directory does not exist
-               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
+               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_LOGS_DIR_404'), getConfig('logs_base')));
        }
 }