X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=fe040c30e302ddb8e2e601f2599d7f388ddf1349;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=65b2810ca7c01836232fa6005609c9ce52696f74;hpb=3594ba2ef6d12870b9e9a9c7fff63a8c0e587ca0;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 65b2810ca7..fe040c30e3 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -1,7 +1,7 @@ 0) $_GET['image'] = substr($_GET['image'], 0, strpos($_GET['image'], "\\")); - $file = sprintf("%s%s%s_usage_%s.png", PATH, $usage, SQL_ESCAPE($_GET['type']), SQL_ESCAPE($_GET['image'])); + if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\"))); + $FQFN = sprintf("%s%s/%s_usage_%s.png", + getPath(), + getConfig('usage_base'), + getRequestParameter('type'), + getRequestParameter('image') + ); } - if (FILE_READABLE($file)) { - $image = imagecreatefrompng($file); - header("Content-type: image/png"); + if (isFileReadable($FQFN)) { + $image = imagecreatefrompng($FQFN); + setContentType('image/png'); imagepng($image); imagedestroy($image); - } - exit(); -} elseif (empty($_GET['usage'])) { - $file = sprintf("%s%sindex.html", PATH, $usage); -} else { - $file = sprintf("%s%susage_%s.html", - PATH, - $usage, - SQL_ESCAPE($_GET['usage']) + } // END - if + shutdown(); +} elseif (isGetRequestParameterSet('usage')) { + $FQFN = sprintf("%s%s/usage_%s.html", + getPath(), + getConfig('usage_base'), + getRequestParameter('usage') ); } -if (!empty($file)) { - if (FILE_READABLE($file)) { - // @TODO This code is double, see functions.php, LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE - $tmpl_file = READ_FILE($file); - $tmpl_file = addslashes($tmpl_file); - $tmpl_file = "\$content=\"".$tmpl_file."\";"; - eval($tmpl_file); - // Double code until here +if ((!empty($FQFN)) && (isFileReadable($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=".$GLOBALS['what']."&type=usage&image=usage", $content); - $content = str_replace("daily_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content); - $content = str_replace("hourly_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content); - $content = str_replace("ctry_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content); - $content = str_replace("usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content)); - // Disabled due to too much trouble - //$content = str_replace("HREF=\"http://", "href=\"".URL."/modules.php?module=loader&url=http://", $content); - $test = strtolower($content); - $body_start = strpos($test, "
"); - if (($body_start > 0) && ($body_end > 0)) - { - $content = substr(substr($content, 0, $body_end), $body_start); - $content = substr($content, strpos($content, ">") + 1); - OUTPUT_HTML("