From b2156f92bcf25ceb760daf1dcdc0ae78f31950b8 Mon Sep 17 00:00:00 2001
From: aoneil <aoneil@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Thu, 10 Jan 2008 23:40:26 +0000
Subject: [PATCH] #1874 - generated .htaccess lacks "Rewritebase"

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47868 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 install.php     | 20 ++++++++------------
 rewritetest.php | 17 +++++++----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/install.php b/install.php
index 2e92ea3..b74d661 100644
--- a/install.php
+++ b/install.php
@@ -737,10 +737,12 @@ PHP
 	
 	function createHtaccess() {
 		$start = "### SILVERSTRIPE START ###\n";
-		$end= "\n### SILVERSTRIPE END ###";
+		$end = "\n### SILVERSTRIPE END ###";
+		$base = dirname($_SERVER['SCRIPT_NAME']);
+		
 		$rewrite = <<<TEXT
 RewriteEngine On
-
+RewriteBase $base
 
 RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
@@ -750,11 +752,6 @@ RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
 TEXT
 		;
 		
-		$baseURL = dirname($_SERVER['SCRIPT_NAME']);
-		if($baseURL == "/") {
-			$baseURL = "";
-		}
-
 		if(file_exists('.htaccess')) {
 			$htaccess = file_get_contents('.htaccess');
 			
@@ -773,9 +770,12 @@ TEXT
 
 	function createHtaccessAlternative() {
 		$start = "### SILVERSTRIPE START ###\n";
-		$end= "\n### SILVERSTRIPE END ###";
+		$end= "\n### SILVERSTRIPE END ###";
+		$base = dirname($_SERVER['SCRIPT_NAME']);
+		
 		$rewrite = <<<TEXT
 RewriteEngine On
+RewriteBase $base
 
 RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
@@ -785,10 +785,6 @@ RewriteRule .* $_SERVER[DOCUMENT_ROOT]/sapphire/main.php?url=%1&%{QUERY_STRING}
 TEXT
 		;
 		
-		$baseURL = dirname($_SERVER['SCRIPT_NAME']);
-		if($baseURL == "/") {
-			$baseURL = "";
-		}
 
 		if(file_exists('.htaccess')) {
 			$htaccess = file_get_contents('.htaccess');
diff --git a/rewritetest.php b/rewritetest.php
index 68bdf44..57e8750 100644
--- a/rewritetest.php
+++ b/rewritetest.php
@@ -75,8 +75,11 @@ function performModRewriteTest() {
 function createHtaccess() {
 	$start = "### SILVERSTRIPE START ###\n";
 	$end= "\n### SILVERSTRIPE END ###";
+	$base = dirname($_SERVER['SCRIPT_NAME']);
+	
 	$rewrite = <<<TEXT
 RewriteEngine On
+RewriteBase $base
 
 RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
@@ -86,10 +89,6 @@ RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
 TEXT
 	;
 	
-	$baseURL = dirname($_SERVER['SCRIPT_NAME']);
-	if($baseURL == "/") {
-		$baseURL = "";
-	}
 	if(file_exists('.htaccess')) {
 		$htaccess = file_get_contents('.htaccess');
 	
@@ -109,8 +108,11 @@ TEXT
 function createHtaccessAlternative() {
 	$start = "### SILVERSTRIPE START ###\n";
 	$end= "\n### SILVERSTRIPE END ###";
+	$base = dirname($_SERVER['SCRIPT_NAME']);
+	
 	$rewrite = <<<TEXT
 RewriteEngine On
+RewriteBase $base
 
 RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
@@ -119,12 +121,7 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule .* $_SERVER[DOCUMENT_ROOT]/sapphire/main.php?url=%1&%{QUERY_STRING} [L]
 TEXT
 	;
-		
-	$baseURL = dirname($_SERVER['SCRIPT_NAME']);
-	if($baseURL == "/") {
-		$baseURL = "";
-	}
-
+	
 	if(file_exists('.htaccess')) {
 		$htaccess = file_get_contents('.htaccess');