alxarafe / alixar

dolibarr/htdocs/societe/canvas/company/tpl/card_view.tpl.php

Indentation +21 added lines, -21 removed lines

@@ -18,8 +18,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -121,22 +121,22 @@ 
 
 <?php
 for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
-		echo '<td>'.$this->control->tpl['profid'.$i];
-		if ($this->control->tpl['profid'.$i]) {
-			if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
-			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
-		}
-		echo '</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	} else {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>&nbsp;</td>';
-		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	}
+    if ($this->control->tpl['langprofid'.$i]!='-')	{
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
+        echo '<td>'.$this->control->tpl['profid'.$i];
+        if ($this->control->tpl['profid'.$i]) {
+            if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
+            else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+        }
+        echo '</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    } else {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>&nbsp;</td>';
+        echo '<td>&nbsp;</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    }
 }
 ?>
 
@@ -153,9 +153,9 @@ 
 	<td><?php echo $langs->trans('Capital'); ?></td>
 	<td colspan="3">
 	<?php
-	if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
-	else echo '&nbsp;';
-	?>
+    if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
+    else echo '&nbsp;';
+    ?>
 	</td>
 </tr>
 

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -32,7 +32,7 @@ 
 
 $head = societe_prepare_head($soc);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -47,7 +47,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -76,7 +76,7 @@ 
 </tr>
 <?php } ?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
@@ -120,9 +120,9 @@ 
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['profid'.$i];
 		if ($this->control->tpl['profid'.$i]) {
@@ -130,12 +130,12 @@ 
 			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
 		}
 		echo '</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	}
 }
 ?>
@@ -147,7 +147,7 @@ 
 	<td><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <tr>
 	<td><?php echo $langs->trans('Capital'); ?></td>
@@ -171,7 +171,7 @@ 
 	<td><?php echo $this->control->tpl['effectif']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['default_lang']; ?></td>
@@ -225,10 +225,10 @@ 
 		</tr>
 	</table>
 	</td>
-	<td colspan="3"><?php echo $this->control->tpl['sales_representatives'];	?></td>
+	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (! empty($conf->adherent->enabled)) { ?>
+<?php if (!empty($conf->adherent->enabled)) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
@@ -247,7 +247,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
@@ -262,12 +262,12 @@ 
 /*
  * Documents generes
  */
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
 
-print $formfile->showdocuments('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
 ?>
 
 </td>
@@ -279,13 +279,13 @@ 
 
 <?php
 // Subsidiaries list
-$result=show_subsidiaries($conf,$langs,$db,$soc);
+$result = show_subsidiaries($conf, $langs, $db, $soc);
 
 // Contacts list
-$result=show_contacts($conf,$langs,$db,$soc);
+$result = show_contacts($conf, $langs, $db, $soc);
 
 // Projects list
-$result=show_projects($conf,$langs,$db,$soc);
+$result = show_projects($conf, $langs, $db, $soc);
 ?>
 
 <!-- END PHP TEMPLATE -->
\ No newline at end of file

Braces +39 added lines, -13 removed lines

@@ -36,9 +36,18 @@ 
 
 ?>
 
-<?php if ($this->control->tpl['error']) echo $this->control->tpl['error']; ?>
-<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['error']) {
+    echo $this->control->tpl['error'];
+}
+?>
+<?php if ($this->control->tpl['action_delete']) {
+    echo $this->control->tpl['action_delete'];
+}
+?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+    echo $this->control->tpl['js_checkVatPopup'];
+}
+?>
 
 <table class="border allwidth">
 
@@ -122,20 +131,31 @@ 
 <?php
 for ($i=1; $i<=4; $i++) {
 	if ($this->control->tpl['langprofid'.$i]!='-')	{
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['profid'.$i];
 		if ($this->control->tpl['profid'.$i]) {
-			if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
-			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+			if ($this->control->tpl['checkprofid'.$i] > 0) {
+			    echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
+			} else {
+			    echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+			}
 		}
 		echo '</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	}
 }
 ?>
@@ -147,14 +167,20 @@ 
 	<td><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 <tr>
 	<td><?php echo $langs->trans('Capital'); ?></td>
 	<td colspan="3">
 	<?php
-	if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
-	else echo '&nbsp;';
+	if ($this->control->tpl['capital']) {
+	    echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
+	} else {
+	    echo '&nbsp;';
+	}
 	?>
 	</td>
 </tr>
@@ -247,7 +273,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>

dolibarr/htdocs/societe/canvas/company/tpl/card_edit.tpl.php

Indentation +14 added lines, -14 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 
@@ -111,7 +111,7 @@ 
 
 <?php
 if ($this->control->tpl['fournisseur']) {
-	if (count($this->control->tpl['suppliercategory']) > 0) { ?>
+    if (count($this->control->tpl['suppliercategory']) > 0) { ?>
 <tr>
 	<td><?php echo $langs->trans('SupplierCategory'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
@@ -163,17 +163,17 @@ 
 
 <?php
 for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
-		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	} else {
-		if ($i==1 || $i==3) echo '<tr>';
-		echo '<td>&nbsp;</td>';
-		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
-	}
+    if ($this->control->tpl['langprofid'.$i]!='-') {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
+        echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    } else {
+        if ($i==1 || $i==3) echo '<tr>';
+        echo '<td>&nbsp;</td>';
+        echo '<td>&nbsp;</td>';
+        if ($i==2 || $i==4) echo '</tr>';
+    }
 }
 ?>
 

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -53,7 +53,7 @@ 
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
@@ -118,7 +118,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -155,24 +155,24 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
 <?php
-for ($i=1; $i<=4; $i++) {
-	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+for ($i = 1; $i <= 4; $i++) {
+	if ($this->control->tpl['langprofid'.$i] != '-') {
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i == 1 || $i == 3) echo '<tr>';
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i == 2 || $i == 4) echo '</tr>';
 	}
 }
 ?>
@@ -201,14 +201,14 @@ 
 	<td><?php echo $this->control->tpl['select_workforce']; echo $this->control->tpl['info_admin']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
 </tr>
 <?php } ?>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 </table>
 <br>

Braces +20 added lines, -6 removed lines

@@ -35,7 +35,10 @@ 
 <?php echo $this->control->tpl['error']; ?>
 
 <?php echo $this->control->tpl['ajax_selectcountry']; ?>
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+    echo $this->control->tpl['js_checkVatPopup'];
+}
+?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@@ -164,15 +167,23 @@ 
 <?php
 for ($i=1; $i<=4; $i++) {
 	if ($this->control->tpl['langprofid'.$i]!='-') {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	} else {
-		if ($i==1 || $i==3) echo '<tr>';
+		if ($i==1 || $i==3) {
+		    echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i==2 || $i==4) echo '</tr>';
+		if ($i==2 || $i==4) {
+		    echo '</tr>';
+		}
 	}
 }
 ?>
@@ -208,7 +219,10 @@ 
 </tr>
 <?php } ?>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 </table>
 <br>

dolibarr/htdocs/societe/canvas/company/actions_card_company.class.php

Indentation +151 added lines, -151 removed lines

