From bd1fa10ab9f1330a68ccaa1ab5cfcca1ac2646cd Mon Sep 17 00:00:00 2001
From: aoneil <aoneil@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Thu, 13 Sep 2007 23:41:22 +0000
Subject: [PATCH] #1368 - mod_rewrite fix for some apache servers

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

diff --git a/install.php b/install.php
index 01cc526..6b36ed3 100644
--- a/install.php
+++ b/install.php
@@ -694,12 +694,8 @@ PHP
 		$rewrite = <<<TEXT
 RewriteEngine On
 
-RewriteRule \.js$ - [L]
-RewriteRule \.css$ - [L]
-RewriteRule \.png$ - [L]
-RewriteRule \.jpg$ - [L]
-RewriteRule \.gif$ - [L]
-RewriteRule \.php$ - [L]
+
+RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -733,13 +729,8 @@ TEXT
 		$end= "\n### SILVERSTRIPE END ###";
 		$rewrite = <<<TEXT
 RewriteEngine On
-
-RewriteRule \.js$ - [L]
-RewriteRule \.css$ - [L]
-RewriteRule \.png$ - [L]
-RewriteRule \.jpg$ - [L]
-RewriteRule \.gif$ - [L]
-RewriteRule \.php$ - [L]
+
+RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/rewritetest.php b/rewritetest.php
index f1d8f1a..6e9dc95 100644
--- a/rewritetest.php
+++ b/rewritetest.php
@@ -75,12 +75,7 @@ function createHtaccess() {
 	$rewrite = <<<TEXT
 RewriteEngine On
 
-RewriteRule \.js$ - [L]
-RewriteRule \.css$ - [L]
-RewriteRule \.png$ - [L]
-RewriteRule \.jpg$ - [L]
-RewriteRule \.gif$ - [L]
-RewriteRule \.php$ - [L]
+RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -114,12 +109,7 @@ function createHtaccessAlternative() {
 	$rewrite = <<<TEXT
 RewriteEngine On
 
-RewriteRule \.js$ - [L]
-RewriteRule \.css$ - [L]
-RewriteRule \.png$ - [L]
-RewriteRule \.jpg$ - [L]
-RewriteRule \.gif$ - [L]
-RewriteRule \.php$ - [L]
+RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f