Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[mailer.git] / inc / modules / admin / what-usage.php

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 97b0e6f1b61e130eeedf94a475522104a91d09d5..a2b8eb36a5036c07ecc8c069167b09ef0e907ab7 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.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,41 +37,40 @@
  ************************************************************************/
 
 // 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__);
 
 // Base directory (should be moved to database)
 $usage = getConfig('usage_base') . '/';
 
-if (REQUEST_ISSET_GET('image')) {
-       if (REQUEST_GET('type') == 'usage') {
+if (isGetRequestElementSet('image')) {
+       if (getRequestElement('type') == 'usage') {
                $FQFN = sprintf("%s%s/usage.png",
                        getConfig('PATH'),
                        getConfig('usage_base')
                );
        } else {
-               if (strpos(REQUEST_GET('image'), "\\") > 0) REQUEST_SET_GET('image', substr(REQUEST_GET('image'), 0, strpos(REQUEST_GET('image'), "\\")));
+               if (strpos(getRequestElement('image'), "\\") > 0) setRequestGetElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), "\\")));
                $FQFN = sprintf("%s%s/%s_usage_%s.png",
                        getConfig('PATH'),
                        getConfig('usage_base'),
-                       REQUEST_GET('type'),
-                       REQUEST_GET('image')
+                       getRequestElement('type'),
+                       getRequestElement('image')
                );
        }
 
        if (isFileReadable($FQFN)) {
                $image = imagecreatefrompng($FQFN);
-               sendHeader('Content-type: image/png');
+               sendHeader('Content-Type: image/png');
                imagepng($image);
                imagedestroy($image);
        }
        shutdown();
-} elseif (!REQUEST_ISSET_GET('usage')) {
+} elseif (!isGetRequestElementSet('usage')) {
        $FQFN = sprintf("%s%s/index.html",
                getConfig('PATH'),
                getConfig('usage_base')
@@ -80,16 +79,13 @@ if (REQUEST_ISSET_GET('image')) {
        $FQFN = sprintf("%s%s/usage_%s.html",
                getConfig('PATH'),
                getConfig('usage_base'),
-               REQUEST_GET('usage')
+               getRequestElement('usage')
        );
 }
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
-       // @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php
-       $tmpl_file = readFromFile($FQFN);
-       $tmpl_file = SQL_ESCAPE($tmpl_file);
-       $tmpl_file = "\$content=\"".$tmpl_file."\";";
-       eval($tmpl_file);
+       // @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
+       eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
        // Until here...
 
        // Replace URLs
@@ -99,7 +95,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=ctry&image='      , $content);
        $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&what='.getWhat().'&usage='                , str_replace('.html', '', $content));
 
-       // Disabled due to too much trouble
+       // @TODO Disabled due to too much trouble
        //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&url=http://", $content);
        $test = strtolower($content);
 
@@ -111,10 +107,10 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        } // END - if
 
        // Output code
-       OUTPUT_HTML($content);
+       outputHtml($content);
 } else {
        // Nothing to load, then we have no directory 'usage'
-       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
+       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
 }
 
 //