alxarafe / alixar

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

Spacing +69 added lines, -69 removed lines

@@ -21,14 +21,14 @@ 
  *  \brief		Set of function for memory/cache management
  */
 
-global $shmkeys,$shmoffset;
+global $shmkeys, $shmoffset;
 
-$shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'products'=>6,
-				'commercial'=>7,'compta'=>8,'projects'=>9,'cashdesk'=>10,'agenda'=>11,'bills'=>12,
-				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
-				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
-				'donations'=>25,'contracts'=>26);
-$shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
+$shmkeys = array('main'=>1, 'admin'=>2, 'dict'=>3, 'companies'=>4, 'suppliers'=>5, 'products'=>6,
+				'commercial'=>7, 'compta'=>8, 'projects'=>9, 'cashdesk'=>10, 'agenda'=>11, 'bills'=>12,
+				'propal'=>13, 'boxes'=>14, 'banks'=>15, 'other'=>16, 'errors'=>17, 'members'=>18, 'ecm'=>19,
+				'orders'=>20, 'users'=>21, 'help'=>22, 'stocks'=>23, 'interventions'=>24,
+				'donations'=>25, 'contracts'=>26);
+$shmoffset = 1000; // Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
 
@@ -39,27 +39,27 @@ 
  * 	@param	string		$data			Data to save
  * 	@return	int							<0 if KO, Nb of bytes written if OK
  */
-function dol_setcache($memoryid,$data)
+function dol_setcache($memoryid, $data)
 {
 	global $conf;
-	$result=0;
+	$result = 0;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 	    global $dolmemcache;
-		if (empty($dolmemcache) || ! is_object($dolmemcache))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
        	
-	    $memoryid=session_name().'_'.$memoryid;
+	    $memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$dolmemcache->getResultCode();
+		$dolmemcache->add($memoryid, $data); // This fails if key already exists
+		$rescode = $dolmemcache->getResultCode();
 		if ($rescode == 0)
 		{
 			return count($data);
@@ -69,20 +69,20 @@ 
 			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))
+		if (empty($dolmemcache) || !is_object($dolmemcache))
     	{
-       	    $dolmemcache=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $dolmemcache = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+		$result = $dolmemcache->add($memoryid, $data); // This fails if key already exists
 		if ($result)
 		{
 			return count($data);
@@ -95,7 +95,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$result=dol_setshmop($memoryid,$data);
+		$result = dol_setshmop($memoryid, $data);
 	}
 
 	return $result;
@@ -112,22 +112,22 @@ 
 	global $conf;
 
 	// Using a memcached server
-	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
 		global $m;
-		if (empty($m) || ! is_object($m))
+		if (empty($m) || !is_object($m))
     	{
-            $m=new Memcached();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+            $m = new Memcached();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-		$memoryid=session_name().'_'.$memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Get memoryid=".$memoryid;
-		$data=$m->get($memoryid);
-		$rescode=$m->getResultCode();
+		$data = $m->get($memoryid);
+		$rescode = $m->getResultCode();
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($rescode == 0)
@@ -139,20 +139,20 @@ 
 			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))
+		if (empty($m) || !is_object($m))
     	{
-       	    $m=new Memcache();
-       		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
-       		if (! $result) return -1;
+       	    $m = new Memcache();
+       		$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+       		$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
+       		if (!$result) return -1;
        	}
 	    
-       	$memoryid=session_name().'_'.$memoryid;
+       	$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$data=$m->get($memoryid);
+		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
 		//var_dump($data);
 		if ($data)
@@ -167,7 +167,7 @@ 
 	// Using shmop
 	else if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
-		$data=dol_getshmop($memoryid);
+		$data = dol_getshmop($memoryid);
 		return $data;
 	}
 
@@ -184,9 +184,9 @@ 
  */
 function dol_getshmopaddress($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 	if (empty($shmkeys[$memoryid])) return 0;
-	return $shmkeys[$memoryid]+$shmoffset;
+	return $shmkeys[$memoryid] + $shmoffset;
 }
 
 /**
@@ -196,13 +196,13 @@ 
  */
 function dol_listshmop()
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	$resarray=array();
-	foreach($shmkeys as $key => $val)
+	$resarray = array();
+	foreach ($shmkeys as $key => $val)
 	{
-		$result=dol_getshmop($key);
-		if (! is_numeric($result) || $result > 0) $resarray[$key]=$result;
+		$result = dol_getshmop($key);
+		if (!is_numeric($result) || $result > 0) $resarray[$key] = $result;
 	}
 	return $resarray;
 }
@@ -214,27 +214,27 @@ 
  * 	@param	string	$data			Data to save
  * 	@return	int						<0 if KO, Nb of bytes written if OK
  */
-function dol_setshmop($memoryid,$data)
+function dol_setshmop($memoryid, $data)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_write")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
-	$newdata=serialize($data);
-	$size=strlen($newdata);
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;
+	$shmkey = dol_getshmopaddress($memoryid);
+	$newdata = serialize($data);
+	$size = strlen($newdata);
 	//print 'dol_setshmop memoryid='.$memoryid." shmkey=".$shmkey." newdata=".$size."bytes<br>\n";
-	$handle=shmop_open($shmkey,'c',0644,6+$size);
+	$handle = shmop_open($shmkey, 'c', 0644, 6 + $size);
 	if ($handle)
 	{
-		$shm_bytes_written1=shmop_write($handle,str_pad($size,6),0);
-		$shm_bytes_written2=shmop_write($handle,$newdata,6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6+dol_strlen($newdata)))
+		$shm_bytes_written1 = shmop_write($handle, str_pad($size, 6), 0);
+		$shm_bytes_written2 = shmop_write($handle, $newdata, 6);
+		if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata)))
 		{
    			print "Couldn't write the entire length of data\n";
 		}
 		shmop_close($handle);
