diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index f7ccac2d0e01227880ca48614d70bad8ef69a506..4a4bd24c377debb9b2fa639fa8217775be23f0e9 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -1,6 +1,7 @@ # Dolibarr language file - en_US - companies CHARSET=UTF-8 ErrorBadEMail=EMail %s is wrong +ErrorBadUrl=Url %s is wrong ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. ErrorSetACountryFirst=Set the country first diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index b76ac8644be991c727c6730e1c0bbc048ca90399..358ca9454981bb47079ea865e836fc678f7ed51d 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -1,6 +1,7 @@ # Dolibarr language file - fr_FR - companies CHARSET=UTF-8 ErrorBadEMail=e-mail %s invalide +ErrorBadUrl=Url %s invalide ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Veuillez en choisir un autre. ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre. ErrorSetACountryFirst=Définissez d'abord le pays diff --git a/htdocs/soc.php b/htdocs/soc.php index bf27e3623a97b8f52cf4bc229cc5caa2b90c93d2..8f895d525659980c15f47c9b9c744d8a720fd242 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -133,6 +133,12 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) $soc->error = $langs->trans("ErrorBadEMail",$soc->email); $_GET["action"] = $_POST["action"]=='add'?'create':'edit'; } + if (! empty($soc->url) && ! isValidUrl($soc->url)) + { + $error = 1; + $soc->error = $langs->trans("ErrorBadUrl",$soc->url); + $_GET["action"] = $_POST["action"]=='add'?'create':'edit'; + } if ($soc->fournisseur && ! $conf->fournisseur->enabled) { $error = 1;