More globals rewritten, see ticket #100

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

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index fb52234bc95b3370a85d26136b0e0f529a3ef56a..9ff0ff623bbf59d4e341498777938a7ede5d7c68 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -47,35 +47,30 @@ function REWRITE_LINKS ($HTML) {
        // Skip rewriting for configured modules
        if (eregi($GLOBALS['module'], getConfig('rewrite_skip')) !== false) return $HTML;
 
-       // Strip slashes with double-backslashes for the preg_replace() function
-       $URL = str_replace('/', '\/', constant('URL'));
-
        // Generate target URL
        $target = constant('URL')."/cms/";
 
        // Convert modules.php?module=...
-       $output = preg_replace('/' . $URL . '\/modules.php\?module=/i', $target, $HTML);
+       $output = str_replace("/" . constant('URL') . "/modules.php?module=", $target, $HTML);
 
+       // Do we have an URL linked to mxchange.org?
        if (eregi(constant('SERVER_URL'), $output)) {
-               // Strip slashes with double-backslashes for the preg_replace() function
-               $URL = str_replace('/', '\/', constant('SERVER_URL'));
-
                // Convert URLs from my server
-               $output = preg_replace('/' . $URL . '\/modules.php\?module=/i', constant('SERVER_URL')."/cms/", $output);
+               $output = str_replace("/" . constant('URL') . "/modules.php?module=", constant('SERVER_URL')."/cms/", $output);
        } // END - if
 
        // Strip slashes as above for the main URL
-       $target2 = str_replace('/', '\/', $target);
+       $target2 = preg_quote($target, "/");
 
        // Action variable
        $act = $target."\$1/act/";
 
        // Convert &|&action=...
-       $output = preg_replace('/'.$target2."(.*)&action=/i", $act, $output);
+       $output = preg_replace("/" . $target2 . "(.*)&action=/i", $act, $output);
 
        // "The same procedure as last variable"... now for &what=
        $wht = $target."\$1/wht/";
-       $output = preg_replace('/'.$target2."(.*)&what=/i", $wht, $output);
+       $output = preg_replace("/" . $target2 . "(.*)&what=/i", $wht, $output);
 
        // Repair missed &what=??? entries
        while (preg_match("/&what=(.*)\/(.*)\/(.*)/i", $output)) {