From 2c074a94f39d0f1e3c17499b530134d04a88903b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 15 Feb 2015 15:57:38 +0100
Subject: [PATCH 1/4] Fix: [ bug #1790 ] Sending a test mail from admin page,
 gives "File already exists" error

---
 ChangeLog                                 | 1 +
 htdocs/core/class/html.formmail.class.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5870e55152d..0b21f163136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1812 ] SQL Error message while sending emailing with PostgreSQL datatabase
 - Fix: [ bug #1819 ] SQL error when searching for an invoice payment
 - Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
+- Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 9d80ced54e3..45e0aec2f65 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -500,6 +501,10 @@ class FormMail
         		$out.= "</td></tr>\n";
         	}
 
+	        if ($this->withform == 1 || $this->withform == -1) {
+		        $out .= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
+	        }
+
         	// Attached files
         	if (! empty($this->withfile))
         	{

From 5db4bb68a43d25dbbe92223d41d3e56fb770da54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 15 Feb 2015 16:00:07 +0100
Subject: [PATCH 2/4] Updated bug name

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0b21f163136..cf3e84bed2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1812 ] SQL Error message while sending emailing with PostgreSQL datatabase
 - Fix: [ bug #1819 ] SQL error when searching for an invoice payment
 - Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
-- Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error
+- Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.

From ca64763440fe211117bc546eb27cf50ffdd41f13 Mon Sep 17 00:00:00 2001
From: braito4 <braito4@hotmail.com>
Date: Tue, 17 Feb 2015 18:09:16 +0100
Subject: [PATCH 3/4] Update note.php

Error in the security check
---
 htdocs/contact/note.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 73b0f513db9..173a1018547 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -36,7 +36,7 @@ $langs->load("companies");
 // Security check
 $id = GETPOST('id','int');
 if ($user->societe_id) $id=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id, '&societe');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
 if ($id > 0) $object->fetch($id);

From d46c76311c9c869219351c1dc941ac40a3ce78d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 20 Feb 2015 10:23:17 +0100
Subject: [PATCH 4/4] Correction

---
 htdocs/core/class/html.formmail.class.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 45e0aec2f65..7ffd535f0ec 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -255,6 +255,7 @@ class FormMail
         	if ($this->withform == 1)
         	{
         		$out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
+				$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
         		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
         	}
         	foreach ($this->param as $key=>$value)
@@ -501,10 +502,6 @@ class FormMail
         		$out.= "</td></tr>\n";
         	}
 
-	        if ($this->withform == 1 || $this->withform == -1) {
-		        $out .= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
-	        }
-
         	// Attached files
         	if (! empty($this->withfile))
         	{