Revert "Fixed: FS#3581 - Website unaccessible under some circumstances when...

Marius Cramer

2014-07-29 0b77531b9479a069753e9e25a5f3e8ec74204607

Revert "Fixed: FS#3581 - Website unaccessible under some circumstances when using seo redirection *.domain to www.domain"

This reverts commit 5742e4c99f53f9dbbcc962e9f967a4c377c209b9.

 server/conf/vhost.conf.master

@@ -339,12 +339,10 @@
<tmpl_if name="rewrite_enabled">
        RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
        RewriteCond %{HTTP_HOST} <tmpl_var name='seo_base_domain'>$ [NC]
        RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
        RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
<tmpl_loop name="alias_seo_redirects">
        RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_base_domain'>$ [NC]
        RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
        RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_loop>

 server/plugins-available/apache2_plugin.inc.php

@@ -2951,8 +2951,6 @@
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
        }
		
        $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
        return $seo_redirects;
    }


 server/plugins-available/nginx_plugin.inc.php

@@ -2842,8 +2842,6 @@
                $seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
            }
        }
		
        $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
        return $seo_redirects;
    }