Dolibarr / dolibarr

htdocs/commande/class/orderline.class.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';		// Because the CommonOrderLine is still in commonorder.class.php file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; // Because the CommonOrderLine is still in commonorder.class.php file
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 
 
@@ -221,7 +221,7 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			if (!$objp) {
-				$this->error = 'OrderLine with id '. $rowid .' not found sql='.$sql;
+				$this->error = 'OrderLine with id '.$rowid.' not found sql='.$sql;
 				return 0;
 			}
 
@@ -266,7 +266,7 @@ 
 			$this->product_desc     = $objp->product_desc;
 			$this->product_tobatch  = $objp->product_tobatch;
 			$this->fk_unit          = $objp->fk_unit;
-			$this->packaging      	= $objp->packaging;
+			$this->packaging = $objp->packaging;
 
 			$this->date_start       = $this->db->jdate($objp->date_start);
 			$this->date_end         = $this->db->jdate($objp->date_end);
@@ -311,8 +311,8 @@ 
 		// check if order line is not in a shipment line before deleting
 		$sqlCheckShipmentLine = "SELECT";
 		$sqlCheckShipmentLine .= " ed.rowid";
-		$sqlCheckShipmentLine .= " FROM " . MAIN_DB_PREFIX . "expeditiondet ed";
-		$sqlCheckShipmentLine .= " WHERE ed.fk_elementdet = " . ((int) $this->id);
+		$sqlCheckShipmentLine .= " FROM ".MAIN_DB_PREFIX."expeditiondet ed";
+		$sqlCheckShipmentLine .= " WHERE ed.fk_elementdet = ".((int) $this->id);
 
 		$resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
 		if (!$resqlCheckShipmentLine) {
@@ -325,13 +325,13 @@ 
 			if ($num > 0) {
 				$error++;
 				$objCheckShipmentLine = $this->db->fetch_object($resqlCheckShipmentLine);
-				$this->error = $langs->trans('ErrorRecordAlreadyExists') . ' : ' . $langs->trans('ShipmentLine') . ' ' . $objCheckShipmentLine->rowid;
+				$this->error = $langs->trans('ErrorRecordAlreadyExists').' : '.$langs->trans('ShipmentLine').' '.$objCheckShipmentLine->rowid;
 				$this->errors[] = $this->error;
 			}
 			$this->db->free($resqlCheckShipmentLine);
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . 'Error ; ' . $this->error, LOG_ERR);
+			dol_syslog(__METHOD__.'Error ; '.$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -347,7 +347,7 @@ 
 		}
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . "commandedet WHERE rowid = " . ((int) $this->id);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid = ".((int) $this->id);
 
 			dol_syslog("OrderLine::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -362,7 +362,7 @@ 
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
-				dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 			}
 		}
 
@@ -372,8 +372,8 @@ 
 		}
 
 		foreach ($this->errors as $errmsg) {
-			dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-			$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 		}
 		$this->db->rollback();
 		return -1 * $error;

htdocs/emailcollector/class/emailcollector.class.php

Spacing +69 added lines, -69 removed lines

@@ -24,25 +24,25 @@ 
  */
 
 // Put here all includes required by your class file
-include_once DOL_DOCUMENT_ROOT .'/emailcollector/lib/emailcollector.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';                   // Customer Proposal
-require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';                    // Sale Order
-require_once DOL_DOCUMENT_ROOT .'/compta/facture/class/facture.class.php';               // Customer Invoice
-require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';                      // Contact / Address
-require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';                // Shipping / Delivery
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.commande.class.php';           // Purchase Order
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.facture.class.php';            // Purchase Invoice
-require_once DOL_DOCUMENT_ROOT .'/projet/class/project.class.php';                       // Project
-require_once DOL_DOCUMENT_ROOT .'/reception/class/reception.class.php';                  // Reception
-require_once DOL_DOCUMENT_ROOT .'/recruitment/class/recruitmentcandidature.class.php';   // Recruiting
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';                      // Third-Party
-require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php';  // Supplier Proposal
-require_once DOL_DOCUMENT_ROOT .'/ticket/class/ticket.class.php';                        // Ticket
+include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; // Customer Proposal
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; // Sale Order
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; // Customer Invoice
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; // Contact / Address
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; // Shipping / Delivery
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; // Purchase Order
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; // Purchase Invoice
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; // Project
+require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php'; // Reception
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php'; // Recruiting
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; // Third-Party
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; // Supplier Proposal
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php'; // Ticket
 //require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport.class.php';        // Expense Report
 //require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';                    // Holidays (leave request)
 
