Dolibarr / dolibarr

htdocs/core/modules/fichinter/mod_pacific.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param	integer		$objsoc     Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */

Indentation +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
  */
 class mod_pacific extends ModeleNumRefFicheinter
 {
-    var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
+	var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
 	var $prefix='FI';
 	var $error='';
 	var $nom = 'pacific';
@@ -39,13 +39,13 @@ 
 	/**
 	 *  Return description of numbering module
 	 *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
 
 	/**
 	 *  Renvoi un exemple de numerotation
@@ -125,8 +125,8 @@ 
 		$date=$object->datec;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
 
 		return $this->prefix.$yymm."-".$num;
 	}

Braces +13 added lines, -6 removed lines

@@ -86,8 +86,7 @@ 
 		if (! $fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -117,16 +116,24 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
 		}
 
 		//$date=time();
 		$date=$object->datec;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    		$num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    		$num = sprintf("%04s",$max+1);
+    	}
 
 		return $this->prefix.$yymm."-".$num;
 	}

Spacing +29 added lines, -29 removed lines

@@ -23,16 +23,16 @@ 
  *  \ingroup    fiche intervention
  *  \brief      File with Pacific numbering module for interventions
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 
 /**
  *	Class to manage numbering of intervention cards with rule Pacific.
  */
 class mod_pacific extends ModeleNumRefFicheinter
 {
-    var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
-	var $prefix='FI';
-	var $error='';
+    var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'FI';
+	var $error = '';
 	var $nom = 'pacific';
 
 
@@ -44,7 +44,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 	/**
@@ -65,32 +65,32 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $langs,$conf,$db;
+		global $langs, $conf, $db;
 
 		$langs->load("bills");
 
-		$fayymm=''; $max='';
+		$fayymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " WHERE entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if (! $fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm))
+		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			return true;
 		}
 		else
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 	}
@@ -102,31 +102,31 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc=0,$object='')
+	function getNextValue($objsoc = 0, $object = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 
 		//$date=time();
-		$date=$object->datec;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->datec;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		return $this->prefix.$yymm."-".$num;
 	}
@@ -138,9 +138,9 @@ 
 	 * 	@param	Object	$objforref	Object for number to search
 	 *  @return string      		Next free value
 	 */
-	function getNumRef($objsoc,$objforref)
+	function getNumRef($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 
 }

htdocs/core/modules/member/doc/pdf_standard.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
 	 *	@param	Adherent	$object		        Member object. Old usage: Array of record informations (array('textleft'=>,'textheader'=>, ...'id'=>,'photo'=>)
 	 *	@param	Translate	$outputlangs		Lang object for output language
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
-	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
+	 *	@param	integer		$mode				Tell if doc module is called for 'member', ...
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
 	 *	@return	int								1=OK, 0=KO
 	 */

Indentation +72 added lines, -72 removed lines

@@ -252,58 +252,58 @@ 
 		
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
-
-    		// List of values to scan for a replacement
-    		$substitutionarray = array (
-    		    '%ID%'=>$object->rowid,
-    		    '%LOGIN%'=>$object->login,
-    		    '%FIRSTNAME%'=>$object->firstname,
-    		    '%LASTNAME%'=>$object->lastname,
-    		    '%FULLNAME%'=>$object->getFullName($langs),
-    		    '%COMPANY%'=>$object->company,
-    		    '%ADDRESS%'=>$object->address,
-    		    '%ZIP%'=>$object->zip,
-    		    '%TOWN%'=>$object->town,
-    		    '%COUNTRY%'=>$object->country,
-    		    '%COUNTRY_CODE%'=>$object->country_code,
-    		    '%EMAIL%'=>$object->email,
-    		    '%BIRTH%'=>dol_print_date($object->birth,'day'),
-    		    '%TYPE%'=>$object->type,
-    		    '%YEAR%'=>$year,
-    		    '%MONTH%'=>$month,
-    		    '%DAY%'=>$day,
-    		    '%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
-    		    '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/"
-    		);
-    		complete_substitutions_array($substitutionarray, $langs);
-
-    		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			if ($object->country == '-') $object->country='';
+
+			// List of values to scan for a replacement
+			$substitutionarray = array (
+				'%ID%'=>$object->rowid,
+				'%LOGIN%'=>$object->login,
+				'%FIRSTNAME%'=>$object->firstname,
+				'%LASTNAME%'=>$object->lastname,
+				'%FULLNAME%'=>$object->getFullName($langs),
+				'%COMPANY%'=>$object->company,
+				'%ADDRESS%'=>$object->address,
+				'%ZIP%'=>$object->zip,
+				'%TOWN%'=>$object->town,
+				'%COUNTRY%'=>$object->country,
+				'%COUNTRY_CODE%'=>$object->country_code,
+				'%EMAIL%'=>$object->email,
+				'%BIRTH%'=>dol_print_date($object->birth,'day'),
+				'%TYPE%'=>$object->type,
+				'%YEAR%'=>$year,
+				'%MONTH%'=>$month,
+				'%DAY%'=>$day,
+				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
+				'%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/"
+			);
+			complete_substitutions_array($substitutionarray, $langs);
+
+			// For business cards
+			$textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+			$textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+			$textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+			$textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 		
-		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+			$nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
+			if ($nb <= 0) $nb=1;  // Protection to avoid empty page
 		    
-		    for($j=0;$j<$nb;$j++)
-	        {
-	            $arrayofmembers[]=array(
-	                'textleft'=>$textleft,
-	                'textheader'=>$textheader,
-	                'textfooter'=>$textfooter,
-	                'textright'=>$textright,
-	                'id'=>$object->rowid,
-	                'photo'=>$object->photo
-	            );
-	        }
+			for($j=0;$j<$nb;$j++)
+			{
+				$arrayofmembers[]=array(
+					'textleft'=>$textleft,
+					'textheader'=>$textheader,
+					'textfooter'=>$textfooter,
+					'textright'=>$textright,
+					'id'=>$object->rowid,
+					'photo'=>$object->photo
+				);
+			}
     		
-    		$arrayofrecords = $arrayofmembers;
+			$arrayofrecords = $arrayofmembers;
 		}
 		else
 		{
-		    $arrayofrecords = $object;
+			$arrayofrecords = $object;
 		}
 
 		//var_dump($arrayofrecords);exit;
@@ -311,14 +311,14 @@ 
 		$this->Tformat = $_Avery_Labels[$this->code];
 		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
-        // standard format or custom
-        if ($this->Tformat['paper-size']!='custom') {
-            $this->format = $this->Tformat['paper-size'];
-        } else {
-            //custom
-            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
-            $this->format = $resolution;
-        }
+		// standard format or custom
+		if ($this->Tformat['paper-size']!='custom') {
+			$this->format = $this->Tformat['paper-size'];
+		} else {
+			//custom
+			$resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+			$this->format = $resolution;
+		}
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -344,15 +344,15 @@ 
 		$filename = 'tmp_cards.pdf';
 		if (is_object($object))
 		{
-		    $outputdir = $conf->adherent->dir_output;
-		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
-		    $file = $dir.'/'.$filename;
+			$outputdir = $conf->adherent->dir_output;
+			$dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
+			$file = $dir.'/'.$filename;
 		}
 		else 
 		{
-		    $outputdir = $conf->adherent->dir_temp;
-		    $dir = $outputdir;
-		    $file = $dir.'/'.$filename;
+			$outputdir = $conf->adherent->dir_temp;
+			$dir = $outputdir;
+			$file = $dir.'/'.$filename;
 		}
 
 		//var_dump($file);exit;
@@ -421,22 +421,22 @@ 
 		// Output to http stream
 		if (empty($nooutput))
 		{
-    		clearstatcache();
+			clearstatcache();
     
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
+			$attachment=true;
+			if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+			$type=dol_mimetype($filename);
     
-    		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
+			//if ($encoding)   header('Content-Encoding: '.$encoding);
+			if ($type)		 header('Content-Type: '.$type);
+			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+			else header('Content-Disposition: inline; filename="'.$filename.'"');
     
-    		// Ajout directives pour resoudre bug IE
-    		header('Cache-Control: Public, must-revalidate');
-    		header('Pragma: public');
+			// Ajout directives pour resoudre bug IE
+			header('Cache-Control: Public, must-revalidate');
+			header('Pragma: public');
     
-    		readfile($file);
+			readfile($file);
 		}
 		
 		return 1;

Spacing +110 added lines, -110 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-	function addSticker(&$pdf,$outputlangs,$param) {
+	function addSticker(&$pdf, $outputlangs, $param) {
 		// use this method in future refactoring
 	}
 
@@ -61,161 +61,161 @@ 
 	 * @param	 string		$photo			Photo (full path to image file used as replacement for key %PHOTOS% into left, right, header or footer text)
 	 * @return	 void
 	 */
-	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photo='')
+	function Add_PDF_card(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $idmember = 0, $photo = '')
 	{
-		global $db,$mysoc,$conf,$langs;
-		global $forceimgscalewidth,$forceimgscaleheight;
+		global $db, $mysoc, $conf, $langs;
+		global $forceimgscalewidth, $forceimgscaleheight;
 
-		$imgscalewidth=(empty($forceimgscalewidth)?0.3:$forceimgscalewidth);	// Scale of image for width (1=Full width of sticker)
-		$imgscaleheight=(empty($forceimgscalewidth)?0.5:$forceimgscalewidth);	// Scale of image for height (1=Full height of sticker)
+		$imgscalewidth = (empty($forceimgscalewidth) ? 0.3 : $forceimgscalewidth); // Scale of image for width (1=Full width of sticker)
+		$imgscaleheight = (empty($forceimgscalewidth) ? 0.5 : $forceimgscalewidth); // Scale of image for height (1=Full height of sticker)
 
 		// We are in a new page, then we must add a page
-		if (($this->_COUNTX ==0) && ($this->_COUNTY==0) and (!$this->_First==1)) {
+		if (($this->_COUNTX == 0) && ($this->_COUNTY == 0) and (!$this->_First == 1)) {
 			$pdf->AddPage();
 		}
-		$this->_First=0;
-		$_PosX = $this->_Margin_Left+($this->_COUNTX*($this->_Width+$this->_X_Space));
-		$_PosY = $this->_Margin_Top+($this->_COUNTY*($this->_Height+$this->_Y_Space));
+		$this->_First = 0;
+		$_PosX = $this->_Margin_Left + ($this->_COUNTX * ($this->_Width + $this->_X_Space));
+		$_PosY = $this->_Margin_Top + ($this->_COUNTY * ($this->_Height + $this->_Y_Space));
 
 		// Define logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (! is_readable($logo))
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		if (!is_readable($logo))
 		{
-			$logo='';
-			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
+			$logo = '';
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
-				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
 
-		$member=new Adherent($db);
+		$member = new Adherent($db);
 		$member->id = $idmember;
 		$member->ref = $idmember;
 		
 		// Define photo
-		$dir=$conf->adherent->dir_output;
-		if (! empty($photo))
+		$dir = $conf->adherent->dir_output;
+		if (!empty($photo))
 		{
-			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
-			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			$file = get_exdir(0, 0, 0, 0, $member, 'member').'photos/'.$photo;
+			$photo = $dir.'/'.$file;
+			if (!is_readable($photo)) $photo = '';
 		}
 
 		// Define background image
-		$backgroundimage='';
-		if(! empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
+		$backgroundimage = '';
+		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
 		{
-			$backgroundimage=$conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
+			$backgroundimage = $conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
 		}
 
 		// Print lines
 		if ($this->code == "CARD")
 		{
-			$this->Tformat=$this->_Avery_Labels["CARD"];
+			$this->Tformat = $this->_Avery_Labels["CARD"];
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
-			$this->_Croix($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.1,10);
+			$this->_Croix($pdf, $_PosX, $_PosY, $_PosX + $this->_Width, $_PosY + $this->_Height, 0.1, 10);
 		}
 
 		// Background
 		if ($backgroundimage)
 		{
-			$pdf->image($backgroundimage,$_PosX,$_PosY,$this->_Width,$this->_Height);
+			$pdf->image($backgroundimage, $_PosX, $_PosY, $this->_Width, $this->_Height);
 		}
 
-		$xleft=2; $ytop=2;
+		$xleft = 2; $ytop = 2;
 
 		// Top
-		if ($header!='')
+		if ($header != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Line_Height+1, $_PosX+$this->_Width, $_PosY+$this->_Line_Height+1); // Only 1 mm and not ytop for top text
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Line_Height + 1, $_PosX + $this->_Width, $_PosY + $this->_Line_Height + 1); // Only 1 mm and not ytop for top text
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX+$xleft, $_PosY+1); // Only 1 mm and not ytop for top text
-			$pdf->Cell($this->_Width-2*$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header),0,1,'C');
+			$pdf->SetXY($_PosX + $xleft, $_PosY + 1); // Only 1 mm and not ytop for top text
+			$pdf->Cell($this->_Width - 2 * $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header), 0, 1, 'C');
 		}
 
 
-		$ytop+=(empty($header)?0:(1+$this->_Line_Height));
+		$ytop += (empty($header) ? 0 : (1 + $this->_Line_Height));
 
 		// Define widthtouse and heighttouse
-		$maxwidthtouse=round(($this->_Width - 2*$xleft)*$imgscalewidth); $maxheighttouse=round(($this->_Height - 2*$ytop)*$imgscaleheight);
-		$defaultratio=($maxwidthtouse/$maxheighttouse);
-		$widthtouse=$maxwidthtouse; $heighttouse=0;		// old value for image
-		$tmp=dol_getImageSize($photo, false);
+		$maxwidthtouse = round(($this->_Width - 2 * $xleft) * $imgscalewidth); $maxheighttouse = round(($this->_Height - 2 * $ytop) * $imgscaleheight);
+		$defaultratio = ($maxwidthtouse / $maxheighttouse);
+		$widthtouse = $maxwidthtouse; $heighttouse = 0; // old value for image
+		$tmp = dol_getImageSize($photo, false);
 		if ($tmp['height'])
 		{
-			$imgratio=$tmp['width']/$tmp['height'];
+			$imgratio = $tmp['width'] / $tmp['height'];
 			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
 			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright == '')	// Only a left part
 		{
 			// Output left area
-			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 		}
-		else if ($textleft!='' && $textright!='')	//
+		else if ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
 			{
-				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 			else if ($textright == '%LOGO%' || $textright == '%PHOTO%')
 			{
-				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 			else	// text on halft left and text on half right
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
-				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
+				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
+				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 		else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			else
 			{
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 
 		// Bottom
-		if ($footer!='')
+		if ($footer != '')
 		{
 			if ($this->code == "CARD")
 			{
-				$pdf->SetDrawColor(128,128,128);
-				$pdf->Line($_PosX, $_PosY+$this->_Height-$this->_Line_Height-2, $_PosX+$this->_Width, $_PosY+$this->_Height-$this->_Line_Height-2);
-				$pdf->SetDrawColor(0,0,0);
+				$pdf->SetDrawColor(128, 128, 128);
+				$pdf->Line($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 2, $_PosX + $this->_Width, $_PosY + $this->_Height - $this->_Line_Height - 2);
+				$pdf->SetDrawColor(0, 0, 0);
 			}
-			$pdf->SetXY($_PosX, $_PosY+$this->_Height-$this->_Line_Height-1);
-			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer),0,1,'C');
+			$pdf->SetXY($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 1);
+			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer), 0, 1, 'C');
 		}
 		//print "$_PosY+$this->_Height-$this->_Line_Height-1<br>\n";
 
