From 118693471c37cde477e856c393226176403b2cb6 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 17 Oct 2010 02:01:18 +0000
Subject: [PATCH] - correct sql-query in update to drop table, fixes #440 - use
 correct language-variable for ips-and-ports docroot-setting, fixes #441

---
 install/updates/froxlor/0.9/update_0.9.inc.php   | 2 +-
 templates/admin/ipsandports/ipsandports_add.tpl  | 2 +-
 templates/admin/ipsandports/ipsandports_edit.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 187c4fd0..09239397 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -1219,7 +1219,7 @@ if(isFroxlorVersion('0.9.14-svn6'))
 	lastStepStatus(0);
 
 	showUpdateStep("Adding new table `".TABLE_FROXLOR_CLIENTS."`");
-	$db->query("DROP TABLE IF EXISTS `".TABLE_FROXLOR_CLIENTS."`;)");
+	$db->query("DROP TABLE IF EXISTS `".TABLE_FROXLOR_CLIENTS."`");
 	$db->query("CREATE TABLE IF NOT EXISTS `".TABLE_FROXLOR_CLIENTS."` (
 				  `id` int(11) NOT NULL auto_increment,
 				  `name` varchar(255) NOT NULL,
diff --git a/templates/admin/ipsandports/ipsandports_add.tpl b/templates/admin/ipsandports/ipsandports_add.tpl
index 7e9d2c92..49d83f5b 100644
--- a/templates/admin/ipsandports/ipsandports_add.tpl
+++ b/templates/admin/ipsandports/ipsandports_add.tpl
@@ -48,7 +48,7 @@ $header
 				<td class="main_field_display" nowrap="nowrap">$vhostcontainer</td>
 			</tr>
 			<tr>
-				<td class="main_field_name">{$lng['admin']['ipsandports']['docroot']}:</td>
+				<td class="main_field_name">{$lng['admin']['ipsandports']['docroot']['title']}:<br /><font size="1">{$lng['admin']['ipsandports']['docroot']['description']}</font></td>
 				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="docroot" value="" /></td>
 			</tr>
 			<tr>
diff --git a/templates/admin/ipsandports/ipsandports_edit.tpl b/templates/admin/ipsandports/ipsandports_edit.tpl
index a5012d43..3566fbdf 100644
--- a/templates/admin/ipsandports/ipsandports_edit.tpl
+++ b/templates/admin/ipsandports/ipsandports_edit.tpl
@@ -47,7 +47,7 @@ $header
 				<td class="main_field_display" nowrap="nowrap">$vhostcontainer</td>
 			</tr>
 			<tr>
-				<td class="main_field_name">{$lng['admin']['ipsandports']['docroot']}:</td>
+				<td class="main_field_name">{$lng['admin']['ipsandports']['docroot']['title']}:<br /><font size="1">{$lng['admin']['ipsandports']['docroot']['description']}</font></td>
 				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="docroot" value="{$result['docroot']}" /></td>
 			</tr>
 			<tr>