-		return ($shm_bytes_written1+$shm_bytes_written2);
+		return ($shm_bytes_written1 + $shm_bytes_written2);
 	}
 	else
 	{
@@ -251,16 +251,16 @@ 
  */
 function dol_getshmop($memoryid)
 {
-	global $shmkeys,$shmoffset;
+	global $shmkeys, $shmoffset;
 
-	if (empty($shmkeys[$memoryid]) || ! function_exists("shmop_open")) return 0;
-	$shmkey=dol_getshmopaddress($memoryid);
+	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);
+	$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));
+		$size = trim(shmop_read($handle, 0, 6));
+		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
 	}

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

Spacing +129 added lines, -129 removed lines

@@ -32,66 +32,66 @@ 
  *	@param		string	$outputfile			Output file
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_calfile($format,$title,$desc,$events_array,$outputfile)
+function build_calfile($format, $title, $desc, $events_array, $outputfile)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
     // Note: A cal file is an UTF8 encoded file
-	$calfileh=fopen($outputfile,'w');
+	$calfileh = fopen($outputfile, 'w');
 	if ($calfileh)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$now=dol_now();
+		$now = dol_now();
 
-		$encoding='';
-		if ($format == 'vcal') $encoding='ENCODING=QUOTED-PRINTABLE:';
+		$encoding = '';
+		if ($format == 'vcal') $encoding = 'ENCODING=QUOTED-PRINTABLE:';
 
 		// Print header
-		fwrite($calfileh,"BEGIN:VCALENDAR\n");
-		fwrite($calfileh,"VERSION:2.0\n");
-		fwrite($calfileh,"METHOD:PUBLISH\n");
+		fwrite($calfileh, "BEGIN:VCALENDAR\n");
+		fwrite($calfileh, "VERSION:2.0\n");
+		fwrite($calfileh, "METHOD:PUBLISH\n");
 		//fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
-		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."\n");
-		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
-		fwrite($calfileh,"X-WR-CALNAME:".$encoding.format_cal($format,$title)."\n");
-        fwrite($calfileh,"X-WR-CALDESC:".$encoding.format_cal($format,$desc)."\n");
+		fwrite($calfileh, "PRODID:-//DOLIBARR ".DOL_VERSION."\n");
+		fwrite($calfileh, "CALSCALE:GREGORIAN\n");
+		fwrite($calfileh, "X-WR-CALNAME:".$encoding.format_cal($format, $title)."\n");
+        fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
         //fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
