Dolibarr / dolibarr

htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php

Spacing +86 added lines, -86 removed lines

@@ -43,7 +43,7 @@ 
 					'border' => false,
 					'hpadding' => 'auto',
 					'vpadding' => 'auto',
-					'fgcolor' => array(0,0,0),
+					'fgcolor' => array(0, 0, 0),
 					'bgcolor' => false,
 					'text' => true,
 					'font' => 'helvetica',
@@ -56,7 +56,7 @@ 
 					'border' => false,
 					'vpadding' => 'auto',
 					'hpadding' => 'auto',
-					'fgcolor' => array(0,0,0),
+					'fgcolor' => array(0, 0, 0),
 					'bgcolor' => false,
 					'module_width' => 1, // width of a single module in points
 					'module_height' => 1 // height of a single module in points
@@ -95,9 +95,9 @@ 
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
 	 */
-	function addSticker(&$pdf,$outputlangs,$param) 
+	function addSticker(&$pdf, $outputlangs, $param) 
 	{
-		global $mysoc,$conf;
+		global $mysoc, $conf;
 		
 		$textleft = $param['textleft'];
 		$header = $param['textheader'];
@@ -110,25 +110,25 @@ 
 		
 
 		// 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;
 			}
 		}
 
@@ -136,20 +136,20 @@ 
 		$ytop = 2;
 
 		// Top
-		if ($header!='')
+		if ($header != '')
 		{
-			$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
 		$pageMargins = $pdf->getMargins();
-		$maxwidthtouse = round($this->_Width - 2*$xleft);
-		$maxheighttouse = round($this->_Height - 2*$ytop);
-		$maxheighttouse -= (empty($footer)?0:(1+$this->_Line_Height));
-		$defaultratio = ($maxwidthtouse/$maxheighttouse);
+		$maxwidthtouse = round($this->_Width - 2 * $xleft);
+		$maxheighttouse = round($this->_Height - 2 * $ytop);
+		$maxheighttouse -= (empty($footer) ? 0 : (1 + $this->_Line_Height));
+		$defaultratio = ($maxwidthtouse / $maxheighttouse);
 		$widthtouse = $maxwidthtouse;
 		$heighttouse = $maxheighttouse;
 		$logoHeight = $heighttouse;
@@ -158,92 +158,92 @@ 
 		//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, 0, $logoHeight);
+			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
 			else if ($code && !empty($encoding)) 
 			{
-				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse, $heighttouse);
+				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_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!='')	// left and right part
+		else if ($textleft != '' && $textright != '')	// left and right part
 		{
-			if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%') )	 // left part logo/barcode right part text
+			if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%'))	 // left part logo/barcode right part text
 			{
-				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, 0);
+				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse / 2, 0);
 				else if ($code && !empty($encoding)) 
 				{
-					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, $heighttouse);
+					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse / 2, $heighttouse);
 				}
-				$pdf->SetXY($_PosX+($widthtouse/2), $_PosY+$ytop);
-				$pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
+				$pdf->SetXY($_PosX + ($widthtouse / 2), $_PosY + $ytop);
+				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 			else if (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
 			{
-				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, 0);
+				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $widthtouse / 2, 0);
 				else if ($code && !empty($encoding)) 
 				{
-					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, $heighttouse);
+					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $widthtouse / 2, $heighttouse);
 				}
-				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-				$pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
 			else if ($textleft == '%LOGO%')	 // left part logo right part text/barcode
 			{
-				if ($logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, 0, $logoHeight);
+				if ($logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
 				{
-					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft+$logoWidth+1, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse);
+					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop, $widthtouse - $logoWidth - 1, $heighttouse);
 				} else {
-					$pdf->SetXY($_PosX+$xleft+$logoWidth+1, $_PosY+$ytop);
-					$pdf->MultiCell($widthtouse-$logoWidth1-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
+					$pdf->SetXY($_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop);
+					$pdf->MultiCell($widthtouse - $logoWidth1 - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 				}				
 			}
 			else if ($textright == '%LOGO%')  // right part logo left part text/barcode
 			{
-				if ($logo) $pdf->Image($logo, $_PosX+$xleft+$widthtouse-$logoWidth+1, $_PosY+$ytop, 0, $logoHeight);
+				if ($logo) $pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
 				{
-					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse);
+					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse - $logoWidth - 1, $heighttouse);
 				} else {
-					$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
-					$pdf->MultiCell($widthtouse-$logoWidth-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
+					$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
+					$pdf->MultiCell($widthtouse - $logoWidth - 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, 0, $logoHeight);
+			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
 			else if ($code && !empty($encoding)) 
 			{
-				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$this->_Width-$widthtouse-$xleft, $_PosY+$ytop, $widthtouse, $heighttouse);
+				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_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 != '')
 		{
-			$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";
 
@@ -252,13 +252,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;
 		}
 	}
 
@@ -275,48 +275,48 @@ 
 	 *  @param  string      $filename           Short file name of PDF output file
 	 *	@return int								1=OK, 0=KO
 	 */
-	function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='',$filename='tmp_address_sheet.pdf')
+	function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
 	{
-		global $user,$conf,$langs,$mysoc,$_Avery_Labels;
+		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
-		$this->code=$srctemplatepath;
+		$this->code = $srctemplatepath;
 		$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");
 		$outputlangs->load("companies");
 		$outputlangs->load("admin");
 
-		$title=$outputlangs->transnoentities('Labels');
-		$keywords=$title." ".$outputlangs->convToOutputCharset($mysoc->name);
+		$title = $outputlangs->transnoentities('Labels');
+		$keywords = $title." ".$outputlangs->convToOutputCharset($mysoc->name);
 
-		$dir = (empty($outputdir)?$conf->adherent->dir_temp:$outputdir);
+		$dir = (empty($outputdir) ? $conf->adherent->dir_temp : $outputdir);
 		$file = $dir."/".$filename;
 
-		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'))
 		{
@@ -330,17 +330,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);
@@ -351,7 +351,7 @@ 
 
 
 		// Add each record
-		foreach($arrayofrecords as $val)
+		foreach ($arrayofrecords as $val)
 		{
 			// imprime le texte specifique sur la carte
 			$this->addSticker($pdf, $outputlangs, $val);
@@ -362,9 +362,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));
 
 
@@ -372,9 +372,9 @@ 
 		// Output to http stream
 		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);

Indentation +8 added lines, -8 removed lines

@@ -242,14 +242,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

Braces +56 added lines, -35 removed lines

@@ -125,8 +125,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;
 			}
@@ -158,45 +157,46 @@ 
 		//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, 0, $logoHeight);
-			else if ($code && !empty($encoding)) 
+		} else if ($code && !empty($encoding)) 
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse, $heighttouse);
-			}
-			else
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
 			}
-		}
-		else if ($textleft!='' && $textright!='')	// left and right part
+		} else if ($textleft!='' && $textright!='') {
+			// left and right part
 		{
 			if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%') )	 // left part logo/barcode right part text
 			{
 				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, 0);
-				else if ($code && !empty($encoding)) 
+		} else if ($code && !empty($encoding)) 
 				{
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse/2, $heighttouse);
 				}
 				$pdf->SetXY($_PosX+($widthtouse/2), $_PosY+$ytop);
 				$pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			else if (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
+			} else if (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) {
+				// right part logo/barcode left part text
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, 0);
-				else if ($code && !empty($encoding)) 
+			} else if ($code && !empty($encoding)) 
 				{
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+($widthtouse/2), $_PosY+$ytop, $widthtouse/2, $heighttouse);
 				}
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($widthtouse/2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft),0,'L');
-			}
-			else if ($textleft == '%LOGO%')	 // left part logo right part text/barcode
+			} else if ($textleft == '%LOGO%') {
+				// left part logo right part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX+$xleft, $_PosY+$ytop, 0, $logoHeight);
+			}
 				if ($code && !empty($encoding))
 				{
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft+$logoWidth+1, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse);
@@ -204,10 +204,11 @@ 
 					$pdf->SetXY($_PosX+$xleft+$logoWidth+1, $_PosY+$ytop);
 					$pdf->MultiCell($widthtouse-$logoWidth1-1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
 				}				
