More wrapper functions used, removed bigintval() which caused a lot trouble

[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 d8a74e6fd99056db7424bbbe7d1be0acc232e4cf..cf5ba9b2ad9a6d14520798aa010801f7f44a51bc 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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 *
@@ -39,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -47,19 +46,25 @@ addMenuDescription('admin', __FILE__);
 // Base directory (should be moved to database)
 $usage = getConfig('usage_base') . '/';
 
-if (isGetRequestElementSet('image')) {
-       if (getRequestElement('type') == 'usage') {
+// Init FQFN
+$FQFN = sprintf("%s%s/index.html",
+       getPath(),
+       getConfig('usage_base')
+);
+
+if (isGetRequestParameterSet('image')) {
+       if (getRequestParameter('type') == 'usage') {
                $FQFN = sprintf("%s%s/usage.png",
-                       getConfig('PATH'),
+                       getPath(),
                        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'),
+                       getPath(),
                        getConfig('usage_base'),
-                       getRequestElement('type'),
-                       getRequestElement('image')
+                       getRequestParameter('type'),
+                       getRequestParameter('image')
                );
        }
 
@@ -70,33 +75,25 @@ if (isGetRequestElementSet('image')) {
                imagedestroy($image);
        }
        shutdown();
-} elseif (!isGetRequestElementSet('usage')) {
-       $FQFN = sprintf("%s%s/index.html",
-               getConfig('PATH'),
-               getConfig('usage_base')
-       );
-} else {
+} elseif (isGetRequestParameterSet('usage')) {
        $FQFN = sprintf("%s%s/usage_%s.html",
-               getConfig('PATH'),
+               getPath(),
                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&what='.getWhat().'&type=usage&image=usage', $content);
-       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=daily&image='     , $content);
-       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&what='.getWhat().'&type=hourly&image='    , $content);
-       $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));
-
-       // @TODO Disabled due to too much trouble
-       //$content = str_replace("HREF=\"http://", "href=\"{?URL?}/modules.php?module=loader&url=http://", $content);
+       $content = str_replace('usage.png'    , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=usage&image=usage', $content);
+       $content = str_replace('daily_usage_' , '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=daily&image='     , $content);
+       $content = str_replace('hourly_usage_', '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=hourly&image='    , $content);
+       $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));
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
@@ -110,8 +107,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, '{--ADMIN_USAGE_DIRECTORY_404--}');
 }
 
-//
+// [EOF]
 ?>