X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=70df56b23fe2132883c9a322e24db3954072b1db;hb=93ccd79d1a3fcb1ee5a101cb6bb670901f154555;hp=97b0e6f1b61e130eeedf94a475522104a91d09d5;hpb=66b91ce490ab549425619c95fc12086e126d541b;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 97b0e6f1b6..70df56b23f 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(getRequestElement('image'), "\\") > 0) { + setGetRequestElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), "\\"))); + } // END - if $FQFN = sprintf("%s%s/%s_usage_%s.png", - getConfig('PATH'), + getPath(), getConfig('usage_base'), - REQUEST_GET('type'), - REQUEST_GET('image') + getRequestElement('type'), + getRequestElement('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", - getConfig('PATH'), - getConfig('usage_base') - ); -} else { +} elseif (isGetRequestElementSet('usage')) { $FQFN = sprintf("%s%s/usage_%s.html", - getConfig('PATH'), + getPath(), getConfig('usage_base'), - REQUEST_GET('usage') + getRequestElement('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='.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)); - - // 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? @@ -111,11 +106,11 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { } // END - if // Output code - OUTPUT_HTML($content); + outputHtml($content); } else { // Nothing to load, then we have no directory 'usage' - LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_USAGE_DIRECTORY_404'), getConfig('usage_base'))); + displayMessage('{--ADMIN_USAGE_DIRECTORY_404--}'); } -// +// [EOF] ?>