@@ -29,23 +29,23 @@ 
  */
 class ActionsCardCompany extends ActionsCardCommon
 {
-	/**
-	 *    Constructor
-	 *
+    /**
+     *    Constructor
+     *
      *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
-	 */
-	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-	{
+     */
+    function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+    {
         $this->db				= $db;
         $this->dirmodule		= $dirmodule;
         $this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
         $this->card				= $card;
-	}
+    }
 
     /**
      *  Return the title of card
@@ -68,155 +68,155 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
-	 */
-	function assign_values(&$action, $id=0, $ref='')
-	{
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
+     */
+    function assign_values(&$action, $id=0, $ref='')
+    {
         // phpcs:enable
-		global $conf, $langs, $user, $mysoc;
-		global $form, $formadmin, $formcompany;
+        global $conf, $langs, $user, $mysoc;
+        global $form, $formadmin, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+        $ret = $this->getObject($id,$ref);
 
-		parent::assign_values($action);
+        parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
         $this->tpl['profid1'] 	= $this->object->idprof1;
-		$this->tpl['profid2'] 	= $this->object->idprof2;
-		$this->tpl['profid3'] 	= $this->object->idprof3;
-		$this->tpl['profid4'] 	= $this->object->idprof4;
-
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
-		{
-			$js = "\n";
-	        $js.= '<script language="JavaScript" type="text/javascript">';
-	        $js.= "function CheckVAT(a) {\n";
-	        $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js.= "}\n";
-	        $js.= '</script>';
-	        $js.= "\n";
-			$this->tpl['js_checkVatPopup'] = $js;
-		}
-
-		if ($action == 'create' || $action == 'edit')
-		{
-			for ($i=1; $i<=4; $i++)
-			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
-			}
-
-			// Type
-			$this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
-
-			// Juridical Status
-			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
-
-			// Workforce
-			$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
-
-			// VAT intra
-			$s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-			if (empty($conf->global->MAIN_DISABLEVATCHECK))
-			{
-				$s.=' ';
-
-				if ($conf->use_javascript_ajax)
-				{
-					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-				}
-				else
-				{
-					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-				}
-			}
-			else
-			{
-				$this->tpl['tva_intra'] = $s;
-			}
-		}
-		else
-		{
-			// Confirm delete third party
-			if ($action == 'delete')
-			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
-			}
-
-			for ($i=1; $i<=4; $i++)
-			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
-				$this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
-			}
-
-			// TVA intra
-			if ($this->object->tva_intra)
-			{
-				$s=$this->object->tva_intra;
-				$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-				if (empty($conf->global->MAIN_DISABLEVATCHECK))
-				{
-					$s.=' &nbsp; ';
-
-					if ($conf->use_javascript_ajax)
-					{
-						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-					}
-					else
-					{
-						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
-					}
-				}
-				else
-				{
-					$this->tpl['tva_intra'] = $s;
-				}
-			}
-			else
-			{
-				$this->tpl['tva_intra'] = '&nbsp;';
-			}
-
-			// Parent company
-			if ($this->object->parent)
-			{
-				$socm = new Societe($this->db);
-				$socm->fetch($this->object->parent);
-				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
-				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
-			}
-			else
-			{
-				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
-			}
-		}
-	}
-
-	/**
-	 * 	Check permissions of a user to show a page and an object. Check read permission
-	 * 	If $_REQUEST['action'] defined, we also check write permission.
-	 *
-	 * 	@param      User	$user      	  	User to check
-	 * 	@param      string	$features	    Features to check (in most cases, it's module name)
-	 * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
-	 *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
-	 *  @param      string	$feature2		Feature to check (second level of permission)
-	 *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
-	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
-	 *  @return		int						1
-	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
-	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
-	}
+        $this->tpl['profid2'] 	= $this->object->idprof2;
+        $this->tpl['profid3'] 	= $this->object->idprof3;
+        $this->tpl['profid4'] 	= $this->object->idprof4;
+
+        if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
+        {
+            $js = "\n";
+            $js.= '<script language="JavaScript" type="text/javascript">';
+            $js.= "function CheckVAT(a) {\n";
+            $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+            $js.= "}\n";
+            $js.= '</script>';
+            $js.= "\n";
+            $this->tpl['js_checkVatPopup'] = $js;
+        }
+
+        if ($action == 'create' || $action == 'edit')
+        {
+            for ($i=1; $i<=4; $i++)
+            {
+                $this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
+                $this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
+            }
+
+            // Type
+            $this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
+
+            // Juridical Status
+            $this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
+
+            // Workforce
+            $this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
+
+            // VAT intra
+            $s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+            if (empty($conf->global->MAIN_DISABLEVATCHECK))
+            {
+                $s.=' ';
+
+                if ($conf->use_javascript_ajax)
+                {
+                    $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                    $this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                }
+                else
+                {
+                    $this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                }
+            }
+            else
+            {
+                $this->tpl['tva_intra'] = $s;
+            }
+        }
+        else
+        {
+            // Confirm delete third party
+            if ($action == 'delete')
+            {
+                $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+            }
+
+            for ($i=1; $i<=4; $i++)
+            {
+                $this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
+                $this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
+                $this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
+            }
+
+            // TVA intra
+            if ($this->object->tva_intra)
+            {
+                $s=$this->object->tva_intra;
+                $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+                if (empty($conf->global->MAIN_DISABLEVATCHECK))
+                {
+                    $s.=' &nbsp; ';
+
+                    if ($conf->use_javascript_ajax)
+                    {
+                        $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                        $this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+                    }
+                    else
+                    {
+                        $this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+                    }
+                }
+                else
+                {
+                    $this->tpl['tva_intra'] = $s;
+                }
+            }
+            else
+            {
+                $this->tpl['tva_intra'] = '&nbsp;';
+            }
+
+            // Parent company
+            if ($this->object->parent)
+            {
+                $socm = new Societe($this->db);
+                $socm->fetch($this->object->parent);
+                $this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
+                $this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
+            }
+            else
+            {
+                $this->tpl['parent_company'] = $langs->trans("NoParentCompany");
+            }
+        }
+    }
+
+    /**
+     * 	Check permissions of a user to show a page and an object. Check read permission
+     * 	If $_REQUEST['action'] defined, we also check write permission.
+     *
+     * 	@param      User	$user      	  	User to check
+     * 	@param      string	$features	    Features to check (in most cases, it's module name)
+     * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
+     *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
+     *  @param      string	$feature2		Feature to check (second level of permission)
+     *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
+     *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
+     *  @return		int						1
+     */
+    function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+    {
+        return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+    }
 }

Spacing +44 added lines, -44 removed lines

@@ -40,11 +40,11 @@ 
 	 */
 	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db				= $db;
-        $this->dirmodule		= $dirmodule;
-        $this->targetmodule		= $targetmodule;
-        $this->canvas			= $canvas;
-        $this->card				= $card;
+        $this->db = $db;
+        $this->dirmodule = $dirmodule;
+        $this->targetmodule = $targetmodule;
+        $this->canvas = $canvas;
+        $this->card = $card;
 	}
 
     /**
@@ -57,11 +57,11 @@ 
     {
         global $langs;
 
-        $out='';
+        $out = '';
 
-        if ($action == 'view')      $out.= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view')      $out .= $langs->trans("ThirdParty");
+        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+        if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
         return $out;
     }
@@ -76,19 +76,19 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-	function assign_values(&$action, $id=0, $ref='')
+	function assign_values(&$action, $id = 0, $ref = '')
 	{
         // phpcs:enable
 		global $conf, $langs, $user, $mysoc;
 		global $form, $formadmin, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+		$ret = $this->getObject($id, $ref);
 
 		parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-        $this->tpl['profid1'] 	= $this->object->idprof1;
+        $this->tpl['profid1'] = $this->object->idprof1;
 		$this->tpl['profid2'] 	= $this->object->idprof2;
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
@@ -96,46 +96,46 @@ 
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
 		{
 			$js = "\n";
-	        $js.= '<script language="JavaScript" type="text/javascript">';
-	        $js.= "function CheckVAT(a) {\n";
-	        $js.= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
-	        $js.= "}\n";
-	        $js.= '</script>';
-	        $js.= "\n";
+	        $js .= '<script language="JavaScript" type="text/javascript">';
+	        $js .= "function CheckVAT(a) {\n";
+	        $js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
+	        $js .= "}\n";
+	        $js .= '</script>';
+	        $js .= "\n";
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
 		if ($action == 'create' || $action == 'edit')
 		{
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i,'idprof'.$i,$this->tpl['profid'.$i],$this->object->country_code);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i, 'idprof'.$i, $this->tpl['profid'.$i], $this->object->country_code);
 			}
 
 			// Type
-			$this->tpl['select_companytype']	= $form->selectarray("typent_id",$formcompany->typent_array(0), $this->object->typent_id);
+			$this->tpl['select_companytype'] = $form->selectarray("typent_id", $formcompany->typent_array(0), $this->object->typent_id);
 
 			// Juridical Status
-			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code,$this->object->country_code);
+			$this->tpl['select_juridicalstatus'] = $formcompany->select_juridicalstatus($this->object->forme_juridique_code, $this->object->country_code);
 
 			// Workforce
-			$this->tpl['select_workforce'] = $form->selectarray("effectif_id",$formcompany->effectif_array(0), $this->object->effectif_id);
+			$this->tpl['select_workforce'] = $form->selectarray("effectif_id", $formcompany->effectif_array(0), $this->object->effectif_id);
 
 			// VAT intra
-			$s='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+			$s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 			if (empty($conf->global->MAIN_DISABLEVATCHECK))
 			{
-				$s.=' ';
+				$s .= ' ';
 
 				if ($conf->use_javascript_ajax)
 				{
-					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 				}
 				else
 				{
-					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
 			else
@@ -148,33 +148,33 @@ 
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"1,action-delete");
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "1,action-delete");
 			}
 
-			for ($i=1; $i<=4; $i++)
+			for ($i = 1; $i <= 4; $i++)
 			{
-				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i,$this->object->country_code);
-				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i,$this->object);
-				$this->tpl['urlprofid'.$i]		= $this->object->id_prof_url($i,$this->object);
+				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
+				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i, $this->object);
+				$this->tpl['urlprofid'.$i] = $this->object->id_prof_url($i, $this->object);
 			}
 
 			// TVA intra
 			if ($this->object->tva_intra)
 			{
-				$s=$this->object->tva_intra;
-				$s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
+				$s = $this->object->tva_intra;
+				$s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
 				if (empty($conf->global->MAIN_DISABLEVATCHECK))
 				{
-					$s.=' &nbsp; ';
+					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax)
 					{
-						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
-						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
+						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
 					}
 					else
 					{
-						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
 				}
 				else
@@ -192,8 +192,8 @@ 
 			{
 				$socm = new Societe($this->db);
 				$socm->fetch($this->object->parent);
-				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
-				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
+				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
+				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
 			}
 			else
 			{
@@ -215,8 +215,8 @@ 
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+	function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
 	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
 	}
 }

Braces +16 added lines, -17 removed lines

@@ -59,9 +59,15 @@ 
 
         $out='';
 
-        if ($action == 'view')      $out.= $langs->trans("ThirdParty");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view') {
+            $out.= $langs->trans("ThirdParty");
+        }
+        if ($action == 'edit') {
+            $out.= $langs->trans("EditCompany");
+        }
+        if ($action == 'create') {
+            $out.= $langs->trans("NewCompany");
+        }
 
         return $out;
     }
@@ -132,18 +138,15 @@ 
 				{
 					$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] =  $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-				}
-				else
+				} else
 				{
 					$this->tpl['tva_intra'] =  $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 				}
-			}
-			else
+			} else
 			{
 				$this->tpl['tva_intra'] = $s;
 			}
-		}
-		else
+		} else
 		{
 			// Confirm delete third party
 			if ($action == 'delete')
@@ -171,18 +174,15 @@ 
 					{
 						$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
-					}
-					else
+					} else
 					{
 						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 					}
-				}
-				else
+				} else
 				{
 					$this->tpl['tva_intra'] = $s;
 				}
-			}
-			else
+			} else
 			{
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
@@ -194,8 +194,7 @@ 
 				$socm->fetch($this->object->parent);
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client?"(".$socm->code_client.")":"");
 				$this->tpl['parent_company'].= ($socm->town ? ' - ' . $socm->town : '');
-			}
-			else
+			} else
 			{
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}

dolibarr/htdocs/societe/canvas/actions_card_common.class.php

Indentation +70 added lines, -70 removed lines

@@ -37,47 +37,47 @@ 
     var $canvas;
     var $card;
 
-	//! Template container
-	var $tpl = array();
-	//! Object container
-	var $object;
+    //! Template container
+    var $tpl = array();
+    //! Object container
+    var $object;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
 
-	/**
+    /**
      *  Get object from id or ref and save it into this->object
-	 *
+     *
      *  @param		int		$id			Object id
      *  @param		ref		$ref		Object ref
      *  @return		object				Object loaded
      */
     protected function getObject($id,$ref='')
     {
-    	//$ret = $this->getInstanceDao();
+        //$ret = $this->getInstanceDao();
 
-    	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
-    	$this->object = $object;
+        $object = new Societe($this->db);
+        if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+        $this->object = $object;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
      */
     function assign_values(&$action, $id=0, $ref='')
     {
@@ -103,9 +103,9 @@ 
 
         if ($action == 'create')
         {
-        	if ($conf->use_javascript_ajax)
-			{
-				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
+            if ($conf->use_javascript_ajax)
+            {
+                $this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 		              $("#radiocompany").click(function() {
                             document.formsoc.action.value="create";
@@ -121,14 +121,14 @@ 
                       });
 		          });
                 </script>'."\n";
-			}
+            }
         }
 
         if ($action == 'create' || $action == 'edit')
         {
-        	if ($conf->use_javascript_ajax)
-			{
-				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+            if ($conf->use_javascript_ajax)
+            {
+                $this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 						$("#selectcountry_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
@@ -137,7 +137,7 @@ 
 						});
 					})
 				</script>'."\n";
