From ad54a2b8af7d23aa80cb5984c886a9423b6d6067 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jan 2019 15:06:28 +0100
Subject: [PATCH] Fix website edit of virtualhost

---
 htdocs/langs/en_US/errors.lang |  1 +
 htdocs/website/index.php       | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index cb183d12ce2..a2d0c8c31cf 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -215,6 +215,7 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
 ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
+ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 88fb642d50a..0dfb13aa9a8 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
-$langs->loadLangs(array("admin","other","website"));
+$langs->loadLangs(array("admin","other","website","errors"));
 
 if (! $user->rights->website->read) accessforbidden();
 
@@ -280,6 +280,12 @@ if ($action == 'addsite')
 {
 	$db->begin();
 
+    if (GETPOST('virtualhost','alpha') && ! preg_match('/^http/',GETPOST('virtualhost','alpha')))
+    {
+        $error++;
+        setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+	}
+
 	if (! $error && ! GETPOST('WEBSITE_REF','alpha'))
 	{
 		$error++;
@@ -353,6 +359,7 @@ if ($action == 'addcontainer')
 		if (! preg_match('/^http/', $urltograb))
 		{
 			$error++;
+			$langs->load("errors");
 			setEventMessages('Error URL must start with http:// or https://', null, 'errors');
 			$action = 'createcontainer';
 		}
@@ -872,7 +879,7 @@ if ($action == 'updatecss')
 		    if (GETPOST('virtualhost','alpha') && ! preg_match('/^http/',GETPOST('virtualhost','alpha')))
     		{
     		    $error++;
-    		    setEventMessages('Error URL must start with http:// or https://', null, 'errors');
+    		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
     		    $action='editcss';
     		}
 
@@ -1825,11 +1832,11 @@ if (! GETPOST('hide_websitemenu'))
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext.= '<span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+		    $htmltext.= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
-		if (empty($virtualurl))
+		elseif (empty($virtualurl))
 		{
-		    $htmltext.= '<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+		    $htmltext.= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else
 		{
@@ -2150,7 +2157,7 @@ if (! GETPOST('hide_websitemenu'))
                             newurl=jQuery("#previewsiteurl").val();
 							if (! newurl.startsWith("http"))
 							{
-								alert(\''.dol_escape_js($langs->trans("ExternalURLMustStartWithHttp")).'\');
+								alert(\''.dol_escape_js($langs->trans("ErrorURLMustStartWithHttp")).'\');
 								return false;
 							}
 
@@ -2412,7 +2419,7 @@ if ($action == 'createsite')
 
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="virtualhost" value="'.dol_escape_htmltag($sitedesc).'">';
+	print '<input type="text" class="flat minwidth300" name="virtualhost" value="'.dol_escape_htmltag(GETPOST('virtualhost','alpha')).'">';
 	print '</td></tr>';