Dolibarr / dolibarr

htdocs/core/class/stats.class.php

Indentation +98 added lines, -98 removed lines

@@ -45,16 +45,16 @@ 
 	{
 		global $conf,$user,$langs;
 
-	    if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
 		$datay=array();
 
 		// Search into cache
 		if (! empty($cachedelay))
-	    {
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-	    }
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
 
 		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
 		$newmask='0644';
@@ -139,45 +139,45 @@ 
 	{
 		global $conf,$user,$langs;
 
-        if ($startyear > $endyear) return -1;
-
-        $datay=array();
-
-        // Search into cache
-        if (! empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
-
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
-
-        $nowgmt = dol_now();
-
-        $foundintocache=0;
-        if ($cachedelay > 0)
-        {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
-
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
-
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
+		if ($startyear > $endyear) return -1;
+
+		$datay=array();
+
+		// Search into cache
+		if (! empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
+
+		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask='0644';
+
+		$nowgmt = dol_now();
+
+		$foundintocache=0;
+		if ($cachedelay > 0)
+		{
+			$filedate=dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache=1;
+
+				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+			}
+			else
+			{
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
+
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		}
+		else
 		{
 			$year=$startyear;
 			while($year <= $endyear)
@@ -229,9 +229,9 @@ 
 	 */
 	function getAverageByMonthWithPrevYear($endyear,$startyear)
 	{
-        if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) return -1;
 
-        $datay=array();
+		$datay=array();
 
 		$year=$startyear;
 		while($year <= $endyear)
@@ -267,43 +267,43 @@ 
 	{
 		global $conf,$user,$langs;
 
-        $datay=array();
-
-        // Search into cache
-        if (! empty($cachedelay))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-        }
-
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
-
-        $nowgmt = dol_now();
-
-        $foundintocache=0;
-        if ($cachedelay > 0)
-        {
-        	$filedate=dol_filemtime($newpathofdestfile);
-        	if ($filedate >= ($nowgmt - $cachedelay))
-        	{
-        		$foundintocache=1;
-
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
-        	}
-        }
-
-        // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
-        {
-        	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
+		$datay=array();
+
+		// Search into cache
+		if (! empty($cachedelay))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+		}
+
+		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask='0644';
+
+		$nowgmt = dol_now();
+
+		$foundintocache=0;
+		if ($cachedelay > 0)
+		{
+			$filedate=dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				$foundintocache=1;
+
+				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+			}
+			else
+			{
+				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
+			}
+		}
+
+		// Load file into $data
+		if ($foundintocache)    // Cache file found and is not too old
+		{
+			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		}
+		else
 		{
 			$data=$this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
@@ -391,8 +391,8 @@ 
 				// For some $sql only
 				if (isset($row->weighted))
 				{
-				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+					$result[$i]['weighted'] = $row->weighted;
+					if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -407,10 +407,10 @@ 
 	/**
 	 *     Renvoie le nombre de proposition par mois pour une annee donnee
 	 *
-     *     @param   int		$year       Year
-     *     @param   string	$sql        SQL
-     *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
-     *     @return	array				Array of nb each month
+	 *     @param   int		$year       Year
+	 *     @param   string	$sql        SQL
+	 *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
+	 *     @return	array				Array of nb each month
 	 */
 	function _getNbByMonth($year, $sql, $format=0)
 	{
@@ -460,7 +460,7 @@ 
 	 *
 	 *     @param	int		$year       Year
 	 *     @param   string	$sql		SQL
-     *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
+	 *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
 	 *     @return	array
 	 */
 	function _getAmountByMonth($year, $sql, $format=0)
@@ -484,7 +484,7 @@ 
 		  	}
 		  	$this->db->free($resql);
 		}
-        else dol_print_error($this->db);
+		else dol_print_error($this->db);
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -506,8 +506,8 @@ 
 	/**
 	 *	   Renvoie le montant moyen par mois pour une annee donnee
 	 *
-     *     @param	int		$year       Year
-     *     @param  	string	$sql        SQL
+	 *     @param	int		$year       Year
+	 *     @param  	string	$sql        SQL
 	 *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
 	 *     @return	array
 	 */
@@ -531,7 +531,7 @@ 
 		  	}
 		  	$this->db->free($resql);
 		}
-        else dol_print_error($this->db);
+		else dol_print_error($this->db);
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -554,9 +554,9 @@ 
 	/**
 	 *	   Return number or total of product refs
 	 *
-     *     @param  	string	$sql        SQL
-     *     @param	int		$limit		Limit
-     *     @return	array
+	 *     @param  	string	$sql        SQL
+	 *     @param	int		$limit		Limit
+	 *     @return	array
 	 */
 	function _getAllByProduct($sql, $limit=10)
 	{
@@ -581,7 +581,7 @@ 
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
 		  	$this->db->free($resql);
 		}
-        else dol_print_error($this->db);
+		else dol_print_error($this->db);
 
 		return $result;
 	}

Spacing +107 added lines, -107 removed lines

@@ -30,8 +30,8 @@ 
 abstract class Stats
 {
 	protected $db;
-	var $_lastfetchdate=array();	// Dates of cache file read by methods
-	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
+	var $_lastfetchdate = array(); // Dates of cache file read by methods
+	var $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -41,35 +41,35 @@ 
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @return 	array					Array of values
 	 */
-	function getNbByMonthWithPrevYear($endyear,$startyear,$cachedelay=0)
+	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 	    if ($startyear > $endyear) return -1;
 
-		$datay=array();
+		$datay = array();
 
 		// Search into cache
-		if (! empty($cachedelay))
+		if (!empty($cachedelay))
 	    {
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 	    }
 
-		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-		$newmask='0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
 		$nowgmt = dol_now();
 
-		$foundintocache=0;
+		$foundintocache = 0;
 		if ($cachedelay > 0)
 		{
-			$filedate=dol_filemtime($newpathofdestfile);
+			$filedate = dol_filemtime($newpathofdestfile);
 			if ($filedate >= ($nowgmt - $cachedelay))
 			{
-				$foundintocache=1;
+				$foundintocache = 1;
 
-				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
 			}
 			else
 			{
@@ -85,7 +85,7 @@ 
 		}
 		else
 		{
-			$year=$startyear;
+			$year = $startyear;
 			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getNbByMonth($year);
@@ -94,13 +94,13 @@ 
 
 			$data = array();
 
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0];
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];
+					$data[$i][] = $datay[$year][$i][1];
 					$year++;
 				}
 			}
@@ -110,14 +110,14 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
 
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		// return array(array('Month',val1,val2,val3),...)
@@ -135,35 +135,35 @@ 
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @return 	array					Array of values
 	 */
-	function getAmountByMonthWithPrevYear($endyear,$startyear,$cachedelay=0)
+	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -179,8 +179,8 @@ 
         }
         else
 		{
-			$year=$startyear;
-			while($year <= $endyear)
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getAmountByMonth($year);
 				$year++;
@@ -188,13 +188,13 @@ 
 
 			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
 					$year++;
 				}
 			}
@@ -204,17 +204,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -227,14 +227,14 @@ 
 	 * @param	int		$startyear		End year
 	 * @return 	array					Array of values
 	 */
