Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/accountancy/class/accountingaccount.class.php

@@ -811,9 +811,9 @@ class AccountingAccount extends CommonObject
 			$suggestedaccountingaccountfor = '';
 			if ((($buyer->country_code == $seller->country_code) || empty($buyer->country_code))) {
 				// If buyer in same country than seller (if not defined, we assume it is same country)
-				if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+				if ($type == 'customer' && !empty($product->accountancy_code_sell)) {
 					$code_p = $product->accountancy_code_sell;
-				} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+				} elseif ($type == 'supplier' && !empty($product->accountancy_code_buy)) {
 					$code_p = $product->accountancy_code_buy;
 				}
 				$suggestedid = $accountingAccount['dom'];
@@ -821,36 +821,36 @@ class AccountingAccount extends CommonObject
 			} else {
 				if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {
 					// European intravat sale, but with VAT
-					if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+					if ($type == 'customer' && !empty($product->accountancy_code_sell)) {
 						$code_p = $product->accountancy_code_sell;
-					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+					} elseif ($type == 'supplier' && !empty($product->accountancy_code_buy)) {
 						$code_p = $product->accountancy_code_buy;
 					}
 					$suggestedid = $accountingAccount['dom'];
 					$suggestedaccountingaccountfor = 'eecwithvat';
 				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {
 					// European intravat sale, without VAT intra community number
-					if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+					if ($type == 'customer' && !empty($product->accountancy_code_sell)) {
 						$code_p = $product->accountancy_code_sell;
-					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+					} elseif ($type == 'supplier' && !empty($product->accountancy_code_buy)) {
 						$code_p = $product->accountancy_code_buy;
 					}
 					$suggestedid = $accountingAccount['dom']; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
 					$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
 				} elseif ($isSellerInEEC && $isBuyerInEEC && !empty($product->accountancy_code_sell_intra)) {
 					// European intravat sale
-					if ($type=='customer' && !empty($product->accountancy_code_sell_intra)) {
+					if ($type == 'customer' && !empty($product->accountancy_code_sell_intra)) {
 						$code_p = $product->accountancy_code_sell_intra;
-					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy_intra)) {
+					} elseif ($type == 'supplier' && !empty($product->accountancy_code_buy_intra)) {
 						$code_p = $product->accountancy_code_buy_intra;
 					}
 					$suggestedid = $accountingAccount['intra'];
 					$suggestedaccountingaccountfor = 'eec';
 				} else {
 					// Foreign sale
-					if ($type=='customer' && !empty($product->accountancy_code_sell_export)) {
+					if ($type == 'customer' && !empty($product->accountancy_code_sell_export)) {
 						$code_p = $product->accountancy_code_sell_export;
-					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy_export)) {
+					} elseif ($type == 'supplier' && !empty($product->accountancy_code_buy_export)) {
 						$code_p = $product->accountancy_code_buy_export;
 					}
 					$suggestedid = $accountingAccount['export'];
@@ -870,12 +870,12 @@ class AccountingAccount extends CommonObject
 			// Manage Deposit
 			if ($factureDet->desc == "(DEPOSIT)" || $facture->type == $facture::TYPE_DEPOSIT) {
 				$accountdeposittoventilated = new self($this->db);
-				if ($type=='customer') {
+				if ($type == 'customer') {
 					$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
-				} elseif ($type=='supplier') {
+				} elseif ($type == 'supplier') {
 					$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT, 1);
 				}
-				if ($result < 0) {
+				if (isset($result) && $result < 0) {
 					return -1;
 				}
 

htdocs/accountancy/index.php

@@ -79,7 +79,7 @@ if (GETPOST('addbox')) {
  * View
  */
 
-$help_url = '';
+$help_url = 'EN:Module_Double_Entry_Accounting#Setup';
 
 llxHeader('', $langs->trans("AccountancyArea"), $help_url);
 

htdocs/admin/security_other.php

@@ -62,7 +62,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 		dol_print_error($db);
 	}
 } elseif ($action == 'updateform') {
-	$res1 = 1; $res2 = 1; $res3 = 1;
+	$res1 = 1; $res2 = 1; $res3 = 1; $res4 = 1;
 	if (GETPOSTISSET('MAIN_APPLICATION_TITLE')) {
 		$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
@@ -72,7 +72,10 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	if (GETPOSTISSET('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT')) {
 		$res3 = dolibarr_set_const($db, "MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", GETPOST("MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", 'alphanohtml'), 'int', 0, '', $conf->entity);
 	}
-	if ($res1 && $res2 && $res3) {
+	if (GETPOSTISSET('MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS')) {
+		$res4 = dolibarr_set_const($db, "MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", GETPOST("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 'alphanohtml'), 'int', 0, '', $conf->entity);
+	}
+	if ($res1 && $res2 && $res3 && $res4) {
 		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
 }
@@ -186,6 +189,14 @@ print '<input class="flat right width50" name="MAIN_SECURITY_MAX_IMG_IN_HTML_CON
 print '</td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("MaxNumberOfPostOnPublicPagesByIP").'</td><td class="right">';
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat right width50" name="MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS" type="text" value="'.getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 1000).'"> '.strtolower($langs->trans("Posts"));
+print '</td>';
+print '</tr>';
+
 /*
 if (empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$conf->global->MAIN_APPLICATION_TITLE = "";

htdocs/asset/class/assetdepreciationoptions.class.php

@@ -163,8 +163,8 @@ class AssetDepreciationOptions extends CommonObject
 				}
 
 				// Unset required option (notnull) if field disabled
-				if (!empty($mode_info['enabled_field'])) {
+				if (!empty($field_info['enabled_field'])) {
-					$info = explode(':', $mode_info['enabled_field']);
+					$info = explode(':', $field_info['enabled_field']);
 					if ($this->deprecation_options[$info[0]][$info[1]] != $info[2] && isset($this->fields[$field_key]['notnull'])) {
 						unset($this->fields[$field_key]['notnull']);
 					}

htdocs/bom/bom_card.php

@@ -19,7 +19,7 @@
 /**
  *    \file       htdocs/bom/bom_card.php
  *    \ingroup    bom
- *    \brief      Page to create/edit/view BOM
+ *    \brief      Page to create/edit/view Bill Of Material
  */
 
 // Load Dolibarr environment
@@ -34,17 +34,16 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'other'));
 
-global $filtertype;
-
 // Get parameters
-$id = GETPOST('id', 'int');
+$id      = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$lineid  = GETPOST('lineid', 'int');
-$action = GETPOST('action', 'aZ09');
+$ref     = GETPOST('ref', 'alpha');
-$confirm    = GETPOST('confirm', 'alpha');
+$action  = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel  = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomcard'; // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha');
+$backtopage  = GETPOST('backtopage', 'alpha');
-$lineid = GETPOST('lineid', 'int');
+
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -56,6 +55,7 @@ $object = new BOM($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('bomcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -86,6 +86,7 @@ if ($object->id > 0) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
 
+// Permissions
 $permissionnote = $user->rights->bom->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->bom->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php

htdocs/bom/bom_note.php

@@ -17,9 +17,9 @@
  */
 
 /**
- *  \file       bom_note.php
+ *    \file       htdocs/bom/bom_note.php
- *  \ingroup    bom
+ *    \ingroup    bom
- *  \brief      Car with notes on BillOfMaterials
+ *    \brief      Card with notes on BillOfMaterials
  */
 
 // Load Dolibarr environment
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 $langs->loadLangs(array("mrp", "companies"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id   = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref  = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -40,9 +40,13 @@ $backtopage = GETPOST('backtopage', 'alpha');
 // Initialize technical objects
 $object = new BOM($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
+
+// Initialize technical objects for hooks
 $hookmanager->initHooks(array('bomnote', 'globalcard')); // Note that conf->hooks_modules contains array
 
+// Massactions
+$diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 

htdocs/bookmarks/bookmarks.lib.php

@@ -94,6 +94,7 @@ function printDropdownBookmarksList()
 	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
 	$listbtn .= img_picto('', 'edit', 'class="paddingright opacitymedium"').$langs->trans('EditBookmarks').'</a>';
 
+	$bookmarkList = '';
 	// Menu with list of bookmarks
 	$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 	$sql .= " WHERE (fk_user = ".((int) $user->id)." OR fk_user is NULL OR fk_user = 0)";

htdocs/core/class/CMailFile.class.php

@@ -878,7 +878,11 @@ class CMailFile
 					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
 					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
 
-					$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+					if (isset($supportedoauth2array)) {
+						$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+					} else {
+						$OAUTH_SERVICENAME = 'Unknown';
+					}
 
 					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 

htdocs/core/class/html.formsetup.class.php

@@ -758,6 +758,8 @@ class FormSetupItem
 				$val = GETPOST($this->confKey, 'array');
 				if ($val && is_array($val)) {
 					$val_const = implode(',', $val);
+				} else {
+					$val_const = '';
 				}
 			} elseif ($this->type == 'html') {
 				$val_const = GETPOST($this->confKey, 'restricthtml');

htdocs/core/class/notify.class.php

@@ -625,6 +625,8 @@ class Notify
 							$mimefilename_list[] = $ref.".pdf";
 						}
 
+						$labeltouse = !empty($labeltouse) ? $labeltouse : '';
+
 						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list, 'outputlangs'=>$outputlangs, 'labeltouse'=>$labeltouse);
 						if (!isset($action)) {
 							$action = '';

htdocs/core/lib/ftp.lib.php

@@ -193,11 +193,12 @@ function dol_ftp_delete($connect_id, $file, $newsection)
  * Download a FTP file
  *
  * @param 		resource	$connect_id		Connection handler
- * @param 		string		$file			File
+ * @param 		string		$localfile		The local file path
+ * @param 		string		$file					The remote file path
  * @param 		string		$newsection			$newsection
  * @return		result
  */
-function dol_ftp_get($connect_id, $file, $newsection)
+function dol_ftp_get($connect_id, $localfile, $file, $newsection)
 {
 
 	global $conf;

htdocs/core/modules/printing/printgcp.modules.php

@@ -332,6 +332,7 @@ class printing_printgcp extends PrintingDriver
 		}
 		$fileprint .= '/'.$file;
 		$mimetype = dol_mimetype($fileprint);
+		$printer_id = '';
 		// select printer uri for module order, propal,...
 		$sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".((int) $user->id);
 		$result = $this->db->query($sql);

htdocs/ftp/index.php

@@ -317,7 +317,7 @@ if ($action == 'download') {
 
 		$newsection = $section;
 
-		$result = dol_ftp_get($connect_id, $file, $newsection);
+		$result = dol_ftp_get($connect_id, $localfile, $file, $newsection);
 
 
 		if ($result) {

htdocs/holiday/card_group.php

@@ -657,10 +657,12 @@ if (is_object($db)) {
 }
 /**
  * send email to validator for current leave represented by (id)
- * @param $id validator for current leave represented by (id)
+ *
- * @param $cancreate flag for user right
+ * @param int		$id validator for current leave represented by (id)
- * @param $now date
+ * @param int 	$cancreate flag for user right
- * @param $autoValidation boolean flag on autovalidation
+ * @param int 	$now date
+ * @param int		$autoValidation boolean flag on autovalidation
+ *
  * @return stdClass
  * @throws Exception
  */

htdocs/langs/en_US/admin.lang

@@ -2307,7 +2307,10 @@ MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
 UsePassword=Use a password
 UseOauth=Use a OAUTH token
 Images=Images
+Posts=Posts
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
+MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with an IP Address
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is: 
 ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
 DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>

htdocs/public/ticket/create_ticket.php

@@ -232,10 +232,35 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$object->db->begin();
+			$object->type_code = GETPOST("type_code", 'aZ09');
+			$object->category_code = GETPOST("category_code", 'aZ09');
+			$object->severity_code = GETPOST("severity_code", 'aZ09');
+			$object->ip = getUserRemoteIP();
+
+			$nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 1000);
+
+			// Calculate nb of post for IP
+			$nb_post_ip = 0;
+			if ($nb_post_max > 0) {	// Calculate only if there is a limit to check
+				$sql = "SELECT COUNT(ref) as nb_tickets";
+				$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
+				$sql .= " WHERE ip = '".$db->escape($object->ip)."'";
+				$resql = $db->query($sql);
+				if ($resql) {
+					$num = $db->num_rows($resql);
+					$i = 0;
+					while ($i < $num) {
+						$i++;
+						$obj = $db->fetch_object($resql);
+						$nb_post_ip = $obj->nb_tickets;
+					}
+				}
+			}
 
 			$object->track_id = generate_random_id(16);
 
+			$object->db->begin();
+
 			$object->subject = GETPOST("subject", "restricthtml");
 			$object->message = GETPOST("message", "restricthtml");
 			$object->origin_email = $origin_email;
@@ -301,114 +326,81 @@ if (empty($reshook)) {
 
 			$object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
 
-			$id = $object->create($user);
+			if ($nb_post_max > 0 && $nb_post_ip >= $nb_post_max) {
-			if ($id <= 0) {
 				$error++;
-				$errors = ($object->error ? array($object->error) : $object->errors);
+				$errors = array($langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
-				array_push($object->errors, $object->error ? array($object->error) : $object->errors);
+				array_push($object->errors, array($langs->trans("AlreadyTooMuchPostOnThisIPAdress")));
 				$action = 'create_ticket';
 			}
 
+			if (!$error) {
+				$id = $object->create($user);
+				if ($id <= 0) {
+					$error++;
+					$errors = ($object->error ? array($object->error) : $object->errors);
+					array_push($object->errors, $object->error ? array($object->error) : $object->errors);
+					$action = 'create_ticket';
+				}
+			}
+
 			if (!$error && $id > 0) {
 				if ($usertoassign > 0) {
 					$object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0);
 				}
-			}
 
-			if (!$error) {
+				if (!$error) {
-				$object->db->commit();
+					$object->db->commit();
-				$action = "infos_success";
+					$action = "infos_success";
-			} else {
+				} else {
-				$object->db->rollback();
+					$object->db->rollback();
-				setEventMessages($object->error, $object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
-				$action = 'create_ticket';
+					$action = 'create_ticket';
-			}
+				}
 
-			if (!$error) {
+				if (!$error) {
-				$res = $object->fetch($id);
+					$res = $object->fetch($id);
-				if ($res) {
+					if ($res) {
-					// Create form object
+						// Create form object
-					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+						include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-					$formmail = new FormMail($db);
+						$formmail = new FormMail($db);
 
-					// Init to avoid errors
+						// Init to avoid errors
-					$filepath = array();
+						$filepath = array();
-					$filename = array();
+						$filename = array();
-					$mimetype = array();
+						$mimetype = array();
 
-					$attachedfiles = $formmail->get_attached_files();
+						$attachedfiles = $formmail->get_attached_files();
-					$filepath = $attachedfiles['paths'];
+						$filepath = $attachedfiles['paths'];
-					$filename = $attachedfiles['names'];
+						$filename = $attachedfiles['names'];
-					$mimetype = $attachedfiles['mimes'];
+						$mimetype = $attachedfiles['mimes'];
 
-					// Send email to customer
+						// Send email to customer
 
-					$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
+						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
-					$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
+						$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
-					$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
+						$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
-					$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+						$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-					$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
+						$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
-					$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
+						$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
 
-					$message .= $infos_new_ticket;
+						$message .= $infos_new_ticket;
-					$message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name));
+						$message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name));
 
-					$sendto = GETPOST('email', 'alpha');
+						$sendto = GETPOST('email', 'alpha');
 
-					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
+						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
-					$replyto = $from;
-					$sendtocc = '';
-					$deliveryreceipt = 0;
-
-					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-						$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-						$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-					}
-					include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
-					if ($mailfile->error || !empty($mailfile->errors)) {
-						setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-					} else {
-						$result = $mailfile->sendfile();
-					}
-					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-						$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-					}
-
-					// Send email to TICKET_NOTIFICATION_EMAIL_TO
-					$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-					if ($sendto) {
-						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
-						$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
-						$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-						$message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
-						// Extrafields
-						$extrafields->fetch_name_optionals_label($object->table_element);
-						if (is_array($object->array_options) && count($object->array_options) > 0) {
-							foreach ($object->array_options as $key => $value) {
-								$key = substr($key, 8); // remove "options_"
-								$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).'</li>';
-							}
-						}
-						$message_admin .= '</ul>';
-
-						$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-						$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 						$replyto = $from;
+						$sendtocc = '';
+						$deliveryreceipt = 0;
 
 						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 							$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 						}
 						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
+						$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
 						if ($mailfile->error || !empty($mailfile->errors)) {
 							setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 						} else {
@@ -417,32 +409,74 @@ if (empty($reshook)) {
 						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 						}
+
+						// Send email to TICKET_NOTIFICATION_EMAIL_TO
+						$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+						if ($sendto) {
+							$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
+							$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
+							$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+							$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+							$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+							$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+							$message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
+							// Extrafields
+							$extrafields->fetch_name_optionals_label($object->table_element);
+							if (is_array($object->array_options) && count($object->array_options) > 0) {
+								foreach ($object->array_options as $key => $value) {
+									$key = substr($key, 8); // remove "options_"
+									$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).'</li>';
+								}
+							}
+							$message_admin .= '</ul>';
+
+							$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+							$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+							$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+							$replyto = $from;
+
+							if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+							}
+							include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+							$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
+							if ($mailfile->error || !empty($mailfile->errors)) {
+								setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+							} else {
+								$result = $mailfile->sendfile();
+							}
+							if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+								$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+							}
+						}
 					}
+
+					// Copy files into ticket directory
+					$destdir = $conf->ticket->dir_output.'/'.$object->ref;
+					if (!dol_is_dir($destdir)) {
+						dol_mkdir($destdir);
+					}
+					foreach ($filename as $i => $val) {
+						dol_move($filepath[$i], $destdir.'/'.$filename[$i], 0, 1);
+						$formmail->remove_attached_files($i);
+					}
+
+					//setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
+
+					// Make a redirect to avoid to have ticket submitted twice if we make back
+					$messagetoshow = $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '{s1}', '{s2}');
+					$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
+					setEventMessages($messagetoshow, null, 'warnings');
+					setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
+
+					header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
+					exit;
 				}
-
+			} else {
-				// Copy files into ticket directory
+				setEventMessages($object->error, $object->errors, 'errors');
-				$destdir = $conf->ticket->dir_output.'/'.$object->ref;
-				if (!dol_is_dir($destdir)) {
-					dol_mkdir($destdir);
-				}
-				foreach ($filename as $i => $val) {
-					dol_move($filepath[$i], $destdir.'/'.$filename[$i], 0, 1);
-					$formmail->remove_attached_files($i);
-				}
-
-				//setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
-
-				// Make a redirect to avoid to have ticket submitted twice if we make back
-				$messagetoshow = $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '{s1}', '{s2}');
-				$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
-				setEventMessages($messagetoshow, null, 'warnings');
-				setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
-
-				header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
-				exit;
 			}
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }

htdocs/takepos/send.php

@@ -82,7 +82,7 @@ if ($action == "send") {
 	$sendto = $email;
 	$from = $mysoc->email;
 	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
-	if ($mail->error || $mail->errors) {
+	if ($mail->error || !empty($mail->errors)) {
 		setEventMessages($mail->error, $mail->errors, 'errors');
 	} else {
 		$result = $mail->sendfile();

htdocs/ticket/class/ticket.class.php

@@ -467,7 +467,8 @@ class Ticket extends CommonObject
 			$sql .= "date_read,";
 			$sql .= "date_close,";
 			$sql .= "entity,";
-			$sql .= "notify_tiers_at_create";
+			$sql .= "notify_tiers_at_create,";
+			$sql .= "ip";
 			$sql .= ") VALUES (";
 			$sql .= " ".(!isset($this->ref) ? '' : "'".$this->db->escape($this->ref)."'").",";
 			$sql .= " ".(!isset($this->track_id) ? 'NULL' : "'".$this->db->escape($this->track_id)."'").",";
@@ -492,6 +493,7 @@ class Ticket extends CommonObject
 			$sql .= " ".(!isset($this->date_close) || dol_strlen($this->date_close) == 0 ? 'NULL' : "'".$this->db->idate($this->date_close)."'")."";
 			$sql .= ", ".((int) $conf->entity);
 			$sql .= ", ".(!isset($this->notify_tiers_at_create) ? '1' : "'".$this->db->escape($this->notify_tiers_at_create)."'");
+			$sql .= ", ".(!isset($this->ip) ? 'NULL' : "'".$this->db->escape($this->ip)."'");
 			$sql .= ")";
 
 			$this->db->begin();