@@ -834,7 +834,7 @@ 
 		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && getDolGlobalString('IMAP_FORCE_NOSSL'))) {
 			$flags .= '';
 		} else {
-			$flags .= '/' . $this->imap_encryption;
+			$flags .= '/'.$this->imap_encryption;
 		}
 
 		$flags .= '/novalidate-cert';
@@ -864,9 +864,9 @@ 
 	{
 		if (function_exists('mb_convert_encoding')) {
 			// change spaces by entropy because mb_convert fail with spaces
-			$str = preg_replace("/ /", "xxxSPACExxx", $str);		// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/ /", "xxxSPACExxx", $str); // the replacement string must be valid in utf7 so _ can't be used
 			$str = preg_replace("/_/", "xxxUNDERSCORExxx", $str); // encode underscore to avoid encoding issues with mb_convert
-			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str);	// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str); // the replacement string must be valid in utf7 so _ can't be used
 			// if mb_convert work
 			if ($str = mb_convert_encoding($str, "UTF-7")) {
 				// change characters
@@ -1488,7 +1488,7 @@ 
 				}
 				if ($fromdate > 0) {
 					// $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
-					array_push($criteria, array("SINCE" => date('j-M-Y', $fromdate - 1)));	// -1 is to add a security to no forgot some email
+					array_push($criteria, array("SINCE" => date('j-M-Y', $fromdate - 1))); // -1 is to add a security to no forgot some email
 				}
 				//$search.=($search?' ':'').'SINCE 8-Apr-2022';
 			}
@@ -1515,7 +1515,7 @@ 
 				}
 
 				if ($rule['type'] == 'from') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'FROM "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1525,7 +1525,7 @@ 
 					}
 				}
 				if ($rule['type'] == 'to') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'TO "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1654,7 +1654,7 @@ 
 					$tmpsourcedir = $this->getEncodedUtf7($sourcedir);
 				}
 
-				$f = $client->getFolders(false, $tmpsourcedir);	// Note the search of directory do a search on sourcedir*
+				$f = $client->getFolders(false, $tmpsourcedir); // Note the search of directory do a search on sourcedir*
 				if ($f) {
 					$folder = $f[0];
 					if ($folder instanceof Webklex\PHPIMAP\Folder) {
@@ -1692,7 +1692,7 @@ 
 					$Query->leaveUnread();
 				}
 				$arrayofemail = $Query->limit($this->maxemailpercollect)->setFetchOrder("asc")->get();
-				dol_syslog("EmailCollector::doCollectOneCollector nb arrayofemail ".(is_array($arrayofemail) ? count($arrayofemail) : 'Not array'));	// @phpstan-ignore-line
+				dol_syslog("EmailCollector::doCollectOneCollector nb arrayofemail ".(is_array($arrayofemail) ? count($arrayofemail) : 'Not array')); // @phpstan-ignore-line
 				//var_dump($arrayofemail);
 			} catch (Exception $e) {
 				$this->error = $e->getMessage();
@@ -1715,7 +1715,7 @@ 
 			}
 		}
 