@@ -224,13 +224,13 @@ 
 		if ($this->_COUNTY == $this->_Y_Number) {
 			// Si on est en bas de page, on remonte le 'curseur' de position
 			$this->_COUNTX++;
-			$this->_COUNTY=0;
+			$this->_COUNTY = 0;
 		}
 
 		if ($this->_COUNTX == $this->_X_Number) {
 			// Si on est en bout de page, alors on repart sur une nouvelle page
-			$this->_COUNTX=0;
-			$this->_COUNTY=0;
+			$this->_COUNTX = 0;
+			$this->_COUNTY = 0;
 		}
 	}
 
@@ -244,18 +244,18 @@ 
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
 	 *	@return	int								1=OK, 0=KO
 	 */
-	function write_file($object, $outputlangs, $srctemplatepath, $mode='member', $nooutput=0)
+	function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
 	{
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 	
-		$this->code=$srctemplatepath;
+		$this->code = $srctemplatepath;
 		
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') $object->country = '';
 
     		// List of values to scan for a replacement
-    		$substitutionarray = array (
+    		$substitutionarray = array(
     		    '%ID%'=>$object->rowid,
     		    '%LOGIN%'=>$object->login,
     		    '%FIRSTNAME%'=>$object->firstname,
@@ -268,7 +268,7 @@ 
     		    '%COUNTRY%'=>$object->country,
     		    '%COUNTRY_CODE%'=>$object->country_code,
     		    '%EMAIL%'=>$object->email,
-    		    '%BIRTH%'=>dol_print_date($object->birth,'day'),
+    		    '%BIRTH%'=>dol_print_date($object->birth, 'day'),
     		    '%TYPE%'=>$object->type,
     		    '%YEAR%'=>$year,
     		    '%MONTH%'=>$month,
@@ -279,17 +279,17 @@ 
     		complete_substitutions_array($substitutionarray, $langs);
 
     		// For business cards
-		    $textleft=make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-		    $textheader=make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-		    $textfooter=make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+		    $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
+		    $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
+		    $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
+		    $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 		
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 		    
-		    for($j=0;$j<$nb;$j++)
+		    for ($j = 0; $j < $nb; $j++)
 	        {
-	            $arrayofmembers[]=array(
+	            $arrayofmembers[] = array(
 	                'textleft'=>$textleft,
 	                'textheader'=>$textheader,
 	                'textfooter'=>$textfooter,
@@ -309,20 +309,20 @@ 
 		//var_dump($arrayofrecords);exit;
 
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('','ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
 		$this->type = 'pdf';
         // standard format or custom
-        if ($this->Tformat['paper-size']!='custom') {
+        if ($this->Tformat['paper-size'] != 'custom') {
             $this->format = $this->Tformat['paper-size'];
         } else {
             //custom
-            $resolution= array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
+            $resolution = array($this->Tformat['custom_x'], $this->Tformat['custom_y']);
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -332,12 +332,12 @@ 
 
 		if (empty($mode) || $mode == 'member')
 		{
-			$title=$outputlangs->transnoentities('MembersCards');
-			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
+			$title = $outputlangs->transnoentities('MembersCards');
+			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
 		}
 		else
 		{
-			dol_print_error('','Bad value for $mode');
+			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
 
@@ -357,16 +357,16 @@ 
 
 		//var_dump($file);exit;
 
-		if (! file_exists($dir))
+		if (!file_exists($dir))
 		{
 			if (dol_mkdir($dir) < 0)
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$pdf=pdf_getInstance($this->format,$this->Tformat['metric'], $this->Tformat['orientation']);
+		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
 		if (class_exists('TCPDF'))
 		{
@@ -380,17 +380,17 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins(0,0);
+		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
-		$posX=1;
-		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		$posX = 1;
+		$posY = 1;
+		if ($posX > 0) $posX--; else $posX = 0;
+		if ($posY > 0) $posY--; else $posY = 0;
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -401,10 +401,10 @@ 
 
 
 		// Add each record
-		foreach($arrayofrecords as $val)
+		foreach ($arrayofrecords as $val)
 		{
 			// imprime le texte specifique sur la carte
-			$this->Add_PDF_card($pdf,$val['textleft'],$val['textheader'],$val['textfooter'],$langs,$val['textright'],$val['id'],$val['photo']);
+			$this->Add_PDF_card($pdf, $val['textleft'], $val['textheader'], $val['textfooter'], $langs, $val['textright'], $val['id'], $val['photo']);
 		}
 
 		//$pdf->SetXY(10, 295);
@@ -412,9 +412,9 @@ 
 
 
 		// Output to file
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 
@@ -423,9 +423,9 @@ 
 		{
     		clearstatcache();
     
-    		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
-    		$type=dol_mimetype($filename);
+    		$attachment = true;
+    		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+    		$type = dol_mimetype($filename);
     
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
     		if ($type)		 header('Content-Type: '.$type);

Braces +71 added lines, -41 removed lines

@@ -85,8 +85,7 @@ 
 			if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (! empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -102,7 +101,9 @@ 
 		{
 			$file=get_exdir(0,0,0,0,$member,'member').'photos/'.$photo;
 			$photo=$dir.'/'.$file;
-			if (! is_readable($photo)) $photo='';
+			if (! is_readable($photo)) {
+				$photo='';
+			}
 		}
 
 		// Define background image
@@ -152,53 +153,58 @@ 
 		if ($tmp['height'])
 		{
 			$imgratio=$tmp['width']/$tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright=='')	// Only a left part
+		if ($textright=='') {
+			// Only a left part
 		{
 			// Output left area
 			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+		} else if ($textleft == '%PHOTO%' && $photo) {
+				$pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 			}
-		}
-		else if ($textleft!='' && $textright!='')	//
+		} else if ($textleft!='' && $textright!='') {
+			//
 		{
 			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
 			{
 				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+		} else if ($textleft == '%PHOTO%' && $photo) {
+					$pdf->Image($photo,$_PosX+$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft+$widthtouse+1, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft-$xleft-$widthtouse-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
-			}
-			else if ($textright == '%LOGO%' || $textright == '%PHOTO%')
+			} else if ($textright == '%LOGO%' || $textright == '%PHOTO%')
 			{
-				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-				else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				if ($textright == '%LOGO%' && $logo) {
+					$pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				} else if ($textright == '%PHOTO%' && $photo) {
+					$pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+				}
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$widthtouse-$xleft-$xleft-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else	// text on halft left and text on half right
+			} else	// text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 				$pdf->SetXY($_PosX+round($this->_Width/2), $_PosY+$ytop);
 				$pdf->MultiCell(round($this->_Width/2)-2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
 			}
-		}
-		else	// Only a right part
+		} else	// Only a right part
 		{
 			// Output right area
-			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else if ($textright == '%PHOTO%' && $photo) $pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
-			else
+			if ($textright == '%LOGO%' && $logo) {
+				$pdf->Image($logo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else if ($textright == '%PHOTO%' && $photo) {
+				$pdf->Image($photo,$_PosX+$this->_Width-$widthtouse-$xleft,$_PosY+$ytop,$widthtouse,$heighttouse);
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
@@ -252,7 +258,9 @@ 
 		
 		if (is_object($object))
 		{
-		    if ($object->country == '-') $object->country='';
+		    if ($object->country == '-') {
+		    	$object->country='';
+		    }
 
     		// List of values to scan for a replacement
     		$substitutionarray = array (
@@ -285,7 +293,10 @@ 
 		    $textright=make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 		
 		    $nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-		    if ($nb <= 0) $nb=1;  // Protection to avoid empty page
+		    if ($nb <= 0) {
+		    	$nb=1;
+		    }
+		    // Protection to avoid empty page
 		    
 		    for($j=0;$j<$nb;$j++)
 	        {
@@ -300,8 +311,7 @@ 
 	        }
     		
     		$arrayofrecords = $arrayofmembers;
-		}
-		else
+		} else
 		{
 		    $arrayofrecords = $object;
 		}
@@ -320,9 +330,13 @@ 
             $this->format = $resolution;
         }
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+			$outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output='ISO-8859-1';
+		}
 
 		$outputlangs->load("main");
 		$outputlangs->load("dict");
@@ -334,8 +348,7 @@ 
 		{
 			$title=$outputlangs->transnoentities('MembersCards');
 			$keywords=$outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
+		} else
 		{
 			dol_print_error('','Bad value for $mode');
 			return -1;
@@ -347,8 +360,7 @@ 
 		    $outputdir = $conf->adherent->dir_output;
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
-		}
-		else 
+		} else 
 		{
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
@@ -380,7 +392,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0,0);
 		$pdf->SetAutoPageBreak(false);
@@ -389,8 +403,16 @@ 
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX=1;
 		$posY=1;
-		if ($posX > 0) $posX--; else $posX=0;
-		if ($posY > 0) $posY--; else $posY=0;
+		if ($posX > 0) {
+			$posX--;
+		} else {
+			$posX=0;
+		}
+		if ($posY > 0) {
+			$posY--;
+		} else {
+			$posY=0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -414,8 +436,9 @@ 
 		// Output to file
 		$pdf->Output($file,'F');
 
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 
 		$this->result = array('fullpath'=>$file);
@@ -426,13 +449,20 @@ 
     		clearstatcache();
     
     		$attachment=true;
-    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
+    		if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+    			$attachment=false;
+    		}
     		$type=dol_mimetype($filename);
     
     		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
+    		if ($type) {
+    			header('Content-Type: '.$type);
+    		}
+    		if ($attachment) {
+    			header('Content-Disposition: attachment; filename="'.$filename.'"');
+    		} else {
+    			header('Content-Disposition: inline; filename="'.$filename.'"');
+    		}
     
     		// Ajout directives pour resoudre bug IE
     		header('Cache-Control: Public, must-revalidate');

htdocs/core/modules/payment/mod_payment_ant.php

Doc Comments +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
     function getNextValue($objsoc,$object)

Indentation +29 added lines, -29 removed lines

@@ -35,14 +35,14 @@ 
 	var $nom = 'Ant';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 
@@ -73,20 +73,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+	 	global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -94,7 +94,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -103,8 +103,8 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
-    {
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -130,11 +130,11 @@ 
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    function commande_get_num($objsoc,$objforref)
-    {
-        return $this->getNextValue($objsoc,$objforref);
-    }
+	 */
+	function commande_get_num($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Ant
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/payment/modules_payment.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/payment/modules_payment.php';
 
 
 /**
@@ -30,7 +30,7 @@ 
  */
 class mod_payment_ant extends ModeleNumRefPayments
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Ant';
 
@@ -42,35 +42,35 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstpayment" value="PAYMENT_ANT_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstpayment" value="PAYMENT_ANT_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -82,14 +82,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -103,22 +103,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->PAYMENT_ANT_MASK;
+		$mask = $conf->global->PAYMENT_ANT_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'paiement','ref','',$objsoc,$object->datepaye);
+		$numFinal = get_next_value($db, $mask, 'paiement', 'ref', '', $objsoc, $object->datepaye);
 
 		return  $numFinal;
 	}
@@ -131,9 +131,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
      */
-    function commande_get_num($objsoc,$objforref)
+    function commande_get_num($objsoc, $objforref)
     {
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 
 }

htdocs/core/modules/payment/mod_payment_cicada.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc,$object)

Indentation +12 added lines, -12 removed lines

@@ -35,16 +35,16 @@ 
 	var $nom='Cicada';
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
 
 
 	/**
@@ -127,8 +127,8 @@ 
 		$date=$object->datepaye;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Braces +13 added lines, -6 removed lines

@@ -114,10 +114,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -127,8 +129,13 @@ 
 		$date=$object->datepaye;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    		$num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    		$num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Spacing +30 added lines, -30 removed lines

@@ -22,17 +22,17 @@ 
  * \brief      File containing class for numbering module Cicada
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/payment/modules_payment.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/payment/modules_payment.php';
 
 /**
  *	Class to manage customer payment numbering rules Cicada
  */
 class mod_payment_cicada extends ModeleNumRefPayments
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='PAY';
-	var $error='';
-	var $nom='Cicada';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'PAY';
+	var $error = '';
+	var $nom = 'Cicada';
 
 
     /**
@@ -43,7 +43,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -66,26 +66,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -99,23 +99,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiement";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiement";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -124,11 +124,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->datepaye;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->datepaye;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -142,9 +142,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function payment_get_num($objsoc,$objforref)
+	function payment_get_num($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 
 }

htdocs/core/modules/project/task/mod_task_simple.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     /**
      * 	Return next reference not yet used as a reference
      *
-     *  @param	Societe	$objsoc     Object third party
+     *  @param	integer	$objsoc     Object third party
      *  @param  Task	$object		Object task
      *  @return string      		Next not used reference
      */

Braces +14 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
         if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
         {
             return true;
-        }
-        else
+        } else
         {
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
@@ -118,10 +117,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -132,8 +133,13 @@ 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+			$num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Indentation +71 added lines, -71 removed lines

@@ -33,44 +33,44 @@ 
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $prefix='TK';
-    var $error='';
+	var $error='';
 	var $nom = "Simple";
 	var $name = "Simple";
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
-
-
-    /**
-     *  Return an example of numbering module values
-     *
-     * 	@return     string      Example
-     */
-    function getExample()
-    {
-        return $this->prefix."0501-0001";
-    }
-
-
-    /**  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *   de conflits qui empechera cette numerotation de fonctionner.
-     *
-     *   @return     boolean     false si conflit, true si ok
-     */
-    function canBeActivated()
-    {
-    	global $conf,$langs,$db;
-
-        $coyymm=''; $max='';
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering module values
+	 *
+	 * 	@return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *   de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *   @return     boolean     false si conflit, true si ok
+	 */
+	function canBeActivated()
+	{
+		global $conf,$langs,$db;
+
+		$coyymm=''; $max='';
 
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
@@ -78,34 +78,34 @@ 
 		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
 		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
 		$sql .= " AND project.entity = " . $conf->entity;
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-        }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-        {
-            return true;
-        }
-        else
-        {
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+		}
+		if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		{
+			return true;
+		}
+		else
+		{
 			$langs->load("errors");
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
    /**
-	*  Return next value
-	*
-	*  @param   Societe	$objsoc		Object third party
-	*  @param   Task	$object		Object Task
-	*  @return	string				Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc,$object)
-    {
+    *  Return next value
+    *
+    *  @param   Societe	$objsoc		Object third party
+    *  @param   Task	$object		Object Task
+    *  @return	string				Value if OK, 0 if KO
+    */
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		// D'abord on recupere la valeur max
@@ -137,19 +137,19 @@ 
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
-    }
-
-
-    /**
-     * 	Return next reference not yet used as a reference
-     *
-     *  @param	Societe	$objsoc     Object third party
-     *  @param  Task	$object		Object task
-     *  @return string      		Next not used reference
-     */
-    function task_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	}
+
+
+	/**
+	 * 	Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe	$objsoc     Object third party
+	 *  @param  Task	$object		Object task
+	 *  @return string      		Next not used reference
+	 */
+	function task_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 }
 

Spacing +30 added lines, -30 removed lines

@@ -23,7 +23,7 @@ 
  *	\brief      File with class to manage the numbering module Simple for project references
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
@@ -31,9 +31,9 @@ 
  */
 class mod_task_simple extends ModeleNumRefTask
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='TK';
-    var $error='';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'TK';
+    var $error = '';
 	var $nom = "Simple";
 	var $name = "Simple";
 
@@ -46,7 +46,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -68,30 +68,30 @@ 
      */
     function canBeActivated()
     {
-    	global $conf,$langs,$db;
+    	global $conf, $langs, $db;
 
-        $coyymm=''; $max='';
+        $coyymm = ''; $max = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
-		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
-		$sql .= " AND project.entity = " . $conf->entity;
-        $resql=$db->query($sql);
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task AS task, ";
+		$sql .= MAIN_DB_PREFIX."projet AS project WHERE task.fk_projet=project.rowid";
+		$sql .= " AND task.ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND project.entity = ".$conf->entity;
+        $resql = $db->query($sql);
         if ($resql)
         {
             $row = $db->fetch_row($resql);
-            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+            if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
         }
-        if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
         {
             return true;
         }
         else
         {
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
             return false;
         }
     }
@@ -104,22 +104,22 @@ 
 	*  @param   Task	$object		Object Task
 	*  @return	string				Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -127,13 +127,13 @@ 
 			return -1;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
 
 		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m",$date);
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -147,9 +147,9 @@ 
      *  @param  Task	$object		Object task
      *  @return string      		Next not used reference
      */
-    function task_get_num($objsoc=0,$object='')
+    function task_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }
 

htdocs/core/modules/project/task/mod_task_universal.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     /**
      *  Return next reference not yet used as a reference
      *
-     *  @param	Societe		$objsoc     Object third party
+     *  @param	integer		$objsoc     Object third party
      *  @param  Task		$object	    Object task
      *  @return string      			Next not used reference
      */

Indentation +41 added lines, -41 removed lines

@@ -36,14 +36,14 @@ 
 	var $name = 'Universal';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("projects");
 		$langs->load("admin");
@@ -75,20 +75,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -96,17 +96,17 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
    /**
-	*  Return next value
-	*
-	*  @param	Societe		$objsoc		Object third party
-	*  @param   Task		$object	    Object task
-	*  @return  string					Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc,$object)
-    {
+    *  Return next value
+    *
+    *  @param	Societe		$objsoc		Object third party
+    *  @param   Task		$object	    Object task
+    *  @return  string					Value if OK, 0 if KO
+    */
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -127,16 +127,16 @@ 
 	}
 
 
-    /**
-     *  Return next reference not yet used as a reference
-     *
-     *  @param	Societe		$objsoc     Object third party
-     *  @param  Task		$object	    Object task
-     *  @return string      			Next not used reference
-     */
-    function project_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	/**
+	 *  Return next reference not yet used as a reference
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Task		$object	    Object task
+	 *  @return string      			Next not used reference
+	 */
+	function project_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 }
 

Spacing +36 added lines, -36 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 
 
 /**
@@ -30,7 +30,7 @@ 
  */
 class mod_task_universal extends ModeleNumRefTask
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Universal';
 	var $name = 'Universal';
@@ -43,7 +43,7 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("projects");
 		$langs->load("admin");
@@ -51,28 +51,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMaskTask">';
-		$texte.= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Task"),$langs->transnoentities("Task"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMaskTask">';
+		$texte .= '<input type="hidden" name="maskconsttask" value="PROJECT_TASK_UNIVERSAL_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Task"), $langs->transnoentities("Task"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -84,14 +84,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -105,23 +105,23 @@ 
 	*  @param   Task		$object	    Object task
 	*  @return  string					Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->PROJECT_TASK_UNIVERSAL_MASK;
+		$mask = $conf->global->PROJECT_TASK_UNIVERSAL_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$date=empty($object->date_c)?dol_now():$object->date_c;
-		$numFinal=get_next_value($db,$mask,'projet_task','ref','',(is_object($objsoc)?$objsoc->code_client:''),$date);
+		$date = empty($object->date_c) ?dol_now() : $object->date_c;
+		$numFinal = get_next_value($db, $mask, 'projet_task', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
 	}
@@ -134,9 +134,9 @@ 
      *  @param  Task		$object	    Object task
      *  @return string      			Next not used reference
      */
-    function project_get_num($objsoc=0,$object='')
+    function project_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }
 

htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php

Doc Comments +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
     function getNextValue($objsoc,$object)

Indentation +29 added lines, -29 removed lines

@@ -35,14 +35,14 @@ 
 	var $nom = 'Brodator';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     *  @return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 
@@ -73,20 +73,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-     	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+	 	global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+	 	$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -94,7 +94,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * 	Return next free value
@@ -103,8 +103,8 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
-    {
+	function getNextValue($objsoc,$object)
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -130,11 +130,11 @@ 
 	 *  @param	Societe		$objsoc     Object third party
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
-     */
-    function commande_get_num($objsoc,$objforref)
-    {
-        return $this->getNextValue($objsoc,$objforref);
-    }
+	 */
+	function commande_get_num($objsoc,$objforref)
+	{
+		return $this->getNextValue($objsoc,$objforref);
+	}
 
 }
 

Spacing +35 added lines, -35 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Brodator
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier_payment.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 
 
 /**
@@ -30,7 +30,7 @@ 
  */
 class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Brodator';
 
@@ -42,35 +42,35 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstsupplierpayment" value="SUPPLIER_PAYMENT_BRODATOR_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstsupplierpayment" value="SUPPLIER_PAYMENT_BRODATOR_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -82,14 +82,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -103,22 +103,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK;
+		$mask = $conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'paiementfourn','ref','',$objsoc,$object->datepaye);
+		$numFinal = get_next_value($db, $mask, 'paiementfourn', 'ref', '', $objsoc, $object->datepaye);
 
 		return  $numFinal;
 	}
@@ -131,9 +131,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
      */
-    function commande_get_num($objsoc,$objforref)
+    function commande_get_num($objsoc, $objforref)
     {
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 
 }

htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc,$object)

Indentation +12 added lines, -12 removed lines

@@ -35,16 +35,16 @@ 
 	var $nom='Bronan';
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
 
 
 	/**
@@ -127,8 +127,8 @@ 
 		$date=$object->datepaye;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s",$max+1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Braces +13 added lines, -6 removed lines

@@ -114,10 +114,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max=0;
+			}
+		} else
 		{
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -127,8 +129,13 @@ 
 		$date=$object->datepaye;
 		$yymm = strftime("%y%m",$date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) {
+    		$num=$max+1;
+    	}
+    	// If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else {
+    		$num = sprintf("%04s",$max+1);
+    	}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Spacing +30 added lines, -30 removed lines

@@ -22,17 +22,17 @@ 
  * \brief      File containing class for numbering module Bronan
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier_payment.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 
 /**
  *	Class to manage customer payment numbering rules Cicada
  */
 class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='SPAY';
-	var $error='';
-	var $nom='Bronan';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'SPAY';
+	var $error = '';
+	var $nom = 'Bronan';
 
 
     /**
@@ -43,7 +43,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -66,26 +66,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -99,23 +99,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=10;
+		$posindice = 10;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -124,11 +124,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->datepaye;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->datepaye;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -142,9 +142,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function payment_get_num($objsoc,$objforref)
+	function payment_get_num($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 
 }

htdocs/expensereport/class/api_expensereports.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+     * @param integer   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
      * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
      * @return  array               Array of Expense Report objects
      */

Indentation +225 added lines, -225 removed lines

@@ -29,171 +29,171 @@ 
 class ExpenseReports extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
-     */
-    static $FIELDS = array(
-        'socid'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object 
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
 
-    /**
-     * @var ExpenseReport $expensereport {@type ExpenseReport}
-     */
-    public $expensereport;
+	/**
+	 * @var ExpenseReport $expensereport {@type ExpenseReport}
+	 */
+	public $expensereport;
 
     
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->expensereport = new ExpenseReport($this->db);
-    }
+		$this->expensereport = new ExpenseReport($this->db);
+	}
 
-    /**
-     * Get properties of a Expense Report object
-     *
-     * Return an array with Expense Report informations
-     * 
-     * @param       int         $id         ID of Expense Report
-     * @return 	    array|mixed             Data without useless information
+	/**
+	 * Get properties of a Expense Report object
 	 *
-     * @throws 	RestException
-     */
-    function get($id)
-    {		
+	 * Return an array with Expense Report informations
+	 * 
+	 * @param       int         $id         ID of Expense Report
+	 * @return 	    array|mixed             Data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	function get($id)
+	{		
 		if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
 			throw new RestException(401);
 		}
 			
-        $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Expense report not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Expense report not found');
+		}
 		
 		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        $this->expensereport->fetchObjectLinked();
+		$this->expensereport->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->expensereport);
-    }
+	}
 
-    /**
-     * List Expense Reports
-     * 
-     * Get a list of Expense Reports
-     * 
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-     * @return  array               Array of Expense Report objects
-     */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $user_ids = 0, $sqlfilters = '') {
-        global $db, $conf;
+	/**
+	 * List Expense Reports
+	 * 
+	 * Get a list of Expense Reports
+	 * 
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string   	$user_ids   User ids filter field. Example: '1' or '1,2,3'          {@pattern /^[0-9,]*$/i}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array               Array of Expense Report objects
+	 */
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $user_ids = 0, $sqlfilters = '') {
+		global $db, $conf;
         
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $societe param is ignored and replaced by user's socid
-        //$socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $societe;
+		// case of external user, $societe param is ignored and replaced by user's socid
+		//$socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $societe;
         
-        $sql = "SELECT t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-        if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
+		$sql = "SELECT t.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
+		$sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
+		if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
         
-        // Add sql filters
-        if ($sqlfilters) 
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
+		// Add sql filters
+		if ($sqlfilters) 
+		{
+			if (! DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
         
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
 
-        $result = $db->query($sql);
+		$result = $db->query($sql);
         
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $expensereport_static = new ExpenseReport($db);
-                if($expensereport_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No Expense Report found');
-        }
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$expensereport_static = new ExpenseReport($db);
+				if($expensereport_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'No Expense Report found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create Expense Report object
-     *
-     * @param   array   $request_data   Request data
-     * @return  int                     ID of Expense Report
-     */
-    function post($request_data = NULL)
-    {
-      if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+	/**
+	 * Create Expense Report object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int                     ID of Expense Report
+	 */
+	function post($request_data = NULL)
+	{
+	  if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
-            $this->expensereport->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach($request_data as $field => $value) {
+			$this->expensereport->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
           }
           $this->expensereport->lines = $lines;
         }*/
-        if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
-        }
+		if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
+		}
         
-        return $this->expensereport->id;
-    }
+		return $this->expensereport->id;
+	}
 
-    /**
-     * Get lines of an Expense Report
-     *
-     * @param int   $id             Id of Expense Report
-     * 
-     * @url	GET {id}/lines
-     * 
-     * @return int 
-     */
+	/**
+	 * Get lines of an Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report
+	 * 
+	 * @url	GET {id}/lines
+	 * 
+	 * @return int 
+	 */
 /*    
     function getLines($id) {
       if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
@@ -217,16 +217,16 @@ 
     }
 */
     
-    /**
-     * Add a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Expense Report data   
-     * 
-     * @url	POST {id}/lines
-     * 
-     * @return int 
-     */
+	/**
+	 * Add a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Expense Report data   
+	 * 
+	 * @url	POST {id}/lines
+	 * 
+	 * @return int 
+	 */
 /*    
     function postLine($id, $request_data = NULL) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -278,18 +278,18 @@ 
     }
 */
     
-    /**
-     * Update a line to given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   Expense Report data   
-     * 
-     * @url	PUT {id}/lines/{lineid}
-     * 
-     * @return object 
-     */
-    /*
+	/**
+	 * Update a line to given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   Expense Report data   
+	 * 
+	 * @url	PUT {id}/lines/{lineid}
+	 * 
+	 * @return object 
+	 */
+	/*
     function putLine($id, $lineid, $request_data = NULL) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
@@ -337,17 +337,17 @@ 
     }
       */
 
-    /**
-     * Delete a line of given Expense Report
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param int   $lineid         Id of line to delete
-     * 
-     * @url	DELETE {id}/lines/{lineid}
-     * 
-     * @return int 
-     */
-    /*
+	/**
+	 * Delete a line of given Expense Report
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param int   $lineid         Id of line to delete
+	 * 
+	 * @url	DELETE {id}/lines/{lineid}
+	 * 
+	 * @return int 
+	 */
+	/*
     function delLine($id, $lineid) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
@@ -370,15 +370,15 @@ 
     }
     */
     
-    /**
-     * Update Expense Report general fields (won't touch lines of expensereport)
-     *
-     * @param int   $id             Id of Expense Report to update
-     * @param array $request_data   Datas   
-     * 
-     * @return int 
-     */
-    /*
+	/**
+	 * Update Expense Report general fields (won't touch lines of expensereport)
+	 *
+	 * @param int   $id             Id of Expense Report to update
+	 * @param array $request_data   Datas   
+	 * 
+	 * @return int 
+	 */
+	/*
     function put($id, $request_data = NULL) {
       if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
 		  	throw new RestException(401);
@@ -404,56 +404,56 @@ 
     }
     */
         
-    /**
-     * Delete Expense Report
-     *
-     * @param   int     $id         Expense Report ID
-     * 
-     * @return  array
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->expensereport->supprimer) {
+	/**
+	 * Delete Expense Report
+	 *
+	 * @param   int     $id         Expense Report ID
+	 * 
+	 * @return  array
+	 */
+	function delete($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->expensereport->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Expense Report not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Expense Report not found');
+		}
 		
 		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        if( ! $this->expensereport->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
-        }
+		if( ! $this->expensereport->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
+		}
         
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Expense Report deleted'
-            )
-        );
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Expense Report deleted'
+			)
+		);
         
