From 92898c9562da57f2fa7ccbe2c6a1bd7118674bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 1 May 2020 11:27:11 +0200
Subject: [PATCH 1/8] enable free emails with select2

---
 htdocs/core/actions_sendmails.inc.php     |  9 ++++--
 htdocs/core/class/html.form.class.php     | 39 +++++++++++++++++++----
 htdocs/core/class/html.formmail.class.php | 22 ++++++-------
 htdocs/langs/en_US/mails.lang             |  1 +
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..f647bd5418e 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -190,10 +190,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// $val is the Id of a contact
+				elseif ((int) $val > 0)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
+				} else {
+					$tmparray[] = $val;
 				}
 			}
 		}
@@ -240,10 +242,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)				// $val is the Id of a contact
+				elseif ((int) $val > 0)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+				} else {
+					$tmparray[] = $val;
 				}
 			}
 		}
@@ -261,6 +265,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 		}
 		$sendtocc = implode(',', $tmparray);
+		//var_dump($sendto, $sendtocc);exit;
 
 		if (dol_strlen($sendto))
 		{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b2c677ed29d..bc605d286c1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6617,10 +6617,11 @@ class Form
 	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
 	 *  @param	string	$placeholder	String to use as placeholder
 	 *  @param	int		$addjscombo		Add js combo
+	 *  @param  int     $enablefreetag  0 no free tag, 1 enable free tag for elemtype
 	 *	@return	string					HTML multiselect string
 	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
+	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1, $enablefreetag = 0)
 	{
 		global $conf, $langs;
 
@@ -6634,11 +6635,11 @@ class Form
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
 		{
-			$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
-						<script>'."\n";
 			if ($addjscombo == 1)
 			{
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";
+				$out .= '<script>'."\n";
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
@@ -6662,13 +6663,37 @@ class Form
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
 								dir: \'ltr\',
+								tags: '.($enablefreetag?'true':'false').',
 								// Specify format function for dropdown item
 								formatResult: formatResult,
-							 	templateResult: formatResult,		/* For 4.0 */
+								/* For 4.0 */
+							 	templateResult: formatResult,
 								// Specify format function for selected item
 								formatSelection: formatSelection,
-							 	templateSelection: formatSelection		/* For 4.0 */
-							});
+								/* For 4.0 */
+								templateSelection: formatSelection';
+				if ($enablefreetag && $elemtype == 'email') {
+					$out .= ',
+								createTag: function (params) {
+									var REGEX_EMAIL = "([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@" +
+									"(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)";
+									// Dont offset to create a tag if there is no @ symbol
+									if (params.term.indexOf("@") === -1) {
+										// Return null to disable tag creation
+										return null;
+									}
+									var match = params.term.match(new RegExp("^([^<]*)\<" + REGEX_EMAIL + "\>$", "i"));
+									// console.log(match);
+									if (match !== null) {
+										return {
+											id: $.trim(match[1]) + " <" + match[2] + ">",
+											text: $.trim(match[1]) + " <" + match[2] + ">"
+										}
+									}
+									return null;
+								}';
+				}
+				$out .= '			});
 						});'."\n";
 			}
 			elseif ($addjscombo == 2)
@@ -6676,6 +6701,8 @@ class Form
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
+				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";
+				$out .= '<script>'."\n";
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d961cd20536..45c40a8bc72 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -630,7 +630,7 @@ class FormMail extends Form
 			if (!empty($this->withto) || is_array($this->withto))
 			{
 				$out .= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
 				else $out .= $langs->trans("MailTo");
 				$out .= '</td><td>';
 				if ($this->withtoreadonly)
@@ -670,14 +670,14 @@ class FormMail extends Form
 				else
 				{
 					// The free input of email
-					if (!empty($this->withtofree))
-					{
-						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
-					}
+					// if (!empty($this->withtofree))
+					// {
+					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+					// }
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
-						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -689,7 +689,7 @@ class FormMail extends Form
 						{
 							$withtoselected = array_keys($tmparray);
 						}
-						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
 					}
 				}
 				$out .= "</td></tr>\n";
@@ -736,7 +736,7 @@ class FormMail extends Form
 			if (!empty($this->withtocc) || is_array($this->withtocc))
 			{
 				$out .= '<tr><td>';
-				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseFreeEmailsForRecipients"));
 				$out .= '</td><td>';
 				if ($this->withtoccreadonly)
 				{
@@ -744,10 +744,10 @@ class FormMail extends Form
 				}
 				else
 				{
-				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
+				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)
@@ -755,7 +755,7 @@ class FormMail extends Form
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
 						$withtoccselected = GETPOST("receivercc"); // Array of selected value
-						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', 0, '', '', 'email', '', -1, !empty($this->withtofree)?1:0);
 					}
 				}
 				$out .= "</td></tr>\n";
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7b3bfd3852a..9806748a1c0 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -117,6 +117,7 @@ NbOfEMailingsSend=Mass emailings sent
 IdRecord=ID record
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
+YouCanUseFreeEmailsForRecipients=You can enter free emails to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
 TagSignature=Signature of sending user

