alxarafe / alixar

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/ajaxcountries.php

Indentation +20 added lines, -20 removed lines

@@ -52,27 +52,27 @@
 // Generate list of countries
 if (! empty($country))
 {
-	global $langs;
-	$langs->load("dict");
+    global $langs;
+    $langs->load("dict");
 
-	$sql = "SELECT rowid, code, label, active";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-	$sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
-	$sql.= " ORDER BY label ASC";
+    $sql = "SELECT rowid, code, label, active";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_country";
+    $sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
+    $sql.= " ORDER BY label ASC";
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		print '<ul>';
-		while($country = $db->fetch_object($resql))
-		{
-			print '<li>';
-			// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
-			print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
-			print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
-			print '</li>';
-		}
-		print '</ul>';
-	}
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        print '<ul>';
+        while($country = $db->fetch_object($resql))
+        {
+            print '<li>';
+            // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
+            print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
+            print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
+            print '</li>';
+        }
+        print '</ul>';
+    }
 }
 

Spacing +15 added lines, -15 removed lines

@@ -22,16 +22,16 @@ 
  *       \brief      File to return Ajax response on country request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 require '../main.inc.php';
 
-$country=GETPOST('country', 'alpha');
+$country = GETPOST('country', 'alpha');
 
 
 /*
@@ -47,28 +47,28 @@ 
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog(join(',',$_POST));
+dol_syslog(join(',', $_POST));
 
 // Generate list of countries
-if (! empty($country))
+if (!empty($country))
 {
 	global $langs;
 	$langs->load("dict");
 
 	$sql = "SELECT rowid, code, label, active";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-	$sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
-	$sql.= " ORDER BY label ASC";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
+	$sql .= " WHERE active = 1 AND label LIKE '%".$db->escape(utf8_decode($country))."%'";
+	$sql .= " ORDER BY label ASC";
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		print '<ul>';
-		while($country = $db->fetch_object($resql))
+		while ($country = $db->fetch_object($resql))
 		{
 			print '<li>';
 			// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
-			print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
+			print ($country->code && $langs->trans("Country".$country->code) != "Country".$country->code ? $langs->trans("Country".$country->code) : ($country->label != '-' ? $country->label : '&nbsp;'));
 			print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
 			print '</li>';
 		}

Braces +19 added lines, -6 removed lines

@@ -22,12 +22,25 @@
  *       \brief      File to return Ajax response on country request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
 
 require '../main.inc.php';
 

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

Spacing +158 added lines, -158 removed lines

@@ -35,67 +35,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]));
 	}
 }
 
@@ -109,14 +109,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;
@@ -126,24 +126,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;
@@ -165,15 +165,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';
 
@@ -181,7 +181,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');
 
@@ -192,26 +192,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>';
 }
 
@@ -222,15 +222,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>';
 	}
 }
 
@@ -241,34 +241,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 "
@@ -284,7 +284,7 @@ 
  $sql.=$hookmanager->resPrint;
  */
 
-$sql.=$db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -299,10 +299,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;
@@ -310,16 +310,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.'">';
@@ -334,16 +334,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 = '';
@@ -351,46 +351,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";
@@ -399,58 +399,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.'"';
@@ -458,10 +458,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;
 			}
 		}
@@ -469,19 +469,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>';
 
@@ -492,11 +492,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)
@@ -513,16 +513,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";
@@ -530,23 +530,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

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);

dolibarr/htdocs/societe/agenda.php

Indentation +31 added lines, -31 removed lines

@@ -100,23 +100,23 @@ 
 
 if ($socid > 0)
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-	$langs->load("companies");
+    $langs->load("companies");
 
 
-	$object = new Societe($db);
-	$result = $object->fetch($socid);
+    $object = new Societe($db);
+    $result = $object->fetch($socid);
 
-	$title=$langs->trans("Agenda");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+    $title=$langs->trans("Agenda");
+    if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+    llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($object);
+    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    $head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
+    dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -127,15 +127,15 @@ 
     print '<div class="underbanner clearboth"></div>';
 
     $object->info($socid);
-	print dol_print_object_info($object, 1);
+    print dol_print_object_info($object, 1);
 
-	print '</div>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
 
 
-	// Actions buttons
+    // Actions buttons
 
     $objthirdparty=$object;
     $objcon=new stdClass();
@@ -147,40 +147,40 @@ 
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
         if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
         $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
-    	//$out.=$langs->trans("AddAnAction").' ';
-    	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    	//$out.="</a>";
-	}
+        //$out.=$langs->trans("AddAnAction").' ';
+        //$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+        //$out.="</a>";
+    }
 
 
-	//print '<div class="tabsAction">';
-	//print '</div>';
+    //print '<div class="tabsAction">';
+    //print '</div>';
 
 
-	$newcardbutton='';
+    $newcardbutton='';
     if (! empty($conf->agenda->enabled))
     {
-    	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
-    	{
-        	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
-        	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-        	$newcardbutton.= '</a>';
-    	}
+        if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
+        {
+            $newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
+            $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+            $newcardbutton.= '</a>';
+        }
     }
 
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
     {
-    	print '<br>';
+        print '<br>';
 
         $param='&socid='.$socid;
         if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 
-		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
+        print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
         //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
         // List of all actions
-		$filters=array();
+        $filters=array();
         $filters['search_agenda_label']=$search_agenda_label;
 
         // TODO Replace this with same code than into list.php

Spacing +44 added lines, -44 removed lines

@@ -34,32 +34,32 @@ 
 
 $langs->load("companies");
 
-if (GETPOST('actioncode','array'))
+if (GETPOST('actioncode', 'array'))
 {
-    $actioncode=GETPOST('actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
+    $actioncode = GETPOST('actioncode', 'array', 3);
+    if (!count($actioncode)) $actioncode = '0';
 }
 else
 {
-    $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
-$search_agenda_label=GETPOST('search_agenda_label');
+$search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = 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='a.datep,a.id';
-if (! $sortorder) $sortorder='DESC,DESC';
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
@@ -69,24 +69,24 @@ 
  *	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;
     }
 
     // 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
     {
-        $actioncode='';
-        $search_agenda_label='';
+        $actioncode = '';
+        $search_agenda_label = '';
     }
 }
 
@@ -109,18 +109,18 @@ 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
 
-	$title=$langs->trans("Agenda");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+	$title = $langs->trans("Agenda");
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
 
     $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');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -137,16 +137,16 @@ 
 
 	// Actions buttons
 
-    $objthirdparty=$object;
-    $objcon=new stdClass();
+    $objthirdparty = $object;
+    $objcon = new stdClass();
 
-    $out='';
-    $permok=$user->rights->agenda->myactions->create;
-    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    $out = '';
+    $permok = $user->rights->agenda->myactions->create;
+    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
     {
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
-        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
+        if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+        $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
     	//$out.=$langs->trans("AddAnAction").' ';
     	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
     	//$out.="</a>";
@@ -157,34 +157,34 @@ 
 	//print '</div>';
 
 
-	$newcardbutton='';
-    if (! empty($conf->agenda->enabled))
+	$newcardbutton = '';
+    if (!empty($conf->agenda->enabled))
     {
-    	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
+    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
-        	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
-        	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-        	$newcardbutton.= '</a>';
+        	$newcardbutton .= '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
+        	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        	$newcardbutton .= '</a>';
     	}
     }
 
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
     {
     	print '<br>';
 
-        $param='&socid='.$socid;
-        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+        $param = '&socid='.$socid;
+        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
         //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
         // List of all actions
-		$filters=array();
-        $filters['search_agenda_label']=$search_agenda_label;
+		$filters = array();
+        $filters['search_agenda_label'] = $search_agenda_label;
 
         // TODO Replace this with same code than into list.php
-        show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
+        show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder);
     }
 }
 