-    }
+	}
     
-    /**
-     * Validate an Expense Report
-     * 
-     * @param   int $id             Expense Report ID
-     * 
-     * @url POST    {id}/validate
-     *  
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "idwarehouse": 0
-     * }
-     */
-    /*
+	/**
+	 * Validate an Expense Report
+	 * 
+	 * @param   int $id             Expense Report ID
+	 * 
+	 * @url POST    {id}/validate
+	 *  
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0
+	 * }
+	 */
+	/*
     function validate($id, $idwarehouse=0)
     {
         if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
@@ -480,22 +480,22 @@ 
         );
     }*/
     
-    /**
-     * Validate fields before create or update object
-     * 
-     * @param   array           $data   Array with data to verify
-     * @return  array           
-     * @throws  RestException
-     */
-    function _validate($data)
-    {
-        $expensereport = array();
-        foreach (ExpenseReports::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $expensereport[$field] = $data[$field];
+	/**
+	 * Validate fields before create or update object
+	 * 
+	 * @param   array           $data   Array with data to verify
+	 * @return  array           
+	 * @throws  RestException
+	 */
+	function _validate($data)
+	{
+		$expensereport = array();
+		foreach (ExpenseReports::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$expensereport[$field] = $data[$field];
             
-        }
-        return $expensereport;
-    }
+		}
+		return $expensereport;
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -64,16 +64,16 @@ 
      */
     function get($id)
     {		
-		if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
+		if (!DolibarrApiAccess::$user->rights->expensereport->lire) {
 			throw new RestException(401);
 		}
 			
         $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Expense report not found');
         }
 		
-		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
@@ -103,30 +103,30 @@ 
         //$socid = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $societe;
         
         $sql = "SELECT t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-        if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
+        $sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
+        if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
         
         // Add sql filters
         if ($sqlfilters) 
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
         
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
@@ -139,7 +139,7 @@ 
             {
                 $obj = $db->fetch_object($result);
                 $expensereport_static = new ExpenseReport($db);
-                if($expensereport_static->fetch($obj->rowid)) {
+                if ($expensereport_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($expensereport_static);
                 }
                 $i++;
@@ -148,7 +148,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No Expense Report found');
         }
 		return $obj_ret;
@@ -162,13 +162,13 @@ 
      */
     function post($request_data = NULL)
     {
-      if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+      if (!DolibarrApiAccess::$user->rights->expensereport->creer) {
 			  throw new RestException(401, "Insuffisant rights");
 		  }
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->expensereport->$field = $value;
         }
         /*if (isset($request_data["lines"])) {
@@ -413,19 +413,19 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->expensereport->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->expensereport->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Expense Report not found');
         }
 		
-		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expensereport', $this->expensereport->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         
-        if( ! $this->expensereport->delete(DolibarrApiAccess::$user)) {
+        if (!$this->expensereport->delete(DolibarrApiAccess::$user)) {
             throw new RestException(500, 'Error when delete Expense Report : '.$this->expensereport->error);
         }
         

Braces +7 added lines, -5 removed lines

@@ -105,7 +105,9 @@ 
         $sql = "SELECT t.rowid";
         $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as t";
         $sql.= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-        if ($user_ids) $sql.=" AND t.fk_user_author IN (".$user_ids.")";
+        if ($user_ids) {
+        	$sql.=" AND t.fk_user_author IN (".$user_ids.")";
+        }
         
         // Add sql filters
         if ($sqlfilters) 
@@ -144,8 +146,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -491,8 +492,9 @@ 
     {
         $expensereport = array();
         foreach (ExpenseReports::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $expensereport[$field] = $data[$field];
             
         }