-		$arrayofemailtodelete = array();	// Track email to delete to make the deletion at end.
+		$arrayofemailtodelete = array(); // Track email to delete to make the deletion at end.
 
 		// Loop on each email found
 		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0 && $connection !== false) {
@@ -1747,7 +1747,7 @@ 
 				// GET header and overview datas
 				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					'@phan-var-force Webklex\PHPIMAP\Message $imapemail';
-					$header = $imapemail->getHeader()->raw;  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$header = $imapemail->getHeader()->raw; // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 					$overview = $imapemail->getAttributes();
 				} else {
 					$header = imap_fetchheader($connection, $imapemail, FT_UID);
@@ -1944,7 +1944,7 @@ 
 
 
 				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
-					$dateformated = dol_print_date($overview['date'], 'dayrfc', 'gmt');		// May generate a warning "dol_print_date($overview['date'], 'dayrfc', 'gmt')" in log
+					$dateformated = dol_print_date($overview['date'], 'dayrfc', 'gmt'); // May generate a warning "dol_print_date($overview['date'], 'dayrfc', 'gmt')" in log
 					dol_syslog("msgid=".$overview['message_id']." date=".$dateformated." from=".$overview['from']." to=".$overview['to']." subject=".$overview['subject']);
 
 					// Removed emojis
@@ -1977,7 +1977,7 @@ 
 						$attachments = [];
 					}
 				} else {
-					$this->getmsg($connection, $imapemail);	// This set global var $charset, $htmlmsg, $plainmsg, $attachments
+					$this->getmsg($connection, $imapemail); // This set global var $charset, $htmlmsg, $plainmsg, $attachments
 				}
 				'@phan-var-force Webklex\PHPIMAP\Attachment[] $attachments';
 
@@ -2074,10 +2074,10 @@ 
 					$sendtocc = empty($overview['cc']) ? '' : $overview['cc'];
 					$sendtobcc = empty($overview['bcc']) ? '' : $overview['bcc'];
 
-					$tmpdate = $overview['date']->toDate();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
-					$tmptimezone = $tmpdate->getTimezone()->getName();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmpdate = $overview['date']->toDate(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmptimezone = $tmpdate->getTimezone()->getName(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 
-					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt');    // if $overview['timezone'] is "+00:00"
+					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt'); // if $overview['timezone'] is "+00:00"
 					if (preg_match('/^([+\-])(\d\d):(\d\d)/', $tmptimezone, $reg)) {
 						if ($reg[1] == '+' && ($reg[2] != '00' || $reg[3] != '00')) {
 							$dateemail -= (3600 * (int) $reg[2]);
@@ -2091,7 +2091,7 @@ 
 					$subject = $overview['subject'];
 				} else {
 					$fromstring = $overview[0]->from;
-					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : "")) ;
+					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : ""));
 
 					$sender = !empty($overview[0]->sender) ? $overview[0]->sender : '';
 					$to = $overview[0]->to;
@@ -2164,17 +2164,17 @@ 
 				foreach ($arrayofreferences as $reference) {
 					//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($dateemail, 'dayhour', 'gmt').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
 					if (!empty($trackidfoundintorecipienttype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintorecipienttype;
 						$reg[2] = $trackidfoundintorecipientid;
 					} elseif (!empty($trackidfoundintomsgidtype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintomsgidtype;
 						$reg[2] = $trackidfoundintomsgidid;
 					} else {
-						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);	// trackid found or not
+						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg); // trackid found or not
 						if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
-							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);	// trackid found
+							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg); // trackid found
 						}
 					}
 
@@ -2342,7 +2342,7 @@ 
 								}
 								if ($changeonticket_references) {
 									$operationslog .= '<br>We complete ticket ID='.$ticketid.' with property origin_references='.$objectemail->origin_references;
-									$objectemail->update($user, 1);		// We complete the references field with all references mentioned into this email. This field is for technical tracking purpose, not a user field, so no need to execute triggers
+									$objectemail->update($user, 1); // We complete the references field with all references mentioned into this email. This field is for technical tracking purpose, not a user field, so no need to execute triggers
 								}
 							}
 						}
@@ -2472,7 +2472,7 @@ 
 
 						// Make Operation
 						dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
-						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);	// If a Dolibarr tracker id is found, we should now the id of object
+						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type); // If a Dolibarr tracker id is found, we should now the id of object
 
 						// Try to guess if this is an email in or out.
 						$actioncode = 'EMAIL_IN';
