Many rewrites to get rid of dublicate modreg inserts while ext-cache is registered

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

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 197a46ad7bf313a1d2f5246924accad8e429cf0f..561d281f4e5b71aae3a395f47aa56bf6f5af689c 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -38,39 +38,45 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Rewrite links in HTML for better SEO (ugly part of mx!)
-function REWRITE_LINKS ($HTML) {
+function rewriteLinksInCode ($HTML) {
        // Skip rewriting for configured modules
-       if (eregi($GLOBALS['module'], getConfig('rewrite_skip')) !== false) return $HTML;
+       if (eregi(getModule(), getConfig('rewrite_skip')) !== false) return $HTML;
 
        // Generate target URL
        $target = "{!URL!}/cms/";
 
        // Convert modules.php?module=...
-       $output = str_replace("/" . "{!URL!}/modules.php?module=", $target, $HTML);
+       $output = str_replace(constant('URL') . "/modules.php?module=", $target, $HTML);
+
+       // Convert modules.php?module=...
+       $output = str_replace("{!URL!}/modules.php?module=", $target, $output);
 
        // Do we have an URL linked to mxchange.org?
        if (eregi(constant('SERVER_URL'), $output)) {
                // Convert URLs from my server
-               $output = str_replace("/" . "{!URL!}/modules.php?module=", constant('SERVER_URL')."/cms/", $output);
+               $output = str_replace("{!URL!}/modules.php?module=", constant('SERVER_URL')."/cms/", $output);
+
+               // Convert URLs from my server
+               $output = str_replace(constant('URL') . "/modules.php?module=", constant('SERVER_URL')."/cms/", $output);
        } // END - if
 
        // Strip slashes as above for the main URL
-       $target2 = preg_quote($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)) {