]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/what-usage.php
projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Error fixed
[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 0af9eee3a811c12615a6bc8868c51cbc600e35ad..a4ed0b2622bb92ea1eb7d26d8f2e7e136878a6cb 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -48,16 +48,22 @@ addMenuDescription('admin', __FILE__);
 // Base directory (should be moved to database)
 $usage = getConfig('usage_base') . '/';
 
+// 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(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'),
                        getRequestParameter('type'),
                        getRequestParameter('image')
@@ -71,14 +77,9 @@ if (isGetRequestParameterSet('image')) {
                imagedestroy($image);
        }
        shutdown();
-} elseif (!isGetRequestParameterSet('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'),
                getRequestParameter('usage')
        );
@@ -94,7 +95,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        $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));
+       $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?
Mailer-Project repository