-			}
-			else if ($textright == '%LOGO%')  // right part logo left part text/barcode
+			} else if ($textright == '%LOGO%') {
+				// right part logo left part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX+$xleft+$widthtouse-$logoWidth+1, $_PosY+$ytop, 0, $logoHeight);
+			}
 				if ($code && !empty($encoding))
 				{
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$xleft, $_PosY+$ytop, $widthtouse-$logoWidth-1, $heighttouse);
@@ -215,24 +216,22 @@ 
 					$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 					$pdf->MultiCell($widthtouse-$logoWidth-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, 0, $logoHeight);
-			else if ($code && !empty($encoding)) 
+			if ($textright == '%LOGO%' && $logo) {
+				$pdf->Image($logo, $_PosX+$this->_Width-$widthtouse-$xleft, $_PosY+$ytop, 0, $logoHeight);
+			} else if ($code && !empty($encoding)) 
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX+$this->_Width-$widthtouse-$xleft, $_PosY+$ytop, $widthtouse, $heighttouse);
-			}
-			else
+			} else
 			{
 				$pdf->SetXY($_PosX+$xleft, $_PosY+$ytop);
 				$pdf->MultiCell($this->_Width-$xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright),0,'R');
@@ -292,9 +291,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");
@@ -330,7 +333,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);
@@ -339,8 +344,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);
@@ -364,20 +377,28 @@ 
 		// 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));
+		}
 
 		// Output to http stream
 		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/modBarcode.class.php

Indentation +20 added lines, -20 removed lines

@@ -91,20 +91,20 @@ 
 		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[2][4] = 'creer_advance';
 
-        // Main menu entries
-        $r=0;
-        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'mainmenu'=>'tools',
-        						'leftmenu'=>'barcodeprint',
-        						'type'=>'left',			                // This is a Left menu entry
-						        'titre'=>'BarCodePrintsheet',
-						        'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
-						        'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->barcode->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        				        'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+		// Main menu entries
+		$r=0;
+		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'mainmenu'=>'tools',
+								'leftmenu'=>'barcodeprint',
+								'type'=>'left',			                // This is a Left menu entry
+								'titre'=>'BarCodePrintsheet',
+								'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
+								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->barcode->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -121,12 +121,12 @@ 
 	}
 
 