-	function getAverageByMonthWithPrevYear($endyear,$startyear)
+	function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
-		$year=$startyear;
-		while($year <= $endyear)
+		$year = $startyear;
+		while ($year <= $endyear)
 		{
 			$datay[$year] = $this->getAverageByMonth($year);
 			$year++;
@@ -242,13 +242,13 @@ 
 
 		$data = array();
 
-		for ($i = 0 ; $i < 12 ; $i++)
+		for ($i = 0; $i < 12; $i++)
 		{
-			$data[$i][]=$datay[$endyear][$i][0];
-			$year=$startyear;
-			while($year <= $endyear)
+			$data[$i][] = $datay[$endyear][$i][0];
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
-				$data[$i][]=$datay[$year][$i][1];
+				$data[$i][] = $datay[$year][$i][1];
 				$year++;
 			}
 		}
@@ -263,33 +263,33 @@ 
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @return 	array					Array of values
 	 */
-	function getAllByProductEntry($year,$cachedelay=0)
+	function getAllByProductEntry($year, $cachedelay = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -305,7 +305,7 @@ 
         }
         else
 		{
-			$data=$this->getAllByProduct($year);
+			$data = $this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
 
@@ -313,16 +313,16 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -343,7 +343,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -373,7 +373,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -383,16 +383,16 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if ($i > 0 && $row->nb) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if ($i > 0 && $row->total) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if ($i > 0 && $row->avg) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if ($i > 0 && $row->weighted) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -412,13 +412,13 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
      *     @return	array				Array of nb each month
 	 */
-	function _getNbByMonth($year, $sql, $format=0)
+	function _getNbByMonth($year, $sql, $format = 0)
 	{
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -437,18 +437,18 @@ 
 			dol_print_error($this->db);
 		}
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$month = dol_print_date(dol_mktime(12, 0, 0, $i, 1, $year), ($format ? "%m" : "%b"));
+			$month = dol_substr($month, 0, 3);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -463,14 +463,14 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
 	 *     @return	array
 	 */
-	function _getAmountByMonth($year, $sql, $format=0)
+	function _getAmountByMonth($year, $sql, $format = 0)
 	{
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -486,18 +486,18 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
+			$res[$i] = (int) round((isset($result[$i]) ? $result[$i] : 0));
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$month = dol_print_date(dol_mktime(12, 0, 0, $i, 1, $year), ($format ? "%m" : "%b"));
+			$month = dol_substr($month, 0, 3);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -511,13 +511,13 @@ 
 	 *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is a number
 	 *     @return	array
 	 */
-	function _getAverageByMonth($year, $sql, $format=0)
+	function _getAverageByMonth($year, $sql, $format = 0)
 	{
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -533,18 +533,18 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
-			$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$month = dol_print_date(dol_mktime(12, 0, 0, $i, 1, $year), ($format ? "%m" : "%b"));
+			$month = dol_substr($month, 0, 3);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -558,27 +558,27 @@ 
      *     @param	int		$limit		Limit
      *     @return	array
 	 */
-	function _getAllByProduct($sql, $limit=10)
+	function _getAllByProduct($sql, $limit = 10)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i = 0; $other=0;
+			$i = 0; $other = 0;
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
+		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
 		  		else $other += $row[1];
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
 		}
         else dol_print_error($this->db);

Braces +78 added lines, -44 removed lines

@@ -45,7 +45,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-	    if ($startyear > $endyear) return -1;
+	    if ($startyear > $endyear) {
+	    	return -1;
+	    }
 
 		$datay=array();
 
@@ -70,20 +72,20 @@ 
 				$foundintocache=1;
 
 				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
+		if ($foundintocache) {
+			// Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
-		else
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
+		} else
 		{
 			$year=$startyear;
 			while ($year <= $endyear)
@@ -110,11 +112,15 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (! empty($conf->global->MAIN_UMASK)) {
+				$newmask=$conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -139,7 +145,9 @@ 
 	{
 		global $conf,$user,$langs;
 
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+        	return -1;
+        }
 
         $datay=array();
 
@@ -164,20 +172,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+        	// Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$year=$startyear;
 			while($year <= $endyear)
@@ -204,16 +212,21 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+					$newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
+			} else {
+				dol_syslog("Failed to write cache file", LOG_ERR);
 			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
 		}
 
@@ -229,7 +242,9 @@ 
 	 */
 	function getAverageByMonthWithPrevYear($endyear,$startyear)
 	{
-        if ($startyear > $endyear) return -1;
+        if ($startyear > $endyear) {
+        	return -1;
+        }
 
         $datay=array();
 
@@ -290,20 +305,20 @@ 
         		$foundintocache=1;
 
         		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
 
         // Load file into $data
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+        	// Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
-        else
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
+        } else
 		{
 			$data=$this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
@@ -313,13 +328,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (! dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (! empty($conf->global->MAIN_UMASK)) {
+					$newmask=$conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
@@ -355,8 +374,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -383,22 +401,29 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if($i>0 && $row->nb) {
+					$result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				}
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if($i>0 && $row->total) {
+					$result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				}
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if($i>0 && $row->avg) {
+					$result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				}
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if($i>0 && $row->weighted) {
+				    	$result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    }
 				}
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -431,8 +456,7 @@ 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -483,8 +507,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+        	dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -530,8 +555,9 @@ 
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+        	dol_print_error($this->db);
+        }
 
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
@@ -574,14 +600,22 @@ 
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
-		  		else $other += $row[1];
+		  		if ($i < $limit || $num == $limit) {
+		  			$result[$i] = array($row[0],$row[1]);
+		  		}
+		  		// Ref of product, nb
+		  		else {
+		  			$other += $row[1];
+		  		}
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) {
+		  		$result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else {
+        	dol_print_error($this->db);
+        }
 
 		return $result;
 	}

htdocs/core/class/ctyperesource.class.php

Spacing +47 added lines, -47 removed lines

@@ -99,18 +99,18 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
 		
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+		$sql .= 'code,';
+		$sql .= 'label';
+		$sql .= 'active';
 
 		
 		$sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
 
 		
 		$sql .= ')';
@@ -119,13 +119,13 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -142,7 +142,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -159,7 +159,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id,$code='',$label='')
+	public function fetch($id, $code = '', $label = '')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -171,10 +171,10 @@ 
 		$sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 		
 		
 		$resql = $this->db->query($sql);
@@ -211,10 +211,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -230,7 +230,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -242,24 +242,24 @@ 
 		$sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 			}
 		}
 		
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -281,10 +281,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -318,22 +318,22 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 		
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
 
         
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error && !$notrigger) {
@@ -350,7 +350,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -389,14 +389,14 @@ 
 		// If you need to delete child tables to, you can insert them here
 		
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -404,7 +404,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -442,9 +442,9 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// End
@@ -455,7 +455,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 

Braces +7 added lines, -3 removed lines

@@ -172,9 +172,13 @@
 
 		
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+			$sql.= " WHERE t.id = ".$id;
+		} elseif ($code) {
+			$sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+			$sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 		
 		
 		$resql = $this->db->query($sql);

htdocs/core/class/ctypent.class.php

Braces +38 added lines, -20 removed lines

@@ -68,11 +68,21 @@ 
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) {
+			$this->id=trim($this->id);
+		}
+		if (isset($this->code)) {
+			$this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+			$this->module=trim($this->module);
+		}
 
 
 