-        if (! empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
-        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
-	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
-	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
-	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
+        if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)
+        && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60) {
+	        $hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'hour');
+	        $mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'min');
+	        $ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, 'sec');
+	        fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($eventqualified)
 			{
 				// See http://fr.wikipedia.org/wiki/ICalendar for format
 				// See http://www.ietf.org/rfc/rfc2445.txt for RFC
-				$uid 		  = $event['uid'];
-				$type         = $event['type'];
-                $startdate    = $event['startdate'];
+				$uid = $event['uid'];
+				$type = $event['type'];
+                $startdate = $event['startdate'];
 				$duration	  = $event['duration'];
-				$enddate	  = $event['enddate'];
-				$summary  	  = $event['summary'];
+				$enddate = $event['enddate'];
+				$summary = $event['summary'];
 				$category	  = $event['category'];
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
 				$location     = $event['location'];
-				$email 		  = $event['email'];
-				$url		  = $event['url'];
-				$transparency = $event['transparency'];		// OPAQUE (busy) or TRANSPARENT (not busy)
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
-                $created      = $event['created'];
- 				$modified     = $event['modified'];
+				$email = $event['email'];
+				$url = $event['url'];
+				$transparency = $event['transparency']; // OPAQUE (busy) or TRANSPARENT (not busy)
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
+                $created = $event['created'];
+ 				$modified = $event['modified'];
 
 				// Uncomment for tests
 				//$summary="Resume";
@@ -99,10 +99,10 @@ 
 				//$description="MemberValidatedInDolibarr gd gdf gd gdff\nNom: tgdf g dfgdf gfd r ter\nType: gdfgfdf dfg fd gfd gd gdf gdf gfd gdfg dfg ddf\nAuteur: AD01fg dgdgdfg df gdf gd";
 
 				// Format
-				$summary=format_cal($format,$summary);
-				$description=format_cal($format,$description);
-				$category=format_cal($format,$category);
-				$location=format_cal($format,$location);
+				$summary = format_cal($format, $summary);
+				$description = format_cal($format, $description);
+				$category = format_cal($format, $category);
+				$location = format_cal($format, $location);
 
 				// Output the vCard/iCal VEVENT object
 				/*
@@ -140,22 +140,22 @@ 
                 */
 				if ($type == 'event')
 				{
-					fwrite($calfileh,"BEGIN:VEVENT\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VEVENT\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						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");
-                    fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\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");
 
 					/* Other keys:
 					// Status values for a "VEVENT"
@@ -178,44 +178,44 @@ 
                     //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
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($now,'dayhourxcard',true)."\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($now, 'dayhourxcard', true)."\n");
 					// Start date
-                    $prefix='';
-                    $startdatef = dol_print_date($startdate,'dayhourxcard',true);
+                    $prefix = '';
+                    $startdatef = dol_print_date($startdate, 'dayhourxcard', true);
                     if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $startdatef = dol_print_date($startdate,'dayxcard',false);     // Local time
+                        $prefix = ';VALUE=DATE';
+					    $startdatef = dol_print_date($startdate, 'dayxcard', false); // Local time
 					}
-					fwrite($calfileh,"DTSTART".$prefix.":".$startdatef."\n");
+					fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
                     // End date
 					if ($fulldayevent)
 					{
-    					if (empty($enddate)) $enddate=dol_time_plus_duree($startdate,1,'d');
+    					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);
+                    $prefix = '';
+					$enddatef = dol_print_date($enddate, 'dayhourxcard', true);
 					if ($fulldayevent)
 					{
-                        $prefix=';VALUE=DATE';
-					    $enddatef = dol_print_date($enddate+1,'dayxcard',false);
+                        $prefix = ';VALUE=DATE';
+					    $enddatef = dol_print_date($enddate + 1, 'dayxcard', false);
 					    //$enddatef .= dol_print_date($enddate+1,'dayhourxcard',false);   // Local time
 					}
-                    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");
-					fwrite($calfileh,"END:VEVENT\n");
+                    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");
+					fwrite($calfileh, "END:VEVENT\n");
 				}
 
 				// Output the vCard/iCal VTODO object
@@ -225,30 +225,30 @@ 
 				// Output the vCard/iCal VJOURNAL object
 				if ($type == 'journal')
 				{
-					fwrite($calfileh,"BEGIN:VJOURNAL\n");
-					fwrite($calfileh,"UID:".$uid."\n");
-					if (! empty($email))
+					fwrite($calfileh, "BEGIN:VJOURNAL\n");
+					fwrite($calfileh, "UID:".$uid."\n");
+					if (!empty($email))
 					{
-						fwrite($calfileh,"ORGANIZER:MAILTO:".$email."\n");
-						fwrite($calfileh,"CONTACT:MAILTO:".$email."\n");
+						fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
+						fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 					}
-					if (! empty($url))
+					if (!empty($url))
 					{
-						fwrite($calfileh,"URL:".$url."\n");
+						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");
-					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
-					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					fwrite($calfileh,'STATUS:CONFIRMED'."\n");
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
-					fwrite($calfileh,"DTSTAMP:".dol_print_date($startdatef,'dayhourxcard',true)."\n");
-
-					fwrite($calfileh,"END:VJOURNAL\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");
+					fwrite($calfileh, "CATEGORIES:".$category."\n");
+					fwrite($calfileh, "LOCATION:".$location."\n");
+					fwrite($calfileh, "TRANSP:OPAQUE\n");
+					fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
+					fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, 'dayhourxcard', true)."\n");
+
+					fwrite($calfileh, "END:VJOURNAL\n");
 				}
 
 
@@ -267,10 +267,10 @@ 
 		}
 
 		// Footer
-		fwrite($calfileh,"END:VCALENDAR");
+		fwrite($calfileh, "END:VCALENDAR");
 
 		fclose($calfileh);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 	else
@@ -292,43 +292,43 @@ 
  *	@param		string	$filter				Filter
  *	@return		int							<0 if ko, Nb of events in file if ok
  */
-function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter='')
+function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '')
 {
-	global $user,$conf,$langs;
+	global $user, $conf, $langs;
 	global $dolibarr_main_url_root;
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) return -1;
 
-	$fichier=fopen($outputfile,'w');
+	$fichier = fopen($outputfile, 'w');
 	if ($fichier)
 	{
-		$date=date("r");
+		$date = date("r");
 
 		// Print header
-		$form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+		$form = '<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
-		$form='<rss version="2.0">';
+		$form = '<rss version="2.0">';
 		fwrite($fichier, $form);
 		fwrite($fichier, "\n");
 
-		$form="<channel>\n<title>".$title."</title>\n";
+		$form = "<channel>\n<title>".$title."</title>\n";
 		fwrite($fichier, $form);
 
-		$form='<description><![CDATA['.$desc.'.]]></description>'."\n".
+		$form = '<description><![CDATA['.$desc.'.]]></description>'."\n".
 //		'<language>fr</language>'."\n".
 		'<copyright>Dolibarr</copyright>'."\n".
 		'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
 		'<generator>Dolibarr</generator>'."\n";
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-  		$url=$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
-		$form.='<link><![CDATA['.$url.']]></link>'."\n";
+  		$url = $urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+		$form .= '<link><![CDATA['.$url.']]></link>'."\n";
 
 		//print $form;
 		fwrite($fichier, $form);
@@ -336,12 +336,12 @@ 
 
 		foreach ($events_array as $key => $event)
 		{
-			$eventqualified=true;
+			$eventqualified = true;
 			if ($filter)
 			{
 				// TODO Add a filter
 
-				$eventqualified=false;
+				$eventqualified = false;
 			}
 
 			if ($eventqualified)
@@ -350,16 +350,16 @@ 
 				$startdate	  = $event['startdate'];
 				$summary  	  = $event['summary'];
 				$url		  = $event['url'];
-				$author		  = $event['author'];
-				$category	  = $event['category'];
+				$author = $event['author'];
+				$category = $event['category'];
 				/* No place inside a RSS
                 $priority     = $event['priority'];
                 $fulldayevent = $event['fulldayevent'];
                 $location     = $event['location'];
                 $email        = $event['email'];
                 */
-				$description=preg_replace('/<br[\s\/]?>/i',"\n",$event['desc']);
- 				$description=dol_string_nohtmltag($description,0);	// Remove html tags
+				$description = preg_replace('/<br[\s\/]?>/i', "\n", $event['desc']);
+ 				$description = dol_string_nohtmltag($description, 0); // Remove html tags
 
 				fwrite($fichier, "<item>\n");
 				fwrite($fichier, "<title><![CDATA[".$summary."]]></title>\n");
@@ -382,7 +382,7 @@ 
 		fwrite($fichier, '</rss>');
 
 		fclose($fichier);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 	}
 }
