alxarafe / alixar

dolibarr/htdocs/core/lib/memory.lib.php

Braces +37 added lines, -26 removed lines

@@ -53,7 +53,9 @@ 
        	    $dolmemcache=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
        	
 	    $memoryid=session_name().'_'.$memoryid;
@@ -63,13 +65,11 @@ 
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || ! is_object($dolmemcache))
@@ -77,7 +77,9 @@ 
        	    $dolmemcache=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -86,8 +88,7 @@ 
 		if ($result)
 		{
 			return count($data);
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -120,7 +121,9 @@ 
             $m=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
 		$memoryid=session_name().'_'.$memoryid;
@@ -133,13 +136,11 @@ 
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -$rescode;
 		}
-	}
-	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || ! is_object($m))
@@ -147,7 +148,9 @@ 
        	    $m=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
        		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       		if (! $result) {
+       		    return -1;
+       		}
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
@@ -158,8 +161,7 @@ 
 		if ($data)
 		{
 			return $data;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -185,7 +187,9 @@ 
 function dol_getshmopaddress($memoryid)
 {
 	global $shmkeys,$shmoffset;
-	if (empty($shmkeys[$memoryid])) return 0;
+	if (empty($shmkeys[$memoryid])) {
+	    return 0;
+	}
 	return $shmkeys[$memoryid]+$shmoffset;
 }
 
@@ -202,7 +206,9 @@ 
 	foreach($shmkeys as $key => $val)
 	{
 		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		if (! is_numeric($result) || $result > 0) {
+		    $resarray[$key]=$result;
+		}
 	}
 	return $resarray;
 }
@@ -219,7 +225,9 @@ 
 	global $shmkeys,$shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	$newdata=serialize($data);
 	$size=strlen($newdata);
@@ -235,8 +243,7 @@ 
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1+$shm_bytes_written2);
-	}
-	else
+	} else
 	{
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
@@ -253,18 +260,22 @@ 
 {
 	global $shmkeys,$shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
+	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) {
+	    return 0;
+	}
 	$shmkey=dol_getshmopaddress($memoryid);
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
 	$handle=@shmop_open($shmkey,'a',0,0);
 	if ($handle)
 	{
 		$size=trim(shmop_read($handle,0,6));
-		if ($size) $data=unserialize(shmop_read($handle,6,$size));
-		else return -1;
+		if ($size) {
+		    $data=unserialize(shmop_read($handle,6,$size));
+		} else {
+		    return -1;
+		}
 		shmop_close($handle);
-	}
-	else
+	} else
 	{
 		return -2;
 	}

dolibarr/htdocs/core/lib/xcal.lib.php

Braces +66 added lines, -30 removed lines

@@ -38,7 +38,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
     // Note: A cal file is an UTF8 encoded file
 	$calfileh=fopen($outputfile,'w');
@@ -48,7 +50,9 @@ 
 		$now=dol_now();
 
 		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		if ($format == 'vcal') {
+		    $encoding='ENCODING=QUOTED-PRINTABLE:';
+		}
 
 		// Print header
 		fwrite($calfileh,"BEGIN:VCALENDAR\n");
@@ -152,8 +156,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
                     fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 
@@ -178,9 +186,15 @@ 
                     //fwrite($calfileh,"X-MICROSOFT-CDO-BUSYSTATUS:1\n");
                     //ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Laurent Destailleur;X-NUM-GUESTS=0:mailto:eldy10@gmail.com
 
-                    if (! empty($location)) fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
-					if ($fulldayevent) fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
-                    if ($fulldayevent) fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    if (! empty($location)) {
+                        fwrite($calfileh,"LOCATION:".$encoding.$location."\n");
+                    }
+					if ($fulldayevent) {
+					    fwrite($calfileh,"X-FUNAMBOL-ALLDAY:1\n");
+					}
+                    if ($fulldayevent) {
+                        fwrite($calfileh,"X-MICROSOFT-CDO-ALLDAYEVENT:1\n");
+                    }
 
 					// Date must be GMT dates
 					// Current date
@@ -197,11 +211,14 @@ 
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
-					}
-					else
+    					if (empty($enddate)) {
+    					    $enddate=dol_time_plus_duree($startdate,1,'d');
+    					}
+					} else
 					{
-                        if (empty($enddate)) $enddate=$startdate+$duration;
+                        if (empty($enddate)) {
+                            $enddate=$startdate+$duration;
+                        }
 					}
                     $prefix='';
 					$enddatef = dol_print_date($enddate,'dayhourxcard',true);