-			}
+            }
 
             // Load object modCodeClient
             $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
@@ -173,35 +173,35 @@ 
 
             if (! empty($conf->fournisseur->enabled))
             {
-            	$this->tpl['supplier_enabled'] = 1;
-
-            	// Load object modCodeFournisseur
-            	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
-            	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-            	{
-            		$module = substr($module, 0, dol_strlen($module)-4);
-            	}
+                $this->tpl['supplier_enabled'] = 1;
+
+                // Load object modCodeFournisseur
+                $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+                if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+                {
+                    $module = substr($module, 0, dol_strlen($module)-4);
+                }
                 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
                     $res=dol_include_once($dirroot.$module.'.php');
                     if ($res) break;
                 }
-            	$modCodeFournisseur = new $module;
-            	$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
-            	// We verified if the tag prefix is used
-            	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
-
-            	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
-            	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
-            	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
-
-            	$this->object->LoadSupplierCateg();
-            	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
+                $modCodeFournisseur = new $module;
+                $this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
+                // We verified if the tag prefix is used
+                if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+
+                // Supplier
+                $this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
+                $this->tpl['suppliercode'] = $this->object->code_fournisseur;
+                if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+                $this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
+                $s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
+                $this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
+
+                $this->object->LoadSupplierCateg();
+                $this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             }
 
             // Zip
@@ -306,23 +306,23 @@ 
             $nbofsalesrepresentative=count($listsalesrepresentatives);
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
-            	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
-            	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
-            	$this->tpl['sales_representatives'].= '</a>';
+                $this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+                $this->tpl['sales_representatives'].= $nbofsalesrepresentative;
+                $this->tpl['sales_representatives'].= '</a>';
             }
             else if ($nbofsalesrepresentative > 0)
             {
-            	$userstatic=new User($this->db);
-            	$i=0;
-            	foreach($listsalesrepresentatives as $val)
-            	{
-            		$userstatic->id=$val['id'];
-            		$userstatic->lastname=$val['name'];
-            		$userstatic->firstname=$val['firstname'];
-            		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
-            		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
-            	}
+                $userstatic=new User($this->db);
+                $i=0;
+                foreach($listsalesrepresentatives as $val)
+                {
+                    $userstatic->id=$val['id'];
+                    $userstatic->lastname=$val['name'];
+                    $userstatic->firstname=$val['firstname'];
+                    $this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
+                    $i++;
+                    if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+                }
             }
             else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
 

Spacing +130 added lines, -130 removed lines

@@ -45,7 +45,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -61,12 +61,12 @@ 
      *  @param		ref		$ref		Object ref
      *  @return		object				Object loaded
      */
-    protected function getObject($id,$ref='')
+    protected function getObject($id, $ref = '')
     {
     	//$ret = $this->getInstanceDao();
 
     	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+    	if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
     	$this->object = $object;
     }
 
@@ -79,7 +79,7 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
      */
-    function assign_values(&$action, $id=0, $ref='')
+    function assign_values(&$action, $id = 0, $ref = '')
     {
         // phpcs:enable
         global $conf, $langs, $user, $mysoc, $canvas;
@@ -87,19 +87,19 @@ 
 
         if ($action == 'add' || $action == 'update') $this->assign_post($action);
 
-        if ($_GET["type"]=='f')  		{ $this->object->fournisseur=1; }
-        if ($_GET["type"]=='c')  		{ $this->object->client=1; }
-        if ($_GET["type"]=='p')  		{ $this->object->client=2; }
-        if ($_GET["type"]=='cp') 		{ $this->object->client=3; }
-        if ($_REQUEST["private"]==1) 	{ $this->object->particulier=1;	}
+        if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
+        if ($_GET["type"] == 'c') { $this->object->client = 1; }
+        if ($_GET["type"] == 'p') { $this->object->client = 2; }
+        if ($_GET["type"] == 'cp') { $this->object->client = 3; }
+        if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
 
-        foreach($this->object as $key => $value)
+        foreach ($this->object as $key => $value)
         {
             $this->tpl[$key] = $value;
         }
 
-        $this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        $this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
+        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
 
         if ($action == 'create')
         {
@@ -140,15 +140,15 @@ 
 			}
 
             // Load object modCodeClient
-            $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
+            $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             {
-                $module = substr($module, 0, dol_strlen($module)-4);
+                $module = substr($module, 0, dol_strlen($module) - 4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+            $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
-                $res=dol_include_once($dirroot.$module.'.php');
+                $res = dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
             $modCodeClient = new $module($db);
@@ -166,25 +166,25 @@ 
 
             // Customer
             $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
             $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
-            $s=$modCodeClient->getToolTip($langs,$this->object,0);
-            $this->tpl['help_customercode'] = $form->textwithpicto('',$s,1);
+            $s = $modCodeClient->getToolTip($langs, $this->object, 0);
+            $this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-            if (! empty($conf->fournisseur->enabled))
+            if (!empty($conf->fournisseur->enabled))
             {
             	$this->tpl['supplier_enabled'] = 1;
 
             	// Load object modCodeFournisseur
-            	$module=$conf->global->SOCIETE_CODECLIENT_ADDON;
+            	$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
             	if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
             	{
-            		$module = substr($module, 0, dol_strlen($module)-4);
+            		$module = substr($module, 0, dol_strlen($module) - 4);
             	}
-                $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+                $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
-                    $res=dol_include_once($dirroot.$module.'.php');
+                    $res = dol_include_once($dirroot.$module.'.php');
                     if ($res) break;
                 }
             	$modCodeFournisseur = new $module;
@@ -193,69 +193,69 @@ 
             	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
 
             	// Supplier
-            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
+            	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
             	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
             	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
-            	$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
-            	$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
+            	$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
+            	$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
 
             	$this->object->LoadSupplierCateg();
             	$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
             }
 
             // Zip
-            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+            $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6);
 
             // Town
-            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town,'town',array('zipcode','selectcountry_id','state_id'));
+            $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
             // Country
             $this->object->country_id = ($this->object->country_id ? $this->object->country_id : $mysoc->country_id);
             $this->object->country_code = ($this->object->country_code ? $this->object->country_code : $mysoc->country_code);
-            $this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
+            $this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
             $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
             // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
+            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
             else $this->tpl['select_state'] = $countrynotdefined;
 
             // Language
-            if (! empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
 
             // VAT
-            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value',$this->tpl['tva_assuj'],1);	// Assujeti par defaut en creation
+            $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
 
             // Select users
             $this->tpl['select_users'] = $form->select_dolusers($this->object->commercial_id, 'commercial_id', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td></tr>';
                 }
-                elseif($mysoc->localtax1_assuj=="1")
+                elseif ($mysoc->localtax1_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><tr>';
                 }
-                elseif($mysoc->localtax2_assuj=="1")
+                elseif ($mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                    $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
-                    $this->tpl['localtax'].= '</td><tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+                    $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
+                    $this->tpl['localtax'] .= '</td><tr>';
                 }
             }
         }