@@ -2530,7 +2530,7 @@ 
 									$operationslog .= '<br>Ticket not found using trackid='.$trackid.' or msgid='.$msgid;
 									$ticketalreadyexists = 0;
 								} else {
-									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid.", we replace operation 'ticket' with 'recordevent' to add a new message";	// We change the operation type to do
+									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid.", we replace operation 'ticket' with 'recordevent' to add a new message"; // We change the operation type to do
 									$ticketalreadyexists = 1;
 									$operation['type'] = 'recordevent';
 								}
@@ -2776,11 +2776,11 @@ 
 									$result = $contactstatic->fetch(0, null, '', $from);
 									if ($result < 0) {
 										$errorforactions++;
-										$this->error = 'Error when getting contact with email ' . $from;
+										$this->error = 'Error when getting contact with email '.$from;
 										$this->errors[] = $this->error;
 										break;
 									} elseif ($result == 0) {
-										dol_syslog("Contact with email " . $from . " was not found. We try to create it.");
+										dol_syslog("Contact with email ".$from." was not found. We try to create it.");
 										$contactstatic = new Contact($this->db);
 
 										// Create contact
@@ -2795,28 +2795,28 @@ 
 										} else {
 											// Search country by name or code
 											if (!empty($contactstatic->country)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry('', '3', $this->db, null, 1, $contactstatic->country);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this name '" . $contactstatic->country . "'";
+													$this->error = "Error country not found by this name '".$contactstatic->country."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this name '" . $contactstatic->country . "'";
+													$this->error = "Error when search country by this name '".$contactstatic->country."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
 													$operationslog .= '<br>We set property country_id='.dol_escape_htmltag($result);
 												}
 											} elseif (!empty($contactstatic->country_code)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry($contactstatic->country_code, '3', $this->db);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error country not found by this code '".$contactstatic->country_code."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error when search country by this code '".$contactstatic->country_code."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
@@ -2827,28 +2827,28 @@ 
 											if (!$errorforactions) {
 												// Search state by name or code (for country if defined)
 												if (!empty($contactstatic->state)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state, 'c_departements', 'nom', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this name '" . $contactstatic->state . "'";
+														$this->error = "Error state not found by this name '".$contactstatic->state."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this name '" . $contactstatic->state . "'";
+														$this->error = "Error when search state by this name '".$contactstatic->state."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
 														$operationslog .= '<br>We set property state_id='.dol_escape_htmltag($result);
 													}
 												} elseif (!empty($contactstatic->state_code)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state_code, 'c_departements', 'code_departement', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error state not found by this code '".$contactstatic->state_code."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error when search state by this code '".$contactstatic->state_code."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
@@ -2913,8 +2913,8 @@ 
 								$actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
 								$actioncomm->note_private = $descriptionfull;
 								$actioncomm->fk_project  = $projectstatic->id;
-								$actioncomm->datep       = $dateemail;	// date of email
-								$actioncomm->datef       = $dateemail;	// date of email
+								$actioncomm->datep       = $dateemail; // date of email
+								$actioncomm->datef       = $dateemail; // date of email
 								$actioncomm->percentage  = -1; // Not applicable
 								$actioncomm->socid       = $thirdpartystatic->id;
 								$actioncomm->contact_id = $contactstatic->id;
@@ -3115,7 +3115,7 @@ 
 								}
 								$hookmanager->initHooks(array('emailcolector'));
 								$parameters = array('arrayobject' => $arrayobject);
-								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters);    // Note that $action and $object may have been modified by some hooks
+								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters); // Note that $action and $object may have been modified by some hooks
 								if ($reshook > 0) {
 									$arrayobject = $hookmanager->resArray;
 								}