From 7e7a10f8d2140ff2ca0eae2a3818bb2da35435b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 22:55:21 +0200
Subject: [PATCH 2/8] clean

---
 htdocs/core/class/html.formmail.class.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 45c40a8bc72..6007dd1dbaa 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,15 +669,8 @@ class FormMail extends Form
 				}
 				else
 				{
-					// The free input of email
-					// if (!empty($this->withtofree))
-					// {
-					// 	$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
-					// }
-					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
-						//if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val)
@@ -744,10 +737,8 @@ class FormMail extends Form
 				}
 				else
 				{
-				    //$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						//$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
 						foreach ($tmparray as $key => $val)

From b88a84323b34d47c81b1929b3f1d6fb8354434b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 22:59:34 +0200
Subject: [PATCH 3/8] clean

---
 htdocs/core/actions_sendmails.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index f647bd5418e..d6c4c0a6313 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -265,7 +265,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 		}
 		$sendtocc = implode(',', $tmparray);
-		//var_dump($sendto, $sendtocc);exit;
 
 		if (dol_strlen($sendto))
 		{

From 8f9ee3250dba03aea88cfd5188253383c866e2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 7 May 2020 23:28:32 +0200
Subject: [PATCH 4/8] clean

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 6007dd1dbaa..8881b93349f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -669,6 +669,7 @@ class FormMail extends Form
 				}
 				else
 				{
+					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
 					{
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time

From e583dc0a7ff7e183062f49cb56eb887df1cfd758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:07:17 +0200
Subject: [PATCH 5/8] enhance free email

---
 htdocs/core/class/html.form.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 999e0463789..d6a4c437c50 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6690,6 +6690,14 @@ class Form
 											text: $.trim(match[1]) + " <" + match[2] + ">"
 										}
 									}
+									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
+									// console.log(match);
+									if (match !== null) {
+										return {
+											id: $.trim(match[1]) + " <" + match[1] + ">",
+											text: $.trim(match[1]) + " <" + match[1] + ">"
+										}
+									}
 									return null;
 								}';
 				}

From 1bc87652918b53acae42d2eae34e3eb17fdd801d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:42:41 +0200
Subject: [PATCH 6/8] enhance free email

---
 htdocs/core/class/html.form.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 95ed7e26a13..1097692d61a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6692,6 +6692,10 @@ class Form
 											text: $.trim(match[1]) + " <" + match[2] + ">"
 										}
 									}
+									if (params.term.indexOf("<") >= 0) {
+										// Return null to disable tag creation
+										return null;
+									}
 									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
 									// console.log(match);
 									if (match !== null) {

From 76bb57bc6bfed3726d11b6c0c02a510b04139ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:50:37 +0200
Subject: [PATCH 7/8] enhance free email

---
 htdocs/core/class/html.form.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1097692d61a..49758d55be7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6699,9 +6699,10 @@ class Form
 									var match = params.term.match(new RegExp("^" + REGEX_EMAIL + "$", "i"));
 									// console.log(match);
 									if (match !== null) {
+										var pos = params.term.indexOf("@");
 										return {
-											id: $.trim(match[1]) + " <" + match[1] + ">",
-											text: $.trim(match[1]) + " <" + match[1] + ">"
+											id: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">",
+											text: $.trim(match[1].substring(0, pos)) + " <" + match[1] + ">"
 										}
 									}
 									return null;

From 62e0bfbb5f4e42e0cd4d1220fc8d111f1706f316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 15 May 2020 18:53:59 +0200
Subject: [PATCH 8/8] enhance free email

---
 htdocs/core/lib/project.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f3690694b01..b0179c966c7 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2226,7 +2226,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				print '<tr class="oddeven">';
 
 				print '<td>';
-				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0 , -1, 'nowraponall');
+				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0, -1, 'nowraponall');
 				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
 				print '</td>';
 				print '<td class="nowraponall tdoverflowmax100">';
@@ -2288,7 +2288,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					$total_plannedworkload += $plannedworkload;
 					if (!in_array('plannedworkload', $hiddenfields))
 					{
-						print '<td class="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
+						print '<td class="right">'.($plannedworkload ? convertSecondToTime($plannedworkload) : '').'</td>';
 					}
 					if (!in_array('declaredprogress', $hiddenfields))
 					{