Even more rewrites/fixes from EL branch (please report any broken part after you...

[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 b64e5ec7f6301d94d9543ed946330ec5414f2010..069171dd7126c82688c3cd0661d757ef9cdd13ab 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,19 +48,19 @@ addMenuDescription('admin', __FILE__);
 // Base directory (should be moved to database)
 $usage = getConfig('usage_base') . '/';
 
-if (isGetRequestElementSet('image')) {
-       if (getRequestElement('type') == 'usage') {
+if (isGetRequestParameterSet('image')) {
+       if (getRequestParameter('type') == 'usage') {
                $FQFN = sprintf("%s%s/usage.png",
                        getConfig('PATH'),
                        getConfig('usage_base')
                );
        } else {
-               if (strpos(getRequestElement('image'), "\\") > 0) setGetRequestElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), "\\")));
+               if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\")));
                $FQFN = sprintf("%s%s/%s_usage_%s.png",
                        getConfig('PATH'),
                        getConfig('usage_base'),
-                       getRequestElement('type'),
-                       getRequestElement('image')
+                       getRequestParameter('type'),
+                       getRequestParameter('image')
                );
        }
 
@@ -70,7 +71,7 @@ if (isGetRequestElementSet('image')) {
                imagedestroy($image);
        }
        shutdown();
-} elseif (!isGetRequestElementSet('usage')) {
+} elseif (!isGetRequestParameterSet('usage')) {
        $FQFN = sprintf("%s%s/index.html",
                getConfig('PATH'),
                getConfig('usage_base')
@@ -79,13 +80,13 @@ if (isGetRequestElementSet('image')) {
        $FQFN = sprintf("%s%s/usage_%s.html",
                getConfig('PATH'),
                getConfig('usage_base'),
-               getRequestElement('usage')
+               getRequestParameter('usage')
        );
 }
 
 if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
-       // @TODO This code is double, see LOAD_TEMPLATE and loadEmailTemplate in functions.php
-       eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";");
+       // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
+       eval('$content="' . SQL_ESCAPE(readFromFile($FQFN)) . '";');
        // Until here...
 
        // Replace URLs