-    /**
-     *      Function called when module is enabled.
-     *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *      It also creates data directories.
-     *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	/**
+	 *      Function called when module is enabled.
+	 *      The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *      It also creates data directories.
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	function init($options='')

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      Fichier de description et activation du module Barcode
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe Barcode
@@ -46,19 +46,19 @@ 
 
 		$this->family = "technic";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des codes barres";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 2;
-		$this->picto='barcode';
+		$this->picto = 'barcode';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/barcode/temp");
 
 		// Dependencies
-		$this->depends = array();        // May be used for product or service or third party module
+		$this->depends = array(); // May be used for product or service or third party module
 		$this->requiredby = array();
 
 		// Config pages
@@ -93,31 +93,31 @@ 
 		$this->rights[2][4] = 'creer_advance';
 
         // Main menu entries
-        $r=0;
-        $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        $r = 0;
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 						        'mainmenu'=>'tools',
         						'leftmenu'=>'barcodeprint',
-        						'type'=>'left',			                // This is a Left menu entry
+        						'type'=>'left', // This is a Left menu entry
 						        'titre'=>'BarCodePrintsheet',
 						        'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
-						        'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+						        'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 						        'position'=>200,
-						        'enabled'=>'$conf->barcode->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        				        'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+						        'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+        				        'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 						        'target'=>'',
-						        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',			                // This is a Left menu entry
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'type'=>'left', // This is a Left menu entry
 								'titre'=>'MassBarcodeInit',
 								'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools',
-								'langs'=>'products',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>300,
-								'enabled'=>'$conf->barcode->enabled && ($leftmenu=="admintools" || $leftmenu=="admintools_info")',   // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'enabled'=>'$conf->barcode->enabled && ($leftmenu=="admintools" || $leftmenu=="admintools_info")', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
-								'user'=>0);				                // 0=Menu for internal users, 1=external users, 2=both
+								'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 	}
 
@@ -130,20 +130,20 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array(
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN8', 'EAN8', 0, '1234567', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN13', 'EAN13', 0, '123456789012', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('UPC', 'UPC', 0, '123456789012', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('ISBN', 'ISBN', 0, '123456789', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C39', 'Code 39', 0, '1234567890', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('DATAMATRIX', 'Datamatrix', 0, '1234567xyz', __ENTITY__)",'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('QRCODE', 'Qr Code', 0, 'www.dolibarr.org', __ENTITY__)",'ignoreerror'=>1)
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN8', 'EAN8', 0, '1234567', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN13', 'EAN13', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('UPC', 'UPC', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('ISBN', 'ISBN', 0, '123456789', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C39', 'Code 39', 0, '1234567890', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('DATAMATRIX', 'Datamatrix', 0, '1234567xyz', __ENTITY__)", 'ignoreerror'=>1),
+				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('QRCODE', 'Qr Code', 0, 'www.dolibarr.org', __ENTITY__)", 'ignoreerror'=>1)
 		);
 
 		return $this->_init($sql, $options);

htdocs/core/modules/export/modules_export.php

Indentation +36 added lines, -36 removed lines

@@ -42,9 +42,9 @@ 
 	/**
 	 *  Load into memory list of available export format
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates (same content than array this->driverlabel)
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
 	function liste_modeles($db,$maxfilenamelength=0)
 	{
@@ -56,40 +56,40 @@ 
 		// Recherche des fichiers drivers exports disponibles
 		$var=True;
 		$i=0;
-        if (is_resource($handle))
-        {
-    		while (($file = readdir($handle))!==false)
-    		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
-    			{
-    				$moduleid=$reg[1];
-
-    				// Loading Class
-    				$file = $dir."export_".$moduleid.".modules.php";
-    				$classname = "Export".ucfirst($moduleid);
-
-    				require_once $file;
-    				if (class_exists($classname))
-    				{
-        				$module = new $classname($db);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+				if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
+				{
+					$moduleid=$reg[1];
+
+					// Loading Class
+					$file = $dir."export_".$moduleid.".modules.php";
+					$classname = "Export".ucfirst($moduleid);
+
+					require_once $file;
+					if (class_exists($classname))
+					{
+						$module = new $classname($db);
     
-        				// Picto
-        				$this->picto[$module->id]=$module->picto;
-        				// Driver properties
-        				$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id]=$module->getDriverDesc();
-        				$this->driverversion[$module->id]=$module->getDriverVersion();
-        				// If use an external lib
-        				$this->liblabel[$module->id]=$module->getLibLabel();
-        				$this->libversion[$module->id]=$module->getLibVersion();
-    				}
-    				$i++;
-    			}
-    		}
-    		closedir($handle);
-        }
-
-        asort($this->driverlabel);
+						// Picto
+						$this->picto[$module->id]=$module->picto;
+						// Driver properties
+						$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
+						$this->driverdesc[$module->id]=$module->getDriverDesc();
+						$this->driverversion[$module->id]=$module->getDriverVersion();
+						// If use an external lib
+						$this->liblabel[$module->id]=$module->getLibLabel();
+						$this->libversion[$module->id]=$module->getLibVersion();
+					}
+					$i++;
+				}
+			}
+			closedir($handle);
+		}
+
+		asort($this->driverlabel);
 
 		return $this->driverlabel;
 	}

Spacing +19 added lines, -19 removed lines

@@ -30,13 +30,13 @@ 
  */
 class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by liste_modeles
 {
-	var $error='';
+	var $error = '';
 
-	var $driverlabel=array();
-	var $driverversion=array();
+	var $driverlabel = array();
+	var $driverversion = array();
 
-	var $liblabel=array();
-	var $libversion=array();
+	var $liblabel = array();
+	var $libversion = array();
 
 
 	/**
@@ -46,23 +46,23 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
-	function liste_modeles($db,$maxfilenamelength=0)
+	function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
-		$handle=opendir($dir);
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
+		$handle = opendir($dir);
 
 		// Recherche des fichiers drivers exports disponibles
-		$var=True;
-		$i=0;
+		$var = True;
+		$i = 0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
+    		while (($file = readdir($handle)) !== false)
     		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
+    			if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
     			{
-    				$moduleid=$reg[1];
+    				$moduleid = $reg[1];
 
     				// Loading Class
     				$file = $dir."export_".$moduleid.".modules.php";
@@ -74,14 +74,14 @@ 
         				$module = new $classname($db);
     
         				// Picto
-        				$this->picto[$module->id]=$module->picto;
+        				$this->picto[$module->id] = $module->picto;
         				// Driver properties
-        				$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id]=$module->getDriverDesc();
-        				$this->driverversion[$module->id]=$module->getDriverVersion();
+        				$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
+        				$this->driverdesc[$module->id] = $module->getDriverDesc();
+        				$this->driverversion[$module->id] = $module->getDriverVersion();
         				// If use an external lib
-        				$this->liblabel[$module->id]=$module->getLibLabel();
-        				$this->libversion[$module->id]=$module->getLibVersion();
+        				$this->liblabel[$module->id] = $module->getLibLabel();
+        				$this->libversion[$module->id] = $module->getLibVersion();
     				}
     				$i++;
     			}

htdocs/core/modules/export/export_excel2007.modules.php

Indentation +32 added lines, -32 removed lines

@@ -45,7 +45,7 @@ 
 	var $worksheet;     // Handle onglet
 	var $row;
 	var $col;
-    var $file;          // To save filename
+	var $file;          // To save filename
 
 	/**
 	 *	Constructor
@@ -61,29 +61,29 @@ 
 		$this->label='Excel 2007';               // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension='xlsx';             // Extension for generated file by this driver
-        $this->picto='mime/xls';			// Picto
+		$this->picto='mime/xls';			// Picto
 		$this->version='1.30';             // Driver version
 
 		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 		
 		if (empty($this->disabled))
 		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
-                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
-                require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
-    		}
-    		else
-    		{
-                require_once PHPEXCEL_PATH.'PHPExcel.php';
-                require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
-    		}
+			// If driver use an external library, put its name here
+			if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			{
+				require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+				require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
+				require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
+				$this->label_lib='PhpWriteExcel';
+				$this->version_lib='unknown';
+			}
+			else
+			{
+				require_once PHPEXCEL_PATH.'PHPExcel.php';
+				require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+				$this->label_lib='PhpExcel';
+				$this->version_lib='1.8.0';		// No way to get info from library
+			}
 		}
 		
 		$this->row=0;
@@ -91,26 +91,26 @@ 
 
 
 	/**
-     *	Close Excel file
-     *
+	 *	Close Excel file
+	 *
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	function close_file()
 	{
 		global $conf;
 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
-            require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
-            $objWriter->save($this->file);
-            $this->workbook->disconnectWorksheets();
-            unset($this->workbook);
-    	}
+		{
+			$this->workbook->close();
+		}
+		else
+		{
+			require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
+			$objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+			$objWriter->save($this->file);
+			$this->workbook->disconnectWorksheets();
+			unset($this->workbook);
+		}
 		return 1;
 	}
 

Spacing +16 added lines, -16 removed lines

@@ -41,11 +41,11 @@ 
 	var $label_lib;
 	var $version_lib;
 
-	var $workbook;      // Handle fichier
-	var $worksheet;     // Handle onglet
+	var $workbook; // Handle fichier
+	var $worksheet; // Handle onglet
 	var $row;
 	var $col;
-    var $file;          // To save filename
+    var $file; // To save filename
 
 	/**
 	 *	Constructor
@@ -57,36 +57,36 @@ 
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';               // Label of driver
+		$this->id = 'excel2007'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 2007'; // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
-		$this->extension='xlsx';             // Extension for generated file by this driver
-        $this->picto='mime/xls';			// Picto
-		$this->version='1.30';             // Driver version
+		$this->extension = 'xlsx'; // Extension for generated file by this driver
+        $this->picto = 'mime/xls'; // Picto
+		$this->version = '1.30'; // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
 		
 		if (empty($this->disabled))
 		{
     		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
+    			$this->label_lib = 'PhpWriteExcel';
+                $this->version_lib = 'unknown';
     		}
     		else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
+    			$this->label_lib = 'PhpExcel';
+                $this->version_lib = '1.8.0'; // No way to get info from library
     		}
 		}
 		
-		$this->row=0;
+		$this->row = 0;
 	}
 
 
@@ -99,7 +99,7 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
     	}

Braces +2 added lines, -4 removed lines

@@ -76,8 +76,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -102,8 +101,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);

htdocs/core/modules/export/export_tsv.modules.php

Indentation +120 added lines, -120 removed lines

@@ -31,130 +31,130 @@ 
  */
 class ExportTsv extends ModeleExports
 {
-    var $id;
-    var $label;
-    var $extension;
-    var $version;
+	var $id;
+	var $label;
+	var $extension;
+	var $version;
 
-    var $label_lib;
-    var $version_lib;
+	var $label_lib;
+	var $version_lib;
 
-    var $separator="\t";
+	var $separator="\t";
 
-    var $handle;    // Handle fichier
+	var $handle;    // Handle fichier
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *	@param	    DoliDB	$db      Database handler
-     */
-    function __construct($db)
-    {
-        global $conf, $langs;
-        $this->db = $db;
-
-        $this->id='tsv';                // Same value then xxx in file name export_xxx.modules.php
-        $this->label = 'TSV';             // Label of driver
-        $this->desc = $langs->trans('TsvFormatDesc');
-        $this->extension='tsv';         // Extension for generated file by this driver
-        $this->picto='mime/other';		// Picto
-        $this->version='1.15';         // Driver version
-
-        // If driver use an external library, put its name here
-        $this->label_lib='Dolibarr';
-        $this->version_lib=DOL_VERSION;
-    }
+	 */
+	function __construct($db)
+	{
+		global $conf, $langs;
+		$this->db = $db;
+
+		$this->id='tsv';                // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'TSV';             // Label of driver
+		$this->desc = $langs->trans('TsvFormatDesc');
+		$this->extension='tsv';         // Extension for generated file by this driver
+		$this->picto='mime/other';		// Picto
+		$this->version='1.15';         // Driver version
+
+		// If driver use an external library, put its name here
+		$this->label_lib='Dolibarr';
+		$this->version_lib=DOL_VERSION;
+	}
 
 	/**
 	 * getDriverId
 	 *
 	 * @return string
 	 */
-    function getDriverId()
-    {
-        return $this->id;
-    }
+	function getDriverId()
+	{
+		return $this->id;
+	}
 
 	/**
 	 * getDriverLabel
 	 *
 	 * @return 	string			Return driver label
 	 */
-    function getDriverLabel()
-    {
-        return $this->label;
-    }
+	function getDriverLabel()
+	{
+		return $this->label;
+	}
 
 	/**
 	 * getDriverDesc
 	 *
 	 * @return string
 	 */
-    function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	function getDriverDesc()
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    function getDriverExtension()
-    {
-        return $this->extension;
-    }
+	function getDriverExtension()
+	{
+		return $this->extension;
+	}
 
 	/**
 	 * getDriverVersion
 	 *
 	 * @return string
 	 */
-    function getDriverVersion()
-    {
-        return $this->version;
-    }
+	function getDriverVersion()
+	{
+		return $this->version;
+	}
 
 	/**
 	 * getLibLabel
 	 *
 	 * @return string
 	 */
-    function getLibLabel()
-    {
-        return $this->label_lib;
-    }
+	function getLibLabel()
+	{
+		return $this->label_lib;
+	}
 
 	/**
 	 * getLibVersion
 	 *
 	 * @return string
 	 */
-    function getLibVersion()
-    {
-        return $this->version_lib;
-    }
+	function getLibVersion()
+	{
+		return $this->version_lib;
+	}
 
 
-    /**
-	*	Open output file
-	*
+	/**
+	 *	Open output file
+	 *
 	 *	@param		string		$file			Path of filename to generate
-	*	@param		Translate	$outputlangs	Output language object
-	*	@return		int							<0 if KO, >=0 if OK
-	*/
+	 *	@param		Translate	$outputlangs	Output language object
+	 *	@return		int							<0 if KO, >=0 if OK
+	 */
 	function open_file($file,$outputlangs)
-    {
-        global $langs;
+	{
+		global $langs;
 
-        dol_syslog("ExportTsv::open_file file=".$file);
+		dol_syslog("ExportTsv::open_file file=".$file);
 
 		$ret=1;
 
-        $outputlangs->load("exports");
+		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-        if (! $this->handle)
+		if (! $this->handle)
 		{
 			$langs->load("errors");
 			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
@@ -162,7 +162,7 @@ 
 		}
 
 		return $ret;
-    }
+	}
 
 	/**
 	 * 	Output header into file
@@ -170,33 +170,33 @@ 
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    function write_header($outputlangs)
-    {
-        return 0;
-    }
+	function write_header($outputlangs)
+	{
+		return 0;
+	}
 
 
 	/**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
-    {
-        foreach($array_selected_sorted as $code => $value)
-        {
-            $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
+	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+	{
+		foreach($array_selected_sorted as $code => $value)
+		{
+			$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
 			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 
 			fwrite($this->handle,$newvalue.$this->separator);
-        }
-        fwrite($this->handle,"\n");
-        return 0;
-    }
+		}
+		fwrite($this->handle,"\n");
+		return 0;
+	}
 
 
 	/**
@@ -205,24 +205,24 @@ 
 	 *  @param      array		$array_selected_sorted      Array with list of field to export
 	 *  @param      resource	$objp                       A record from a fetch with all fields from select
 	 *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
-    {
-    	global $conf;
+	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+	{
+		global $conf;
 
 		$this->col=0;
  		foreach($array_selected_sorted as $code => $value)
-        {
+		{
 			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
 			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
 
-            $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
-            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
+			$typefield=isset($array_types[$code])?$array_types[$code]:'';
 
-            // Translation newvalue
+			// Translation newvalue
 			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
 
 			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
@@ -235,11 +235,11 @@ 
 			}
 			
 			fwrite($this->handle,$newvalue.$this->separator);
-            $this->col++;
+			$this->col++;
 		}
-        fwrite($this->handle,"\n");
-        return 0;
-    }
+		fwrite($this->handle,"\n");
+		return 0;
+	}
 
 	/**
 	 * 	Output footer into file
@@ -247,46 +247,46 @@ 
 	 * 	@param		Translate	$outputlangs		Output language object
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
-    function write_footer($outputlangs)
-    {
+	function write_footer($outputlangs)
+	{
 		return 0;
-    }
+	}
 
 	/**
 	 * 	Close file handle
 	 *
 	 * 	@return		int							<0 if KO, >0 if OK
 	 */
-    function close_file()
-    {
-        fclose($this->handle);
-        return 0;
-    }
-
-    /**
-     * Clean a cell to respect rules of TSV file cells
-     *
-     * @param 	string	$newvalue	String to clean
+	function close_file()
+	{
+		fclose($this->handle);
+		return 0;
+	}
+
+	/**
+	 * Clean a cell to respect rules of TSV file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
 	 * @param	string	$charset	Input AND Output character set
-     * @return 	string				Value cleaned
-     */
-    function tsv_clean($newvalue, $charset)
-    {
+	 * @return 	string				Value cleaned
+	 */
+	function tsv_clean($newvalue, $charset)
+	{
 		// Rule Dolibarr: No HTML
 		$newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
 
 		// Rule 1 TSV: No CR, LF in cells
-    	$newvalue=str_replace("\r",'',$newvalue);
-        $newvalue=str_replace("\n",'\n',$newvalue);
+		$newvalue=str_replace("\r",'',$newvalue);
+		$newvalue=str_replace("\n",'\n',$newvalue);
 
-        // Rule 2 TSV: If value contains tab, we must replace by space
+		// Rule 2 TSV: If value contains tab, we must replace by space
 		if (preg_match('/'.$this->separator.'/',$newvalue))
 		{
 			$newvalue=str_replace("\t"," ",$newvalue);
 		}
 
-    	return $newvalue;
-    }
+		return $newvalue;
+	}
 
 }
 

Spacing +38 added lines, -38 removed lines

@@ -23,7 +23,7 @@ 
  *		\author	    Laurent Destailleur
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 
 
 /**
@@ -39,9 +39,9 @@ 
     var $label_lib;
     var $version_lib;
 
-    var $separator="\t";
+    var $separator = "\t";
 
-    var $handle;    // Handle fichier
+    var $handle; // Handle fichier
 
 
     /**
@@ -54,16 +54,16 @@ 
         global $conf, $langs;
         $this->db = $db;
 
-        $this->id='tsv';                // Same value then xxx in file name export_xxx.modules.php
-        $this->label = 'TSV';             // Label of driver
+        $this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
+        $this->label = 'TSV'; // Label of driver
         $this->desc = $langs->trans('TsvFormatDesc');
-        $this->extension='tsv';         // Extension for generated file by this driver
-        $this->picto='mime/other';		// Picto
-        $this->version='1.15';         // Driver version
+        $this->extension = 'tsv'; // Extension for generated file by this driver
+        $this->picto = 'mime/other'; // Picto
+        $this->version = '1.15'; // Driver version
 
         // If driver use an external library, put its name here
-        $this->label_lib='Dolibarr';
-        $this->version_lib=DOL_VERSION;
+        $this->label_lib = 'Dolibarr';
+        $this->version_lib = DOL_VERSION;
     }
 
 	/**
@@ -144,21 +144,21 @@ 
 	*	@param		Translate	$outputlangs	Output language object
 	*	@return		int							<0 if KO, >=0 if OK
 	*/
-	function open_file($file,$outputlangs)
+	function open_file($file, $outputlangs)
     {
         global $langs;
 
         dol_syslog("ExportTsv::open_file file=".$file);
 
-		$ret=1;
+		$ret = 1;
 
         $outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-        if (! $this->handle)
+        if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
+			$ret = -1;
 		}
 
 		return $ret;
@@ -185,16 +185,16 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
     {
-        foreach($array_selected_sorted as $code => $value)
+        foreach ($array_selected_sorted as $code => $value)
         {
-            $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
         }
-        fwrite($this->handle,"\n");
+        fwrite($this->handle, "\n");
         return 0;
     }
 
@@ -208,24 +208,24 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
     {
     	global $conf;
 
-		$this->col=0;
- 		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+ 		foreach ($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
 
-            $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
-            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+            $newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
+            $typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 			
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -234,10 +234,10 @@ 
 				$newvalue = $array[$newvalue];
 			}
 			
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
             $this->col++;
 		}
-        fwrite($this->handle,"\n");
+        fwrite($this->handle, "\n");
         return 0;
     }
 