@@ -263,78 +263,78 @@ 
         {
             $head = societe_prepare_head($this->object);
 
-            $this->tpl['showhead']=dol_get_fiche_head($head, 'card', '', 0, 'company');
-            $this->tpl['showend']=dol_get_fiche_end();
+            $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
+            $this->tpl['showend'] = dol_get_fiche_end();
 
-            $this->tpl['showrefnav'] 		= $form->showrefnav($this->object,'socid','',($user->societe_id?0:1),'rowid','nom');
+            $this->tpl['showrefnav'] = $form->showrefnav($this->object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
             $this->tpl['checkcustomercode'] = $this->object->check_codeclient();
             $this->tpl['checksuppliercode'] = $this->object->check_codefournisseur();
-            $this->tpl['address'] 			= dol_nl2br($this->object->address);
+            $this->tpl['address'] = dol_nl2br($this->object->address);
 
-            $img=picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
-            $this->tpl['country'] = ($img?$img.' ':'').$this->object->country;
+            $img = picto_from_langcode($this->object->country_code);
+            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+            $this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
-            $this->tpl['phone'] 	= dol_print_phone($this->object->phone,$this->object->country_code,0,$this->object->id,'AC_TEL');
-            $this->tpl['fax'] 		= dol_print_phone($this->object->fax,$this->object->country_code,0,$this->object->id,'AC_FAX');
-            $this->tpl['email'] 	= dol_print_email($this->object->email,0,$this->object->id,'AC_EMAIL');
+            $this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
+            $this->tpl['fax'] 		= dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX');
+            $this->tpl['email'] 	= dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL');
             $this->tpl['url'] 		= dol_print_url($this->object->url);
 
-            $this->tpl['tva_assuj']		= yn($this->object->tva_assuj);
+            $this->tpl['tva_assuj'] = yn($this->object->tva_assuj);
 
             // Third party type
             $arr = $formcompany->typent_array(1);
             $this->tpl['typent'] = $arr[$this->object->typent_code];
 
-            if (! empty($conf->global->MAIN_MULTILANGS))
+            if (!empty($conf->global->MAIN_MULTILANGS))
             {
                 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
                 //$s=picto_from_langcode($this->default_lang);
                 //print ($s?$s.' ':'');
                 $langs->load("languages");
-                $this->tpl['default_lang'] = ($this->default_lang?$langs->trans('Language_'.$this->object->default_lang):'');
+                $this->tpl['default_lang'] = ($this->default_lang ? $langs->trans('Language_'.$this->object->default_lang) : '');
             }
 
-            $this->tpl['image_edit']	= img_edit();
+            $this->tpl['image_edit'] = img_edit();
 
-            $this->tpl['display_rib']	= $this->object->display_rib();
+            $this->tpl['display_rib'] = $this->object->display_rib();
 
             // Sales representatives
             $this->tpl['sales_representatives'] = '';
-            $listsalesrepresentatives=$this->object->getSalesRepresentatives($user);
-            $nbofsalesrepresentative=count($listsalesrepresentatives);
+            $listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
+            $nbofsalesrepresentative = count($listsalesrepresentatives);
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
-            	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
-            	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
-            	$this->tpl['sales_representatives'].= '</a>';
+            	$this->tpl['sales_representatives'] .= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+            	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
+            	$this->tpl['sales_representatives'] .= '</a>';
             }
             else if ($nbofsalesrepresentative > 0)
             {
-            	$userstatic=new User($this->db);
-            	$i=0;
-            	foreach($listsalesrepresentatives as $val)
+            	$userstatic = new User($this->db);
+            	$i = 0;
+            	foreach ($listsalesrepresentatives as $val)
             	{
-            		$userstatic->id=$val['id'];
-            		$userstatic->lastname=$val['name'];
-            		$userstatic->firstname=$val['firstname'];
-            		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
+            		$userstatic->id = $val['id'];
+            		$userstatic->lastname = $val['name'];
+            		$userstatic->firstname = $val['firstname'];
+            		$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
             		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
             	}
             }
-            else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
+            else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
-            if (! empty($conf->adherent->enabled))
+            if (!empty($conf->adherent->enabled))
             {
                 $langs->load("members");
-                $adh=new Adherent($this->db);
-                $result=$adh->fetch('','',$this->object->id);
+                $adh = new Adherent($this->db);
+                $result = $adh->fetch('', '', $this->object->id);
                 if ($result > 0)
                 {
-                    $adh->ref=$adh->getFullName($langs);
+                    $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
                 }
                 else
@@ -345,26 +345,26 @@ 
 
             // Local Tax
             // TODO mettre dans une classe propre au pays
-            if($mysoc->country_code=='ES')
+            if ($mysoc->country_code == 'ES')
             {
                 $this->tpl['localtax'] = '';
 
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+                if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td>'.yn($this->object->localtax1_assuj).'</td>';
-                    $this->tpl['localtax'].= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
+                    $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
                 }
-                elseif($mysoc->localtax1_assuj=="1")
+                elseif ($mysoc->localtax1_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
                 }
-                elseif($mysoc->localtax2_assuj=="1")
+                elseif ($mysoc->localtax2_assuj == "1")
                 {
-                    $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
-                    $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
+                    $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
+                    $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
                 }
             }
         }
@@ -382,47 +382,47 @@ 
         // phpcs:enable
         global $langs, $mysoc;
 
-        $this->object->id					=	$_POST["socid"];
-        $this->object->name					=	$_POST["nom"];
-        $this->object->prefix_comm			=	$_POST["prefix_comm"];
-        $this->object->client				=	$_POST["client"];
-        $this->object->code_client			=	$_POST["code_client"];
-        $this->object->fournisseur			=	$_POST["fournisseur"];
-        $this->object->code_fournisseur		=	$_POST["code_fournisseur"];
-        $this->object->address				=	$_POST["adresse"];
-        $this->object->zip					=	$_POST["zipcode"];
-        $this->object->town					=	$_POST["town"];
-        $this->object->country_id			=	$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
-        $this->object->state_id		        =	$_POST["state_id"];
-        $this->object->phone				=	$_POST["tel"];
-        $this->object->fax					=	$_POST["fax"];
-        $this->object->email				=	$_POST["email"];
-        $this->object->url					=	$_POST["url"];
-        $this->object->capital				=	$_POST["capital"];
-        $this->object->idprof1				=	$_POST["idprof1"];
-        $this->object->idprof2				=	$_POST["idprof2"];
-        $this->object->idprof3				=	$_POST["idprof3"];
-        $this->object->idprof4				=	$_POST["idprof4"];
-        $this->object->typent_id			=	$_POST["typent_id"];
-        $this->object->effectif_id			=	$_POST["effectif_id"];
-        $this->object->barcode				=	$_POST["barcode"];
-        $this->object->forme_juridique_code	=	$_POST["forme_juridique_code"];
-        $this->object->default_lang			=	$_POST["default_lang"];
-        $this->object->commercial_id		=	$_POST["commercial_id"];
-
-        $this->object->tva_assuj 			= 	$_POST["assujtva_value"]?$_POST["assujtva_value"]:1;
-        $this->object->tva_intra			=	$_POST["tva_intra"];
+        $this->object->id = $_POST["socid"];
+        $this->object->name = $_POST["nom"];
+        $this->object->prefix_comm			= $_POST["prefix_comm"];
+        $this->object->client = $_POST["client"];
+        $this->object->code_client			= $_POST["code_client"];
+        $this->object->fournisseur			= $_POST["fournisseur"];
+        $this->object->code_fournisseur = $_POST["code_fournisseur"];
+        $this->object->address = $_POST["adresse"];
+        $this->object->zip = $_POST["zipcode"];
+        $this->object->town					= $_POST["town"];
+        $this->object->country_id = $_POST["country_id"] ? $_POST["country_id"] : $mysoc->country_id;
+        $this->object->state_id = $_POST["state_id"];
+        $this->object->phone				= $_POST["tel"];
+        $this->object->fax					= $_POST["fax"];
+        $this->object->email				= $_POST["email"];
+        $this->object->url					= $_POST["url"];
+        $this->object->capital				= $_POST["capital"];
+        $this->object->idprof1				= $_POST["idprof1"];
+        $this->object->idprof2				= $_POST["idprof2"];
+        $this->object->idprof3				= $_POST["idprof3"];
+        $this->object->idprof4				= $_POST["idprof4"];
+        $this->object->typent_id = $_POST["typent_id"];
+        $this->object->effectif_id = $_POST["effectif_id"];
+        $this->object->barcode				= $_POST["barcode"];
+        $this->object->forme_juridique_code = $_POST["forme_juridique_code"];
+        $this->object->default_lang			= $_POST["default_lang"];
+        $this->object->commercial_id		= $_POST["commercial_id"];
+
+        $this->object->tva_assuj = $_POST["assujtva_value"] ? $_POST["assujtva_value"] : 1;
+        $this->object->tva_intra = $_POST["tva_intra"];
 
         //Local Taxes
-        $this->object->localtax1_assuj		= 	$_POST["localtax1assuj_value"];
-        $this->object->localtax2_assuj		= 	$_POST["localtax2assuj_value"];
+        $this->object->localtax1_assuj		= $_POST["localtax1assuj_value"];
+        $this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id)
         {
-            $tmparray=getCountry($this->object->country_id,'all',$this->db,$langs,0);
-            $this->object->country_code	=	$tmparray['code'];
-            $this->object->country_label=	$tmparray['label'];
+            $tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
+            $this->object->country_code	= $tmparray['code'];
+            $this->object->country_label = $tmparray['label'];
         }
     }
 }

Braces +56 added lines, -31 removed lines

@@ -66,7 +66,9 @@ 
     	//$ret = $this->getInstanceDao();
 
     	$object = new Societe($this->db);
-    	if (! empty($id) || ! empty($ref)) $object->fetch($id,$ref);
+    	if (! empty($id) || ! empty($ref)) {
+    	    $object->fetch($id,$ref);
+    	}
     	$this->object = $object;
     }
 
@@ -85,7 +87,9 @@ 
         global $conf, $langs, $user, $mysoc, $canvas;
         global $form, $formadmin, $formcompany;
 
-        if ($action == 'add' || $action == 'update') $this->assign_post($action);
+        if ($action == 'add' || $action == 'update') {
+            $this->assign_post($action);
+        }
 
         if ($_GET["type"]=='f')  		{ $this->object->fournisseur=1; }
         if ($_GET["type"]=='c')  		{ $this->object->client=1; }
@@ -99,7 +103,9 @@ 
         }
 
         $this->tpl['error'] = get_htmloutput_errors($this->object->error,$this->object->errors);
-        if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        if (is_array($GLOBALS['errors'])) {
+            $this->tpl['error'] = get_htmloutput_mesg('',$GLOBALS['errors'],'error');
+        }
 
         if ($action == 'create')
         {
@@ -149,12 +155,16 @@ 
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
-                if ($res) break;
+                if ($res) {
+                    break;
+                }
             }
             $modCodeClient = new $module($db);
             $this->tpl['auto_customercode'] = $modCodeClient->code_auto;
             // We verified if the tag prefix is used
-            if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+            if ($modCodeClient->code_auto) {
+                $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+            }
 
             // TODO create a function
             $this->tpl['select_customertype'] = Form::selectarray('client', array(
@@ -166,7 +176,9 @@ 
 
             // Customer
             $this->tpl['customercode'] = $this->object->code_client;
-            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) {
+                $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object,0);
+            }
             $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
             $s=$modCodeClient->getToolTip($langs,$this->object,0);
             $this->tpl['help_customercode'] = $form->textwithpicto('',$s,1);
@@ -185,17 +197,23 @@ 
                 foreach ($dirsociete as $dirroot)
                 {
                     $res=dol_include_once($dirroot.$module.'.php');
-                    if ($res) break;
+                    if ($res) {
+                        break;
+                    }
                 }
             	$modCodeFournisseur = new $module;
             	$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
             	// We verified if the tag prefix is used
-            	if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+            	if ($modCodeFournisseur->code_auto) {
+            	    $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+            	}
 
             	// Supplier
             	$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
             	$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+            	if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) {
+            	    $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
+            	}
             	$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
             	$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
             	$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
@@ -216,14 +234,21 @@ 
             $this->tpl['select_country'] = $form->select_country($this->object->country_id,'country_id');
             $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-            if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            if ($user->admin) {
+                $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
 
             // State
-            if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
-            else $this->tpl['select_state'] = $countrynotdefined;
+            if ($this->object->country_id) {
+                $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id,$this->object->country_code);
+            } else {
+                $this->tpl['select_state'] = $countrynotdefined;
+            }
 
             // Language
-            if (! empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            if (! empty($conf->global->MAIN_MULTILANGS)) {
+                $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang?$this->object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
+            }
 
             // VAT
             $this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value',$this->tpl['tva_assuj'],1);	// Assujeti par defaut en creation
@@ -244,22 +269,19 @@ 
                     $this->tpl['localtax'].= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
                     $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td></tr>';
-                }
-                elseif($mysoc->localtax1_assuj=="1")
+                } elseif($mysoc->localtax1_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'].= $form->selectyesno('localtax1assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td><tr>';
-                }
-                elseif($mysoc->localtax2_assuj=="1")
+                } elseif($mysoc->localtax2_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'].= $form->selectyesno('localtax2assuj_value',$this->object->localtax1_assuj,1);
                     $this->tpl['localtax'].= '</td><tr>';
                 }
             }
-        }
-        else
+        } else
         {
             $head = societe_prepare_head($this->object);
 
@@ -273,7 +295,9 @@ 
             $this->tpl['address'] 			= dol_nl2br($this->object->address);
 
             $img=picto_from_langcode($this->object->country_code);
-            if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
+            if ($this->object->isInEEC()) {
+                $this->tpl['country'] = $form->textwithpicto(($img?$img.' ':'').$this->object->country,$langs->trans("CountryIsInEEC"),1,0);
+            }
             $this->tpl['country'] = ($img?$img.' ':'').$this->object->country;
 
             $this->tpl['phone'] 	= dol_print_phone($this->object->phone,$this->object->country_code,0,$this->object->id,'AC_TEL');
@@ -304,13 +328,14 @@ 
             $this->tpl['sales_representatives'] = '';
             $listsalesrepresentatives=$this->object->getSalesRepresentatives($user);
             $nbofsalesrepresentative=count($listsalesrepresentatives);
-            if ($nbofsalesrepresentative > 3)   // We print only number
+            if ($nbofsalesrepresentative > 3) {
+                // We print only number
             {
             	$this->tpl['sales_representatives'].= '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$this->object->id.'">';
+            }
             	$this->tpl['sales_representatives'].= $nbofsalesrepresentative;
             	$this->tpl['sales_representatives'].= '</a>';
-            }
-            else if ($nbofsalesrepresentative > 0)
+            } else if ($nbofsalesrepresentative > 0)
             {
             	$userstatic=new User($this->db);
             	$i=0;
@@ -321,10 +346,13 @@ 
             		$userstatic->firstname=$val['firstname'];
             		$this->tpl['sales_representatives'].= $userstatic->getNomUrl(1);
             		$i++;
-            		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'].= ', ';
+            		if ($i < $nbofsalesrepresentative) {
+            		    $this->tpl['sales_representatives'].= ', ';
+            		}
             	}
+            } else {
+                $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
             }
-            else $this->tpl['sales_representatives'].= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
             if (! empty($conf->adherent->enabled))
@@ -336,8 +364,7 @@ 
                 {
                     $adh->ref=$adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                }
-                else
+                } else
                 {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
@@ -355,13 +382,11 @@ 
                     $this->tpl['localtax'].= '<td>'.yn($this->object->localtax1_assuj).'</td>';
                     $this->tpl['localtax'].= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-                elseif($mysoc->localtax1_assuj=="1")
+                } elseif($mysoc->localtax1_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                }
-                elseif($mysoc->localtax2_assuj=="1")
+                } elseif($mysoc->localtax2_assuj=="1")
                 {
                     $this->tpl['localtax'].= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'].= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';

dolibarr/htdocs/societe/canvas/individual/tpl/card_create.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -58,7 +58,7 @@ 
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
 	<?php } ?>
@@ -113,7 +113,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -150,13 +150,13 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -168,7 +168,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>

Braces +4 added lines, -1 removed lines

@@ -168,7 +168,10 @@
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>

dolibarr/htdocs/societe/canvas/individual/tpl/card_view.tpl.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 

Spacing +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -32,7 +32,7 @@ 
 
 $head = societe_prepare_head($object);
 
-dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
+dol_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
 ?>
 
@@ -46,7 +46,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -75,7 +75,7 @@ 
 </tr>
 <?php } ?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
