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 a2b8eb36a5036c07ecc8c069167b09ef0e907ab7..069171dd7126c82688c3cd0661d757ef9cdd13ab 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/15/2003 *
- * ===============                              Last change: 04/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/15/2003 *
+ * ===================                          Last change: 04/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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) setRequestGetElement('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,24 +80,21 @@ 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
-       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=usage&image=usage', $content);
-       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=daily&image='     , $content);
-       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=hourly&image='    , $content);
-       $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&type=ctry&image='      , $content);
-       $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;what='.getWhat().'&usage='                , str_replace('.html', '', $content));
-
-       // @TODO Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&amp;url=http://", $content);
+       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=usage&amp;image=usage', $content);
+       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=daily&amp;image='     , $content);
+       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=hourly&amp;image='    , $content);
+       $content = str_replace('ctry_usage_'  , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;type=ctry&amp;image='      , $content);
+       $content = str_replace('usage_'       , '{?URL?}/modules.php?module=admin&amp;what=' . getWhat() . '&amp;usage='                , str_replace('.html', '', $content));
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -110,8 +108,8 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        outputHtml($content);
 } else {
        // Nothing to load, then we have no directory 'usage'
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base')));
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404'));
 }
 
-//
+// [EOF]
 ?>