@@ -395,24 +395,24 @@ 
  * 	@param 		string	$string		string to encode
  * 	@return		string				string encoded
  */
-function format_cal($format,$string)
+function format_cal($format, $string)
 {
 	global $conf;
 
-	$newstring=$string;
+	$newstring = $string;
 
 	if ($format == 'vcal')
 	{
-		$newstring=quotedPrintEncode($newstring);
+		$newstring = quotedPrintEncode($newstring);
 	}
 	if ($format == 'ical')
 	{
 		// Replace new lines chars by '\n'
-		$newstring=preg_replace('/'."\r\n".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n\r".'/i',"\n",$newstring);
-		$newstring=preg_replace('/'."\n".'/i','\n',$newstring);
+		$newstring = preg_replace('/'."\r\n".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n\r".'/i', "\n", $newstring);
+		$newstring = preg_replace('/'."\n".'/i', '\n', $newstring);
 		// Must not exceed 75 char. Cut with "\r\n"+Space
-		$newstring=calEncode($newstring);
+		$newstring = calEncode($newstring);
 	}
 
 	return $newstring;
@@ -434,14 +434,14 @@ 
 	// If mb_ functions exists, it's better to use them
 	if (function_exists('mb_strlen'))
 	{
-	    $strlength=mb_strlen($line, 'UTF-8');
+	    $strlength = mb_strlen($line, 'UTF-8');
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = mb_substr($line, $j, 1, 'UTF-8');	// Take char at position $j
+			$char = mb_substr($line, $j, 1, 'UTF-8'); // Take char at position $j
 
 			if ((mb_strlen($newpara, 'UTF-8') + mb_strlen($char, 'UTF-8')) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -450,14 +450,14 @@ 
 	}
 	else
 	{
-	    $strlength=dol_strlen($line);
+	    $strlength = dol_strlen($line);
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
-			$char = substr($line, $j, 1);	// Take char at position $j
+			$char = substr($line, $j, 1); // Take char at position $j
 
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75 )
+			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
 			{
-				$out .= $newpara . "\r\n ";	// CRLF + Space for cal
+				$out .= $newpara."\r\n "; // CRLF + Space for cal
 				$newpara = '';
 			}
 			$newpara .= $char;
@@ -476,7 +476,7 @@ 
  *	@param		int		$forcal		1=For cal
  *	@return		string 				String converted
  */
-function quotedPrintEncode($str,$forcal=0)
+function quotedPrintEncode($str, $forcal = 0)
 {
 	$lines = preg_split("/\r\n/", $str);
 	$out = '';
@@ -485,19 +485,19 @@ 
 	{
 		$newpara = '';
 
-		$strlength=strlen($line);	// Do not use dol_strlen here, we need number of bytes
+		$strlength = strlen($line); // Do not use dol_strlen here, we need number of bytes
 		for ($j = 0; $j <= ($strlength - 1); $j++)
 		{
 			$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;
@@ -516,6 +516,6 @@ 
 function quotedPrintDecode($str)
 {
 	$out = preg_replace('/=\r?\n/', '', $str);
-	$out = quoted_printable_decode($out);	// Available with PHP 4+
+	$out = quoted_printable_decode($out); // Available with PHP 4+
 	return trim($out);
 }

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

Spacing +11 added lines, -11 removed lines

@@ -87,18 +87,18 @@ 
 	global $dolibarr_main_url_root;
 
 	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	// Cron launch
 	print '<div class="div-table-responsive-no-min">';
 	print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
+	print img_picto('', 'object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
-	$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
-	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	$url = $urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
+	print img_picto('', 'object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
     print '</div>';
     print '<br>';
     
@@ -107,22 +107,22 @@ 
 	
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
-	$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+	$file = '/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
 	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
 	print '<br>';
 
 	// Add note
 	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;
+    	$linuxlike = 1;
+    	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>';
+    		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
     	{

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

Spacing +5 added lines, -5 removed lines

@@ -38,17 +38,17 @@ 
  *  @param  string              $varlink        Add a variable into the address of the page
  *	@return	void
  */
-function report_header($reportname,$notused,$period,$periodlink,$description,$builddate,$exportlink='',$moreparam=array(),$calcmode='', $varlink='')
+function report_header($reportname, $notused, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '')
 {
 	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;
+	$h = 0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
 	$head[$h][1] = $langs->trans("Report");
 	$head[$h][2] = 'report';
@@ -57,7 +57,7 @@ 
 
 	dol_fiche_head($head, 'report');
 
-	foreach($moreparam as $key => $value)
+	foreach ($moreparam as $key => $value)
 	{
 		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}

dolibarr/htdocs/core/actions_sendmails.inc.php

Spacing +132 added lines, -132 removed lines

@@ -32,66 +32,66 @@ 
 /*
  * Add file in email form
  */
-if (GETPOST('addfile','alpha'))
+if (GETPOST('addfile', 'alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+	$vardir = $conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
 
 	dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, $trackid, 0);
-	$action='presend';
+	$action = 'presend';
 }
 
 /*
  * Remove file in email form
  */
-if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
+if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';             // TODO Add $keytoavoidconflict in upload_dir path
+	$vardir = $conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
 
 	// TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
 	// GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
-	dol_remove_file_process(GETPOST('removedfile','alpha'), 0, 1, $trackid);   // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
-	$action='presend';
+	dol_remove_file_process(GETPOST('removedfile', 'alpha'), 0, 1, $trackid); // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
+	$action = 'presend';
 }
 
 /*
  * Remove all files in email form
  */
-if (GETPOST('removAll','alpha'))
+if (GETPOST('removAll', 'alpha'))
 {
-	$trackid = GETPOST('trackid','aZ09');
+	$trackid = GETPOST('trackid', 'aZ09');
 
-	$listofpaths=array();
-	$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]);
+	$listofpaths = array();
+	$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]);
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->trackid = $trackid;
 
-	foreach($listofpaths as $key => $value)
+	foreach ($listofpaths as $key => $value)
 	{
 		$pathtodelete = $value;
 		$filetodelete = $listofnames[$key];
-		$result = dol_delete_file($pathtodelete,1); // Delete uploded Files
+		$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
 
 		$langs->load("other");
-		setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
+		setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 
 		$formmail->remove_attached_files($key); // Update Session
 	}
@@ -100,76 +100,76 @@ 
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
+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='';
+	$subject = ''; $actionmsg = ''; $actionmsg2 = '';
 
 	$langs->load('mails');
 
 	if (is_object($object))
 	{
-		$result=$object->fetch($id);
+		$result = $object->fetch($id);
 
-		$sendtosocid=0;    // Thirdparty on object
-		if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport', 'contact')))
+		$sendtosocid = 0; // Thirdparty on object
+		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
-			$thirdparty=$object->thirdparty;
-			$sendtosocid=$thirdparty->id;
+			$result = $object->fetch_thirdparty();
+			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')
 		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+			$thirdparty = $object;
+			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
 		}
 		else if ($object->element == 'societe')
 		{
-			$thirdparty=$object;
-			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+			$thirdparty = $object;
+			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
 		}
 		else if ($object->element == 'contact')
 		{
-			$contact=$object;
-			if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+			$contact = $object;
+			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
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
 	}
 	else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
-		$sendto='';
-		$sendtocc='';
-		$sendtobcc='';
+		$sendto = '';
+		$sendtocc = '';
+		$sendtobcc = '';
 		$sendtoid = array();
-		$sendtouserid=array();
-		$sendtoccuserid=array();
+		$sendtouserid = array();
+		$sendtoccuserid = array();
 
 		// Define $sendto
-		$receiver=$_POST['receiver'];
-		if (! is_array($receiver))
+		$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();
+		$tmparray = array();
 		if (trim($_POST['sendto']))
 		{
 			// Recipients are provided into free text
 			$tmparray[] = trim($_POST['sendto']);
 		}
-		if (count($receiver)>0)
+		if (count($receiver) > 0)
 		{
-			foreach($receiver as $key=>$val)
+			foreach ($receiver as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -183,42 +183,42 @@ 
 				}
 				elseif ($val)	// Id du contact
 				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
 				}
 			}
 		}
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
 		{
-			$receiveruser=$_POST['receiveruser'];
-			if (is_array($receiveruser) && count($receiveruser)>0)
+			$receiveruser = $_POST['receiveruser'];
+			if (is_array($receiveruser) && count($receiveruser) > 0)
 			{
 				$fuserdest = new User($db);
-				foreach($receiveruser as $key=>$val)
+				foreach ($receiveruser as $key=>$val)
 				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
+					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtouserid[] = $val;
 				}
 			}
 		}
 
-		$sendto=implode(',',$tmparray);
+		$sendto = implode(',', $tmparray);
 
 		// Define $sendtocc
-		$receivercc=$_POST['receivercc'];
-		if (! is_array($receivercc))
+		$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();
+		$tmparray = array();
 		if (trim($_POST['sendtocc']))
 		{
 			$tmparray[] = trim($_POST['sendtocc']);
 		}
 		if (count($receivercc) > 0)
 		{
-			foreach($receivercc as $key=>$val)
+			foreach ($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -232,57 +232,57 @@ 
 				}
 				elseif ($val)	// Id du contact
 				{
-					$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
+					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
 				}
 			}
 		}
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiverccuser=$_POST['receiverccuser'];
+			$receiverccuser = $_POST['receiverccuser'];
 
-			if (is_array($receiverccuser) && count($receiverccuser)>0)
+			if (is_array($receiverccuser) && count($receiverccuser) > 0)
 			{
 				$fuserdest = new User($db);
-				foreach($receiverccuser as $key=>$val)
+				foreach ($receiverccuser as $key=>$val)
 				{
-					$tmparray[] = $fuserdest->user_get_property($val,'email');
+					$tmparray[] = $fuserdest->user_get_property($val, 'email');
 					$sendtoccuserid[] = $val;
 				}
 			}
 		}
-		$sendtocc=implode(',',$tmparray);
+		$sendtocc = implode(',', $tmparray);
 
 		if (dol_strlen($sendto))
 		{
             // Define $urlwithroot
-            $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-            $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+            $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+            $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
             //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 			$langs->load("commercial");
 
-			$fromtype = GETPOST('fromtype','alpha');
+			$fromtype = GETPOST('fromtype', 'alpha');
 			if ($fromtype === 'robot') {
-				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
 			}
 			elseif ($fromtype === 'user') {
-				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
+				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 			}
 			elseif ($fromtype === 'company') {
-				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+				$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)) {
-				$tmp=explode(',', $user->email_aliases);
+				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
 			}
 			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
 			}
 			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];