@@ -213,8 +230,12 @@ 
 					}
                     fwrite($calfileh,"DTEND".$prefix.":".$enddatef."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					if (! empty($transparency)) fwrite($calfileh,"TRANSP:".$transparency."\n");
-					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					if (! empty($transparency)) {
+					    fwrite($calfileh,"TRANSP:".$transparency."\n");
+					}
+					if (! empty($category)) {
+					    fwrite($calfileh,"CATEGORIES:".$encoding.$category."\n");
+					}
 					fwrite($calfileh,"END:VEVENT\n");
 				}
 
@@ -237,8 +258,12 @@ 
 						fwrite($calfileh,"URL:".$url."\n");
 					};
 
-                    if ($created)  fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
-                    if ($modified) fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    if ($created) {
+                        fwrite($calfileh,"CREATED:".dol_print_date($created,'dayhourxcard',true)."\n");
+                    }
+                    if ($modified) {
+                        fwrite($calfileh,"LAST-MODIFIED:".dol_print_date($modified,'dayhourxcard',true)."\n");
+                    }
 					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
 					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
@@ -270,10 +295,10 @@ 
 		fwrite($calfileh,"END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+	} else
 	{
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
@@ -299,7 +324,9 @@ 
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile)) return -1;
+	if (empty($outputfile)) {
+	    return -1;
+	}
 
 	$fichier=fopen($outputfile,'w');
 	if ($fichier)
@@ -367,7 +394,9 @@ 
 				fwrite($fichier, "<author><![CDATA[".$author."]]></author>\n");
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
-				if ($description) fwrite($fichier, $description);
+				if ($description) {
+				    fwrite($fichier, $description);
+				}
 				//else fwrite($fichier, 'NoDesc');
 				fwrite($fichier, "]]></description>\n");
 				fwrite($fichier, "<pubDate>".date("r", $startdate)."</pubDate>\n");
@@ -382,8 +411,9 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
 	}
 }
 
@@ -447,8 +477,7 @@ 
 			$newpara .= $char;
 		}
 		$out .= $newpara;
-	}
-	else
+	} else
 	{
 	    $strlength=dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
@@ -491,13 +520,20 @@ 
 			$char = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 )
-			$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			if ( $ascii < 32 || $ascii == 61 || $ascii > 126 ) {
+						$char = '=' . strtoupper(sprintf("%02X", $ascii));
+			}
 
-			if ((strlen($newpara) + strlen($char)) >= 76 )	// Do not use dol_strlen here, we need number of bytes
+			if ((strlen($newpara) + strlen($char)) >= 76 ) {
+			    // Do not use dol_strlen here, we need number of bytes
 			{
-				$out .= $newpara . '=' . "\r\n";	// CRLF
-				if ($forcal) $out .= " ";		// + Space for cal
+				$out .= $newpara . '=' . "\r\n";
+			}
+			// CRLF
+				if ($forcal) {
+				    $out .= " ";
+				}
+				// + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;

dolibarr/htdocs/core/lib/ticket.lib.php

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
     	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
     	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
     	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	if ($nbContact > 0) {
+    	    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	}
     	$head[$h][2] = 'contact';
     	$h++;
     }

dolibarr/htdocs/core/lib/cron.lib.php

Braces +10 added lines, -5 removed lines

@@ -103,7 +103,9 @@ 
     print '<br>';
     
 	$logintouse = 'firstadmin';
-	if ($user->admin) $logintouse = $user->login;
+	if ($user->admin) {
+	    $logintouse = $user->login;
+	}
 	
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
@@ -115,16 +117,19 @@ 
 	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
 	{
     	$linuxlike=1;
-    	if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-    	if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+    	if (preg_match('/^win/i',PHP_OS)) {
+    	    $linuxlike=0;
+    	}
+    	if (preg_match('/^mac/i',PHP_OS)) {
+    	    $linuxlike=0;
+    	}
     	print $langs->trans("Note").': ';
     	if ($linuxlike)
     	{
     		print $langs->trans("CronExplainHowToRunUnix");
     		print '<br>';
     		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else
+    	} else
     	{
     		print $langs->trans("CronExplainHowToRunWin");
     	}

dolibarr/htdocs/core/lib/report.lib.php

Braces +24 added lines, -8 removed lines

@@ -42,11 +42,15 @@ 
 {
 	global $langs;
 
-	if (empty($hselected)) $hselected='report';
+	if (empty($hselected)) {
+	    $hselected='report';
+	}
 
 	print "\n\n<!-- start banner of report -->\n";
 
-	if(! empty($varlink)) $varlink = '?'.$varlink;
+	if(! empty($varlink)) {
+	    $varlink = '?'.$varlink;
+	}
 
 	$h=0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
@@ -71,7 +75,9 @@ 
 	print '<td>';
 	print $reportname;
 	print '</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+	    print '<td></td>';
+	}
 	print '</tr>';
 
 	// Calculation mode
@@ -81,7 +87,9 @@ 
 		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
 		print '<td>';
 		print $calcmode;
-		if ($variante) print '<td></td>';
+		if ($variante) {
+		    print '<td></td>';
+		}
 		print '</td>';
 		print '</tr>';
 	}