@@ -134,8 +144,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -162,9 +171,13 @@ 
 		$sql.= " t.active,";
 		$sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        if ($id) {
+        	$sql.= " WHERE t.id = ".$id;
+        } elseif ($code) {
+        	$sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        } elseif ($label) {
+        	$sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -183,8 +196,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -205,10 +217,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) {
+			$this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+			$this->module=trim($this->module);
+		}
 
 
 		// Check parameters
@@ -254,8 +274,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -310,8 +329,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

Indentation +130 added lines, -130 removed lines

@@ -33,7 +33,7 @@ 
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
-    var $id;
+	var $id;
 	var $code;
 	var $libelle;
 	var $active;
@@ -42,28 +42,28 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -79,7 +79,7 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
 		$sql.= "id,";
@@ -89,7 +89,7 @@ 
 		$sql.= "module";
 
 
-        $sql.= ") VALUES (";
+		$sql.= ") VALUES (";
 
 		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
 		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
@@ -103,34 +103,34 @@ 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
-        }
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -138,70 +138,70 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @param		string	$label	Label
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    function fetch($id,$code='',$label='')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @param		string	$label	Label
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	function fetch($id,$code='',$label='')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql.= " t.id,";
 		$sql.= " t.code,";
 		$sql.= " t.libelle as label,";
 		$sql.= " t.fk_country as country_id,";
 		$sql.= " t.active,";
 		$sql.= " t.module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->id;
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+		if ($id)   $sql.= " WHERE t.id = ".$id;
+		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
 				$this->active = $obj->active;
 				$this->module = $obj->module;
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-    	global $conf, $langs;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -214,43 +214,43 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
 		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
 		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
 		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
 		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
-        $sql.= " WHERE id=".$this->id;
+		$sql.= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -260,16 +260,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	function delete($user, $notrigger=0)
 	{
 		global $conf, $langs;
@@ -282,31 +282,31 @@ 
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +70 added lines, -70 removed lines

@@ -27,9 +27,9 @@ 
  */
 class Ctypent // extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
+	var $db; //!< To store db handler
+	var $error; //!< To return error code (or message)
+	var $errors = array(); //!< To return several error codes (or messages)
 	//var $element='ctypent';			//!< Id that identify managed objects
 	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
@@ -61,18 +61,18 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) $this->id = trim($this->id);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 
@@ -82,35 +82,35 @@ 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
-		$sql.= "id,";
-		$sql.= "code,";
-		$sql.= "libelle,";
-		$sql.= "active,";
-		$sql.= "module";
+		$sql .= "id,";
+		$sql .= "code,";
+		$sql .= "libelle,";
+		$sql .= "active,";
+		$sql .= "module";
 
 
-        $sql.= ") VALUES (";
+        $sql .= ") VALUES (";
 
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
-		$sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->active($this->active)."'").",";
+		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'")."";
 
 
-		$sql.= ")";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -127,13 +127,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -151,29 +151,29 @@ 
      *  @param		string	$label	Label
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='',$label='')
+    function fetch($id, $code = '', $label = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.id,";
-		$sql.= " t.code,";
-		$sql.= " t.libelle as label,";
-		$sql.= " t.fk_country as country_id,";
-		$sql.= " t.active,";
-		$sql.= " t.module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
-
-        $resql=$this->db->query($sql);
+		$sql .= " t.id,";
+		$sql .= " t.code,";
+		$sql .= " t.libelle as label,";
+		$sql .= " t.fk_country as country_id,";
+		$sql .= " t.active,";
+		$sql .= " t.module";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+        if ($id)   $sql .= " WHERE t.id = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->id;
+                $this->id = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
@@ -186,7 +186,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -199,16 +199,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 		// Check parameters
@@ -216,21 +216,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
-		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
-        $sql.= " WHERE id=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
+		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";
+        $sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -247,13 +247,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -270,23 +270,23 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE id=".$this->id;
+		$sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -303,13 +303,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

htdocs/core/class/canvas.class.php

Indentation +50 added lines, -50 removed lines

@@ -34,21 +34,21 @@ 
 
 	var $actiontype;
 
-    var $dirmodule;			// Module directory
-    var $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
-    var $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
-    var $card;              // Tab (sub-canvas)
+	var $dirmodule;			// Module directory
+	var $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
+	var $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
+	var $card;              // Tab (sub-canvas)
 
-    var $template_dir;			// Initialized by getCanvas with templates directory
-    var $control;           	// Initialized by getCanvas with controller instance
+	var $template_dir;			// Initialized by getCanvas with templates directory
+	var $control;           	// Initialized by getCanvas with controller instance
 
 
    /**
-	*   Constructor
-	*
-	*   @param     DoliDB	$db          	Database handler
-	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
-	*/
+    *   Constructor
+    *
+    *   @param     DoliDB	$db          	Database handler
+    *   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
+    */
 	function __construct($db, $actiontype='view')
 	{
 		$this->db = $db;
@@ -64,11 +64,11 @@ 
 	 */
 	private function _cleanaction($action)
 	{
-	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
-	    return $newaction;
+		$newaction = $action;
+		if ($newaction == 'add')    $newaction='create';
+		if ($newaction == 'update') $newaction='edit';
+		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+		return $newaction;
 	}
 
 
@@ -85,44 +85,44 @@ 
 		global $conf, $langs;
 
 		// Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
-        $this->targetmodule = $module;
-        $this->canvas = $canvas;
-        $this->card = $card;
-        $this->dirmodule = $module;
-        // Correct values if canvas is into an external module
+		$this->targetmodule = $module;
+		$this->canvas = $canvas;
+		$this->card = $card;
+		$this->dirmodule = $module;
+		// Correct values if canvas is into an external module
 		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
 		{
-            $this->canvas = $regs[1];
-		    $this->dirmodule = $regs[2];
+			$this->canvas = $regs[1];
+			$this->dirmodule = $regs[2];
 		}
 		// For compatibility
-        if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
+		if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
 
-        // Control file
+		// Control file
 		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
 		if (file_exists($controlclassfile))
 		{
-            // Include actions class (controller)
-            $this->control_file=$controlclassfile;
-            require_once $controlclassfile;
+			// Include actions class (controller)
+			$this->control_file=$controlclassfile;
+			require_once $controlclassfile;
 
-            // Instantiate actions class (controller)
-            $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
-            $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
+			// Instantiate actions class (controller)
+			$controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
+			$this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
 		}
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (! is_dir($this->template_dir))
-        {
-            $this->template_dir='';
-        }
+		if (! is_dir($this->template_dir))
+		{
+			$this->template_dir='';
+		}
 
-        //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
-        //print ' => template_dir='.$this->template_dir.'<br>';
+		//print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
+		//print ' => template_dir='.$this->template_dir.'<br>';
 	}
 
-    /**
+	/**
 	 * 	Shared method for canvas to assign values for templates
 	 *
 	 * 	@param		string		$action	Action string
@@ -135,19 +135,19 @@ 
 		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
-    /**
-     *	Return the template to display canvas (if it exists)
+	/**
+	 *	Return the template to display canvas (if it exists)
 	 *
 	 *	@param	string	$action		Action code
-     *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
-     */
-    function displayCanvasExists($action)
-    {
-        if (empty($this->template_dir)) return 0;
+	 *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
+	 */
+	function displayCanvasExists($action)
+	{
+		if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
-    }
+		if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
+		else return 0;
+	}
 
 	/**
 	 *	Display a canvas page. This will include the template for output.
@@ -175,12 +175,12 @@ 
 	 */
 	function hasActions()
 	{
-        return (is_object($this->control));
+		return (is_object($this->control));
 	}
 
 	/**
 	 * 	Shared method for canvas to execute actions.
-     *  @deprecated Use the doActions of hooks instead of this.
+	 *  @deprecated Use the doActions of hooks instead of this.
 	 * 	            This function is called if you add a doActions class inside your canvas. Try to not
 	 * 				do that and add action code into a hook instead.
 	 *

Spacing +21 added lines, -21 removed lines

@@ -30,17 +30,17 @@ 
 {
 	var $db;
 	var $error;
-	var $errors=array();
+	var $errors = array();
 
 	var $actiontype;
 
-    var $dirmodule;			// Module directory
-    var $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
-    var $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
-    var $card;              // Tab (sub-canvas)
+    var $dirmodule; // Module directory
+    var $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+    var $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+    var $card; // Tab (sub-canvas)
 
-    var $template_dir;			// Initialized by getCanvas with templates directory
-    var $control;           	// Initialized by getCanvas with controller instance
+    var $template_dir; // Initialized by getCanvas with templates directory
+    var $control; // Initialized by getCanvas with controller instance
 
 
    /**
@@ -49,7 +49,7 @@ 
 	*   @param     DoliDB	$db          	Database handler
 	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
 	*/
-	function __construct($db, $actiontype='view')
+	function __construct($db, $actiontype = 'view')
 	{
 		$this->db = $db;
 
@@ -65,9 +65,9 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add')    $newaction = 'create';
+	    if ($newaction == 'update') $newaction = 'edit';
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
 	    return $newaction;
 	}
 
@@ -90,7 +90,7 @@ 
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
             $this->canvas = $regs[1];
 		    $this->dirmodule = $regs[2];
@@ -103,7 +103,7 @@ 
 		if (file_exists($controlclassfile))
 		{
             // Include actions class (controller)
-            $this->control_file=$controlclassfile;
+            $this->control_file = $controlclassfile;
             require_once $controlclassfile;
 
             // Instantiate actions class (controller)
@@ -113,9 +113,9 @@ 
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (! is_dir($this->template_dir))
+        if (!is_dir($this->template_dir))
         {
-            $this->template_dir='';
+            $this->template_dir = '';
         }
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
@@ -130,9 +130,9 @@ 
 	 * 	@param		string		$ref		Object ref (if id not provided)
 	 * 	@return		void
 	 */
-	function assign_values(&$action='view', $id=0, $ref='')
+	function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
     /**
@@ -145,7 +145,7 @@ 
     {
         if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
+        if (file_exists($this->template_dir.($this->card ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
         else return 0;
     }
 
@@ -161,7 +161,7 @@ 
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
-		include $this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+		include $this->template_dir.($this->card ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template
 	}
 
 
@@ -189,9 +189,9 @@ 
 	 * 	@return		mixed					Return return code of doActions of canvas
 	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
 	 */
-	function doActions(&$action='view', $id=0)
+	function doActions(&$action = 'view', $id = 0)
 	{
-		if (method_exists($this->control,'doActions'))
+		if (method_exists($this->control, 'doActions'))
 		{
 			$ret = $this->control->doActions($action, $id);
 			return $ret;

Braces +20 added lines, -7 removed lines

@@ -65,9 +65,15 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add') {
+	    	$newaction='create';
+	    }
+	    if ($newaction == 'update') {
+	    	$newaction='edit';
+	    }
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {
+	    	$newaction='view';
+	    }
 	    return $newaction;
 	}
 
@@ -132,7 +138,9 @@ 
 	 */
 	function assign_values(&$action='view', $id=0, $ref='')
 	{
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control,'assign_values')) {
+			$this->control->assign_values($action, $id, $ref);
+		}
 	}
 
     /**
@@ -143,10 +151,15 @@ 
      */
     function displayCanvasExists($action)
     {
-        if (empty($this->template_dir)) return 0;
+        if (empty($this->template_dir)) {
+        	return 0;
+        }
 
-        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
+        if (file_exists($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) {
+        	return 1;
+        } else {
+        	return 0;
+        }
     }
 
 	/**

htdocs/core/class/fiscalyear.class.php

Indentation +15 added lines, -15 removed lines

@@ -56,7 +56,7 @@ 
 		$this->db = $db;
 
 		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
-        $this->statuts = array(0 => 'Opened', 1 => 'Closed');
+		$this->statuts = array(0 => 'Opened', 1 => 'Closed');
 
 		return 1;
 	}
@@ -134,10 +134,10 @@ 
 
 		// Check parameters
 		if (empty($this->date_start) && empty($this->date_end))
-        {
-            $this->error='ErrorBadParameter';
-            return -1;
-        }
+		{
+			$this->error='ErrorBadParameter';
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -167,11 +167,11 @@ 
 	}
 
 	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
+	 * Load an object from database
+	 *
+	 * @param	int		$id		Id of record to load
+	 * @return	int				<0 if KO, >0 if OK
+	 */
 	function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
@@ -201,11 +201,11 @@ 
 	}
 
    /**
-	*	Delete record
-	*
-	*	@param	int		$id		Id of record to delete
-	*	@return	int				<0 if KO, >0 if OK
-	*/
+    *	Delete record
+    *
+    *	@param	int		$id		Id of record to delete
+    *	@return	int				<0 if KO, >0 if OK
+    */
 	function delete($id)
 	{
 		$this->db->begin();

Braces +30 added lines, -20 removed lines

@@ -106,15 +106,13 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
@@ -156,8 +154,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
@@ -192,8 +189,7 @@ 
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -218,8 +214,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -259,23 +254,39 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			}
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) {
+				return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			}
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) {
+				return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			}
 		}
 	}
 