+				$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);
 				if ($obj)
@@ -291,39 +291,39 @@ 
 				}
 			}
 			else {
-				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
+				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
 			}
 
-			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
-			$message = GETPOST('message','none');
-			$subject = GETPOST('subject','none');
+			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")).' <'.$_POST['replytomail'].'>';
+			$message = GETPOST('message', 'none');
+			$subject = GETPOST('subject', 'none');
 
 			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
 			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 			// become
 			// <img alt="" src="'.$urlwithroot.'viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
+			$message = preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
 
-			$sendtobcc= GETPOST('sendtoccc');
+			$sendtobcc = GETPOST('sendtoccc');
 			// Autocomplete the $sendtobcc
 			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if (! empty($autocopy))
+			if (!empty($autocopy))
 			{
-				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
+				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
 			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
 			if ($action == 'send' || $action == 'relance')
 			{
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
+				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
 				if ($message)
 				{
-					$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));
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+					$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));
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
 				}
 			}
@@ -331,9 +331,9 @@ 
 			// Create form object
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($db);
-			$formmail->trackid = $trackid;      // $trackid must be defined
+			$formmail->trackid = $trackid; // $trackid must be defined
 
-			$attachedfiles=$formmail->get_attached_files();
+			$attachedfiles = $formmail->get_attached_files();
 			$filepath = $attachedfiles['paths'];
 			$filename = $attachedfiles['names'];
 			$mimetype = $attachedfiles['mimes'];
