From ccc859ec8069ce78dfeef31c1599ae0b2baf2782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 21 May 2020 09:12:18 +0200
Subject: [PATCH] add new rule

---
 htdocs/adherents/admin/adherent.php           |  45 +-
 htdocs/adherents/admin/adherent_emails.php    |  24 +-
 .../adherents/admin/adherent_extrafields.php  |   9 +-
 .../admin/adherent_type_extrafields.php       |   9 +-
 htdocs/adherents/admin/website.php            |  21 +-
 htdocs/adherents/agenda.php                   |  26 +-
 .../actions_adherentcard_common.class.php     |  39 +-
 .../actions_adherentcard_default.class.php    |   9 +-
 .../default/tpl/adherentcard_create.tpl.php   |   3 +-
 .../default/tpl/adherentcard_edit.tpl.php     |   3 +-
 .../default/tpl/adherentcard_view.tpl.php     |   3 +-
 htdocs/adherents/card.php                     | 408 ++++++------------
 htdocs/adherents/cartes/carte.php             |  66 +--
 htdocs/adherents/class/adherent.class.php     |  18 +-
 .../adherents/class/adherent_type.class.php   |  98 ++---
 .../adherents/class/adherentstats.class.php   |   3 +-
 htdocs/adherents/class/api_members.class.php  |  21 +-
 .../class/api_memberstypes.class.php          |  18 +-
 .../class/api_subscriptions.class.php         |  18 +-
 htdocs/adherents/class/subscription.class.php |  47 +-
 htdocs/adherents/document.php                 |  15 +-
 htdocs/adherents/htpasswd.php                 |  15 +-
 htdocs/adherents/index.php                    |  68 +--
 htdocs/adherents/ldap.php                     |  30 +-
 htdocs/adherents/list.php                     | 219 ++++------
 htdocs/adherents/note.php                     |   9 +-
 htdocs/adherents/stats/byproperties.php       |  12 +-
 htdocs/adherents/stats/geo.php                |  55 +--
 htdocs/adherents/stats/index.php              |  21 +-
 htdocs/adherents/subscription.php             | 277 ++++--------
 htdocs/adherents/subscription/card.php        |  69 +--
 htdocs/adherents/subscription/list.php        | 124 ++----
 .../adherents/tpl/linkedobjectblock.tpl.php   |   6 +-
 htdocs/adherents/type.php                     | 133 ++----
 htdocs/adherents/type_ldap.php                |  21 +-
 htdocs/adherents/type_translation.php         |  66 +--
 htdocs/zapier/class/hook.class.php            |   3 +-
 htdocs/zapier/hook_agenda.php                 |  29 +-
 htdocs/zapier/hook_card.php                   |  36 +-
 htdocs/zapier/hook_document.php               |   6 +-
 htdocs/zapier/hook_list.php                   |   3 +-
 htdocs/zapier/hook_note.php                   |   3 +-
 htdocs/zapier/lib/zapier_hook.lib.php         |   3 +-
 htdocs/zapier/zapierindex.php                 |   3 +-
 44 files changed, 711 insertions(+), 1403 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index ca5011849b1..ca1d1cc2a33 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -49,8 +49,7 @@ $action = GETPOST('action', 'alpha');
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
@@ -58,17 +57,14 @@ if ($action == 'updateall')
     $res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
     $res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
     // Use vat for invoice creation
