Dolibarr / dolibarr

htdocs/emailcollector/class/emailcollector.class.php

Braces +257 added lines, -95 removed lines

@@ -212,8 +212,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val)
@@ -473,7 +477,10 @@ 
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 
@@ -512,15 +519,21 @@ 
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -528,8 +541,11 @@ 
 		$hookmanager->initHooks(array('emailcollectordao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -567,7 +583,9 @@ 
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -661,7 +679,9 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return 1;
 	}
@@ -693,7 +713,9 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 	}
 
 
@@ -710,11 +732,16 @@ 
 
 		// Connect to IMAP
 		$flags = '/service=imap'; // IMAP
-		if ($ssl) $flags .= '/ssl'; // '/tls'
+		if ($ssl) {
+			$flags .= '/ssl';
+		}
+		// '/tls'
 		$flags .= '/novalidate-cert';
 		//$flags.='/readonly';
 		//$flags.='/debug';
-		if ($norsh || !empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
+		if ($norsh || !empty($conf->global->IMPA_FORCE_NORSH)) {
+			$flags .= '/norsh';
+		}
 
 		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
@@ -770,7 +797,9 @@ 
 			dol_syslog("doCollect result = ".$result." for emailcollector->id = ".$emailcollector->id);
 
 			$this->error .= 'EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
-			if (!empty($emailcollector->errors)) $this->error .= join('<br>', $emailcollector->errors);
+			if (!empty($emailcollector->errors)) {
+				$this->error .= join('<br>', $emailcollector->errors);
+			}
 			$this->output .= 'EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
 		}
 
@@ -805,7 +834,10 @@ 
 			} else {
 				$tmpproperty = $tmparray[0];
 			}
-			if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
+			if ($tmpclass && ($tmpclass != $object->element)) {
+				continue;
+			}
+			// Property is for another type of object
 
 			//if (property_exists($object, $tmpproperty) || preg_match('/^options_/', $tmpproperty))
 			if ($tmpproperty)
@@ -827,16 +859,26 @@ 
 				}
 				if (!empty($sourcefield) && !empty($regexstring))
 				{
-					if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-					elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-					elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+					if (strtolower($sourcefield) == 'body') {
+						$sourcestring = $messagetext;
+					} elseif (strtolower($sourcefield) == 'subject') {
+						$sourcestring = $subject;
+					} elseif (strtolower($sourcefield) == 'header') {
+						$sourcestring = $header;
+					}
 
 					if ($sourcestring)
 					{
 						$regforval = array();
 						$regexoptions = '';
-						if (strtolower($sourcefield) == 'body') $regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
-						if (strtolower($sourcefield) == 'header') $regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+						if (strtolower($sourcefield) == 'body') {
+							$regexoptions = 'ms';
+						}
+						// The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
+						if (strtolower($sourcefield) == 'header') {
+							$regexoptions = 'm';
+						}
+						// The m means ^ and $ char is valid at each new line.
 
 						//var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
 						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval))
@@ -862,8 +904,11 @@ 
 				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
 				{
 					$valuecurrent = '';
-					if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
-					else $valuecurrent = $object->$tmpproperty;
+					if (preg_match('/^options_/', $tmpproperty)) {
+						$valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
+					} else {
+						$valuecurrent = $object->$tmpproperty;
+					}
 
 					if ($regforregex[1] == 'SET' || empty($valuecurrent))
 					{
@@ -872,13 +917,15 @@ 
 						$matcharray = array();
 						preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray);
 						//var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray);
-						if (is_array($matcharray[1]))    // $matcharray[1] is array with list of substitution key found without the __
+						if (is_array($matcharray[1])) {
+							// $matcharray[1] is array with list of substitution key found without the __
 						{
 							foreach ($matcharray[1] as $keytoreplace)
 							{
 								if ($keytoreplace && isset($object->$keytoreplace))
 								{
 									$substitutionarray['__'.$keytoreplace.'__'] = $object->$keytoreplace;
+						}
 								}
 							}
 						}
@@ -886,8 +933,11 @@ 
 						dol_syslog(var_export($substitutionarray, true));
 						//var_dump($substitutionarray);
 						$valuetouse = make_substitutions($valuetouse, $substitutionarray);
-						if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
-						else $object->$tmpproperty = $valuetouse;
+						if (preg_match('/^options_/', $tmpproperty)) {
+							$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
+						} else {
+							$object->$tmpproperty = $valuetouse;
+						}
 					}
 				} else {
 					$errorforthisaction++;
@@ -977,7 +1027,9 @@ 
 		$searchfilterisnotanswer = 0;
 		foreach ($this->filters as $rule)
 		{
-			if (empty($rule['status'])) continue;
+			if (empty($rule['status'])) {
+				continue;
+			}
 
 			if ($rule['type'] == 'to') {
 				$tmprulevaluearray = explode('*', $rule['rulevalue']);
@@ -989,22 +1041,50 @@ 
 					$search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $rule['rulevalue']).'"';
 				}
 			}
-			if ($rule['type'] == 'bcc')     $search .= ($search ? ' ' : '').'BCC';
-			if ($rule['type'] == 'cc')      $search .= ($search ? ' ' : '').'CC';
-			if ($rule['type'] == 'from')    $search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'subject') $search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'body')    $search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'header')  $search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
-
-			if ($rule['type'] == 'notinsubject') $search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'notinbody') $search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
-
-			if ($rule['type'] == 'seen')    $search .= ($search ? ' ' : '').'SEEN';
-			if ($rule['type'] == 'unseen')  $search .= ($search ? ' ' : '').'UNSEEN';
-			if ($rule['type'] == 'unanswered') $search .= ($search ? ' ' : '').'UNANSWERED';
-			if ($rule['type'] == 'answered')   $search .= ($search ? ' ' : '').'ANSWERED';
-			if ($rule['type'] == 'smaller') $search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'larger')  $search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'bcc') {
+				$search .= ($search ? ' ' : '').'BCC';
+			}
+			if ($rule['type'] == 'cc') {
+				$search .= ($search ? ' ' : '').'CC';
+			}
+			if ($rule['type'] == 'from') {
+				$search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'subject') {
+				$search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'body') {
+				$search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'header') {
+				$search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			}
+
+			if ($rule['type'] == 'notinsubject') {
+				$search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'notinbody') {
+				$search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+
+			if ($rule['type'] == 'seen') {
+				$search .= ($search ? ' ' : '').'SEEN';
+			}
+			if ($rule['type'] == 'unseen') {
+				$search .= ($search ? ' ' : '').'UNSEEN';
+			}
+			if ($rule['type'] == 'unanswered') {
+				$search .= ($search ? ' ' : '').'UNANSWERED';
+			}
+			if ($rule['type'] == 'answered') {
+				$search .= ($search ? ' ' : '').'ANSWERED';
+			}
+			if ($rule['type'] == 'smaller') {
+				$search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'larger') {
+				$search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
 
 			if ($rule['type'] == 'withtrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
 			if ($rule['type'] == 'withouttrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
@@ -1015,11 +1095,18 @@ 
 			if ($rule['type'] == 'isnotanswer') { $searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/'; }
 		}
 
-		if (empty($targetdir))	// Use last date as filter if there is no targetdir defined.
+		if (empty($targetdir)) {
+			// Use last date as filter if there is no targetdir defined.
 		{
 			$fromdate = 0;
-			if ($this->datelastok) $fromdate = $this->datelastok;
-			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)
+		}
+			if ($this->datelastok) {
+				$fromdate = $this->datelastok;
+			}
+			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)
 			//$search.=($search?' ':'').'SINCE 8-Apr-2018';
 		}
 		dol_syslog("IMAP search string = ".$search);
@@ -1178,7 +1265,9 @@ 
 					// Note: we can have
 					// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 					$isanswer = 0;
-					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+						$isanswer = 1;
+					}
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 
@@ -1193,7 +1282,9 @@ 
 						// Note: we can have
 						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 						$isanswer = 0;
-						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+							$isanswer = 1;
+						}
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 						if ($isanswer) {
@@ -1427,16 +1518,27 @@ 
 								$fk_element_id = $objectemail->id;
 								$fk_element_type = $objectemail->element;
 								// Fix fk_element_type
-								if ($fk_element_type == 'facture') $fk_element_type = 'invoice';
+								if ($fk_element_type == 'facture') {
+									$fk_element_type = 'invoice';
+								}
 
-								if (get_class($objectemail) != 'Societe') $thirdpartyid = $objectemail->fk_soc;
-								else $thirdpartyid = $objectemail->id;
+								if (get_class($objectemail) != 'Societe') {
+									$thirdpartyid = $objectemail->fk_soc;
+								} else {
+									$thirdpartyid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Contact') $contactid = $objectemail->fk_socpeople;
-								else $contactid = $objectemail->id;
+								if (get_class($objectemail) != 'Contact') {
+									$contactid = $objectemail->fk_socpeople;
+								} else {
+									$contactid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Project') $projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
-								else $projectid = $objectemail->id;
+								if (get_class($objectemail) != 'Project') {
+									$projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
+								} else {
+									$projectid = $objectemail->id;
+								}
 							}
 						}
 
@@ -1444,33 +1546,48 @@ 
 						if ($projectid > 0)
 						{
 							$result = $projectstatic->fetch($projectid);
-							if ($result <= 0) $projectstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$projectstatic->id = 0;
+							} else {
 								$projectid = $projectstatic->id;
-								if ($trackid) $projectfoundby = 'trackid ('.$trackid.')';
-								if (empty($contactid)) $contactid = $projectstatic->fk_contact;
-								if (empty($thirdpartyid)) $thirdpartyid = $projectstatic->fk_soc;
+								if ($trackid) {
+									$projectfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($contactid)) {
+									$contactid = $projectstatic->fk_contact;
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $projectstatic->fk_soc;
+								}
 							}
 						}
 						// Contact
 						if ($contactid > 0)
 						{
 							$result = $contactstatic->fetch($contactid);
-							if ($result <= 0) $contactstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$contactstatic->id = 0;
+							} else {
 								$contactid = $contactstatic->id;
-								if ($trackid) $contactfoundby = 'trackid ('.$trackid.')';
-								if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
+								if ($trackid) {
+									$contactfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $contactstatic->fk_soc;
+								}
 							}
 						}
 						// Thirdparty
 						if ($thirdpartyid > 0)
 						{
 							$result = $thirdpartystatic->fetch($thirdpartyid);
-							if ($result <= 0) $thirdpartystatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$thirdpartystatic->id = 0;
+							} else {
 								$thirdpartyid = $thirdpartystatic->id;
-								if ($trackid) $thirdpartyfoundby = 'trackid ('.$trackid.')';
+								if ($trackid) {
+									$thirdpartyfoundby = 'trackid ('.$trackid.')';
+								}
 							}
 						}
 
@@ -1481,9 +1598,11 @@ 
 					}
 				}
 
-				if (empty($contactid))		// Try to find contact using email
+				if (empty($contactid)) {
+					// Try to find contact using email
 				{
 					$result = $contactstatic->fetch(0, null, '', $from);
+				}
 
 					if ($result > 0)
 					{
@@ -1501,10 +1620,14 @@ 
 					}
 				}
 
-				if (empty($thirdpartyid))		// Try to find thirdparty using email
+				if (empty($thirdpartyid)) {
+					// Try to find thirdparty using email
 				{
 					$result = $thirdpartystatic->fetch(0, '', '', '', '', '', '', '', '', '', $from);
-					if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
+				}
+					if ($result > 0) {
+						$thirdpartyfoundby = 'email ('.$from.')';
+					}
 				}
 
 				// Do operations
@@ -1512,8 +1635,12 @@ 
 				{
 					$errorforthisaction = 0;
 
-					if ($errorforactions) break;
-					if (empty($operation['status'])) continue;
+					if ($errorforactions) {
+						break;
+					}
+					if (empty($operation['status'])) {
+						continue;
+					}
 
 					// Make Operation
 					dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
@@ -1521,7 +1648,9 @@ 
 
 					$actioncode = 'EMAIL_IN';
 					// If we scan the Sent box, we use the code for out email
-					if ($this->source_directory == 'Sent') $actioncode = 'EMAIL_OUT';
+					if ($this->source_directory == 'Sent') {
+						$actioncode = 'EMAIL_OUT';
+					}
 
 					$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
 
@@ -1529,9 +1658,13 @@ 
 
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
-					if ($sender) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					if ($sender) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					}
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTo").($langs->trans("MailTo") != 'To' ? ' (To)' : '').' : '.dol_escape_htmltag($to));
-					if ($sendtocc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					}
 
 					// Search and create thirdparty
 					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
@@ -1562,9 +1695,13 @@ 
 
 								if (!empty($sourcefield) && !empty($regexstring))
 								{
-									if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-									elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-									elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+									if (strtolower($sourcefield) == 'body') {
+										$sourcestring = $messagetext;
+									} elseif (strtolower($sourcefield) == 'subject') {
+										$sourcestring = $subject;
+									} elseif (strtolower($sourcefield) == 'header') {
+										$sourcestring = $header;
+									}
 
 									if ($sourcestring)
 									{
@@ -1623,7 +1760,9 @@ 
 
 										// Create thirdparty
 										$thirdpartystatic->name = $nametouseforthirdparty;
-										if ($fromtext != $nametouseforthirdparty) $thirdpartystatic->name_alias = $fromtext;
+										if ($fromtext != $nametouseforthirdparty) {
+											$thirdpartystatic->name_alias = $fromtext;
+										}
 										$thirdpartystatic->email = $from;
 
 										// Overwrite values with values extracted from source email
@@ -1656,15 +1795,21 @@ 
 						{
 							if ($projectstatic->id > 0)
 							{
-								if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+								if ($projectfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+								}
 							}
 							if ($thirdpartystatic->id > 0)
 							{
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
 							if ($contactstatic->id > 0)
 							{
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1749,12 +1894,16 @@ 
 							if ($thirdpartystatic->id > 0)
 							{
 								$projecttocreate->socid = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
 							if ($contactstatic->id > 0)
 							{
 								$projecttocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1865,12 +2014,16 @@ 
 							{
 								$tickettocreate->socid = $thirdpartystatic->id;
 								$tickettocreate->fk_soc = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
 							if ($contactstatic->id > 0)
 							{
 								$tickettocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -2175,11 +2328,17 @@ 
 		$this->datelastresult = $now;
 		$this->lastresult = $output;
 		$this->debuginfo = 'IMAP search string used : '.$search;
-		if ($searchhead) $this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		if ($searchhead) {
+			$this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		}
 
-		if (!$error) $this->datelastok = $now;
+		if (!$error) {
+			$this->datelastok = $now;
+		}
 
-		if (!empty($this->errors)) $this->lastresult .= " - ".join(" - ", $this->errors);
+		if (!empty($this->errors)) {
+			$this->lastresult .= " - ".join(" - ", $this->errors);
+		}
 		$this->codelastresult = ($error ? 'KO' : 'OK');
 		$this->update($user);
 
@@ -2259,10 +2418,11 @@ 
 		imap_fetchbody($mbox, $mid, $partno) : // multipart
 		imap_body($mbox, $mid); // simple
 		// Any part may be encoded, even plain text messages, so check everything.
-		if ($p->encoding == 4)
-			$data = quoted_printable_decode($data);
-		elseif ($p->encoding == 3)
-			$data = base64_decode($data);
+		if ($p->encoding == 4) {
+					$data = quoted_printable_decode($data);
+		} elseif ($p->encoding == 3) {
+					$data = base64_decode($data);
+		}
 
 		// PARAMETERS
 		// get all parameters, like charset, filenames of attachments, etc.
@@ -2299,9 +2459,11 @@ 
 			}
 			// Messages may be split in different parts because of inline attachments,
 			// so append parts together with blank row.
-			if (strtolower($p->subtype) == 'plain')
-				$plainmsg .= trim($data)."\n\n";
-			else $htmlmsg .= $data."<br><br>";
+			if (strtolower($p->subtype) == 'plain') {
+							$plainmsg .= trim($data)."\n\n";
+			} else {
+				$htmlmsg .= $data."<br><br>";
+			}
 			$charset = $params['charset']; // assume all parts are same charset
 		}
 

htdocs/core/lib/ajax.lib.php

Braces +41 added lines, -14 removed lines

@@ -46,13 +46,19 @@ 
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
-	if (empty($minLength)) $minLength = 1;
+	if (empty($minLength)) {
+		$minLength = 1;
+	}
 
 	$dataforrenderITem = 'ui-autocomplete';
 	$dataforitem = 'ui-autocomplete-item';
 	// Allow two constant to use other values for backward compatibility
-	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
-	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) {
+		$dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
+	}
+	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) {
+		$dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+	}
 
 	// Input search_htmlname is original field
 	// Input htmlname is a second input field used when using ajax autocomplete.
@@ -388,14 +394,26 @@ 
 	global $conf;
 
 	// select2 can be disabled for smartphones
-	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) return '';
+	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) {
+		return '';
+	}
 
-	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-	if (empty($conf->use_javascript_ajax)) return '';
-	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) {
+		return '';
+	}
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
+	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+		return '';
+	}
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		return '';
+	}
 
-	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete = 0;
+	if (empty($minLengthToAutocomplete)) {
+		$minLengthToAutocomplete = 0;
+	}
 
 	$tmpplugin = 'select2';
 	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
@@ -422,10 +440,13 @@ 
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg .= '.select2(\'focus\')';
+	if ($forcefocus) {
+		$msg .= '.select2(\'focus\')';
+	}
 	$msg .= ';'."\n";
 
-	if (is_array($events) && count($events))    // If an array of js events to do were provided.
+	if (is_array($events) && count($events)) {
+		// If an array of js events to do were provided.
 	{
 		$msg .= '
 			jQuery("#'.$htmlname.'").change(function () {
@@ -475,6 +496,7 @@ 
 				);
 			}';
 	}
+	}
 
 	$msg .= '});'."\n";
 	$msg .= "</script>\n";
@@ -500,12 +522,17 @@ 
 	global $conf, $langs, $user;
 
 	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
-	if (!isset($input)) $input = array();
+	if (!isset($input)) {
+		$input = array();
+	}
 
 	if (empty($conf->use_javascript_ajax) || $forcenoajax)
 	{
-		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		if (empty($conf->global->$code)) {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		}
 	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>

htdocs/core/modules/modEmailCollector.class.php

Braces +12 added lines, -4 removed lines

@@ -304,7 +304,9 @@ 
 				$sql[] = $sqlforexampleFilterA3;
 				$sql[] = $sqlforexampleA4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -346,7 +348,9 @@ 
 				$sql[] = $sqlforexampleB2;
 				$sql[] = $sqlforexampleB3;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -375,7 +379,9 @@ 
 				$sql[] = $sqlforexampleFilterC3;
 				$sql[] = $sqlforexampleC4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -403,7 +409,9 @@ 
 				$sql[] = $sqlforexampleFilterC3;
 				$sql[] = $sqlforexampleC4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $this->_init($sql, $options);
 	}

htdocs/product/stock/card.php

Braces +63 added lines, -25 removed lines

@@ -47,8 +47,12 @@ 
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-if (!$sortfield) $sortfield = "p.ref";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "p.ref";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -87,7 +91,9 @@ 
 
 $parameters = array('id'=>$id, 'ref'=>$ref);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 if (empty($reshook))
 {
 	// Ajout entrepot
@@ -174,11 +180,15 @@ 
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0)   $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 
 			if (!$error) {
 				$ret = $object->update($id, $user);
-				if ($ret < 0)   $error++;
+				if ($ret < 0) {
+					$error++;
+				}
 			}
 
 			if ($error) {
@@ -198,7 +208,9 @@ 
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 		if (!$error) {
 			$result = $object->insertExtraFields();
 			if ($result < 0) {
@@ -206,7 +218,9 @@ 
 				$error++;
 			}
 		}
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 
 	if ($cancel == $langs->trans("Cancel"))
@@ -285,7 +299,9 @@ 
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	print img_picto('', 'globe-americas', 'class="paddingright"');
 	print $form->select_country((!empty($object->country_id) ? $object->country_id : $mysoc->country_code), 'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	if ($user->admin) {
+		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 	print '</td></tr>';
 
 	// Phone / Fax
@@ -365,8 +381,11 @@ 
 			// Call Hook formConfirm
 			$parameters = array('formConfirm' => $formconfirm);
 			$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-			elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+			if (empty($reshook)) {
+				$formconfirm .= $hookmanager->resPrint;
+			} elseif ($reshook > 0) {
+				$formconfirm = $hookmanager->resPrint;
+			}
 
 			// Print form confirm
 			print $formconfirm;
@@ -379,7 +398,9 @@ 
 			$morehtmlref .= '</div>';
 
 			$shownav = 1;
-			if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+			if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+				$shownav = 0;
+			}
 
 			dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
 
@@ -487,15 +508,13 @@ 
 				{
 					if ($user->rights->stock->creer) {
 						print '<a class="butAction" href="card.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Modify").'</a>';
 					}
 
 					if ($user->rights->stock->supprimer) {
 						print '<a class="butActionDelete" href="card.php?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
-					}
-					else {
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete").'</a>';
 					}
 				}
@@ -516,7 +535,9 @@ 
 			print_liste_field_titre("Product", "", "p.ref", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("Label", "", "p.label", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("Units", "", "ps.reel", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) print_liste_field_titre("Unit", "", "p.fk_unit", "&amp;id=".$id, "", 'align="left"', $sortfield, $sortorder);
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				print_liste_field_titre("Unit", "", "p.fk_unit", "&amp;id=".$id, "", 'align="left"', $sortfield, $sortorder);
+			}
 			print_liste_field_titre("AverageUnitPricePMPShort", "", "p.pmp", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 			print_liste_field_titre("EstimatedStockValueShort", "", "", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
@@ -538,7 +559,9 @@ 
 
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
 			$sql .= " ps.reel as value";
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) $sql .= ",fk_unit";
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				$sql .= ",fk_unit";
+			}
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 			$sql .= " WHERE ps.fk_product = p.rowid";
 			$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
@@ -556,9 +579,11 @@ 
 					$objp = $db->fetch_object($resql);
 
 					// Multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
+						// si l'option est active
 					{
 						$sql = "SELECT label";
+					}
 						$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sql .= " WHERE fk_product=".$objp->rowid;
 						$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
@@ -568,7 +593,9 @@ 
 						if ($result)
 						{
 							$objtp = $db->fetch_object($result);
-							if ($objtp->label != '') $objp->produit = $objtp->label;
+							if ($objtp->label != '') {
+								$objp->produit = $objtp->label;
+							}
 						}
 					}
 
@@ -598,7 +625,9 @@ 
 					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						// Units
 						print '<td align="left">';
-						if (is_null($productstatic->fk_unit))$productstatic->fk_unit = 1;
+						if (is_null($productstatic->fk_unit)) {
+							$productstatic->fk_unit = 1;
+						}
 						print $langs->trans($productstatic->getLabelOfUnit());
 						print '</td>';
 					}
@@ -637,8 +666,11 @@ 
 						print "</a></td>";
 					}
 					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-						if ($i == 0) $units = $productstatic->fk_unit;
-						elseif ($productstatic->fk_unit != $units) $sameunits = false;
+						if ($i == 0) {
+							$units = $productstatic->fk_unit;
+						} elseif ($productstatic->fk_unit != $units) {
+							$sameunits = false;
+						}
 					}
 					print "</tr>";
 					$i++;
@@ -648,10 +680,14 @@ 
 				print '<tr class="liste_total"><td class="liste_total" colspan="2">'.$langs->trans("Total").'</td>';
 				print '<td class="liste_total right">';
 				$valtoshow = price2num($totalunit, 'MS');
-				if (empty($conf->global->PRODUCT_USE_UNITS) || $sameunits) print empty($valtoshow) ? '0' : $valtoshow;
+				if (empty($conf->global->PRODUCT_USE_UNITS) || $sameunits) {
+					print empty($valtoshow) ? '0' : $valtoshow;
+				}
 				print '</td>';
 				print '<td class="liste_total">';
-				if (empty($conf->global->PRODUCT_USE_UNITS) && $sameunits) print $langs->trans($productstatic->getLabelOfUnit());
+				if (empty($conf->global->PRODUCT_USE_UNITS) && $sameunits) {
+					print $langs->trans($productstatic->getLabelOfUnit());
+				}
 				print '</td>';
 				print '<td class="liste_total right">'.price(price2num($totalvalue, 'MT')).'</td>';
 				if (empty($conf->global->PRODUIT_MULTIPRICES))
@@ -721,7 +757,9 @@ 
 			print '<tr><td>'.$langs->trans('Country').'</td><td>';
 			print img_picto('', 'globe-americas', 'class="paddingright"');
 			print $form->select_country($object->country_id ? $object->country_id : $mysoc->country_code, 'country_id');
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td></tr>';
 
 			// Phone / Fax

htdocs/commande/info.php

Braces +6 added lines, -2 removed lines

@@ -31,7 +31,9 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-if (!$user->rights->commande->lire)	accessforbidden();
+if (!$user->rights->commande->lire) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'bills'));
@@ -42,7 +44,9 @@ 
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $comid, '');
 
 $object = new Commande($db);

htdocs/ecm/dir_card.php

Braces +32 added lines, -12 removed lines

@@ -40,7 +40,9 @@ 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -51,8 +53,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $section = GETPOST("section", 'alpha') ?GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
 if (!$section)
@@ -112,9 +118,11 @@ 
 			$result = $ecmdir->changeNbOfFiles('+');
 		} else {
    			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
+			if ($resupload < 0) {
+				// Unknown error
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
+			}
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
@@ -136,8 +144,11 @@ 
 	$langs->load("other");
 	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret = dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	if ($ret) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	}
 
 	$result = $ecmdir->changeNbOfFiles('-');
 }
@@ -169,8 +180,9 @@ 
 		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
-		if ($resbool) $result = 1;
-		else {
+		if ($resbool) {
+			$result = 1;
+		} else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -206,7 +218,9 @@ 
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
 		$ecmdir->description = GETPOST("description");
 		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 		if (!$error) {
 			// Actions on extra fields
 			$result = $ecmdir->insertExtraFields();
@@ -330,7 +344,9 @@ 
 		if ($i == 0 && $action == 'edit')
 		{
 			$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-		} else $s = $tmpecmdir->getNomUrl(1).$s;
+		} else {
+			$s = $tmpecmdir->getNomUrl(1).$s;
+		}
 		if ($tmpecmdir->fk_parent)
 		{
 			$s = ' -> '.$s;
@@ -358,7 +374,9 @@ 
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			} else $s .= $subdir;
+			} else {
+				$s .= $subdir;
+			}
 		}
 		if ($i < (count($subdirs) - 1))
 		{
@@ -389,7 +407,9 @@ 
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	} else print dol_nl2br($ecmdir->description);
+	} else {
+		print dol_nl2br($ecmdir->description);
+	}
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';

htdocs/ecm/file_card.php

Braces +53 added lines, -18 removed lines

@@ -36,7 +36,9 @@ 
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (!$user->rights->ecm->setup) accessforbidden();
+if (!$user->rights->ecm->setup) {
+	accessforbidden();
+}
 
 // Get parameters
 $socid = GETPOST("socid", "int");
@@ -56,8 +58,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $section = GETPOST("section", 'alpha');
 if (!$section)
@@ -186,7 +192,9 @@ 
 		if ($object->id > 0)
 		{
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 			if (!$error) {
 				// Actions on extra fields
 				$result = $object->insertExtraFields();
@@ -284,8 +292,11 @@ 
 $urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
 
 $s = img_picto('', 'object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s.' -> ';
-if ($action == 'edit') $s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
-else $s .= $urlfiletoshow;
+if ($action == 'edit') {
+	$s .= '<input type="text" name="label" class="quatrevingtpercent" value="'.$urlfiletoshow.'">';
+} else {
+	$s .= $urlfiletoshow;
+}
 
 $linkback = '';
 if ($backtopage) {
@@ -335,20 +346,33 @@ 
 $modulepart = 'ecm';
 $forcedownload = 1;
 $rellink = '/document.php?modulepart='.$modulepart;
-if ($forcedownload) $rellink .= '&attachment=1';
-if (!empty($object->entity)) $rellink .= '&entity='.$object->entity;
+if ($forcedownload) {
+	$rellink .= '&attachment=1';
+}
+if (!empty($object->entity)) {
+	$rellink .= '&entity='.$object->entity;
+}
 $rellink .= '&file='.urlencode($filepath);
 $fulllink = $urlwithroot.$rellink;
 print img_picto('', 'globe').' ';
-if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
-else print $fulllink;
-if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+if ($action != 'edit') {
+	print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
+} else {
+	print $fulllink;
+}
+if ($action != 'edit') {
+	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+}
+// No target here.
 print '</td></tr>';
 
 // Link for direct external download
 print '<tr><td>';
-if ($action != 'edit') print $langs->trans("DirectDownloadLink");
-else print $langs->trans("FileSharedViaALink");
+if ($action != 'edit') {
+	print $langs->trans("DirectDownloadLink");
+} else {
+	print $langs->trans("FileSharedViaALink");
+}
 print '</td><td>';
 if (!empty($object->share))
 {
@@ -357,17 +381,28 @@ 
 		$forcedownload = 0;
 
 		$paramlink = '';
-		if (!empty($object->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($object->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$object->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
 		$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;		// Hash of file path
 		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
 
 		print img_picto('', 'globe').' ';
-		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-		else print $fulllink;
-		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
+		if ($action != 'edit') {
+			print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+		} else {
+			print $fulllink;
+		}
+		if ($action != 'edit') {
+			print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+		}
+		// No target here
 	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}

htdocs/expedition/stats/index.php

Braces +9 added lines, -3 removed lines

@@ -192,7 +192,9 @@ 
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -229,8 +231,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+	if (!in_array($year, $arrayyears)) {
+		$arrayyears[$year] = $year;
+	}
+	if (!in_array($nowyear, $arrayyears)) {
+		$arrayyears[$nowyear] = $nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';

htdocs/core/modules/modFournisseur.class.php

Braces +57 added lines, -19 removed lines

@@ -332,11 +332,13 @@ 
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+			// This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$fieldname = 'extra.'.$obj->name;
+		}
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
 				switch ($obj->type)
@@ -360,7 +362,9 @@ 
 							$var = array_keys($tmpparam['options']);
 							$tmp = array_shift($var);
 						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -372,11 +376,13 @@ 
 		// Add extra fields line
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+			// This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$fieldname = 'extraline.'.$obj->name;
+		}
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
 				switch ($obj->type)
@@ -396,8 +402,12 @@ 
 					case 'sellist':
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift(array_keys($tmpparam['options']));
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift(array_keys($tmpparam['options']));
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -408,7 +418,9 @@ 
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -418,7 +430,9 @@ 
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -465,11 +479,13 @@ 
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+			// This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$fieldname = 'extra.'.$obj->name;
+		}
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
 				switch ($obj->type)
@@ -489,8 +505,12 @@ 
 					case 'sellist':
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift(array_keys($tmpparam['options']));
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift(array_keys($tmpparam['options']));
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -501,7 +521,9 @@ 
 		// End add extra fields object
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -510,7 +532,9 @@ 
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		// Order
 		$r++;
@@ -560,11 +584,13 @@ 
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+			// This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$fieldname = 'extra.'.$obj->name;
+		}
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
 				switch ($obj->type)
@@ -585,8 +611,12 @@ 
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 						$tmpkey = array_keys($tmpparam['options']);
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift($tmpkey);
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift($tmpkey);
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -598,11 +628,13 @@ 
 		// Add extra fields line
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+			// This can fail when class is used on old database (during migration for example)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$fieldname = 'extraline.'.$obj->name;
+		}
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
 				switch ($obj->type)
@@ -627,7 +659,9 @@ 
 							$tmpparam_param_key = array_keys($tmpparam['options']);
 							$tmp = array_shift($tmpparam_param_key);
 						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -638,7 +672,9 @@ 
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -650,7 +686,9 @@ 
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_order').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		//Import Supplier Invoice
 		//--------