From ef97f63b7335b4ae481540f72f067123cce181c9 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Fri, 17 Sep 2010 05:16:06 +0000
Subject: [PATCH] - only show redirect-info on "path"-field for domain-pages,
 not for path-options pages, fixes #408 refs #408

---
 lng/english.lng.php                         | 3 ++-
 lng/german.lng.php                          | 3 ++-
 templates/customer/domains/domains_add.tpl  | 2 +-
 templates/customer/domains/domains_edit.tpl | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lng/english.lng.php b/lng/english.lng.php
index a09926d7..7c0d4acd 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -497,7 +497,8 @@ $lng['admin']['mailserversettings'] = 'Mailserver settings';
 $lng['admin']['nameserversettings'] = 'Nameserver settings';
 $lng['admin']['updatecounters'] = 'Recalculate resource usage';
 $lng['question']['admin_counters_reallyupdate'] = 'Do you really want to recalculate resource usage?';
-$lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://';
+$lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.';
+$lng['panel']['pathDescriptionEx'] = '<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://';
 
 // ADDED IN 1.2.16-svn6
 
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 1267b070..e8a038a3 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -496,7 +496,8 @@ $lng['admin']['mailserversettings'] = 'Mailservereinstellungen';
 $lng['admin']['nameserversettings'] = 'Nameservereinstellungen';
 $lng['admin']['updatecounters'] = 'Ressourcenverbrauch';
 $lng['question']['admin_counters_reallyupdate'] = 'Wollen Sie den Ressourcenverbrauch neu berechnen?';
-$lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.<br /><br />Sollte eine Weiterleitung auf eine andere Domain gew&uuml;nscht sein, muss der Eintrag mit http:// oder https:// beginnen';
+$lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.';
+$lng['panel']['pathDescriptionEx'] = '<br /><br />Sollte eine Weiterleitung auf eine andere Domain gew&uuml;nscht sein, muss der Eintrag mit http:// oder https:// beginnen';
 
 // ADDED IN 1.2.16-svn6
 
diff --git a/templates/customer/domains/domains_add.tpl b/templates/customer/domains/domains_add.tpl
index eb7e4266..419a1ec6 100644
--- a/templates/customer/domains/domains_add.tpl
+++ b/templates/customer/domains/domains_add.tpl
@@ -17,7 +17,7 @@ $header
 			</tr>
 			<if $settings['panel']['pathedit'] != 'Dropdown'>
 				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td>
+					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
 					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
 				</tr>
 			</if>
diff --git a/templates/customer/domains/domains_edit.tpl b/templates/customer/domains/domains_edit.tpl
index 571cd31b..e253c72a 100644
--- a/templates/customer/domains/domains_edit.tpl
+++ b/templates/customer/domains/domains_edit.tpl
@@ -24,7 +24,7 @@ $header
 			</if>
 			<if $settings['panel']['pathedit'] != 'Dropdown'>
 				<tr>
-					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}</font></td>
+					<td class="main_field_name">{$lng['panel']['pathorurl']}:<br /><font size="1">{$lng['panel']['pathDescription']}{$lng['panel']['pathDescriptionEx']}</font></td>
 					<td class="main_field_display" nowrap="nowrap">{$pathSelect}</td>
 				</tr>
 			</if>