@@ -317,8 +328,7 @@ 
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

Spacing +54 added lines, -54 removed lines

@@ -21,18 +21,18 @@ 
  *		\brief      File of class to manage fiscal years
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * Class to manage fiscal year
  */
 class Fiscalyear extends CommonObject
 {
-	public $element='fiscalyear';
-	public $table_element='accounting_fiscalyear';
+	public $element = 'fiscalyear';
+	public $table_element = 'accounting_fiscalyear';
 	public $table_element_line = '';
 	public $fk_element = '';
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	var $rowid;
 
@@ -40,11 +40,11 @@ 
 	var $date_start;
 	var $date_end;
 	var $datec;
-	var $statut;		// 0=open, 1=closed
+	var $statut; // 0=open, 1=closed
 	var $entity;
 
-	var $statuts=array();
-	var $statuts_short=array();
+	var $statuts = array();
+	var $statuts_short = array();
 
 	/**
 	 * Constructor
@@ -73,27 +73,27 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
-		$sql.= "label";
-		$sql.= ", date_start";
-		$sql.= ", date_end";
-		$sql.= ", statut";
-		$sql.= ", entity";
-		$sql.= ", datec";
-		$sql.= ", fk_user_author";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->label)."'";
-		$sql.= ", '".$this->db->idate($this->date_start)."'";
-		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", 0";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ". $user->id;
-		$sql.= ")";
+		$sql .= "label";
+		$sql .= ", date_start";
+		$sql .= ", date_end";
+		$sql .= ", statut";
+		$sql .= ", entity";
+		$sql .= ", datec";
+		$sql .= ", fk_user_author";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->idate($this->date_start)."'";
+		$sql .= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", 0";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -101,7 +101,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
 
-			$result=$this->update($user);
+			$result = $this->update($user);
 			if ($result > 0)
 			{
 				$this->db->commit();
@@ -109,14 +109,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror()." sql=".$sql;
+			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
@@ -135,7 +135,7 @@ 
 		// Check parameters
 		if (empty($this->date_start) && empty($this->date_end))
         {
-            $this->error='ErrorBadParameter';
+            $this->error = 'ErrorBadParameter';
             return -1;
         }
 
@@ -146,8 +146,8 @@ 
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= ", statut = '".$this->db->escape($this->statut)."'";
-		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
-		$sql .= ", fk_user_modif = " . $user->id;
+		$sql .= ", datec = ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", fk_user_modif = ".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -159,7 +159,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
@@ -175,27 +175,27 @@ 
 	function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql.= " WHERE rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql .= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
 
-			$this->id			= $obj->rowid;
-			$this->ref			= $obj->rowid;
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
 			$this->date_start	= $this->db->jdate($obj->date_start);
-			$this->date_end		= $this->db->jdate($obj->date_end);
-			$this->label		= $obj->label;
+			$this->date_end = $this->db->jdate($obj->date_end);
+			$this->label = $obj->label;
 			$this->statut	    = $obj->statut;
 
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -221,7 +221,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -233,9 +233,9 @@ 
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -245,7 +245,7 @@ 
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		global $langs;
 
@@ -259,23 +259,23 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts_short[$statut]);
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			if ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			if ($statut == 1 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
 		}
 	}
 
@@ -288,9 +288,9 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
-		$sql.= ' fy.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql.= ' WHERE fy.rowid = '.$id;
+		$sql .= ' fy.tms';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+		$sql .= ' WHERE fy.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
 		$result = $this->db->query($sql);

htdocs/core/class/html.formmailing.class.php

Indentation +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 			$options[-2] = '';   // Note -1 is used for error
 		}
 
-        $options = $options + $mailing->statut_dest;
+		$options = $options + $mailing->statut_dest;
 
-        return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
+		return Form::selectarray($htmlname, $options, $selectedid, 0, 0, 0, '', 1);
 	}
 }

Spacing +4 added lines, -4 removed lines

@@ -20,14 +20,14 @@ 
  *  \ingroup    core
  *	\brief      File of predefined functions for HTML forms for mailing module
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *	Class to offer components to list and upload files
  */
 class FormMailing extends Form
 {
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * Output a select with destinaries status
@@ -37,7 +37,7 @@ 
 	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
-	public function selectDestinariesStatus($selectedid='',$htmlname='dest_status', $show_empty=0) {
+	public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0) {
 
 		global $langs;
 		$langs->load("mails");
@@ -48,7 +48,7 @@ 
 		$options = array();
 
 		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
+			$options[-2] = ''; // Note -1 is used for error
 		}
 
         $options = $options + $mailing->statut_dest;

htdocs/core/class/html.formsocialcontrib.class.php

Indentation +71 added lines, -71 removed lines

@@ -32,85 +32,85 @@
 
 
 	/**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
 	public function __construct($db)
 	{
-	    $this->db = $db;
+		$this->db = $db;
 	}
 
-    /**
-     *	Return list of social contributions.
-     * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
-     *
-     *	@param	string	$selected       Preselected type
-     *	@param  string	$htmlname       Name of field in form
-     * 	@param	int		$useempty		Set to 1 if we want an empty value
-     * 	@param	int		$maxlen			Max length of text in combo box
-     * 	@param	int		$help			Add or not the admin help picto
-     * 	@return	void
-     */
-    function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1)
-    {
-        global $db,$langs,$user,$mysoc;
+	/**
+	 *	Return list of social contributions.
+	 * 	Use mysoc->country_id or mysoc->country_code so they must be defined.
+	 *
+	 *	@param	string	$selected       Preselected type
+	 *	@param  string	$htmlname       Name of field in form
+	 * 	@param	int		$useempty		Set to 1 if we want an empty value
+	 * 	@param	int		$maxlen			Max length of text in combo box
+	 * 	@param	int		$help			Add or not the admin help picto
+	 * 	@return	void
+	 */
+	function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1)
+	{
+		global $db,$langs,$user,$mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code))
-        {
-            dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
-            exit;
-        }
+		if (empty($mysoc->country_id) && empty($mysoc->country_code))
+		{
+			dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
+			exit;
+		}
 
