Possible fix for error 'Empty delimiter,errfile=wrapper-functions.php,errline=1050'

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

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index bf041ab195e064a2228764d524c930ef67fcad83..ae1854d4d2289ff2afb853884b96c80d37b3b5a7 100644 (file)
--- 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 *
@@ -44,24 +42,26 @@ if (!defined('__SECURITY')) {
 
 // Rewrite links in HTML for better SEO (ugly part of mx!)
 function rewriteLinksInCode ($code) {
-       // Skip rewriting for configured modules
-       if (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false) return $code;
+       // Skip rewriting for configured or empty modules
+       if ((getModule() == '') || (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false)) {
+               return $code;
+       } // END - if
 
        // 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