@@ -123,14 +123,14 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['tva_assuj']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 <tr>
 	<td><?php echo $langs->trans("Type"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['typent']; ?></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['default_lang']; ?></td>
@@ -170,10 +170,10 @@ 
 		</tr>
 	</table>
 	</td>
-	<td colspan="3"><?php echo $this->control->tpl['sales_representatives'];	?></td>
+	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (! empty($conf->adherent->enabled)) { ?>
+<?php if (!empty($conf->adherent->enabled)) { ?>
 <tr>
 	<td width="25%" valign="top"><?php echo $langs->trans("LinkedToDolibarrMember"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['linked_member']; ?></td>
@@ -192,7 +192,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
@@ -206,12 +206,12 @@ 
 /*
  * Documents generes
  */
-$filedir=$conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
-$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed=$user->rights->societe->lire;
-$delallowed=$user->rights->societe->creer;
+$filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
+$urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
+$genallowed = $user->rights->societe->lire;
+$delallowed = $user->rights->societe->creer;
 
-print $formfile->showdocuments('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
+print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
 ?>
 
 </td>
@@ -223,13 +223,13 @@ 
 
 <?php
 // Subsidiaries list
-$result=show_subsidiaries($conf,$langs,$db,$object);
+$result = show_subsidiaries($conf, $langs, $db, $object);
 
 // Contacts list
-$result=show_contacts($conf,$langs,$db,$object);
+$result = show_contacts($conf, $langs, $db, $object);
 
 // Projects list
-$result=show_projects($conf,$langs,$db,$object);
+$result = show_projects($conf, $langs, $db, $object);
 ?>
 
 <!-- END PHP TEMPLATE -->
\ No newline at end of file

Braces +13 added lines, -4 removed lines

@@ -36,8 +36,14 @@ 
 
 ?>
 
-<?php if ($this->control->tpl['error']) echo $this->control->tpl['error']; ?>
-<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
+<?php if ($this->control->tpl['error']) {
+    echo $this->control->tpl['error'];
+}
+?>
+<?php if ($this->control->tpl['action_delete']) {
+    echo $this->control->tpl['action_delete'];
+}
+?>
 
 <table class="border allwidth">
 
@@ -123,7 +129,10 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['tva_assuj']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 <tr>
 	<td><?php echo $langs->trans("Type"); ?></td>
@@ -192,7 +201,7 @@ 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
-	<?php }	else { ?>
+	<?php } else { ?>
 		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>

dolibarr/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php

Indentation +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 ?>
@@ -108,7 +108,7 @@ 
 
 <?php
 if ($this->control->tpl['fournisseur']) {
-	if (count($this->control->tpl['suppliercategory']) > 0) { ?>
+    if (count($this->control->tpl['suppliercategory']) > 0) { ?>
 <tr>
 	<td><?php echo $langs->trans('SupplierCategory'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -50,7 +50,7 @@ 
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
@@ -115,7 +115,7 @@ 
 </tr>
 <?php } }?>
 
-<?php if (! empty($conf->barcode->enabled)) { ?>
+<?php if (!empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
@@ -152,13 +152,13 @@ 
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY?'*':''); ?></td>
+	<td><?php echo $langs->trans('EMail').($conf->global->SOCIETE_EMAIL_MANDATORY ? '*' : ''); ?></td>
 	<td><input type="text" name="email" size="32" value="<?php echo $this->control->tpl['email']; ?>"></td>
 	<td><?php echo $langs->trans('Web'); ?></td>
 	<td><input type="text" name="url" size="32" value="<?php echo $this->control->tpl['url']; ?>"></td>
 </tr>
 
-<?php if (! empty($conf->global->MAIN_MULTILANGS)) { ?>
+<?php if (!empty($conf->global->MAIN_MULTILANGS)) { ?>
 <tr>
 	<td><?php echo $langs->trans("DefaultLang"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_lang']; ?></td>
@@ -170,7 +170,7 @@ 
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
 
 </table>
 <br>

Braces +4 added lines, -1 removed lines

@@ -170,7 +170,10 @@
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if(!empty($this->control->tpl['localtax'])) {
+    echo $this->control->tpl['localtax'];
+}
+?>
 
 </table>
 <br>

dolibarr/htdocs/societe/canvas/individual/actions_card_individual.class.php

Indentation +66 added lines, -66 removed lines

@@ -29,22 +29,22 @@ 
 class ActionsCardIndividual extends ActionsCardCommon
 {
     /**
-	 *    Constructor
-	 *
+     *    Constructor
+     *
      *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
      */
-	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
-	{
-		$this->db				= $db;
-		$this->dirmodule		= $dirmodule;
-		$this->targetmodule		= $targetmodule;
+    function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
+    {
+        $this->db				= $db;
+        $this->dirmodule		= $dirmodule;
+        $this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
         $this->card				= $card;
-	}
+    }
 
 
     /**
@@ -67,73 +67,73 @@ 
     }
 
 
-	/**
-	 * Execute actions
+    /**
+     * Execute actions
      * @deprecated Use the doActions of hooks instead of this.
-	 *
-	 * @param	string	$action	Action
-	 * @param	int		$id			Id of object (may be empty for creation)
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function doActions(&$action, $id)
-	{
-		$ret = $this->getObject($id);
+     *
+     * @param	string	$action	Action
+     * @param	int		$id			Id of object (may be empty for creation)
+     * @return	int					<0 if KO, >0 if OK
+     */
+    function doActions(&$action, $id)
+    {
+        $ret = $this->getObject($id);
 
-		$return = parent::doActions($action);
+        $return = parent::doActions($action);
 
-		return $return;
-	}
+        return $return;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Assign custom values for canvas (for example into this->tpl to be used by templates)
-	 *
-	 *    @param	string	$action    Type of action
-	 *    @param	integer	$id			Id of object
-	 *    @param	string	$ref		Ref of object
-	 *    @return	void
-	 */
-	function assign_values(&$action, $id=0, $ref='')
-	{
+    /**
+     *    Assign custom values for canvas (for example into this->tpl to be used by templates)
+     *
+     *    @param	string	$action    Type of action
+     *    @param	integer	$id			Id of object
+     *    @param	string	$ref		Ref of object
+     *    @return	void
+     */
+    function assign_values(&$action, $id=0, $ref='')
+    {
         // phpcs:enable
-		global $conf, $langs;
-		global $form, $formcompany;
+        global $conf, $langs;
+        global $form, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+        $ret = $this->getObject($id,$ref);
 
-		parent::assign_values($action);
+        parent::assign_values($action);
 
         $this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-		if ($action == 'create' || $action == 'edit')
-		{
-			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
-		{
-			// Confirm delete third party
-			if ($action == 'delete' || $conf->use_javascript_ajax)
-			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteAnIndividual"),$langs->trans("ConfirmDeleteIndividual"),"confirm_delete",'',0,"1,action-delete");
-			}
-		}
-	}
-
-	/**
-	 * 	Check permissions of a user to show a page and an object. Check read permission
-	 * 	If $_REQUEST['action'] defined, we also check write permission.
-	 *
-	 * 	@param      User	$user      	  	User to check
-	 * 	@param      string	$features	    Features to check (in most cases, it's module name)
-	 * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
-	 *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
-	 *  @param      string	$feature2		Feature to check (second level of permission)
-	 *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
-	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
-	 *  @return		int						1
-	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
-	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
-	}
+        if ($action == 'create' || $action == 'edit')
+        {
+            $this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
+        }
+        else
+        {
+            // Confirm delete third party
+            if ($action == 'delete' || $conf->use_javascript_ajax)
+            {
+                $this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteAnIndividual"),$langs->trans("ConfirmDeleteIndividual"),"confirm_delete",'',0,"1,action-delete");
+            }
+        }
+    }
+
+    /**
+     * 	Check permissions of a user to show a page and an object. Check read permission
+     * 	If $_REQUEST['action'] defined, we also check write permission.
+     *
+     * 	@param      User	$user      	  	User to check
+     * 	@param      string	$features	    Features to check (in most cases, it's module name)
+     * 	@param      int		$objectid      	Object ID if we want to check permission on a particular record (optional)
+     *  @param      string	$dbtablename    Table name where object is stored. Not used if objectid is null (optional)
+     *  @param      string	$feature2		Feature to check (second level of permission)
+     *  @param      string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. (optional)
+     *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
+     *  @return		int						1
+     */
+    function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+    {
+        return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -39,10 +39,10 @@ 
      */
 	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-		$this->db				= $db;
-		$this->dirmodule		= $dirmodule;
+		$this->db = $db;
+		$this->dirmodule = $dirmodule;
 		$this->targetmodule		= $targetmodule;
-        $this->canvas			= $canvas;
+        $this->canvas = $canvas;
         $this->card				= $card;
 	}
 
@@ -57,11 +57,11 @@ 
     {
         global $langs;
 
-        $out='';
+        $out = '';
 
-        if ($action == 'view')      $out.= $langs->trans("Individual");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view')      $out .= $langs->trans("Individual");
+        if ($action == 'edit')      $out .= $langs->trans("EditCompany");
+        if ($action == 'create')    $out .= $langs->trans("NewCompany");
 
         return $out;
     }
@@ -93,13 +93,13 @@ 
 	 *    @param	string	$ref		Ref of object
 	 *    @return	void
 	 */
-	function assign_values(&$action, $id=0, $ref='')
+	function assign_values(&$action, $id = 0, $ref = '')
 	{
         // phpcs:enable
 		global $conf, $langs;
 		global $form, $formcompany;
 
-		$ret = $this->getObject($id,$ref);
+		$ret = $this->getObject($id, $ref);
 
 		parent::assign_values($action);
 
@@ -114,7 +114,7 @@ 
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)
 			{
-				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id,$langs->trans("DeleteAnIndividual"),$langs->trans("ConfirmDeleteIndividual"),"confirm_delete",'',0,"1,action-delete");
+				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteAnIndividual"), $langs->trans("ConfirmDeleteIndividual"), "confirm_delete", '', 0, "1,action-delete");
 			}
 		}
 	}
@@ -132,8 +132,8 @@ 
 	 *  @param      string	$dbt_select		Field name for select if not rowid. (optional)
 	 *  @return		int						1
 	 */
-	function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid')
+	function restrictedArea($user, $features = 'societe', $objectid = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid')
 	{
-		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
+		return restrictedArea($user, $features, $objectid, $dbtablename, $feature2, $dbt_keyfield, $dbt_select);
 	}
 }

Braces +10 added lines, -5 removed lines

@@ -59,9 +59,15 @@ 
 
         $out='';
 
-        if ($action == 'view')      $out.= $langs->trans("Individual");
-        if ($action == 'edit')      $out.= $langs->trans("EditCompany");
-        if ($action == 'create')    $out.= $langs->trans("NewCompany");
+        if ($action == 'view') {
+            $out.= $langs->trans("Individual");
+        }
+        if ($action == 'edit') {
+            $out.= $langs->trans("EditCompany");
+        }
+        if ($action == 'create') {
+            $out.= $langs->trans("NewCompany");
+        }
 
         return $out;
     }
@@ -108,8 +114,7 @@ 
 		if ($action == 'create' || $action == 'edit')
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
+		} else
 		{
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)

dolibarr/htdocs/societe/website.php

Indentation +153 added lines, -153 removed lines

@@ -72,36 +72,36 @@ 
 $search=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
 }
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+    // If $val['visible']==0, then we never show the field
+    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
 }
 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	}
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 if ($id > 0)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 }
 
 
@@ -128,17 +128,17 @@ 
     // Purge search criteria
     if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
     {
-    	foreach($objectwebsiteaccount->fields as $key => $val)
-    	{
-    		$search[$key]='';
-    	}
-    	$toselect='';
-    	$search_array_options=array();
+        foreach($objectwebsiteaccount->fields as $key => $val)
+        {
+            $search[$key]='';
+        }
+        $toselect='';
+        $search_array_options=array();
     }
     if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-    	|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
     {
-    	$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
     }
 
     // Mass actions
@@ -171,7 +171,7 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 foreach($search as $key => $val)
 {
-	$param.= '&search_'.$key.'='.urlencode($search[$key]);
+    $param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -194,25 +194,25 @@ 
 // Prefix
 if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
 {
-	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
+    print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
 
 if ($object->client) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
-	print $object->code_client;
-	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('CustomerCode') . '</td><td colspan="3">';
+    print $object->code_client;
+    if ($object->check_codeclient() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+    print '</td></tr>';
 }
 
 if ($object->fournisseur) {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
-	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
-	print '</td></tr>';
+    print '<tr><td class="titlefield">';
+    print $langs->trans('SupplierCode') . '</td><td colspan="3">';
+    print $object->code_fournisseur;
+    if ($object->check_codefournisseur() != 0)
+        print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+    print '</td></tr>';
 }
 
 print '</table>';
@@ -223,15 +223,15 @@ 
 
 $newcardbutton = '';
 if (! empty($conf->website->enabled)) {
-	if (! empty($user->rights->societe->lire)) {
-		$newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">' . $langs->trans("AddWebsiteAccount").'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	} else {
-		$newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	}
+    if (! empty($user->rights->societe->lire)) {
+        $newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">' . $langs->trans("AddWebsiteAccount").'</span>';
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    } else {
+        $newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    }
 }
 
 print '<br>';
@@ -243,7 +243,7 @@ 
 $sql = 'SELECT ';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+    $sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -259,8 +259,8 @@ 
 $sql.=" AND fk_soc = ".$object->id;
 foreach($search as $key => $val)
 {
-	$mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+    $mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
+    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
 }
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -290,13 +290,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -304,8 +304,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -342,8 +342,8 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
 /*$moreforfilter = '';
@@ -358,9 +358,9 @@ 
 
 if (! empty($moreforfilter))
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -376,11 +376,11 @@ 
 print '<tr class="liste_titre">';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+    if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -401,11 +401,11 @@ 
 print '<tr class="liste_titre">';
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+    if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 // Extra fields
@@ -422,7 +422,7 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
 }
 
 
@@ -432,90 +432,90 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
-
-	// Store properties in $object
-	$objectwebsiteaccount->id = $obj->rowid;
-	foreach($objectwebsiteaccount->fields as $key => $val)
-	{
-		if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
-	}
-
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach($objectwebsiteaccount->fields as $key => $val)
-	{
-		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-		if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
-		if (! empty($arrayfields['t.'.$key]['checked']))
-		{
-			print '<td';
-			if ($align) print ' class="'.$align.'"';
-			print '>';
-			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
-			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! empty($val['isameasure']))
-			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-				$totalarray['val']['t.'.$key] += $obj->$key;
-			}
-		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print '</tr>';
-
-	$i++;
+    $obj = $db->fetch_object($resql);
+    if (empty($obj)) break;		// Should not happen
+
+    // Store properties in $object
+    $objectwebsiteaccount->id = $obj->rowid;
+    foreach($objectwebsiteaccount->fields as $key => $val)
+    {
+        if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
+    }
+
+    // Show here line of result
+    print '<tr class="oddeven">';
+    foreach($objectwebsiteaccount->fields as $key => $val)
+    {
+        $align='';
+        if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
+        if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
+        if ($key == 'status') $align.=($align?' ':'').'center';
+        if (! empty($arrayfields['t.'.$key]['checked']))
+        {
+            print '<td';
+            if ($align) print ' class="'.$align.'"';
+            print '>';
+            if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+            else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+            if (! empty($val['isameasure']))
+            {
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                $totalarray['val']['t.'.$key] += $obj->$key;
+            }
+        }
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>';
+
+    $i++;
 }
 
 // Show total line
 if (isset($totalarray['pos']))
 {
-	print '<tr class="liste_total">';
-	$i=0;
-	while ($i < $totalarray['nbfield'])
-	{
-		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
-			if ($i == 1)
-			{
-				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
-		}
-	}
-	print '</tr>';
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+        else
+        {
+            if ($i == 1)
+            {
+                if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+                else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+            }
+            else print '<td></td>';
+        }
+    }
+    print '</tr>';
 }
 
 // If no record found
 if ($num == 0)
 {
-	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+    $colspan=1;
+    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
@@ -532,21 +532,21 @@ 
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	$hidegeneratedfilelistifempty=1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+    $hidegeneratedfilelistifempty=1;
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
 
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-	$formfile = new FormFile($db);
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+    $formfile = new FormFile($db);
 
-	// Show list of available documents
-	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-	$urlsource.=str_replace('&amp;','&',$param);
+    // Show list of available documents
+    $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource.=str_replace('&amp;','&',$param);
 
-	$filedir=$diroutputmassaction;
-	$genallowed=$user->rights->mymodule->read;
-	$delallowed=$user->rights->mymodule->create;
+    $filedir=$diroutputmassaction;
+    $genallowed=$user->rights->mymodule->read;
+    $delallowed=$user->rights->mymodule->create;
 
-	print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+    print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
 // End of page

Braces +174 added lines, -65 removed lines

@@ -41,7 +41,9 @@ 
 
 // Security check
 $id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -52,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.login';
-if (! $sortorder) $sortorder='ASC';
+if (! $sortfield) {
+    $sortfield='t.login';
+}
+if (! $sortorder) {
+    $sortorder='ASC';
+}
 
 // Initialize technical objects
 $object=new Societe($db);
@@ -72,30 +78,38 @@ 
 $search=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
-}
+	if (GETPOST('search_'.$key,'alpha')) {
+	    $search[$key]=GETPOST('search_'.$key,'alpha');
+	}
+	}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
-}
+	if ($val['searchall']) {
+	    $fieldstosearchall['t.'.$key]=$val['label'];
+	}
+	}
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
-}
+	if (! empty($val['visible'])) {
+	    $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+	}
+	}
 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (! empty($extrafields->attribute_list[$key])) {
+		    $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		}
 	}
 }
 
@@ -111,7 +125,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -126,11 +142,13 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+        // All tests are required to be compatible with all browsers
     {
     	foreach($objectwebsiteaccount->fields as $key => $val)
     	{
     		$search[$key]='';
+    }
     	}
     	$toselect='';
     	$search_array_options=array();
@@ -166,14 +184,22 @@ 
 llxHeader('', $title);
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($id > 0) $param.='&id='.urlencode($id);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.urlencode($contextpage);
+}
+if ($id > 0) {
+    $param.='&id='.urlencode($id);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.urlencode($limit);
+}
 foreach($search as $key => $val)
 {
 	$param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+if ($optioncss != '') {
+    $param.='&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -192,17 +218,20 @@ 
 print '<table class="border centpercent">';
 
 // Prefix
-if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+    // Old not used prefix field
 {
 	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
+}
 
 if ($object->client) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+	if ($object->check_codeclient() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -210,8 +239,9 @@ 
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+	if ($object->check_codefournisseur() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -246,23 +276,34 @@ 
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX."societe_account as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($objectwebsiteaccount->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('societeaccount').")";
-else $sql.=" WHERE 1 = 1";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($objectwebsiteaccount->ismultientitymanaged == 1) {
+    $sql.= " WHERE t.entity IN (".getEntity('societeaccount').")";
+} else {
+    $sql.=" WHERE 1 = 1";
+}
 $sql.=" AND fk_soc = ".$object->id;
 foreach($search as $key => $val)
 {
 	$mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	if ($search[$key] != '') {
+	    $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	}
+	}
+if ($search_all) {
+    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -292,9 +333,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -317,12 +360,18 @@ 
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->mymodule->delete) {
+    $arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend','predelete'))) {
+    $arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -342,7 +391,9 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
@@ -353,8 +404,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $objectwebsiteaccount);    // Note that $action and $objectwebsiteaccount may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+    $moreforfilter .= $hookmanager->resPrint;
+} else {
+    $moreforfilter = $hookmanager->resPrint;
+}
 
 if (! empty($moreforfilter))
 {
@@ -377,11 +431,19 @@ 
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
 	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-}
+	if (in_array($val['type'], array('date','datetime','timestamp'))) {
+	    $align='center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+	    $align.=' nowrap';
+	}
+	if ($key == 'status') {
+	    $align.=($align?' ':'').'center';
+	}
+	if (! empty($arrayfields['t.'.$key]['checked'])) {
+	    print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	}
+	}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
@@ -402,11 +464,19 @@ 
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
 	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
-}
+	if (in_array($val['type'], array('date','datetime','timestamp'))) {
+	    $align='center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+	    $align.='nowrap';
+	}
+	if ($key == 'status') {
+	    $align.=($align?' ':'').'center';
+	}
+	if (! empty($arrayfields['t.'.$key]['checked'])) {
+	    print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	}
+	}
 // Extra fields
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -422,7 +492,10 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	if (preg_match('/\$object/',$val)) {
+	    $needToFetchEachLine++;
+	}
+	// There is at least one compute field that use $object
 }
 
 
@@ -433,13 +506,18 @@ 
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
+	if (empty($obj)) {
+	    break;
+	}
+	// Should not happen
 
 	// Store properties in $object
 	$objectwebsiteaccount->id = $obj->rowid;
 	foreach($objectwebsiteaccount->fields as $key => $val)
 	{
-		if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
+		if (isset($obj->$key)) {
+		    $objectwebsiteaccount->$key = $obj->$key;
+		}
 	}
 
 	// Show here line of result
@@ -447,21 +525,36 @@ 
 	foreach($objectwebsiteaccount->fields as $key => $val)
 	{
 		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-		if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
+		if (in_array($val['type'], array('date','datetime','timestamp'))) {
+		    $align='center';
+		}
+		if (in_array($val['type'], array('timestamp'))) {
+		    $align.='nowrap';
+		}
+		if ($key == 'status') {
+		    $align.=($align?' ':'').'center';
+		}
 		if (! empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
-			if ($align) print ' class="'.$align.'"';
+			if ($align) {
+			    print ' class="'.$align.'"';
+			}
 			print '>';
-			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
-			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+			if ($key == 'login') {
+			    print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+			} else {
+			    print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+			}
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 			if (! empty($val['isameasure']))
 			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				if (! $i) {
+				    $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -474,14 +567,20 @@ 
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+	    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	}
+		if (in_array($obj->rowid, $arrayofselected)) {
+		    $selected=1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 
@@ -496,15 +595,20 @@ 
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
+		if (! empty($totalarray['pos'][$i])) {
+		    print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		} else
 		{
 			if ($i == 1)
 			{
-				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				if ($num < $limit) {
+				    print '<td align="left">'.$langs->trans("Total").'</td>';
+				} else {
+				    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} else {
+			    print '<td></td>';
 			}
-			else print '<td></td>';
 		}
 	}
 	print '</tr>';
@@ -514,7 +618,10 @@ 
 if ($num == 0)
 {
 	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) {
+	    $colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -533,7 +640,9 @@ 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	$hidegeneratedfilelistifempty=1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+	    $hidegeneratedfilelistifempty=0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);

Spacing +159 added lines, -159 removed lines

@@ -31,7 +31,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -39,67 +39,67 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$langs->loadLangs(array("companies","website"));
+$langs->loadLangs(array("companies", "website"));
 
-$search_status=GETPOST('search_status');
+$search_status = GETPOST('search_status');
 
 // Security check
-$id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.login';
-if (! $sortorder) $sortorder='ASC';
+if (!$sortfield) $sortfield = 't.login';
+if (!$sortorder) $sortorder = 'ASC';
 
 // Initialize technical objects
-$object=new Societe($db);
-$objectwebsiteaccount=new SocieteAccount($db);
+$object = new Societe($db);
+$objectwebsiteaccount = new SocieteAccount($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->website->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('websitethirdpartylist'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction = $conf->website->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('websitethirdpartylist')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('thirdpartyaccount');
-$search_array_options=$extrafields->getOptionalsFromPost('thirdpartyaccount','','search_');
+$search_array_options = $extrafields->getOptionalsFromPost('thirdpartyaccount', '', 'search_');
 
-unset($objectwebsiteaccount->fields['fk_soc']);		// Remove this field, we are already on the thirdparty
+unset($objectwebsiteaccount->fields['fk_soc']); // Remove this field, we are already on the thirdparty
 
 // Initialize array of search criterias
-$search_all=trim(GETPOST("search_all",'alpha'));
-$search=array();
-foreach($objectwebsiteaccount->fields as $key => $val)
+$search_all = trim(GETPOST("search_all", 'alpha'));
+$search = array();
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach($objectwebsiteaccount->fields as $key => $val)
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
 // Definition of fields for list
-$arrayfields=array();
-foreach($objectwebsiteaccount->fields as $key => $val)
+$arrayfields = array();
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled']);
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled']);
 }
 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	foreach ($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
@@ -113,14 +113,14 @@ 
  *	Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
     // Cancel
-    if (GETPOST('cancel','alpha') && ! empty($backtopage))
+    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
     {
         header("Location: ".$backtopage);
         exit;
@@ -130,24 +130,24 @@ 
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
     {
-    	foreach($objectwebsiteaccount->fields as $key => $val)
+    	foreach ($objectwebsiteaccount->fields as $key => $val)
     	{
-    		$search[$key]='';
+    		$search[$key] = '';
     	}
-    	$toselect='';
-    	$search_array_options=array();
+    	$toselect = '';
+    	$search_array_options = array();
     }
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-    	|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+    	|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
     {
-    	$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+    	$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
     }
 
     // Mass actions
-    $objectclass='WebsiteAccount';
-    $objectlabel='WebsiteAccount';
+    $objectclass = 'WebsiteAccount';
+    $objectlabel = 'WebsiteAccount';
     $permtoread = $user->rights->societe->lire;
     $permtodelete = $user->rights->societe->supprimer;
     $uploaddir = $conf->societe->dir_output;
@@ -169,15 +169,15 @@ 
 $title = $langs->trans("WebsiteAccounts");
 llxHeader('', $title);
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($id > 0) $param.='&id='.urlencode($id);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-foreach($search as $key => $val)
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($id > 0) $param .= '&id='.urlencode($id);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+foreach ($search as $key => $val)
 {
-	$param.= '&search_'.$key.'='.urlencode($search[$key]);
+	$param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -185,7 +185,7 @@ 
 
 dol_fiche_head($head, 'website', $langs->trans("ThirdParty"), - 1, 'company');
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/societe/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
@@ -196,26 +196,26 @@ 
 print '<table class="border centpercent">';
 
 // Prefix
-if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
 {
-	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
 if ($object->client) {
 	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
+	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
 	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
 	print '</td></tr>';
 }
 
 if ($object->fournisseur) {
 	print '<tr><td class="titlefield">';
-	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
+	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
 	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
 	print '</td></tr>';
 }
 
@@ -226,15 +226,15 @@ 
 dol_fiche_end();
 
 $newcardbutton = '';
-if (! empty($conf->website->enabled)) {
-	if (! empty($user->rights->societe->lire)) {
-		$newcardbutton .= '<a class="butActionNew" href="' . DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">' . $langs->trans("AddWebsiteAccount").'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+if (!empty($conf->website->enabled)) {
+	if (!empty($user->rights->societe->lire)) {
+		$newcardbutton .= '<a class="butActionNew" href="'.DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'"><span class="valignmiddle">'.$langs->trans("AddWebsiteAccount").'</span>';
+		$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton .= '</a>';
 	} else {
-		$newcardbutton .= '<a class="butActionNewRefused" href="#">' . $langs->trans("AddAction");
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+		$newcardbutton .= '<a class="butActionNewRefused" href="#">'.$langs->trans("AddAction");
+		$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton .= '</a>';
 	}
 }
 
@@ -245,34 +245,34 @@ 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach($objectwebsiteaccount->fields as $key => $val)
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/','', $sql);
-$sql.= " FROM ".MAIN_DB_PREFIX."societe_account as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($objectwebsiteaccount->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('societeaccount').")";
-else $sql.=" WHERE 1 = 1";
-$sql.=" AND fk_soc = ".$object->id;
-foreach($search as $key => $val)
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/, $/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_account_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($objectwebsiteaccount->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity('societeaccount').")";
+else $sql .= " WHERE 1 = 1";
+$sql .= " AND fk_soc = ".$object->id;
+foreach ($search as $key => $val)
 {
-	$mode_search=(($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	$mode_search = (($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->fields[$key])) ? 1 : 0);
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters, $objectwebsiteaccount);    // Note that $action and $objectwebsiteaccount may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objectwebsiteaccount); // Note that $action and $objectwebsiteaccount may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
 /* If a group by is required
  $sql.= " GROUP BY "
@@ -288,7 +288,7 @@ 
  $sql.=$hookmanager->resPrint;
  */
 
-$sql.=$db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -303,10 +303,10 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
-$resql=$db->query($sql);
-if (! $resql)
+$resql = $db->query($sql);
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -314,16 +314,16 @@ 
 
 $num = $db->num_rows($resql);
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->mymodule->delete) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -338,16 +338,16 @@ 
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
 
-$topicmail="Information";
-$modelmail="societeaccount";
-$objecttmp=new SocieteAccount($db);
-$trackid='thi'.$object->id;
+$topicmail = "Information";
+$modelmail = "societeaccount";
+$objecttmp = new SocieteAccount($db);
+$trackid = 'thi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 /*$moreforfilter = '';
@@ -355,46 +355,46 @@ 
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
 $moreforfilter.= '</div>';*/
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $objectwebsiteaccount);    // Note that $action and $objectwebsiteaccount may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $objectwebsiteaccount may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($objectwebsiteaccount->fields as $key => $val)
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.=' nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	$align = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+	if (in_array($val['type'], array('timestamp'))) $align .= ' nowrap';
+	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+	if (!empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
@@ -403,58 +403,58 @@ 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($objectwebsiteaccount->fields as $key => $val)
+foreach ($objectwebsiteaccount->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-	if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	$align = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+	if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
+	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+	if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
+$needToFetchEachLine = 0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
 }
 
 
 // Loop on record
 // --------------------------------------------------------------------
-$i=0;
-$totalarray=array();
+$i = 0;
+$totalarray = array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
+	if (empty($obj)) break; // Should not happen
 
 	// Store properties in $object
 	$objectwebsiteaccount->id = $obj->rowid;
-	foreach($objectwebsiteaccount->fields as $key => $val)
+	foreach ($objectwebsiteaccount->fields as $key => $val)
 	{
 		if (isset($obj->$key)) $objectwebsiteaccount->$key = $obj->$key;
 	}
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach($objectwebsiteaccount->fields as $key => $val)
+	foreach ($objectwebsiteaccount->fields as $key => $val)
 	{
-		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align='center';
-		if (in_array($val['type'], array('timestamp'))) $align.='nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
-		if (! empty($arrayfields['t.'.$key]['checked']))
+		$align = '';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
+		if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
+		if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
 			if ($align) print ' class="'.$align.'"';
@@ -462,10 +462,10 @@ 
 			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
 			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! empty($val['isameasure']))
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure']))
 			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -473,19 +473,19 @@ 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['nbfield']++;
 
 	print '</tr>';
 
@@ -496,11 +496,11 @@ 
 if (isset($totalarray['pos']))
 {
 	print '<tr class="liste_total">';
-	$i=0;
+	$i = 0;
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		if (!empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		else
 		{
 			if ($i == 1)
@@ -517,16 +517,16 @@ 
 // If no record found
 if ($num == 0)
 {
-	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
 $db->free($resql);
 
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter', $parameters, $objectwebsiteaccount);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -534,23 +534,23 @@ 
 
 print '</form>'."\n";
 
-if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	$hidegeneratedfilelistifempty=1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
 
 	// Show list of available documents
-	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-	$urlsource.=str_replace('&amp;','&',$param);
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
 
-	$filedir=$diroutputmassaction;
-	$genallowed=$user->rights->mymodule->read;
-	$delallowed=$user->rights->mymodule->create;
+	$filedir = $diroutputmassaction;
+	$genallowed = $user->rights->mymodule->read;
+	$delallowed = $user->rights->mymodule->create;
 
-	print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page