From 8388ae72ae0b07a1152bdad8b43a345830613e3b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 15 Oct 2009 09:56:01 -0400 Subject: [PATCH] Fixed a problem with apache rewrite rules wen noflag is selected. Fixed: FS#934 - Webalizer statistics wrong --- server/plugins-available/apache2_plugin.inc.php | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 5cc8956..995cd21 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -579,6 +579,10 @@ $rewrite_rules = array(); if($data["new"]["redirect_type"] != '') { if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/'; + if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') { + $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/'; + } + $rewrite_rules[] = array( 'rewrite_domain' => $data["new"]["domain"], 'rewrite_type' => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']', 'rewrite_target' => $data["new"]["redirect_path"]); @@ -626,6 +630,9 @@ // Rewriting if($alias["redirect_type"] != '') { if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/'; + if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') { + $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/'; + } $rewrite_rules[] = array( 'rewrite_domain' => $alias["domain"], 'rewrite_type' => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']', 'rewrite_target' => $alias["redirect_path"]); -- Gitblit v1.9.1