X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=fe040c30e302ddb8e2e601f2599d7f388ddf1349;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=0f77c2730caa11d760d009ed4137b582a30540f8;hpb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 0f77c2730c..fe040c30e3 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -1,7 +1,7 @@ 0) REQUEST_SET_GET('image', substr(REQUEST_GET('image'), 0, strpos(REQUEST_GET('image'), "\\"))); + if (strpos(getRequestParameter('image'), "\\") > 0) setGetRequestParameter('image', substr(getRequestParameter('image'), 0, strpos(getRequestParameter('image'), "\\"))); $FQFN = sprintf("%s%s/%s_usage_%s.png", - constant('PATH'), - getConfig('usage_base'), - REQUEST_GET(('type')), - REQUEST_GET(('image')) + getPath(), + getConfig('usage_base'), + getRequestParameter('type'), + getRequestParameter('image') ); } if (isFileReadable($FQFN)) { $image = imagecreatefrompng($FQFN); - sendHeader("Content-type: image/png"); + setContentType('image/png'); imagepng($image); imagedestroy($image); - } + } // END - if shutdown(); -} elseif (!REQUEST_ISSET_GET(('usage'))) { - $FQFN = sprintf("%s%s/index.html", - constant('PATH'), - getConfig('usage_base') - ); -} else { +} elseif (isGetRequestParameterSet('usage')) { $FQFN = sprintf("%s%s/usage_%s.html", - constant('PATH'), - getConfig('usage_base'), - REQUEST_GET(('usage')) + getPath(), + getConfig('usage_base'), + getRequestParameter('usage') ); } if ((!empty($FQFN)) && (isFileReadable($FQFN))) { - // @TODO This code is double, see LOAD_TEMPLATE and LOAD_EMAIL_TEMPLATE in functions.php - $tmpl_file = readFromFile($FQFN); - $tmpl_file = SQL_ESCAPE($tmpl_file); - $tmpl_file = "\$content=\"".$tmpl_file."\";"; - eval($tmpl_file); + // @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("