X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frewrite_functions.php;h=ae1854d4d2289ff2afb853884b96c80d37b3b5a7;hb=2db306a4e4049ab759a10bb1e3c18d925d1583f9;hp=83d131c421de7dfa1d6bd70f0bf3c44dd159aa08;hpb=854fcac4ae5fe26e28e9d4d7b8361f2ab455aeb1;p=mailer.git

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 83d131c421..ae1854d4d2 100644
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/24/2004 *
- * ===============                              Last change: 11/14/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/24/2004 *
+ * ===================                          Last change: 11/14/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : rewrite_functions.php                            *
@@ -14,10 +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 - 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 *
@@ -42,26 +41,27 @@ if (!defined('__SECURITY')) {
 }
 
 // Rewrite links in HTML for better SEO (ugly part of mx!)
-function rewriteLinksInCode ($HTML) {
-	// Skip rewriting for configured modules
-	if (eregi(getModule(), getConfig('rewrite_skip')) !== false) return $HTML;
+function rewriteLinksInCode ($code) {
+	// Skip rewriting for configured or empty modules
+	if ((getModule() == '') || (isInStringIgnoreCase(getModule(), getConfig('rewrite_skip')) !== false)) {
+		return $code;
+	} // END - if
 
 	// Generate target URL
-	$target = '{?URL?}/cms/';
-
-	// Convert modules.php?module=...
-	$output = str_replace(getConfig('URL') . '/modules.php?module=', $target, $HTML);
+	$target = getUrl() . '/cms/';
 
 	// Convert modules.php?module=...
-	$output = str_replace('{?URL?}/modules.php?module=', $target, $output);
+	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 (eregi(getConfig('SERVER_URL'), $output)) {
+	if (isInStringIgnoreCase(getServerUrl(), $code)) {
 		// Convert URLs from my server
-		$output = str_replace('{?URL?}/modules.php?module=', getConfig('SERVER_URL') . '/cms/', $output);
+		$code = str_replace('{?URL?}/modules.php?module=', getServerUrl() . '/cms/', $code);
 
 		// Convert URLs from my server
-		$output = str_replace(getConfig('URL') . '/modules.php?module=', getConfig('SERVER_URL') . '/cms/', $output);
+		$code = str_replace(getUrl() . '/modules.php?module=', getServerUrl() . '/cms/', $code);
 	} // END - if
 
 	// Strip slashes as above for the main URL
@@ -71,19 +71,19 @@ function rewriteLinksInCode ($HTML) {
 	$action = $target . '$1/act/';
 
 	// Convert &amp;|&action=...
-	$output = preg_replace('/' . $target2 . '(.*)&amp;action=/i', $action, $output);
+	$code = preg_replace('/' . $target2 . '(.*)&amp;action=/i', $action, $code);
 
 	// "The same procedure as last variable"... now for &amp;what=
-	$what = $target.'$1/wht/';
-	$output = preg_replace('/' . $target2 . '(.*)&amp;what=/i', $what, $output);
+	$what = $target . '$1/wht/';
+	$code = preg_replace('/' . $target2 . '(.*)&amp;what=/i', $what, $code);
 
 	// Repair missed &amp;what=??? entries
-	while (preg_match("/&amp;what=(.*)\/(.*)\/(.*)/i", $output)) {
-		$output = preg_replace("/&amp;what=(.*)\/(.*)\/(.*)/i", "/wht/\$1/\$2/\$3", $output);
+	while (preg_match("/&amp;what=(.*)\/(.*)\/(.*)/i", $code)) {
+		$code = preg_replace("/&amp;what=(.*)\/(.*)\/(.*)/i", "/wht/\$1/\$2/\$3", $code);
 	} // END - while
 
 	// Return rewritten code
-	return $output;
+	return $code;
 }
 
 // [EOF]