X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=b18804cc849a91ab3a4a3493719bfa07dfae004e;hb=5ef42cb239e9225f160f5963a718f14bc70a1866;hp=70d433eb40e1c04d0102118d95fcd1c9c458cb52;hpb=00797d46cc0b7e2c4e8c084eb4c6ac26cd0336e1;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 70d433eb40..b18804cc84 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'), chr(92)) > 0) { + setGetRequestElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('image'), chr(92)))); + } // END - if $FQFN = sprintf("%s%s/%s_usage_%s.png", - constant('PATH'), - getConfig('usage_base'), - REQUEST_GET(('type')), - REQUEST_GET(('image')) + getPath(), + getConfig('usage_base'), + getRequestElement('type'), + getRequestElement('image') ); } if (isFileReadable($FQFN)) { $image = imagecreatefrompng($FQFN); - sendHeader('Content-type: image/png'); + setContentType('image/png'); imagepng($image); imagedestroy($image); - } - shutdown(); -} elseif (!REQUEST_ISSET_GET(('usage'))) { - $FQFN = sprintf("%s%s/index.html", - constant('PATH'), - getConfig('usage_base') - ); -} else { + } // END - if + doShutdown(); +} elseif (isGetRequestElementSet('usage')) { $FQFN = sprintf("%s%s/usage_%s.html", - constant('PATH'), - getConfig('usage_base'), - REQUEST_GET(('usage')) + getPath(), + getConfig('usage_base'), + 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=".$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( + // From: + array( + 'usage.png', + 'daily_usage_', + 'hourly_usage_', + 'ctry_usage_', + 'usage_', + '.html', + ), + // To: + array( + '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=usage&image=usage', + '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=daily&image=', + '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=hourly&image=', + '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&type=ctry&image=', + '{?URL?}/modules.php?module=admin&what=' . getWhat() . '&usage=', + '', + ), + // Target to replace on: + $content + ); $test = strtolower($content); // Do we need to strip out above and including plus trailing tag? @@ -111,13 +123,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] ?>