-    if ($conf->facture->enabled)
-    {
+    if ($conf->facture->enabled) {
         $res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         $res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-        {
+        if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
             $res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         }
     }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
     } else {
@@ -78,14 +74,12 @@ if ($action == 'updateall')
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constname = GETPOST('constname', 'alpha');
 	$constvalue = (GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
 
 	if (($constname == 'ADHERENT_CARD_TYPE' || $constname == 'ADHERENT_ETIQUETTE_TYPE' || $constname == 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue = '';
-	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
+	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') { // Invert choice
 		if ($constvalue) $constvalue = 0;
 		else $constvalue = 1;
 	}
@@ -96,8 +90,7 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -105,21 +98,17 @@ if ($action == 'update' || $action == 'add')
 }
 
 // Action to enable of a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
@@ -179,19 +168,16 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 print '<td>';
 print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
-if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice')
-{
+if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
     print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if ($conf->facture->enabled)
-{
+if ($conf->facture->enabled) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
@@ -202,8 +188,7 @@ if ($conf->facture->enabled)
 	}
 	print "</tr>\n";
 
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-	{
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index f59a27c170b..22519c55ab0 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -65,13 +65,11 @@ $constantes = array(
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
     } else {
@@ -81,8 +79,7 @@ if ($action == 'updateall')
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constlineid = GETPOST('rowid', 'int');
 	$constname = GETPOST('constname', 'alpha');
 
@@ -96,8 +93,7 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else {
@@ -106,21 +102,17 @@ if ($action == 'update' || $action == 'add')
 }
 
 // Action to enable a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 73e1a519c59..d3d91ecba09 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -78,8 +78,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -92,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +103,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 7864505f2e1..fe7989a70b9 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -81,8 +81,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -95,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -108,8 +106,7 @@ if ($action == 'create')
 /* 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));
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 50a7f58e8c5..0dbb998f764 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -42,14 +42,12 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-if ($action == 'setMEMBER_ENABLE_PUBLIC')
-{
+if ($action == 'setMEMBER_ENABLE_PUBLIC') {
 	if (GETPOST('value')) dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
 	else dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
 }
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$public = GETPOST('MEMBER_ENABLE_PUBLIC');
 	$amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
@@ -67,8 +65,7 @@ if ($action == 'update')
 
     if (!$res > 0) $error++;
 
- 	if (!$error)
-    {
+ 	if (!$error) {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     } else {
 	    setEventMessages($langs->trans("Error"), null, 'errors');
@@ -99,8 +96,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
     print "\n".'<script type="text/javascript" language="javascript">';
     print 'jQuery(document).ready(function () {
                 function initemail()
@@ -139,8 +135,7 @@ print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").
 
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
-if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	// Button off, click to enable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
@@ -157,8 +152,7 @@ print '<input type="hidden" id="MEMBER_ENABLE_PUBLIC" name="MEMBER_ENABLE_PUBLIC
 
 print '<br>';
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 
 	print '<table class="noborder centpercent">';
@@ -219,8 +213,7 @@ dol_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index f1d83a4b314..a7e7a6f3634 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -49,8 +49,7 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'a.datep,a.id';
 if (!$sortorder) $sortorder = 'DESC';
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
 } else {
@@ -63,8 +62,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
 	$object->fetch_thirdparty();
 
     $adht = new AdherentType($db);
@@ -80,19 +78,16 @@ $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $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))
-{
+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 test are required to be compatible with all browsers
-    {
-        $actioncode = '';
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+		$actioncode = '';
         $search_agenda_label = '';
     }
 }
@@ -110,8 +105,7 @@ $form = new Form($db);
 /*
  * Customer and/or supplier category sheet
  */
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -147,13 +141,11 @@ if ($object->id > 0)
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
+    if (!empty($conf->agenda->enabled)) {
         $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
     }
 
-    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 = '&id='.$id;
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 44046d5a26e..79e4cab1719 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -91,18 +91,15 @@ abstract class ActionsAdherentCardCommon
 
         if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
+        foreach ($this->object as $key => $value) {
             $this->tpl[$key] = $value;
         }
 
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
-			{
+        if ($action == 'create' || $action == 'edit') {
+        	if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -114,8 +111,7 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
+        	if (is_object($objsoc) && $objsoc->id > 0) {
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
         	} else {
@@ -126,8 +122,7 @@ abstract class ActionsAdherentCardCommon
         	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
         	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE'))
-        	{
+        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
         		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
         		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
         		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
@@ -159,18 +154,15 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
         }
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
         	// Emailing
-        	if (!empty($conf->mailing->enabled))
-			{
+        	if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
         	// Dolibarr user
-        	if ($this->object->user_id)
-			{
+        	if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
@@ -178,12 +170,10 @@ abstract class ActionsAdherentCardCommon
 			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
-        if ($action == 'view' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'delete') {
         	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
+        	if ($this->object->socid > 0) {
         		$objsoc = new Societe($this->db);
 
         		$objsoc->fetch($this->object->socid);
@@ -210,8 +200,7 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['note'] = nl2br($this->object->note);
         }
 
-        if ($action == 'create_user')
-        {
+        if ($action == 'create_user') {
         	// Full firstname and lastname separated with a dot : firstname.lastname
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
             require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -259,12 +248,10 @@ abstract class ActionsAdherentCardCommon
         $this->object->canvas = $_POST["canvas"];
 
         // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
+        if ($this->object->country_id) {
             $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->object->country_code = $obj->code;
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index f248256a547..db2473c55d9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -90,8 +90,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-		if ($action == 'view')
-		{
+		if ($action == 'view') {
             // Card header
             $head = member_prepare_head($this->object);
             $title = $this->getTitle($action);
@@ -107,14 +106,12 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
         } else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer)
-        	{
+        	if ($action == 'delete' && $user->rights->adherent->supprimer) {
         		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
         	}
 		}
 
-		if ($action == 'list')
-		{
+		if ($action == 'list') {
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 92f1e11d7a2..b6c0b542d27 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -17,8 +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;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 36e2deab14c..92a4fbddd38 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -17,8 +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;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index b738f549247..8789b2fcb34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -17,8 +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;
 }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 7a5880fc317..cf5253e3bf8 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -55,8 +55,7 @@ $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
-if (!empty($conf->mailmanspip->enabled))
-{
+if (!empty($conf->mailmanspip->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 
 	$langs->load('mailmanspip');
@@ -76,8 +75,7 @@ $socialnetworks = getArrayOfSocialNetworks();
 $object->getCanvas($id);
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
@@ -86,16 +84,14 @@ if (!empty($canvas))
 // Security check
 $result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objcanvas);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	// Load member
 	$result = $object->fetch($id);
 
 	// Define variables to know what current user can do on users
 	$canadduser = ($user->admin || $user->rights->user->user->creer);
 	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
+	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
 		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -107,8 +103,7 @@ if ($id > 0)
 // Define variables to determine what the current user can do on the members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
+if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -125,34 +120,26 @@ $parameters = array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas, 'confirm'=
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
 	}
 
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
+	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
 		$error = 0;
-		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
+		if (empty($user->rights->user->user->creer)) {	// If can edit only itself user, we can link to itself only
+			if ($userid != $user->id && $userid != $object->user_id) {
 				$error++;
 				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 			}
 		}
 
-		if (!$error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($userid != $object->user_id) {	// If link differs from currently in database
 				$result = $object->setUserId($userid);
 				if ($result < 0) dol_print_error($object->db, $object->error);
 				$action = '';
@@ -160,22 +147,17 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setsocid')
-	{
+	if ($action == 'setsocid') {
 		$error = 0;
-		if (!$error)
-		{
-			if ($socid != $object->socid)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($socid != $object->socid) {	// If link differs from currently in database
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
 				$sql .= " WHERE socid = '".$socid."'";
 				$sql .= " AND entity = ".$conf->entity;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
+					if ($obj && $obj->rowid > 0) {
 						$othermember = new Adherent($db);
 						$othermember->fetch($obj->rowid);
 						$thirdparty = new Societe($db);
@@ -185,8 +167,7 @@ if (empty($reshook))
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $object->setThirdPartyId($socid);
 					if ($result < 0) dol_print_error($object->db, $object->error);
 					$action = '';
@@ -196,16 +177,13 @@ if (empty($reshook))
 	}
 
 	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
 			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
@@ -215,16 +193,13 @@ if (empty($reshook))
 	}
 
 	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+		if ($result > 0) {
 			// User creation
 			$company = new Societe($db);
 			$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($company->error), null, 'errors');
 				setEventMessages($company->error, $company->errors, 'errors');
@@ -234,15 +209,13 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->adherent->creer)
-	{
+	if ($action == 'update' && !$cancel && $user->rights->adherent->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$lastname = $_POST["lastname"];
@@ -267,16 +240,14 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
 		}
 		// Check if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
 			}
 		}
 		// Create new object
-		if ($result > 0 && !$error)
-		{
+		if ($result > 0 && !$error) {
 			$object->oldcopy = clone $object;
 
 			// Change values
@@ -329,32 +300,27 @@ if (empty($reshook))
 
 			// Check if we need to also synchronize user information
 			$nosyncuser = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser = 1; // Disable synchronizing
 			}
 
 			// Check if we need to also synchronize password information
 			$nosyncuserpass = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass = 1; // Disable synchronizing
 			}
 
 			$result = $object->update($user, 0, $nosyncuser, $nosyncuserpass);
 
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$categories = GETPOST('memcats', 'array');
 				$object->setCategories($categories);
 
 				// Logo/Photo save
 				$dir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos';
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
+				if ($file_OK) {
+					if (GETPOST('deletephoto')) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						$fileimg = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/'.$object->photo;
 						$dirthumbs = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/thumbs';
@@ -362,15 +328,12 @@ if (empty($reshook))
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
+					if (image_format_supported($_FILES['photo']['name']) > 0) {
 						dol_mkdir($dir);
 
-						if (@is_dir($dir))
-						{
+						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
-							{
+							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
 							    // Create thumbs
@@ -381,8 +344,7 @@ if (empty($reshook))
 						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
 				} else {
-					switch ($_FILES['photo']['error'])
-					{
+					switch ($_FILES['photo']['error']) {
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 							$errors[] = "ErrorFileSizeTooLarge";
@@ -397,8 +359,7 @@ if (empty($reshook))
 	            $id = $object->id;
 				$action = '';
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -411,19 +372,16 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
+	if ($action == 'add' && $user->rights->adherent->creer) {
 		if ($canvas) $object->canvas = $canvas;
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$datesubscription = '';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
+		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) {
 			$datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 		}
 
@@ -508,8 +466,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MemberNature")), null, 'errors');
 		}
 		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
@@ -557,14 +514,12 @@ if (empty($reshook))
 		$public = 0;
 		if (isset($public)) $public = 1;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Email about right and login does not exist
 			$result = $object->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Foundation categories
 				$memcats = GETPOST('memcats', 'array');
 				$object->setCategories($memcats);
@@ -590,13 +545,10 @@ if (empty($reshook))
 		}
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->delete($id, $user);
-		if ($result > 0)
-		{
-			if (!empty($backtopage))
-			{
+		if ($result > 0) {
+			if (!empty($backtopage)) {
 				header("Location: ".$backtopage);
 				exit;
 			} else {
@@ -608,8 +560,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes') {
 		$error = 0;
 
 		$db->begin();
@@ -619,11 +570,9 @@ if (empty($reshook))
 
 		$result = $object->validate($user);
 
-		if ($result >= 0 && !count($object->errors))
-		{
+		if ($result >= 0 && !count($object->errors)) {
 			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
+			if ($object->email && GETPOST("send_mail")) {
 				$subject = '';
 				$msg = '';
 
@@ -641,8 +590,7 @@ if (empty($reshook))
 
 				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-				{
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 					$subject = $arraydefaultmessage->topic;
 					$msg     = $arraydefaultmessage->content;
 				}
@@ -661,8 +609,7 @@ if (empty($reshook))
 					$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -677,8 +624,7 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -686,21 +632,17 @@ if (empty($reshook))
 		$action = '';
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_resign') {
 		$error = 0;
 
-		if ($confirm == 'yes')
-		{
+		if ($confirm == 'yes') {
 			$adht = new AdherentType($db);
 			$adht->fetch($object->typeid);
 
 			$result = $object->resiliate($user);
 
-			if ($result >= 0 && !count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
+			if ($result >= 0 && !count($object->errors)) {
+				if ($object->email && GETPOST("send_mail")) {
 					$subject = '';
 					$msg = '';
 
@@ -718,8 +660,7 @@ if (empty($reshook))
 
 					if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 						$subject = $arraydefaultmessage->topic;
 						$msg     = $arraydefaultmessage->content;
 					}
@@ -738,8 +679,7 @@ if (empty($reshook))
 						$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 						$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
@@ -756,31 +696,24 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-		if (!empty($backtopage) && !$error)
-		{
+		if (!empty($backtopage) && !$error) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
 	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->del_to_spip($object)) {
 				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
+	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->add_to_spip($object)) {
 				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
@@ -817,13 +750,11 @@ llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
+	if (empty($object->error) && $id) {
 		$object = new Adherent($db);
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error('', $object->error);
@@ -835,8 +766,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	// When used in standard mode
 	// -----------------------------------------
 
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Creation mode                                                              */
@@ -847,8 +777,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// We set country_id, country_code and country for the selected country
 		$object->country_id = GETPOST('country_id', 'int') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
 			$object->country = $tmparray['label'];
@@ -858,8 +787,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
             $object = new Societe($db);
             if ($socid > 0) $object->fetch($socid);
 
-            if (!($object->id > 0))
-            {
+            if (!($object->id > 0)) {
                 $langs->load("errors");
                 print($langs->trans('ErrorRecordNotFound'));
                 exit;
@@ -870,8 +798,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print load_fiche_titre($langs->trans("NewMember"), '', 'members');
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -913,14 +840,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tbody>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="minwidth300" maxlength="50" value="'.(isset($_POST["member_login"]) ?GETPOST("member_login", 'alpha', 2) : $object->login).'" autofocus="autofocus"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$generated_password = getRandomPassword(false);
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
@@ -931,8 +856,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype = $adht->liste_array();
-		if (count($listetype))
-		{
+		if (count($listetype)) {
 			print $form->selectarray("typeid", $listetype, GETPOST('typeid', 'int') ?GETPOST('typeid', 'int') : $typeid, count($listetype) > 1 ? 1 : 0);
 		} else {
 			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
@@ -992,11 +916,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
+			if ($object->country_id) {
 				print $formcompany->select_state(GETPOST('state_id', 'int') ?GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
 			} else {
 				print $countrynotdefined;
@@ -1031,8 +953,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
@@ -1050,8 +971,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
 		print '&nbsp;&nbsp;';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
 		} else {
 			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
@@ -1061,8 +981,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</form>\n";
 	}
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		/********************************************
 		*
 		* Edition mode
@@ -1083,12 +1002,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// We set country_id, and country_code, country of the chosen country
 		$country = GETPOST('country', 'int');
-		if (!empty($country) || $object->country_id)
-		{
+		if (!empty($country) || $object->country_id) {
 			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
 			} else {
 				dol_print_error($db);
@@ -1101,8 +1018,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$head = member_prepare_head($object);
 
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 				jQuery("#selectcountry_id").change(function() {
@@ -1147,14 +1063,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="minwidth300" maxlength="50" value="'.(isset($_POST["login"]) ?GETPOST("login", 'alpha', 2) : $object->login).'"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(isset($_POST["pass"]) ?GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
 		}
 		// Morphy
@@ -1166,8 +1080,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
+		if ($user->rights->adherent->creer) {
 			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ?GETPOST("typeid", 'int') : $object->typeid));
 		} else {
 			print $adht->getNomUrl(1);
@@ -1203,8 +1116,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$langs->trans("Photo").'</td>';
 		print '<td class="hideonsmartphone" valign="middle">';
 		print $form->showphoto('memberphoto', $object)."\n";
-		if ($caneditfieldmember)
-		{
+		if ($caneditfieldmember) {
 			if ($object->photo) print "<br>\n";
 			print '<table class="nobordernopadding">';
 			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
@@ -1237,8 +1149,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id);
 			print '</td></tr>';
@@ -1271,8 +1182,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1289,11 +1199,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->socid)
-			{
+			if ($object->socid) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->socid);
 				print $company->getNomUrl(1);
@@ -1305,8 +1213,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Login Dolibarr
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 		}
 		else print $langs->trans("NoDolibarrAccess");
@@ -1327,8 +1234,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</form>';
 	}
 
-	if ($id > 0 && $action != 'edit')
-	{
+	if ($id > 0 && $action != 'edit') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* View mode                                                                  */
@@ -1359,11 +1265,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			$login = $object->login;
-			if (empty($login))
-			{
+			if (empty($login)) {
 				// Full firstname and name separated with a dot : firstname.name
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$login = dol_buildlogin($object->lastname, $object->firstname);
@@ -1375,8 +1279,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
 			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
 				else $text .= $langs->trans("UserWillBeInternalUser");
 			}
@@ -1384,13 +1287,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
 			} else {
@@ -1408,8 +1309,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm validate member
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1432,8 +1332,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1469,8 +1368,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm terminate
-		if ($action == 'resign')
-		{
+		if ($action == 'resign') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1493,8 +1391,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1525,21 +1422,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Confirm remove member
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formquestion = array();
 			if ($backtopage) $formquestion[] = array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("DeleteMember"), $langs->trans("ConfirmDeleteMember"), "confirm_delete", $formquestion, 'no', 1);
 		}
 
 		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
+		if ($action == 'add_spip') {
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
 		}
 		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
+		if ($action == 'del_spip') {
 			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
 		}
 
@@ -1558,8 +1452,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<table class="border tableforfield centpercent">';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 		}
 
@@ -1584,16 +1477,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</tr>';
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 			if ($object->pass) print preg_replace('/./i', '*', $object->pass);
 			else {
 			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 			    else print $langs->trans("Hidden");
 			}
-			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-			{
+			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 			    $langs->load("errors");
 			    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 			    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -1603,19 +1494,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Date end subscription
 		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-		if ($object->datefin)
-		{
+		if ($object->datefin) {
 			print dol_print_date($object->datefin, 'day');
 			if ($object->hasDelay()) {
 				print " ".img_warning($langs->trans("Late"));
 			}
 		} else {
-			if ($object->need_subscription == 0)
-            {
+			if ($object->need_subscription == 0) {
                 print $langs->trans("SubscriptionNotNeeded");
             }
-            elseif (!$adht->subscription)
-			{
+            elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			} else {
@@ -1626,14 +1514,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>';
 			$editenable = $user->rights->adherent->creer;
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
 			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
+			if ($action == 'editthirdparty') {
 				$htmlname = 'socid';
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -1662,12 +1548,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
 		print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
+		if ($action == 'editlogin') {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 		} else {
-			if ($object->user_id)
-			{
+			if ($object->user_id) {
 				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 			} else {
 				print $langs->trans("NoDolibarrAccess");
@@ -1691,8 +1575,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -1718,8 +1601,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		if (empty($reshook)) {
-			if ($action != 'editlogin' && $action != 'editthirdparty')
-			{
+			if ($action != 'editlogin' && $action != 'editthirdparty') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
@@ -1748,18 +1630,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
 				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
 
 				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == -1) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
@@ -1767,10 +1646,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == 0) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
@@ -1778,10 +1655,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
+				if ($object->statut >= 1) {
+					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
 					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
@@ -1789,10 +1664,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Create third party
-				if (!empty($conf->societe->enabled) && !$object->socid)
-				{
-					if ($user->rights->societe->creer)
-					{
+				if (!empty($conf->societe->enabled) && !$object->socid) {
+					if ($user->rights->societe->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 					} else {
@@ -1801,10 +1674,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Create user
-				if (!$user->socid && !$object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
+				if (!$user->socid && !$object->user_id) {
+					if ($user->rights->user->user->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 					} else {
@@ -1813,24 +1684,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 
 				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
 				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
 
 				// Action SPIP
-				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP))
-				{
+				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
-					if ($isinspip == 1)
-					{
+					if ($isinspip == 1) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
 					}
-					if ($isinspip == 0)
-					{
+					if ($isinspip == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
@@ -1838,8 +1705,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 		print '</div>';
 
-		if ($isinspip == -1)
-		{
+		if ($isinspip == -1) {
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
@@ -1849,8 +1715,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
@@ -1878,8 +1743,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Shon online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-			if ($useonlinepayment)
-			{
+			if ($useonlinepayment) {
 				print '<br>';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 345542f8cba..736cc45319e 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -55,13 +55,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  * Actions
  */
 
-if ($mode == 'cardlogin' && empty($foruserlogin))
-{
+if ($mode == 'cardlogin' && empty($foruserlogin)) {
     $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
-if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
-{
+if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
     $arrayofmembers = array();
 
     // request taking into account member with up to date subscriptions
@@ -83,12 +81,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
 
     dol_syslog("Search members", LOG_DEBUG);
     $result = $db->query($sql);
-    if ($result)
-    {
+    if ($result) {
     	$num = $db->num_rows($result);
     	$i = 0;
-    	while ($i < $num)
-    	{
+    	while ($i < $num) {
     		$objp = $db->fetch_object($result);
 
     		if ($objp->country == '-') $objp->country = '';
@@ -98,14 +94,11 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     		$adherentstatic->firstname = $objp->firstname;
 
             // Format extrafield so they can be parsed in function complete_substitutions_array
-    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
-            {
+    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
                 $adherentstatic->array_options = array();
-                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-                {
+                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                     $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey))
-                    {
+                    if (!empty($objp->$tmpkey)) {
                         $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
                     }
                     //if (!empty($objp->$key))
@@ -139,20 +132,17 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
             // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-            {
+            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
                 $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
                 $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
                 $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
                 $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-                if (is_numeric($foruserid) || $foruserlogin)
-                {
+                if (is_numeric($foruserid) || $foruserlogin) {
                     $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
                     if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-                    for ($j = 0; $j < $nb; $j++)
-                    {
+                    for ($j = 0; $j < $nb; $j++) {
                         $arrayofmembers[] = array(
                         	'textleft'=>$textleft,
                             'textheader'=>$textheader,
@@ -175,8 +165,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             }
 
             // For labels
-            if ($mode == 'label')
-            {
+            if ($mode == 'label') {
             	if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
                 $textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
                 $textheader = '';
@@ -195,41 +184,33 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     	}
 
     	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-        {
-            if (!count($arrayofmembers))
-            {
+        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-            if (empty($model) || $model == '-1')
-            {
+            if (empty($model) || $model == '-1') {
             	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
             }
             if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
         }
-        elseif ($mode == 'label')
-        {
-            if (!count($arrayofmembers))
-            {
+        elseif ($mode == 'label') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-        	if (empty($modellabel) || $modellabel == '-1')
-    		{
+        	if (empty($modellabel) || $modellabel == '-1') {
     			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
     		}
         	if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
         }
 
-    	if ($result <= 0)
-    	{
+    	if ($result <= 0) {
     		dol_print_error('', $result);
     	}
     } else {
     	dol_print_error($db);
     }
 
-    if (!$mesg)
-    {
+    if (!$mesg) {
     	$db->close();
     	exit;
     }
@@ -262,8 +243,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -281,8 +261,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -301,8 +280,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index a7410d87973..1f78a0d1c7b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -660,8 +660,7 @@ class Adherent extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
 				if ($result < 0) {
 					$error++;
@@ -704,8 +703,7 @@ class Adherent extends CommonObject
 				}
 			}
 
-			if (!$error && $nbrowsaffected) // If something has change in main data
-			{
+			if (!$error && $nbrowsaffected) { // If something has change in main data
 				// Update information on linked user if it is an update
 				if (!$error && $this->user_id > 0 && !$nosyncuser) {
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1555,8 +1553,7 @@ class Adherent extends CommonObject
 			$customer = new Societe($this->db);
 
 			if (!$error) {
-				if (!($this->fk_soc > 0)) // If not yet linked to a company
-				{
+				if (!($this->fk_soc > 0)) { // If not yet linked to a company
 					if ($autocreatethirdparty) {
 						// Create a linked thirdparty to member
 						$companyalias = '';
@@ -2420,8 +2417,7 @@ class Adherent extends CommonObject
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
 		} // Set LDAP password if possible
-		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-		{
+		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
@@ -2620,8 +2616,7 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (empty($conf->adherent->enabled)) // Should not happen. If module disabled, cron job should not be visible.
-		{
+		if (empty($conf->adherent->enabled)) { // Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
@@ -2640,8 +2635,7 @@ class Adherent extends CommonObject
 		$listofmembersko = array();
 
 		$arraydaysbeforeend = explode(';', $daysbeforeendlist);
-		foreach ($arraydaysbeforeend as $daysbeforeend) // Loop on each delay
-		{
+		foreach ($arraydaysbeforeend as $daysbeforeend) { // Loop on each delay
 			dol_syslog(__METHOD__.' - Process delta = '.$daysbeforeend, LOG_DEBUG);
 
 			if (!is_numeric($daysbeforeend)) {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 199bd5e8a51..e2ff3786a3c 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -132,12 +132,10 @@ class AdherentType extends CommonObject
 
         $result = $this->db->query($sql);
         if ($result) {
-            while ($obj = $this->db->fetch_object($result))
-            {
+            while ($obj = $this->db->fetch_object($result)) {
                 //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-                if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
-                {
-                    $this->label        = $obj->label;
+                if ($obj->lang == $current_lang) {  // si on a les traduct. dans la langue courante on les charge en infos principales.
+					$this->label        = $obj->label;
                     $this->description = $obj->description;
                     $this->email        = $obj->email;
                 }
@@ -165,8 +163,7 @@ class AdherentType extends CommonObject
         $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
         $current_lang = $langs->getDefaultLang();
 
-        foreach ($langs_available as $key => $value)
-        {
+        foreach ($langs_available as $key => $value) {
             if ($key == $current_lang) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
@@ -175,9 +172,8 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->label)."',";
                     $sql2 .= " description='".$this->db->escape($this->description)."'";
@@ -203,9 +199,8 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
                     $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
@@ -303,27 +298,23 @@ class AdherentType extends CommonObject
 
 		dol_syslog("Adherent_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
 
 			$result = $this->update($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -3;
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -368,8 +359,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
             $this->description = $this->db->escape($this->note);
 
             // Multilangs
@@ -383,25 +373,21 @@ class AdherentType extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -431,8 +417,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
@@ -464,10 +449,8 @@ class AdherentType extends CommonObject
 		dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
@@ -515,15 +498,12 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$adherenttypes[$obj->rowid] = $langs->trans($obj->label);
@@ -559,14 +539,10 @@ class AdherentType extends CommonObject
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!array_key_exists($obj->rowid, $ret))
-				{
-					if ($mode < 2)
-					{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!array_key_exists($obj->rowid, $ret)) {
+					if ($mode < 2) {
 						$memberstatic = new Adherent($this->db);
 						if ($mode == 1) {
 							$memberstatic->fetch($obj->rowid, '', '', '', false, false);
@@ -659,8 +635,7 @@ class AdherentType extends CommonObject
 		$statusType = 'status4';
 		if ($status == 0) $statusType = 'status5';
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -713,11 +688,9 @@ class AdherentType extends CommonObject
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
-		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
-		{
+		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
-			foreach ($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
-			{
+			foreach ($this->members as $key=>$val) {    // This is array of users for group into dolibarr database.
 				$member = new Adherent($this->db);
 				$member->fetch($val->id, '', '', '', false, false);
 				$info2 = $member->_load_ldap_info();
@@ -767,8 +740,7 @@ class AdherentType extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
-		{
+		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
 
@@ -785,8 +757,7 @@ class AdherentType extends CommonObject
 		global $conf;
 
 		// mail_subscription not  defined so never used
-		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription)))  // Property not yet defined
-		{
+		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
 		}
 
@@ -803,9 +774,8 @@ class AdherentType extends CommonObject
         global $conf;
 
         // NOTE mail_resiliate not defined so never used
-        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate)))  // Property not yet defined
-        {
-            return $this->mail_resiliate;
+        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) {  // Property not yet defined
+			return $this->mail_resiliate;
         }
 
         return '';
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bdb174cc0bd..b3029a6bd55 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -71,8 +71,7 @@ class AdherentStats extends Stats
 		$this->where .= " m.statut != 0";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($this->memberid)
-		{
+		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
         //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index a5d72f3b78f..c69706d8a3b 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -109,8 +109,7 @@ class Members extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
     	}
         $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid))
-        {
+        if (!empty($typeid)) {
             $sql .= ' AND t.fk_adherent_type='.$typeid;
         }
     	// Select members of given category
@@ -119,10 +118,8 @@ class Members extends DolibarrApi
 			$sql .= " AND c.fk_member = t.rowid ";
     	}
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -131,8 +128,7 @@ class Members extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -141,13 +137,11 @@ class Members extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $member = new Adherent($this->db);
                 if ($member->fetch($obj->rowid)) {
@@ -236,8 +230,7 @@ class Members extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($member->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($member->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $member->error);
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index c9d12206962..61758255624 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -101,10 +101,8 @@ class MembersTypes extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -113,8 +111,7 @@ class MembersTypes extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -123,13 +120,11 @@ class MembersTypes extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $membertype = new AdherentType($this->db);
                 if ($membertype->fetch($obj->rowid)) {
@@ -204,8 +199,7 @@ class MembersTypes extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $membertype->error);
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 11ac1f17113..79480c09fdf 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -99,10 +99,8 @@ class Subscriptions extends DolibarrApi
         $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
         $sql .= ' WHERE 1 = 1';
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -111,8 +109,7 @@ class Subscriptions extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -121,12 +118,10 @@ class Subscriptions extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
-            {
+            while ($i < min($limit, $num)) {
                 $obj = $db->fetch_object($result);
                 $subscription = new Subscription($this->db);
                 if ($subscription->fetch($obj->rowid)) {
@@ -193,8 +188,7 @@ class Subscriptions extends DolibarrApi
             $subscription->$field = $value;
         }
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0)
-        {
+        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
             return $this->get($id);
         } else {
             throw new RestException(500, $subscription->error);
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index e1ec3bd1753..cdc70cf0cd1 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -136,8 +136,7 @@ class Subscription extends CommonObject
         $now = dol_now();
 
         // Check parameters
-        if ($this->datef <= $this->dateh)
-        {
+        if ($this->datef <= $this->dateh) {
             $this->error = $langs->trans("ErrorBadValueForDate");
             return -1;
         }
@@ -169,14 +168,12 @@ class Subscription extends CommonObject
             $this->errors[] = $this->db->lasterror();
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->fk_type = $type;
         }
 
-        if (!$error && !$notrigger)
-        {
+        if (!$error && !$notrigger) {
         	$this->context = array('member'=>$member);
         	// Call triggers
             $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
@@ -213,10 +210,8 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
+        if ($resql) {
+            if ($this->db->num_rows($resql)) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id             = $obj->rowid;
@@ -268,8 +263,7 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
+        if ($resql) {
             require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
             $member = new Adherent($this->db);
             $result = $member->fetch($this->fk_adherent);
@@ -309,8 +303,7 @@ class Subscription extends CommonObject
         $error = 0;
 
         // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0)
-        {
+        if ($this->fk_bank > 0) {
             require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
             $accountline = new AccountLine($this->db);
             $result = $accountline->fetch($this->fk_bank);
@@ -327,26 +320,21 @@ class Subscription extends CommonObject
             }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $num = $this->db->affected_rows($resql);
-                if ($num)
-                {
+                if ($num) {
                     require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
                     $member = new Adherent($this->db);
                     $result = $member->fetch($this->fk_adherent);
                     $result = $member->update_end_date($user);
 
-                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0)	// If we found bank account line (this means this->fk_bank defined)
-                    {
-                        $result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0)
-                        {
+                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
+						$result = $accountline->delete($user); // Return false if refused because line is conciliated
+                        if ($result > 0) {
                             $this->db->commit();
                             return 1;
                         } else {
@@ -400,8 +388,7 @@ class Subscription extends CommonObject
 
         $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        if ($option != 'nolink')
-        {
+        if ($option != 'nolink') {
             // Add param to save lastsearch_values or not
             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
             if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
@@ -462,10 +449,8 @@ class Subscription extends CommonObject
         $sql .= ' WHERE c.rowid = '.$id;
 
         $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
+        if ($result) {
+            if ($this->db->num_rows($result)) {
                 $obj = $this->db->fetch_object($result);
                 $this->id = $obj->rowid;
 
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 291b1916e55..141e19d0c96 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -61,8 +61,7 @@ $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
 $result = $object->fetch($id);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -86,16 +85,13 @@ $title = $langs->trans("Member")." - ".$langs->trans("Documents");
 $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros";
 llxHeader("", $title, $helpurl);
 
-if ($id > 0)
-{
+if ($id > 0) {
     $result = $membert->fetch($object->typeid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -118,8 +114,7 @@ if ($id > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         // Login
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-        {
+        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
             print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
         }
 
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 385e34d6538..fc9b2eaf7f9 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -40,13 +40,11 @@ $now = dol_now();
 
 if (empty($sortorder)) {  $sortorder = "ASC"; }
 if (empty($sortfield)) {  $sortfield = "d.login"; }
-if (!isset($statut))
-{
+if (!isset($statut)) {
 	$statut = 1;
 }
 
-if (!isset($cotis))
-{
+if (!isset($cotis)) {
 	// by default, members must be up to date of subscription
 	$cotis = 1;
 }
@@ -55,24 +53,21 @@ if (!isset($cotis))
 $sql = "SELECT d.login, d.pass, d.datefin";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
 $sql .= " WHERE d.statut = ".$statut;
-if ($cotis == 1)
-{
+if ($cotis == 1) {
 	$sql .= " AND datefin > '".$db->idate($now)."'";
 }
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.=$db->plimit($conf->liste_limit, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	print_barre_liste($langs->trans("HTPasswordExport"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0);
 
 	print "<hr>\n";
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$htpass = crypt($objp->pass, makesalt());
 		print $objp->login.":".$htpass."<br>\n";
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 001730d67b1..89f95b3e3dc 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -73,12 +73,10 @@ $sql .= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$adhtype = new AdherentType($db);
@@ -110,12 +108,10 @@ $sql .= " GROUP BY d.fk_adherent_type";
 
 dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$MemberUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
@@ -127,23 +123,19 @@ if ($result)
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
-    // Search contact/address
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-    {
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
+	// Search contact/address
+    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
     	$listofsearchfields['search_member'] = array('text'=>'Member');
     }
 
-    if (count($listofsearchfields))
-    {
+    if (count($listofsearchfields)) {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
         print '<div class="div-table-responsive-no-min">';
     	print '<table class="noborder nohover centpercent">';
     	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
+    	foreach ($listofsearchfields as $key => $value) {
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
     		print '<tr class="oddeven">';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
@@ -163,8 +155,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
@@ -177,8 +168,7 @@ if ($conf->use_javascript_ajax)
     $total = 0;
     $dataval = array();
     $i = 0;
-    foreach ($AdherentType as $key => $adhtype)
-    {
+    foreach ($AdherentType as $key => $adhtype) {
         $dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
         $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
         $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
@@ -232,12 +222,10 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    while ($i < $num)
-    {
+    while ($i < $num) {
         $objp = $db->fetch_object($result);
         $year = dol_print_date($db->jdate($objp->dateh), "%Y");
         $Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
@@ -259,10 +247,8 @@ print "</tr>\n";
 
 krsort($Total);
 $i = 0;
-foreach ($Total as $key=>$value)
-{
-	if ($i >= 8)
-	{
+foreach ($Total as $key=>$value) {
+	if ($i >= 8) {
 		print '<tr class="oddeven">';
 		print "<td>...</td>";
 		print "<td class=\"right\"></td>";
@@ -308,26 +294,22 @@ $sql .= $db->order("a.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastMembersModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$staticmember->id = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
-			if (!empty($obj->fk_soc))
-			{
+			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
 				$staticmember->name = $staticmember->thirdparty->name;
@@ -367,19 +349,16 @@ $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$subscriptionstatic->id = $obj->cid;
@@ -423,8 +402,7 @@ print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
-foreach ($AdherentType as $key => $adhtype)
-{
+foreach ($AdherentType as $key => $adhtype) {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 43d6a34fcf9..79eb8237d91 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -37,15 +37,13 @@ $action = GETPOST('action', 'aZ09');
 
 // Protection
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $socid = $user->socid;
 }
 
 $object = new Adherent($db);
 $result = $object->fetch($rowid);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db, "Failed to get adherent: ".$object->error);
 	exit;
 }
@@ -55,13 +53,11 @@ if (!$result)
  * Actions
  */
 
-if ($action == 'dolibarr2ldap')
-{
+if ($action == 'dolibarr2ldap') {
 	$ldap = new Ldap();
 	$result = $ldap->connect_bind();
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$info = $object->_load_ldap_info();
 		$dn = $object->_load_ldap_dn($info);
 		$olddn = $dn; // We can say that old dn = dn as we force synchro
@@ -104,8 +100,7 @@ print '<table class="border centpercent tableforfield">';
 print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 // If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
-if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
-{
+if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
 	print '<td class="valeur">'.$object->pass.'</td>';
 	print "</tr>\n";
@@ -142,8 +137,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr')
-{
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a></div>';
 }
 
@@ -166,14 +160,12 @@ print '</tr>';
 // Lecture LDAP
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
 	$info = $object->_load_ldap_info();
 	$dn = $object->_load_ldap_dn($info, 1);
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-	if (empty($dn))
-	{
+	if (empty($dn)) {
 	    $langs->load("errors");
 	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
 	} else {
@@ -182,10 +174,8 @@ if ($result > 0)
     	//print_r($records);
 
     	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    	{
-    		if (!is_array($records))
-    		{
+    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+    		if (!is_array($records)) {
     			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
     		} else {
     			$result = show_ldap_content($records, 0, $records['count'], true);
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 72745b54614..d82b7438574 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -141,10 +141,8 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
 			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
@@ -162,14 +160,12 @@ $parameters = array('socid'=>$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))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	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
 		$search = "";
 		$search_ref = "";
 		$search_lastname = "";
@@ -198,29 +194,25 @@ if (empty($reshook))
 	}
 
 	// Close
-	if ($massaction == 'close' && $user->rights->adherent->creer)
-	{
+	if ($massaction == 'close' && $user->rights->adherent->creer) {
 	    $tmpmember = new Adherent($db);
 	    $error = 0;
 	    $nbclose = 0;
 
 	    $db->begin();
 
-        foreach ($toselect as $idtoclose)
-        {
+        foreach ($toselect as $idtoclose) {
             $tmpmember->fetch($idtoclose);
             $result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors))
-    	    {
+            if ($result < 0 && !count($tmpmember->errors)) {
     	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
     	    } else {
     	        if ($result > 0) $nbclose++;
     	    }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
             $db->commit();
@@ -282,8 +274,7 @@ $sql .= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
 if ($statut != '') $sql .= " AND d.statut in (".$db->escape($statut).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -313,13 +304,11 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
 	else dol_print_error($db);
-	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;
 	}
@@ -329,8 +318,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -339,8 +327,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/card.php?id='.$id);
@@ -350,8 +337,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
 
 $titre = $langs->trans("MembersList");
-if (GETPOSTISSET("statut"))
-{
+if (GETPOSTISSET("statut")) {
 	if ($statut == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
 	if ($statut == '-1') { $titre = $langs->trans("MembersListToValid"); }
 	if ($statut == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
@@ -359,13 +345,11 @@ if (GETPOSTISSET("statut"))
 	if ($statut == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 	if ($statut == '0') { $titre = $langs->trans("MembersListResiliated"); }
 }
-elseif ($action == 'search')
-{
+elseif ($action == 'search') {
 	$titre = $langs->trans("MembersListQualified");
 }
 
-if ($search_type > 0)
-{
+if ($search_type > 0) {
 	$membertype = new AdherentType($db);
 	$result = $membertype->fetch(GETPOST("type", 'int'));
 	$titre .= " (".$membertype->label.")";
@@ -409,8 +393,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->creer)
-{
+if ($user->rights->adherent->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
@@ -431,16 +414,14 @@ $objecttmp = new Adherent($db);
 $trackid = 'mem'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
@@ -451,8 +432,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object 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>';
@@ -470,120 +450,100 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['d.civility']['checked']))
-{
+if (!empty($arrayfields['d.civility']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_civility" value="'.dol_escape_htmltag($search_civility).'"></td>';
 }
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
-if (!empty($arrayfields['d.gender']['checked']))
-{
+if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['d.company']['checked']))
-{
+if (!empty($arrayfields['d.company']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
-if (!empty($arrayfields['d.morphy']['checked']))
-{
+if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
 	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.address']['checked']))
-{
+if (!empty($arrayfields['d.address']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.$search_address.'"></td>';
 }
 
-if (!empty($arrayfields['d.zip']['checked']))
-{
+if (!empty($arrayfields['d.zip']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 }
-if (!empty($arrayfields['d.town']['checked']))
-{
+if (!empty($arrayfields['d.town']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.$search_town.'"></td>';
 }
 // State
-if (!empty($arrayfields['state.nom']['checked']))
-{
+if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
 // Phone pro
-if (!empty($arrayfields['d.phone']['checked']))
-{
+if (!empty($arrayfields['d.phone']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.$search_phone.'"></td>';
 }
 // Phone perso
-if (!empty($arrayfields['d.phone_perso']['checked']))
-{
+if (!empty($arrayfields['d.phone_perso']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
 }
 // Phone mobile
-if (!empty($arrayfields['d.phone_mobile']['checked']))
-{
+if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
 }
 // Email
-if (!empty($arrayfields['d.email']['checked']))
-{
+if (!empty($arrayfields['d.email']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.$search_email.'"></td>';
 }
 
-if (!empty($arrayfields['d.datefin']['checked']))
-{
+if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
@@ -595,26 +555,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['d.datec']['checked']))
-{
+if (!empty($arrayfields['d.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 //Birthday
-if (!empty($arrayfields['d.birth']['checked']))
-{
+if (!empty($arrayfields['d.birth']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['d.tms']['checked']))
-{
+if (!empty($arrayfields['d.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['d.statut']['checked']))
-{
+if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right maxwidthonsmartphone">';
 	$liststatus = array(
 		'-1'=>$langs->trans("Draft"),
@@ -669,8 +625,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);
@@ -698,74 +653,64 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-	{
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 		print '<td class="center">'.$obj->rowid.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Civility
-	if (!empty($arrayfields['d.civility']['checked']))
-	{
+	if (!empty($arrayfields['d.civility']['checked'])) {
 		print "<td>";
 		print $obj->civility;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Gender
-	if (!empty($arrayfields['d.gender']['checked']))
-	{
+	if (!empty($arrayfields['d.gender']['checked'])) {
 		print '<td>';
 		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Company
-	if (!empty($arrayfields['d.company']['checked']))
-	{
+	if (!empty($arrayfields['d.company']['checked'])) {
 		print "<td>";
 		print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print "<td>".$obj->login."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Moral/Physique
-	if (!empty($arrayfields['d.morphy']['checked']))
-	{
+	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
 		print '<td class="nowrap">';
@@ -774,38 +719,33 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Address
-	if (!empty($arrayfields['d.address']['checked']))
-	{
+	if (!empty($arrayfields['d.address']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->address;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (!empty($arrayfields['d.zip']['checked']))
-	{
+	if (!empty($arrayfields['d.zip']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Town
-	if (!empty($arrayfields['d.town']['checked']))
-	{
+	if (!empty($arrayfields['d.town']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print "<td>".$obj->state_name."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->country, 'all');
 		print $tmparray['label'];
@@ -813,40 +753,34 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (!empty($arrayfields['d.phone']['checked']))
-	{
+	if (!empty($arrayfields['d.phone']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (!empty($arrayfields['d.phone_perso']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_perso']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_perso;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (!empty($arrayfields['d.phone_mobile']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_mobile;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// EMail
-	if (!empty($arrayfields['d.email']['checked']))
-	{
+	if (!empty($arrayfields['d.email']['checked'])) {
 		print "<td>".dol_print_email($obj->email, 0, 0, 1)."</td>\n";
 	}
 	// End of subscription date
 	$datefin = $db->jdate($obj->datefin);
-	if (!empty($arrayfields['d.datefin']['checked']))
-	{
-		if ($datefin)
-		{
+	if (!empty($arrayfields['d.datefin']['checked'])) {
+		if ($datefin) {
 			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
@@ -856,8 +790,7 @@ while ($i < min($num, $limit))
 			print '</td>';
 		} else {
 			print '<td class="nowrap left">';
-			if ($obj->subscription == 'yes')
-			{
+			if ($obj->subscription == 'yes') {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();
 			} else {
@@ -873,32 +806,28 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['d.datec']['checked']))
-	{
+	if (!empty($arrayfields['d.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Birth
-	if (!empty($arrayfields['d.birth']['checked']))
-	{
+	if (!empty($arrayfields['d.birth']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['d.tms']['checked']))
-	{
+	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (!empty($arrayfields['d.statut']['checked']))
-	{
+	if (!empty($arrayfields['d.statut']['checked'])) {
 		print '<td class="nowrap right">';
 		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
 		print '</td>';
@@ -906,8 +835,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="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;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -924,8 +852,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+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>';
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index ee72c920e2f..819c3499627 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -39,8 +39,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
     $adht = new AdherentType($db);
     $result = $adht->fetch($object->typeid);
 }
@@ -64,8 +63,7 @@ llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id)
-{
+if ($id) {
 	$head = member_prepare_head($object);
 
 	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
@@ -83,8 +81,7 @@ if ($id)
 	print '<table class="border centpercent tableforfield">';
 
     // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-    {
+    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
         print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
     }
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 70c6ab0689b..8f9a46228c6 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -33,8 +33,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -77,12 +76,10 @@ $foundphy = $foundmor = 0;
 // Define $data array
 dol_syslog("Count member", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		if ($obj->code == 'phy') $foundphy++;
@@ -124,8 +121,7 @@ print '</tr>';
 if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index bde4d5c949c..62f4cd63dca 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -34,8 +34,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -68,11 +67,9 @@ print load_fiche_titre($title, '', 'object_group');
 
 dol_mkdir($dir);
 
-if ($mode)
-{
+if ($mode) {
     // Define sql
-    if ($mode == 'memberbycountry')
-    {
+    if ($mode == 'memberbycountry') {
         $label = $langs->trans("Country");
         $tab = 'statscountry';
 
@@ -87,8 +84,7 @@ if ($mode)
         //print $sql;
     }
 
-	if ($mode == 'memberbystate')
-    {
+	if ($mode == 'memberbystate') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("State");
         $tab = 'statsstate';
@@ -105,9 +101,8 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, c.nom";
         //print $sql;
     }
-    if ($mode == 'memberbyregion') //
-    {
-        $label = $langs->trans("Country");
+    if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
         $label2 = $langs->trans("Region"); //département
         $tab = 'statsregion'; //onglet
 
@@ -123,8 +118,7 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
     }
-    if ($mode == 'memberbytown')
-    {
+    if ($mode == 'memberbytown') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("Town");
         $tab = 'statstown';
@@ -148,15 +142,12 @@ if ($mode)
     // Define $data array
     dol_syslog("Count member", LOG_DEBUG);
     $resql = $db->query($sql);
-    if ($resql)
-    {
+    if ($resql) {
         $num = $db->num_rows($resql);
         $i = 0;
-        while ($i < $num)
-        {
+        while ($i < $num) {
             $obj = $db->fetch_object($resql);
-            if ($mode == 'memberbycountry')
-            {
+            if ($mode == 'memberbycountry') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 							'code'=>$obj->code,
@@ -165,9 +156,8 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbyregion') //+
-            {
-                $data[] = array(
+            if ($mode == 'memberbyregion') { //+
+				$data[] = array(
                     'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                     'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				    'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -176,8 +166,7 @@ if ($mode)
                     'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
 	        }
-            if ($mode == 'memberbystate')
-            {
+            if ($mode == 'memberbystate') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -186,8 +175,7 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbytown')
-            {
+            if ($mode == 'memberbytown') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -212,8 +200,7 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
-if ($mode && !count($data))
-{
+if ($mode && !count($data)) {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
 } else {
@@ -237,8 +224,7 @@ if ($mode && !count($data))
 
 
 // Show graphics
-if (count($arrayjs) && $mode == 'memberbycountry')
-{
+if (count($arrayjs) && $mode == 'memberbycountry') {
     $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
     if (is_readable($color_file)) include_once $color_file;
 
@@ -256,8 +242,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
 
     // loop and dump
     $i = 0;
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
         //$valcountry=ucfirst($val['label_en']);
         if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
@@ -286,8 +271,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
     print '<br>';
 }
 
-if ($mode)
-{
+if ($mode) {
     // Print array / Affiche le tableau
     print '<table class="liste centpercent">';
     print '<tr class="liste_titre">';
@@ -298,8 +282,7 @@ if ($mode)
     print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
     print '</tr>';
 
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $year = $val['year'];
         print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index cb0e6a463e4..892d4d10cc6 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -35,8 +35,7 @@ $userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -79,12 +78,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px1->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -112,12 +109,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px2->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -175,11 +170,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
     $year = $val['year'];
-    while ($oldyear > $year + 1)
-    {	// If we have empty year
+    while ($oldyear > $year + 1) {	// If we have empty year
         $oldyear--;
         print '<tr class="oddeven" height="24">';
         print '<td class="center">';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3bf821db04e..a3d72e600e6 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -75,16 +75,14 @@ $errmsg = '';
 $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
-if ($rowid)
-{
+if ($rowid) {
     // Load member
     $result = $object->fetch($rowid);
 
     // Define variables to know what current user can do on users
     $canadduser = ($user->admin || $user->rights->user->user->creer);
     // Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id)
-    {
+    if ($object->user_id) {
         // $user is the user editing, $object->user_id is the user's id linked to the edited member
         $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
         || (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -96,8 +94,7 @@ if ($rowid)
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
-if ($rowid)
-{
+if ($rowid) {
     $caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -115,16 +112,13 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
  */
 
 // Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-{
-	if ($result > 0)
-	{
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+	if ($result > 0) {
 		// Creation of thirdparty
 		$company = new Societe($db);
 		$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'), GETPOST('customercode', 'alpha'));
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
 		}
@@ -137,23 +131,18 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 	}
 }
 
-if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-{
+if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
     $error = 0;
-    if (empty($user->rights->user->user->creer))    // If can edit only itself user, we can link to itself only
-    {
-        if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
-        {
+    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
             $error++;
             setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
-        }
+		}
     }
 
-    if (!$error)
-    {
-        if ($_POST["userid"] != $object->user_id)  // If link differs from currently in database
-        {
-            $result = $object->setUserId($_POST["userid"]);
+    if (!$error) {
+        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+			$result = $object->setUserId($_POST["userid"]);
             if ($result < 0) dol_print_error('', $object->error);
             $_POST['action'] = '';
             $action = '';
@@ -161,21 +150,16 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
     }
 }
 
-if ($action == 'setsocid')
-{
+if ($action == 'setsocid') {
     $error = 0;
-    if (!$error)
-    {
-        if (GETPOST('socid', 'int') != $object->fk_soc)    // If link differs from currently in database
-        {
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+    if (!$error) {
+        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
             $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
             $resql = $db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0)
-                {
+                if ($obj && $obj->rowid > 0) {
                     $othermember = new Adherent($db);
                     $othermember->fetch($obj->rowid);
                     $thirdparty = new Societe($db);
@@ -185,8 +169,7 @@ if ($action == 'setsocid')
                 }
             }
 
-            if (!$error)
-            {
+            if (!$error) {
                 $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
                 if ($result < 0) dol_print_error('', $object->error);
                 $_POST['action'] = '';
@@ -196,8 +179,7 @@ if ($action == 'setsocid')
     }
 }
 
-if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"])
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
     $error = 0;
 
     $langs->load("banks");
@@ -209,16 +191,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $datesubscription = 0;
     $datesubend = 0;
     $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"])
-    {
+    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
         $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
     }
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"])
-    {
+    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
         $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
     }
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"])
-    {
+    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
         $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
     }
     $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
@@ -235,28 +214,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $sendalsoemail = GETPOST("sendmail", 'alpha');
 
     // Check parameters
-    if (!$datesubscription)
-    {
+    if (!$datesubscription) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (GETPOST('end') && !$datesubend)
-    {
+    if (GETPOST('end') && !$datesubend) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (!$datesubend)
-    {
+    if (!$datesubend) {
         $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
     }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate)
-    {
+    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
         $error++;
         $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
         setEventMessages($errmsg, null, 'errors');
@@ -264,21 +239,17 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription)	// Member type need subscriptions
-    {
-        if (!is_numeric($amount))
-        {
+    if (!$error && $adht->subscription) {	// Member type need subscriptions
+		if (!is_numeric($amount)) {
             // If field is '' or not a numeric value
             $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
         	setEventMessages($errmsg, null, 'errors');
             $error++;
             $action = 'addsubscription';
-        }
+		}
         else {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none')
-            {
-                if ($_POST["subscription"])
-                {
+            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+                if ($_POST["subscription"]) {
                     if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
@@ -286,8 +257,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
-                if ($errmsg)
-                {
+                if ($errmsg) {
                 	$error++;
         			setEventMessages($errmsg, null, 'errors');
         			$error++;
@@ -298,24 +268,20 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription')
-    {
+    if (!$error && $action == 'subscription') {
         $db->begin();
 
         // Create subscription
         $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0)
-        {
+        if ($crowid <= 0) {
             $error++;
             $errmsg = $object->error;
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -324,8 +290,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 			}
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $db->commit();
         }
         else {
@@ -333,18 +298,15 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
             $action = 'addsubscription';
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	setEventMessages("SubscriptionRecorded", null, 'mesgs');
         }
 
         // Send email
-        if (!$error)
-        {
+        if (!$error) {
             // Send confirmation Email
-            if ($object->email && $sendalsoemail)   // $object is 'Adherent'
-            {
-            	$subject = '';
+            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+				$subject = '';
             	$msg = '';
 
             	// Send subscription email
@@ -362,8 +324,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
             	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            	{
+            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             		$subject = $arraydefaultmessage->topic;
             		$msg     = $arraydefaultmessage->content;
             	}
@@ -378,8 +339,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $listofpaths = array();
                 $listofnames = array();
                 $listofmimes = array();
-                if (is_object($object->invoice))
-                {
+                if (is_object($object->invoice)) {
                 	$invoicediroutput = $conf->facture->dir_output;
                 	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
                 	$file = $fileparams['fullname'];
@@ -392,8 +352,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
                 $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0)
-                {
+                if ($result < 0) {
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
                 }
@@ -407,8 +366,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
         }
 
         // Clean some POST vars
-        if (!$error)
-        {
+        if (!$error) {
             $_POST["subscription"] = '';
             $_POST["accountid"] = '';
             $_POST["operation"] = '';
@@ -442,8 +400,7 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if ($rowid > 0)
-{
+if ($rowid > 0) {
     $res = $object->fetch($rowid);
     if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
@@ -472,8 +429,7 @@ if ($rowid > 0)
     print '<table class="border centpercent tableforfield">';
 
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 	}
 
@@ -492,11 +448,9 @@ if ($rowid > 0)
 	print '</tr>';
 
 	// Password
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
-		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-		{
+		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 		    $langs->load("errors");
 		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -519,8 +473,7 @@ if ($rowid > 0)
 	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
 		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -533,16 +486,14 @@ if ($rowid > 0)
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($object->datefin)
-	{
+	if ($object->datefin) {
 	    print dol_print_date($object->datefin, 'day');
 	    if ($object->hasDelay()) {
 	        print " ".img_warning($langs->trans("Late"));
 	    }
 	}
 	else {
-	    if (!$adht->subscription)
-	    {
+	    if (!$adht->subscription) {
 	        print $langs->trans("SubscriptionNotRecorded");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
@@ -554,8 +505,7 @@ if ($rowid > 0)
 	print '</td></tr>';
 
 	// Third party Dolibarr
-	if (!empty($conf->societe->enabled))
-	{
+	if (!empty($conf->societe->enabled)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans("LinkedToDolibarrThirdParty");
@@ -563,8 +513,7 @@ if ($rowid > 0)
 		if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editthirdparty')
-		{
+		if ($action == 'editthirdparty') {
 			$htmlname = 'socid';
 			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -578,8 +527,7 @@ if ($rowid > 0)
 			print '</tr></table></form>';
 		}
 		else {
-			if ($object->fk_soc)
-			{
+			if ($object->fk_soc) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
@@ -596,24 +544,20 @@ if ($rowid > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans("LinkedToDolibarrUser");
 	print '</td>';
-	if ($action != 'editlogin' && $user->rights->adherent->creer)
-	{
+	if ($action != 'editlogin' && $user->rights->adherent->creer) {
 		print '<td class="right">';
-		if ($user->rights->user->user->creer)
-		{
+		if ($user->rights->user->user->creer) {
 			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
 		}
 		print '</td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2" class="valeur">';
-	if ($action == 'editlogin')
-	{
+	if ($action == 'editlogin') {
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
 	}
 	else {
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
 		}
 		else print $langs->trans("NoDolibarrAccess");
@@ -635,10 +579,8 @@ if ($rowid > 0)
      */
 
     // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer)
-    {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty')
-        {
+    if ($user->rights->adherent->cotisation->creer) {
+        if ($action != 'addsubscription' && $action != 'create_thirdparty') {
             print '<div class="tabsAction">';
 
             if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
@@ -651,8 +593,7 @@ if ($rowid > 0)
     /*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty')
-    {
+    if ($action != 'addsubscription' && $action != 'create_thirdparty') {
         $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
         $sql .= " c.rowid as crowid, c.subscription,";
         $sql .= " c.datec, c.fk_type as cfk_type,";
@@ -668,8 +609,7 @@ if ($rowid > 0)
 		$sql .= $db->order($sortfield, $sortorder);
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $subscriptionstatic = new Subscription($db);
 
             $num = $db->num_rows($result);
@@ -683,8 +623,7 @@ if ($rowid > 0)
             print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->banque->enabled))
-            {
+            if (!empty($conf->banque->enabled)) {
             	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
             }
             print "</tr>\n";
@@ -694,8 +633,7 @@ if ($rowid > 0)
             $adht = new AdherentType($db);
 
             $i = 0;
-            while ($i < $num)
-            {
+            while ($i < $num) {
                 $objp = $db->fetch_object($result);
 
                 $adh->id = $objp->rowid;
@@ -705,8 +643,7 @@ if ($rowid > 0)
                 $subscriptionstatic->id = $objp->crowid;
 
                 $typeid = ($objp->cfk_type > 0 ? $objp->cfk_type : $adh->typeid);
-                if ($typeid > 0)
-                {
+                if ($typeid > 0) {
                     $adht->fetch($typeid);
                 }
 
@@ -721,19 +658,16 @@ if ($rowid > 0)
                 print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
                 print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
                 print '<td class="right">'.price($objp->subscription).'</td>';
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
-					if ($objp->bid)
-					{
+					if ($objp->bid) {
 						$accountstatic->label = $objp->label;
 						$accountstatic->id = $objp->baid;
 						$accountstatic->number = $objp->number;
 						$accountstatic->account_number = $objp->account_number;
 						$accountstatic->currency_code = $objp->currency_code;
 
-						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0)
-						{
+						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0) {
 							$accountingjournal = new AccountingJournal($db);
 							$accountingjournal->fetch($objp->fk_accountancy_journal);
 
@@ -764,13 +698,11 @@ if ($rowid > 0)
     }
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty'))
-    {
+    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
 	    // Shon online payment link
 	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment)
-	    {
+	    if ($useonlinepayment) {
 	    	print '<br>';
 
 	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -782,8 +714,7 @@ if ($rowid > 0)
     /*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer)
-    {
+    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
         print '<br>';
 
         print load_fiche_titre($langs->trans("NewCotisation"));
@@ -792,8 +723,7 @@ if ($rowid > 0)
         $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
         $invoiceonly = 0; // 1 means option by default is invoice only
         $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave'))
-        {
+        if (GETPOST('paymentsave')) {
         	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
         	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
         	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
@@ -805,8 +735,7 @@ if ($rowid > 0)
 
         print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax)
-        {
+        if ($conf->use_javascript_ajax) {
         	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
             print "\n".'<script type="text/javascript" language="javascript">';
             print '$(document).ready(function () {
@@ -842,13 +771,11 @@ if ($rowid > 0)
 
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
 			} else {
@@ -862,8 +789,7 @@ if ($rowid > 0)
 				array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
 			);
 			// If customer code was forced to "required", we ask it at creation to avoid error later
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-			{
+			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
                 $tmpcompany->get_codeclient($tmpcompany, 0);
@@ -901,23 +827,19 @@ if ($rowid > 0)
         $paymentdate = -1;
 
         // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday'))
-        {
+        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
             $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
         }
 
         print '<tr>';
         // Date start subscription
         print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday'))
-        {
+        if (GETPOST('reday')) {
             $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
         }
-        if (!$datefrom)
-        {
+        if (!$datefrom) {
         	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0)
-            {
+        	if ($object->datefin > 0) {
                 $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
             }
         }
@@ -925,20 +847,17 @@ if ($rowid > 0)
         print "</td></tr>";
 
         // Date end subscription
-        if (GETPOST('endday'))
-        {
+        if (GETPOST('endday')) {
             $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
         }
-        if (!$dateto)
-        {
+        if (!$dateto) {
             $dateto = -1; // By default, no date is suggested
         }
         print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
         print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
         print "</td></tr>";
 
-        if ($adht->subscription)
-        {
+        if ($adht->subscription) {
             // Amount
             print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
@@ -949,11 +868,9 @@ if ($rowid > 0)
             print '"></td></tr>';
 
             // Complementary action
-            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled))
-            {
+            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) {
                 $company = new Societe($db);
-                if ($object->fk_soc)
-                {
+                if ($object->fk_soc) {
                     $result = $company->fetch($object->fk_soc);
                 }
 
@@ -966,14 +883,12 @@ if ($rowid > 0)
                 print '<td>';
                 print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
                 // Add entry into bank accoun
-                if (!empty($conf->banque->enabled))
-                {
+                if (!empty($conf->banque->enabled)) {
                     print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
                     print '> '.$langs->trans("MoreActionBankDirect").'<br>';
                 }
                 // Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
                     print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionInvoiceOnly");
@@ -995,8 +910,7 @@ if ($rowid > 0)
                     print '<br>';
                 }
                 // Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
                     print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionBankViaInvoice");
@@ -1010,8 +924,7 @@ if ($rowid > 0)
                     	print '</a>)';
                     }
                     if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
@@ -1056,8 +969,7 @@ if ($rowid > 0)
 
         print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
         print '<td>';
-        if (!$object->email)
-        {
+        if (!$object->email) {
             print $langs->trans("NoEMail");
         } else {
             $adht = new AdherentType($db);
@@ -1081,8 +993,7 @@ if ($rowid > 0)
 
             if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            {
+            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             	$subject = $arraydefaultmessage->topic;
             	$msg     = $arraydefaultmessage->content;
             }
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 303a4aa7b5a..b7e54238c4c 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -66,39 +66,33 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, n
 //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel)
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel) {
 	// Load current object
 	$result = $object->fetch($rowid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->begin();
 
 		$errmsg = '';
 
-		if ($object->fk_bank)
-		{
+		if ($object->fk_bank) {
 			$accountline = new AccountLine($db);
 			$result = $accountline->fetch($object->fk_bank);
 
 			// If transaction consolidated
-			if ($accountline->rappro)
-			{
+			if ($accountline->rappro) {
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
 			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->amount = $_POST["amount"];
 				$result = $accountline->update($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errmsg = $accountline->error;
 				}
 			}
 		}
 
-		if (!$errmsg)
-		{
+		if (!$errmsg) {
 			// Modify values
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
@@ -108,8 +102,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$db->commit();
 
 				header("Location: card.php?rowid=".$object->id);
@@ -117,12 +110,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$db->rollback();
 
-			    if ($object->error)
-				{
+			    if ($object->error) {
 					$errmsg = $object->error;
 				} else {
-					foreach ($object->errors as $error)
-					{
+					foreach ($object->errors as $error) {
 						if ($errmsg) $errmsg .= '<br>';
 						$errmsg .= $error;
 					}
@@ -135,12 +126,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
     $result = $object->delete($user);
-    if ($result > 0)
-    {
+    if ($result > 0) {
     	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
     	exit;
     } else {
@@ -163,8 +152,7 @@ llxHeader('', $langs->trans("SubscriptionCard"), 'EN:Module_Foundations|FR:Modul
 dol_htmloutput_errors($errmsg);
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'edit')
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in edit mode
@@ -228,13 +216,10 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
@@ -259,8 +244,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print "\n";
 }
 
-if ($rowid && $action != 'edit')
-{
+if ($rowid && $action != 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in view mode
@@ -275,8 +259,7 @@ if ($rowid && $action != 'edit')
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
     // Confirmation to delete subscription
-    if ($action == 'delete')
-    {
+    if ($action == 'delete') {
 		//$formquestion=array();
         //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
@@ -333,13 +316,10 @@ if ($rowid && $action != 'edit')
     print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
@@ -363,10 +343,8 @@ if ($rowid && $action != 'edit')
      */
     print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer)
-	{
-		if (!$bankline->rappro)
-		{
+    if ($user->rights->adherent->cotisation->creer) {
+		if (!$bankline->rappro) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=edit\">".$langs->trans("Modify")."</a></div>";
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify")."</a></div>";
@@ -374,8 +352,7 @@ if ($rowid && $action != 'edit')
 	}
 
     // Delete
-    if ($user->rights->adherent->cotisation->creer)
-    {
+    if ($user->rights->adherent->cotisation->creer) {
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=delete\">".$langs->trans("Delete")."</a></div>\n";
     }
 
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d2fd59b8ce5..509f00d2705 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -110,15 +110,13 @@ $parameters = array('socid'=>$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))
-{
+if (empty($reshook)) {
     // Selection of new fields
     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
-    {
-	    $search_type = "";
+    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
+		$search_type = "";
 	    $search_ref = "";
 	    $search_lastname = "";
 	    $search_firstname = "";
@@ -153,13 +151,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription a
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.rowid = c.fk_adherent";
 $sql .= " AND d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
-{
+if (isset($date_select) && $date_select != '') {
     $sql .= " AND c.dateadh >= '".$date_select."-01-01 00:00:00'";
     $sql .= " AND c.dateadh < '".($date_select + 1)."-01-01 00:00:00'";
 }
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -183,14 +179,12 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
     $resql = $db->query($sql);
     if ($resql) $nbtotalofrecords = $db->num_rows($resql);
     else dol_print_error($db);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
+    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
     	$offset = 0;
     }
 }
@@ -198,8 +192,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db);
 	exit;
 }
@@ -208,8 +201,7 @@ $num = $db->num_rows($result);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/subscription/card.php?id='.$id);
@@ -247,8 +239,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->cotisation->creer)
-{
+if ($user->rights->adherent->cotisation->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
@@ -269,8 +260,7 @@ $objecttmp = new Subscription($db);
 $trackid = 'sub'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
@@ -289,70 +279,59 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 }
 
 // Type
-if (!empty($arrayfields['d.fk_type']['checked']))
-{
+if (!empty($arrayfields['d.fk_type']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 	print'</td>';
 }
 
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
 
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	print '';
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.bank']['checked']))
-{
+if (!empty($arrayfields['d.bank']['checked'])) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150');
 	print '</td>';
 }
 
-if (!empty($arrayfields['c.dateadh']['checked']))
-{
+if (!empty($arrayfields['c.dateadh']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['c.datef']['checked']))
-{
+if (!empty($arrayfields['c.datef']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['d.amount']['checked']))
-{
+if (!empty($arrayfields['d.amount']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input class="flat" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'" size="4">';
 	print '</td>';
@@ -365,14 +344,12 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['c.datec']['checked']))
-{
+if (!empty($arrayfields['c.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['c.tms']['checked']))
-{
+if (!empty($arrayfields['c.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -412,8 +389,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($result);
 
 	$subscription->ref = $obj->crowid;
@@ -435,17 +411,14 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
     // Type
-    if (!empty($arrayfields['d.fk_type']['checked']))
-	{
+    if (!empty($arrayfields['d.fk_type']['checked'])) {
         print '<td class="nowraponall">';
-        if ($typeid > 0)
-        {
+        if ($typeid > 0) {
         	print $adht->getNomUrl(1);
         }
         print '</td>';
@@ -453,30 +426,26 @@ while ($i < min($num, $limit))
 	}
 
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		$adherent->firstname = '';
 		print '<td>'.$adherent->getNomUrl(-1).'</td>';
 		$adherent->firstname = $obj->firstname;
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		print '<td>';
 		print dol_trunc($obj->note, 128);
 		print '</td>';
@@ -484,11 +453,9 @@ while ($i < min($num, $limit))
 	}
 
 	// Banque
-	if (!empty($arrayfields['d.bank']['checked']))
-	{
+	if (!empty($arrayfields['d.bank']['checked'])) {
 		print '<td class="tdmaxoverflow150">';
-		if ($obj->fk_account > 0)
-		{
+		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
 			$accountstatic->fetch($obj->fk_account);
 			//$accountstatic->label=$obj->label;
@@ -499,20 +466,17 @@ while ($i < min($num, $limit))
 	}
 
 	// Date start
-	if (!empty($arrayfields['c.dateadh']['checked']))
-	{
+	if (!empty($arrayfields['c.dateadh']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date end
-	if (!empty($arrayfields['c.datef']['checked']))
-	{
+	if (!empty($arrayfields['c.datef']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Price
-	if (!empty($arrayfields['d.amount']['checked']))
-	{
+	if (!empty($arrayfields['d.amount']['checked'])) {
 		print '<td class="right">'.price($obj->subscription).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
@@ -525,16 +489,14 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['c.datec']['checked']))
-	{
+	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['c.tms']['checked']))
-	{
+	if (!empty($arrayfields['c.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
@@ -542,8 +504,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="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;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -560,8 +521,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+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>';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 16b600bfeeb..136c1dab8f4 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,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;
 }
@@ -33,8 +32,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("members");
 
 $total = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
     echo '<tr class="oddeven">';
     echo '<td>'.$langs->trans("Subscription").'</td>';
     echo '<td>'.$objectlink->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 5f89f06b22f..534e7c2896c 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -79,9 +79,8 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-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
-{
-    $search_lastname = "";
+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
+	$search_lastname = "";
     $search_login = "";
     $search_email = "";
     $type = "";
@@ -138,11 +137,9 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		}
@@ -156,8 +153,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	}
 }
 
-if ($action == 'update' && $user->rights->adherent->configurer)
-{
+if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
@@ -178,8 +174,7 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 	$ret = $object->update($user);
 
-	if ($ret >= 0 && !count($object->errors))
-	{
+	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
 	}
 	else {
@@ -190,13 +185,11 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
-{
+if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -219,8 +212,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Modul
 
 
 // List of members type
-if (!$rowid && $action != 'create' && $action != 'edit')
-{
+if (!$rowid && $action != 'create' && $action != 'edit') {
 	//dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
@@ -228,8 +220,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
 
@@ -317,8 +308,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 /* Creation mode                                                              */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new AdherentType($db);
 
 	print load_fiche_titre($langs->trans("NewMemberType"), '', 'members');
@@ -393,10 +383,8 @@ if ($action == 'create')
 /* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-if ($rowid > 0)
-{
-	if ($action != 'edit')
-	{
+if ($rowid > 0) {
+	if ($action != 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -404,8 +392,7 @@ if ($rowid > 0)
 		/*
 		 * Confirmation deletion
 		 */
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
@@ -435,12 +422,10 @@ if ($rowid > 0)
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-		if ($object->duration_value > 1)
-		{
+		if ($object->duration_value > 1) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
 		}
-		elseif ($object->duration_value > 0)
-		{
+		elseif ($object->duration_value > 0) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 		}
 		print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
@@ -467,22 +452,19 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Add
-        if ($user->rights->adherent->configurer && !empty($object->statut))
-		{
+        if ($user->rights->adherent->configurer && !empty($object->statut)) {
             print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
         } else {
 		    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
         }
 
 		// Delete
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
@@ -503,39 +485,30 @@ if ($rowid > 0)
 		$sql .= " WHERE d.fk_adherent_type = t.rowid ";
 		$sql .= " AND d.entity IN (".getEntity('adherent').")";
 		$sql .= " AND t.rowid = ".$object->id;
-		if ($sall)
-		{
+		if ($sall) {
 			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
-		if ($status != '')
-		{
+		if ($status != '') {
 		    $sql .= natural_search('d.statut', $status, 2);
 		}
-		if ($action == 'search')
-		{
-			if (GETPOST('search', 'alpha'))
-			{
+		if ($action == 'search') {
+			if (GETPOST('search', 'alpha')) {
 		  		$sql .= natural_search(array("d.firstname", "d.lastname"), GETPOST('search', 'alpha'));
 		  	}
 		}
-		if (!empty($search_lastname))
-		{
+		if (!empty($search_lastname)) {
 			$sql .= natural_search(array("d.firstname", "d.lastname"), $search_lastname);
 		}
-		if (!empty($search_login))
-		{
+		if (!empty($search_login)) {
 			$sql .= natural_search("d.login", $search_login);
 		}
-		if (!empty($search_email))
-		{
+		if (!empty($search_email)) {
 			$sql .= natural_search("d.email", $search_email);
 		}
-        if ($filter == 'uptodate')
-        {
+        if ($filter == 'uptodate') {
             $sql .= " AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
         }
-        if ($filter == 'outofdate')
-        {
+        if ($filter == 'outofdate') {
             $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
         }
 
@@ -543,14 +516,12 @@ if ($rowid > 0)
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$resql = $db->query($sql);
 		    if ($resql) $nbtotalofrecords = $db->num_rows($result);
 		    else dol_print_error($db);
-		    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-		    {
-		    	$page = 0;
+		    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+				$page = 0;
 		    	$offset = 0;
 		    }
 		}
@@ -558,14 +529,12 @@ if ($rowid > 0)
 		$sql .= " ".$db->plimit($conf->liste_limit + 1, $offset);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 
 		    $titre = $langs->trans("MembersList");
-		    if ($status != '')
-		    {
+		    if ($status != '') {
 		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
 		        elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); }
 		        elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
@@ -573,13 +542,11 @@ if ($rowid > 0)
 		        elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 		        elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
 		    }
-		    elseif ($action == 'search')
-		    {
+		    elseif ($action == 'search') {
 		        $titre = $langs->trans("MembersListQualified");
 		    }
 
-		    if ($type > 0)
-		    {
+		    if ($type > 0) {
 				$membertype = new AdherentType($db);
 		        $result = $membertype->fetch($type);
 				$titre .= " (".$membertype->label.")";
@@ -593,8 +560,7 @@ if ($rowid > 0)
 		    if (!empty($search_email))		$param .= "&search_email=".$search_email;
 		    if (!empty($filter))			$param .= "&filter=".$filter;
 
-		    if ($sall)
-		    {
+		    if ($sall) {
 		        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
 		    }
 
@@ -644,8 +610,7 @@ if ($rowid > 0)
 		    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 		    print "</tr>\n";
 
-		    while ($i < $num && $i < $conf->liste_limit)
-		    {
+		    while ($i < $num && $i < $conf->liste_limit) {
 		        $objp = $db->fetch_object($resql);
 
 		        $datefin = $db->jdate($objp->datefin);
@@ -656,8 +621,7 @@ if ($rowid > 0)
 
 		        // Lastname
 		        print '<tr class="oddeven">';
-		        if ($objp->company != '')
-		        {
+		        if ($objp->company != '') {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
 		        }
 		        else {
@@ -687,11 +651,9 @@ if ($rowid > 0)
 		        print "</td>";
 
 		        // Date end subscription
-		        if ($datefin)
-		        {
+		        if ($datefin) {
 			        print '<td class="nowrap center">';
-		            if ($datefin < dol_now() && $objp->statut > 0)
-		            {
+		            if ($datefin < dol_now() && $objp->statut > 0) {
 		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
 		            }
 		            else {
@@ -701,8 +663,7 @@ if ($rowid > 0)
 		        }
 		        else {
 			        print '<td class="nowrap left">';
-			        if ($objp->subscription == 'yes')
-			        {
+			        if ($objp->subscription == 'yes') {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();
 			        }
@@ -714,13 +675,11 @@ if ($rowid > 0)
 
 		        // Actions
 		        print '<td class="center">';
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<a class="editfielda" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				print '&nbsp;';
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 		        }
 				print "</td>";
@@ -733,8 +692,7 @@ if ($rowid > 0)
             print '</div>';
             print '</form>';
 
-			if ($num > $conf->liste_limit)
-			{
+			if ($num > $conf->liste_limit) {
 			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
 		}
@@ -749,8 +707,7 @@ if ($rowid > 0)
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index 9e52f05739e..47dcacf1d6a 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -53,15 +53,12 @@ $parameters = array();
 $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))
-{
-	if ($action == 'dolibarr2ldap')
-	{
+if (empty($reshook)) {
+	if ($action == 'dolibarr2ldap') {
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$object->listMembersForMemberType('', 1);
 
 			$info = $object->_load_ldap_info();
@@ -126,8 +123,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1)
-{
+if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
@@ -150,8 +146,7 @@ print '</tr>';
 // LDAP reading
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
     $info = $object->_load_ldap_info();
     $dn = $object->_load_ldap_dn($info, 1);
     $search = "(".$object->_load_ldap_dn($info, 2).")";
@@ -161,10 +156,8 @@ if ($result > 0)
     //print_r($records);
 
     // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    {
-        if (!is_array($records))
-        {
+    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+        if (!is_array($records)) {
             print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
         }
         else {
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 0e81240a020..1e1d06f85b8 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -51,28 +51,24 @@ $result = restrictedArea($user, 'adherent', $id, 'adherent_type');
  */
 
 // return to translation display if cancellation
-if ($cancel == $langs->trans("Cancel"))
-{
+if ($cancel == $langs->trans("Cancel")) {
 	$action = '';
 }
 
-if ($action == 'delete' && GETPOST('langtodelete', 'alpha'))
-{
+if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
 }
 
 // Add translation
-if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
 	// update of object
-	if ($_POST["forcelangprod"] == $current_lang)
-	{
+	if ($_POST["forcelangprod"] == $current_lang) {
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
@@ -84,8 +80,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	}
 
 	// backup into database
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
 	}
 	else {
@@ -95,16 +90,13 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 }
 
 // Edit translation
-if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // saving new values in the object
-	{
-		if ($key == $current_lang)
-		{
+	foreach ($object->multilangs as $key => $value) { // saving new values in the object
+		if ($key == $current_lang) {
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -116,8 +108,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 		}
 	}
 
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
 	}
 	else {
@@ -127,15 +118,13 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 }
 
 // Delete translation
-if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$langtodelete = GETPOST('langdel', 'alpha');
 
 
-	if ($object->delMultiLangs($langtodelete, $user) > 0)
-	{
+	if ($object->delMultiLangs($langtodelete, $user) > 0) {
 		$action = '';
 	}
 	else {
@@ -169,10 +158,8 @@ $titre = $langs->trans("MemberType".$object->type);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;
-if (!empty($object->multilangs))
-{
-    foreach ($object->multilangs as $key => $value)
-    {
+if (!empty($object->multilangs)) {
+    foreach ($object->multilangs as $key => $value) {
         $cnt_trans++;
     }
 }
@@ -196,10 +183,8 @@ dol_fiche_end();
 
 print "\n<div class=\"tabsAction\">\n";
 
-if ($action == '')
-{
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
+if ($action == '') {
+    if ($user->rights->produit->creer || $user->rights->service->creer) {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
         if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
     }
@@ -209,8 +194,7 @@ print "\n</div>\n";
 
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -219,10 +203,8 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 
@@ -248,12 +230,9 @@ if ($action == 'edit')
 
 	print '</form>';
 }
-elseif ($action != 'add')
-{
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+elseif ($action != 'add') {
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
 
@@ -275,8 +254,7 @@ elseif ($action != 'add')
  * Form to add a new translation
  */
 
-if ($action == 'add' && $user->rights->adherent->configurer)
-{
+if ($action == 'add' && $user->rights->adherent->configurer) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 280780f8f25..0a6f39c777b 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -635,8 +635,7 @@ class Hook extends CommonObject
         // phpcs:enable
     	global $langs;
 
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
     		global $langs;
     		//$langs->load("mymodule");
     		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index b036057cb04..a9b44fbd089 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -41,8 +41,7 @@ $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
 } else {
@@ -89,19 +88,16 @@ $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))
-{
+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
-    {
-        $actioncode = '';
+    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 = '';
     }
 }
@@ -116,8 +112,7 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$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;
 	$help_url = '';
@@ -197,8 +192,7 @@ if ($object->id > 0)
 
     $out = '';
     $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+    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';
@@ -210,10 +204,8 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
+    if (!empty($conf->agenda->enabled)) {
+    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
     	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -222,8 +214,7 @@ if ($object->id > 0)
 
     print '</div>';
 
-    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))) {
         $param = '&socid='.$socid;
         if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index 660e972cf28..c6cfda9f539 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -55,8 +55,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
@@ -82,8 +81,7 @@ $parameters = array();
 $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))
-{
+if (empty($reshook)) {
     $error = 0;
 
     $permissiontoadd = $user->rights->mymodule->write;
@@ -142,8 +140,7 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -175,8 +172,7 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -207,8 +203,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
     $res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
@@ -217,8 +212,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
@@ -230,8 +224,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	if ($action == 'xxx') {
 		$formquestion = array();
 	    /*
 		$forcecombo=0;
@@ -332,19 +325,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
+    	if (empty($reshook)) {
             // Modify
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
     		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
     		// Clone
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
     		}
 
@@ -362,8 +352,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete)
-    		{
+    		if ($user->rights->mymodule->delete) {
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
     		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
@@ -378,8 +367,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 	    print '<div class="fichecenter"><div class="fichehalfleft">';
 	    print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index 4c390a118e2..9b43ded60c8 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -92,8 +92,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -105,8 +104,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 8be913c5a8c..228d26232e8 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -509,8 +509,7 @@ while ($i < min($num, $limit)) {
             else print $object->showOutputField($val, $key, $obj->$key, '');
             print '</td>';
             if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure']))
-            {
+            if (!empty($val['isameasure'])) {
                 if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
                 $totalarray['val']['t.'.$key] += $obj->$key;
             }
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index af96dfce98c..151c762be56 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -77,8 +77,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
index 9416936e261..114e7753512 100644
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ b/htdocs/zapier/lib/zapier_hook.lib.php
@@ -41,8 +41,7 @@ function myobjectPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php
index 6986bc8588d..760bd85322a 100644
--- a/htdocs/zapier/zapierindex.php
+++ b/htdocs/zapier/zapierindex.php
@@ -37,8 +37,7 @@ $action = GETPOST('action', 'alpha');
 // Securite acces client
 if (!$user->rights->zapier->read) accessforbidden();
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }