alxarafe / alixar

dolibarr/htdocs/core/modules/modWorkflow.class.php

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    workflow
  *      \brief      File to describe and activate module Workflow
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -43,13 +43,13 @@ 
 
         // Id for module (must be unique).
         // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 6000 ;
+        $this->numero = 6000;
         // Key text used to identify module (for permissions, menus, etc...)
         $this->rights_class = 'workflow';
 
         $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));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Workflow management";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -59,7 +59,7 @@ 
         // Name of png file (without png) used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
         // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array("/workflow/temp");
@@ -68,26 +68,26 @@ 
         $this->config_page_url = array('workflow.php');
 
         // Dependencies
-       $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(2,8);  // Minimum version of Dolibarr required by module
+       $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
         $this->langfiles = array("@workflow");
 
         // Constants
         // List of particular constants to add when module is enabled
         //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0),
         //                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
-        $this->const=array();
+        $this->const = array();
 
         // Boxes
         $this->boxes = array();
 
         // Permissions
         $this->rights = array();
-        $r=0;
+        $r = 0;
 
         /*
         $r++;
@@ -99,8 +99,8 @@ 
         */
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
         /*
         $this->menu[$r]=array('fk_menu'=>0,
                                 'type'=>'top',
@@ -139,13 +139,13 @@ 
      *      @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();
 
-        return $this->_init($sql,$options);
+        return $this->_init($sql, $options);
     }
 }

dolibarr/htdocs/core/modules/cheque/doc/pdf_blochet.class.php

Spacing +118 added lines, -118 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Load traductions files requiredby by page
 		$langs->loadLangs(array("main", "bills"));
@@ -59,23 +59,23 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
         // Recupere emmetteur
-        $this->emetteur=$mysoc;
-        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+        $this->emetteur = $mysoc;
+        if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
         // Defini position des colonnes
         $this->line_height = 5;
 		$this->line_per_page = 40;
-		$this->tab_height = 200;	//$this->line_height * $this->line_per_page;
+		$this->tab_height = 200; //$this->line_height * $this->line_per_page;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -91,49 +91,49 @@ 
 	function write_file($object, $_dir, $number, $outputlangs)
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$hookmanager;
+		global $user, $conf, $langs, $hookmanager;
 
-        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
-        $sav_charset_output=$outputlangs->charset_output;
-        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        $sav_charset_output = $outputlangs->charset_output;
+        if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
         // Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
-		$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
+		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
-			$result=dol_mkdir($dir);
+			$result = dol_mkdir($dir);
 
 			if ($result < 0)
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}
 
-		$file = $dir . "/bordereau-".$number.".pdf";
+		$file = $dir."/bordereau-".$number.".pdf";
 
 		// Add pdfgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file, 'outputlangs'=>$outputlangs);
+		$parameters = array('file'=>$file, 'outputlangs'=>$outputlangs);
 		global $action;
-		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 		// Create PDF instance
-        $pdf=pdf_getInstance($this->format);
-        $heightforinfotot = 50;	// Height reserved to output the info and total part
-        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-        $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
-        $pdf->SetAutoPageBreak(1,0);
+        $pdf = pdf_getInstance($this->format);
+        $heightforinfotot = 50; // Height reserved to output the info and total part
+        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+        $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+        $pdf->SetAutoPageBreak(1, 0);
 
         if (class_exists('TCPDF'))
         {
@@ -143,23 +143,23 @@ 
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 		$pdf->Open();
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 		$pdf->SetTitle($outputlangs->transnoentities("CheckReceipt")." ".$number);
 		$pdf->SetSubject($outputlangs->transnoentities("CheckReceipt"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-		$nboflines=count($this->lines);
+		$nboflines = count($this->lines);
 
 		// Define nb of page
 		$pages = intval($nboflines / $this->line_per_page);
-		if (($nboflines % $this->line_per_page)>0)
+		if (($nboflines % $this->line_per_page) > 0)
 		{
 			$pages++;
 		}
@@ -176,31 +176,31 @@ 
 		$this->Body($pdf, $pagenb, $pages, $outputlangs);
 
 		// Pied de page
-		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+		$this->_pagefoot($pdf, '', $outputlangs);
+		if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 		$pdf->Close();
 
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 
 		// Add pdfgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('pdfgeneration'));
-		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 		global $action;
-		$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		$this->result = array('fullpath'=>$file);
 
-        $outputlangs->charset_output=$sav_charset_output;
-	    return 1;   // Pas d'erreur
+        $outputlangs->charset_output = $sav_charset_output;
+	    return 1; // Pas d'erreur
 	}
 
 
@@ -224,38 +224,38 @@ 
 		$outputlangs->loadLangs(array("compta", "banks"));
 
 		$title = $outputlangs->transnoentities("CheckReceipt");
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(10,8);
-        $pdf->MultiCell(0,2,$title,0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,15);
-		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
-        $pdf->SetXY(32,15);
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,20);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
-        $pdf->SetXY(32,20);
-        $pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,26);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(32,26);
-        $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,32);
-        $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
-        pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(114,15);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(10, 8);
+        $pdf->MultiCell(0, 2, $title, 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 15);
+		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Ref"), 0, 'L');
+        $pdf->SetXY(32, 15);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext ? " - ".$this->ref_ext : '')), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 20);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Date"), 0, 'L');
+        $pdf->SetXY(32, 20);
+        $pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, dol_print_date($this->date, "day", false, $outputlangs));
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 26);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(32, 26);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 32);
+        $pdf->MultiCell(0, 2, $outputlangs->transnoentities("Account"), 0, 'L');
+        pdf_bank($pdf, $outputlangs, 32, 32, $this->account, 1);
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(114, 15);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
         $pdf->Rect(9, 14, 192, 35);
@@ -268,44 +268,44 @@ 
         $pdf->line(112, 14, 112, 49);
 
 		// Number of cheques
-		$posy=51;
+		$posy = 51;
 		$pdf->Rect(9, $posy, 192, 6);
-		$pdf->line(55, $posy, 55, $posy+6);
-		$pdf->line(140, $posy, 140, $posy+6);
-		$pdf->line(170, $posy, 170, $posy+6);
+		$pdf->line(55, $posy, 55, $posy + 6);
+		$pdf->line(140, $posy, 140, $posy + 6);
+		$pdf->line(170, $posy, 170, $posy + 6);
 
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY(10,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY(10, $posy + 1);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(57,$posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(57, $posy + 1);
         $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(148,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(148, $posy + 1);
 		$pdf->MultiCell(40, 2, $langs->trans("Total"));
 
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->SetXY(170, $posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+		$pdf->SetXY(170, $posy + 1);
 		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
 
 		// Tableau
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetXY(11, $this->tab_top+2);
-		$pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size - 2);
+		$pdf->SetXY(11, $this->tab_top + 2);
+		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Num"), 0, 'L');
 		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(41, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
+		$pdf->SetXY(41, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Bank"), 0, 'L');
 		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
-        $pdf->SetXY(101, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
+        $pdf->SetXY(101, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
 		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(180, $this->tab_top+2);
-		$pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
+		$pdf->SetXY(180, $this->tab_top + 2);
+		$pdf->MultiCell(20, 2, $outputlangs->transnoentities("Amount"), 0, 'R');
 		$pdf->line(9, $this->tab_top + 8, 201, $this->tab_top + 8);
 
 		$pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
@@ -329,44 +329,44 @@ 
 		// x=30 - Banque
 		// x=100 - Emetteur
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 		$oldprowid = 0;
-		$pdf->SetFillColor(220,220,220);
+		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
-		$lineinpage=0;
-		$num=count($this->lines);
+		$lineinpage = 0;
+		$num = count($this->lines);
 		for ($j = 0; $j < $num; $j++)
 		{
 		    $lineinpage++;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
+			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', 0);
 
 			$pdf->SetXY(10, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'L', 0);
+			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq ? $this->lines[$j]->num_chq : '', 0, 'L', 0);
 
 			$pdf->SetXY(40, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'L', 0);
+			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq), 44), 0, 'L', 0);
 
 			$pdf->SetXY(100, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'L', 0);
+			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq), 50), 0, 'L', 0);
 
 			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
 
 			$yp = $yp + $this->line_height;
 
-			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
+			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines) - 1))
 			{
-			    $lineinpage=0; $yp=0;
+			    $lineinpage = 0; $yp = 0;
 
                 // New page
                 $pdf->AddPage();
                 $pagenb++;
                 $this->Header($pdf, $pagenb, $pages, $outputlangs);
-                $pdf->SetFont('','', $default_font_size - 1);
-                $pdf->MultiCell(0, 3, '');      // Set interline to 3
-                $pdf->SetTextColor(0,0,0);
+                $pdf->SetFont('', '', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, ''); // Set interline to 3
+                $pdf->SetTextColor(0, 0, 0);
 			}
 		}
 	}
@@ -381,21 +381,21 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 
 		// Line of free text
-		$newfreetext='';
-		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
-		if (! empty($conf->global->$paramfreetext))
+		$newfreetext = '';
+		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
+		if (!empty($conf->global->$paramfreetext))
 		{
-		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+		    $newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 		}
 
-		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, $newfreetext, $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

dolibarr/htdocs/core/modules/cheque/mod_chequereceipt_mint.php

Spacing +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Mint
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 /**
  *	Class to manage cheque receipts numbering rules Mint
@@ -33,16 +33,16 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix='CHK';
+	public $prefix = 'CHK';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	public $name='Mint';
+	public $name = 'Mint';
 
 
     /**
@@ -53,7 +53,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -76,26 +76,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$payyymm=''; $max='';
+		$payyymm = ''; $max = '';
 
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($payyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$payyymm))
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -109,23 +109,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=9;
+		$posindice = 9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
+		$sql .= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -134,11 +134,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->date_bordereau;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->date_bordereau;
+		$yymm = strftime("%y%m", $date);
 
-    	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    	else $num = sprintf("%04s",$max+1);
+    	if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    	else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -153,9 +153,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function chequereceipt_get_num($objsoc,$objforref)
+	function chequereceipt_get_num($objsoc, $objforref)
 	{
         // phpcs:enable
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 }

dolibarr/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php

Spacing +34 added lines, -34 removed lines

@@ -22,7 +22,7 @@ 
  * \brief      File containing class for numbering module Thyme
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 
 
 /**
@@ -34,7 +34,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';		// 'development', 'experimental', 'dolibarr'
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
 	 * @var string Error message
@@ -58,28 +58,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("CheckReceiptShort"),$langs->transnoentities("CheckReceiptShort"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstchequereceipts" value="CHEQUERECEIPTS_THYME_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CheckReceiptShort"), $langs->transnoentities("CheckReceiptShort"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -91,14 +91,14 @@ 
      */
     function getExample()
     {
-     	global $conf,$langs,$mysoc;
+     	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-     	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+     	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -112,22 +112,22 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-    function getNextValue($objsoc,$object)
+    function getNextValue($objsoc, $object)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->CHEQUERECEIPTS_THYME_MASK;
+		$mask = $conf->global->CHEQUERECEIPTS_THYME_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'bordereau_cheque','ref','',$objsoc,$object->date_bordereau);
+		$numFinal = get_next_value($db, $mask, 'bordereau_cheque', 'ref', '', $objsoc, $object->date_bordereau);
 
 		return  $numFinal;
 	}
@@ -141,9 +141,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
      */
-    function chequereceipt_get_num($objsoc,$objforref)
+    function chequereceipt_get_num($objsoc, $objforref)
     {
         // phpcs:enable
-        return $this->getNextValue($objsoc,$objforref);
+        return $this->getNextValue($objsoc, $objforref);
     }
 }

dolibarr/htdocs/core/modules/cheque/modules_chequereceipts.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';   // Requis car utilise dans les classes qui heritent
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent
 
 /**
  *  \class      ModeleNumRefChequeReceipts
@@ -39,7 +39,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Return if a module can be used or not
@@ -92,7 +92,7 @@ 
 	 *	@param	Object		$object		Object we need next value for
 	 *	@return	string      Valeur
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -125,7 +125,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
@@ -135,16 +135,16 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
 	 */
-	static function liste_modeles($db,$maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;
 
-		$type='chequereceipt';
-		$liste=array();
+		$type = 'chequereceipt';
+		$liste = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste=getListOfModels($db,$type,$maxfilenamelength);
+		$liste = getListOfModels($db, $type, $maxfilenamelength);
 		// TODO Remove this to use getListOfModels only
 		$liste = array('blochet'=>'blochet');
 
@@ -166,15 +166,15 @@ 
  */
 function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 	$langs->load("bills");
 
-	$dir = DOL_DOCUMENT_ROOT . "/core/modules/cheque/doc/";
+	$dir = DOL_DOCUMENT_ROOT."/core/modules/cheque/doc/";
 
 	// Positionne modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
+	if (!dol_strlen($modele))
 	{
-		if (! empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
+		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
 		}
@@ -197,22 +197,22 @@ 
 
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
+		$sav_charset_output = $outputlangs->charset_output;
 		if ($obj->write_file($id, $outputlangs) > 0)
 		{
-			$outputlangs->charset_output=$sav_charset_output;
+			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		}
 		else
 		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"chequereceipt_pdf_create Error: ".$obj->error);
+			$outputlangs->charset_output = $sav_charset_output;
+			dol_print_error($db, "chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
 	}
 	else
 	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.$file));