@@ -3124,10 +3124,10 @@ 
 
 								foreach ($arrayobject as $key => $objectdesc) {
 									$sql = 'SELECT DISTINCT t.rowid ';
-									$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->db->sanitize($objectdesc['table']) . ' AS t';
+									$sql .= ' FROM '.MAIN_DB_PREFIX.$this->db->sanitize($objectdesc['table']).' AS t';
 									$sql .= ' WHERE ';
 									foreach ($objectdesc['fields'] as $field) {
-										$sql .= "('" .$this->db->escape($subject) . "'  LIKE CONCAT('%',  t." . $this->db->sanitize($field) . ", '%') AND t." . $this->db->sanitize($field) . " <> '') OR ";
+										$sql .= "('".$this->db->escape($subject)."'  LIKE CONCAT('%',  t.".$this->db->sanitize($field).", '%') AND t.".$this->db->sanitize($field)." <> '') OR ";
 									}
 									$sql = substr($sql, 0, -4);
 
@@ -3148,8 +3148,8 @@ 
 									foreach ($ids as $val) {
 										$res = $objectmanaged->fetch($val);
 										if ($res) {
-											$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
-											$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
+											$path = ($objectmanaged->entity > 1 ? "/".$objectmanaged->entity : '');
+											$dirs[] = DOL_DATA_ROOT.$path."/".$elementpath.'/'.dol_sanitizeFileName($objectmanaged->ref).'/';
 										} else {
 											$this->errors[] = 'object not found';
 										}
@@ -3158,7 +3158,7 @@ 
 								foreach ($dirs as $target) {
 									$prefix = $this->actions[$this->id]['actionparam'];
 									foreach ($data as $filename => $content) {
-										$resr = saveAttachment($target, $prefix . '_' . $filename, $content);
+										$resr = saveAttachment($target, $prefix.'_'.$filename, $content);
 										if ($resr == -1) {
 											$this->errors[] = 'Doc not saved';
 										}
@@ -3205,7 +3205,7 @@ 
 								$percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
 
 								$projecttocreate->title = $subject;
-								$projecttocreate->date_start = $dateemail;	// date of email
+								$projecttocreate->date_start = $dateemail; // date of email
 								$projecttocreate->date_end = 0;
 								$projecttocreate->opp_status = $id_opp_status;
 								$projecttocreate->opp_percent = $percent_opp_status;
@@ -3505,7 +3505,7 @@ 
 								$candidaturetocreate->note_private = $descriptionfull;
 								$candidaturetocreate->entity = $conf->entity;
 								$candidaturetocreate->email_msgid = $msgid;
-								$candidaturetocreate->email_date = $dateemail;		// date of email
+								$candidaturetocreate->email_date = $dateemail; // date of email
 								$candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
 								//$candidaturetocreate->fk_contact = $contactstatic->id;
 
@@ -3915,8 +3915,8 @@ 
 				 * append increment number to the original filename
 				 */
 				while (file_exists($destdir.$file_name.".".$extension)) {
-					$file_name = $file_name_original . ' (' . $num . ')';
-					$file_name_complete = $file_name . "." . $extension;
+					$file_name = $file_name_original.' ('.$num.')';
+					$file_name_complete = $file_name.".".$extension;
 					$destination = $destdir.$file_name_complete;
 					$num++;
 				}
@@ -4030,7 +4030,7 @@ 
 	 */
 	private function saveAttachment($destdir, $filename, $content)
 	{
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 		$tmparraysize = getDefaultImageSizes();
 		$maxwidthsmall = $tmparraysize['maxwidthsmall'];

htdocs/ticket/class/ticket.class.php

Spacing +18 added lines, -18 removed lines

@@ -254,14 +254,14 @@ 
 	/**
 	 * Status
 	 */
-	const STATUS_NOT_READ = 0;			// Draft. Not take into account yet.
-	const STATUS_READ = 1;				// Ticket was read.
-	const STATUS_ASSIGNED = 2;			// Ticket was just assigned to someone. Not in progress yet.
-	const STATUS_IN_PROGRESS = 3;		// In progress
-	const STATUS_NEED_MORE_INFO = 5;	// Waiting requester feedback
-	const STATUS_WAITING = 7;			// On hold
-	const STATUS_CLOSED = 8;			// Closed - Solved
-	const STATUS_CANCELED = 9;			// Closed - Not solved
+	const STATUS_NOT_READ = 0; // Draft. Not take into account yet.
+	const STATUS_READ = 1; // Ticket was read.
+	const STATUS_ASSIGNED = 2; // Ticket was just assigned to someone. Not in progress yet.
+	const STATUS_IN_PROGRESS = 3; // In progress
+	const STATUS_NEED_MORE_INFO = 5; // Waiting requester feedback
+	const STATUS_WAITING = 7; // On hold
+	const STATUS_CLOSED = 8; // Closed - Solved
+	const STATUS_CANCELED = 9; // Closed - Not solved
 
 
 	/**
@@ -1586,9 +1586,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('category') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_TICKET, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_TICKET, 1);
 		}
 
 		return $datas;
@@ -1833,7 +1833,7 @@ 
 		// Insert entry into agenda with code 'TICKET_MSG'
 		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code = 'AC_OTH_AUTO';	// This is not an entry that must appears into manual calendar but only into CRM calendar
+		$actioncomm->type_code = 'AC_OTH_AUTO'; // This is not an entry that must appears into manual calendar but only into CRM calendar
 		$actioncomm->code = 'TICKET_MSG';
 		if ($this->private) {
 			$actioncomm->code = 'TICKET_MSG_PRIVATE';
@@ -1847,7 +1847,7 @@ 
 		$actioncomm->socid = $this->socid;
 		$actioncomm->label = $this->subject;
 		$actioncomm->note_private = $this->message;
-		$actioncomm->userassigned = array($user->id => array('id' => $user->id,'transparency' => 0));
+		$actioncomm->userassigned = array($user->id => array('id' => $user->id, 'transparency' => 0));
 		$actioncomm->userownerid = $user->id;
 		$actioncomm->datep = $now;
 		$actioncomm->percentage = -1; // percentage is not relevant for punctual events
@@ -2431,7 +2431,7 @@ 
 						'email' => $obj->email,
 						'rowid' => (int) $obj->rowid,
 						'code' => $obj->code,
-						'libelle' => $labelType,		// deprecated, replaced with labeltype
+						'libelle' => $labelType, // deprecated, replaced with labeltype
 						'labeltype' => $labelType,
 						'status' => $obj->statuslink,
 						'statuscontact' => (int) $obj->statuscontact,
@@ -2518,7 +2518,7 @@ 
 			if (is_resource($handle)) {
 				while (($file = readdir($handle)) !== false) {
 					if (!utf8_check($file)) {
-						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1');	// To be sure data is stored in UTF8 in memory
+						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
 					}
 					if (dol_is_file($dir.$file)) {
 						return true;
@@ -2556,7 +2556,7 @@ 
 		$formmail->trackid = (is_null($forcetrackid) ? 'tic'.$this->id : '');
 		$attachedfiles = $formmail->get_attached_files();
 
-		$filepath = $attachedfiles['paths'];	// path is for example user->dir_temp.'/'.$user->id.'/'...
+		$filepath = $attachedfiles['paths']; // path is for example user->dir_temp.'/'.$user->id.'/'...
 		$filename = $attachedfiles['names'];
 		$mimetype = $attachedfiles['mimes'];
 
@@ -2977,10 +2977,10 @@ 
 
 								// If public interface is not enable, use link to internal page into mail
 								$url_public_ticket = (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE') ?
-										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
+										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE').'/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
 
 								if (getDolGlobalInt('TICKET_INCLUDE_LINK_TO_PUBLIC_INTERFACE_IN_MESSAGE')) {
-									$message .= '<br>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="' . $url_public_ticket . '">' . $object->track_id . '</a><br>';
+									$message .= '<br>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$object->track_id.'</a><br>';
 								}
 
 								// Build final message
@@ -3025,7 +3025,7 @@ 
 									if ($result) {
 										// update last_msg_sent date of ticket (for last message sent to external users)
 										$this->date_last_msg_sent = dol_now();
-										$this->update($user, 1);	// disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
+										$this->update($user, 1); // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
 
 										// update event actioncomm $id
 										//print 'update actioncomm id='.$id.' with sendto='.json_encode($sendto)." sendtocc=".json_encode($sendtocc)." email_msgid=".json_encode($this->email_msgid);