X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-usage.php;h=10008b064ecf6d30cfbfd5339ffca463611489e5;hb=0d16dc908325fb9078d335e17f4e7c86b54eda7d;hp=57a3feeb32a7fbffecc577b715d88b5aa151fe13;hpb=2379934be6a196a54f4155bb8e24c49b20736969;p=mailer.git diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 57a3feeb32..10008b064e 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -59,8 +59,8 @@ if (isGetRequestElementSet('image')) { getConfig('usage_base') ); } else { - if (strpos(getRequestElement('image'), "\\") > 0) { - setGetRequestElement('image', substr(getRequestElement('image'), 0, strpos(getRequestElement('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", getPath(), @@ -76,7 +76,7 @@ if (isGetRequestElementSet('image')) { imagepng($image); imagedestroy($image); } // END - if - shutdown(); + doShutdown(); } elseif (isGetRequestElementSet('usage')) { $FQFN = sprintf("%s%s/usage_%s.html", getPath(), @@ -91,11 +91,28 @@ if ((!empty($FQFN)) && (isFileReadable($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)); + $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? @@ -108,7 +125,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) { // Output code outputHtml($content); } else { - // Nothing to load, then we have no directory 'usage' + // Nothing to load, then there is no directory 'usage' displayMessage('{--ADMIN_USAGE_DIRECTORY_404--}'); }