From fb4b0e3920546b1d183283ffb5319ef12fdad28e Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Wed, 28 Apr 2010 09:34:50 +0000
Subject: [PATCH] - more work on default-webserver-error-documents

---
 actions/admin/settings/130.webserver.php      | 14 +++++++++---
 .../updates/froxlor/0.9/update_0.9.inc.php    | 22 +++++++++++++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index 6ca725b8..2abcbeb7 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -124,7 +124,7 @@ return array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err401',
-					'type' => 'text',
+					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
@@ -132,7 +132,7 @@ return array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err403',
-					'type' => 'text',
+					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
@@ -140,7 +140,15 @@ return array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
 					'settinggroup' => 'defaultwebsrverrhandler',
 					'varname' => 'err404',
-					'type' => 'text',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'defaultwebsrverrhandler_err500' => array(
+					'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'err500',
+					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 4eb0bb24..6b937200 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -522,6 +522,11 @@ if(isFroxlorVersion('0.9.6-svn2'))
 	
 	$update_deferr_enable = isset($_POST['update_deferr_enable']) ? true : false;
 
+	$err500 = false;
+	$err401 = false;
+	$err403 = false;
+	$err404 = false;
+
 	showUpdateStep("Adding new webserver configurations to database");
 	if($update_deferr_enable == true)
 	{
@@ -531,34 +536,47 @@ if(isFroxlorVersion('0.9.6-svn2'))
 			&& trim($_POST['update_deferr_500']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');");
+			$err500 = true;
 		}
 		
 		if(isset($_POST['update_deferr_401'])
 			&& trim($_POST['update_deferr_401']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_401'])."');");
+			$err401 = true;
 		}
 		
 		if(isset($_POST['update_deferr_403'])
 			&& trim($_POST['update_deferr_403']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_403'])."');");
+			$err403 = true;
 		}
 		
 		if(isset($_POST['update_deferr_404'])
 			&& trim($_POST['update_deferr_404']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_404'])."');");
+			$err404 = true;
 		}
 	} 
-	else
-	{
+
+	if(!$update_deferr_enable) {
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '0');");
+	}
+	if(!$err401) {
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '');");
+	}
+	if(!$err403) {
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '');");
+	}
+	if(!$err404) {
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '');");
+	}
+	if(!$err500) {
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '');");	
 	}
+
 	lastStepStatus(0);
 
 	updateToVersion('0.9.6-svn3');