+		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $dir.$file));
 		return -1;
 	}
 }

dolibarr/htdocs/core/modules/modPrinting.class.php

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    printing
  *  \brief      File of class to describe and activate module Direct Printing
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 
@@ -42,17 +42,17 @@ 
      */
     function __construct($db)
     {
-        $this->db = $db ;
+        $this->db = $db;
         $this->numero = 64000;
         // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
         // It is used to group modules in module setup page
         $this->family = "interface";
         $this->module_position = '52';
         // 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));
         // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Enable Direct Printing System.";
-        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'dolibarr'; // 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
         // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
@@ -66,12 +66,12 @@ 
         $this->config_page_url = array("printing.php@printing");
 
         // Dependencies
-        $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("printing");
 
@@ -85,7 +85,7 @@ 
         $this->rights = array();
         $this->rights_class = 'printing';
 
-        $r=0;
+        $r = 0;
         // $this->rights[$r][0]     Id permission (unique tous modules confondus)
         // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
         // $this->rights[$r][2]     Non utilise
@@ -101,20 +101,20 @@ 
         $this->rights[$r][4] = 'read';
 
         // Main menu entries
-        $this->menus = array();         // List of menus to add
-        $r=0;
+        $this->menus = array(); // List of menus to add
+        $r = 0;
 
         // This is to declare the Top Menu entry:
-        $this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',               // Put 0 if this is a top menu
-                                'type'=>'left',                 // This is a Top menu entry
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Put 0 if this is a top menu
+                                'type'=>'left', // This is a Top menu entry
                                 'titre'=>'MenuDirectPrinting',
                                 'url'=>'/printing/index.php?mainmenu=home&leftmenu=admintools',
-                                'langs'=>'printing',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                                'langs'=>'printing', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
                                 'position'=>300,
                                 'enabled'=>'$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',
-                                'perms'=>'$user->rights->printing->read',    // Use 'perms'=>'1' if you want your menu with no permission rules
+                                'perms'=>'$user->rights->printing->read', // Use 'perms'=>'1' if you want your menu with no 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++;
     }

