X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=fe040c30e302ddb8e2e601f2599d7f388ddf1349;hb=0176313718a3887a7d833d578142ae41d3a06a15;hp=fb3bd33282d10f34a546ba848698092971b72dea;hpb=80fd77090250e200b2ec070a7f191aa5a260b7ff;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index fb3bd33282..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, + 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'), - SQL_ESCAPE($_GET['type']), - SQL_ESCAPE($_GET['image']) + 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%s/index.html", PATH, getConfig('usage_base')); -} else { - $file = sprintf("%s%s/usage_%s.html", - PATH, + } // END - if + shutdown(); +} elseif (isGetRequestParameterSet('usage')) { + $FQFN = sprintf("%s%s/usage_%s.html", + getPath(), getConfig('usage_base'), - SQL_ESCAPE($_GET['usage']) + getRequestParameter('usage') ); } -if ((!empty($file)) && (FILE_READABLE($file) { - // @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php - $tmpl_file = READ_FILE($file); - $tmpl_file = addslashes($tmpl_file); - $tmpl_file = "\$content=\"".$tmpl_file."\";"; - eval($tmpl_file); +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); + $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
plus trailing tag? - if ((strpos($test, " 0) && (strpos($test, "") > 0)) { + if ((strpos($test, ' 0) && (strpos($test, '') > 0)) { // Okay, then do so. $content = substr(substr($content, 0, $body_end), $body_start); - $content = substr($content, strpos($content, ">") + 1); + $content = substr($content, strpos($content, '>') + 1); } // END - if // Output code - OUTPUT_HTML("