@@ -273,16 +273,16 @@ 
     function tsv_clean($newvalue, $charset)
     {
 		// Rule Dolibarr: No HTML
-		$newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
+		$newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
 
 		// Rule 1 TSV: No CR, LF in cells
-    	$newvalue=str_replace("\r",'',$newvalue);
-        $newvalue=str_replace("\n",'\n',$newvalue);
+    	$newvalue = str_replace("\r", '', $newvalue);
+        $newvalue = str_replace("\n", '\n', $newvalue);
 
         // Rule 2 TSV: If value contains tab, we must replace by space
-		if (preg_match('/'.$this->separator.'/',$newvalue))
+		if (preg_match('/'.$this->separator.'/', $newvalue))
 		{
-			$newvalue=str_replace("\t"," ",$newvalue);
+			$newvalue = str_replace("\t", " ", $newvalue);
 		}
 
     	return $newvalue;

Braces +11 added lines, -4 removed lines

@@ -215,15 +215,22 @@
 		$this->col=0;
  		foreach($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+				$alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+				$alias=substr($code, strpos($code, ' as ') + 4);
+			}
+            if (empty($alias)) {
+            	dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            }
 
             $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
             $typefield=isset($array_types[$code])?$array_types[$code]:'';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+				$newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 			

htdocs/core/modules/export/export_excel.modules.php

Indentation +196 added lines, -196 removed lines

@@ -44,7 +44,7 @@ 
 	var $worksheet;     // Handle onglet
 	var $row;
 	var $col;
-    var $file;          // To save filename
+	var $file;          // To save filename
 
 
 	/**
@@ -61,29 +61,29 @@ 
 		$this->label='Excel 95';             // Label of driver
 		$this->desc = $langs->trans('Excel95FormatDesc');
 		$this->extension='xls';             // Extension for generated file by this driver
-        $this->picto='mime/xls';					// Picto
+		$this->picto='mime/xls';					// Picto
 		$this->version='1.30';             // Driver version
 
 		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 		
 		if (empty($this->disabled))
 		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
-                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
-                require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
-    		}
-    		else
-    		{
-                require_once PHPEXCEL_PATH.'PHPExcel.php';
-                require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
-    		}
+			// If driver use an external library, put its name here
+			if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			{
+				require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+				require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
+				require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
+				$this->label_lib='PhpWriteExcel';
+				$this->version_lib='unknown';
+			}
+			else
+			{
+				require_once PHPEXCEL_PATH.'PHPExcel.php';
+				require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+				$this->label_lib='PhpExcel';
+				$this->version_lib='1.8.0';		// No way to get info from library
+			}
 		}
 
 		$this->row=0;
@@ -115,16 +115,16 @@ 
 	 * @return string
 	 */
 	function getDriverDesc()
-    {
-        return $this->desc;
-    }
+	{
+		return $this->desc;
+	}
 
 	/**
 	 * getDriverExtension
 	 *
 	 * @return string
 	 */
-    function getDriverExtension()
+	function getDriverExtension()
 	{
 		return $this->extension;
 	}
@@ -173,58 +173,58 @@ 
 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+			$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 		}
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
-        $this->file=$file;
+		$this->file=$file;
 
 		$ret=1;
 
-    	$outputlangs->load("exports");
+		$outputlangs->load("exports");
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-            require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
-            require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
-            require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-		    $this->workbook = new writeexcel_workbookbig($file);
-    		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
-    		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
-    		$this->worksheet = &$this->workbook->addworksheet();
+			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
+			require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
+			$this->workbook = new writeexcel_workbookbig($file);
+			$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
+			$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
+			$this->worksheet = &$this->workbook->addworksheet();
 		}
 		else
 		{
-            require_once PHPEXCEL_PATH.'PHPExcel.php';
-            require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-
-		    if ($this->id == 'excel2007')
-		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
-	            {
-	            	$langs->load("errors");
-	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
-	            	return -1;
-	            }
-		    }
-
-		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			    $cacheSettings = array (
-			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-			    );
-			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-		    }
-
-            $this->workbook = new PHPExcel();
-            $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
-            //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
-            $this->workbook->getProperties()->setTitle($outputlangs->trans("Export").' - '.$file);
-            $this->workbook->getProperties()->setSubject($outputlangs->trans("Export").' - '.$file);
-            $this->workbook->getProperties()->setDescription($outputlangs->trans("Export").' - '.$file);
-
-            $this->workbook->setActiveSheetIndex(0);
-            $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
-            $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
+			require_once PHPEXCEL_PATH.'PHPExcel.php';
+			require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
+
+			if ($this->id == 'excel2007')
+			{
+				if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+				{
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorPHPNeedModule','zip');
+					return -1;
+				}
+			}
+
+			if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+				$cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+				$cacheSettings = array (
+						'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+				);
+				PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+			}
+
+			$this->workbook = new PHPExcel();
+			$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
+			//$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION);
+			$this->workbook->getProperties()->setTitle($outputlangs->trans("Export").' - '.$file);
+			$this->workbook->getProperties()->setSubject($outputlangs->trans("Export").' - '.$file);
+			$this->workbook->getProperties()->setDescription($outputlangs->trans("Export").' - '.$file);
+
+			$this->workbook->setActiveSheetIndex(0);
+			$this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
+			$this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
 		}
 		return $ret;
 	}
@@ -232,7 +232,7 @@ 
 	/**
 	 *	Write header
 	 *
-     *	@param      Translate	$outputlangs        Object lang to translate values
+	 *	@param      Translate	$outputlangs        Object lang to translate values
 	 * 	@return		int								<0 if KO, >0 if OK
 	 */
 	function write_header($outputlangs)
@@ -244,12 +244,12 @@ 
 
 
 	/**
-     *  Output title line into file
-     *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  Output title line into file
+	 *
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
@@ -259,39 +259,39 @@ 
 		// Create a format for the column headings
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-
-		    $formatheader =$this->workbook->addformat();
-    		$formatheader->set_bold();
-    		$formatheader->set_color('blue');
-    		//$formatheader->set_size(12);
-    		//$formatheader->set_font("Courier New");
-    		//$formatheader->set_align('center');
+			$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+
+			$formatheader =$this->workbook->addformat();
+			$formatheader->set_bold();
+			$formatheader->set_color('blue');
+			//$formatheader->set_size(12);
+			//$formatheader->set_font("Courier New");
+			//$formatheader->set_align('center');
 		}
 		else
 		{
-            $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+			$this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
+			$this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 		}
 
 		$this->col=0;
 		foreach($array_selected_sorted as $code => $value)
 		{
-            $alias=$array_export_fields_label[$code];
+			$alias=$array_export_fields_label[$code];
 			//print "dd".$alias;
 			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
-    		{
-                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
-                {
-                	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
-                }
-    		}
+			if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			{
+				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
+			}
+			else
+			{
+				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
+				if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+				{
+					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+				}
+			}
 			$this->col++;
 		}
 		$this->row++;
@@ -299,12 +299,12 @@ 
 	}
 
 	/**
-     *  Output record line into file
-     *
-     *  @param      array		$array_selected_sorted      Array with list of field to export
-     *  @param      resource	$objp                       A record from a fetch with all fields from select
-     *  @param      Translate	$outputlangs                Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *  Output record line into file
+	 *
+	 *  @param      array		$array_selected_sorted      Array with list of field to export
+	 *  @param      resource	$objp                       A record from a fetch with all fields from select
+	 *  @param      Translate	$outputlangs                Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
@@ -314,7 +314,7 @@ 
 		// Create a format for the column headings
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+			$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 		}
 
 		// Define first row
@@ -324,8 +324,8 @@ 
 		{
 			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
 			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-            $newvalue=$objp->$alias;
+			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			$newvalue=$objp->$alias;
 
 			$newvalue=$this->excel_clean($newvalue);
 			$typefield=isset($array_types[$code])?$array_types[$code]:'';
@@ -349,65 +349,65 @@ 
 
 			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
 			{
-        		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-        		{
-            		$formatdate=$this->workbook->addformat();
-            		$formatdate->set_num_format('yyyy-mm-dd');
-            		//$formatdate->set_num_format(0x0f);
-        		    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-        		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
-        		{
-        		    $newvalue=dol_stringtotime($newvalue);
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-        		}
+				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+				{
+					$formatdate=$this->workbook->addformat();
+					$formatdate->set_num_format('yyyy-mm-dd');
+					//$formatdate->set_num_format(0x0f);
+					$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+					//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+					$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+					$this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
+				}
+				else
+				{
+					$newvalue=dol_stringtotime($newvalue);
+					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+					$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+				}
 			}
 			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-            		$formatdatehour=$this->workbook->addformat();
-            		$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
-            		//$formatdatehour->set_num_format(0x0f);
-            		$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-    		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
-    		    {
-        		    $newvalue=dol_stringtotime($newvalue);
-    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
-    		    }
+				{
+					$formatdatehour=$this->workbook->addformat();
+					$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
+					//$formatdatehour->set_num_format(0x0f);
+					$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+					//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+					$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+					$this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
+				}
+				else
+				{
+					$newvalue=dol_stringtotime($newvalue);
+					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+					$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
+				}
 			}
 			else
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
 				{
-    		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
-    		    	{
-    		    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+					$this->worksheet->write($this->row, $this->col, $newvalue);
+				}
+				else
+				{
+					if ($typefield == 'Text' || $typefield == 'TextAuto')
+					{
+						//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
 						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
-    		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
-    		    	{
-    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
-    		    	}
-    		    }
+						$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+						$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+						$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+					}
+					else
+					{
+						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+					}
+				}
 			}
 			$this->col++;
 		}
@@ -417,11 +417,11 @@ 
 
 
 	/**
-     *	Write footer
-     *
+	 *	Write footer
+	 *
 	 * 	@param		Translate	$outputlangs	Output language object
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	function write_footer($outputlangs)
 	{
 		return 0;
@@ -429,65 +429,65 @@ 
 
 
 	/**
-     *	Close Excel file
-     *
+	 *	Close Excel file
+	 *
 	 * 	@return		int							<0 if KO, >0 if OK
-     */
+	 */
 	function close_file()
 	{
 		global $conf;
 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
-            require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
-            $objWriter->save($this->file);
-            $this->workbook->disconnectWorksheets();
-            unset($this->workbook);
-    	}
+		{
+			$this->workbook->close();
+		}
+		else
+		{
+			require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
+			$objWriter = new PHPExcel_Writer_Excel5($this->workbook);
+			$objWriter->save($this->file);
+			$this->workbook->disconnectWorksheets();
+			unset($this->workbook);
+		}
 		return 1;
 	}
 
 
 	/**
-     * Clean a cell to respect rules of Excel file cells
-     *
-     * @param 	string	$newvalue	String to clean
-     * @return 	string				Value cleaned
-     */
-    function excel_clean($newvalue)
-    {
+	 * Clean a cell to respect rules of Excel file cells
+	 *
+	 * @param 	string	$newvalue	String to clean
+	 * @return 	string				Value cleaned
+	 */
+	function excel_clean($newvalue)
+	{
 		// Rule Dolibarr: No HTML
-    	$newvalue=dol_string_nohtmltag($newvalue);
+		$newvalue=dol_string_nohtmltag($newvalue);
 
-    	return $newvalue;
-    }
+		return $newvalue;
+	}
 
 
-    /**
-     * Convert a column to letter (1->A, 0->B, 27->AA, ...)
-     *
-     * @param 	int		$c		Column position
-     * @return 	string			Letter
-     */
-    function column2Letter($c)
-    {
+	/**
+	 * Convert a column to letter (1->A, 0->B, 27->AA, ...)
+	 *
+	 * @param 	int		$c		Column position
+	 * @return 	string			Letter
+	 */
+	function column2Letter($c)
+	{
 
-    	$c = intval($c);
-    	if ($c <= 0) return '';
+		$c = intval($c);
+		if ($c <= 0) return '';
 
-    	while ($c != 0)
-    	{
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
-    	}
+		while ($c != 0)
+		{
+			$p = ($c - 1) % 26;
+			$c = intval(($c - $p) / 26);
+			$letter = chr(65 + $p) . $letter;
+		}
 
-    	return $letter;
-    }
+		return $letter;
+	}
 }
 

Spacing +74 added lines, -74 removed lines

@@ -40,11 +40,11 @@ 
 	var $label_lib;
 	var $version_lib;
 
-	var $workbook;      // Handle fichier
-	var $worksheet;     // Handle onglet
+	var $workbook; // Handle fichier
+	var $worksheet; // Handle onglet
 	var $row;
 	var $col;
-    var $file;          // To save filename
+    var $file; // To save filename
 
 
 	/**
@@ -57,36 +57,36 @@ 
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 95';             // Label of driver
+		$this->id = 'excel'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 95'; // Label of driver
 		$this->desc = $langs->trans('Excel95FormatDesc');
-		$this->extension='xls';             // Extension for generated file by this driver
-        $this->picto='mime/xls';					// Picto
-		$this->version='1.30';             // Driver version
+		$this->extension = 'xls'; // Extension for generated file by this driver
+        $this->picto = 'mime/xls'; // Picto
+		$this->version = '1.30'; // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
 		
 		if (empty($this->disabled))
 		{
     		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
+    			$this->label_lib = 'PhpWriteExcel';
+                $this->version_lib = 'unknown';
     		}
     		else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
+    			$this->label_lib = 'PhpExcel';
+                $this->version_lib = '1.8.0'; // No way to get info from library
     		}
 		}
 
-		$this->row=0;
+		$this->row = 0;
 	}
 
 	/**
@@ -167,28 +167,28 @@ 
 	 *  @param		Translate	$outputlangs	Output language object
 	 *	@return		int							<0 if KO, >=0 if OK
 	 */
-	function open_file($file,$outputlangs)
+	function open_file($file, $outputlangs)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
-        $this->file=$file;
+        $this->file = $file;
 
-		$ret=1;
+		$ret = 1;
 
     	$outputlangs->load("exports");
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
 		    $this->workbook = new writeexcel_workbookbig($file);
-    		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
+    		$this->workbook->set_tempdir($conf->export->dir_temp); // Set temporary directory
     		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
     		$this->worksheet = &$this->workbook->addworksheet();
 		}
@@ -199,17 +199,17 @@ 
 
 		    if ($this->id == 'excel2007')
 		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+	            if (!class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
 	            {
 	            	$langs->load("errors");
-	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
+	            	$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 	            	return -1;
 	            }
 		    }
 
 		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
 			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			    $cacheSettings = array (
+			    $cacheSettings = array(
 			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
 			    );
 			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
@@ -252,16 +252,16 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+	function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
 		global $conf;
 
 		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 
-		    $formatheader =$this->workbook->addformat();
+		    $formatheader = $this->workbook->addformat();
     		$formatheader->set_bold();
     		$formatheader->set_color('blue');
     		//$formatheader->set_size(12);
@@ -274,20 +274,20 @@ 
 		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 		}
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+		foreach ($array_selected_sorted as $code => $value)
 		{
-            $alias=$array_export_fields_label[$code];
+            $alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
     		}
     		else
     		{
-                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
+    		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
                 {
                 	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
                 }
@@ -307,28 +307,28 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+	function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
 		global $conf;
 
 		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		// Define first row
-		$this->col=0;
+		$this->col = 0;
 
-		foreach($array_selected_sorted as $code => $value)
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-            $newvalue=$objp->$alias;
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+            $newvalue = $objp->$alias;
 
-			$newvalue=$this->excel_clean($newvalue);
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
+			$newvalue = $this->excel_clean($newvalue);
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 			
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -338,58 +338,58 @@ 
 			}
 			
 			// Traduction newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
 			{
-				$newvalue=$outputlangs->transnoentities($reg[1]);
+				$newvalue = $outputlangs->transnoentities($reg[1]);
 			}
 			else
 			{
-				$newvalue=$outputlangs->convToOutputCharset($newvalue);
+				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
-			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
+			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue))
 			{
-        		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
         		{
-            		$formatdate=$this->workbook->addformat();
+            		$formatdate = $this->workbook->addformat();
             		$formatdate->set_num_format('yyyy-mm-dd');
             		//$formatdate->set_num_format(0x0f);
-        		    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+        		    $arrayvalue = preg_split('/[.,]/', xl_parse_date($newvalue));
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+    				$newvalue = strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
         		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
         		}
         		else
         		{
-        		    $newvalue=dol_stringtotime($newvalue);
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+        		    $newvalue = dol_stringtotime($newvalue);
+        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+        		    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
         		}
 			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+				if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
-            		$formatdatehour=$this->workbook->addformat();
+            		$formatdatehour = $this->workbook->addformat();
             		$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
             		//$formatdatehour->set_num_format(0x0f);
-            		$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+            		$arrayvalue = preg_split('/[.,]/', xl_parse_date($newvalue));
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+    				$newvalue = strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
     		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
     		    }
     		    else
     		    {
-        		    $newvalue=dol_stringtotime($newvalue);
-    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+        		    $newvalue = dol_stringtotime($newvalue);
+    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+        		    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
     		    }
 			}
 			else
 			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+				if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
 			        $this->worksheet->write($this->row, $this->col, $newvalue);
     		    }
@@ -398,14 +398,14 @@ 
     		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     		    	{
     		    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
-						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
-    		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, (string) $newvalue);
+    		    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
     		    	}
     		    	else
     		    	{
-    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     		    	}
     		    }
 			}
@@ -437,7 +437,7 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
     	}
@@ -462,7 +462,7 @@ 
     function excel_clean($newvalue)
     {
 		// Rule Dolibarr: No HTML
-    	$newvalue=dol_string_nohtmltag($newvalue);
+    	$newvalue = dol_string_nohtmltag($newvalue);
 
     	return $newvalue;
     }
@@ -484,7 +484,7 @@ 
     	{
     		$p = ($c - 1) % 26;
     		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
+    		$letter = chr(65 + $p).$letter;
     	}
 
     	return $letter;

Braces +32 added lines, -31 removed lines

@@ -76,8 +76,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -191,17 +190,18 @@ 
     		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
     		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
     		$this->worksheet = &$this->workbook->addworksheet();
-		}
-		else
+		} else
 		{
             require_once PHPEXCEL_PATH.'PHPExcel.php';
             require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
 
 		    if ($this->id == 'excel2007')
 		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+	            if (! class_exists('ZipArchive')) {
+	            	// For Excel2007, PHPExcel need ZipArchive
 	            {
 	            	$langs->load("errors");
+	            }
 	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
 	            	return -1;
 	            }
@@ -267,8 +267,7 @@ 
     		//$formatheader->set_size(12);
     		//$formatheader->set_font("Courier New");
     		//$formatheader->set_align('center');
-		}
-		else
+		} else
 		{
             $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
 		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
@@ -279,17 +278,20 @@ 
 		{
             $alias=$array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) {
+				dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			}
     		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
+    		} else
     		{
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto'))) {
+    		    	// Set autowidth for some types
                 {
                 	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+    		    }
                 }
     		}
 			$this->col++;
@@ -322,9 +324,14 @@ 
 
 		foreach($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+				$alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+				$alias=substr($code, strpos($code, ' as ') + 4);
+			}
+            if (empty($alias)) {
+            	dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            }
             $newvalue=$objp->$alias;
 
 			$newvalue=$this->excel_clean($newvalue);
@@ -341,8 +348,7 @@ 
 			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
 			{
 				$newvalue=$outputlangs->transnoentities($reg[1]);
-			}
-			else
+			} else
 			{
 				$newvalue=$outputlangs->convToOutputCharset($newvalue);
 			}
@@ -358,16 +364,14 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
         		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
+        		} else
         		{
         		    $newvalue=dol_stringtotime($newvalue);
         		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
         		}
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
@@ -378,22 +382,19 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
     		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
+    		    } else
     		    {
         		    $newvalue=dol_stringtotime($newvalue);
     		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
     		    }
-			}
-			else
+			} else
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
 			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
+    		    } else
 				{
     		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     		    	{
@@ -402,8 +403,7 @@ 
     		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
+    		    	} else
     		    	{
     		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
     		    	}
@@ -440,8 +440,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
@@ -478,7 +477,9 @@ 
     {
 
     	$c = intval($c);
-    	if ($c <= 0) return '';
+    	if ($c <= 0) {
+    		return '';
+    	}
 
     	while ($c != 0)
     	{

htdocs/core/modules/export/export_csv.modules.php

Indentation +10 added lines, -10 removed lines

@@ -184,10 +184,10 @@ 
 	/**
 	 * 	Output title line into file
 	 *
-     *  @param      array		$array_export_fields_label   	Array with list of label of fields
-     *  @param      array		$array_selected_sorted       	Array with list of field to export
-     *  @param      Translate	$outputlangs    				Object lang to translate values
-     *  @param		array		$array_types					Array with types of fields
+	 *  @param      array		$array_export_fields_label   	Array with list of label of fields
+	 *  @param      array		$array_selected_sorted       	Array with list of field to export
+	 *  @param      Translate	$outputlangs    				Object lang to translate values
+	 *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
 	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
@@ -216,12 +216,12 @@ 
 
 
 	/**
-     *	Output record line into file
-     *
-     *  @param     	array		$array_selected_sorted      Array with list of field to export
-     *  @param     	resource	$objp                       A record from a fetch with all fields from select
-     *  @param     	Translate	$outputlangs    			Object lang to translate values
-     *  @param		array		$array_types				Array with types of fields
+	 *	Output record line into file
+	 *
+	 *  @param     	array		$array_selected_sorted      Array with list of field to export
+	 *  @param     	resource	$objp                       A record from a fetch with all fields from select
+	 *  @param     	Translate	$outputlangs    			Object lang to translate values
+	 *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
 	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)

Spacing +54 added lines, -54 removed lines

@@ -22,7 +22,7 @@ 
  *		\author	    Laurent Destailleur
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 
 	var $separator;
 
-	var $handle;    // Handle fichier
+	var $handle; // Handle fichier
 
 
 	/**
@@ -50,24 +50,24 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 		$this->db = $db;
 
-		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
-		$this->escape='"';
-		$this->enclosure='"';
+		$this->separator = ',';
+		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		$this->escape = '"';
+		$this->enclosure = '"';
 
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label = 'CSV';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.32';         // Driver version
+		$this->id = 'csv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'CSV'; // Label of driver
+		$this->desc = $langs->trans("CSVFormatDesc", $this->separator, $this->enclosure, $this->escape);
+		$this->extension = 'csv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.32'; // Driver version
 
 		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
 
 	}
 
@@ -149,21 +149,21 @@ 
 	 * 	@param		Translate	$outputlangs	Output language object
 	 *	@return		int							<0 if KO, >=0 if OK
 	 */
-	function open_file($file,$outputlangs)
+	function open_file($file, $outputlangs)
 	{
 		global $langs;
 
 		dol_syslog("ExportCsv::open_file file=".$file);
 
-		$ret=1;
+		$ret = 1;
 
 		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-		if (! $this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
+			$ret = -1;
 		}
 
 		return $ret;
@@ -190,11 +190,11 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+	function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
 		global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
@@ -203,14 +203,14 @@ 
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		foreach($array_selected_sorted as $code => $value)
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
 		}
-		fwrite($this->handle,"\n");
+		fwrite($this->handle, "\n");
 		return 0;
 	}
 
@@ -224,11 +224,11 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+	function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
 		global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
@@ -237,20 +237,20 @@ 
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+			if (empty($alias)) dol_print_error('', 'Bad value for field with key='.$code.'. Try to redefine export.');
 
-			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
+			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -259,11 +259,11 @@ 
 				$newvalue = $array[$newvalue];
 			}
 			
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
 			$this->col++;
 		}
 
-		fwrite($this->handle,"\n");
+		fwrite($this->handle, "\n");
 		return 0;
 	}
 