-        if (! empty($mysoc->country_id))
-        {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql.= " WHERE c.active = 1";
-            $sql.= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
-        {
-            $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.libelle ASC";
-        }
+		if (! empty($mysoc->country_id))
+		{
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+			$sql.= " WHERE c.active = 1";
+			$sql.= " AND c.fk_pays = ".$mysoc->country_id;
+			$sql.= " ORDER BY c.libelle ASC";
+		}
+		else
+		{
+			$sql = "SELECT c.id, c.libelle as type";
+			$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+			$sql.= " AND co.code = '".$mysoc->country_code."'";
+			$sql.= " ORDER BY c.libelle ASC";
+		}
 
-        dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            if ($num)
-            {
-                print '<select class="flat" name="'.$htmlname.'">';
-                $i = 0;
+		dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			if ($num)
+			{
+				print '<select class="flat" name="'.$htmlname.'">';
+				$i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
-                while ($i < $num)
-                {
-                    $obj = $db->fetch_object($resql);
-                    print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type,$maxlen);
-                    $i++;
-                }
-                print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
-            {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
-            }
-        }
-        else
-        {
-            dol_print_error($db,$db->lasterror());
-        }
-    }
+				if ($useempty) print '<option value="0">&nbsp;</option>';
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					print '<option value="'.$obj->id.'"';
+					if ($obj->id == $selected) print ' selected';
+					print '>'.dol_trunc($obj->type,$maxlen);
+					$i++;
+				}
+				print '</select>';
+				if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+			else
+			{
+				print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
+			}
+		}
+		else
+		{
+			dol_print_error($db,$db->lasterror());
+		}
+	}
 
 }
 

Spacing +17 added lines, -17 removed lines

@@ -52,35 +52,35 @@ 
      * 	@param	int		$help			Add or not the admin help picto
      * 	@return	void
      */
-    function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1)
+    function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1)
     {
-        global $db,$langs,$user,$mysoc;
+        global $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code))
         {
-            dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
+            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql.= " WHERE c.active = 1";
-            $sql.= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+            $sql .= " WHERE c.active = 1";
+            $sql .= " AND c.fk_pays = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.libelle ASC";
         }
         else
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+            $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.libelle ASC";
         }
 
         dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
@@ -95,20 +95,20 @@ 
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
                     if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type,$maxlen);
+                    print '>'.dol_trunc($obj->type, $maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             }
             else
             {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
+                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
         }
         else
         {
-            dol_print_error($db,$db->lasterror());
+            dol_print_error($db, $db->lasterror());
         }
     }
 

Braces +12 added lines, -9 removed lines

@@ -69,8 +69,7 @@ 
             $sql.= " WHERE c.active = 1";
             $sql.= " AND c.fk_pays = ".$mysoc->country_id;
             $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.id, c.libelle as type";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
@@ -89,24 +88,28 @@ 
                 print '<select class="flat" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                	print '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