Braces +34 added lines, -13 removed lines

@@ -37,9 +37,10 @@ 
 if (GETPOST('actioncode','array'))
 {
     $actioncode=GETPOST('actioncode','array',3);
-    if (! count($actioncode)) $actioncode='0';
-}
-else
+    if (! count($actioncode)) {
+        $actioncode='0';
+    }
+    } else
 {
     $actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -47,7 +48,9 @@ 
 
 // Security check
 $socid = 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;
@@ -58,8 +61,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='a.datep,a.id';
-if (! $sortorder) $sortorder='DESC,DESC';
+if (! $sortfield) {
+    $sortfield='a.datep,a.id';
+}
+if (! $sortorder) {
+    $sortorder='DESC,DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
@@ -71,7 +78,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))
 {
@@ -83,9 +92,11 @@ 
     }
 
     // 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
     {
         $actioncode='';
+    }
         $search_agenda_label='';
     }
 }
@@ -110,10 +121,14 @@ 
 	$result = $object->fetch($socid);
 
 	$title=$langs->trans("Agenda");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	    $title=$object->name." - ".$title;
+	}
 	llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
@@ -145,7 +160,9 @@ 
     if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
     {
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        if (get_class($objthirdparty) == 'Societe') {
+            $out.='&amp;socid='.$objthirdparty->id;
+        }
         $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
     	//$out.=$langs->trans("AddAnAction").' ';
     	//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -173,8 +190,12 @@ 
     	print '<br>';
 
         $param='&socid='.$socid;
-        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+        if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+            $param.='&contextpage='.$contextpage;
+        }
+        if ($limit > 0 && $limit != $conf->liste_limit) {
+            $param.='&limit='.$limit;
+        }
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
         //print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);

dolibarr/htdocs/societe/admin/societe.php

Indentation +475 added lines, -475 removed lines

@@ -46,169 +46,169 @@ 
 
 if ($action == 'setcodeclient')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 if ($action == 'setcodecompta')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 if ($action == 'updateoptions')
 {
-	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
-	{
-		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
-	    {
-		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
-	    {
-		    setEventMessages($langs->trans("Error"), null, 'errors');
-		}
-	}
-
-	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
-	{
-		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
-		{
-			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans("Error"), null, 'errors');
-		}
-	}
+    if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
+    {
+        $companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
+        $res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
+
+    if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
+    {
+        $contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
+        $res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
 }
 
 // Activate a document generator module
 if ($action == 'set')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+    $label = GETPOST('label','alpha');
+    $scandir = GETPOST('scan_dir','alpha');
 
-	$type='company';
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+    $type='company';
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+    $sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
+    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
+    $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
+    $sql.= ")";
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+    $resql=$db->query($sql);
+    if (! $resql) dol_print_error($db);
 }
 
 // Disable a document generator module
 if ($action== 'del')
 {
-	$type='company';
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+    $type='company';
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+    $sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
+    $resql=$db->query($sql);
+    if (! $resql) dol_print_error($db);
 }
 
 // Define default generator
 if ($action == 'setdoc')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+    $label = GETPOST('label','alpha');
+    $scandir = GETPOST('scan_dir','alpha');
 
-	$db->begin();
+    $db->begin();
 
-	dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
 
-	// On active le modele
-	$type='company';
-	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
-	$sql_del.= " AND type = '".$type."'";
-	$sql_del.= " AND entity = ".$conf->entity;
+    // On active le modele
+    $type='company';
+    $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+    $sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
+    $sql_del.= " AND type = '".$type."'";
+    $sql_del.= " AND entity = ".$conf->entity;
     dol_syslog("societe.php ".$sql);
-	$result1=$db->query($sql_del);
+    $result1=$db->query($sql_del);
 
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
+    $sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
+    $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
+    $sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
+    $sql.= ")";
     dol_syslog("societe.php", LOG_DEBUG);
-	$result2=$db->query($sql);
-	if ($result1 && $result2)
-	{
-		$db->commit();
-	}
-	else
-	{
-	    $db->rollback();
-	}
+    $result2=$db->query($sql);
+    if ($result1 && $result2)
+    {
+        $db->commit();
+    }
+    else
+    {
+        $db->rollback();
+    }
 }
 
 //Activate Set ref in list
 if ($action=="setaddrefinlist") {
-	$setaddrefinlist = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $setaddrefinlist = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate Set adress in list
 if ($action=="setaddadressinlist") {
-	$val = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $val = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate Ask For Preferred Shipping Method
 if ($action=="setaskforshippingmet") {
-	$setaskforshippingmet = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $setaskforshippingmet = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
+    if (! $res > 0) $error++;
+    if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 
 //Activate "Disable prospect/customer type"
@@ -229,81 +229,81 @@ 
 //Activate ProfId unique
 if ($action == 'setprofid')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_UNIQUE";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_UNIQUE";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Activate ProfId mandatory
 if ($action == 'setprofidmandatory')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_MANDATORY";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Activate ProfId invoice mandatory
 if ($action == 'setprofidinvoicemandatory')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	$idprof="SOCIETE_".$value."_INVOICE_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $idprof="SOCIETE_".$value."_INVOICE_MANDATORY";
+    if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        //header("Location: ".$_SERVER["PHP_SELF"]);
+        //exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 //Set hide closed customer into combox or select
 if ($action == 'sethideinactivethirdparty')
 {
-	$status = GETPOST('status','alpha');
+    $status = GETPOST('status','alpha');
 
-	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 if($action=='setonsearchandlistgooncustomerorsuppliercard'){
-       $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
-       $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
-       if (! $res > 0) $error++;
-       if (! $error)
-       {
-               setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-       }
-       else
-       {
-               setEventMessages($langs->trans("Error"), null, 'errors');
-       }
+        $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
+        $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
+        if (! $res > 0) $error++;
+        if (! $error)
+        {
+                setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+                setEventMessages($langs->trans("Error"), null, 'errors');
+        }
 }
 
 
@@ -343,63 +343,63 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+    $dir = dol_buildpath($dirroot,0);
 
     $handle = @opendir($dir);
     if (is_resource($handle))
     {
-    	// Loop on each module find in opened directory
-    	while (($file = readdir($handle))!==false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
-
-    			try {
-        			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$modCodeTiers = new $file;
-
-    			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-
-    			print '<tr class="oddeven">'."\n";
-    			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
-    			print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
-    			print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
-
-    			if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
-    			{
-    				print '<td align="center">'."\n";
-    				print img_picto($langs->trans("Activated"),'switch_on');
-    				print "</td>\n";
-    			}
-    			else
-    			{
-    				$disabled = false;
-    				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
-    				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				if (! $disabled) print '</a>';
-    				print '</td>';
-    			}
-
-    			print '<td align="center">';
-    			$s=$modCodeTiers->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
-    			print '</td>';
-
-    			print '</tr>';
-    		}
-    	}
-    	closedir($handle);
+        // Loop on each module find in opened directory
+        while (($file = readdir($handle))!==false)
+        {
+            if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
+            {
+                $file = substr($file, 0, dol_strlen($file)-4);
+
+                try {
+                    dol_include_once($dirroot.$file.'.php');
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $modCodeTiers = new $file;
+
+                // Show modules according to features level
+                if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+                if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+                print '<tr class="oddeven">'."\n";
+                print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
+                print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
+                print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
+
+                if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
+                {
+                    print '<td align="center">'."\n";
+                    print img_picto($langs->trans("Activated"),'switch_on');
+                    print "</td>\n";
+                }
+                else
+                {
+                    $disabled = false;
+                    if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
+                    print '<td align="center">';
+                    if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+                    print img_picto($langs->trans("Disabled"),'switch_off');
+                    if (! $disabled) print '</a>';
+                    print '</td>';
+                }
+
+                print '<td align="center">';
+                $s=$modCodeTiers->getToolTip($langs,null,-1);
+                print $form->textwithpicto('',$s,1);
+                print '</td>';
+
+                print '</tr>';
+            }
+        }
+        closedir($handle);
     }
 }
 print '</table>';
@@ -423,53 +423,53 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+    $dir = dol_buildpath($dirroot,0);
 
-	$handle = @opendir($dir);
+    $handle = @opendir($dir);
     if (is_resource($handle))
     {
-    	while (($file = readdir($handle))!==false)
-    	{
-    		if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
-    		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
-
-    		    try {
-        			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$modCodeCompta = new $file;
-
-    			print '<tr class="oddeven">';
-    			print '<td>'.$modCodeCompta->name."</td><td>\n";
-    			print $modCodeCompta->info($langs);
-    			print '</td>';
-    			print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
-
-    			if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
-    			{
-    				print '<td align="center">';
-    				print img_picto($langs->trans("Activated"),'switch_on');
-    				print '</td>';
-    			}
-    			else
-    			{
-    				print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				print '</a></td>';
-    			}
-    			print '<td align="center">';
-    			$s=$modCodeCompta->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
-    			print '</td>';
-    			print "</tr>\n";
-    		}
-    	}
-    	closedir($handle);
+        while (($file = readdir($handle))!==false)
+        {
+            if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
+            {
+                $file = substr($file, 0, dol_strlen($file)-4);
+
+                try {
+                    dol_include_once($dirroot.$file.'.php');
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $modCodeCompta = new $file;
+
+                print '<tr class="oddeven">';
+                print '<td>'.$modCodeCompta->name."</td><td>\n";
+                print $modCodeCompta->info($langs);
+                print '</td>';
+                print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
+
+                if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
+                {
+                    print '<td align="center">';
+                    print img_picto($langs->trans("Activated"),'switch_on');
+                    print '</td>';
+                }
+                else
+                {
+                    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
+                    print img_picto($langs->trans("Disabled"),'switch_off');
+                    print '</a></td>';
+                }
+                print '<td align="center">';
+                $s=$modCodeCompta->getToolTip($langs,null,-1);
+                print $form->textwithpicto('',$s,1);
+                print '</td>';
+                print "</tr>\n";
+            }
+        }
+        closedir($handle);
     }
 }
 print "</table>\n";
@@ -490,18 +490,18 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$i = 0;
-	$num_rows=$db->num_rows($resql);
-	while ($i < $num_rows)
-	{
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
-		$i++;
-	}
+    $i = 0;
+    $num_rows=$db->num_rows($resql);
+    while ($i < $num_rows)
+    {
+        $array = $db->fetch_array($resql);
+        array_push($def, $array[0]);
+        $i++;
+    }
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 print '<table class="noborder" width="100%">';
@@ -515,108 +515,108 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot.'doc/',0);
-
-	$handle=@opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle))!==false)
-		{
-			if (preg_match('/\.modules\.php$/i',$file))
-			{
-				$name = substr($file, 4, dol_strlen($file) -16);
-				$classname = substr($file, 0, dol_strlen($file) -12);
-
-			    try {
-        			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch(Exception $e)
-    			{
-    			    dol_syslog($e->getMessage(), LOG_ERR);
-    			}
-
-    			$module = new $classname($db);
-
-				$modulequalified=1;
-				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-				}
-
-				if ($modulequalified)
-				{
-					print '<tr class="oddeven"><td width="100">';
-					print $module->name;
-					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
-					print '</td>';
-
-					// Activate / Disable
-					if (in_array($name, $def))
-					{
-						print "<td align=\"center\">\n";
-						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
-						//{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
-							print img_picto($langs->trans("Enabled"),'switch_on');
-							print '</a>';
-						//}
-						//else
-						//{
-						//	print img_picto($langs->trans("Enabled"),'on');
-						//}
-						print "</td>";
-					}
-					else
-					{
-						if (versioncompare($module->phpmin,versionphparray()) > 0)
-						{
-							print "<td align=\"center\">\n";
-							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
-							print "</td>";
-						}
-						else
-						{
-							print "<td align=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-							print "</td>";
-						}
-					}
-
-					// Info
-					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-					if ($module->type == 'pdf')
-					{
-						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
-					}
-					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-
-					print '<td align="center" class="nowrap">';
-					print $form->textwithpicto('',$htmltooltip,1,0);
-					print '</td>';
-
-					// Preview
-					print '<td align="center" class="nowrap">';
-					if ($module->type == 'pdf')
-					{
-						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
-					{
-						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
-					}
-					print $linkspec;
-					print '</td>';
-
-					print "</tr>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
+    $dir = dol_buildpath($dirroot.'doc/',0);
+
+    $handle=@opendir($dir);
+    if (is_resource($handle))
+    {
+        while (($file = readdir($handle))!==false)
+        {
+            if (preg_match('/\.modules\.php$/i',$file))
+            {
+                $name = substr($file, 4, dol_strlen($file) -16);
+                $classname = substr($file, 0, dol_strlen($file) -12);
+
+                try {
+                    dol_include_once($dirroot.'doc/'.$file);
+                }
+                catch(Exception $e)
+                {
+                    dol_syslog($e->getMessage(), LOG_ERR);
+                }
+
+                $module = new $classname($db);
+
+                $modulequalified=1;
+                if (! empty($module->version)) {
+                    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+                    else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+                }
+
+                if ($modulequalified)
+                {
+                    print '<tr class="oddeven"><td width="100">';
+                    print $module->name;
+                    print "</td><td>\n";
+                    if (method_exists($module,'info')) print $module->info($langs);
+                    else print $module->description;
+                    print '</td>';
+
+                    // Activate / Disable
+                    if (in_array($name, $def))
+                    {
+                        print "<td align=\"center\">\n";
+                        //if ($conf->global->COMPANY_ADDON_PDF != "$name")
+                        //{
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+                            print img_picto($langs->trans("Enabled"),'switch_on');
+                            print '</a>';
+                        //}
+                        //else
+                        //{
+                        //	print img_picto($langs->trans("Enabled"),'on');
+                        //}
+                        print "</td>";
+                    }
+                    else
+                    {
+                        if (versioncompare($module->phpmin,versionphparray()) > 0)
+                        {
+                            print "<td align=\"center\">\n";
+                            print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+                            print "</td>";
+                        }
+                        else
+                        {
+                            print "<td align=\"center\">\n";
+                            print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                            print "</td>";
+                        }
+                    }
+
+                    // Info
+                    $htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+                    $htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+                    if ($module->type == 'pdf')
+                    {
+                        $htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+                    }
+                    $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+                    $htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+
+                    print '<td align="center" class="nowrap">';
+                    print $form->textwithpicto('',$htmltooltip,1,0);
+                    print '</td>';
+
+                    // Preview
+                    print '<td align="center" class="nowrap">';
+                    if ($module->type == 'pdf')
+                    {
+                        $linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+                    }
+                    else
+                    {
+                        $linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+                    }
+                    print $linkspec;
+                    print '</td>';
+
+                    print "</tr>\n";
+                }
+            }
+        }
+        closedir($handle);
+    }
 }
 print '</table>';
 
@@ -652,63 +652,63 @@ 
 $nbofloop=count($profid);
 foreach($profid as $key => $val)
 {
-	if ($profid[$key][1]!='-')
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$profid[$key][0]."</td><td>\n";
-		print $profid[$key][1];
-		print '</td>';
-
-		$idprof_unique ='SOCIETE_'.$key.'_UNIQUE';
-		$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-		$idprof_invoice_mandatory ='SOCIETE_'.$key.'_INVOICE_MANDATORY';
-
-		$verif=(empty($conf->global->$idprof_unique)?false:true);
-		$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
-		$invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
-
-		if ($verif)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		if ($mandatory)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		if ($invoice_mandatory)
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
-			print '</a></td>';
-		}
-		else
-		{
-			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
-			print '</a></td>';
-		}
-
-		print "</tr>\n";
-	}
-	$i++;
+    if ($profid[$key][1]!='-')
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$profid[$key][0]."</td><td>\n";
+        print $profid[$key][1];
+        print '</td>';
+
+        $idprof_unique ='SOCIETE_'.$key.'_UNIQUE';
+        $idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
+        $idprof_invoice_mandatory ='SOCIETE_'.$key.'_INVOICE_MANDATORY';
+
+        $verif=(empty($conf->global->$idprof_unique)?false:true);
+        $mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
+        $invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
+
+        if ($verif)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        if ($mandatory)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        if ($invoice_mandatory)
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
+            print img_picto($langs->trans("Activated"),'switch_on');
+            print '</a></td>';
+        }
+        else
+        {
+            print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
+            print img_picto($langs->trans("Disabled"),'switch_off');
+            print '</a></td>';
+        }
+
+        print "</tr>\n";
+    }
+    $i++;
 }
 
 print "</table><br>\n";
@@ -735,22 +735,22 @@ 
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
 if (! $conf->use_javascript_ajax)
 {
-	print '<td class="nowrap" align="right" colspan="2">';
-	print $langs->trans("NotAvailableWhenAjaxDisabled");
-	print "</td>";
+    print '<td class="nowrap" align="right" colspan="2">';
+    print $langs->trans("NotAvailableWhenAjaxDisabled");
+    print "</td>";
 }
 else
 {
-	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
+    print '<td width="60" align="right">';
+    $arrval=array('0'=>$langs->trans("No"),
+    '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
     '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
     '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
-	);
-	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
-	print '</td><td align="right">';
-	print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
-	print "</td>";
+    );
+    print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+    print '</td><td align="right">';
+    print '<input type="submit" class="button" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+    print "</td>";
 }
 print '</tr>';
 
@@ -759,22 +759,22 @@ 
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
 if (! $conf->use_javascript_ajax)
 {
-	print '<td class="nowrap" align="right" colspan="2">';
-	print $langs->trans("NotAvailableWhenAjaxDisabled");
-	print "</td>";
+    print '<td class="nowrap" align="right" colspan="2">';
+    print $langs->trans("NotAvailableWhenAjaxDisabled");
+    print "</td>";
 }
 else
 {
-	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
-	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
-	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
-	);
-	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
-	print '</td><td align="right">';
-	print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
-	print "</td>";
+    print '<td width="60" align="right">';
+    $arrval=array('0'=>$langs->trans("No"),
+    '1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
+    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
+    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+    );
+    print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+    print '</td><td align="right">';
+    print '<input type="submit" class="button" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+    print "</td>";
 }
 print '</tr>';
 
@@ -786,13 +786,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -803,13 +803,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -822,13 +822,13 @@ 
 print '<td align="center">';
 if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
 print '</tr>';

Spacing +184 added lines, -184 removed lines

@@ -31,8 +31,8 @@ 
 
 $langs->loadLangs(array("admin", "other"));
 
-$action=GETPOST('action','alpha');
-$value=GETPOST('value','alpha');
+$action = GETPOST('action', 'alpha');
+$value = GETPOST('value', 'alpha');
 
 if (!$user->admin) accessforbidden();
 
@@ -46,7 +46,7 @@ 
 
 if ($action == 'setcodeclient')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -59,7 +59,7 @@ 
 
 if ($action == 'setcodecompta')
 {
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON",$value,'chaine',0,'',$conf->entity) > 0)
+	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -74,10 +74,10 @@ 
 {
 	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
 	{
-		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
+		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT', 'alpha');
+		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity);
+		if (!$res > 0) $error++;
+		if (!$error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	    }
@@ -89,10 +89,10 @@ 
 
 	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
 	{
-		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
-		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
-		if (! $error)
+		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT', 'alpha');
+		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch, 'chaine', 0, '', $conf->entity);
+		if (!$res > 0) $error++;
+		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		}
@@ -106,56 +106,56 @@ 
 // Activate a document generator module
 if ($action == 'set')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+	$label = GETPOST('label', 'alpha');
+	$scandir = GETPOST('scan_dir', 'alpha');
 
-	$type='company';
+	$type = 'company';
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+	$sql .= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
+	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
+	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
+	$sql .= ")";
 
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 }
 
 // Disable a document generator module
-if ($action== 'del')
+if ($action == 'del')
 {
-	$type='company';
+	$type = 'company';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
+	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
+	$resql = $db->query($sql);
+	if (!$resql) dol_print_error($db);
 }
 
 // Define default generator
 if ($action == 'setdoc')
 {
-	$label = GETPOST('label','alpha');
-	$scandir = GETPOST('scan_dir','alpha');
+	$label = GETPOST('label', 'alpha');
+	$scandir = GETPOST('scan_dir', 'alpha');
 
 	$db->begin();
 
-	dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "COMPANY_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity);
 
 	// On active le modele
-	$type='company';
+	$type = 'company';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql_del.= " WHERE nom = '".$db->escape(GETPOST('value','alpha'))."'";
-	$sql_del.= " AND type = '".$type."'";
-	$sql_del.= " AND entity = ".$conf->entity;
+	$sql_del .= " WHERE nom = '".$db->escape(GETPOST('value', 'alpha'))."'";
+	$sql_del .= " AND type = '".$type."'";
+	$sql_del .= " AND entity = ".$conf->entity;
     dol_syslog("societe.php ".$sql);
-	$result1=$db->query($sql_del);
+	$result1 = $db->query($sql_del);
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql.= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
-	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
-	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
-	$sql.= ")";
+	$sql .= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
+	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
+	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
+	$sql .= ")";
     dol_syslog("societe.php", LOG_DEBUG);
-	$result2=$db->query($sql);
+	$result2 = $db->query($sql);
 	if ($result1 && $result2)
 	{
 		$db->commit();
@@ -167,11 +167,11 @@ 
 }
 
 //Activate Set ref in list
-if ($action=="setaddrefinlist") {
-	$setaddrefinlist = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
+if ($action == "setaddrefinlist") {
+	$setaddrefinlist = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -182,11 +182,11 @@ 
 }
 
 //Activate Set adress in list
-if ($action=="setaddadressinlist") {
-	$val = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
+if ($action == "setaddadressinlist") {
+	$val = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -197,11 +197,11 @@ 
 }
 
 //Activate Ask For Preferred Shipping Method
-if ($action=="setaskforshippingmet") {
-	$setaskforshippingmet = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
-	if (! $error)
+if ($action == "setaskforshippingmet") {
+	$setaskforshippingmet = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -212,11 +212,11 @@ 
 }
 
 //Activate "Disable prospect/customer type"
-if ($action=="setdisableprospectcustomer") {
-    $setdisableprospectcustomer = GETPOST('value','int');
-    $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
-    if (! $error)
+if ($action == "setdisableprospectcustomer") {
+    $setdisableprospectcustomer = GETPOST('value', 'int');
+    $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
+    if (!$res > 0) $error++;
+    if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
@@ -229,9 +229,9 @@ 
 //Activate ProfId unique
 if ($action == 'setprofid')
 {
-	$status = GETPOST('status','alpha');
+	$status = GETPOST('status', 'alpha');
 
-	$idprof="SOCIETE_".$value."_UNIQUE";
+	$idprof = "SOCIETE_".$value."_UNIQUE";
 	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
@@ -246,9 +246,9 @@ 
 //Activate ProfId mandatory
 if ($action == 'setprofidmandatory')
 {
-	$status = GETPOST('status','alpha');
+	$status = GETPOST('status', 'alpha');
 
-	$idprof="SOCIETE_".$value."_MANDATORY";
+	$idprof = "SOCIETE_".$value."_MANDATORY";
 	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
@@ -263,9 +263,9 @@ 
 //Activate ProfId invoice mandatory
 if ($action == 'setprofidinvoicemandatory')
 {
-	$status = GETPOST('status','alpha');
+	$status = GETPOST('status', 'alpha');
 
-	$idprof="SOCIETE_".$value."_INVOICE_MANDATORY";
+	$idprof = "SOCIETE_".$value."_INVOICE_MANDATORY";
 	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
@@ -280,9 +280,9 @@ 
 //Set hide closed customer into combox or select
 if ($action == 'sethideinactivethirdparty')
 {
-	$status = GETPOST('status','alpha');
+	$status = GETPOST('status', 'alpha');
 
-	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0)
+	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX", $status, 'chaine', 0, '', $conf->entity) > 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -292,11 +292,11 @@ 
 		dol_print_error($db);
 	}
 }
-if($action=='setonsearchandlistgooncustomerorsuppliercard'){
-       $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
-       $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
-       if (! $res > 0) $error++;
-       if (! $error)
+if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
+       $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+       $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
+       if (!$res > 0) $error++;
+       if (!$error)
        {
                setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
        }
@@ -313,24 +313,24 @@ 
 
 clearstatcache();
 
-$form=new Form($db);
+$form = new Form($db);
 
-$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers|ES:Configuración_del_módulo_terceros';
-llxHeader('',$langs->trans("CompanySetup"),$help_url);
+$help_url = 'EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers|ES:Configuración_del_módulo_terceros';
+llxHeader('', $langs->trans("CompanySetup"), $help_url);
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 
 $head = societe_admin_prepare_head();
 
 dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
 
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
+$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 
 // Module to manage customer/supplier code
 
-print load_fiche_titre($langs->trans("CompanyCodeChecker"),'','');
+print load_fiche_titre($langs->trans("CompanyCodeChecker"), '', '');
 
 print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">'."\n";
@@ -343,22 +343,22 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+	$dir = dol_buildpath($dirroot, 0);
 
     $handle = @opendir($dir);
     if (is_resource($handle))
     {
     	// Loop on each module find in opened directory
-    	while (($file = readdir($handle))!==false)
+    	while (($file = readdir($handle)) !== false)
     	{
     		if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
     		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
+    			$file = substr($file, 0, dol_strlen($file) - 4);
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
     			}
-    			catch(Exception $e)
+    			catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -366,7 +366,7 @@ 
     			$modCodeTiers = new $file;
 
     			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+    			if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
     			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
     			print '<tr class="oddeven">'."\n";
@@ -377,23 +377,23 @@ 
     			if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
     			{
     				print '<td align="center">'."\n";
-    				print img_picto($langs->trans("Activated"),'switch_on');
+    				print img_picto($langs->trans("Activated"), 'switch_on');
     				print "</td>\n";
     			}
     			else
     			{
     				$disabled = false;
-    				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
+    				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
-    				if (! $disabled) print '</a>';
+    				if (!$disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				print img_picto($langs->trans("Disabled"), 'switch_off');
+    				if (!$disabled) print '</a>';
     				print '</td>';
     			}
 
     			print '<td align="center">';
-    			$s=$modCodeTiers->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
+    			$s = $modCodeTiers->getToolTip($langs, null, -1);
+    			print $form->textwithpicto('', $s, 1);
     			print '</td>';
 
     			print '</tr>';
@@ -410,7 +410,7 @@ 
 
 // Select accountancy code numbering module
 
-print load_fiche_titre($langs->trans("AccountCodeManager"),'','');
+print load_fiche_titre($langs->trans("AccountCodeManager"), '', '');
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -423,21 +423,21 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot,0);
+	$dir = dol_buildpath($dirroot, 0);
 
 	$handle = @opendir($dir);
     if (is_resource($handle))
     {
-    	while (($file = readdir($handle))!==false)
+    	while (($file = readdir($handle)) !== false)
     	{
     		if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
     		{
-    			$file = substr($file, 0, dol_strlen($file)-4);
+    			$file = substr($file, 0, dol_strlen($file) - 4);
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
     			}
-    			catch(Exception $e)
+    			catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -453,18 +453,18 @@ 
     			if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
     			{
     				print '<td align="center">';
-    				print img_picto($langs->trans("Activated"),'switch_on');
+    				print img_picto($langs->trans("Activated"), 'switch_on');
     				print '</td>';
     			}
     			else
     			{
     				print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
-    				print img_picto($langs->trans("Disabled"),'switch_off');
+    				print img_picto($langs->trans("Disabled"), 'switch_off');
     				print '</a></td>';
     			}
     			print '<td align="center">';
-    			$s=$modCodeCompta->getToolTip($langs,null,-1);
-    			print $form->textwithpicto('',$s,1);
+    			$s = $modCodeCompta->getToolTip($langs, null, -1);
+    			print $form->textwithpicto('', $s, 1);
     			print '</td>';
     			print "</tr>\n";
     		}
@@ -479,19 +479,19 @@ 
  *  Document templates generators
  */
 print '<br>';
-print load_fiche_titre($langs->trans("ModelModules"),'','');
+print load_fiche_titre($langs->trans("ModelModules"), '', '');
 
 // Load array def with activated templates
 $def = array();
 $sql = "SELECT nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = 'company'";
-$sql.= " AND entity = ".$conf->entity;
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = 'company'";
+$sql .= " AND entity = ".$conf->entity;
+$resql = $db->query($sql);
 if ($resql)
 {
 	$i = 0;
-	$num_rows=$db->num_rows($resql);
+	$num_rows = $db->num_rows($resql);
 	while ($i < $num_rows)
 	{
 		$array = $db->fetch_array($resql);
@@ -515,32 +515,32 @@ 
 
 foreach ($dirsociete as $dirroot)
 {
-	$dir = dol_buildpath($dirroot.'doc/',0);
+	$dir = dol_buildpath($dirroot.'doc/', 0);
 
-	$handle=@opendir($dir);
+	$handle = @opendir($dir);
 	if (is_resource($handle))
 	{
-		while (($file = readdir($handle))!==false)
+		while (($file = readdir($handle)) !== false)
 		{
-			if (preg_match('/\.modules\.php$/i',$file))
+			if (preg_match('/\.modules\.php$/i', $file))
 			{
-				$name = substr($file, 4, dol_strlen($file) -16);
-				$classname = substr($file, 0, dol_strlen($file) -12);
+				$name = substr($file, 4, dol_strlen($file) - 16);
+				$classname = substr($file, 0, dol_strlen($file) - 12);
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
     			}
-    			catch(Exception $e)
+    			catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
 
     			$module = new $classname($db);
 
-				$modulequalified=1;
-				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+				$modulequalified = 1;
+				if (!empty($module->version)) {
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 				}
 
 				if ($modulequalified)
@@ -548,7 +548,7 @@ 
 					print '<tr class="oddeven"><td width="100">';
 					print $module->name;
 					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
+					if (method_exists($module, 'info')) print $module->info($langs);
 					else print $module->description;
 					print '</td>';
 
@@ -559,7 +559,7 @@ 
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
-							print img_picto($langs->trans("Enabled"),'switch_on');
+							print img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						//}
 						//else
@@ -570,43 +570,43 @@ 
 					}
 					else
 					{
-						if (versioncompare($module->phpmin,versionphparray()) > 0)
+						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
 							print "<td align=\"center\">\n";
-							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
+							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
 						}
 						else
 						{
 							print "<td align=\"center\">\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
 						}
 					}
 
 					// Info
-					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-					$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
 					if ($module->type == 'pdf')
 					{
-						$htmltooltip.='<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+						$htmltooltip .= '<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
 					}
-					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
+					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraft").': '.yn((!empty($module->option_draft_watermark) ? $module->option_draft_watermark : ''), 1, 1);
 
 					print '<td align="center" class="nowrap">';
-					print $form->textwithpicto('',$htmltooltip,1,0);
+					print $form->textwithpicto('', $htmltooltip, 1, 0);
 					print '</td>';
 
 					// Preview
 					print '<td align="center" class="nowrap">';
 					if ($module->type == 'pdf')
 					{
-						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 					}
 					else
 					{
-						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
+						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
 					print $linkspec;
 					print '</td>';
@@ -623,7 +623,7 @@ 
 print '<br>';
 
 //IDProf
-print load_fiche_titre($langs->trans("CompanyIdProfChecker"),'','');
+print load_fiche_titre($langs->trans("CompanyIdProfChecker"), '', '');
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -634,75 +634,75 @@ 
 print '<td align="center">'.$langs->trans("MustBeInvoiceMandatory").'</td>';
 print "</tr>\n";
 
-$profid['IDPROF1'][0]=$langs->trans("ProfId1");
-$profid['IDPROF1'][1]=$langs->transcountry('ProfId1', $mysoc->country_code);
-$profid['IDPROF2'][0]=$langs->trans("ProfId2");
-$profid['IDPROF2'][1]=$langs->transcountry('ProfId2', $mysoc->country_code);
-$profid['IDPROF3'][0]=$langs->trans("ProfId3");
-$profid['IDPROF3'][1]=$langs->transcountry('ProfId3', $mysoc->country_code);
-$profid['IDPROF4'][0]=$langs->trans("ProfId4");
-$profid['IDPROF4'][1]=$langs->transcountry('ProfId4', $mysoc->country_code);
-$profid['IDPROF5'][0]=$langs->trans("ProfId5");
-$profid['IDPROF5'][1]=$langs->transcountry('ProfId5', $mysoc->country_code);
-$profid['IDPROF6'][0]=$langs->trans("ProfId6");
-$profid['IDPROF6'][1]=$langs->transcountry('ProfId6', $mysoc->country_code);
-$profid['EMAIL'][0]=$langs->trans("EMail");
-$profid['EMAIL'][1]=$langs->trans('Email');
-
-$nbofloop=count($profid);
-foreach($profid as $key => $val)
-{
-	if ($profid[$key][1]!='-')
+$profid['IDPROF1'][0] = $langs->trans("ProfId1");
+$profid['IDPROF1'][1] = $langs->transcountry('ProfId1', $mysoc->country_code);
+$profid['IDPROF2'][0] = $langs->trans("ProfId2");
+$profid['IDPROF2'][1] = $langs->transcountry('ProfId2', $mysoc->country_code);
+$profid['IDPROF3'][0] = $langs->trans("ProfId3");
+$profid['IDPROF3'][1] = $langs->transcountry('ProfId3', $mysoc->country_code);
+$profid['IDPROF4'][0] = $langs->trans("ProfId4");
+$profid['IDPROF4'][1] = $langs->transcountry('ProfId4', $mysoc->country_code);
+$profid['IDPROF5'][0] = $langs->trans("ProfId5");
+$profid['IDPROF5'][1] = $langs->transcountry('ProfId5', $mysoc->country_code);
+$profid['IDPROF6'][0] = $langs->trans("ProfId6");
+$profid['IDPROF6'][1] = $langs->transcountry('ProfId6', $mysoc->country_code);
+$profid['EMAIL'][0] = $langs->trans("EMail");
+$profid['EMAIL'][1] = $langs->trans('Email');
+
+$nbofloop = count($profid);
+foreach ($profid as $key => $val)
+{
+	if ($profid[$key][1] != '-')
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$profid[$key][0]."</td><td>\n";
 		print $profid[$key][1];
 		print '</td>';
 
-		$idprof_unique ='SOCIETE_'.$key.'_UNIQUE';
-		$idprof_mandatory ='SOCIETE_'.$key.'_MANDATORY';
-		$idprof_invoice_mandatory ='SOCIETE_'.$key.'_INVOICE_MANDATORY';
+		$idprof_unique = 'SOCIETE_'.$key.'_UNIQUE';
+		$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
+		$idprof_invoice_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
 
-		$verif=(empty($conf->global->$idprof_unique)?false:true);
-		$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
-		$invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
+		$verif = (empty($conf->global->$idprof_unique) ?false:true);
+		$mandatory = (empty($conf->global->$idprof_mandatory) ?false:true);
+		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ?false:true);
 
 		if ($verif)
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
+			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
 		else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
+			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
 
 		if ($mandatory)
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
+			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
 		else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
+			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
 
 		if ($invoice_mandatory)
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
-			print img_picto($langs->trans("Activated"),'switch_on');
+			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
 		}
 		else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
-			print img_picto($langs->trans("Disabled"),'switch_off');
+			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
 
@@ -714,10 +714,10 @@ 
 print "</table><br>\n";
 
 
-print load_fiche_titre($langs->trans("Other"),'','');
+print load_fiche_titre($langs->trans("Other"), '', '');
 
 // Autres options
-$form=new Form($db);
+$form = new Form($db);
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -732,8 +732,8 @@ 
 // Utilisation formulaire Ajax sur choix societe
 
 print '<tr class="oddeven">';
-print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"),$langs->trans('UseSearchToSelectCompanyTooltip'),1).' </td>';
-if (! $conf->use_javascript_ajax)
+print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"), $langs->trans('UseSearchToSelectCompanyTooltip'), 1).' </td>';
+if (!$conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
@@ -742,10 +742,10 @@ 
 else
 {
 	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
-    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
-    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+	$arrval = array('0'=>$langs->trans("No"),
+	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
@@ -756,8 +756,8 @@ 
 
 
 print '<tr class="oddeven">';
-print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"),$langs->trans('UseSearchToSelectContactTooltip'),1).'</td>';
-if (! $conf->use_javascript_ajax)
+print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"), $langs->trans('UseSearchToSelectContactTooltip'), 1).'</td>';
+if (!$conf->use_javascript_ajax)
 {
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
@@ -766,10 +766,10 @@ 
 else
 {
 	print '<td width="60" align="right">';
-	$arrval=array('0'=>$langs->trans("No"),
-	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
-	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
-	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+	$arrval = array('0'=>$langs->trans("No"),
+	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
+	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
+	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 	print '</td><td align="right">';
@@ -787,12 +787,12 @@ 
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -804,12 +804,12 @@ 
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -823,12 +823,12 @@ 
 if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';
@@ -841,12 +841,12 @@ 
 if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
+    print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
+    print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
 print '</tr>';

Braces +86 added lines, -84 removed lines

@@ -34,7 +34,9 @@ 
 $action=GETPOST('action','alpha');
 $value=GETPOST('value','alpha');
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 
@@ -50,8 +52,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -63,8 +64,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -76,12 +76,13 @@ 
 	{
 		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT','alpha');
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
+		if (! $res > 0) {
+		    $error++;
+		}
 		if (! $error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
+	    } else
 	    {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
@@ -91,12 +92,13 @@ 
 	{
 		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
 		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
+		if (! $res > 0) {
+		    $error++;
+		}
 		if (! $error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
@@ -117,8 +119,10 @@ 
 	$sql.= ")";
 
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-}
+	if (! $resql) {
+	    dol_print_error($db);
+	}
+	}
 
 // Disable a document generator module
 if ($action== 'del')
@@ -127,8 +131,10 @@ 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql.= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
 	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-}
+	if (! $resql) {
+	    dol_print_error($db);
+	}
+	}
 
 // Define default generator
 if ($action == 'setdoc')
@@ -159,8 +165,7 @@ 
 	if ($result1 && $result2)
 	{
 		$db->commit();
-	}
-	else
+	} else
 	{
 	    $db->rollback();
 	}
@@ -170,12 +175,13 @@ 
 if ($action=="setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -185,12 +191,13 @@ 
 if ($action=="setaddadressinlist") {
 	$val = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -200,12 +207,13 @@ 
 if ($action=="setaskforshippingmet") {
 	$setaskforshippingmet = GETPOST('value','int');
 	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet,'yesno',0,'',$conf->entity);
-	if (! $res > 0) $error++;
+	if (! $res > 0) {
+	    $error++;
+	}
 	if (! $error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -215,12 +223,13 @@ 
 if ($action=="setdisableprospectcustomer") {
     $setdisableprospectcustomer = GETPOST('value','int');
     $res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+    if (! $res > 0) {
+        $error++;
+    }
     if (! $error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -236,8 +245,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -253,8 +261,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -270,8 +277,7 @@ 
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -286,8 +292,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -295,12 +300,13 @@ 
 if($action=='setonsearchandlistgooncustomerorsuppliercard'){
        $setonsearchandlistgooncustomerorsuppliercard = GETPOST('value','int');
        $res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard,'yesno',0,'',$conf->entity);
-       if (! $res > 0) $error++;
+       if (! $res > 0) {
+           $error++;
+       }
        if (! $error)
        {
                setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-       }
-       else
+       } else
        {
                setEventMessages($langs->trans("Error"), null, 'errors');
        }
@@ -357,8 +363,7 @@ 
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -366,8 +371,12 @@ 
     			$modCodeTiers = new $file;
 
     			// Show modules according to features level
-    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+    			if ($modCodeTiers->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+    			    continue;
+    			}
+    			if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+    			    continue;
+    			}
 
     			print '<tr class="oddeven">'."\n";
     			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
@@ -379,15 +388,18 @@ 
     				print '<td align="center">'."\n";
     				print img_picto($langs->trans("Activated"),'switch_on');
     				print "</td>\n";
-    			}
-    			else
+    			} else
     			{
     				$disabled = false;
     				if (! empty($conf->multicompany->enabled) && (is_object($mc) && ! empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td align="center">';
-    				if (! $disabled) print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				if (! $disabled) {
+    				    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+    				}
     				print img_picto($langs->trans("Disabled"),'switch_off');
-    				if (! $disabled) print '</a>';
+    				if (! $disabled) {
+    				    print '</a>';
+    				}
     				print '</td>';
     			}
 
@@ -436,8 +448,7 @@ 
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -455,8 +466,7 @@ 
     				print '<td align="center">';
     				print img_picto($langs->trans("Activated"),'switch_on');
     				print '</td>';
-    			}
-    			else
+    			} else
     			{
     				print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     				print img_picto($langs->trans("Disabled"),'switch_off');
@@ -498,8 +508,7 @@ 
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -529,8 +538,7 @@ 
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch(Exception $e)
+    			} catch(Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -539,8 +547,11 @@ 
 
 				$modulequalified=1;
 				if (! empty($module->version)) {
-					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-					else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					    $modulequalified=0;
+					} else if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					    $modulequalified=0;
+					}
 				}
 
 				if ($modulequalified)
@@ -548,8 +559,11 @@ 
 					print '<tr class="oddeven"><td width="100">';
 					print $module->name;
 					print "</td><td>\n";
-					if (method_exists($module,'info')) print $module->info($langs);
-					else print $module->description;
+					if (method_exists($module,'info')) {
+					    print $module->info($langs);
+					} else {
+					    print $module->description;
+					}
 					print '</td>';
 
 					// Activate / Disable
@@ -567,16 +581,14 @@ 
 						//	print img_picto($langs->trans("Enabled"),'on');
 						//}
 						print "</td>";
-					}
-					else
+					} else
 					{
 						if (versioncompare($module->phpmin,versionphparray()) > 0)
 						{
 							print "<td align=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion",join('.',$module->phpmin))),'switch_off');
 							print "</td>";
-						}
-						else
+						} else
 						{
 							print "<td align=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
@@ -603,8 +615,7 @@ 
 					if ($module->type == 'pdf')
 					{
 						$linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-					}
-					else
+					} else
 					{
 						$linkspec=img_object($langs->trans("PreviewNotAvailable"),'generic');
 					}
@@ -672,8 +683,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -685,8 +695,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -698,8 +707,7 @@ 
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"),'switch_on');
 			print '</a></td>';
-		}
-		else
+		} else
 		{
 			print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"),'switch_off');
@@ -738,8 +746,7 @@ 
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
+} else
 {
 	print '<td width="60" align="right">';
 	$arrval=array('0'=>$langs->trans("No"),
@@ -762,8 +769,7 @@ 
 	print '<td class="nowrap" align="right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
+} else
 {
 	print '<td width="60" align="right">';
 	$arrval=array('0'=>$langs->trans("No"),
@@ -788,8 +794,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -805,8 +810,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -824,8 +828,7 @@ 
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -842,8 +845,7 @@ 
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');

dolibarr/htdocs/societe/admin/societe_extrafields.php

Spacing +12 added lines, -12 removed lines

@@ -34,13 +34,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='societe';  //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'societe'; //Must be the $element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -57,14 +57,14 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("ThirdParty");
+$textobject = $langs->transnoentitiesnoconv("ThirdParty");
 
-$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
-llxHeader('',$langs->trans("CompanySetup"),$help_url);
+$help_url = 'EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
+llxHeader('', $langs->trans("CompanySetup"), $help_url);
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 
 $head = societe_admin_prepare_head();
@@ -104,7 +104,7 @@ 
 /* Edition d'un champ optionnel                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print '<br><div id="editattrib"></div>';
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));

Braces +6 added lines, -2 removed lines

@@ -36,13 +36,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='societe';  //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

dolibarr/htdocs/societe/admin/contact_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
 
 if ($action == 'create')
 {
-	print '<br><div id="newattrib"></div>';
-	print load_fiche_titre($langs->trans('NewAttribute'));
+    print '<br><div id="newattrib"></div>';
+    print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }

Spacing +12 added lines, -12 removed lines

@@ -34,13 +34,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='socpeople'; //Must be the $element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'socpeople'; //Must be the $element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -57,14 +57,14 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("ContactsAddresses");
+$textobject = $langs->transnoentitiesnoconv("ContactsAddresses");
 
-$help_url='EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
-llxHeader('',$langs->trans("CompanySetup"),$help_url);
+$help_url = 'EN:Module Third Parties setup|FR:Paramétrage_du_module_Tiers';
+llxHeader('', $langs->trans("CompanySetup"), $help_url);
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CompanySetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CompanySetup"), $linkback, 'title_setup');
 
 
 $head = societe_admin_prepare_head();
@@ -104,7 +104,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print "<br>";
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));

Braces +6 added lines, -2 removed lines

@@ -36,13 +36,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='socpeople'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*