X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frewrite_functions.php;h=6f0acf594653d81f2512124113170dd2e6027daf;hb=24dfd21baed6a9a112992bdabf7da96576012bc4;hp=bf041ab195e064a2228764d524c930ef67fcad83;hpb=9642d17a028f3e7fdc57fa12e5dbd7129f166816;p=mailer.git diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php index bf041ab195..6f0acf5946 100644 --- a/inc/libs/rewrite_functions.php +++ b/inc/libs/rewrite_functions.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -48,20 +46,20 @@ function rewriteLinksInCode ($code) { if (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false) return $code; // Generate target URL - $target = getConfig('URL') . '/cms/'; + $target = getUrl() . '/cms/'; // Convert modules.php?module=... - foreach (array(getConfig('URL'), '{?URL?}') as $rewrite) { + foreach (array(getUrl(), '{?URL?}') as $rewrite) { $code = str_replace($rewrite . '/modules.php?module=', $target, $code); } // END - foreach // Do we have an URL linked to mxchange.org? - if (isInStringIgnoreCase(getConfig('SERVER_URL'), $code)) { + if (isInStringIgnoreCase(getServerUrl(), $code)) { // Convert URLs from my server - $code = str_replace('{?URL?}/modules.php?module=', getConfig('SERVER_URL') . '/cms/', $code); + $code = str_replace('{?URL?}/modules.php?module=', getServerUrl() . '/cms/', $code); // Convert URLs from my server - $code = str_replace(getConfig('URL') . '/modules.php?module=', getConfig('SERVER_URL') . '/cms/', $code); + $code = str_replace(getUrl() . '/modules.php?module=', getServerUrl() . '/cms/', $code); } // END - if // Strip slashes as above for the main URL