@@ -383,15 +383,15 @@ 
 			*/
 
 			// Make substitution in email content
-			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
+			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
-			$parameters=array('mode'=>'formemail');
+			$parameters = array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
-			$subject=make_substitutions($subject, $substitutionarray);
-			$message=make_substitutions($message, $substitutionarray);
+			$subject = make_substitutions($subject, $substitutionarray);
+			$message = make_substitutions($message, $substitutionarray);
 
 			if (method_exists($object, 'makeSubstitution'))
 			{
@@ -401,16 +401,16 @@ 
 
 			// Send mail (substitutionarray must be done just before this)
 			if (empty($sendcontext)) $sendcontext = 'standard';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1,'','',$trackid,'', $sendcontext);
+			$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';
+				$action = 'presend';
 			}
 			else
 			{
-				$result=$mailfile->sendfile();
+				$result = $mailfile->sendfile();
 				if ($result)
 				{
 					// Two hooks are available into method $mailfile->sendfile, so dedicated code is no more required
@@ -437,25 +437,25 @@ 
 					// 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.
-						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
-						$object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
+						$object->socid = $sendtosocid; // To link to a company
+						$object->sendtoid = $sendtoid; // To link to contact addresses. This is an array.
+						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+						$object->actionmsg = $actionmsg; // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
+						$object->actionmsg2		= $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
 
-						$object->trackid        = $trackid;
+						$object->trackid = $trackid;
 						$object->fk_element		= $object->id;
 						$object->elementtype	= $object->element;
-						if (is_array($attachedfiles) && count($attachedfiles)>0) {
-							$object->attachedfiles	= $attachedfiles;
+						if (is_array($attachedfiles) && count($attachedfiles) > 0) {
+							$object->attachedfiles = $attachedfiles;
 						}
-						if (is_array($sendtouserid) && count($sendtouserid)>0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-							$object->sendtouserid	= $sendtouserid;
+						if (is_array($sendtouserid) && count($sendtouserid) > 0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+							$object->sendtouserid = $sendtouserid;
 						}
 
-						$object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
+						$object->email_msgid = $mailfile->msgid; // @TODO Set msgid into $mailfile after sending
 						$object->email_from = $from;
 						$object->email_subject = $subject;
 						$object->email_to = $sendto;
@@ -465,11 +465,11 @@ 
 						$object->email_msgid = $mailfile->msgid;
 
 						// Call of triggers
-						if (! empty($trigger_name))
+						if (!empty($trigger_name))
 						{
-    						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    						$interface=new Interfaces($db);
-    						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+    						include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+    						$interface = new Interfaces($db);
+    						$result = $interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
 							if ($result < 0) {
     							setEventMessages($interface->error, $interface->errors, 'errors');
     						}
@@ -478,28 +478,28 @@ 
 
 					// Redirect here
 					// This avoid sending mail twice if going out and then back to page
-					$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
 					setEventMessages($mesg, null, 'mesgs');
 
-  					$moreparam='';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam.= '&'.($paramname2?$paramname2:'mid').'='.$paramval2;
-		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').$moreparam);
+  					$moreparam = '';
+	  				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
 				{
 					$langs->load("other");
-					$mesg='<div class="error">';
+					$mesg = '<div class="error">';
 					if ($mailfile->error)
 					{
-						$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-						$mesg.='<br>'.$mailfile->error;
+						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
+						$mesg .= '<br>'.$mailfile->error;
 					}
 					else
 					{
-						$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
-					$mesg.='</div>';
+					$mesg .= '</div>';
 
 					setEventMessages($mesg, null, 'warnings');
 					$action = 'presend';
@@ -509,7 +509,7 @@ 
 		else
 		{
 			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
@@ -517,7 +517,7 @@ 
 	else
 	{
 		$langs->load("other");
-		setEventMessages($langs->trans('ErrorFailedToReadObject',$object->element), null, 'errors');
+		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
 		$action = 'presend';
 	}

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

Spacing +9 added lines, -9 removed lines

@@ -1,19 +1,19 @@ 
 <!-- BEGIN TEMPLATE resource_view.tpl.php -->
 <?php
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 
-$form= new Form($db);
+$form = new Form($db);
 
 
 print '<div class="tagtable centpercent noborder allwidth">';
 
-if($mode == 'edit' )
+if ($mode == 'edit')
 {
     print '<form class="tagtr liste_titre">';
     print '<div class="tagtd liste_titre">'.$langs->trans('Resource').'</div>';
@@ -34,13 +34,13 @@ 
     print '</form>';
 }
 
-if( (array) $linked_resources && count($linked_resources) > 0)
+if ((array) $linked_resources && count($linked_resources) > 0)
 {
 
 	foreach ($linked_resources as $linked_resource)
 	{
 
-		$object_resource = fetchObjectByElement($linked_resource['resource_id'],$linked_resource['resource_type']);
+		$object_resource = fetchObjectByElement($linked_resource['resource_id'], $linked_resource['resource_type']);
 
 		//$element_id = $linked_resource['rowid'];
 
@@ -56,16 +56,16 @@ 
 
 			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';
 			print '<div class="tagtd">'.$object_resource->type_label.'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('busy',$linked_resource['busy']?1:0,1).'</div>';
-			print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory',$linked_resource['mandatory']?1:0,1).'</div>';
+			print '<div class="tagtd" align="center">'.$form->selectyesno('busy', $linked_resource['busy'] ? 1 : 0, 1).'</div>';
+			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
 		{
-			$style='';
+			$style = '';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
-				$style='style="background: orange;"';
+				$style = 'style="background: orange;"';
 
 			print '<form class="tagtr oddeven" '.$style.'>';
 

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

Spacing +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	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 -->
@@ -35,25 +35,25 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
 	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';
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	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

Spacing +24 added lines, -24 removed lines

@@ -29,47 +29,47 @@ 
 $isNewObject = empty($object->id) && empty($object->rowid);
 
 // Relative and absolute discounts
-$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("EditRelativeDiscount") . '</a>';
-$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-$viewabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $thirdparty->id . '&backtopage=' . $backtopage . '">' . $langs->trans("ViewAvailableGlobalDiscounts") . '</a>';
+$addrelativediscount = '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("EditRelativeDiscount").'</a>';
+$addabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("EditGlobalDiscounts").'</a>';
+$viewabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("ViewAvailableGlobalDiscounts").'</a>';
 
 $fixedDiscount = $thirdparty->remise_percent;
-if(! empty($discount_type)) {
+if (!empty($discount_type)) {
 	$fixedDiscount = $thirdparty->remise_supplier_percent;
 }
 
 if ($fixedDiscount > 0)
 {
-	$translationKey = (! empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
+	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
 }
 else
 {
-	$translationKey = (! empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
+	$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) {
 
-	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut > $classname::STATUS_DRAFT || $object->type == $classname::TYPE_CREDIT_NOTE || $object->type == $classname::TYPE_DEPOSIT) {
-		$translationKey = ! empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
-		$text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency)).'.';
+	if ($cannotApplyDiscount || !$isInvoice || $isNewObject || $object->statut > $classname::STATUS_DRAFT || $object->type == $classname::TYPE_CREDIT_NOTE || $object->type == $classname::TYPE_DEPOSIT) {
+		$translationKey = !empty($discount_type) ? 'HasAbsoluteDiscountFromSupplier' : 'CompanyHasAbsoluteDiscount';
+		$text = $langs->trans($translationKey, price($absolute_discount), $langs->transnoentities("Currency".$conf->currency)).'.';
 
-		if ($isInvoice && ! $isNewObject && $object->statut > $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
+		if ($isInvoice && !$isNewObject && $object->statut > $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
 			$text = $form->textwithpicto($text, $langs->trans('AbsoluteDiscountUse'));
 		}
 
 		if ($isNewObject) {
-			$text.= ' ('.$addabsolutediscount.')';
+			$text .= ' ('.$addabsolutediscount.')';
 		}
 
 		print '<br>'.$text;
 	} else {
 		// Discount available of type fixed amount (not credit note)
-		$more = '(' . $addabsolutediscount . ')';
-		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
+		$more = '('.$addabsolutediscount.')';
+		$form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
 	}
 }
 
@@ -77,32 +77,32 @@ 
 if ($absolute_creditnote > 0) {
 
 	// If validated, we show link "add credit note to payment"
-	if ($cannotApplyDiscount || ! $isInvoice || $isNewObject || $object->statut != $classname::STATUS_VALIDATED || $object->type == $classname::TYPE_CREDIT_NOTE) {
-		$translationKey = ! empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
-		$text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '.';
+	if ($cannotApplyDiscount || !$isInvoice || $isNewObject || $object->statut != $classname::STATUS_VALIDATED || $object->type == $classname::TYPE_CREDIT_NOTE) {
+		$translationKey = !empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
+		$text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency".$conf->currency)).'.';
 
-		if ($isInvoice && ! $isNewObject && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_DEPOSIT) {
+		if ($isInvoice && !$isNewObject && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_DEPOSIT) {
 			$text = $form->textwithpicto($text, $langs->trans('CreditNoteDepositUse'));
 		}
 
 		if ($absolute_discount <= 0 || $isNewObject) {
-			$text.= '('.$addabsolutediscount.')';
+			$text .= '('.$addabsolutediscount.')';
 		}
 
 		print '<br>'.$text;
 	} else {  // We can add a credit note on a down payment or standard invoice or situation invoice
 		// There is credit notes discounts available
-		$more = $isInvoice && ! $isNewObject ? ' (' . $viewabsolutediscount . ')' : '';
-		$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $thirdparty->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, $discount_type); // We allow credit note even if amount is higher
+		$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';
+		$form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $thirdparty->id, $absolute_creditnote, $filtercreditnote, 0, $more, 0, $discount_type); // We allow credit note even if amount is higher
 	}
 }
 
-if($absolute_discount <= 0 && $absolute_creditnote <= 0) {
-	$translationKey = ! empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
+if ($absolute_discount <= 0 && $absolute_creditnote <= 0) {
+	$translationKey = !empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';
 	print '<br>'.$langs->trans($translationKey).'.';
 
 	if ($isInvoice && $object->statut == $classname::STATUS_DRAFT && $object->type != $classname::TYPE_CREDIT_NOTE && $object->type != $classname::TYPE_DEPOSIT) {
-		print ' (' . $addabsolutediscount . ')';
+		print ' ('.$addabsolutediscount.')';
 	}
 }
 

dolibarr/htdocs/core/tpl/notes.tpl.php

Spacing +34 added lines, -34 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object)) {
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -29,56 +29,56 @@ 
 $note_public  = 'note_public';
 $note_private = 'note_private';
 
-$colwidth=(isset($colwidth)?$colwidth:(empty($cssclass)?'25':''));
+$colwidth = (isset($colwidth) ? $colwidth : (empty($cssclass) ? '25' : ''));
 // Set $permission from the $permissionnote var defined on calling page
-$permission=(isset($permissionnote)?$permissionnote:(isset($permission)?$permission:(isset($user->rights->$module->create)?$user->rights->$module->create:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0))));
-$moreparam=(isset($moreparam)?$moreparam:'');
-$value_public=$object->note_public;
-$value_private=$object->note_private;
-if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
+$permission = (isset($permissionnote) ? $permissionnote : (isset($permission) ? $permission : (isset($user->rights->$module->create) ? $user->rights->$module->create : (isset($user->rights->$module->creer) ? $user->rights->$module->creer : 0))));
+$moreparam = (isset($moreparam) ? $moreparam : '');
+$value_public = $object->note_public;
+$value_private = $object->note_private;
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
 {
-	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action','aZ09') == 'edit'.$note_public)
+	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
+	if (GETPOST('action', 'aZ09') == 'edit'.$note_public)
 	{
-		$value_public=dol_concatdesc($value_public, ($value_public?"\n":"")."-- ".$stringtoadd);
-		if (dol_textishtml($value_public)) $value_public.="<br>\n";
-		else $value_public.="\n";
+		$value_public = dol_concatdesc($value_public, ($value_public ? "\n" : "")."-- ".$stringtoadd);
+		if (dol_textishtml($value_public)) $value_public .= "<br>\n";
+		else $value_public .= "\n";
 	}
 }
-if (! empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 {
-	$stringtoadd=dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action','aZ09') == 'edit'.$note_private)
+	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
+	if (GETPOST('action', 'aZ09') == 'edit'.$note_private)
 	{
-		$value_private=dol_concatdesc($value_private, ($value_private?"\n":"")."-- ".$stringtoadd);
-		if (dol_textishtml($value_private)) $value_private.="<br>\n";
-		else $value_private.="\n";
+		$value_private = dol_concatdesc($value_private, ($value_private ? "\n" : "")."-- ".$stringtoadd);
+		if (dol_textishtml($value_private)) $value_private .= "<br>\n";
+		else $value_private .= "\n";
 	}
 }
 
 // Special cases
-if ($module == 'propal')                 { $permission=$user->rights->propale->creer;}
-elseif ($module == 'supplier_proposal')  { $permission=$user->rights->supplier_proposal->creer;}
-elseif ($module == 'fichinter')          { $permission=$user->rights->ficheinter->creer;}
-elseif ($module == 'project')            { $permission=$user->rights->projet->creer;}
-elseif ($module == 'project_task')       { $permission=$user->rights->projet->creer;}
-elseif ($module == 'invoice_supplier')   { $permission=$user->rights->fournisseur->facture->creer;}
-elseif ($module == 'order_supplier')     { $permission=$user->rights->fournisseur->commande->creer;}
-elseif ($module == 'societe')     	 	 { $permission=$user->rights->societe->creer;}
-elseif ($module == 'contact')     		 { $permission=$user->rights->societe->creer;}
-elseif ($module == 'shipping')    		 { $permission=$user->rights->expedition->creer;}
-elseif ($module == 'product')    		 { $permission=$user->rights->produit->creer;}
+if ($module == 'propal') { $permission = $user->rights->propale->creer; }
+elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; }
+elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
+elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
+elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
+elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
+elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
+elseif ($module == 'societe') { $permission = $user->rights->societe->creer; }
+elseif ($module == 'contact') { $permission = $user->rights->societe->creer; }
+elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
+elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:95%';	// Rem: This var is for all notes, not only thirdparties note.
-else $typeofdata='textarea:12:95%';
+if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%'; // Rem: This var is for all notes, not only thirdparties note.
+else $typeofdata = 'textarea:12:95%';
 
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border centpercent">'."\n";
 if ($module != 'product') {
 	// No public note yet on products
 	print '<div class="tagtr pair table-border-row">'."\n";
-	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
 	print '<div class="tagtd table-val-border-col">'."\n";
@@ -87,8 +87,8 @@ 
 	print '</div>'."\n";
 }
 if (empty($user->societe_id)) {
-	print '<div class="tagtr '.($module != 'product'?'impair':'pair').' table-border-row">'."\n";
-	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass)?'':' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+	print '<div class="tagtr '.($module != 'product' ? 'impair' : 'pair').' table-border-row">'."\n";
+	print '<div class="tagtd tagtdnote tdtop table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
 	print '<div class="tagtd table-val-border-col">'."\n";