Renamed function so it might be more understandable

[mailer.git] / inc / libs / rewrite_functions.php

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index bf041ab195e064a2228764d524c930ef67fcad83..9c36f08677617f2f937340f403a84d4982896f1e 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -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