+                    if ($obj->id == $selected) {
+                    	print ' selected';
+                    }
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
+                if ($user->admin && $help) {
+                	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                }
+            } else
             {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }

htdocs/core/class/cstate.class.php

Braces +27 added lines, -16 removed lines

@@ -71,9 +71,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+			$this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+			$this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -125,8 +131,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -150,8 +155,11 @@ 
 		$sql.= " t.nom,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        if ($id) {
+        	$sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+        	$sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -169,8 +177,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -191,9 +198,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+			$this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+			$this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+			$this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -238,8 +251,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -294,8 +306,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

Indentation +128 added lines, -128 removed lines

@@ -38,7 +38,7 @@ 
 	//var $element='cstate';			//!< Id that identify managed objects
 	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
-    var $id;
+	var $id;
 	var $code_departement;
 	var $nom;
 	var $active;
@@ -46,28 +46,28 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
 
 
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-     *  @return     int      		   	 <0 if KO, Id of created object if OK
-     */
-    function create($user, $notrigger=0)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create object into database
+	 *
+	 *  @param      User	$user        User that create
+	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 */
+	function create($user, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -78,13 +78,13 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
 		$sql.= "rowid,";
 		$sql.= "code_departement,";
 		$sql.= "nom,";
 		$sql.= "active";
-        $sql.= ") VALUES (";
+		$sql.= ") VALUES (";
 		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
 		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
 		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
@@ -94,34 +94,34 @@ 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql=$this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
-        }
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -129,65 +129,65 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
-
-
-    /**
-     *  Load object in memory from database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    function fetch($id,$code='')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	}
+
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param      int		$id    	Id object
+	 *  @param		string	$code	Code
+	 *  @return     int          	<0 if KO, >0 if OK
+	 */
+	function fetch($id,$code='')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql.= " t.rowid,";
 		$sql.= " t.code_departement,";
 		$sql.= " t.nom,";
 		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
-
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+		if ($id)   $sql.= " WHERE t.rowid = ".$id;
+		elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
 				$this->code_departement = $obj->code_departement;
 				$this->nom = $obj->nom;
 				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param      User	$user        User that modify
-     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return     int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-    	global $conf, $langs;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param      User	$user        User that modify
+	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -199,42 +199,42 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
 		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
 		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
 		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -244,16 +244,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
  	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *
+ 	 *	@param  User	$user        User that delete
+ 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+ 	 *  @return	int					 <0 if KO, >0 if OK
+ 	 */
 	function delete($user, $notrigger=0)
 	{
 		global $conf, $langs;
@@ -266,31 +266,31 @@ 
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
 			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +60 added lines, -60 removed lines

@@ -32,9 +32,9 @@ 
  */
 class Cstate // extends CommonObject
 {
-	var $db;							//!< To store db handler
-	var $error;							//!< To return error code (or message)
-	var $errors=array();				//!< To return several error codes (or messages)
+	var $db; //!< To store db handler
+	var $error; //!< To return error code (or message)
+	var $errors = array(); //!< To return several error codes (or messages)
 	//var $element='cstate';			//!< Id that identify managed objects
 	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
@@ -65,43 +65,43 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
-		$sql.= "rowid,";
-		$sql.= "code_departement,";
-		$sql.= "nom,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
-		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code_departement,";
+		$sql .= "nom,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").",";
+		$sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -118,13 +118,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -141,27 +141,27 @@ 
      *  @param		string	$code	Code
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code_departement,";
-		$sql.= " t.nom,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code_departement,";
+		$sql .= " t.nom,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 				$this->code_departement = $obj->code_departement;
 				$this->nom = $obj->nom;
 				$this->active = $obj->active;
@@ -172,7 +172,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -185,15 +185,15 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -201,20 +201,20 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
-		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
-		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
+		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -231,13 +231,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -254,23 +254,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -287,13 +287,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

htdocs/core/class/vcard.class.php

Indentation +276 added lines, -276 removed lines

@@ -30,7 +30,7 @@ 
  */
 function encode($string)
 {
-    return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
+	return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -44,38 +44,38 @@ 
  */
 function dol_quoted_printable_encode($input, $line_max=76)
 {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-    $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
-    $eol = "\r\n";
-    $linebreak = "=0D=0A";
-    $escape = "=";
-    $output = "";
-
-    $num = count($lines);
-    for ($j = 0; $j < $num; $j++)
-    {
-        $line = $lines[$j];
-        $linlen = strlen($line);
-        $newline = "";
-        for($i = 0; $i < $linlen; $i++) {
-            $c = substr($line, $i, 1);
-            $dec = ord($c);
-            if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
-                $c = "=20";
-            } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-                $h2 = floor($dec/16); $h1 = floor($dec%16);
-                $c = $escape.$hex["$h2"].$hex["$h1"];
-            }
-            if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-                $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
-                $newline = "    ";
-            }
-            $newline .= $c;
-        } // end of for
-        $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
-    }
-    return trim($output);
+	$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+	$lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
+	$eol = "\r\n";
+	$linebreak = "=0D=0A";
+	$escape = "=";
+	$output = "";
+
+	$num = count($lines);
+	for ($j = 0; $j < $num; $j++)
+	{
+		$line = $lines[$j];
+		$linlen = strlen($line);
+		$newline = "";
+		for($i = 0; $i < $linlen; $i++) {
+			$c = substr($line, $i, 1);
+			$dec = ord($c);
+			if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+				$c = "=20";
+			} elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+				$h2 = floor($dec/16); $h1 = floor($dec%16);
+				$c = $escape.$hex["$h2"].$hex["$h1"];
+			}
+			if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+				$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+				$newline = "    ";
+			}
+			$newline .= $c;
+		} // end of for
+		$output .= $newline;
+		if ($j<count($lines)-1) $output .= $linebreak;
+	}
+	return trim($output);
 }
 
 
@@ -84,249 +84,249 @@ 
  */
 class vCard
 {
-    var $properties;
-    var $filename;
-
-    //var $encoding="UTF-8";
-    var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
-
-
-    /**
-     *	mise en forme du numero de telephone
-     *
-     *	@param	int		$number		numero de telephone
-     *	@param	string	$type		Type
-     *	@return	void
-     */
-    function setPhoneNumber($number, $type="")
-    {
-        // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
-        $key = "TEL";
-        if ($type!="") $key .= ";".$type;
-        $key.= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = encode($number);
-    }
-
-    /**
-     *	mise en forme de la photo
-     *  warning NON TESTE !
-     *
-     *	@param	string	$type			Type
-     *	@param	string	$photo			Photo
-     *	@return	void
+	var $properties;
+	var $filename;
+
+	//var $encoding="UTF-8";
+	var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+
+
+	/**
+	 *	mise en forme du numero de telephone
+	 *
+	 *	@param	int		$number		numero de telephone
+	 *	@param	string	$type		Type
+	 *	@return	void
+	 */
+	function setPhoneNumber($number, $type="")
+	{
+		// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
+		$key = "TEL";
+		if ($type!="") $key .= ";".$type;
+		$key.= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = encode($number);
+	}
+
+	/**
+	 *	mise en forme de la photo
+	 *  warning NON TESTE !
+	 *
+	 *	@param	string	$type			Type
+	 *	@param	string	$photo			Photo
+	 *	@return	void
+	 */
+	function setPhoto($type, $photo)
+	{ // $type = "GIF" | "JPEG"
+		$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+	}
+
+	/**
+	 *	mise en forme du nom formate
+	 *
+	 *	@param	string	$name			Name
+	 *	@return	void
+	 */
+	function setFormattedName($name)
+	{
+		$this->properties["FN;CHARSET=".$this->encoding] = encode($name);
+	}
+
+	/**
+	 *	mise en forme du nom complet
+	 *
+	 *	@param	string	$family			Family
+	 *	@param	string	$first			First
+	 *	@param	string	$additional		Additionnal
+	 *	@param	string	$prefix			Prefix
+	 *	@param	string	$suffix			Suffix
+	 *	@return	void
+	 */
+	function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+	{
+		$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+		$this->filename = "$first%20$family.vcf";
+		if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+	}
+
+	/**
+	 *	mise en forme de l'anniversaire
+	 *
+	 *	@param	timestamp	$date		Date
+	 *	@return	void
+	 */
+	function setBirthday($date)
+	{ 
+		// $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
+		$this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
+	}
+
+	/**
+	 *	mise en forme de l'adresse
+	 *
+	 *	@param	string	$postoffice		Postoffice
+	 *	@param	string	$extended		Extended
+	 *	@param	string	$street			Street
+	 *	@param	string	$city			City
+	 *	@param	string	$region			Region
+	 *	@param	string	$zip			Zip
+	 *	@param	string	$country		Country
+	 *	@param	string	$type			Type
+	 *	@return	void
+	 */
+	function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+	{
+		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
+		$key = "ADR";
+		if ($type!="") $key.= ";$type";
+		$key.= ";CHARSET=".$this->encoding;
+		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
+
+		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
+		{
+			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
+		}
+	}
+
+	/**
+	 *	mise en forme du label
+	 *
+	 *	@param	string	$postoffice		Postoffice
+	 *	@param	string	$extended		Extended
+	 *	@param	string	$street			Street
+	 *	@param	string	$city			City
+	 *	@param	string	$region			Region
+	 *	@param	string	$zip			Zip
+	 *	@param	string	$country		Country
+	 *	@param	string	$type			Type
+	 *	@return	void
+	 */
+	function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
+		$label = "";
+		if ($postoffice!="") $label.= "$postoffice\r\n";
+		if ($extended!="") $label.= "$extended\r\n";
+		if ($street!="") $label.= "$street\r\n";
+		if ($zip!="") $label.= "$zip ";
+		if ($city!="") $label.= "$city\r\n";
+		if ($region!="") $label.= "$region\r\n";
+		if ($country!="") $country.= "$country\r\n";
+
+		$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
+	}
+
+	/**
+	 *	mise en forme de l'email
+	 *
+	 *	@param	string	$address		EMail
+	 *	@param	string	$type			Vcard type
+	 *	@return	void
+	 */
+	function setEmail($address,$type="internet,pref")
+	{
+		$this->properties["EMAIL;TYPE=".$type] = $address;
+	}
+
+	/**
+	 *	mise en forme de la note
+	 *
+	 *	@param	string	$note		Note
+	 *	@return	void
+	 */
+	function setNote($note)
+	{
+		$this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
+	}
+
+	/**
+	 * 	mise en forme de la fonction
+	 *
+	 *	@param	string	$title		Title
+	 *	@return	void
+	 */
+	function setTitle($title)
+	{
+		$this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
+	}
+
+
+	/**
+	 *	mise en forme de la societe
+	 *
+	 *	@param	string	$org		Org
+	 *	@return	void
+	 */
+	function setOrg($org)
+	{
+		$this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
+	}
+
+
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$prodid		Prodid
+	 *	@return	void
+	 */
+	function setProdId($prodid)
+	{
+		$this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
+	}
+
+
+	/**
+	 * 	mise en forme du logiciel generateur
+	 *
+	 *  @param	string	$uid	Uid
+	 *	@return	void
+	 */
+	function setUID($uid)
+	{
+		$this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
+	}
+
+
+	/**
+	 *  mise en forme de l'url
+	 *
+	 *	@param	string	$url		URL
+	 *  @param	string	$type		Type
+	 *	@return	void
+	 */
+	function setURL($url, $type="")
+	{
+		// $type may be WORK | HOME
+		$key = "URL";
+		if ($type!="") $key.= ";$type";
+		$this->properties[$key] = $url;
+	}
+
+	/**
+	 *  permet d'obtenir une vcard
+	 *
+	 *  @return	string
+	 */
+	function getVCard()
+	{
+		$text = "BEGIN:VCARD\r\n";
+		//$text.= "VERSION:3.0\r\n";
+		$text.= "VERSION:2.1\r\n";
+		foreach($this->properties as $key => $value)
+		{
+			$text.= "$key:$value\r\n";
+		}
+		$text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+		$text.= "MAILER: Dolibarr\r\n";
+		$text.= "END:VCARD\r\n";
+		return $text;
+	}
+
+	/**
+	 *  permet d'obtenir le nom de fichier
+	 *
+	 *  @return	string		Filename
 	 */
