X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=a4ed0b2622bb92ea1eb7d26d8f2e7e136878a6cb;hb=07ec113b187228ba74b4b08966602c4a2c161d2c;hp=718ec0adf604ec25707f19886b8ecc41f5e0dc5b;hpb=2fcf6314278d4f1d3fe1af02e622a2b2c4134c2d;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 718ec0adf6..a4ed0b2622 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -39,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point addMenuDescription('admin', __FILE__); @@ -47,16 +48,22 @@ addMenuDescription('admin', __FILE__); // Base directory (should be moved to database) $usage = getConfig('usage_base') . '/'; +// Init FQFN +$FQFN = sprintf("%s%s/index.html", + getPath(), + getConfig('usage_base') +); + if (isGetRequestParameterSet('image')) { if (getRequestParameter('type') == 'usage') { $FQFN = sprintf("%s%s/usage.png", - getConfig('PATH'), + getPath(), getConfig('usage_base') ); } else { 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'), getRequestParameter('type'), getRequestParameter('image') @@ -70,14 +77,9 @@ if (isGetRequestParameterSet('image')) { imagedestroy($image); } shutdown(); -} elseif (!isGetRequestParameterSet('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'), getRequestParameter('usage') ); @@ -85,7 +87,7 @@ if (isGetRequestParameterSet('image')) { if ((!empty($FQFN)) && (isFileReadable($FQFN))) { // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php - eval("\$content=\"".SQL_ESCAPE(readFromFile($FQFN))."\";"); + eval('$content="' . SQL_ESCAPE(readFromFile($FQFN)) . '";'); // Until here... // Replace URLs @@ -93,7 +95,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { $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)); + $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? @@ -107,7 +109,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { outputHtml($content); } else { // Nothing to load, then we have no directory 'usage' - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USAGE_DIRECTORY_404')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_USAGE_DIRECTORY_404--}'); } // [EOF]