From 838c874d186669867fee81800aaaf29655b4a15f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Mar 2009 13:36:14 -0500
Subject: [PATCH] - Added more redirect options. - Made jailkit programs configurable per linux distribution in the installer.

---
 server/plugins-available/apache2_plugin.inc.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 555cffa..65ce21e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -472,13 +472,13 @@
 		$rewrite_rules = array();
 		if($data["new"]["redirect_type"] != '') {
 			$rewrite_rules[] = array(	'rewrite_domain' 	=> $data["new"]["domain"],
-										'rewrite_type' 		=> $data["new"]["redirect_type"],
+										'rewrite_type' 		=> ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
 										'rewrite_target' 	=> $data["new"]["redirect_path"]);
             
             switch($data["new"]["subdomain"]) {
             case 'www':
     			$rewrite_rules[] = array(	'rewrite_domain' 	=> 'www.'.$data["new"]["domain"],
-    										'rewrite_type' 		=> $data["new"]["redirect_type"],
+    										'rewrite_type' 		=> ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
     										'rewrite_target' 	=> $data["new"]["redirect_path"]);
                 break;
             case '*':
@@ -517,12 +517,12 @@
 				// Rewriting
 				if($alias["redirect_type"] != '') {
 					$rewrite_rules[] = array(	'rewrite_domain' 	=> $alias["domain"],
-												'rewrite_type' 		=> $alias["redirect_type"],
+												'rewrite_type' 		=> ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
 												'rewrite_target' 	=> $alias["redirect_path"]);
                     switch($alias["subdomain"]) {
                     case 'www':
             			$rewrite_rules[] = array(	'rewrite_domain' 	=> 'www.'.$alias["domain"],
-            										'rewrite_type' 		=> $alias["redirect_type"],
+            										'rewrite_type' 		=> ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
             										'rewrite_target' 	=> $alias["redirect_path"]);
                         break;
                     case '*':

--
Gitblit v1.9.1