-    function setPhoto($type, $photo)
-    { // $type = "GIF" | "JPEG"
-        $this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-    }
-
-    /**
-     *	mise en forme du nom formate
-     *
-     *	@param	string	$name			Name
-     *	@return	void
-     */
-    function setFormattedName($name)
-    {
-        $this->properties["FN;CHARSET=".$this->encoding] = encode($name);
-    }
-
-    /**
-     *	mise en forme du nom complet
-     *
-     *	@param	string	$family			Family
-     *	@param	string	$first			First
-     *	@param	string	$additional		Additionnal
-     *	@param	string	$prefix			Prefix
-     *	@param	string	$suffix			Suffix
-     *	@return	void
-     */
-    function setName($family="", $first="", $additional="", $prefix="", $suffix="")
-    {
-        $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
-        $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
-    }
-
-    /**
-     *	mise en forme de l'anniversaire
-     *
-     *	@param	timestamp	$date		Date
-     *	@return	void
-     */
-    function setBirthday($date)
-    { 
-        // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
-        $this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
-    }
-
-    /**
-     *	mise en forme de l'adresse
-     *
-     *	@param	string	$postoffice		Postoffice
-     *	@param	string	$extended		Extended
-     *	@param	string	$street			Street
-     *	@param	string	$city			City
-     *	@param	string	$region			Region
-     *	@param	string	$zip			Zip
-     *	@param	string	$country		Country
-     *	@param	string	$type			Type
-     *	@return	void
-     */
-    function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
-    {
-        // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
-        $key = "ADR";
-        if ($type!="") $key.= ";$type";
-        $key.= ";CHARSET=".$this->encoding;
-        $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
-
-        if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
-        {
-            //$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
-        }
-    }
-
-    /**
-     *	mise en forme du label
-     *
-     *	@param	string	$postoffice		Postoffice
-     *	@param	string	$extended		Extended
-     *	@param	string	$street			Street
-     *	@param	string	$city			City
-     *	@param	string	$region			Region
-     *	@param	string	$zip			Zip
-     *	@param	string	$country		Country
-     *	@param	string	$type			Type
-     *	@return	void
-     */
-    function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
-        $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
-
-        $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
-    }
-
-    /**
-     *	mise en forme de l'email
-     *
-     *	@param	string	$address		EMail
-     *	@param	string	$type			Vcard type
-     *	@return	void
-     */
-    function setEmail($address,$type="internet,pref")
-    {
-        $this->properties["EMAIL;TYPE=".$type] = $address;
-    }
-
-    /**
-     *	mise en forme de la note
-     *
-     *	@param	string	$note		Note
-     *	@return	void
-     */
-    function setNote($note)
-    {
-        $this->properties["NOTE;CHARSET=".$this->encoding] = encode($note);
-    }
-
-    /**
-     * 	mise en forme de la fonction
-     *
-     *	@param	string	$title		Title
-     *	@return	void
-     */
-    function setTitle($title)
-    {
-        $this->properties["TITLE;CHARSET=".$this->encoding] = encode($title);
-    }
-
-
-    /**
-     *	mise en forme de la societe
-     *
-     *	@param	string	$org		Org
-     *	@return	void
-     */
-    function setOrg($org)
-    {
-        $this->properties["ORG;CHARSET=".$this->encoding] = encode($org);
-    }
-
-
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$prodid		Prodid
-     *	@return	void
-     */
-    function setProdId($prodid)
-    {
-        $this->properties["PRODID;CHARSET=".$this->encoding] = encode($prodid);
-    }
-
-
-    /**
-     * 	mise en forme du logiciel generateur
-     *
-     *  @param	string	$uid	Uid
-     *	@return	void
-     */
-    function setUID($uid)
-    {
-        $this->properties["UID;CHARSET=".$this->encoding] = encode($uid);
-    }
-
-
-    /**
-     *  mise en forme de l'url
-     *
-     *	@param	string	$url		URL
-     *  @param	string	$type		Type
-     *	@return	void
-     */
-    function setURL($url, $type="")
-    {
-        // $type may be WORK | HOME
-        $key = "URL";
-        if ($type!="") $key.= ";$type";
-        $this->properties[$key] = $url;
-    }
-
-    /**
-     *  permet d'obtenir une vcard
-     *
-     *  @return	string
-     */
-    function getVCard()
-    {
-        $text = "BEGIN:VCARD\r\n";
-        //$text.= "VERSION:3.0\r\n";
-        $text.= "VERSION:2.1\r\n";
-        foreach($this->properties as $key => $value)
-        {
-            $text.= "$key:$value\r\n";
-        }
-        $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text.= "MAILER: Dolibarr\r\n";
-        $text.= "END:VCARD\r\n";
-        return $text;
-    }
-
-    /**
-     *  permet d'obtenir le nom de fichier
-     *
-     *  @return	string		Filename
-     */
-    function getFileName()
-    {
-        return $this->filename;
-    }
+	function getFileName()
+	{
+		return $this->filename;
+	}
 
 }

Spacing +34 added lines, -34 removed lines

@@ -30,7 +30,7 @@ 
  */
 function encode($string)
 {
-    return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
+    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -42,9 +42,9 @@ 
  * @param	int		$line_max	Max length of lines
  * @return	string				Encoded string
  */
-function dol_quoted_printable_encode($input, $line_max=76)
+function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
     $eol = "\r\n";
     $linebreak = "=0D=0A";
@@ -57,23 +57,23 @@ 
         $line = $lines[$j];
         $linlen = strlen($line);
         $newline = "";
-        for($i = 0; $i < $linlen; $i++) {
+        for ($i = 0; $i < $linlen; $i++) {
             $c = substr($line, $i, 1);
             $dec = ord($c);
-            if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
                 $c = "=20";
-            } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-                $h2 = floor($dec/16); $h1 = floor($dec%16);
+            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
                 $c = $escape.$hex["$h2"].$hex["$h1"];
             }
-            if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
                 $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
                 $newline = "    ";
             }
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j < count($lines) - 1) $output .= $linebreak;
     }
     return trim($output);
 }
@@ -88,7 +88,7 @@ 
     var $filename;
 
     //var $encoding="UTF-8";
-    var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+    var $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
     /**
@@ -98,12 +98,12 @@ 
      *	@param	string	$type		Type
      *	@return	void
      */
-    function setPhoneNumber($number, $type="")
+    function setPhoneNumber($number, $type = "")
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";".$type;
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
 
@@ -141,7 +141,7 @@ 
      *	@param	string	$suffix			Suffix
      *	@return	void
      */
-    function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+    function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
@@ -173,12 +173,12 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";$type";
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
         if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
@@ -200,15 +200,15 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
+    function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL") {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice != "") $label .= "$postoffice\r\n";
+        if ($extended != "") $label .= "$extended\r\n";
+        if ($street != "") $label .= "$street\r\n";
+        if ($zip != "") $label .= "$zip ";
+        if ($city != "") $label .= "$city\r\n";
+        if ($region != "") $label .= "$region\r\n";
+        if ($country != "") $country .= "$country\r\n";
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -220,7 +220,7 @@ 
      *	@param	string	$type			Vcard type
      *	@return	void
      */
-    function setEmail($address,$type="internet,pref")
+    function setEmail($address, $type = "internet,pref")
     {
         $this->properties["EMAIL;TYPE=".$type] = $address;
     }
@@ -291,11 +291,11 @@ 
      *  @param	string	$type		Type
      *	@return	void
      */
-    function setURL($url, $type="")
+    function setURL($url, $type = "")
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type != "") $key .= ";$type";
         $this->properties[$key] = $url;
     }
 
@@ -308,14 +308,14 @@ 
     {
         $text = "BEGIN:VCARD\r\n";
         //$text.= "VERSION:3.0\r\n";
-        $text.= "VERSION:2.1\r\n";
-        foreach($this->properties as $key => $value)
+        $text .= "VERSION:2.1\r\n";
+        foreach ($this->properties as $key => $value)
         {
-            $text.= "$key:$value\r\n";
+            $text .= "$key:$value\r\n";
         }
-        $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text.= "MAILER: Dolibarr\r\n";
-        $text.= "END:VCARD\r\n";
+        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+        $text .= "MAILER: Dolibarr\r\n";
+        $text .= "END:VCARD\r\n";
         return $text;
     }
 

Braces +36 added lines, -12 removed lines

@@ -73,7 +73,9 @@ 
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j<count($lines)-1) {
+        	$output .= $linebreak;
+        }
     }
     return trim($output);
 }
@@ -102,7 +104,9 @@ 
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
+        if ($type!="") {
+        	$key .= ";".$type;
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
@@ -145,7 +149,9 @@ 
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        if (empty($this->properties["FN"])) {
+        	$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        }
     }
 
     /**
@@ -177,7 +183,9 @@ 
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+        	$key.= ";$type";
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
@@ -202,13 +210,27 @@ 
      */
     function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL") {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice!="") {
+        	$label.= "$postoffice\r\n";
+        }
+        if ($extended!="") {
+        	$label.= "$extended\r\n";
+        }
+        if ($street!="") {
+        	$label.= "$street\r\n";
+        }
+        if ($zip!="") {
+        	$label.= "$zip ";
+        }
+        if ($city!="") {
+        	$label.= "$city\r\n";
+        }
+        if ($region!="") {
+        	$label.= "$region\r\n";
+        }
+        if ($country!="") {
+        	$country.= "$country\r\n";
+        }
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -295,7 +317,9 @@ 
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+        	$key.= ";$type";
+        }
         $this->properties[$key] = $url;
     }