dolibarr/htdocs/core/modules/modMailing.class.php

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      Fichier de description et activation du module Mailing
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,22 +51,22 @@ 
 		$this->module_position = '11';
 
 		// 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 EMailings";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/mailing/temp");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->langfiles = array("mails");
 
 		// Config pages
@@ -81,7 +81,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'mailing';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 221; // id de la permission
@@ -116,7 +116,7 @@ 
 		$this->rights[$r][1] = 'View recipients and info';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'recipient';
 
 		$r++;
@@ -124,7 +124,7 @@ 
 		$this->rights[$r][1] = 'Manually send mailings';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'send';
 
 		$r++;
@@ -132,12 +132,12 @@ 
 		$this->rights[$r][1] = 'Delete mailings after validation and/or sent';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'mailing_advance';		// Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'mailing_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'delete';
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 
 
@@ -149,13 +149,13 @@ 
      *      @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();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

dolibarr/htdocs/core/modules/modDeplacement.class.php

Spacing +29 added lines, -29 removed lines

@@ -23,7 +23,7 @@ 
  *	\ingroup    deplacement
  *	\brief      Fichier de description et activation du module Deplacement et notes de frais
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -42,13 +42,13 @@ 
 		global $conf, $user;
 
 		$this->db = $db;
-		$this->numero = 75 ;
+		$this->numero = 75;
 
 		$this->family = "hr";
 		$this->module_position = '41';
 		// 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->description = "Gestion des notes de frais et deplacements";		// Si traduction Module75Desc non trouvee
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Gestion des notes de frais et deplacements"; // Si traduction Module75Desc non trouvee
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
 		$this->version = 'dolibarr_deprecated';
@@ -61,7 +61,7 @@ 
 
 		// Config pages
 		$this->config_page_url = array();
-		$this->langfiles = array("companies","trips");
+		$this->langfiles = array("companies", "trips");
 
 		// Dependancies
 		$this->depends = array();