@@ -90,8 +98,12 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
 	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+	if ($period) {
+	    print $period;
+	}
+	if ($variante) {
+	    print '<td class="nowraponall">'.$periodlink.'</td>';
+	}
 	print '</td>';
 	print '</tr>';
 
@@ -99,7 +111,9 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportDescription").'</td>';
 	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+	    print '<td></td>';
+	}
 	print '</tr>';
 
 	// Ligne d'export
@@ -108,7 +122,9 @@ 
 	print '<td>';
 	print dol_print_date($builddate, 'dayhour');
 	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	if ($variante) {
+	    print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	}
 	print '</tr>';
 
 	print '</table>';

dolibarr/htdocs/core/actions_sendmails.inc.php

Braces +82 added lines, -52 removed lines

@@ -76,9 +76,15 @@ 
 	$listofnames=array();
 	$listofmimes=array();
 	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
-	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
@@ -102,7 +108,9 @@ 
  */
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid','aZ09');
+	if (empty($trackid)) {
+	    $trackid = GETPOST('trackid','aZ09');
+	}
 
 	$subject='';$actionmsg='';$actionmsg2='';
 
@@ -116,34 +124,42 @@ 
 		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
 		{
 			$result=$object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result=1;    // Even if not found, we consider ok
+			if ($object->element == 'user' && $result == 0) {
+			    $result=1;
+			}
+			// Even if not found, we consider ok
 			$thirdparty=$object->thirdparty;
 			$sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'member' || $object->element == 'user')
+		} else if ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'societe')
+			if ($thirdparty->id > 0) {
+			    $sendtosocid=$thirdparty->id;
+			}
+		} else if ($object->element == 'societe')
 		{
 			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-		}
-		else if ($object->element == 'contact')
+			if ($thirdparty->id > 0) {
+			    $sendtosocid=$thirdparty->id;
+			}
+		} else if ($object->element == 'contact')
 		{
 			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+			if ($contact->id > 0) {
+			    $sendtosocid=$contact->fetch_thirdparty()->id;
+			}
+		} else {
+		    dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 		}
-		else dol_print_error('','Use actions_sendmails.in.php for an element/object that is not supported');
 
 		if (is_object($hookmanager))
 		{
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('initSendToSocid',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		}
+	} else {
+	    $thirdparty = $mysoc;
 	}
-	else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
@@ -158,8 +174,11 @@ 
 		$receiver=$_POST['receiver'];
 		if (! is_array($receiver))
 		{
-			if ($receiver == '-1') $receiver=array();
-			else $receiver=array($receiver);
+			if ($receiver == '-1') {
+			    $receiver=array();
+			} else {
+			    $receiver=array($receiver);
+			}
 		}
 		$tmparray=array();
 		if (trim($_POST['sendto']))
@@ -172,18 +191,23 @@ 
 			foreach($receiver as $key=>$val)
 			{
 				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
+				if ($val == 'thirdparty') {
+				    // Id of third party
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
+				}
 				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
+				elseif ($val == 'contact') {
+				    // Id of contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// Id du contact
+				} elseif ($val) {
+				    // Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+				}
 					$sendtoid[] = $val;
 				}
 			}
@@ -208,8 +232,11 @@ 
 		$receivercc=$_POST['receivercc'];
 		if (! is_array($receivercc))
 		{
-			if ($receivercc == '-1') $receivercc=array();
-			else $receivercc=array($receivercc);
+			if ($receivercc == '-1') {
+			    $receivercc=array();
+			} else {
+			    $receivercc=array($receivercc);
+			}
 		}
 		$tmparray=array();
 		if (trim($_POST['sendtocc']))
@@ -221,18 +248,23 @@ 
 			foreach($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Id of third party
+				if ($val == 'thirdparty') {
+				    // Id of third party
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
+				}
 				// Recipient was provided from combo list
-				elseif ($val == 'contact') // Id of contact
+				elseif ($val == 'contact') {
+				    // Id of contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
 				}
-				elseif ($val)	// Id du contact
+				} elseif ($val) {
+				    // Id du contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+				}
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 				}
 			}
@@ -266,22 +298,17 @@ 
 			$fromtype = GETPOST('fromtype','alpha');
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
+			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
+			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp=explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
@@ -289,8 +316,7 @@ 
 				{
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
-			}
-			else {
+			} else {
 				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
 			}
 
@@ -321,7 +347,9 @@ 
 				{
 					$actionmsg=$langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg=dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+					    $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . dol_escape_htmltag($sendtocc));
+					}
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -400,15 +428,16 @@ 
 			}
 
 			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
+			if (empty($sendcontext)) {
+			    $sendcontext = 'standard';
+			}
 			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
 
 			if ($mailfile->error)
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action='presend';
-			}
-			else
+			} else
 			{
 				$result=$mailfile->sendfile();
 				if ($result)
@@ -437,7 +466,10 @@ 
 					// Initialisation of datas of object to call trigger
 					if (is_object($object))
 					{
-					    if (empty($actiontypecode)) $actiontypecode='AC_OTH_AUTO'; // Event insert into agenda automatically
+					    if (empty($actiontypecode)) {
+					        $actiontypecode='AC_OTH_AUTO';
+					    }
+					    // Event insert into agenda automatically
 
 						$object->socid			= $sendtosocid;	   // To link to a company
 						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
@@ -482,11 +514,12 @@ 
 					setEventMessages($mesg, null, 'mesgs');
 
   					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+	  				if (isset($paramname2) || isset($paramval2)) {
+	  				    $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
+	  				}
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
 			  		exit;
-				}
-				else
+				} else
 				{
 					$langs->load("other");
 					$mesg='<div class="error">';
@@ -494,8 +527,7 @@ 
 					{
 						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
 						$mesg.='<br>'.$mailfile->error;
-					}
-					else
+					} else
 					{
 						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
@@ -505,16 +537,14 @@ 
 					$action = 'presend';
 				}
 			}
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
-	}
-	else
+	} else
 	{
 		$langs->load("other");
 		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');

dolibarr/htdocs/core/tpl/resource_view.tpl.php

Braces +6 added lines, -8 removed lines

@@ -22,8 +22,7 @@ 
     print '<div class="tagtd liste_titre" align="center">'.$langs->trans('Mandatory').'</div>';
     print '<div class="tagtd liste_titre"></div>';
     print '</form>';
-}
-else
+} else
 {
     print '<form class="tagtr liste_titre">';
     print '<div class="tagtd liste_titre">'.$langs->trans('Resource').'</div>';
@@ -60,12 +59,12 @@ 
 			print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory',$linked_resource['mandatory']?1:0,1).'</div>';
 			print '<div class="tagtd" align="right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</form>';
-		}
-		else
+		} else
 		{
 			$style='';
-			if ($linked_resource['rowid'] == GETPOST('lineid'))
-				$style='style="background: orange;"';
+			if ($linked_resource['rowid'] == GETPOST('lineid')) {
+							$style='style="background: orange;"';
+			}
 
 			print '<form class="tagtr oddeven" '.$style.'>';
 
@@ -98,8 +97,7 @@ 
 			print '</form>';
 		}
 	}
-}
-else {
+} else {
 	print '<form class="tagtr oddeven">';
 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
 	print '<div class="tagtd opacitymedium"></div>';

dolibarr/htdocs/core/tpl/commonfields_edit.tpl.php

Braces +28 added lines, -10 removed lines

@@ -27,7 +27,9 @@ 
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (! is_object($form)) $form=new Form($db);
+if (! is_object($form)) {
+    $form=new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_edit.tpl.php -->
@@ -38,22 +40,38 @@ 
 foreach($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) {
+	    continue;
+	}
+	// We don't want this field
 
 	print '<tr><td';
 	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key)?GETPOST($key, 'int'):$object->$key;
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key)?GETPOST($key,'none'):$object->$key;
-	else $value = GETPOSTISSET($key)?GETPOST($key, 'alpha'):$object->$key;
+	if (in_array($val['type'], array('int', 'integer'))) {
+	    $value = GETPOSTISSET($key)?GETPOST($key, 'int'):$object->$key;
+	} elseif ($val['type'] == 'text' || $val['type'] == 'html') {
+	    $value = GETPOSTISSET($key)?GETPOST($key,'none'):$object->$key;
+	} else {
+	    $value = GETPOSTISSET($key)?GETPOST($key, 'alpha'):$object->$key;
+	}
 	//var_dump($val.' '.$key.' '.$value);
 	print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';

dolibarr/htdocs/core/tpl/object_discounts.tpl.php

Braces +4 added lines, -3 removed lines

@@ -42,13 +42,14 @@
 {
 	$translationKey = (! empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
-}
-else
+} else
 {
 	$translationKey = (! empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print $langs->trans($translationKey).'.';
 }
-if($isNewObject) print ' ('.$addrelativediscount.')';
+if($isNewObject) {
+    print ' ('.$addrelativediscount.')';
+}
 
 // Is there is commercial discount or down payment available ?
 if ($absolute_discount > 0) {