From 06213b0470a3451fab33d35d89a52dd15ed19e30 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 18 Mar 2009 12:22:49 +0000
Subject: [PATCH] Additional checks and fixes of php settings in GI mode.

---
 .htaccess         | 10 ++++++++--
 CHANGELOG.txt     |  6 ++++++
 install/index.php | 24 ++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index b923b02..de47e67 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,8 +2,14 @@
 # Maybe you might have problems
 # with other scripts that needs
 # register_globals ON
-php_flag magic_quotes_gpc Off
-php_flag register_globals Off
+<IfModule mod_php4.c>
+	php_flag magic_quotes_gpc Off
+	php_flag register_globals Off
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag magic_quotes_gpc Off
+	php_flag register_globals Off
+</IfModule>
 
 #Sometimes neccessary to add those
 #
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 560c746..0d0ca15 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,6 +24,12 @@ $ -> Affected files
 ! Release 2.1
 $ config.php
 
+18-Mar-2009 Janusz Dobrowolski
+# Additional php.ini checks and fixes for php in CGI mode
+$ /.htaccess
+  /install.html
+  /install/index.php
+
 16-Mar-2009 Janusz Dobrowolski
 # Fixed redirection after order cancelation.
 $ /sales/sales_order_entry.php
diff --git a/install/index.php b/install/index.php
index 1c78b53..99d810a 100644
--- a/install/index.php
+++ b/install/index.php
@@ -131,6 +131,30 @@ function change_os(type) {
 				?>
 			</td>
 		</tr>
+		<?php if (substr(php_sapi_name(), 0, 3) == 'cgi') {	?>
+		<tr>
+			<td width="140" style="color: #666666;">Magic Quotes GPC</td>
+			<td width="35">
+				<?php
+				if(ini_get('magic_quotes_gpc')) {
+					echo '<font class="bad">Enabled</font>';
+				} else {
+					echo '<font class="good">Disabled</font>';
+				}
+				?>
+			</td>
+			<td width="140" style="color: #666666;">Register Globals</td>
+			<td width="35">
+				<?php
+				if (ini_get('register_globals')) {
+					echo '<font class="bad">Enabled</font>';
+				} else {
+					echo '<font class="good">Disabled</font>';
+				}
+				?>
+			</td>
+		</tr>
+		<?php } ?>
 		</table>
 		<table cellpadding="3" cellspacing="0" width="100%" align="center">
 		<tr>
-- 
2.30.2