@@ -110,36 +110,36 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]='trips_'.$r;
-		$this->export_label[$r]='ListTripsAndExpenses';
-		$this->export_permission[$r]=array(array("deplacement","export"));
-        $this->export_fields_array[$r]=array('u.login'=>'Login','u.lastname'=>'Lastname','u.firstname'=>'Firstname','d.rowid'=>"TripId",'d.type'=>"Type",'d.km'=>"FeesKilometersOrAmout",'d.dated'=>"Date",'d.note_private'=>'NotePrivate','d.note_public'=>'NotePublic','s.nom'=>'ThirdParty');
-        $this->export_TypeFields_array[$r]=array('u.rowid'=>'List:user:name','u.login'=>'Text','u.lastname'=>'Text','u.firstname'=>'Text','d.type'=>"Text",'d.km'=>"Numeric",'d.dated'=>"Date",'d.note_private'=>'Text','d.note_public'=>'Text','s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text');
-        $this->export_entities_array[$r]=array('u.login'=>'user','u.lastname'=>'user','u.firstname'=>'user','d.rowid'=>"trip",'d.type'=>"trip",'d.km'=>"trip",'d.dated'=>"trip",'d.note_private'=>'trip','d.note_public'=>'trip','s.nom'=>'company');
-        $this->export_dependencies_array[$r]=array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'deplacement as d';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' WHERE d.fk_user = u.rowid';
-		$this->export_sql_end[$r] .=' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR d.fk_soc IS NULL)';
-
-		if (! empty($user))   // Not defined during migration process
+		$this->export_code[$r] = 'trips_'.$r;
+		$this->export_label[$r] = 'ListTripsAndExpenses';
+		$this->export_permission[$r] = array(array("deplacement", "export"));
+        $this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
+        $this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
+        $this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
+        $this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ', '.MAIN_DB_PREFIX.'deplacement as d';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' WHERE d.fk_user = u.rowid';
+		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('deplacement').')';
+		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR d.fk_soc IS NULL)';
+
+		if (!empty($user))   // Not defined during migration process
 		{
     		$childids = $user->getAllChildIds();
-    		$childids[]=$user->id;
+    		$childids[] = $user->id;
 
-    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
+    		if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
 		}
 	}
 
@@ -152,13 +152,13 @@ 
      *      @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();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

dolibarr/htdocs/core/modules/modOpenSurvey.class.php

Spacing +35 added lines, -35 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    opensurvey
  *      \brief      Description and activation file for module OpenSurvey
  */
-include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 
 /**
@@ -39,7 +39,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$this->db = $db;
 
@@ -54,7 +54,7 @@ 
 		$this->family = "portal";
 		$this->module_position = '40';
 		// 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));
 		// Module description used if translation string 'ModuleXXXDesc' not found (XXX is value MyModule)
 		$this->description = "Module to make online surveys (like Doodle, Studs, Rdvz, ...)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -64,7 +64,7 @@ 
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='opensurvey.png@opensurvey';
+		$this->picto = 'opensurvey.png@opensurvey';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
@@ -72,22 +72,22 @@ 
 		//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,4,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 4, 0); // Minimum version of Dolibarr required by module
 
 		// Constants
-		$this->const = array();			// List of parameters
+		$this->const = array(); // List of parameters
 
 		// Dictionaries
-        $this->dictionaries=array();
+        $this->dictionaries = array();
 
 		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+		$this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Add here list of php file(s) stored in includes/boxes that contains class to show a box.
 		// Example:
@@ -97,32 +97,32 @@ 
 		//$r++;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read surveys';	// Permission label
-		$this->rights[$r][2] = 'r'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 55001; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read surveys'; // Permission label
+		$this->rights[$r][2] = 'r'; // Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		$this->rights[$r][0] = 55002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/modify surveys';	// Permission label
-		$this->rights[$r][2] = 'w'; 					// Permission by default for new user (0/1)
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][0] = 55002; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify surveys'; // Permission label
+		$this->rights[$r][2] = 'w'; // Permission by default for new user (0/1)
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 
 		// Menus
 		//-------
-        $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
 								'type'=>'left',
 								'titre'=>'Survey',
 								'mainmenu'=>'tools',
@@ -130,13 +130,13 @@ 
 								'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
 								'langs'=>'opensurvey',
 								'position'=>200,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->read',
 								'target'=>'',
 								'user'=>0);
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',
 								'titre'=>'NewSurvey',
 								'mainmenu'=>'tools',
@@ -144,13 +144,13 @@ 
 								'url'=>'/opensurvey/wizard/index.php',
 								'langs'=>'opensurvey',
 								'position'=>210,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->write',
 								'target'=>'',
 								'user'=>0);
 		$r++;
 
-		$this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=opensurvey', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',
 								'titre'=>'List',
 								'mainmenu'=>'tools',
@@ -158,7 +158,7 @@ 
 								'url'=>'/opensurvey/list.php',
 								'langs'=>'opensurvey',
 								'position'=>220,
-                				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
+                				'enabled'=>'$conf->opensurvey->enabled', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
 								'perms'=>'$user->rights->opensurvey->read',
 								'target'=>'',
 								'user'=>0);
@@ -173,14 +173,14 @@ 
      *  @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();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }