X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=a887b87616351074b99bf45f2189ea0de22ca22d;hp=a2b8eb36a5036c07ecc8c069167b09ef0e907ab7;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index a2b8eb36a5..a887b87616 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -1,7 +1,7 @@ 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') ); } if (isFileReadable($FQFN)) { $image = imagecreatefrompng($FQFN); - sendHeader('Content-Type: image/png'); + setContentType('image/png'); imagepng($image); imagedestroy($image); - } + } // END - if 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 plus trailing 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] ?>