@@ -302,40 +302,40 @@ 
 	public function csvClean($newvalue, $charset)
 	{
 		global $conf;
-		$addquote=0;
+		$addquote = 0;
 		
 
 		// Rule Dolibarr: No HTML
    		//print $charset.' '.$newvalue."\n";
    		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
-   		$newvalue=dol_htmlcleanlastbr($newvalue);
+   		$newvalue = dol_htmlcleanlastbr($newvalue);
    		//print $charset.' '.$newvalue."\n";
 		
 		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
-		$oldvalue=$newvalue;
-		$newvalue=str_replace("\r",'',$newvalue);
-		$newvalue=str_replace("\n",'\n',$newvalue);
-		if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
+		$oldvalue = $newvalue;
+		$newvalue = str_replace("\r", '', $newvalue);
+		$newvalue = str_replace("\n", '\n', $newvalue);
+		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
 		{
 			// If strict use of CSV rules, we just add quote
-			$newvalue=$oldvalue;
-			$addquote=1;
+			$newvalue = $oldvalue;
+			$addquote = 1;
 		}
 		
 		// Rule 2 CSV: If value contains ", we must escape with ", and add "
-		if (preg_match('/"/',$newvalue))
+		if (preg_match('/"/', $newvalue))
 		{
-			$addquote=1;
-			$newvalue=str_replace('"','""',$newvalue);
+			$addquote = 1;
+			$newvalue = str_replace('"', '""', $newvalue);
 		}
 
 		// Rule 3 CSV: If value contains separator, we must add "
-		if (preg_match('/'.$this->separator.'/',$newvalue))
+		if (preg_match('/'.$this->separator.'/', $newvalue))
 		{
-			$addquote=1;
+			$addquote = 1;
 		}
 
-		return ($addquote?'"':'').$newvalue.($addquote?'"':'');
+		return ($addquote ? '"' : '').$newvalue.($addquote ? '"' : '');
 	}
 
 }

Braces +16 added lines, -9 removed lines

@@ -54,7 +54,9 @@ 
 		$this->db = $db;
 
 		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
+			$this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		}
 		$this->escape='"';
 		$this->enclosure='"';
 
@@ -197,8 +199,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -231,8 +232,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -240,15 +240,22 @@ 
 		$this->col=0;
 		foreach($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+				$alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+				$alias=substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+				dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			}
 
 			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
 			$typefield=isset($array_types[$code])?$array_types[$code]:'';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+				$newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
 

htdocs/core/modules/modFckeditor.class.php

Indentation +6 added lines, -6 removed lines

@@ -69,12 +69,12 @@
 
 		// Constants
 		$this->const = array();
-        $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
-        $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
-        $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
-        $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
-        $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
-        $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
+		$this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
+		$this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
+		$this->const[2]  = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
+		$this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
+		$this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
+		$this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
 		$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
 
 		// Boxes

Spacing +12 added lines, -12 removed lines

@@ -25,7 +25,7 @@ 
  *  \brief      Fichier de description et activation du module Fckeditor
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -47,7 +47,7 @@ 
 		$this->family = "technic";
 		$this->module_position = 20;
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Editeur WYSIWYG";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -55,28 +55,28 @@ 
 		$this->special = 2;
 		// Name of png file (without png) used for this module.
 		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='list';
+		$this->picto = 'list';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/medias/temp","/medias/image");
+		$this->dirs = array("/medias/temp", "/medias/image");
 
 		// Config pages
 		$this->config_page_url = array("fckeditor.php");
 
 		// Dependencies
-		$this->disabled = (in_array(constant('JS_CKEDITOR'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		$this->disabled = (in_array(constant('JS_CKEDITOR'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
 		$this->depends = array();
 		$this->requiredby = array('modWebsites');
 
 		// Constants
 		$this->const = array();
-        $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
-        $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
-        $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
-        $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
-        $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
-        $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
-		$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
+        $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
+        $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
+        $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
+        $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
+        $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
+        $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL", "yesno", "1", "WYSIWIG for products details lines for all entities");
+		$this->const[6] = array("FCKEDITOR_SKIN", "string", "moono-lisa", "Skin by default for fckeditor");
 
 		// Boxes
 		$this->boxes = array();

htdocs/core/modules/oauth/google_oauthcallback.php

Indentation +44 added lines, -44 removed lines

@@ -65,17 +65,17 @@ 
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_GOOGLE_ID,
-    $conf->global->OAUTH_GOOGLE_SECRET,
-    $currentUri->getAbsoluteUri()
+	$conf->global->OAUTH_GOOGLE_ID,
+	$conf->global->OAUTH_GOOGLE_SECRET,
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray=array();
 if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }
 //var_dump($requestedpermissionsarray);exit;
 
@@ -99,63 +99,63 @@ 
 
 if ($action == 'delete') 
 {
-    $storage->clearToken('Google');
+	$storage->clearToken('Google');
     
-    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
     
-    header('Location: ' . $backtourl);
-    exit();
+	header('Location: ' . $backtourl);
+	exit();
 } 
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
 {
-    //llxHeader('',$langs->trans("OAuthSetup"));
+	//llxHeader('',$langs->trans("OAuthSetup"));
 
-    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    //dol_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//dol_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = isset($_GET['state']) ? $_GET['state'] : null;
+	//print '<table>';
 
-    // This was a callback request from service, get the token
-    try {
-        //var_dump($_GET['code']);
-        //var_dump($state);
-        //var_dump($apiService);      // OAuth\OAuth2\Service\Google
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
         
-        $token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code'], $state);
         
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
-    } catch (Exception $e) {
-        print $e->getMessage();
-    }
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
 
-    $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-    unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+	$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+	unset($_SESSION["backtourlsavedbeforeoauthjump"]);
     
-    header('Location: ' . $backtourl);
-    exit();
+	header('Location: ' . $backtourl);
+	exit();
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+	$_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
     
-    // This may create record into oauth_state before the header redirect.
-    // Creation of record with state in this tables depend on the Provider used (see its constructor).
-    if (GETPOST('state'))
-    {
-        $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
-        $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
-    }
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state'))
+	{
+		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	}
+	else
+	{
+		$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+	}
     
-    // we go on oauth provider authorization page
-    header('Location: ' . $url);
-    exit();
+	// we go on oauth provider authorization page
+	header('Location: ' . $url);
+	exit();
 }
 
 

Spacing +11 added lines, -11 removed lines

@@ -29,8 +29,8 @@ 
 use OAuth\OAuth2\Service\Google;
 
 // Define $urlwithroot
-$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
@@ -70,8 +70,8 @@ 
     $currentUri->getAbsoluteUri()
 );
 
-$requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+$requestedpermissionsarray = array();
+if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -103,11 +103,11 @@ 
     
     setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
     
-    header('Location: ' . $backtourl);
+    header('Location: '.$backtourl);
     exit();
 } 
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (!empty($_GET['code']))     // We are coming from oauth provider page
 {
     //llxHeader('',$langs->trans("OAuthSetup"));
 
@@ -127,7 +127,7 @@ 
         
         $token = $apiService->requestAccessToken($_GET['code'], $state);
         
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
     } catch (Exception $e) {
         print $e->getMessage();
     }
@@ -135,12 +135,12 @@ 
     $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
     unset($_SESSION["backtourlsavedbeforeoauthjump"]);
     
-    header('Location: ' . $backtourl);
+    header('Location: '.$backtourl);
     exit();
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+    $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
     
     // This may create record into oauth_state before the header redirect.
     // Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -150,11 +150,11 @@ 
     }
     else
     {
-        $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+        $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
     
     // we go on oauth provider authorization page
-    header('Location: ' . $url);
+    header('Location: '.$url);
     exit();
 }
 

Braces +9 added lines, -6 removed lines

@@ -71,7 +71,10 @@ 
 );
 
 $requestedpermissionsarray=array();
-if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state'));       // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+	$requestedpermissionsarray=explode(',', GETPOST('state'));
+}
+// Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
 if ($action != 'delete' && empty($requestedpermissionsarray))
 {
     print 'Error, parameter state is not defined';
@@ -107,7 +110,8 @@ 
     exit();
 } 
 
-if (! empty($_GET['code']))     // We are coming from oauth provider page
+if (! empty($_GET['code'])) {
+	// We are coming from oauth provider page
 {
     //llxHeader('',$langs->trans("OAuthSetup"));
 
@@ -117,6 +121,7 @@ 
     //dol_fiche_head();
     // retrieve the CSRF state parameter
     $state = isset($_GET['state']) ? $_GET['state'] : null;
+}
     //print '<table>';
 
     // This was a callback request from service, get the token
@@ -137,8 +142,7 @@ 
     
     header('Location: ' . $backtourl);
     exit();
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
     
@@ -147,8 +151,7 @@ 
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
+    } else
     {
         $url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     }