Dolibarr / dolibarr

htdocs/admin/mails_templates.php

Indentation +492 added lines, -492 removed lines

@@ -115,31 +115,31 @@ 
 $formmail=new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
-    $tmp=FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTranslationKey)__']='Translation';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach($tmp as $key => $val)
-    {
-    	$helpsubstit.=$key.' -> '.$val.'<br>';
-    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
-    }
+	$tmp=FormMail::getAvailableSubstitKey('formemail');
+	$tmp['__(AnyTranslationKey)__']='Translation';
+	$helpsubstit = $langs->trans("AvailableVariables").':<br>';
+	$helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+	foreach($tmp as $key => $val)
+	{
+		$helpsubstit.=$key.' -> '.$val.'<br>';
+		$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+	}
 }
 else
 {
-    $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTranslationKey)__']='Translation';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach($tmp as $key => $val)
-    {
-    	$helpsubstit.=$key.' -> '.$val.'<br>';
-    }
-    $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
-    foreach($tmp as $key => $val)
-    {
-    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
-    }
+	$tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
+	$tmp['__(AnyTranslationKey)__']='Translation';
+	$helpsubstit = $langs->trans("AvailableVariables").':<br>';
+	$helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+	foreach($tmp as $key => $val)
+	{
+		$helpsubstit.=$key.' -> '.$val.'<br>';
+	}
+	$tmp=FormMail::getAvailableSubstitKey('formemailforlines');
+	foreach($tmp as $key => $val)
+	{
+		$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+	}
 }
 
 
@@ -197,193 +197,193 @@ 
 
 if (empty($reshook))
 {
-    // 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_label='';
-        $search_type_template='';
-        $search_lang='';
-        $search_fk_user='';
-        $search_topic='';
-        $toselect='';
-        $search_array_options=array();
-    }
-
-    // Actions add or modify an entry into a dictionary
-    if (GETPOST('actionadd') || GETPOST('actionmodify'))
-    {
-        $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
-        $listfieldinsert=explode(',',$tabfieldinsert[$id]);
-        $listfieldmodify=explode(',',$tabfieldinsert[$id]);
-        $listfieldvalue=explode(',',$tabfieldvalue[$id]);
-
-        // Check that all fields are filled
-        $ok=1;
-        foreach ($listfield as $f => $value)
-        {
-        	// Not mandatory fields
-            if ($value == 'joinfiles') continue;
-            if ($value == 'content') continue;
-            if ($value == 'content_lines') continue;
-
-            if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
-
-            if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
-            {
-                $ok=0;
-                $fieldnamekey=$listfield[$f];
-                // We take translate key of field
-                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-                if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-                if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-                if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-                if ($fieldnamekey == 'type_template') $fieldnamekey = 'TypeOfTemplate';
-                if ($fieldnamekey == 'fk_user') $fieldnamekey = 'Owner';
-                if ($fieldnamekey == 'private') $fieldnamekey = 'Private';
-                if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-                if ($fieldnamekey == 'topic') $fieldnamekey = 'Topic';
-
-                setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-            }
-        }
-
-        // Si verif ok et action add, on ajoute la ligne
-        if ($ok && GETPOST('actionadd'))
-        {
-            // Add new entry
-            $sql = "INSERT INTO ".$tabname[$id]." (";
-            // List of fields
-            $sql.= $tabfieldinsert[$id];
-            $sql.=",active)";
-            $sql.= " VALUES(";
-
-            // List of values
-            $i=0;
-            foreach ($listfieldinsert as $f => $value)
-            {
-            	//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
-            	$keycode=$listfieldvalue[$i];
-            	if ($value == 'lang') $keycode='langcode';
-                if ($value == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
-                if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
-                if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
-                if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
-                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
-                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="null";
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
-                $i++;
-            }
-            $sql.=",1)";
-
-            dol_syslog("actionadd", LOG_DEBUG);
-            $result = $db->query($sql);
-            if ($result)	// Add is ok
-            {
-                setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
-            }
-            else
-            {
-                if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                    setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-                }
-                else {
-                    dol_print_error($db);
-                }
-            }
-        }
-
-        // Si verif ok et action modify, on modifie la ligne
-        if ($ok && GETPOST('actionmodify'))
-        {
-            $rowidcol="rowid";
-
-            // Modify entry
-            $sql = "UPDATE ".$tabname[$id]." SET ";
-            // Modifie valeur des champs
-            $i = 0;
-            foreach ($listfieldmodify as $field)
-            {
-            	$keycode=$listfieldvalue[$i];
-            	if ($field == 'lang') $keycode='langcode';
-
-                if ($field == 'fk_user' && ! ($_POST['fk_user'] > 0)) $_POST['fk_user']='';
-            	if ($field == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
-            	if ($field == 'joinfiles') $_POST['joinfiles']=$_POST['joinfiles-'.$rowid];
-            	if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            	if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
-                if ($field == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
-                $sql.= $field."=";
-                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  // For vat, we want/accept code = ''
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
-                $i++;
-            }
-            $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
-
-            dol_syslog("actionmodify", LOG_DEBUG);
-            //print $sql;
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-            	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            }
-            else
-            {
-                setEventMessages($db->error(), null, 'errors');
-            }
-        }
-    }
-
-    if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-    {
-        $rowidcol="rowid";
-
-        $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
-
-        dol_syslog("delete", LOG_DEBUG);
-        $result = $db->query($sql);
-        if (! $result)
-        {
-            if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-            {
-                setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-            }
-            else
-            {
-                dol_print_error($db);
-            }
-        }
-    }
-
-    // activate
-    if ($action == $acts[0])
-    {
-        $rowidcol="rowid";
-
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-
-        $result = $db->query($sql);
-        if (!$result)
-        {
-            dol_print_error($db);
-        }
-    }
-
-    // disable
-    if ($action == $acts[1])
-    {
-        $rowidcol="rowid";
-
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-
-        $result = $db->query($sql);
-        if (!$result)
-        {
-            dol_print_error($db);
-        }
-    }
+	// 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_label='';
+		$search_type_template='';
+		$search_lang='';
+		$search_fk_user='';
+		$search_topic='';
+		$toselect='';
+		$search_array_options=array();
+	}
+
+	// Actions add or modify an entry into a dictionary
+	if (GETPOST('actionadd') || GETPOST('actionmodify'))
+	{
+		$listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+		$listfieldinsert=explode(',',$tabfieldinsert[$id]);
+		$listfieldmodify=explode(',',$tabfieldinsert[$id]);
+		$listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+		// Check that all fields are filled
+		$ok=1;
+		foreach ($listfield as $f => $value)
+		{
+			// Not mandatory fields
+			if ($value == 'joinfiles') continue;
+			if ($value == 'content') continue;
+			if ($value == 'content_lines') continue;
+
+			if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
+
+			if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
+			{
+				$ok=0;
+				$fieldnamekey=$listfield[$f];
+				// We take translate key of field
+				if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+				if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+				if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+				if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+				if ($fieldnamekey == 'type_template') $fieldnamekey = 'TypeOfTemplate';
+				if ($fieldnamekey == 'fk_user') $fieldnamekey = 'Owner';
+				if ($fieldnamekey == 'private') $fieldnamekey = 'Private';
+				if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+				if ($fieldnamekey == 'topic') $fieldnamekey = 'Topic';
+
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			}
+		}
+
+		// Si verif ok et action add, on ajoute la ligne
+		if ($ok && GETPOST('actionadd'))
+		{
+			// Add new entry
+			$sql = "INSERT INTO ".$tabname[$id]." (";
+			// List of fields
+			$sql.= $tabfieldinsert[$id];
+			$sql.=",active)";
+			$sql.= " VALUES(";
+
+			// List of values
+			$i=0;
+			foreach ($listfieldinsert as $f => $value)
+			{
+				//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
+				$keycode=$listfieldvalue[$i];
+				if ($value == 'lang') $keycode='langcode';
+				if ($value == 'entity') $_POST[$keycode] = $conf->entity;
+				if ($i) $sql.=",";
+				if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
+				if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
+				if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
+				if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
+				elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="null";
+				else $sql.="'".$db->escape($_POST[$keycode])."'";
+				$i++;
+			}
+			$sql.=",1)";
+
+			dol_syslog("actionadd", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)	// Add is ok
+			{
+				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+				$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+			}
+			else
+			{
+				if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+				}
+				else {
+					dol_print_error($db);
+				}
+			}
+		}
+
+		// Si verif ok et action modify, on modifie la ligne
+		if ($ok && GETPOST('actionmodify'))
+		{
+			$rowidcol="rowid";
+
+			// Modify entry
+			$sql = "UPDATE ".$tabname[$id]." SET ";
+			// Modifie valeur des champs
+			$i = 0;
+			foreach ($listfieldmodify as $field)
+			{
+				$keycode=$listfieldvalue[$i];
+				if ($field == 'lang') $keycode='langcode';
+
+				if ($field == 'fk_user' && ! ($_POST['fk_user'] > 0)) $_POST['fk_user']='';
+				if ($field == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
+				if ($field == 'joinfiles') $_POST['joinfiles']=$_POST['joinfiles-'.$rowid];
+				if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
+				if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+				if ($field == 'entity') $_POST[$keycode] = $conf->entity;
+				if ($i) $sql.=",";
+				$sql.= $field."=";
+				if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  // For vat, we want/accept code = ''
+				else $sql.="'".$db->escape($_POST[$keycode])."'";
+				$i++;
+			}
+			$sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+			dol_syslog("actionmodify", LOG_DEBUG);
+			//print $sql;
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			}
+			else
+			{
+				setEventMessages($db->error(), null, 'errors');
+			}
+		}
+	}
+
+	if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+	{
+		$rowidcol="rowid";
+
+		$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+		dol_syslog("delete", LOG_DEBUG);
+		$result = $db->query($sql);
+		if (! $result)
+		{
+			if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+			{
+				setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+		}
+	}
+
+	// activate
+	if ($action == $acts[0])
+	{
+		$rowidcol="rowid";
+
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
+
+	// disable
+	if ($action == $acts[1])
+	{
+		$rowidcol="rowid";
+
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -409,7 +409,7 @@ 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);
 
@@ -433,20 +433,20 @@ 
 if ($search_topic) $sql.=natural_search('topic', $search_topic);
 if ($sortfield)
 {
-    // If sort order is "country", we use country_code instead
+	// If sort order is "country", we use country_code instead
 	if ($sortfield == 'country') $sortfield='country_code';
-    $sql.= " ORDER BY ".$sortfield;
-    if ($sortorder)
-    {
-        $sql.=" ".strtoupper($sortorder);
-    }
-    $sql.=", ";
-    // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+	$sql.= " ORDER BY ".$sortfield;
+	if ($sortorder)
+	{
+		$sql.=" ".strtoupper($sortorder);
+	}
+	$sql.=", ";
+	// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+	$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+	$tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
 }
 else {
-    $sql.=" ORDER BY ";
+	$sql.=" ORDER BY ";
 }
 $sql.=$tabsqlsort[$id];
 $sql.=$db->plimit($listlimit+1,$offset);
@@ -469,38 +469,38 @@ 
 print '<tr class="liste_titre">';
 foreach ($fieldlist as $field => $value)
 {
-        // Determine le nom du champ par rapport aux noms possibles
-        // dans les dictionnaires de donnees
-        $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
-        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-        $align="left";
-        if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner");}
-        if ($fieldlist[$field]=='lang')            { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
-        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-        if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
-        if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-    	if ($fieldlist[$field]=='private')         { $align='center'; }
-    	if ($fieldlist[$field]=='position')        { $align='center'; }
-
-    	if ($fieldlist[$field]=='topic')           { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='joinfiles')       { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
-
-        if ($valuetoshow != '')
-        {
-            print '<td align="'.$align.'">';
-        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value]))
-        	{
-        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
-        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
-        	}
-        	else print $valuetoshow;
-            print '</td>';
-         }
-         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+		// Determine le nom du champ par rapport aux noms possibles
+		// dans les dictionnaires de donnees
+		$valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+		$valuetoshow=$langs->trans($valuetoshow);   // try to translate
+		$align="left";
+		if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner");}
+		if ($fieldlist[$field]=='lang')            { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
+		if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+		if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+		if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+		if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field]=='private')         { $align='center'; }
+		if ($fieldlist[$field]=='position')        { $align='center'; }
+
+		if ($fieldlist[$field]=='topic')           { $valuetoshow=''; }
+		if ($fieldlist[$field]=='joinfiles')       { $valuetoshow=''; }
+		if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
+		if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
+
+		if ($valuetoshow != '')
+		{
+			print '<td align="'.$align.'">';
+			if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+			else if (! empty($tabhelp[$id][$value]))
+			{
+				if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
+				else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+			}
+			else print $valuetoshow;
+			print '</td>';
+		 }
+		 if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
 }
 print '<td>';
 print '<input type="hidden" name="id" value="' . $id . '">';
@@ -618,85 +618,85 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    $var=true;
-
-    $param = '&id='.$id;
-    $paramwithsearch = $param;
-    if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-    if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-    if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
-
-    // There is several pages
-    if ($num > $listlimit)
-    {
-        print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
-        print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
-        print '</td></tr>';
-    }
-
-
-    // Title line with search boxes
-    print '<tr class="liste_titre">';
-    $filterfound=0;
-    foreach ($fieldlist as $field => $value)
-    {
-        if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-        elseif ($value == 'lang')
-        {
-        	print '<td class="liste_titre">';
-        	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
-        	print '</td>';
-        }
-        elseif ($value == 'fk_user')
-        {
-        	print '<td class="liste_titre">';
-        	$restrictid=array();
-        	if (! $user->admin) $restrictid=array($user->id);
-        	//var_dump($restrictid);
-        	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth200');
-        	print '</td>';
-        }
-        elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
-        elseif ($value == 'type_template')
-        {
-        	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200 maxwidth100onsmartphone').'</td>';
-        }
-        elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
-    }
-    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
-    // Action column
-    print '<td class="liste_titre" align="right" width="64">';
-    $searchpicto=$form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
-
-    // Title of lines
-    print '<tr class="liste_titre">';
-    foreach ($fieldlist as $field => $value)
-    {
-        // Determine le nom du champ par rapport aux noms possibles
-        // dans les dictionnaires de donnees
-        $showfield=1;							  	// By defaut
-        $align="left";
-        $sortable=1;
-        $valuetoshow='';
-        /*
+	$num = $db->num_rows($resql);
+	$i = 0;
+	$var=true;
+
+	$param = '&id='.$id;
+	$paramwithsearch = $param;
+	if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+	if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+	if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+
+	// There is several pages
+	if ($num > $listlimit)
+	{
+		print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+		print '</td></tr>';
+	}
+
+
+	// Title line with search boxes
+	print '<tr class="liste_titre">';
+	$filterfound=0;
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+		elseif ($value == 'lang')
+		{
+			print '<td class="liste_titre">';
+			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
+			print '</td>';
+		}
+		elseif ($value == 'fk_user')
+		{
+			print '<td class="liste_titre">';
+			$restrictid=array();
+			if (! $user->admin) $restrictid=array($user->id);
+			//var_dump($restrictid);
+			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth200');
+			print '</td>';
+		}
+		elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+		elseif ($value == 'type_template')
+		{
+			print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200 maxwidth100onsmartphone').'</td>';
+		}
+		elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+	}
+	if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+	// Action column
+	print '<td class="liste_titre" align="right" width="64">';
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
+
+	// Title of lines
+	print '<tr class="liste_titre">';
+	foreach ($fieldlist as $field => $value)
+	{
+		// Determine le nom du champ par rapport aux noms possibles
+		// dans les dictionnaires de donnees
+		$showfield=1;							  	// By defaut
+		$align="left";
+		$sortable=1;
+		$valuetoshow='';
+		/*
         $tmparray=getLabelOfField($fieldlist[$field]);
         $showfield=$tmp['showfield'];
         $valuetoshow=$tmp['valuetoshow'];
         $align=$tmp['align'];
         $sortable=$tmp['sortable'];
 		*/
-        $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-        if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner"); }
-        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
-    	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+		$valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+		$valuetoshow=$langs->trans($valuetoshow);   // try to translate
+		if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner"); }
+		if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+		if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+		if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+		if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
 		if ($fieldlist[$field]=='private')         { $align='center'; }
 		if ($fieldlist[$field]=='position')        { $align='center'; }
 
@@ -704,180 +704,180 @@ 
 		if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); $showfield=0;}
 		if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); $showfield=0; }
 
-        // Affiche nom du champ
-        if ($showfield)
-        {
-            if (! empty($tabhelp[$id][$value]))
-            {
-                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);   // Tooltip on click
-                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1);	// Tooltip on hover
-            }
-            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
-        }
-    }
-
-    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-    print getTitleFieldOfList('');
-    print '</tr>';
-
-    if ($num)
-    {
-        // Lines with values
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-
-            print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-
-            if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
-            {
-            	$tmpaction='edit';
-                $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
-                $error=$hookmanager->error; $errors=$hookmanager->errors;
-
-                // Show fields
-                if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
-
-                print '<td></td><td></td><td></td>';
-                print '<td align="center">';
-                print '<input type="hidden" name="page" value="'.$page.'">';
-                print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-                print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
-                print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                print '</td>';
-
-                $fieldsforcontent = array('topic', 'joinfiles', 'content');
-                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
-                {
-                    $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
-                }
-                foreach ($fieldsforcontent as $tmpfieldlist)
-                {
-                    $showfield = 1;
-                    $align = "left";
-                    $valuetoshow = $obj->{$tmpfieldlist};
+		// Affiche nom du champ
+		if ($showfield)
+		{
+			if (! empty($tabhelp[$id][$value]))
+			{
+				if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);   // Tooltip on click
+				else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1);	// Tooltip on hover
+			}
+			print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+		}
+	}
 
-                    $class = 'tddict';
-                    // Show value for field
-                    if ($showfield) {
+	print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+	print getTitleFieldOfList('');
+	print '</tr>';
+
+	if ($num)
+	{
+		// Lines with values
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+
+			print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+
+			if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+			{
+				$tmpaction='edit';
+				$parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+				$error=$hookmanager->error; $errors=$hookmanager->errors;
+
+				// Show fields
+				if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+				print '<td></td><td></td><td></td>';
+				print '<td align="center">';
+				print '<input type="hidden" name="page" value="'.$page.'">';
+				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+				print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+				print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+				print '</td>';
+
+				$fieldsforcontent = array('topic', 'joinfiles', 'content');
+				if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+				{
+					$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
+				}
+				foreach ($fieldsforcontent as $tmpfieldlist)
+				{
+					$showfield = 1;
+					$align = "left";
+					$valuetoshow = $obj->{$tmpfieldlist};
+
+					$class = 'tddict';
+					// Show value for field
+					if ($showfield) {
 						// Show line for topic, joinfiles and content
-                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
-                        print '<td colspan="8">';
-                        if ($tmpfieldlist == 'topic')
-                        {
-	                        print '<strong>' . $form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
-    	                    print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
-                        }
-                        if ($tmpfieldlist == 'joinfiles')
-                        {
-                        	print '<strong>' . $form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
-                        	print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
-                        }
-                        if ($tmpfieldlist == 'content')
-                        {
-                        	$okforextended = true;
-                        	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
-                        	$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
-                        	print $doleditor->Create(1);
-                        }
-                        print '</td>';
-                        print '<td></td>';
-                        print '<td></td>';
-                    }
-                }
-            }
-            else
-            {
-              	$tmpaction = 'view';
-                $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+						print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
+						print '<td colspan="8">';
+						if ($tmpfieldlist == 'topic')
+						{
+							print '<strong>' . $form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
+							print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+						}
+						if ($tmpfieldlist == 'joinfiles')
+						{
+							print '<strong>' . $form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
+							print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+						}
+						if ($tmpfieldlist == 'content')
+						{
+							$okforextended = true;
+							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							print $doleditor->Create(1);
+						}
+						print '</td>';
+						print '<td></td>';
+						print '<td></td>';
+					}
+				}
+			}
+			else
+			{
+			  	$tmpaction = 'view';
+				$parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
 
-                $error=$hookmanager->error; $errors=$hookmanager->errors;
+				$error=$hookmanager->error; $errors=$hookmanager->errors;
 
-                if (empty($reshook))
-                {
-                    foreach ($fieldlist as $field => $value)
-                    {
-                        if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
-                        $showfield=1;
-                    	$align="left";
-                        $valuetoshow=$obj->{$fieldlist[$field]};
-                        if ($value == 'type_template')
-                        {
-                            $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
-                        }
-                        if ($value == 'lang' && $valuetoshow)
-                        {
-                        	$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
-                        }
-                        if ($value == 'fk_user')
-                        {
-                        	if ($valuetoshow > 0)
-                        	{
-                        		$fuser=new User($db);
-                        		$fuser->fetch($valuetoshow);
-                        		$valuetoshow = $fuser->getNomUrl(1);
-                        	}
-                        }
-                        if ($value == 'private')
-                        {
-                        	$align="center";
-                        	if ($valuetoshow) $valuetoshow=yn($valuetoshow);
-                        	else $valuetoshow='';
-                        }
-                        if ($value == 'position')
-                        {
-                        	$align="center";
-                        }
-                        if ($value == 'joinfiles')
-                        {
-                        	$align="center";
-                        	if ($valuetoshow) $valuetoshow=1;
-                        	else $valuetoshow='';
-                        }
-
-                        $class='tddict';
+				if (empty($reshook))
+				{
+					foreach ($fieldlist as $field => $value)
+					{
+						if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+						$showfield=1;
+						$align="left";
+						$valuetoshow=$obj->{$fieldlist[$field]};
+						if ($value == 'type_template')
+						{
+							$valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+						}
+						if ($value == 'lang' && $valuetoshow)
+						{
+							$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
+						}
+						if ($value == 'fk_user')
+						{
+							if ($valuetoshow > 0)
+							{
+								$fuser=new User($db);
+								$fuser->fetch($valuetoshow);
+								$valuetoshow = $fuser->getNomUrl(1);
+							}
+						}
+						if ($value == 'private')
+						{
+							$align="center";
+							if ($valuetoshow) $valuetoshow=yn($valuetoshow);
+							else $valuetoshow='';
+						}
+						if ($value == 'position')
+						{
+							$align="center";
+						}
+						if ($value == 'joinfiles')
+						{
+							$align="center";
+							if ($valuetoshow) $valuetoshow=1;
+							else $valuetoshow='';
+						}
+
+						$class='tddict';
 						// Show value for field
 						if ($showfield)
 						{
-                           	print '<!-- '.$fieldlist[$field].' -->';
-                           	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						   	print '<!-- '.$fieldlist[$field].' -->';
+						   	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
 						}
-                    }
-                }
+					}
+				}
 
-                // Can an entry be erased or disabled ?
-                $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-                if (! $user->admin && $obj->fk_user != $user->id)
-                {
-                	$iserasable=0;
-                	$canbedisabled=0;
-                	$canbemodified=0;
-                }
+				// Can an entry be erased or disabled ?
+				$iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+				if (! $user->admin && $obj->fk_user != $user->id)
+				{
+					$iserasable=0;
+					$canbedisabled=0;
+					$canbemodified=0;
+				}
 
-                $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
-                if ($param) $url .= '&'.$param;
-                $url.='&';
+				$url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+				if ($param) $url .= '&'.$param;
+				$url.='&';
 
-                // Status / Active
-                print '<td align="center" class="nowrap">';
-                if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                print "</td>";
+				// Status / Active
+				print '<td align="center" class="nowrap">';
+				if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+				print "</td>";
 
-                // Modify link / Delete link
-                print '<td class="center nowraponall" width="64">';
-                if ($canbemodified) print '<a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a>';
-                if ($iserasable)
-                {
-                    print ' &nbsp; <a href="'.$url.'action=delete">'.img_delete().'</a>';
-                    //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                }
-                print '</td>';
+				// Modify link / Delete link
+				print '<td class="center nowraponall" width="64">';
+				if ($canbemodified) print '<a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a>';
+				if ($iserasable)
+				{
+					print ' &nbsp; <a href="'.$url.'action=delete">'.img_delete().'</a>';
+					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+				}
+				print '</td>';
 
 
-                /*
+				/*
                 $fieldsforcontent = array('content');
                 if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
                 {
@@ -904,16 +904,16 @@ 
 
                     }
                 }*/
-            }
-            print "</tr>\n";
+			}
+			print "</tr>\n";
 
 
-            $i++;
-        }
-    }
+			$i++;
+		}
+	}
 }
 else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</table>';

Spacing +291 added lines, -291 removed lines

@@ -42,139 +42,139 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load traductions files requiredby by page
-$langs->loadLangs(array("errors","admin","mails","languages"));
+$langs->loadLangs(array("errors", "admin", "mails", "languages"));
 
-$action     = GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
-$confirm    = GETPOST('confirm','alpha');												// Result of a confirmation
+$action     = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view';
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 
-$id			= GETPOST('id','int');
-$rowid		= GETPOST('rowid','alpha');
-$search_label=GETPOST('search_label','alpha');
-$search_type_template=GETPOST('search_type_template','alpha');
-$search_lang=GETPOST('search_lang','alpha');
-$search_fk_user=GETPOST('search_fk_user','intcomma');
-$search_topic=GETPOST('search_topic','alpha');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_type_template = GETPOST('search_type_template', 'alpha');
+$search_lang = GETPOST('search_lang', 'alpha');
+$search_fk_user = GETPOST('search_fk_user', 'intcomma');
+$search_topic = GETPOST('search_topic', 'alpha');
 
-$allowed=1;
-if (! $allowed) accessforbidden();
+$allowed = 1;
+if (!$allowed) accessforbidden();
 
 $acts[0] = "activate";
 $acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+$actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
 
-$listoffset=GETPOST('listoffset','alpha');
-$listlimit =GETPOST('listlimit','alpha')>0?GETPOST('listlimit','alpha'):1000;
+$listoffset = GETPOST('listoffset', 'alpha');
+$listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
 $active = 1;
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $listlimit * $page ;
+$offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (empty($sortfield)) $sortfield='label, lang, position';
-if (empty($sortorder)) $sortorder='ASC';
+if (empty($sortfield)) $sortfield = 'label, lang, position';
+if (empty($sortorder)) $sortorder = 'ASC';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
 
 // Name of SQL tables of dictionaries
-$tabname=array();
-$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
+$tabname = array();
+$tabname[25] = MAIN_DB_PREFIX."c_email_templates";
 
 // Criteria to sort dictionaries
-$tabsqlsort=array();
-$tabsqlsort[25]="label ASC, lang ASC, position ASC";
+$tabsqlsort = array();
+$tabsqlsort[25] = "label ASC, lang ASC, position ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
-$tabfield=array();
-$tabfield[25]= "label,type_template,lang,fk_user,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+$tabfield = array();
+$tabfield[25] = "label,type_template,lang,fk_user,private,position,topic,joinfiles,content";
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25] .= ',content_lines';
 
 // Nom des champs d'edition pour modification d'un enregistrement
-$tabfieldvalue=array();
-$tabfieldvalue[25]= "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldvalue[25].=',content_lines';
+$tabfieldvalue = array();
+$tabfieldvalue[25] = "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldvalue[25] .= ',content_lines';
 
 // Nom des champs dans la table pour insertion d'un enregistrement
-$tabfieldinsert=array();
-$tabfieldinsert[25]= "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldinsert[25].=',content_lines';
-$tabfieldinsert[25].=',entity';     // Must be at end because not into other arrays
+$tabfieldinsert = array();
+$tabfieldinsert[25] = "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldinsert[25] .= ',content_lines';
+$tabfieldinsert[25] .= ',entity'; // Must be at end because not into other arrays
 
 // Condition to show dictionary in setup page
-$tabcond=array();
-$tabcond[25]= true;
+$tabcond = array();
+$tabcond[25] = true;
 
 // List of help for fields
 // Set MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES to allow edit of template for lines
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-$formmail=new FormMail($db);
+$formmail = new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
-    $tmp=FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTranslationKey)__']='Translation';
+    $tmp = FormMail::getAvailableSubstitKey('formemail');
+    $tmp['__(AnyTranslationKey)__'] = 'Translation';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>';
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach($tmp as $key => $val)
+    foreach ($tmp as $key => $val)
     {
-    	$helpsubstit.=$key.' -> '.$val.'<br>';
-    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+    	$helpsubstit .= $key.' -> '.$val.'<br>';
+    	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
     }
 }
 else
 {
-    $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTranslationKey)__']='Translation';
+    $tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
+    $tmp['__(AnyTranslationKey)__'] = 'Translation';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>';
     $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach($tmp as $key => $val)
+    foreach ($tmp as $key => $val)
     {
-    	$helpsubstit.=$key.' -> '.$val.'<br>';
+    	$helpsubstit .= $key.' -> '.$val.'<br>';
     }
-    $tmp=FormMail::getAvailableSubstitKey('formemailforlines');
-    foreach($tmp as $key => $val)
+    $tmp = FormMail::getAvailableSubstitKey('formemailforlines');
+    foreach ($tmp as $key => $val)
     {
-    	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
+    	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
     }
 }
 
 
-$tabhelp=array();
-$tabhelp[25] = array('topic'=>$helpsubstit,'joinfiles'=>$langs->trans('AttachMainDocByDefault'), 'content'=>$helpsubstit,'content_lines'=>$helpsubstitforlines,'type_template'=>$langs->trans("TemplateForElement"),'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
+$tabhelp = array();
+$tabhelp[25] = array('topic'=>$helpsubstit, 'joinfiles'=>$langs->trans('AttachMainDocByDefault'), 'content'=>$helpsubstit, 'content_lines'=>$helpsubstitforlines, 'type_template'=>$langs->trans("TemplateForElement"), 'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), 'position'=>$langs->trans("PositionIntoComboList"));
 
 // List of check for fields (NOT USED YET)
-$tabfieldcheck=array();
+$tabfieldcheck = array();
 $tabfieldcheck[25] = array();
 
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-$sourceList=array();
+$sourceList = array();
 
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
-if ($conf->propal->enabled)            $elementList['propal_send']=$langs->trans('MailToSendProposal');
-if ($conf->commande->enabled)          $elementList['order_send']=$langs->trans('MailToSendOrder');
-if ($conf->facture->enabled)           $elementList['facture_send']=$langs->trans('MailToSendInvoice');
-if ($conf->expedition->enabled)        $elementList['shipping_send']=$langs->trans('MailToSendShipment');
-if ($conf->ficheinter->enabled)        $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
-if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
-if ($conf->fournisseur->enabled)       $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
-if ($conf->fournisseur->enabled)       $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
-if ($conf->societe->enabled)           $elementList['thirdparty']=$langs->trans('MailToThirdparty');
-if ($conf->adherent->enabled)          $elementList['member']=$langs->trans('MailToMember');
-if ($conf->contrat->enabled)           $elementList['contract']=$langs->trans('MailToSendContract');
-$elementList['user']=$langs->trans('MailToUser');
-$elementList['all'] =$langs->trans('VisibleEverywhere');
-$elementList['none']=$langs->trans('VisibleNowhere');
-
-
-$parameters=array('elementList'=>$elementList);
-$reshook=$hookmanager->executeHooks('emailElementlist',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($conf->propal->enabled)            $elementList['propal_send'] = $langs->trans('MailToSendProposal');
+if ($conf->commande->enabled)          $elementList['order_send'] = $langs->trans('MailToSendOrder');
+if ($conf->facture->enabled)           $elementList['facture_send'] = $langs->trans('MailToSendInvoice');
+if ($conf->expedition->enabled)        $elementList['shipping_send'] = $langs->trans('MailToSendShipment');
+if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = $langs->trans('MailToSendIntervention');
+if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = $langs->trans('MailToSendSupplierRequestForQuotation');
+if ($conf->fournisseur->enabled)       $elementList['order_supplier_send'] = $langs->trans('MailToSendSupplierOrder');
+if ($conf->fournisseur->enabled)       $elementList['invoice_supplier_send'] = $langs->trans('MailToSendSupplierInvoice');
+if ($conf->societe->enabled)           $elementList['thirdparty'] = $langs->trans('MailToThirdparty');
+if ($conf->adherent->enabled)          $elementList['member'] = $langs->trans('MailToMember');
+if ($conf->contrat->enabled)           $elementList['contract'] = $langs->trans('MailToSendContract');
+$elementList['user'] = $langs->trans('MailToUser');
+$elementList['all'] = $langs->trans('VisibleEverywhere');
+$elementList['none'] = $langs->trans('VisibleNowhere');
+
+
+$parameters = array('elementList'=>$elementList);
+$reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
 if ($reshook == 0) {
 	foreach ($hookmanager->resArray as $item => $value) {
 		$elementList[$item] = $value;
@@ -188,37 +188,37 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$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))
 {
     // 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_label='';
-        $search_type_template='';
-        $search_lang='';
-        $search_fk_user='';
-        $search_topic='';
-        $toselect='';
-        $search_array_options=array();
+        $search_label = '';
+        $search_type_template = '';
+        $search_lang = '';
+        $search_fk_user = '';
+        $search_topic = '';
+        $toselect = '';
+        $search_array_options = array();
     }
 
     // Actions add or modify an entry into a dictionary
     if (GETPOST('actionadd') || GETPOST('actionmodify'))
     {
-        $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
-        $listfieldinsert=explode(',',$tabfieldinsert[$id]);
-        $listfieldmodify=explode(',',$tabfieldinsert[$id]);
-        $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+        $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+        $listfieldinsert = explode(',', $tabfieldinsert[$id]);
+        $listfieldmodify = explode(',', $tabfieldinsert[$id]);
+        $listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
         // Check that all fields are filled
-        $ok=1;
+        $ok = 1;
         foreach ($listfield as $f => $value)
         {
         	// Not mandatory fields
@@ -226,14 +226,14 @@ 
             if ($value == 'content') continue;
             if ($value == 'content_lines') continue;
 
-            if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
+            if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
 
-            if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
+            if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
             {
-                $ok=0;
-                $fieldnamekey=$listfield[$f];
+                $ok = 0;
+                $fieldnamekey = $listfield[$f];
                 // We take translate key of field
-                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
                 if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
                 if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
                 if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
@@ -253,35 +253,35 @@ 
             // Add new entry
             $sql = "INSERT INTO ".$tabname[$id]." (";
             // List of fields
-            $sql.= $tabfieldinsert[$id];
-            $sql.=",active)";
-            $sql.= " VALUES(";
+            $sql .= $tabfieldinsert[$id];
+            $sql .= ",active)";
+            $sql .= " VALUES(";
 
             // List of values
-            $i=0;
+            $i = 0;
             foreach ($listfieldinsert as $f => $value)
             {
             	//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
-            	$keycode=$listfieldvalue[$i];
-            	if ($value == 'lang') $keycode='langcode';
+            	$keycode = $listfieldvalue[$i];
+            	if ($value == 'lang') $keycode = 'langcode';
                 if ($value == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
-                if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
-                if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
-                if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
-                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
-                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="null";
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
+                if ($i) $sql .= ",";
+                if ($value == 'fk_user' && !($_POST[$keycode] > 0)) $_POST[$keycode] = '';
+                if ($value == 'private' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '0';
+                if ($value == 'position' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '1';
+                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql .= "null"; // lang must be '' if not defined so the unique key that include lang will work
+                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql .= "null";
+                else $sql .= "'".$db->escape($_POST[$keycode])."'";
                 $i++;
             }
-            $sql.=",1)";
+            $sql .= ",1)";
 
             dol_syslog("actionadd", LOG_DEBUG);
             $result = $db->query($sql);
             if ($result)	// Add is ok
             {
                 setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+            	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
             }
             else
             {
@@ -297,7 +297,7 @@ 
         // Si verif ok et action modify, on modifie la ligne
         if ($ok && GETPOST('actionmodify'))
         {
-            $rowidcol="rowid";
+            $rowidcol = "rowid";
 
             // Modify entry
             $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -305,22 +305,22 @@ 
             $i = 0;
             foreach ($listfieldmodify as $field)
             {
-            	$keycode=$listfieldvalue[$i];
-            	if ($field == 'lang') $keycode='langcode';
-
-                if ($field == 'fk_user' && ! ($_POST['fk_user'] > 0)) $_POST['fk_user']='';
-            	if ($field == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
-            	if ($field == 'joinfiles') $_POST['joinfiles']=$_POST['joinfiles-'.$rowid];
-            	if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            	if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
+            	$keycode = $listfieldvalue[$i];
+            	if ($field == 'lang') $keycode = 'langcode';
+
+                if ($field == 'fk_user' && !($_POST['fk_user'] > 0)) $_POST['fk_user'] = '';
+            	if ($field == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
+            	if ($field == 'joinfiles') $_POST['joinfiles'] = $_POST['joinfiles-'.$rowid];
+            	if ($field == 'content') $_POST['content'] = $_POST['content-'.$rowid];
+            	if ($field == 'content_lines') $_POST['content_lines'] = $_POST['content_lines-'.$rowid];
                 if ($field == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
-                $sql.= $field."=";
-                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  // For vat, we want/accept code = ''
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
+                if ($i) $sql .= ",";
+                $sql .= $field."=";
+                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql .= "null"; // For vat, we want/accept code = ''
+                else $sql .= "'".$db->escape($_POST[$keycode])."'";
                 $i++;
             }
-            $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+            $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
 
             dol_syslog("actionmodify", LOG_DEBUG);
             //print $sql;
@@ -338,13 +338,13 @@ 
 
     if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
     {
-        $rowidcol="rowid";
+        $rowidcol = "rowid";
 
         $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
         dol_syslog("delete", LOG_DEBUG);
         $result = $db->query($sql);
-        if (! $result)
+        if (!$result)
         {
             if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
             {
@@ -360,7 +360,7 @@ 
     // activate
     if ($action == $acts[0])
     {
-        $rowidcol="rowid";
+        $rowidcol = "rowid";
 
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
 
@@ -374,7 +374,7 @@ 
     // disable
     if ($action == $acts[1])
     {
-        $rowidcol="rowid";
+        $rowidcol = "rowid";
 
         $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
 
@@ -392,15 +392,15 @@ 
  */
 
 $form = new Form($db);
-$formadmin=new FormAdmin($db);
+$formadmin = new FormAdmin($db);
 
 llxHeader();
 
-$titre=$langs->trans("EMailsSetup");
-$linkback='';
-$titlepicto='title_setup';
+$titre = $langs->trans("EMailsSetup");
+$linkback = '';
+$titlepicto = 'title_setup';
 
-print load_fiche_titre($titre,$linkback,$titlepicto);
+print load_fiche_titre($titre, $linkback, $titlepicto);
 
 $head = email_admin_prepare_head();
 
@@ -409,58 +409,58 @@ 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
 
-$sql="SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, active";
-$sql.=" FROM ".MAIN_DB_PREFIX."c_email_templates";
-$sql.=" WHERE entity IN (".getEntity('email_template').")";
-if (! $user->admin)
+$sql = "SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, active";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
+$sql .= " WHERE entity IN (".getEntity('email_template').")";
+if (!$user->admin)
 {
-	$sql.=" AND (private = 0 OR (private = 1 AND fk_user = ".$user->id."))";	// Show only public and private to me
-	$sql.=" AND (active = 1 OR fk_user = ".$user->id.")";						// Show only active or owned by me
+	$sql .= " AND (private = 0 OR (private = 1 AND fk_user = ".$user->id."))"; // Show only public and private to me
+	$sql .= " AND (active = 1 OR fk_user = ".$user->id.")"; // Show only active or owned by me
 }
 if (empty($conf->global->MAIN_MULTILANGS))
 {
-	$sql.= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL OR lang = '')";
+	$sql .= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL OR lang = '')";
 }
-if ($search_label) $sql.=natural_search('label', $search_label);
-if ($search_type_template != '' && $search_type_template != '-1') $sql.=natural_search('type_template', $search_type_template);
-if ($search_lang) $sql.=natural_search('lang', $search_lang);
-if ($search_fk_user != '' && $search_fk_user != '-1') $sql.=natural_search('fk_user', $search_fk_user, 2);
-if ($search_topic) $sql.=natural_search('topic', $search_topic);
+if ($search_label) $sql .= natural_search('label', $search_label);
+if ($search_type_template != '' && $search_type_template != '-1') $sql .= natural_search('type_template', $search_type_template);
+if ($search_lang) $sql .= natural_search('lang', $search_lang);
+if ($search_fk_user != '' && $search_fk_user != '-1') $sql .= natural_search('fk_user', $search_fk_user, 2);
+if ($search_topic) $sql .= natural_search('topic', $search_topic);
 if ($sortfield)
 {
     // If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield='country_code';
-    $sql.= " ORDER BY ".$sortfield;
+	if ($sortfield == 'country') $sortfield = 'country_code';
+    $sql .= " ORDER BY ".$sortfield;
     if ($sortorder)
     {
-        $sql.=" ".strtoupper($sortorder);
+        $sql .= " ".strtoupper($sortorder);
     }
-    $sql.=", ";
+    $sql .= ", ";
     // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
-    $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+    $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
 }
 else {
-    $sql.=" ORDER BY ";
+    $sql .= " ORDER BY ";
 }
-$sql.=$tabsqlsort[$id];
-$sql.=$db->plimit($listlimit+1,$offset);
+$sql .= $tabsqlsort[$id];
+$sql .= $db->plimit($listlimit + 1, $offset);
 //print $sql;
 
-$fieldlist=explode(',',$tabfield[$id]);
+$fieldlist = explode(',', $tabfield[$id]);
 
 // Form to add a new line
-$alabelisused=0;
-$var=false;
+$alabelisused = 0;
+$var = false;
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
@@ -471,39 +471,39 @@ 
 {
         // Determine le nom du champ par rapport aux noms possibles
         // dans les dictionnaires de donnees
-        $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
-        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-        $align="left";
-        if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner");}
-        if ($fieldlist[$field]=='lang')            { $valuetoshow=(empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
-        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-        if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
-        if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-    	if ($fieldlist[$field]=='private')         { $align='center'; }
-    	if ($fieldlist[$field]=='position')        { $align='center'; }
-
-    	if ($fieldlist[$field]=='topic')           { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='joinfiles')       { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='content')         { $valuetoshow=''; }
-    	if ($fieldlist[$field]=='content_lines')   { $valuetoshow=''; }
+        $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+        $valuetoshow = $langs->trans($valuetoshow); // try to translate
+        $align = "left";
+        if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
+        if ($fieldlist[$field] == 'lang') { $valuetoshow = (empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
+        if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+        if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+        if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
+        if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
+    	if ($fieldlist[$field] == 'private') { $align = 'center'; }
+    	if ($fieldlist[$field] == 'position') { $align = 'center'; }
+
+    	if ($fieldlist[$field] == 'topic') { $valuetoshow = ''; }
+    	if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = ''; }
+    	if ($fieldlist[$field] == 'content') { $valuetoshow = ''; }
+    	if ($fieldlist[$field] == 'content_lines') { $valuetoshow = ''; }
 
         if ($valuetoshow != '')
         {
             print '<td align="'.$align.'">';
-        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value]))
+        	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+        	else if (!empty($tabhelp[$id][$value]))
         	{
-        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
-        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
+        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
         	}
         	else print $valuetoshow;
             print '</td>';
          }
-         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+         if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 }
 print '<td>';
-print '<input type="hidden" name="id" value="' . $id . '">';
+print '<input type="hidden" name="id" value="'.$id.'">';
 print '</td>';
 print '</tr>';
 
@@ -528,7 +528,7 @@ 
 
 
 // Line to enter new values (input fields)
-print "<tr " . $bcnd[$var] . ">";
+print "<tr ".$bcnd[$var].">";
 
 if (empty($reshook))
 {
@@ -544,29 +544,29 @@ 
 print "</tr>";
 
 $fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('content','content_lines'); }
+if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('content', 'content_lines'); }
 foreach ($fieldsforcontent as $tmpfieldlist)
 {
 	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
 	// Label
 	if ($tmpfieldlist == 'topic')
 	{
-		print '<strong>' . $form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
+		print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
 	}
 	if ($tmpfieldlist == 'joinfiles')
 	{
-		print '<strong>' . $form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
+		print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
 	}
 	if ($tmpfieldlist == 'content')
 		print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist);
 	if ($tmpfieldlist == 'content_lines')
-		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '<br>';
+		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 	// Input field
 	if ($tmpfieldlist == 'topic') {
-		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
 	}
 	else if ($tmpfieldlist == 'joinfiles') {
-		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
 	}
 	else
 	{
@@ -575,7 +575,7 @@ 
 			$okforextended = true;
 			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
 				$okforextended = false;
-			$doleditor = new DolEditor($tmpfieldlist, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
 		}
 		else
@@ -583,9 +583,9 @@ 
 	}
 	print '</td>';
 	if ($tmpfieldlist == 'topic') {
-		print '<td align="center" rowspan="' . (count($fieldsforcontent)) . '">';
+		print '<td align="center" rowspan="'.(count($fieldsforcontent)).'">';
 		if ($action != 'edit') {
-			print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		}
 		print '</td>';
 	}
@@ -595,7 +595,7 @@ 
 
 
 
-$colspan=count($fieldlist)+1;
+$colspan = count($fieldlist) + 1;
 //print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
 
 print '</table>';
@@ -608,38 +608,38 @@ 
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 
 // List of available record in database
 dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $var=true;
+    $var = true;
 
     $param = '&id='.$id;
     $paramwithsearch = $param;
-    if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-    if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-    if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+    if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
+    if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
+    if (GETPOST('from')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
 
     // There is several pages
     if ($num > $listlimit)
     {
-        print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
-        print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+        print '<tr class="none"><td align="right" colspan="'.(3 + count($fieldlist)).'">';
+        print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
         print '</td></tr>';
     }
 
 
     // Title line with search boxes
     print '<tr class="liste_titre">';
-    $filterfound=0;
+    $filterfound = 0;
     foreach ($fieldlist as $field => $value)
     {
         if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
@@ -652,8 +652,8 @@ 
         elseif ($value == 'fk_user')
         {
         	print '<td class="liste_titre">';
-        	$restrictid=array();
-        	if (! $user->admin) $restrictid=array($user->id);
+        	$restrictid = array();
+        	if (!$user->admin) $restrictid = array($user->id);
         	//var_dump($restrictid);
         	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth200');
         	print '</td>';
@@ -663,12 +663,12 @@ 
         {
         	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200 maxwidth100onsmartphone').'</td>';
         }
-        elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+        elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
     if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
     // Action column
     print '<td class="liste_titre" align="right" width="64">';
-    $searchpicto=$form->showFilterButtons();
+    $searchpicto = $form->showFilterButtons();
     print $searchpicto;
     print '</td>';
     print '</tr>';
@@ -679,10 +679,10 @@ 
     {
         // Determine le nom du champ par rapport aux noms possibles
         // dans les dictionnaires de donnees
-        $showfield=1;							  	// By defaut
-        $align="left";
-        $sortable=1;
-        $valuetoshow='';
+        $showfield = 1; // By defaut
+        $align = "left";
+        $sortable = 1;
+        $valuetoshow = '';
         /*
         $tmparray=getLabelOfField($fieldlist[$field]);
         $showfield=$tmp['showfield'];
@@ -690,33 +690,33 @@ 
         $align=$tmp['align'];
         $sortable=$tmp['sortable'];
 		*/
-        $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-        $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-        if ($fieldlist[$field]=='fk_user')         { $valuetoshow=$langs->trans("Owner"); }
-        if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-        if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-        if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
-    	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-		if ($fieldlist[$field]=='private')         { $align='center'; }
-		if ($fieldlist[$field]=='position')        { $align='center'; }
-
-		if ($fieldlist[$field]=='joinfiles')       { $valuetoshow=$langs->trans("FilesAttachedToEmail"); $align='center'; }
-		if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); $showfield=0;}
-		if ($fieldlist[$field]=='content_lines')   { $valuetoshow=$langs->trans("ContentLines"); $showfield=0; }
+        $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+        $valuetoshow = $langs->trans($valuetoshow); // try to translate
+        if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
+        if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+        if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+        if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
+    	if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field] == 'private') { $align = 'center'; }
+		if ($fieldlist[$field] == 'position') { $align = 'center'; }
+
+		if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = $langs->trans("FilesAttachedToEmail"); $align = 'center'; }
+		if ($fieldlist[$field] == 'content') { $valuetoshow = $langs->trans("Content"); $showfield = 0; }
+		if ($fieldlist[$field] == 'content_lines') { $valuetoshow = $langs->trans("ContentLines"); $showfield = 0; }
 
         // Affiche nom du champ
         if ($showfield)
         {
-            if (! empty($tabhelp[$id][$value]))
+            if (!empty($tabhelp[$id][$value]))
             {
-                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);   // Tooltip on click
-                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1);	// Tooltip on hover
+                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value); // Tooltip on click
+                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1); // Tooltip on hover
             }
-            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
         }
     }
 
-    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
     print getTitleFieldOfList('');
     print '</tr>';
 
@@ -729,27 +729,27 @@ 
 
             print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
-            if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+            if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
             {
-            	$tmpaction='edit';
-                $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
-                $error=$hookmanager->error; $errors=$hookmanager->errors;
+            	$tmpaction = 'edit';
+                $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+                $error = $hookmanager->error; $errors = $hookmanager->errors;
 
                 // Show fields
-                if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
 
                 print '<td></td><td></td><td></td>';
                 print '<td align="center">';
                 print '<input type="hidden" name="page" value="'.$page.'">';
                 print '<input type="hidden" name="rowid" value="'.$rowid.'">';
                 print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
                 print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                 print '</td>';
 
                 $fieldsforcontent = array('topic', 'joinfiles', 'content');
-                if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+                if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
                 {
                     $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
                 }
@@ -767,19 +767,19 @@ 
                         print '<td colspan="8">';
                         if ($tmpfieldlist == 'topic')
                         {
-	                        print '<strong>' . $form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
-    	                    print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+	                        print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+    	                    print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
                         }
                         if ($tmpfieldlist == 'joinfiles')
                         {
-                        	print '<strong>' . $form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
-                        	print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
+                        	print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+                        	print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
                         }
                         if ($tmpfieldlist == 'content')
                         {
                         	$okforextended = true;
                         	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
-                        	$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+                        	$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
                         	print $doleditor->Create(1);
                         }
                         print '</td>';
@@ -791,22 +791,22 @@ 
             else
             {
               	$tmpaction = 'view';
-                $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                $error=$hookmanager->error; $errors=$hookmanager->errors;
+                $error = $hookmanager->error; $errors = $hookmanager->errors;
 
                 if (empty($reshook))
                 {
                     foreach ($fieldlist as $field => $value)
                     {
-                        if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
-                        $showfield=1;
-                    	$align="left";
-                        $valuetoshow=$obj->{$fieldlist[$field]};
+                        if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
+                        $showfield = 1;
+                    	$align = "left";
+                        $valuetoshow = $obj->{$fieldlist[$field]};
                         if ($value == 'type_template')
                         {
-                            $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
                         }
                         if ($value == 'lang' && $valuetoshow)
                         {
@@ -816,29 +816,29 @@ 
                         {
                         	if ($valuetoshow > 0)
                         	{
-                        		$fuser=new User($db);
+                        		$fuser = new User($db);
                         		$fuser->fetch($valuetoshow);
                         		$valuetoshow = $fuser->getNomUrl(1);
                         	}
                         }
                         if ($value == 'private')
                         {
-                        	$align="center";
-                        	if ($valuetoshow) $valuetoshow=yn($valuetoshow);
-                        	else $valuetoshow='';
+                        	$align = "center";
+                        	if ($valuetoshow) $valuetoshow = yn($valuetoshow);
+                        	else $valuetoshow = '';
                         }
                         if ($value == 'position')
                         {
-                        	$align="center";
+                        	$align = "center";
                         }
                         if ($value == 'joinfiles')
                         {
-                        	$align="center";
-                        	if ($valuetoshow) $valuetoshow=1;
-                        	else $valuetoshow='';
+                        	$align = "center";
+                        	if ($valuetoshow) $valuetoshow = 1;
+                        	else $valuetoshow = '';
                         }
 
-                        $class='tddict';
+                        $class = 'tddict';
 						// Show value for field
 						if ($showfield)
 						{
@@ -849,17 +849,17 @@ 
                 }
 
                 // Can an entry be erased or disabled ?
-                $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-                if (! $user->admin && $obj->fk_user != $user->id)
+                $iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+                if (!$user->admin && $obj->fk_user != $user->id)
                 {
-                	$iserasable=0;
-                	$canbedisabled=0;
-                	$canbemodified=0;
+                	$iserasable = 0;
+                	$canbedisabled = 0;
+                	$canbemodified = 0;
                 }
 
-                $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
                 if ($param) $url .= '&'.$param;
-                $url.='&';
+                $url .= '&';
 
                 // Status / Active
                 print '<td align="center" class="nowrap">';
@@ -937,12 +937,12 @@ 
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 {
 	global $conf, $langs, $user, $db;
 	global $form;
 	global $region_id;
-	global $elementList,$sourceList,$localtax_typeList;
+	global $elementList, $sourceList, $localtax_typeList;
 	global $bc;
 
 	$formadmin = new FormAdmin($db);
@@ -961,24 +961,24 @@ 
 			{
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
-					print $user->getNomUrl(1);		// Me
-					$forcedvalue=$user->id;
+					print $user->getNomUrl(1); // Me
+					$forcedvalue = $user->id;
 				}
 				else
 				{
-					if ($obj && ! empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
+					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
-						$fuser=new User($db);
+						$fuser = new User($db);
 						$fuser->fetch($obj->{$fieldlist[$field]});
 						print $fuser->getNomUrl(1);
-						$forcedvalue=$fuser->id;
+						$forcedvalue = $fuser->id;
 					}
 					else
 					{
-						$forcedvalue=$obj->{$fieldlist[$field]};
+						$forcedvalue = $obj->{$fieldlist[$field]};
 					}
 				}
-				$keyname=$fieldlist[$field];
+				$keyname = $fieldlist[$field];
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
@@ -986,7 +986,7 @@ 
 		elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
-			if (! empty($conf->global->MAIN_MULTILANGS))
+			if (!empty($conf->global->MAIN_MULTILANGS))
 			{
 				$selectedlang = $langs->defaultlang;
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
@@ -994,12 +994,12 @@ 
 			}
 			else
 			{
-				if (! empty($obj->{$fieldlist[$field]}))
+				if (!empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
 				}
-				$keyname=$fieldlist[$field];
-				if ($keyname == 'lang') $keyname='langcode';	// Avoid conflict with lang param
+				$keyname = $fieldlist[$field];
+				if ($keyname == 'lang') $keyname = 'langcode'; // Avoid conflict with lang param
 				print '<input type="hidden" value="'.$obj->{$fieldlist[$field]}.'" name="'.$keyname.'">';
 			}
 			print '</td>';
@@ -1008,7 +1008,7 @@ 
 		elseif ($fieldlist[$field] == 'type_template')
 		{
 			print '<td>';
-			if ($context == 'edit' && ! empty($obj->{$fieldlist[$field]}) && ! in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
+			if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
 			{
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
@@ -1016,7 +1016,7 @@ 
 			}
 			else
 			{
-				print $form->selectarray('type_template', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200');
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200');
 			}
 			print '</td>';
 		}
@@ -1025,16 +1025,16 @@ 
 		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		else
 		{
-			$size=''; $class=''; $classtd='';
-			if ($fieldlist[$field]=='code') $class='maxwidth100';
-			if ($fieldlist[$field]=='private') { $class='maxwidth50'; $classtd='center'; }
-			if ($fieldlist[$field]=='position') { $class='maxwidth50'; $classtd='center'; }
-			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='topic') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
-
-			print '<td'.($classtd?' class="'.$classtd.'"':'').'>';
-			if ($fieldlist[$field]=='private')
+			$size = ''; $class = ''; $classtd = '';
+			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
+			if ($fieldlist[$field] == 'private') { $class = 'maxwidth50'; $classtd = 'center'; }
+			if ($fieldlist[$field] == 'position') { $class = 'maxwidth50'; $classtd = 'center'; }
+			if ($fieldlist[$field] == 'libelle') $class = 'quatrevingtpercent';
+			if ($fieldlist[$field] == 'topic') $class = 'quatrevingtpercent';
+			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') $size = 'size="2" ';
+
+			print '<td'.($classtd ? ' class="'.$classtd.'"' : '').'>';
+			if ($fieldlist[$field] == 'private')
 			{
 				if (empty($user->admin))
 				{
@@ -1043,12 +1043,12 @@ 
 				else
 				{
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
-					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1);
+					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 				}
 			}
 			else
 			{
-				print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
 		}

Braces +319 added lines, -151 removed lines

@@ -56,7 +56,9 @@ 
 $search_topic=GETPOST('search_topic','alpha');
 
 $allowed=1;
-if (! $allowed) accessforbidden();
+if (! $allowed) {
+	accessforbidden();
+}
 
 $acts[0] = "activate";
 $acts[1] = "disable";
@@ -75,8 +77,12 @@ 
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (empty($sortfield)) $sortfield='label, lang, position';
-if (empty($sortorder)) $sortorder='ASC';
+if (empty($sortfield)) {
+	$sortfield='label, lang, position';
+}
+if (empty($sortorder)) {
+	$sortorder='ASC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
@@ -92,17 +98,23 @@ 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
 $tabfield[25]= "label,type_template,lang,fk_user,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfield[25].=',content_lines';
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+	$tabfield[25].=',content_lines';
+}
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
 $tabfieldvalue[25]= "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldvalue[25].=',content_lines';
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+	$tabfieldvalue[25].=',content_lines';
+}
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
 $tabfieldinsert[25]= "label,type_template,fk_user,lang,private,position,topic,joinfiles,content";
-if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) $tabfieldinsert[25].=',content_lines';
+if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+	$tabfieldinsert[25].=',content_lines';
+}
 $tabfieldinsert[25].=',entity';     // Must be at end because not into other arrays
 
 // Condition to show dictionary in setup page
@@ -124,8 +136,7 @@ 
     	$helpsubstit.=$key.' -> '.$val.'<br>';
     	$helpsubstitforlines.=$key.' -> '.$val.'<br>';
     }
-}
-else
+} else
 {
     $tmp=FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTranslationKey)__']='Translation';
@@ -157,17 +168,39 @@ 
 
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
-if ($conf->propal->enabled)            $elementList['propal_send']=$langs->trans('MailToSendProposal');
-if ($conf->commande->enabled)          $elementList['order_send']=$langs->trans('MailToSendOrder');
-if ($conf->facture->enabled)           $elementList['facture_send']=$langs->trans('MailToSendInvoice');
-if ($conf->expedition->enabled)        $elementList['shipping_send']=$langs->trans('MailToSendShipment');
-if ($conf->ficheinter->enabled)        $elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
-if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
-if ($conf->fournisseur->enabled)       $elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
-if ($conf->fournisseur->enabled)       $elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
-if ($conf->societe->enabled)           $elementList['thirdparty']=$langs->trans('MailToThirdparty');
-if ($conf->adherent->enabled)          $elementList['member']=$langs->trans('MailToMember');
-if ($conf->contrat->enabled)           $elementList['contract']=$langs->trans('MailToSendContract');
+if ($conf->propal->enabled) {
+	$elementList['propal_send']=$langs->trans('MailToSendProposal');
+}
+if ($conf->commande->enabled) {
+	$elementList['order_send']=$langs->trans('MailToSendOrder');
+}
+if ($conf->facture->enabled) {
+	$elementList['facture_send']=$langs->trans('MailToSendInvoice');
+}
+if ($conf->expedition->enabled) {
+	$elementList['shipping_send']=$langs->trans('MailToSendShipment');
+}
+if ($conf->ficheinter->enabled) {
+	$elementList['fichinter_send']=$langs->trans('MailToSendIntervention');
+}
+if ($conf->supplier_proposal->enabled) {
+	$elementList['supplier_proposal_send']=$langs->trans('MailToSendSupplierRequestForQuotation');
+}
+if ($conf->fournisseur->enabled) {
+	$elementList['order_supplier_send']=$langs->trans('MailToSendSupplierOrder');
+}
+if ($conf->fournisseur->enabled) {
+	$elementList['invoice_supplier_send']=$langs->trans('MailToSendSupplierInvoice');
+}
+if ($conf->societe->enabled) {
+	$elementList['thirdparty']=$langs->trans('MailToThirdparty');
+}
+if ($conf->adherent->enabled) {
+	$elementList['member']=$langs->trans('MailToMember');
+}
+if ($conf->contrat->enabled) {
+	$elementList['contract']=$langs->trans('MailToSendContract');
+}
 $elementList['user']=$langs->trans('MailToUser');
 $elementList['all'] =$langs->trans('VisibleEverywhere');
 $elementList['none']=$langs->trans('VisibleNowhere');
@@ -193,14 +226,18 @@ 
 
 $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 ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
     // 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_label='';
+    }
         $search_type_template='';
         $search_lang='';
         $search_fk_user='';
@@ -222,26 +259,52 @@ 
         foreach ($listfield as $f => $value)
         {
         	// Not mandatory fields
-            if ($value == 'joinfiles') continue;
-            if ($value == 'content') continue;
-            if ($value == 'content_lines') continue;
+            if ($value == 'joinfiles') {
+            	continue;
+            }
+            if ($value == 'content') {
+            	continue;
+            }
+            if ($value == 'content_lines') {
+            	continue;
+            }
 
-            if (GETPOST('actionmodify') && $value == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
+            if (GETPOST('actionmodify') && $value == 'topic') {
+            	$_POST['topic']=$_POST['topic-'.$rowid];
+            }
 
             if ((! isset($_POST[$value]) || $_POST[$value]=='' || $_POST[$value]=='-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
             {
                 $ok=0;
                 $fieldnamekey=$listfield[$f];
                 // We take translate key of field
-                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-                if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-                if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-                if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-                if ($fieldnamekey == 'type_template') $fieldnamekey = 'TypeOfTemplate';
-                if ($fieldnamekey == 'fk_user') $fieldnamekey = 'Owner';
-                if ($fieldnamekey == 'private') $fieldnamekey = 'Private';
-                if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-                if ($fieldnamekey == 'topic') $fieldnamekey = 'Topic';
+                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+                	$fieldnamekey='Label';
+                }
+                if ($fieldnamekey == 'libelle_facture') {
+                	$fieldnamekey = 'LabelOnDocuments';
+                }
+                if ($fieldnamekey == 'code') {
+                	$fieldnamekey = 'Code';
+                }
+                if ($fieldnamekey == 'note') {
+                	$fieldnamekey = 'Note';
+                }
+                if ($fieldnamekey == 'type_template') {
+                	$fieldnamekey = 'TypeOfTemplate';
+                }
+                if ($fieldnamekey == 'fk_user') {
+                	$fieldnamekey = 'Owner';
+                }
+                if ($fieldnamekey == 'private') {
+                	$fieldnamekey = 'Private';
+                }
+                if ($fieldnamekey == 'position') {
+                	$fieldnamekey = 'Position';
+                }
+                if ($fieldnamekey == 'topic') {
+                	$fieldnamekey = 'Topic';
+                }
 
                 setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
             }
@@ -263,32 +326,50 @@ 
             {
             	//var_dump($i.' - '.$listfieldvalue[$i].' - '.$_POST[$listfieldvalue[$i]].' - '.$value);
             	$keycode=$listfieldvalue[$i];
-            	if ($value == 'lang') $keycode='langcode';
-                if ($value == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
-                if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) $_POST[$keycode]='';
-                if ($value == 'private' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='0';
-                if ($value == 'position' && ! is_numeric($_POST[$keycode])) $_POST[$keycode]='1';
-                if ($_POST[$keycode] == '' && $keycode != 'langcode') $sql.="null";		// lang must be '' if not defined so the unique key that include lang will work
-                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') $sql.="null";
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
+            	if ($value == 'lang') {
+            		$keycode='langcode';
+            	}
+                if ($value == 'entity') {
+                	$_POST[$keycode] = $conf->entity;
+                }
+                if ($i) {
+                	$sql.=",";
+                }
+                if ($value == 'fk_user' && ! ($_POST[$keycode] > 0)) {
+                	$_POST[$keycode]='';
+                }
+                if ($value == 'private' && ! is_numeric($_POST[$keycode])) {
+                	$_POST[$keycode]='0';
+                }
+                if ($value == 'position' && ! is_numeric($_POST[$keycode])) {
+                	$_POST[$keycode]='1';
+                }
+                if ($_POST[$keycode] == '' && $keycode != 'langcode') {
+                	$sql.="null";
+                }
+                // lang must be '' if not defined so the unique key that include lang will work
+                elseif ($_POST[$keycode] == '0' && $keycode == 'langcode') {
+                	$sql.="null";
+                } else {
+                	$sql.="'".$db->escape($_POST[$keycode])."'";
+                }
                 $i++;
             }
             $sql.=",1)";
 
             dol_syslog("actionadd", LOG_DEBUG);
             $result = $db->query($sql);
-            if ($result)	// Add is ok
+            if ($result) {
+            	// Add is ok
             {
                 setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
             }
-            else
+            	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+            } else
             {
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-                }
-                else {
+                } else {
                     dol_print_error($db);
                 }
             }
@@ -306,18 +387,39 @@ 
             foreach ($listfieldmodify as $field)
             {
             	$keycode=$listfieldvalue[$i];
-            	if ($field == 'lang') $keycode='langcode';
-
-                if ($field == 'fk_user' && ! ($_POST['fk_user'] > 0)) $_POST['fk_user']='';
-            	if ($field == 'topic') $_POST['topic']=$_POST['topic-'.$rowid];
-            	if ($field == 'joinfiles') $_POST['joinfiles']=$_POST['joinfiles-'.$rowid];
-            	if ($field == 'content') $_POST['content']=$_POST['content-'.$rowid];
-            	if ($field == 'content_lines') $_POST['content_lines']=$_POST['content_lines-'.$rowid];
-                if ($field == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($i) $sql.=",";
+            	if ($field == 'lang') {
+            		$keycode='langcode';
+            	}
+
+                if ($field == 'fk_user' && ! ($_POST['fk_user'] > 0)) {
+                	$_POST['fk_user']='';
+                }
+            	if ($field == 'topic') {
+            		$_POST['topic']=$_POST['topic-'.$rowid];
+            	}
+            	if ($field == 'joinfiles') {
+            		$_POST['joinfiles']=$_POST['joinfiles-'.$rowid];
+            	}
+            	if ($field == 'content') {
+            		$_POST['content']=$_POST['content-'.$rowid];
+            	}
+            	if ($field == 'content_lines') {
+            		$_POST['content_lines']=$_POST['content_lines-'.$rowid];
+            	}
+                if ($field == 'entity') {
+                	$_POST[$keycode] = $conf->entity;
+                }
+                if ($i) {
+                	$sql.=",";
+                }
                 $sql.= $field."=";
-                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) $sql.="null";  // For vat, we want/accept code = ''
-                else $sql.="'".$db->escape($_POST[$keycode])."'";
+                if ($_POST[$keycode] == '' || ($keycode == 'langcode' && empty($_POST[$keycode]))) {
+                	$sql.="null";
+                }
+                // For vat, we want/accept code = ''
+                else {
+                	$sql.="'".$db->escape($_POST[$keycode])."'";
+                }
                 $i++;
             }
             $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
@@ -328,17 +430,18 @@ 
             if ($resql)
             {
             	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            }
-            else
+            } else
             {
                 setEventMessages($db->error(), null, 'errors');
             }
         }
     }
 
-    if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+    if ($action == 'confirm_delete' && $confirm == 'yes') {
+    	// delete
     {
         $rowidcol="rowid";
+    }
 
         $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
@@ -349,8 +452,7 @@ 
             if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
             {
                 setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-            }
-            else
+            } else
             {
                 dol_print_error($db);
             }
@@ -426,15 +528,27 @@ 
 {
 	$sql.= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL OR lang = '')";
 }
-if ($search_label) $sql.=natural_search('label', $search_label);
-if ($search_type_template != '' && $search_type_template != '-1') $sql.=natural_search('type_template', $search_type_template);
-if ($search_lang) $sql.=natural_search('lang', $search_lang);
-if ($search_fk_user != '' && $search_fk_user != '-1') $sql.=natural_search('fk_user', $search_fk_user, 2);
-if ($search_topic) $sql.=natural_search('topic', $search_topic);
+if ($search_label) {
+	$sql.=natural_search('label', $search_label);
+}
+if ($search_type_template != '' && $search_type_template != '-1') {
+	$sql.=natural_search('type_template', $search_type_template);
+}
+if ($search_lang) {
+	$sql.=natural_search('lang', $search_lang);
+}
+if ($search_fk_user != '' && $search_fk_user != '-1') {
+	$sql.=natural_search('fk_user', $search_fk_user, 2);
+}
+if ($search_topic) {
+	$sql.=natural_search('topic', $search_topic);
+}
 if ($sortfield)
 {
     // If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield='country_code';
+	if ($sortfield == 'country') {
+		$sortfield='country_code';
+	}
     $sql.= " ORDER BY ".$sortfield;
     if ($sortorder)
     {
@@ -444,8 +558,7 @@ 
     // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
     $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
     $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
-}
-else {
+} else {
     $sql.=" ORDER BY ";
 }
 $sql.=$tabsqlsort[$id];
@@ -491,17 +604,27 @@ 
         if ($valuetoshow != '')
         {
             print '<td align="'.$align.'">';
-        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-        	else if (! empty($tabhelp[$id][$value]))
+        	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) {
+        		print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+        	} else if (! empty($tabhelp[$id][$value]))
         	{
-        	    if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);   // Tooltip on click
-        	    else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
+        	    if (in_array($value, array('topic'))) {
+        	    	print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value);
+        	    }
+        	    // Tooltip on click
+        	    else {
+        	    	print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);
+        	    }
+        	    // Tooltip on hover
+        	} else {
+        		print $valuetoshow;
         	}
-        	else print $valuetoshow;
             print '</td>';
          }
-         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
-}
+         if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') {
+         	$alabelisused=1;
+         }
+         }
 print '<td>';
 print '<input type="hidden" name="id" value="' . $id . '">';
 print '</td>';
@@ -512,8 +635,9 @@ 
 if (GETPOST('actionadd'))
 {
 	foreach ($fieldlist as $key => $val) {
-		if (GETPOST($val) != '')
-			$obj->$val = GETPOST($val);
+		if (GETPOST($val) != '') {
+					$obj->$val = GETPOST($val);
+		}
 	}
 }
 
@@ -557,29 +681,30 @@ 
 	{
 		print '<strong>' . $form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '</strong> ';
 	}
-	if ($tmpfieldlist == 'content')
-		print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist);
-	if ($tmpfieldlist == 'content_lines')
-		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '<br>';
+	if ($tmpfieldlist == 'content') {
+			print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist);
+	}
+	if ($tmpfieldlist == 'content_lines') {
+			print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist) . '<br>';
+	}
 	// Input field
 	if ($tmpfieldlist == 'topic') {
 		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
-	}
-	else if ($tmpfieldlist == 'joinfiles') {
+	} else if ($tmpfieldlist == 'joinfiles') {
 		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="' . (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '') . '">';
-	}
-	else
+	} else
 	{
 		if ($context != 'hide') {
 			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
-			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
-				$okforextended = false;
+			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+							$okforextended = false;
+			}
 			$doleditor = new DolEditor($tmpfieldlist, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
+		} else {
+					print '&nbsp;';
 		}
-		else
-			print '&nbsp;';
 	}
 	print '</td>';
 	if ($tmpfieldlist == 'topic') {
@@ -624,9 +749,15 @@ 
 
     $param = '&id='.$id;
     $paramwithsearch = $param;
-    if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-    if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-    if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+    if ($sortorder) {
+    	$paramwithsearch.= '&sortorder='.$sortorder;
+    }
+    if ($sortfield) {
+    	$paramwithsearch.= '&sortfield='.$sortfield;
+    }
+    if (GETPOST('from')) {
+    	$paramwithsearch.= '&from='.GETPOST('from','alpha');
+    }
 
     // There is several pages
     if ($num > $listlimit)
@@ -642,30 +773,35 @@ 
     $filterfound=0;
     foreach ($fieldlist as $field => $value)
     {
-        if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-        elseif ($value == 'lang')
+        if ($value == 'label') {
+        	print '<td class="liste_titre"><input type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+        } elseif ($value == 'lang')
         {
         	print '<td class="liste_titre">';
         	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
         	print '</td>';
-        }
-        elseif ($value == 'fk_user')
+        } elseif ($value == 'fk_user')
         {
         	print '<td class="liste_titre">';
         	$restrictid=array();
-        	if (! $user->admin) $restrictid=array($user->id);
+        	if (! $user->admin) {
+        		$restrictid=array($user->id);
+        	}
         	//var_dump($restrictid);
         	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth200');
         	print '</td>';
-        }
-        elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
-        elseif ($value == 'type_template')
+        } elseif ($value == 'topic') {
+        	print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+        } elseif ($value == 'type_template')
         {
         	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200 maxwidth100onsmartphone').'</td>';
+        } elseif (! in_array($value, array('content', 'content_lines'))) {
+        	print '<td class="liste_titre"></td>';
         }
-        elseif (! in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
-    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+    	print '<td class="liste_titre"></td>';
+    }
     // Action column
     print '<td class="liste_titre" align="right" width="64">';
     $searchpicto=$form->showFilterButtons();
@@ -709,8 +845,14 @@ 
         {
             if (! empty($tabhelp[$id][$value]))
             {
-                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);   // Tooltip on click
-                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1);	// Tooltip on hover
+                if (in_array($value, array('topic'))) {
+                	$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);
+                }
+                // Tooltip on click
+                else {
+                	$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', 1);
+                }
+                // Tooltip on hover
             }
             print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
         }
@@ -737,7 +879,9 @@ 
                 $error=$hookmanager->error; $errors=$hookmanager->errors;
 
                 // Show fields
-                if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                if (empty($reshook)) {
+                	fieldList($fieldlist,$obj,$tabname[$id],'edit');
+                }
 
                 print '<td></td><td></td><td></td>';
                 print '<td align="center">';
@@ -778,7 +922,9 @@ 
                         if ($tmpfieldlist == 'content')
                         {
                         	$okforextended = true;
-                        	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
+                        	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+                        		$okforextended = false;
+                        	}
                         	$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
                         	print $doleditor->Create(1);
                         }
@@ -787,8 +933,7 @@ 
                         print '<td></td>';
                     }
                 }
-            }
-            else
+            } else
             {
               	$tmpaction = 'view';
                 $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
@@ -800,7 +945,9 @@ 
                 {
                     foreach ($fieldlist as $field => $value)
                     {
-                        if (in_array($fieldlist[$field], array('content','content_lines'))) continue;
+                        if (in_array($fieldlist[$field], array('content','content_lines'))) {
+                        	continue;
+                        }
                         $showfield=1;
                     	$align="left";
                         $valuetoshow=$obj->{$fieldlist[$field]};
@@ -824,8 +971,11 @@ 
                         if ($value == 'private')
                         {
                         	$align="center";
-                        	if ($valuetoshow) $valuetoshow=yn($valuetoshow);
-                        	else $valuetoshow='';
+                        	if ($valuetoshow) {
+                        		$valuetoshow=yn($valuetoshow);
+                        	} else {
+                        		$valuetoshow='';
+                        	}
                         }
                         if ($value == 'position')
                         {
@@ -834,8 +984,11 @@ 
                         if ($value == 'joinfiles')
                         {
                         	$align="center";
-                        	if ($valuetoshow) $valuetoshow=1;
-                        	else $valuetoshow='';
+                        	if ($valuetoshow) {
+                        		$valuetoshow=1;
+                        	} else {
+                        		$valuetoshow='';
+                        	}
                         }
 
                         $class='tddict';
@@ -858,17 +1011,23 @@ 
                 }
 
                 $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
-                if ($param) $url .= '&'.$param;
+                if ($param) {
+                	$url .= '&'.$param;
+                }
                 $url.='&';
 
                 // Status / Active
                 print '<td align="center" class="nowrap">';
-                if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                if ($canbedisabled) {
+                	print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                }
                 print "</td>";
 
                 // Modify link / Delete link
                 print '<td class="center nowraponall" width="64">';
-                if ($canbemodified) print '<a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a>';
+                if ($canbemodified) {
+                	print '<a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a>';
+                }
                 if ($iserasable)
                 {
                     print ' &nbsp; <a href="'.$url.'action=delete">'.img_delete().'</a>';
@@ -911,8 +1070,7 @@ 
             $i++;
         }
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -956,15 +1114,16 @@ 
 			if ($user->admin)
 			{
 				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
-			}
-			else
+			} else
 			{
-				if ($context == 'add')	// I am not admin and we show the add form
+				if ($context == 'add') {
+					// I am not admin and we show the add form
 				{
-					print $user->getNomUrl(1);		// Me
-					$forcedvalue=$user->id;
+					print $user->getNomUrl(1);
 				}
-				else
+				// Me
+					$forcedvalue=$user->id;
+				} else
 				{
 					if ($obj && ! empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
@@ -972,8 +1131,7 @@ 
 						$fuser->fetch($obj->{$fieldlist[$field]});
 						print $fuser->getNomUrl(1);
 						$forcedvalue=$fuser->id;
-					}
-					else
+					} else
 					{
 						$forcedvalue=$obj->{$fieldlist[$field]};
 					}
@@ -982,24 +1140,27 @@ 
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			if (! empty($conf->global->MAIN_MULTILANGS))
 			{
 				$selectedlang = $langs->defaultlang;
-				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
+				if ($context == 'edit') {
+					$selectedlang = $obj->{$fieldlist[$field]};
+				}
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1);
-			}
-			else
+			} else
 			{
 				if (! empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
 				}
 				$keyname=$fieldlist[$field];
-				if ($keyname == 'lang') $keyname='langcode';	// Avoid conflict with lang param
+				if ($keyname == 'lang') {
+					$keyname='langcode';
+				}
+				// Avoid conflict with lang param
 				print '<input type="hidden" value="'.$obj->{$fieldlist[$field]}.'" name="'.$keyname.'">';
 			}
 			print '</td>';
@@ -1013,25 +1174,34 @@ 
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
-			}
-			else
+			} else
 			{
 				print $form->selectarray('type_template', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200');
 			}
 			print '</td>';
-		}
-		elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		else
+		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+			continue;
+		} elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+			continue;
+		} elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) {
+			continue;
+		} else
 		{
 			$size=''; $class=''; $classtd='';
-			if ($fieldlist[$field]=='code') $class='maxwidth100';
+			if ($fieldlist[$field]=='code') {
+				$class='maxwidth100';
+			}
 			if ($fieldlist[$field]=='private') { $class='maxwidth50'; $classtd='center'; }
 			if ($fieldlist[$field]=='position') { $class='maxwidth50'; $classtd='center'; }
-			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='topic') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			if ($fieldlist[$field]=='libelle') {
+				$class='quatrevingtpercent';
+			}
+			if ($fieldlist[$field]=='topic') {
+				$class='quatrevingtpercent';
+			}
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') {
+				$size='size="2" ';
+			}
 
 			print '<td'.($classtd?' class="'.$classtd.'"':'').'>';
 			if ($fieldlist[$field]=='private')
@@ -1039,14 +1209,12 @@ 
 				if (empty($user->admin))
 				{
 					print $form->selectyesno($fieldlist[$field], '1', 1);
-				}
-				else
+				} else
 				{
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
 					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 1);
 				}
-			}
-			else
+			} else
 			{
 				print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}

htdocs/accountancy/journal/expensereportsjournal.php

Spacing +102 added lines, -102 removed lines

@@ -27,19 +27,19 @@ 
  * \brief		Page with expense reports journal
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-$langs->loadLangs(array("commercial", "compta","bills","other","accountancy","trips","errors"));
+$langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "trips", "errors"));
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -71,13 +71,13 @@ 
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
-	$pastmonthyear --;
+	$pastmonthyear--;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
@@ -90,25 +90,25 @@ 
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
 $sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 //$sql .= " ct.accountancy_code_buy as account_tva";
-$sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
+$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
+$sql .= " JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_expensereport";
+$sql .= " JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0";
 $sql .= " AND erd.fk_code_ventilation > 0";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 if ($date_start && $date_end)
-	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND er.date_debut >= '".$db->idate($date_start)."' AND er.date_debut <= '".$db->idate($date_end)."'";
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
-    $sql .= " AND er.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+    $sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 if ($in_bookkeeping == 'notyet')
 {
-    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 $sql .= " ORDER BY er.date_debut";
 
@@ -116,38 +116,38 @@ 
 $result = $db->query($sql);
 if ($result) {
 
-	$taber = array ();
-	$tabht = array ();
-	$tabtva = array ();
-	$def_tva = array ();
-	$tabttc = array ();
-	$tablocaltax1 = array ();
-	$tablocaltax2 = array ();
-	$tabuser = array ();
+	$taber = array();
+	$tabht = array();
+	$tabtva = array();
+	$def_tva = array();
+	$tabttc = array();
+	$tablocaltax1 = array();
+	$tablocaltax2 = array();
+	$tabuser = array();
 
 	$num = $db->num_rows($result);
 
 	// Variables
-	$account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
-	$account_vat = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
+	$account_salary = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
+	$account_vat = (!empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
 
 	$i = 0;
-	while ( $i < $num ) {
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$compta_user = (! empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
+		$compta_user = (!empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
 		$compta_fees = $obj->compte;
 
-		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
-		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $account_vat);
-		$compta_localtax1 = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_localtax2 = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
+		$compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $account_vat);
+		$compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+		$compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
 		{
-			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
 		$taber[$obj->rowid]["date"] = $db->jdate($obj->de);
@@ -156,24 +156,24 @@ 
 		$taber[$obj->rowid]["fk_expensereportdet"] = $obj->erdid;
 
 		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0;
+		if (!isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0;
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 
 		$tabttc[$obj->rowid][$compta_user] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_fees] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
-		$tabuser[$obj->rowid] = array (
+		$tabuser[$obj->rowid] = array(
 				'id' => $obj->uid,
 				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'user_accountancy_code' => $obj->user_accountancy_account
 		);
 
-		$i ++;
+		$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -194,9 +194,9 @@ 
 		$db->begin();
 
 		// Thirdparty
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
+			foreach ($tabttc[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -241,9 +241,9 @@ 
 		}
 
 		// Fees
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabht[$key] as $k => $mt ) {
+			foreach ($tabht[$key] as $k => $mt) {
 				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
@@ -292,16 +292,16 @@ 
 		}
 
 		// VAT
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			$listoftax=array(0, 1, 2);
-			foreach($listoftax as $numtax)
+			$listoftax = array(0, 1, 2);
+			foreach ($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
 				if ($numtax == 1) $arrayofvat = $tablocaltax1;
 				if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-				foreach ( $arrayofvat[$key] as $k => $mt ) {
+				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
 					// get compte id and label
 					$bookkeeping = new BookKeeping($db);
@@ -314,7 +314,7 @@ 
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_operation = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %';
+					$bookkeeping->label_operation = $langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %';
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -355,7 +355,7 @@ 
 			setEventMessages('Try to insert a non balanced transaction in book for '.$val["ref"].'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (! $errorforline)
+		if (!$errorforline)
 		{
 			$db->commit();
 		}
@@ -366,7 +366,7 @@ 
 			if ($error >= 10)
 			{
 			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-			    break;  // Break in the foreach
+			    break; // Break in the foreach
 			}
 		}
 	}
@@ -385,20 +385,20 @@ 
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
-	$action='';
+	$action = '';
 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error)
 	{
-		$param='id_journal='.$id_journal;
-		$param.='&date_startday='.$date_startday;
-		$param.='&date_startmonth='.$date_startmonth;
-		$param.='&date_startyear='.$date_startyear;
-		$param.='&date_endday='.$date_endday;
-		$param.='&date_endmonth='.$date_endmonth;
-		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookkeeping='.$in_bookkeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
+		$param = 'id_journal='.$id_journal;
+		$param .= '&date_startday='.$date_startday;
+		$param .= '&date_startmonth='.$date_startmonth;
+		$param .= '&date_startyear='.$date_startyear;
+		$param .= '&date_endday='.$date_endday;
+		$param .= '&date_endmonth='.$date_endmonth;
+		$param .= '&date_endyear='.$date_endyear;
+		$param .= '&in_bookkeeping='.$in_bookkeeping;
+		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -524,17 +524,17 @@ 
 
 	llxHeader('', $langs->trans("ExpenseReportsJournal"));
 
-	$nom = $langs->trans("ExpenseReportsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("ExpenseReportsJournal").' - '.$accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
-	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	$builddate = dol_now();
+	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
-	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
-	$period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices = array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0, 1).' - '.$form->select_date($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0, 1).' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_journal='.$id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
@@ -545,11 +545,11 @@ 
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	}
 	else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
+		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		else print '<a href="#" class="butActionRefused" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
 	//print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';
@@ -580,13 +580,13 @@ 
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("ExpenseReportRef") . ")</td>";
-	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>".$langs->trans("Date")."</td>";
+	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ExpenseReportRef").")</td>";
+	print "<td>".$langs->trans("AccountAccounting")."</td>";
+	print "<td>".$langs->trans("SubledgerAccount")."</td>";
+	print "<td>".$langs->trans("LabelOperation")."</td>";
+	print "<td align='right'>".$langs->trans("Debit")."</td>";
+	print "<td align='right'>".$langs->trans("Credit")."</td>";
 	print "</tr>\n";
 
 	$r = '';
@@ -594,7 +594,7 @@ 
 	$expensereportstatic = new ExpenseReport($db);
 	$expensereportlinestatic = new ExpenseReportLine($db);
 
-	foreach ( $taber as $key => $val ) {
+	foreach ($taber as $key => $val) {
 		$expensereportstatic->id = $key;
 		$expensereportstatic->ref = $val["ref"];
 		$expensereportlinestatic->comments = html_entity_decode(dol_trunc($val["comments"], 32));
@@ -602,15 +602,15 @@ 
 		$date = dol_print_date($val["date"], 'day');
 
 		// Fees
-		foreach ( $tabht[$key] as $k => $mt ) {
+		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Fees --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 				$userstatic->id = $tabuser[$key]['id'];
 				$userstatic->name = $tabuser[$key]['name'];
 				// Account
@@ -627,19 +627,19 @@ 
 				print '</td>';
 				$userstatic->id = $tabuser[$key]['id'];
 				$userstatic->name = $tabuser[$key]['name'];
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $accountingaccount->label . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$accountingaccount->label."</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
 
 		// Third party
-		foreach ( $tabttc[$key] as $k => $mt ) {
+		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+			print "<td>".$date."</td>";
+			print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->name = $tabuser[$key]['name'];
 			// Account
@@ -660,9 +660,9 @@ 
 			}
 			else print $accountoshow;
 			print '</td>';
-			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
+			print '<td align="right">'.($mt < 0 ? -price(-$mt) : '')."</td>";
+			print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -673,12 +673,12 @@ 
 			if ($numtax == 1) $arrayofvat = $tablocaltax1;
 			if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-			foreach ( $arrayofvat[$key] as $k => $mt ) {
+			foreach ($arrayofvat[$key] as $k => $mt) {
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
@@ -691,10 +691,10 @@ 
 				// Subledger account
 				print "<td>";
 				print '</td>';
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+				print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 				print "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 			}

htdocs/theme/md/style.css.php

Spacing +251 added lines, -251 removed lines

@@ -27,35 +27,35 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 // Colors
-$colorbackhmenu1='90,50,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
-$colorbacktitle1='240,240,240';      // title of tables-lists
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='250,250,250';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='244,244,244';    // line pair
-$colorbacklinebreak='214,218,220';
-$colorbackbody='248,248,248';
-$colortexttitlenotab='90,90,90';
-$colortexttitle='20,20,20';
-$colortext='0,0,0';
-$colortextlink='0,0,120';
-$fontsize='13';
-$fontsizesmaller='11';
+$colorbackhmenu1 = '90,50,120'; // topmenu
+$colorbackvmenu1 = '255,255,255'; // vmenu
+$colortopbordertitle1 = ''; // top border of tables-lists title. not defined = default to colorbackhmenu1
+$colorbacktitle1 = '240,240,240'; // title of tables-lists
+$colorbacktabcard1 = '255,255,255'; // card
+$colorbacktabactive = '234,234,234';
+$colorbacklineimpair1 = '255,255,255'; // line impair
+$colorbacklineimpair2 = '255,255,255'; // line impair
+$colorbacklinepair1 = '250,250,250'; // line pair
+$colorbacklinepair2 = '248,248,248'; // line pair
+$colorbacklinepairhover = '244,244,244'; // line pair
+$colorbacklinebreak = '214,218,220';
+$colorbackbody = '248,248,248';
+$colortexttitlenotab = '90,90,90';
+$colortexttitle = '20,20,20';
+$colortext = '0,0,0';
+$colortextlink = '0,0,120';
+$fontsize = '13';
+$fontsizesmaller = '11';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
 
@@ -65,7 +65,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
-if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login'],'',1);
+if (empty($user->id) && !empty($_SESSION['dol_login'])) $user->fetch('', $_SESSION['dol_login'], '', 1);
 
 
 // Define css type
@@ -77,132 +77,132 @@ 
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
+if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 
-$langs->load("main",0,1);
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$langs->load("main", 0, 1);
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
-$path='';    	// This value may be used in future for external module to overwrite theme
-$theme='md';	// Value of theme
-if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
+$path = ''; // This value may be used in future for external module to overwrite theme
+$theme = 'md'; // Value of theme
+if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files and other constants
-$fontlist='roboto,arial,tahoma,verdana,helvetica';    //$fontlist='verdana,helvetica,arial,sans-serif';
-$img_head='';
-$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='verdana,helvetica,arial,sans-serif';
+$img_head = '';
+$img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
+$dol_hide_topmenu = $conf->dol_hide_topmenu;
+$dol_hide_leftmenu = $conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen = $conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover = $conf->dol_no_mouse_hover;
 
 
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
-$borderwidth=2;
+$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 1);
+$borderwidth = 2;
 
 // Case of option always editable
-if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
-if (! isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1=$colorbackvmenu1;
-if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1;
-if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER==$colorbacklinepairhover;
-if (! isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK=$colorbacklinebreak;
-if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;
-if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK=$colortextlink;
+if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
+if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
+if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER == $colorbacklinepairhover;
+if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
+if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
+if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
     // 90A4AE, 607D8B, 455A64, 37474F
-    $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
-    $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_TEXT='0,0,0';
-    $conf->global->THEME_ELDY_FONT_SIZE1='13';
-    $conf->global->THEME_ELDY_FONT_SIZE2='11';
+    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
+    $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
+    $conf->global->THEME_ELDY_TEXT = '0,0,0';
+    $conf->global->THEME_ELDY_FONT_SIZE1 = '13';
+    $conf->global->THEME_ELDY_FONT_SIZE2 = '11';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colortopbordertitle1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$conf->global->THEME_ELDY_TOPBORDER_TITLE1)   :(empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$user->conf->THEME_ELDY_TOPBORDER_TITLE1);
-$colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinebreak  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEBREAK)    ?$colorbacklinebreak:$conf->global->THEME_ELDY_LINEBREAK)    :(empty($user->conf->THEME_ELDY_LINEBREAK)?$colorbacklinebreak:$user->conf->THEME_ELDY_LINEBREAK);
-$colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
-$colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
-$colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
-$colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
-$colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortext:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
-$fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
+$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
+$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
+$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
+$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
+$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
+$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
 // Hover color
-$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
-if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
+$colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER));
+if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
+    $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_HOVER));
 }
 
-if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
+if (empty($colortopbordertitle1)) $colortopbordertitle1 = $colorbackhmenu1;
 
 
 // Set text color to black or white
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbackhmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) $colortextbackhmenu='FFFFFF';
-else $colortextbackhmenu='000000';
-
-$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbackvmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu='FFFFFF'; }
-else { $colortextbackvmenu='000000'; }
-
-$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbacktitle1);
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackhmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF';
+else $colortextbackhmenu = '000000';
+
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackvmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
+else { $colortextbackvmenu = '000000'; }
+
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
-	$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-	if ($tmpval <= 460) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-	else { $colortexttitle='101010'; $colorshadowtitle='FFFFFF'; }
+	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
+	else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
 }
-else $colorshadowtitle='888888';
+else $colorshadowtitle = '888888';
 
-$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbacktabcard1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab='FFFFFF'; }
-else { $colortextbacktab='111111'; }
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktabcard1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
+else { $colortextbacktab = '111111'; }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));
-$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));
-$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));
-$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
-$colorbacktabactive=join(',',colorStringToArray($colorbacktabactive));
-$colorbacklineimpair1=join(',',colorStringToArray($colorbacklineimpair1));
-$colorbacklineimpair2=join(',',colorStringToArray($colorbacklineimpair2));
-$colorbacklinepair1=join(',',colorStringToArray($colorbacklinepair1));
-$colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2));
-if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
-$colorbackbody=join(',',colorStringToArray($colorbackbody));
-$colortexttitlenotab=join(',',colorStringToArray($colortexttitlenotab));
-$colortexttitle=join(',',colorStringToArray($colortexttitle));
-$colortext=join(',',colorStringToArray($colortext));
-$colortextlink=join(',',colorStringToArray($colortextlink));
-
-$nbtopmenuentries=$menumanager->showmenu('topnb');
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1));
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1));
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1));
+$colorbacktabactive = join(',', colorStringToArray($colorbacktabactive));
+$colorbacklineimpair1 = join(',', colorStringToArray($colorbacklineimpair1));
+$colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
+$colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
+$colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
+if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
+$colorbackbody = join(',', colorStringToArray($colorbackbody));
+$colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
+$colortexttitle = join(',', colorStringToArray($colortexttitle));
+$colortext = join(',', colorStringToArray($colortext));
+$colortextlink = join(',', colorStringToArray($colortextlink));
+
+$nbtopmenuentries = $menumanager->showmenu('topnb');
 
 print '/*'."\n";
 print 'colorbackbody='.$colorbackbody."\n";
@@ -238,7 +238,7 @@ 
 
 
 body {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -300,7 +300,7 @@ 
     font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
     border: none;
-    border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT)?'-bottom':''; ?>: solid 1px rgba(0,0,0,.2);
+    border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2);
     outline: none;
     margin: 0px 0px 0px 0px;
 }
@@ -360,39 +360,39 @@ 
 	white-space: normal;
 }
 input.buttonpaymentcb {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png', 1) ?>);
 	background-size: 26px;
 	background-repeat: no-repeat;
 	background-position: 5px 5px;
 }
 input.buttonpaymentcheque {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
 input.buttonpaymentcb {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png', 1) ?>);
 	background-size: 24px;
 	background-repeat: no-repeat;
 	background-position: 5px 4px;
 }
 input.buttonpaymentcheque {
-	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 5px 4px;
 }
 input.buttonpaymentpaypal {
-	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
 input.buttonpaymentpaybox {
-	background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
 input.buttonpaymentstripe {
-	background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
@@ -593,7 +593,7 @@ 
 	text-align: justify;
 }
 .nowrap {
-	white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
+	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .liste_titre .nowrap {
 	white-space: nowrap;
@@ -834,7 +834,7 @@ 
 }
 
 .flexcontainer {
-    <?php if (in_array($conf->browser->browsername, array('chrome','firefox'))) echo 'display: inline-flex;' ?>
+    <?php if (in_array($conf->browser->browsername, array('chrome', 'firefox'))) echo 'display: inline-flex;' ?>
     flex-flow: row wrap;
     justify-content: flex-start;
 }
@@ -948,10 +948,10 @@ 
 @media only screen and (max-width: 767px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print $fontsize + 3; ?>px !important;
 	}
 }
 
@@ -959,10 +959,10 @@ 
 @media only screen and (max-width: 570px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print $fontsize + 3; ?>px !important;
 	}
 
 	.divmainbodylarge { margin-left: 20px; margin-right: 20px; }
@@ -974,7 +974,7 @@ 
         white-space: nowrap;
     }
 	div.fiche {
-		    margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
+		    margin-top: <?php print ($dol_hide_topmenu ? '12' : '6'); ?>px !important;
 	}
 	div.titre {
 		/* margin-top: 12px; */
@@ -996,7 +996,7 @@ 
 		min-width: 20px;
     	min-height: 1.4em;
     	line-height: 1.4em;
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
     	/* padding: .4em .1em; */
     	/* border-bottom: 1px solid #BBB; */
     	/* max-width: inherit; why this */
@@ -1024,7 +1024,7 @@ 
 
 	#tooltip {
 		position: absolute;
-		width: <?php print dol_size(300,'width'); ?>px;
+		width: <?php print dol_size(300, 'width'); ?>px;
 	}
 
 	/* intput, input[type=text], */
@@ -1062,7 +1062,7 @@ 
    	}
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -1109,14 +1109,14 @@ 
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
 	padding-bottom: 10px;
-<?php if (GETPOST('optioncss','aZ09') != 'print') { ?>
+<?php if (GETPOST('optioncss', 'aZ09') != 'print') { ?>
 	padding-left: 229px;
 	padding-top: 12px;
 <?php } ?>
 }
 
 .side-nav {
-<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
@@ -1127,7 +1127,7 @@ 
 	display: block;
 	font-family: "RobotoDraft","Roboto",sans-serif;
 	left: 0;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	position: fixed;
 	top: 50px;
@@ -1156,7 +1156,7 @@ 
 	-moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	-webkit-overflow-scrolling: touch;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	overflow-x: hidden;
 	overflow-y: auto;
@@ -1168,7 +1168,7 @@ 
 }
 
 /* For smartphone (testmenuhider is on) */
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -1180,7 +1180,7 @@ 
 	top: inherit !important;
 }
 .side-nav {
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 <?php } else { ?>
 	overflow-x: initial !important;
 	overflow-y: scroll;
@@ -1208,7 +1208,7 @@ 
 	z-index: 91;
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 	border-right: 1px solid rgba(0,0,0,0.3);
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 	top: 50px ! important;
 <?php } else { ?>
 	top: 60px ! important;
@@ -1221,9 +1221,9 @@ 
 <?php } ?>
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'22':'6')); ?>px;
-	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '22' : '6')); ?>px;
+	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
 	margin-bottom: 15px;
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
@@ -1237,25 +1237,25 @@ 
 	margin-top: 8px;
 }
 div.fichethirdleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?>
 }
 div.fichetwothirdright {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
 }
 div.fichehalfleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 }
 div.fichehalfright {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 }
 div.ficheaddleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
+	<?php if ($conf->browser->layout != 'phone') { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
 div.firstcolumn div.box {
@@ -1268,9 +1268,9 @@ 
 @media only screen and (max-width: 900px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'4':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:16); ?>px;
-    	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px;
+    	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     	margin-bottom: 15px;
     }
     div.fichecenter {
@@ -1448,16 +1448,16 @@ 
 /* ============================================================================== */
 
 <?php
-$minwidthtmenu=66;      /* minimum width for one top menu entry */
-$heightmenu=48;			/* height of top menu, part with image */
-$heightmenu2=48;        /* height of top menu, ârt with login  */
+$minwidthtmenu = 66; /* minimum width for one top menu entry */
+$heightmenu = 48; /* height of top menu, part with image */
+$heightmenu2 = 48; /* height of top menu, ârt with login  */
 $disableimages = 0;
 $maxwidthloginblock = 110;
-if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
+if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0; }
 ?>
 
 div#tmenu_tooltip {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1473,7 +1473,7 @@ 
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	/* padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px; */
@@ -1487,7 +1487,7 @@ 
 }
 
 div.tmenudiv {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1552,12 +1552,12 @@ 
 	*/
 }
 li.tmenu, li.tmenusel {
-	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
+	<?php print $minwidthtmenu ? 'min-width: '.$minwidthtmenu.'px;' : ''; ?>
 	text-align: center;
 	vertical-align: bottom;
 	<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
 	float: <?php print $left; ?>;
-    <?php if (! $disableimages) { ?>
+    <?php if (!$disableimages) { ?>
     height: <?php print $heightmenu; ?>px;
 	padding: 0px 0px 2px 0px;
     <?php } else { ?>
@@ -1577,7 +1577,7 @@ 
     background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
 */
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
+	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
 }
 li.tmenusel, li.tmenu:hover {
 	opacity: .50; /* show only a slight shadow */
@@ -1591,10 +1591,10 @@ 
 	margin-top: 0px;
 	<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
 	width: 5px;
-	<?php if (! $disableimages) { ?>
-	height: <?php print $heightmenu+4; ?>px;
+	<?php if (!$disableimages) { ?>
+	height: <?php print $heightmenu + 4; ?>px;
 	<?php } ?>
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */
+	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png', 1); ?>) 0 -6px no-repeat; */
 	<?php } ?>
 }
 div.tmenucenter
@@ -1625,7 +1625,7 @@ 
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu - 19); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -1634,128 +1634,128 @@ 
 <?php if (empty($dol_hide_topmenu)) { ?>
 
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>);
 	background-position-x: center;
 }
 
 div.mainmenu.billing {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png', 1) ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png', 1) ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png', 1) ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png', 1) ?>);
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png', 1) ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png', 1) ?>);
 }
 
 div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
 }
 
 div.mainmenu.ftp {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
 }
 
 div.mainmenu.hrm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png', 1) ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png', 1) ?>);
 }
 
 div.mainmenu.menu {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
 	top: 7px;
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png', 1) ?>);
 }
 
 div.mainmenu.ticketsup {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup.png', 1) ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
 }
 
 div.mainmenu.website {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
 }
 
 <?php
 // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
-$moduletomainmenu=array('user'=>'','syslog'=>'','societe'=>'companies','projet'=>'project','propale'=>'commercial','commande'=>'commercial',
-	'produit'=>'products','service'=>'products','stock'=>'products',
-	'don'=>'accountancy','tax'=>'accountancy','banque'=>'accountancy','facture'=>'accountancy','compta'=>'accountancy','accounting'=>'accountancy','adherent'=>'members','import'=>'tools','export'=>'tools','mailing'=>'tools',
-	'contrat'=>'commercial','ficheinter'=>'commercial','ticketsup'=>'ticketsup','deplacement'=>'commercial',
+$moduletomainmenu = array('user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
+	'produit'=>'products', 'service'=>'products', 'stock'=>'products',
+	'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
+	'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticketsup'=>'ticketsup', 'deplacement'=>'commercial',
 	'fournisseur'=>'companies',
-	'barcode'=>'','fckeditor'=>'','categorie'=>'',
+	'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
 );
-$mainmenuused='home';
-foreach($conf->modules as $val)
+$mainmenuused = 'home';
+foreach ($conf->modules as $val)
 {
-	$mainmenuused.=','.(isset($moduletomainmenu[$val])?$moduletomainmenu[$val]:$val);
+	$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
 }
 //var_dump($mainmenuused);
-$mainmenuusedarray=array_unique(explode(',',$mainmenuused));
+$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
 
-$generic=1;
+$generic = 1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','website');
+$divalreadydefined = array('home', 'companies', 'products', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
 // Put here list of menu entries we are sure we don't want
-$divnotrequired=array('multicurrency','salaries','ticketsup','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
-foreach($mainmenuusedarray as $val)
+$divnotrequired = array('multicurrency', 'salaries', 'ticketsup', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
+foreach ($mainmenuusedarray as $val)
 {
-	if (empty($val) || in_array($val,$divalreadydefined)) continue;
-	if (in_array($val,$divnotrequired)) continue;
+	if (empty($val) || in_array($val, $divalreadydefined)) continue;
+	if (in_array($val, $divnotrequired)) continue;
 	//print "XXX".$val;
 
 	// Search img file in module dir
-	$found=0; $url='';
-	foreach($conf->file->dol_document_root as $dirroot)
+	$found = 0; $url = '';
+	foreach ($conf->file->dol_document_root as $dirroot)
 	{
 		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 		{
-			$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-			$found=1;
+			$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+			$found = 1;
 			break;
 		}
 	}
 	// Img file not found
-	if (! $found)
+	if (!$found)
 	{
-		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
-		$found=1;
+		$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png", 1);
+		$found = 1;
 		if ($generic < 4) $generic++;
 		print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
 	}
@@ -1895,7 +1895,7 @@ 
     padding-bottom: 3px;
 	<?php print $left; ?>: 0;
 	top: 0px;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && ((GETPOST('testmenuhider') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 	position: absolute;
 <?php } else { ?>
 	position: fixed;
@@ -1907,7 +1907,7 @@ 
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 	width: 228px;
 	height: 43px;
-	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1983,11 +1983,11 @@ 
     vertical-align: middle;
 }
 .span-icon-user {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
 }
 .span-icon-password {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png', 1); ?>);
 	background-repeat: no-repeat;
 }
 
@@ -2007,7 +2007,7 @@ 
 
 .vmenu {
 	margin-left: 4px;
-	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -2295,7 +2295,7 @@ 
 a.tab:hover
 {
 	/*
-	background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
+	background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
 	color: #<?php echo $colortextbacktab; ?>;
 	*/
 	text-decoration: underline;
@@ -2348,8 +2348,8 @@ 
 	border-color: #c5c5c5;
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
-    padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
-    margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+    padding: 0.4em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
+    margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
 	line-height: 20px;
 	text-align: center;
 	vertical-align: middle;
@@ -2436,7 +2436,7 @@ 
 	background-color: transparent ! important;
 }
 
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
+<?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
 .butActionRefused {
 	display: none;
 }
@@ -2454,7 +2454,7 @@ 
 
 #undertopmenu {
 	background-repeat: repeat-x;
-	margin-top: <?php echo ($dol_hide_topmenu?'6':'0'); ?>px;
+	margin-top: <?php echo ($dol_hide_topmenu ? '6' : '0'); ?>px;
 }
 
 
@@ -2942,7 +2942,7 @@ 
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
     border-bottom: 1px solid #FDFFFF;
 
     color: rgb(<?php echo $colortexttitle; ?>);
@@ -2960,7 +2960,7 @@ 
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
 {
     font-family: <?php print $fontlist ?>;
-    font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+    font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
     vertical-align: middle;
     height: 24px;
 }
@@ -3235,7 +3235,7 @@ 
     background-repeat: repeat-x;
     color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>, sans-serif;
-    font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+    font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
     border-bottom: 1px solid #FDFFFF;
     white-space: nowrap;
 }
@@ -3398,12 +3398,12 @@ 
 
 .logo_setup
 {
-	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg',1) ?>);	/* content is used to best fit the container */
+	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg', 1) ?>);	/* content is used to best fit the container */
 	display: inline-block;
 }
 .nographyet
 {
-	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg',1) ?>);
+	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg', 1) ?>);
 	display: inline-block;
     opacity: 0.1;
     background-repeat: no-repeat;
@@ -3422,7 +3422,7 @@ 
 	padding-top: 5px;
     padding-bottom: 5px;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
-	<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
+	<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
 }
 
 #dolpaymenttable { min-width: 300px; font-size: 16px; }	/* Width must have min to make stripe input area visible */
@@ -3528,11 +3528,11 @@ 
 }
 
 div.ui-tooltip {
-	max-width: <?php print dol_size(600,'width'); ?>px !important;
+	max-width: <?php print dol_size(600, 'width'); ?>px !important;
 }
 
 .mytooltip {
-	width: <?php print dol_size(450,'width'); ?>px;
+	width: <?php print dol_size(450, 'width'); ?>px;
 	border-top: solid 1px #BBBBBB;
 	border-<?php print $left; ?>: solid 1px #BBBBBB;
 	border-<?php print $right; ?>: solid 1px #444444;
@@ -3777,7 +3777,7 @@ 
 
 .ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff !important; }
 
-.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif', 1) ?>) right center no-repeat; }
 .ui-autocomplete {
 	       position:absolute;
 	       width:auto;
@@ -3818,14 +3818,14 @@ 
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png', 1) ?>) right top no-repeat;
 	cursor: pointer;
 	margin-right: 3px;
 	margin-top: 3px;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png', 1) ?>) right center no-repeat;
 	cursor: pointer;
 	margin-right: 3px;
 	margin-top: 3px;
@@ -4003,7 +4003,7 @@ 
     font-family:<?php echo $fontlist; ?>;
     font-size:<?php echo $fontsize; ?>px;
 }
-.ui-button { margin-left: -2px; <?php print (preg_match('/chrome/',$conf->browser->name)?'padding-top: 1px;':''); ?> }
+.ui-button { margin-left: -2px; <?php print (preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> }
 .ui-button-icon-only .ui-button-text { height: 8px; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; }
 .ui-button-text
@@ -4132,7 +4132,7 @@ 
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth'])?max($_SESSION['dol_screenwidth']-830,450):'450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 .gtaskname div, .gtaskname {
@@ -4273,9 +4273,9 @@ 
     float: right;
 }
 
-.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
+.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
 
 
 /* ============================================================================== */
@@ -4284,12 +4284,12 @@ 
 
 .jnotify-container {
 	position: fixed !important;
-<?php if (! empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
+<?php if (!empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
 	top: auto !important;
 	bottom: 4px !important;
 <?php } ?>
 	text-align: center;
-	min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
+	min-width: <?php echo $dol_optimize_smallscreen ? '200' : '480'; ?>px;
 	width: auto;
 	max-width: 1024px;
 	padding-left: 10px !important;
@@ -4342,10 +4342,10 @@ 
 table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
   background: none !important;
 }
-.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right !important; }
-.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right !important; }
-.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png',1); ?>') no-repeat center right !important; }
-.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png',1); ?>') no-repeat center right !important; }
+.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
 .dataTables_paginate {
 	margin-top: 8px;
 }
@@ -5002,12 +5002,12 @@ 
 /* ============================================================================== */
 
 .menu_choix1 a {
-	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>') top left no-repeat;
+	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>') top left no-repeat;
 	background-position-y: 15px;
 }
 
 .menu_choix2 a {
-	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>') top left no-repeat;
+	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>') top left no-repeat;
 	background-position-y: 15px;
 }
 .menu_choix1,.menu_choix2 {
@@ -5100,7 +5100,7 @@ 
 
 	#tooltip {
 		position: absolute;
-		width: <?php print dol_size(350,'width'); ?>px;
+		width: <?php print dol_size(350, 'width'); ?>px;
 	}
 
     div.tabBar {
@@ -5175,7 +5175,7 @@ 
 @media only screen and (max-width: 570px)
 {
 	div#tmenu_tooltip {
-	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		/* padding-<?php echo $right; ?>: 78px; */
@@ -5198,7 +5198,7 @@ 
 
 	#tooltip {
 		position: absolute;
-		width: <?php print dol_size(300,'width'); ?>px;
+		width: <?php print dol_size(300, 'width'); ?>px;
 	}
 	select {
 		width: 98%;

htdocs/theme/eldy/style.css.php

Spacing +243 added lines, -243 removed lines

@@ -26,35 +26,35 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);          // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 // Colors
-$colorbackhmenu1='80,90,120';      // topmenu
-$colorbackvmenu1='248,248,248';      // vmenu
-$colortopbordertitle1='200,200,200';    // top border of title
-$colorbacktitle1='220,220,223';      // title of tables,list
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='248,248,248';    // line pair
-$colorbacklinepair2='248,248,248';    // line pair
-$colorbacklinepairhover='238,246,252';    // line pair
-$colorbacklinebreak='214,218,220';		// line break
-$colorbackbody='255,255,255';
-$colortexttitlenotab='100,60,20';
-$colortexttitle='0,0,0';
-$colortext='0,0,0';
-$colortextlink='0,0,100';
-$fontsize='13';
-$fontsizesmaller='12';
+$colorbackhmenu1 = '80,90,120'; // topmenu
+$colorbackvmenu1 = '248,248,248'; // vmenu
+$colortopbordertitle1 = '200,200,200'; // top border of title
+$colorbacktitle1 = '220,220,223'; // title of tables,list
+$colorbacktabcard1 = '255,255,255'; // card
+$colorbacktabactive = '234,234,234';
+$colorbacklineimpair1 = '255,255,255'; // line impair
+$colorbacklineimpair2 = '255,255,255'; // line impair
+$colorbacklinepair1 = '248,248,248'; // line pair
+$colorbacklinepair2 = '248,248,248'; // line pair
+$colorbacklinepairhover = '238,246,252'; // line pair
+$colorbacklinebreak = '214,218,220'; // line break
+$colorbackbody = '255,255,255';
+$colortexttitlenotab = '100,60,20';
+$colortexttitle = '0,0,0';
+$colortext = '0,0,0';
+$colortextlink = '0,0,100';
+$fontsize = '13';
+$fontsizesmaller = '12';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
 
@@ -64,7 +64,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
-if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login'],'',1);
+if (empty($user->id) && !empty($_SESSION['dol_login'])) $user->fetch('', $_SESSION['dol_login'], '', 1);
 
 
 // Define css type
@@ -76,131 +76,131 @@ 
 // On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
 if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
 
-if (GETPOST('theme','alpha')) $conf->theme=GETPOST('theme','alpha');  // If theme was forced on URL
-if (GETPOST('lang','aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
+if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 
-$langs->load("main",0,1);
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$langs->load("main", 0, 1);
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
-$path='';    	// This value may be used in future for external module to overwrite theme
-$theme='eldy';	// Value of theme
-if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
+$path = ''; // This value may be used in future for external module to overwrite theme
+$theme = 'eldy'; // Value of theme
+if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files and other constants
-$fontlist='roboto,arial,tahoma,verdana,helvetica';    //$fontlist='helvetica, verdana, arial, sans-serif';
+$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
 //$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
-$img_head='';
-$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$img_head = '';
+$img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
+$dol_hide_topmenu = $conf->dol_hide_topmenu;
+$dol_hide_leftmenu = $conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen = $conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover = $conf->dol_no_mouse_hover;
 
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:0);
-$borderwidth=1;
+$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
+$borderwidth = 1;
 
 // Case of option always editable
-if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
-if (! isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1=$colorbackvmenu1;
-if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1;
-if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=$colorbacklinepairhover;
-if (! isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK=$colorbacklinebreak;
-if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;
-if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK=$colortextlink;
+if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
+if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
+if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
+if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
+if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
+if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
-	$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-	$conf->global->THEME_ELDY_TEXT='0,0,0';
-	$conf->global->THEME_ELDY_FONT_SIZE1='13';
-	$conf->global->THEME_ELDY_FONT_SIZE2='12';
+	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
+	$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
+	$conf->global->THEME_ELDY_TEXT = '0,0,0';
+	$conf->global->THEME_ELDY_FONT_SIZE1 = '13';
+	$conf->global->THEME_ELDY_FONT_SIZE2 = '12';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colortopbordertitle1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$conf->global->THEME_ELDY_TOPBORDER_TITLE1)   :(empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$user->conf->THEME_ELDY_TOPBORDER_TITLE1);
-$colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinebreak  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEBREAK)    ?$colorbacklinebreak:$conf->global->THEME_ELDY_LINEBREAK)    :(empty($user->conf->THEME_ELDY_LINEBREAK)?$colorbacklinebreak:$user->conf->THEME_ELDY_LINEBREAK);
-$colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
-$colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
-$colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortexttitle:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
-$colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
-$colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortextlink:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
-$fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
+$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
+$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
+$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
+$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
+$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
+$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
 // Hover color
-$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
-if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
+$colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER));
+if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	$colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
+	$colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_HOVER));
 }
 
 //$colortopbordertitle1=$colorbackhmenu1;
 
 // Set text color to black or white
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbackhmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) $colortextbackhmenu='FFFFFF';
-else $colortextbackhmenu='000000';
-
-$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbackvmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu='FFFFFF'; }
-else { $colortextbackvmenu='000000'; }
-
-$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbacktitle1);
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackhmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF';
+else $colortextbackhmenu = '000000';
+
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackvmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
+else { $colortextbackvmenu = '000000'; }
+
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
-	$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-	if ($tmpval <= 460) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-	else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
+	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
+	else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
 }
-else $colorshadowtitle='888888';
+else $colorshadowtitle = '888888';
 
-$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',',$colorbacktabcard1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab='FFFFFF'; }
-else { $colortextbacktab='111111'; }
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktabcard1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
+else { $colortextbacktab = '111111'; }
 
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));
-$colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));
-$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));
-$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
-$colorbacktabactive=join(',',colorStringToArray($colorbacktabactive));
-$colorbacklineimpair1=join(',',colorStringToArray($colorbacklineimpair1));
-$colorbacklineimpair2=join(',',colorStringToArray($colorbacklineimpair2));
-$colorbacklinepair1=join(',',colorStringToArray($colorbacklinepair1));
-$colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2));
-if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
-$colorbackbody=join(',',colorStringToArray($colorbackbody));
-$colortexttitlenotab=join(',',colorStringToArray($colortexttitlenotab));
-$colortexttitle=join(',',colorStringToArray($colortexttitle));
-$colortext=join(',',colorStringToArray($colortext));
-$colortextlink=join(',',colorStringToArray($colortextlink));
-
-$nbtopmenuentries=$menumanager->showmenu('topnb');
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1));
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1));
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1));
+$colorbacktabactive = join(',', colorStringToArray($colorbacktabactive));
+$colorbacklineimpair1 = join(',', colorStringToArray($colorbacklineimpair1));
+$colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
+$colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
+$colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
+if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
+$colorbackbody = join(',', colorStringToArray($colorbackbody));
+$colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
+$colortexttitle = join(',', colorStringToArray($colortexttitle));
+$colortext = join(',', colorStringToArray($colortext));
+$colortextlink = join(',', colorStringToArray($colortextlink));
+
+$nbtopmenuentries = $menumanager->showmenu('topnb');
 
 print '/*'."\n";
 print 'colorbackbody='.$colorbackbody."\n";
@@ -236,7 +236,7 @@ 
 
 
 body {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
 	background: rgb(<?php print $colorbackbody; ?>);
@@ -253,7 +253,7 @@ 
 }
 
 .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; font-weight: bold !important; }
-th a { font-weight: <?php echo ($useboldtitle?'bold':'normal'); ?> !important; }
+th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
 a.tab { font-weight: bold !important; }
 
 a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: normal; color: rgb(<?php print $colortextlink; ?>); text-decoration: none;  }
@@ -293,7 +293,7 @@ 
     font-family: <?php print $fontlist ?>;
     outline: none;
     margin: 0px 0px 0px 0px;
-    border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT)?'-bottom':''; ?>: solid 1px rgba(0,0,0,.2);
+    border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2);
 }
 
 input {
@@ -366,29 +366,29 @@ 
 	box-shadow: 1px 1px 8px #bbb;
 }
 input.buttonpaymentcb {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png', 1) ?>);
 	background-size: 26px;
 	background-repeat: no-repeat;
 	background-position: 5px 11px;
 }
 input.buttonpaymentcheque {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/common/cheque.png', 1) ?>);
 	background-size: 24px;
 	background-repeat: no-repeat;
 	background-position: 5px 8px;
 }
 input.buttonpaymentpaypal {
-	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/paypal/img/object_paypal.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
 input.buttonpaymentpaybox {
-	background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/paybox/img/object_paybox.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
 input.buttonpaymentstripe {
-	background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/stripe/img/object_stripe.png', 1) ?>);
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
@@ -592,7 +592,7 @@ 
 	text-align: justify;
 }
 .nowrap {
-	white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>;
+	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .liste_titre .nowrap {
 	white-space: nowrap;
@@ -840,7 +840,7 @@ 
 }
 
 .flexcontainer {
-    <?php if (in_array($conf->browser->name, array('chrome','firefox'))) echo 'display: inline-flex;'."\n"; ?>
+    <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;'."\n"; ?>
     flex-flow: row wrap;
     justify-content: flex-start;
 }
@@ -959,10 +959,10 @@ 
 @media only screen and (max-width: 767px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print $fontsize + 3; ?>px !important;
 	}
 }
 
@@ -970,10 +970,10 @@ 
 @media only screen and (max-width: 570px)
 {
 	body {
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize+3; ?>px !important;
+		font-size: <?php print $fontsize + 3; ?>px !important;
 	}
 
 	.divmainbodylarge { margin-left: 20px !important; margin-right: 20px !important; }
@@ -985,7 +985,7 @@ 
         white-space: nowrap;
     }
 	div.fiche {
-		    margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
+		    margin-top: <?php print ($dol_hide_topmenu ? '12' : '6'); ?>px !important;
 	}
 	div.titre {
 		/* margin-top: 12px; */
@@ -1005,7 +1005,7 @@ 
 	}
 	input, input[type=text], input[type=password], select, textarea     {
 		min-width: 20px;
-		font-size: <?php print $fontsize+3; ?>px;
+		font-size: <?php print $fontsize + 3; ?>px;
     	/* min-height: 1.4em; */
     	/* line-height: 1.4em; */
     	/* padding: .4em .1em; */
@@ -1036,7 +1036,7 @@ 
 
 	#tooltip {
 		position: absolute;
-		width: <?php print dol_size(300,'width'); ?>px;
+		width: <?php print dol_size(300, 'width'); ?>px;
 	}
 
 	/* intput, input[type=text], */
@@ -1081,7 +1081,7 @@ 
    	}
 }
 .linkobject { cursor: pointer; }
-<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
@@ -1175,7 +1175,7 @@ 
 */
 
 /* For smartphone (testmenuhider is on) */
-<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 #id-container {
 	width: 100%;
 }
@@ -1217,10 +1217,10 @@ 
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'25':'6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:(empty($conf->dol_optimize_smallscreen)?'24':'6')); ?>px;
-	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
-	<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '25' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px;
+	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
+	<?php if (!empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
 	margin: 20px !important;
@@ -1237,25 +1237,25 @@ 
 	margin-top: 8px;
 }
 div.fichethirdleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
-	<?php if ($conf->browser->layout == 'phone')   { print "padding-bottom: 6px;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?>
 }
 div.fichetwothirdright {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
-	<?php if ($conf->browser->layout == 'phone')   { print "padding-bottom: 6px\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
 }
 div.fichehalfleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 }
 div.fichehalfright {
-	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
-	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?>
 }
 div.ficheaddleft {
-	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
+	<?php if ($conf->browser->layout != 'phone') { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
 div.firstcolumn div.box {
@@ -1268,9 +1268,9 @@ 
 @media only screen and (max-width: 1000px)
 {
     div.fiche {
-    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
-    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss','aZ09') == 'print'?8:6); ?>px;
-    	<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+    	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '6' : '20')); ?>px;
+    	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 6); ?>px;
+    	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
     }
     div.fichecenter {
     	width: 100%;
@@ -1452,16 +1452,16 @@ 
 /* ============================================================================== */
 
 <?php
-$minwidthtmenu=66;		/* minimum width for one top menu entry */
-$heightmenu=46;			/* height of top menu, part with image */
-$heightmenu2=48;        /* height of top menu, part with login  */
+$minwidthtmenu = 66; /* minimum width for one top menu entry */
+$heightmenu = 46; /* height of top menu, part with image */
+$heightmenu2 = 48; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 130;
-if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
+if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0; }
 ?>
 
 div#id-top {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -1469,7 +1469,7 @@ 
 }
 
 div#tmenu_tooltip {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
 	padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px;
@@ -1483,7 +1483,7 @@ 
 }
 
 div.tmenudiv {
-<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
     position: relative;
@@ -1538,7 +1538,7 @@ 
 ul.tmenu li {	/* We need this to have background color when menu entry wraps on new lines */
 }
 li.tmenu, li.tmenusel {
-	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
+	<?php print $minwidthtmenu ? 'min-width: '.$minwidthtmenu.'px;' : ''; ?>
 	text-align: center;
 	vertical-align: bottom;
 	<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
@@ -1569,7 +1569,7 @@ 
 	margin-top: 0px;
 	<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
 	width: 5px;
-	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */
+	/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png', 1); ?>) 0 -6px no-repeat; */
 	<?php } ?>
 	<?php if ($disableimages) { ?>
 	height: 26px;
@@ -1618,7 +1618,7 @@ 
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-22); ?>px;
+	height: <?php echo ($heightmenu - 22); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -1627,129 +1627,129 @@ 
 <?php if (empty($dol_hide_topmenu)) { ?>
 
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>);
 	background-position-x: center;
 }
 
 div.mainmenu.billing {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png', 1) ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png', 1) ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png', 1) ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png', 1) ?>);
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png', 1) ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png', 1) ?>);
 }
 
 div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
 }
 
 div.mainmenu.ftp {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
 }
 
 div.mainmenu.hrm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png', 1) ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png', 1) ?>);
 }
 
 div.mainmenu.menu {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
 	top: 7px;
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png', 1) ?>);
 }
 
 div.mainmenu.ticketsup {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticketsup.png', 1) ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
 }
 
 div.mainmenu.website {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
 }
 
 <?php
 // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
-$moduletomainmenu=array(
-	'user'=>'','syslog'=>'','societe'=>'companies','projet'=>'project','propale'=>'commercial','commande'=>'commercial',
-	'produit'=>'products','service'=>'products','stock'=>'products',
-	'don'=>'accountancy','tax'=>'accountancy','banque'=>'accountancy','facture'=>'accountancy','compta'=>'accountancy','accounting'=>'accountancy','adherent'=>'members','import'=>'tools','export'=>'tools','mailing'=>'tools',
-	'contrat'=>'commercial','ficheinter'=>'commercial','ticketsup'=>'ticketsup','deplacement'=>'commercial',
+$moduletomainmenu = array(
+	'user'=>'', 'syslog'=>'', 'societe'=>'companies', 'projet'=>'project', 'propale'=>'commercial', 'commande'=>'commercial',
+	'produit'=>'products', 'service'=>'products', 'stock'=>'products',
+	'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
+	'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticketsup'=>'ticketsup', 'deplacement'=>'commercial',
 	'fournisseur'=>'companies',
-	'barcode'=>'','fckeditor'=>'','categorie'=>'',
+	'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
 );
-$mainmenuused='home';
-foreach($conf->modules as $val)
+$mainmenuused = 'home';
+foreach ($conf->modules as $val)
 {
-	$mainmenuused.=','.(isset($moduletomainmenu[$val])?$moduletomainmenu[$val]:$val);
+	$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
 }
 //var_dump($mainmenuused);
-$mainmenuusedarray=array_unique(explode(',',$mainmenuused));
+$mainmenuusedarray = array_unique(explode(',', $mainmenuused));
 
-$generic=1;
+$generic = 1;
 // Put here list of menu entries when the div.mainmenu.menuentry was previously defined
-$divalreadydefined=array('home','companies','products','commercial','externalsite','accountancy','project','tools','members','agenda','ftp','holiday','hrm','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','stripe','webservices','website');
+$divalreadydefined = array('home', 'companies', 'products', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
 // Put here list of menu entries we are sure we don't want
-$divnotrequired=array('multicurrency','salaries','ticketsup','margin','opensurvey','paybox','expensereport','incoterm','prelevement','propal','workflow','notification','supplier_proposal','cron','product','productbatch','expedition');
-foreach($mainmenuusedarray as $val)
+$divnotrequired = array('multicurrency', 'salaries', 'ticketsup', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
+foreach ($mainmenuusedarray as $val)
 {
-	if (empty($val) || in_array($val,$divalreadydefined)) continue;
-	if (in_array($val,$divnotrequired)) continue;
+	if (empty($val) || in_array($val, $divalreadydefined)) continue;
+	if (in_array($val, $divnotrequired)) continue;
 	//print "XXX".$val;
 
 	// Search img file in module dir
-	$found=0; $url='';
-	foreach($conf->file->dol_document_root as $dirroot)
+	$found = 0; $url = '';
+	foreach ($conf->file->dol_document_root as $dirroot)
 	{
 		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 		{
-			$url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
-			$found=1;
+			$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+			$found = 1;
 			break;
 		}
 	}
 	// Img file not found
-	if (! $found)
+	if (!$found)
 	{
-		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
-		$found=1;
+		$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png", 1);
+		$found = 1;
 		if ($generic < 4) $generic++;
 		print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
 	}
@@ -1891,10 +1891,10 @@ 
 	position: absolute;
 	text-align: <?php print $right; ?>;
 	<?php print $right; ?>: 0;
-	top: <?php print $disableimages?'4px':'0'; ?>;
+	top: <?php print $disableimages ? '4px' : '0'; ?>;
 	font-weight: bold;
 	max-width: <?php echo $maxwidthloginblock; ?>px;
-	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
 }
@@ -1980,11 +1980,11 @@ 
     background-color: #FFF;
 }
 .span-icon-user {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
 }
 .span-icon-password {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png', 1); ?>);
 	background-repeat: no-repeat;
 }
 
@@ -2005,7 +2005,7 @@ 
 .vmenu {
     width: 190px;
 	margin-left: 6px;
-	<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
     display: none;
 	<?php } ?>
 }
@@ -2314,7 +2314,7 @@ 
 a.tab:hover
 {
 	/*
-	background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
+	background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
 	color: #<?php echo $colortextbacktab; ?>;
 	*/
 	text-decoration: underline;
@@ -2366,8 +2366,8 @@ 
 
 .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	text-decoration: none;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important;
-	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em !important;
+	padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
 	font-family: <?php print $fontlist ?>;
     font-weight: normal;
     border-color: #c5c5c5;
@@ -2405,8 +2405,8 @@ 
     text-decoration: none !important;
 	white-space: nowrap !important;
 	cursor: not-allowed !important;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
-	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
+	padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
     font-family: <?php print $fontlist ?> !important;
     font-weight: normal !important;
     display: inline-block;
@@ -2421,7 +2421,7 @@ 
 	background-color: transparent ! important;
 }
 
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (! $user->admin)) { ?>
+<?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
 .butActionRefused {
 	display: none;
 }
@@ -2439,7 +2439,7 @@ 
 
 #undertopmenu {
 	background-repeat: repeat-x;
-	margin-top: <?php echo ($dol_hide_topmenu?'6':'0'); ?>px;
+	margin-top: <?php echo ($dol_hide_topmenu ? '6' : '0'); ?>px;
 }
 
 
@@ -2913,7 +2913,7 @@ 
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
 	background: rgb(<?php echo $colorbacktitle1; ?>);
-	font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
 /*    border-bottom: 1px solid #ddd; */
 
     color: rgb(<?php echo $colortexttitle; ?>);
@@ -2931,7 +2931,7 @@ 
 tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
 {
     font-family: <?php print $fontlist ?>;
-    font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+    font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
     vertical-align: middle;
     height: 24px;
 }
@@ -3260,7 +3260,7 @@ 
 	background: rgb(<?php echo $colorbacktitle1; ?>)
 	color: rgb(<?php echo $colortexttitle; ?>);
     font-family: <?php print $fontlist ?>, sans-serif;
-    font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
+    font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
     border-bottom: 1px solid #FDFFFF;
     white-space: nowrap;
 }
@@ -3423,12 +3423,12 @@ 
 
 .logo_setup
 {
-	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg',1) ?>);	/* content is used to best fit the container */
+	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg', 1) ?>);	/* content is used to best fit the container */
 	display: inline-block;
 }
 .nographyet
 {
-	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg',1) ?>);
+	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nographyet.svg', 1) ?>);
 	display: inline-block;
     opacity: 0.1;
     background-repeat: no-repeat;
@@ -3562,7 +3562,7 @@ 
 }
 
 div.ui-tooltip {
-	max-width: <?php print dol_size(600,'width'); ?>px !important;
+	max-width: <?php print dol_size(600, 'width'); ?>px !important;
 }
 .mytooltip {
 	border-top: solid 1px #BBBBBB;
@@ -3808,7 +3808,7 @@ 
 
 .ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff !important; }
 
-.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif', 1) ?>) right center no-repeat; }
 .ui-autocomplete {
 	       position:absolute;
 	       width:auto;
@@ -3839,14 +3839,14 @@ 
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png', 1) ?>) right top no-repeat;
 	cursor: pointer;
 	margin-right: 3px;
 	margin-top: 3px;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png', 1) ?>) right center no-repeat;
 	margin-right: 3px;
 	cursor: pointer;
 	margin-right: 3px;
@@ -4025,7 +4025,7 @@ 
     font-family:<?php echo $fontlist; ?>;
     font-size:<?php echo $fontsize; ?>px;
 }
-/* .ui-button { margin-left: -2px; <?php print (preg_match('/chrome/',$conf->browser->name)?'padding-top: 1px;':''); ?> } */
+/* .ui-button { margin-left: -2px; <?php print (preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> } */
 .ui-button { margin-left: -2px; }
 .ui-button-icon-only .ui-button-text { height: 8px; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; }
@@ -4207,7 +4207,7 @@ 
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth'])?max($_SESSION['dol_screenwidth']-830,450):'450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 .gtaskname div, .gtaskname {
@@ -4343,9 +4343,9 @@ 
     float: right;
 }
 
-.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
+.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
 
 
 /* ============================================================================== */
@@ -4354,12 +4354,12 @@ 
 
 .jnotify-container {
 	position: fixed !important;
-<?php if (! empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
+<?php if (!empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
 	top: auto !important;
 	bottom: 4px !important;
 <?php } ?>
 	text-align: center;
-	min-width: <?php echo $dol_optimize_smallscreen?'200':'480'; ?>px;
+	min-width: <?php echo $dol_optimize_smallscreen ? '200' : '480'; ?>px;
 	width: auto;
 	max-width: 1024px;
 	padding-left: 10px !important;
@@ -4413,10 +4413,10 @@ 
 table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
   background: none !important;
 }
-.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right !important; }
-.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right !important; }
-.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png',1); ?>') no-repeat center right !important; }
-.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png',1); ?>') no-repeat center right !important; }
+.sorting_asc  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png', 1); ?>') no-repeat center right !important; }
+.sorting_asc_disabled  { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png', 1); ?>') no-repeat center right !important; }
+.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png', 1); ?>') no-repeat center right !important; }
 .dataTables_paginate {
 	margin-top: 8px;
 }
@@ -5062,10 +5062,10 @@ 
 /* ============================================================================== */
 
 .menu_choix1 a {
-	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/money.png',1) ?>') top left no-repeat;
+	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/money.png', 1) ?>') top left no-repeat;
 }
 .menu_choix2 a {
-	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/home.png',1) ?>') top left no-repeat;
+	background: url('<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus_black/home.png', 1) ?>') top left no-repeat;
 }
 .menu_choix1,.menu_choix2 {
 	font-size: 1.4em;
@@ -5146,7 +5146,7 @@ 
 
 	#tooltip {
 		position: absolute;
-		width: <?php print dol_size(350,'width'); ?>px;
+		width: <?php print dol_size(350, 'width'); ?>px;
 	}
 
     div.tabBar {
@@ -5254,7 +5254,7 @@ 
 	<?php } ?>
 	}
 	div#tmenu_tooltip {
-	<?php if (GETPOST('optioncss','aZ09') == 'print') {  ?>
+	<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 		display:none;
 	<?php } else { ?>
 		padding-<?php echo $right; ?>: 0;
@@ -5265,7 +5265,7 @@ 
 		width: 100%;
 	}
 	div.login_block {
-		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 		/* Style when phone layout or when using the menuhider */
 		display: none;
 		padding-top: 20px;

htdocs/cron/list.php

Indentation +52 added lines, -52 removed lines

@@ -124,51 +124,51 @@ 
 	// Execute jobs
 	if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 	{
-	    if (! empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
-	    {
-	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-	        $action='';
-	    }
-	    else
-	    {
-	        $object = new Cronjob($db);
-	    	$job = $object->fetch($id);
-
-	        $now = dol_now();   // Date we start
-
-	        $resrunjob = $object->run_jobs($user->login);   // Return -1 if KO, 1 if OK
-	    	if ($resrunjob < 0) {
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-
-	    	// Programm next run
-	    	$res = $object->reprogram_jobs($user->login, $now);
-	    	if ($res > 0)
-	    	{
-	    		if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
-	    		{
-	    		    if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
-	    		}
-	    		$action='';
-	    	}
-	    	else
-	    	{
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    		$action='';
-	    	}
-
-	    	$param='&search_status='.urlencode($search_status);
-	    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	    	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	    	if ($search_label)	  $param.='&search_label='.urlencode($search_label);
-	    	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
-	    	// Add $param from extra fields
-	    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-	    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:''));		// Make a redirect to avoid to run twice the job when using back
-	    	exit;
-	    }
+		if (! empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+		{
+			setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+			$action='';
+		}
+		else
+		{
+			$object = new Cronjob($db);
+			$job = $object->fetch($id);
+
+			$now = dol_now();   // Date we start
+
+			$resrunjob = $object->run_jobs($user->login);   // Return -1 if KO, 1 if OK
+			if ($resrunjob < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+
+			// Programm next run
+			$res = $object->reprogram_jobs($user->login, $now);
+			if ($res > 0)
+			{
+				if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
+				{
+					if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+					else setEventMessages($langs->trans("JobFinished"), null, 'errors');
+				}
+				$action='';
+			}
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action='';
+			}
+
+			$param='&search_status='.urlencode($search_status);
+			if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+			if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+			if ($search_label)	  $param.='&search_label='.urlencode($search_label);
+			if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+			// Add $param from extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+			header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:''));		// Make a redirect to avoid to run twice the job when using back
+			exit;
+		}
 	}
 
 	// Mass actions
@@ -274,8 +274,8 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -334,11 +334,11 @@ 
 // Line with explanation and button new job
 if (! $user->rights->cron->create)
 {
-    $buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
+	$buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
 }
 else
 {
-    $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
+	$buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
 }
 
 print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit);
@@ -452,7 +452,7 @@ 
 		print '<td>';
 		if ($obj->jobtype=='method')
 		{
-		    $text=$langs->trans("CronClass");
+			$text=$langs->trans("CronClass");
 			$texttoshow=$langs->trans('CronModule').': '.$obj->module_name.'<br>';
 			$texttoshow.=$langs->trans('CronClass').': '. $obj->classesname.'<br>';
 			$texttoshow.=$langs->trans('CronObject').': '. $obj->objectname.'<br>';
@@ -527,8 +527,8 @@ 
 		}
 		if ($user->rights->cron->execute)
 		{
-		    if (!empty($obj->status)) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").'</a>';
-		    else print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'),"playdisabled").'</a>';
+			if (!empty($obj->status)) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").'</a>';
+			else print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'),"playdisabled").'</a>';
 		} else {
 			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'),"playdisabled").'</a>';
 		}

Spacing +174 added lines, -174 removed lines

@@ -29,37 +29,37 @@ 
 require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
 
-$langs->loadLangs(array("admin","cron","bills"));
+$langs->loadLangs(array("admin", "cron", "bills"));
 
 if (!$user->rights->cron->read) accessforbidden();
 
-$action=GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');											// The bulk action (combo box choice into lists)
-$confirm=GETPOST('confirm','alpha');
-$toselect   = GETPOST('toselect', 'array');												// Array of ids of elements selected into a list
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'cronjoblist';   // To manage different context of search
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$confirm = GETPOST('confirm', 'alpha');
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cronjoblist'; // To manage different context of search
 
-$id=GETPOST('id','int');
+$id = GETPOST('id', 'int');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.status,t.priority';
-if (! $sortorder) $sortorder='DESC,ASC';
+if (!$sortfield) $sortfield = 't.status,t.priority';
+if (!$sortorder) $sortorder = 'DESC,ASC';
 
-$search_status=GETPOST('search_status','int')?GETPOST('search_status','int'):GETPOST('status','int');
-if ($search_status == '') $search_status=-2;
+$search_status = GETPOST('search_status', 'int') ?GETPOST('search_status', 'int') : GETPOST('status', 'int');
+if ($search_status == '') $search_status = -2;
 
 //Search criteria
-$search_label=GETPOST("search_label",'alpha');
-$securitykey = GETPOST('securitykey','alpha');
+$search_label = GETPOST("search_label", 'alpha');
+$securitykey = GETPOST('securitykey', 'alpha');
 
-$diroutputmassaction=$conf->cronjob->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->cronjob->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('cronjoblist'));
@@ -67,7 +67,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('cronjob');
-$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($extralabels, '', 'search_');
 
 $object = new Cronjob($db);
 
@@ -76,11 +76,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$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))
@@ -89,23 +89,23 @@ 
 	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_label='';
-		$search_status=-1;
-		$toselect='';
-		$search_array_options=array();
+		$search_label = '';
+		$search_status = -1;
+		$toselect = '';
+		$search_array_options = array();
 	}
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
 	{
-		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
-	$filter=array();
+	$filter = array();
 	if (!empty($search_label))
 	{
-		$filter['t.label']=$search_label;
+		$filter['t.label'] = $search_label;
 	}
 
 	// Delete jobs
@@ -113,7 +113,7 @@ 
 	{
 		//Delete cron task
 		$object = new Cronjob($db);
-		$object->id=$id;
+		$object->id = $id;
 		$result = $object->delete($user);
 
 		if ($result < 0) {
@@ -124,19 +124,19 @@ 
 	// Execute jobs
 	if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
 	{
-	    if (! empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+	    if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
 	    {
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
-	        $action='';
+	        $action = '';
 	    }
 	    else
 	    {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
 
-	        $now = dol_now();   // Date we start
+	        $now = dol_now(); // Date we start
 
-	        $resrunjob = $object->run_jobs($user->login);   // Return -1 if KO, 1 if OK
+	        $resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
 	    	if ($resrunjob < 0) {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    	}
@@ -150,39 +150,39 @@ 
 	    		    if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
 	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
 	    		}
-	    		$action='';
+	    		$action = '';
 	    	}
 	    	else
 	    	{
 	    		setEventMessages($object->error, $object->errors, 'errors');
-	    		$action='';
+	    		$action = '';
 	    	}
 
-	    	$param='&search_status='.urlencode($search_status);
-	    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	    	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	    	if ($search_label)	  $param.='&search_label='.urlencode($search_label);
-	    	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+	    	$param = '&search_status='.urlencode($search_status);
+	    	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	    	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	    	if ($search_label)	  $param .= '&search_label='.urlencode($search_label);
+	    	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 	    	// Add $param from extra fields
 	    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:''));		// Make a redirect to avoid to run twice the job when using back
+	    	header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '')); // Make a redirect to avoid to run twice the job when using back
 	    	exit;
 	    }
 	}
 
 	// Mass actions
-	$objectclass='CronJob';
-	$objectlabel='CronJob';
+	$objectclass = 'CronJob';
+	$objectlabel = 'CronJob';
 	$permtoread = $user->rights->cron->read;
-	$permtocreate = $user->rights->cron->create?$user->rights->cron->create:$user->rights->cron->write;
+	$permtocreate = $user->rights->cron->create ? $user->rights->cron->create : $user->rights->cron->write;
 	$permtodelete = $user->rights->cron->delete;
 	$uploaddir = $conf->cron->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 	if ($permtocreate)
 	{
 		$tmpcron = new Cronjob($db);
-		foreach($toselect as $id)
+		foreach ($toselect as $id)
 		{
 			$result = $tmpcron->fetch($id);
 			if ($result)
@@ -209,66 +209,66 @@ 
 $form = new Form($db);
 $cronjob = new Cronjob($db);
 
-$pagetitle=$langs->trans("CronList");
+$pagetitle = $langs->trans("CronList");
 
-llxHeader('',$pagetitle);
+llxHeader('', $pagetitle);
 
 
 $sql = "SELECT";
-$sql.= " t.rowid,";
-$sql.= " t.tms,";
-$sql.= " t.datec,";
-$sql.= " t.jobtype,";
-$sql.= " t.label,";
-$sql.= " t.command,";
-$sql.= " t.classesname,";
-$sql.= " t.objectname,";
-$sql.= " t.methodename,";
-$sql.= " t.params,";
-$sql.= " t.md5params,";
-$sql.= " t.module_name,";
-$sql.= " t.priority,";
-$sql.= " t.datelastrun,";
-$sql.= " t.datenextrun,";
-$sql.= " t.dateend,";
-$sql.= " t.datestart,";
-$sql.= " t.lastresult,";
-$sql.= " t.datelastresult,";
-$sql.= " t.lastoutput,";
-$sql.= " t.unitfrequency,";
-$sql.= " t.frequency,";
-$sql.= " t.status,";
-$sql.= " t.fk_user_author,";
-$sql.= " t.fk_user_mod,";
-$sql.= " t.note,";
-$sql.= " t.nbrun,";
-$sql.= " t.libname,";
-$sql.= " t.test";
-$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-$sql.= " WHERE 1 = 1";
-if ($search_status >= 0 && $search_status < 2) $sql.= " AND t.status = ".(empty($search_status)?'0':'1');
-if ($search_status == 2) $sql.= " AND t.status = 2";
+$sql .= " t.rowid,";
+$sql .= " t.tms,";
+$sql .= " t.datec,";
+$sql .= " t.jobtype,";
+$sql .= " t.label,";
+$sql .= " t.command,";
+$sql .= " t.classesname,";
+$sql .= " t.objectname,";
+$sql .= " t.methodename,";
+$sql .= " t.params,";
+$sql .= " t.md5params,";
+$sql .= " t.module_name,";
+$sql .= " t.priority,";
+$sql .= " t.datelastrun,";
+$sql .= " t.datenextrun,";
+$sql .= " t.dateend,";
+$sql .= " t.datestart,";
+$sql .= " t.lastresult,";
+$sql .= " t.datelastresult,";
+$sql .= " t.lastoutput,";
+$sql .= " t.unitfrequency,";
+$sql .= " t.frequency,";
+$sql .= " t.status,";
+$sql .= " t.fk_user_author,";
+$sql .= " t.fk_user_mod,";
+$sql .= " t.note,";
+$sql .= " t.nbrun,";
+$sql .= " t.libname,";
+$sql .= " t.test";
+$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+$sql .= " WHERE 1 = 1";
+if ($search_status >= 0 && $search_status < 2) $sql .= " AND t.status = ".(empty($search_status) ? '0' : '1');
+if ($search_status == 2) $sql .= " AND t.status = 2";
 //Manage filter
-if (is_array($filter) && count($filter)>0) {
-	foreach($filter as $key => $value) {
-		$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+if (is_array($filter) && count($filter) > 0) {
+	foreach ($filter as $key => $value) {
+		$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 	}
 }
 $sqlwhere = array();
 if (!empty($module_name)) {
-	$sqlwhere[]='(t.module_name='.$module_name.')';
+	$sqlwhere[] = '(t.module_name='.$module_name.')';
 }
-if (count($sqlwhere)>0) {
-	$sql.= " WHERE ".implode(' AND ',$sqlwhere);
+if (count($sqlwhere) > 0) {
+	$sql .= " WHERE ".implode(' AND ', $sqlwhere);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
-$sql.= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -278,21 +278,21 @@ 
     $nbtotalofrecords = $db->num_rows($result);
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
-$result=$db->query($sql);
-if (! $result) dol_print_error($db);
+$result = $db->query($sql);
+if (!$result) dol_print_error($db);
 
 $num = $db->num_rows($result);
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_status)   $param.='&search_status='.$search_status;
-if ($search_label)	  $param.='&search_label='.$search_label;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($search_status)   $param .= '&search_status='.$search_status;
+if ($search_label)	  $param .= '&search_label='.$search_label;
+if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -300,23 +300,23 @@ 
 
 if ($action == 'delete')
 {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.$param,$langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"),"confirm_delete",'','',1);
+	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.$param, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
 }
 if ($action == 'execute')
 {
-	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
+	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"), $langs->trans("CronConfirmExecute"), "confirm_execute", '', '', 1);
 }
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 	'enable'=>$langs->trans("Enable"),
 	'disable'=>$langs->trans("Disable"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->mymodule->delete) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
@@ -332,13 +332,13 @@ 
 print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 // Line with explanation and button new job
-if (! $user->rights->cron->create)
+if (!$user->rights->cron->create)
 {
-    $buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
+    $buttontoshow .= '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
 }
 else
 {
-    $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
+    $buttontoshow .= '<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
 }
 
 print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_setup', 0, $buttontoshow, '', $limit);
@@ -346,15 +346,15 @@ 
 
 print $langs->trans('CronInfo').'<br>';
 
-$text =$langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
-if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text.=$langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+$text = $langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
+if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text .= $langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
 print info_admin($text);
 print '<br>';
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields='';
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = '';
 //$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="noborder">';
@@ -378,44 +378,44 @@ 
 print '<td class="liste_titre" align="center">';
 print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $search_status, 1);
 print '</td><td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-print_liste_field_titre("ID",$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("CronLabel",$_SERVER["PHP_SELF"],"t.label","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("Prority",$_SERVER["PHP_SELF"],"t.priority","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("CronTask",'','',"",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("CronFrequency",'',"","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("CronDtStart",$_SERVER["PHP_SELF"],"t.datestart","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("CronDtEnd",$_SERVER["PHP_SELF"],"t.dateend","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("CronMaxRun",$_SERVER["PHP_SELF"],"t.maxrun","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre("CronNbRun",$_SERVER["PHP_SELF"],"t.nbrun","",$param,'align="right"',$sortfield,$sortorder);
-print_liste_field_titre("CronDtLastLaunch",$_SERVER["PHP_SELF"],"t.datelastrun","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("CronLastResult",$_SERVER["PHP_SELF"],"t.lastresult","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("CronLastOutput",$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder);
-print_liste_field_titre("CronDtNextLaunch",$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status,t.priority","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields,$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre("ID", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronTask", '', '', "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronDtStart", $_SERVER["PHP_SELF"], "t.datestart", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("CronDtEnd", $_SERVER["PHP_SELF"], "t.dateend", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("CronMaxRun", $_SERVER["PHP_SELF"], "t.maxrun", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("CronLastResult", $_SERVER["PHP_SELF"], "t.lastresult", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("CronLastOutput", $_SERVER["PHP_SELF"], "t.lastoutput", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronDtNextLaunch", $_SERVER["PHP_SELF"], "t.datenextrun", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "t.status,t.priority", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
 
 if ($num > 0)
 {
 	// Loop on each job
-	$style='pair';
+	$style = 'pair';
 	$now = dol_now();
-	$i=0;
-	$var=true;
-	$totalarray=array();
-	while ($i < min($num,$limit))
+	$i = 0;
+	$var = true;
+	$totalarray = array();
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($result);
 
 		if (empty($obj)) break;
-		if (! verifCond($obj->test)) continue;        // Discard line with test = false
+		if (!verifCond($obj->test)) continue; // Discard line with test = false
 
 		$object->id = $obj->rowid;
 		$object->ref = $obj->rowid;
@@ -432,7 +432,7 @@ 
 
 		// Label
 		print '<td>';
-		if (! empty($obj->label))
+		if (!empty($obj->label))
 		{
 			$object->ref = $langs->trans($obj->label);
 			print $object->getNomUrl(0, '', 1);
@@ -450,63 +450,63 @@ 
 		print '</td>';
 
 		print '<td>';
-		if ($obj->jobtype=='method')
+		if ($obj->jobtype == 'method')
 		{
-		    $text=$langs->trans("CronClass");
-			$texttoshow=$langs->trans('CronModule').': '.$obj->module_name.'<br>';
-			$texttoshow.=$langs->trans('CronClass').': '. $obj->classesname.'<br>';
-			$texttoshow.=$langs->trans('CronObject').': '. $obj->objectname.'<br>';
-			$texttoshow.=$langs->trans('CronMethod').': '. $obj->methodename;
-			$texttoshow.='<br>'.$langs->trans('CronArgs').': '. $obj->params;
-			$texttoshow.='<br>'.$langs->trans('Comment').': '. $langs->trans($obj->note);
+		    $text = $langs->trans("CronClass");
+			$texttoshow = $langs->trans('CronModule').': '.$obj->module_name.'<br>';
+			$texttoshow .= $langs->trans('CronClass').': '.$obj->classesname.'<br>';
+			$texttoshow .= $langs->trans('CronObject').': '.$obj->objectname.'<br>';
+			$texttoshow .= $langs->trans('CronMethod').': '.$obj->methodename;
+			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
+			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
 		}
-		elseif ($obj->jobtype=='command')
+		elseif ($obj->jobtype == 'command')
 		{
-			$text=$langs->trans('CronCommand');
-			$texttoshow=$langs->trans('CronCommand').': '.dol_trunc($obj->command);
-			$texttoshow.='<br>'.$langs->trans('CronArgs').': '. $obj->params;
-			$texttoshow.='<br>'.$langs->trans('Comment').': '. $langs->trans($obj->note);
+			$text = $langs->trans('CronCommand');
+			$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command);
+			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
+			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
 		}
 		print $form->textwithpicto($text, $texttoshow, 1);
 		print '</td>';
 
 		print '<td>';
-		if($obj->unitfrequency == "60") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Minutes');
-		if($obj->unitfrequency == "3600") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Hours');
-		if($obj->unitfrequency == "86400") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Days');
-		if($obj->unitfrequency == "604800") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Weeks');
+		if ($obj->unitfrequency == "60") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Minutes');
+		if ($obj->unitfrequency == "3600") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Hours');
+		if ($obj->unitfrequency == "86400") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Days');
+		if ($obj->unitfrequency == "604800") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Weeks');
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datestart)) {print dol_print_date($db->jdate($obj->datestart),'dayhour');}
+		if (!empty($obj->datestart)) {print dol_print_date($db->jdate($obj->datestart), 'dayhour'); }
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend),'dayhour');}
+		if (!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend), 'dayhour'); }
 		print '</td>';
 
 		print '<td align="right">';
-		if (!empty($obj->maxrun)) {print $obj->maxrun;}
+		if (!empty($obj->maxrun)) {print $obj->maxrun; }
 		print '</td>';
 
 		print '<td align="right">';
-		if (!empty($obj->nbrun)) {print $obj->nbrun;} else {print '0';}
+		if (!empty($obj->nbrun)) {print $obj->nbrun; } else {print '0'; }
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datelastrun)) {print dol_print_date($db->jdate($obj->datelastrun),'dayhour');}
+		if (!empty($obj->datelastrun)) {print dol_print_date($db->jdate($obj->datelastrun), 'dayhour'); }
 		print '</td>';
 
 		print '<td class="center">';
-		if ($obj->lastresult != '') {print dol_trunc($obj->lastresult);}
+		if ($obj->lastresult != '') {print dol_trunc($obj->lastresult); }
 		print '</td>';
 
 		print '<td>';
-		if(!empty($obj->lastoutput)) {print dol_trunc(nl2br($obj->lastoutput),50);}
+		if (!empty($obj->lastoutput)) {print dol_trunc(nl2br($obj->lastoutput), 50); }
 		print '</td>';
 
 		print '<td class="center">';
-		if(!empty($obj->datenextrun)) {print dol_print_date($db->jdate($obj->datenextrun),'dayhour');}
+		if (!empty($obj->datenextrun)) {print dol_print_date($db->jdate($obj->datenextrun), 'dayhour'); }
 		print '</td>';
 
 		// Status
@@ -517,26 +517,26 @@ 
 		print '<td align="right" class="nowraponall">';
 		if ($user->rights->cron->create)
 		{
-			print "<a href=\"".DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."&backtourl=".urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:''))."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'),'edit')."</a> &nbsp;";
+			print "<a href=\"".DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param."&backtourl=".urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : ''))."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')."</a> &nbsp;";
 		}
 		if ($user->rights->cron->delete)
 		{
-			print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'),'delete')."</a> &nbsp;";
+			print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete')."</a> &nbsp;";
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete')."</a> &nbsp; ";
 		}
 		if ($user->rights->cron->execute)
 		{
-		    if (!empty($obj->status)) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").'</a>';
-		    else print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'),"playdisabled").'</a>';
+		    if (!empty($obj->status)) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'), "play").'</a>';
+		    else print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'), "playdisabled").'</a>';
 		} else {
-			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'),"playdisabled").'</a>';
+			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'), "playdisabled").'</a>';
 		}
 		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 ' &nbsp; <input id="cb'.$obj->rowid.'" class="flat checkforselect valignmiddle" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print ' &nbsp; <input id="cb'.$obj->rowid.'" class="flat checkforselect valignmiddle" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 

Braces +118 added lines, -52 removed lines

@@ -31,7 +31,9 @@ 
 
 $langs->loadLangs(array("admin","cron","bills"));
 
-if (!$user->rights->cron->read) accessforbidden();
+if (!$user->rights->cron->read) {
+	accessforbidden();
+}
 
 $action=GETPOST('action','alpha');
 $massaction = GETPOST('massaction','alpha');											// The bulk action (combo box choice into lists)
@@ -49,11 +51,17 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='t.status,t.priority';
-if (! $sortorder) $sortorder='DESC,ASC';
+if (! $sortfield) {
+	$sortfield='t.status,t.priority';
+}
+if (! $sortorder) {
+	$sortorder='DESC,ASC';
+}
 
 $search_status=GETPOST('search_status','int')?GETPOST('search_status','int'):GETPOST('status','int');
-if ($search_status == '') $search_status=-2;
+if ($search_status == '') {
+	$search_status=-2;
+}
 
 //Search criteria
 $search_label=GETPOST("search_label",'alpha');
@@ -81,7 +89,9 @@ 
 
 $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 ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -89,9 +99,11 @@ 
 	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_label='';
+	}
 		$search_status=-1;
 		$toselect='';
 		$search_array_options=array();
@@ -128,8 +140,7 @@ 
 	    {
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 	        $action='';
-	    }
-	    else
+	    } else
 	    {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
@@ -145,24 +156,34 @@ 
 	    	$res = $object->reprogram_jobs($user->login, $now);
 	    	if ($res > 0)
 	    	{
-	    		if ($resrunjob >= 0)	// We show the result of reprogram only if no error message already reported
+	    		if ($resrunjob >= 0) {
+	    			// We show the result of reprogram only if no error message already reported
 	    		{
 	    		    if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
-	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
+	    		} else {
+	    		    	setEventMessages($langs->trans("JobFinished"), null, 'errors');
+	    		    }
 	    		}
 	    		$action='';
-	    	}
-	    	else
+	    	} else
 	    	{
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    		$action='';
 	    	}
 
 	    	$param='&search_status='.urlencode($search_status);
-	    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	    	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	    	if ($search_label)	  $param.='&search_label='.urlencode($search_label);
-	    	if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+	    	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	    		$param.='&contextpage='.urlencode($contextpage);
+	    	}
+	    	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    		$param.='&limit='.urlencode($limit);
+	    	}
+	    	if ($search_label) {
+	    		$param.='&search_label='.urlencode($search_label);
+	    	}
+	    	if ($optioncss != '') {
+	    		$param.='&optioncss='.urlencode($optioncss);
+	    	}
 	    	// Add $param from extra fields
 	    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -188,12 +209,17 @@ 
 			if ($result)
 			{
 				$result = 0;
-				if ($massaction == 'disable') $result = $tmpcron->setStatut(Cronjob::STATUS_DISABLED);
-				elseif ($massaction == 'enable') $result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
-				else dol_print_error($db, 'Bad value for massaction');
-				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
-			}
-			else
+				if ($massaction == 'disable') {
+					$result = $tmpcron->setStatut(Cronjob::STATUS_DISABLED);
+				} elseif ($massaction == 'enable') {
+					$result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
+				} else {
+					dol_print_error($db, 'Bad value for massaction');
+				}
+				if ($result < 0) {
+					setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
+				}
+			} else
 			{
 				$error++;
 			}
@@ -246,8 +272,12 @@ 
 $sql.= " t.test";
 $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
 $sql.= " WHERE 1 = 1";
-if ($search_status >= 0 && $search_status < 2) $sql.= " AND t.status = ".(empty($search_status)?'0':'1');
-if ($search_status == 2) $sql.= " AND t.status = 2";
+if ($search_status >= 0 && $search_status < 2) {
+	$sql.= " AND t.status = ".(empty($search_status)?'0':'1');
+}
+if ($search_status == 2) {
+	$sql.= " AND t.status = 2";
+}
 //Manage filter
 if (is_array($filter) && count($filter)>0) {
 	foreach($filter as $key => $value) {
@@ -281,18 +311,30 @@ 
 $sql.= $db->plimit($limit+1, $offset);
 
 $result=$db->query($sql);
-if (! $result) dol_print_error($db);
+if (! $result) {
+	dol_print_error($db);
+}
 
 $num = $db->num_rows($result);
 
 $arrayofselected=is_array($toselect)?$toselect:array();
 
 $param = '';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_status)   $param.='&search_status='.$search_status;
-if ($search_label)	  $param.='&search_label='.$search_label;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param.='&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param.='&limit='.$limit;
+}
+if ($search_status) {
+	$param.='&search_status='.$search_status;
+}
+if ($search_label) {
+	$param.='&search_label='.$search_label;
+}
+if ($optioncss != '') {
+	$param.='&optioncss='.$optioncss;
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -314,13 +356,19 @@ 
 	'enable'=>$langs->trans("Enable"),
 	'disable'=>$langs->trans("Disable"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->mymodule->delete) {
+	$arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend','predelete'))) {
+	$arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -335,8 +383,7 @@ 
 if (! $user->rights->cron->create)
 {
     $buttontoshow.='<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronCreateJob").'</a>';
-}
-else
+} else
 {
     $buttontoshow.='<a class="butAction" style="margin-right: 0px;margin-left: 0px;" href="'.DOL_URL_ROOT.'/cron/card.php?action=create">'.$langs->trans("CronCreateJob").'</a>';
 }
@@ -347,7 +394,9 @@ 
 print $langs->trans('CronInfo').'<br>';
 
 $text =$langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
-if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text.=$langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+if (! empty($conf->global->CRON_WARNING_DELAY_HOURS)) {
+	$text.=$langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+}
 print info_admin($text);
 print '<br>';
 
@@ -414,8 +463,13 @@ 
 	{
 		$obj = $db->fetch_object($result);
 
-		if (empty($obj)) break;
-		if (! verifCond($obj->test)) continue;        // Discard line with test = false
+		if (empty($obj)) {
+			break;
+		}
+		if (! verifCond($obj->test)) {
+			continue;
+		}
+		// Discard line with test = false
 
 		$object->id = $obj->rowid;
 		$object->ref = $obj->rowid;
@@ -437,8 +491,7 @@ 
 			$object->ref = $langs->trans($obj->label);
 			print $object->getNomUrl(0, '', 1);
 			$object->ref = $obj->rowid;
-		}
-		else
+		} else
 		{
 			//print $langs->trans('CronNone');
 		}
@@ -459,8 +512,7 @@ 
 			$texttoshow.=$langs->trans('CronMethod').': '. $obj->methodename;
 			$texttoshow.='<br>'.$langs->trans('CronArgs').': '. $obj->params;
 			$texttoshow.='<br>'.$langs->trans('Comment').': '. $langs->trans($obj->note);
-		}
-		elseif ($obj->jobtype=='command')
+		} elseif ($obj->jobtype=='command')
 		{
 			$text=$langs->trans('CronCommand');
 			$texttoshow=$langs->trans('CronCommand').': '.dol_trunc($obj->command);
@@ -471,10 +523,18 @@ 
 		print '</td>';
 
 		print '<td>';
-		if($obj->unitfrequency == "60") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Minutes');
-		if($obj->unitfrequency == "3600") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Hours');
-		if($obj->unitfrequency == "86400") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Days');
-		if($obj->unitfrequency == "604800") print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Weeks');
+		if($obj->unitfrequency == "60") {
+			print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Minutes');
+		}
+		if($obj->unitfrequency == "3600") {
+			print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Hours');
+		}
+		if($obj->unitfrequency == "86400") {
+			print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Days');
+		}
+		if($obj->unitfrequency == "604800") {
+			print $langs->trans('CronEach')." ".($obj->frequency)." ".$langs->trans('Weeks');
+		}
 		print '</td>';
 
 		print '<td class="center">';
@@ -527,15 +587,22 @@ 
 		}
 		if ($user->rights->cron->execute)
 		{
-		    if (!empty($obj->status)) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").'</a>';
-		    else print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'),"playdisabled").'</a>';
+		    if (!empty($obj->status)) {
+		    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute'.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").'</a>';
+		    } else {
+		    	print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'),"playdisabled").'</a>';
+		    }
 		} else {
 			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'),"playdisabled").'</a>';
 		}
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		if ($massactionbutton || $massaction) {
+			// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		{
 			$selected=0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+		}
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected=1;
+			}
 			print ' &nbsp; <input id="cb'.$obj->rowid.'" class="flat checkforselect valignmiddle" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 		}
 		print '</td>';
@@ -544,8 +611,7 @@ 
 
 		$i++;
 	}
-}
-else
+} else
 {
 	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }

htdocs/public/payment/newpayment.php

Spacing +402 added lines, -402 removed lines

@@ -27,13 +27,13 @@ 
  *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
  */
 
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define("NOLOGIN", 1); // This means this output page does not require to be logged.
+define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
@@ -46,9 +46,9 @@ 
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
-$langs->loadLangs(array("main","other","dict","bills","companies","errors","paybox"));     // File with generic data
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox")); // File with generic data
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 // Input are:
 // type ('invoice','order','contractline'),
@@ -57,26 +57,26 @@ 
 // tag (a free text, required if type is empty)
 // currency (iso code)
 
-$suffix=GETPOST("suffix",'aZ09');
-$amount=price2num(GETPOST("amount",'alpha'));
-if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
-else $currency=GETPOST("currency",'alpha');
-$source = GETPOST("s",'alpha')?GETPOST("s",'alpha'):GETPOST("source",'alpha');
-$download = GETPOST('d','int')?GETPOST('d','int'):GETPOST('download','int');
+$suffix = GETPOST("suffix", 'aZ09');
+$amount = price2num(GETPOST("amount", 'alpha'));
+if (!GETPOST("currency", 'alpha')) $currency = $conf->currency;
+else $currency = GETPOST("currency", 'alpha');
+$source = GETPOST("s", 'alpha') ?GETPOST("s", 'alpha') : GETPOST("source", 'alpha');
+$download = GETPOST('d', 'int') ?GETPOST('d', 'int') : GETPOST('download', 'int');
 
-if (! $action)
+if (!$action)
 {
-	if (! GETPOST("amount",'alpha') && ! $source)
+	if (!GETPOST("amount", 'alpha') && !$source)
 	{
 		print $langs->trans('ErrorBadParameters')." - amount or source";
 		exit;
 	}
-	if (is_numeric($amount) && ! GETPOST("tag",'alpha') && ! $source)
+	if (is_numeric($amount) && !GETPOST("tag", 'alpha') && !$source)
 	{
 		print $langs->trans('ErrorBadParameters')." - tag or source";
 		exit;
 	}
-	if ($source && ! GETPOST("ref",'alpha'))
+	if ($source && !GETPOST("ref", 'alpha'))
 	{
 		print $langs->trans('ErrorBadParameters')." - ref";
 		exit;
@@ -84,15 +84,15 @@ 
 }
 
 
-$paymentmethod='';
-$validpaymentmethod=array();
+$paymentmethod = '';
+$validpaymentmethod = array();
 
 // Detect $paymentmethod
-foreach($_POST as $key => $val)
+foreach ($_POST as $key => $val)
 {
 	if (preg_match('/^dopayment_(.*)$/', $key, $reg))
 	{
-		$paymentmethod=$reg[1];
+		$paymentmethod = $reg[1];
 		break;
 	}
 }
@@ -101,61 +101,61 @@ 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
-$urlok=$urlwithroot.'/public/payment/paymentok.php?';
-$urlko=$urlwithroot.'/public/payment/paymentko.php?';
+$urlok = $urlwithroot.'/public/payment/paymentok.php?';
+$urlko = $urlwithroot.'/public/payment/paymentko.php?';
 
 // Complete urls for post treatment
-$ref=$REF=GETPOST('ref','alpha');
-$TAG=GETPOST("tag",'alpha');
-$FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
-$SECUREKEY=GETPOST("securekey");	        // Secure key
-if ($paymentmethod && ! preg_match('/'.preg_quote('PM='.$paymentmethod,'/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
+$ref = $REF = GETPOST('ref', 'alpha');
+$TAG = GETPOST("tag", 'alpha');
+$FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more informations
+$SECUREKEY = GETPOST("securekey"); // Secure key
+if ($paymentmethod && !preg_match('/'.preg_quote('PM='.$paymentmethod, '/').'/', $FULLTAG)) $FULLTAG .= ($FULLTAG ? '.' : '').'PM='.$paymentmethod;
 
-if (! empty($suffix))
+if (!empty($suffix))
 {
-	$urlok.='suffix='.urlencode($suffix).'&';
-	$urlko.='suffix='.urlencode($suffix).'&';
+	$urlok .= 'suffix='.urlencode($suffix).'&';
+	$urlko .= 'suffix='.urlencode($suffix).'&';
 }
 if ($source)
 {
-	$urlok.='s='.urlencode($source).'&';
-	$urlko.='s='.urlencode($source).'&';
+	$urlok .= 's='.urlencode($source).'&';
+	$urlko .= 's='.urlencode($source).'&';
 }
-if (! empty($REF))
+if (!empty($REF))
 {
-	$urlok.='ref='.urlencode($REF).'&';
-	$urlko.='ref='.urlencode($REF).'&';
+	$urlok .= 'ref='.urlencode($REF).'&';
+	$urlko .= 'ref='.urlencode($REF).'&';
 }
-if (! empty($TAG))
+if (!empty($TAG))
 {
-	$urlok.='tag='.urlencode($TAG).'&';
-	$urlko.='tag='.urlencode($TAG).'&';
+	$urlok .= 'tag='.urlencode($TAG).'&';
+	$urlko .= 'tag='.urlencode($TAG).'&';
 }
-if (! empty($FULLTAG))
+if (!empty($FULLTAG))
 {
-	$urlok.='fulltag='.urlencode($FULLTAG).'&';
-	$urlko.='fulltag='.urlencode($FULLTAG).'&';
+	$urlok .= 'fulltag='.urlencode($FULLTAG).'&';
+	$urlko .= 'fulltag='.urlencode($FULLTAG).'&';
 }
-if (! empty($SECUREKEY))
+if (!empty($SECUREKEY))
 {
-	$urlok.='securekey='.urlencode($SECUREKEY).'&';
-	$urlko.='securekey='.urlencode($SECUREKEY).'&';
+	$urlok .= 'securekey='.urlencode($SECUREKEY).'&';
+	$urlko .= 'securekey='.urlencode($SECUREKEY).'&';
 }
-if (! empty($entity))
+if (!empty($entity))
 {
-	$urlok.='e='.urlencode($entity).'&';
-	$urlko.='e='.urlencode($entity).'&';
+	$urlok .= 'e='.urlencode($entity).'&';
+	$urlko .= 'e='.urlencode($entity).'&';
 }
-$urlok=preg_replace('/&$/','',$urlok);  // Remove last &
-$urlko=preg_replace('/&$/','',$urlko);  // Remove last &
+$urlok = preg_replace('/&$/', '', $urlok); // Remove last &
+$urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
 
 
 // Find valid payment methods
 
-if (! empty($conf->paypal->enabled))
+if (!empty($conf->paypal->enabled))
 {
 	$langs->load("paypal");
 
@@ -163,39 +163,39 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 
 	// Check parameters
-	$PAYPAL_API_OK="";
-	if ($urlok) $PAYPAL_API_OK=$urlok;
-	$PAYPAL_API_KO="";
-	if ($urlko) $PAYPAL_API_KO=$urlko;
+	$PAYPAL_API_OK = "";
+	if ($urlok) $PAYPAL_API_OK = $urlok;
+	$PAYPAL_API_KO = "";
+	if ($urlko) $PAYPAL_API_KO = $urlko;
 	if (empty($PAYPAL_API_USER))
 	{
-		dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
+		dol_print_error('', "Paypal setup param PAYPAL_API_USER not defined");
 		return -1;
 	}
 	if (empty($PAYPAL_API_PASSWORD))
 	{
-		dol_print_error('',"Paypal setup param PAYPAL_API_PASSWORD not defined");
+		dol_print_error('', "Paypal setup param PAYPAL_API_PASSWORD not defined");
 		return -1;
 	}
 	if (empty($PAYPAL_API_SIGNATURE))
 	{
-		dol_print_error('',"Paypal setup param PAYPAL_API_SIGNATURE not defined");
+		dol_print_error('', "Paypal setup param PAYPAL_API_SIGNATURE not defined");
 		return -1;
 	}
 
-	$validpaymentmethod['paypal']='valid';
+	$validpaymentmethod['paypal'] = 'valid';
 }
 
-if (! empty($conf->paybox->enabled))
+if (!empty($conf->paybox->enabled))
 {
 	$langs->load("paybox");
 
 	// TODO
 
-	$validpaymentmethod['paybox']='valid';
+	$validpaymentmethod['paybox'] = 'valid';
 }
 
-if (! empty($conf->stripe->enabled))
+if (!empty($conf->stripe->enabled))
 {
 	$langs->load("stripe");
 
@@ -207,18 +207,18 @@ 
 	require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 	*/
 
-	$validpaymentmethod['stripe']='valid';
+	$validpaymentmethod['stripe'] = 'valid';
 }
 
 
 
 // Check security token
-$valid=true;
-if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+$valid = true;
+if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 {
-	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $source . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
+		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 	}
 	else
@@ -227,11 +227,11 @@ 
 	}
 	if ($SECUREKEY != $token)
 	{
-		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) $valid=false;	// PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
+		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) $valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		else dol_syslog("Warning: PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is on", LOG_WARNING);
 	}
 
-	if (! $valid)
+	if (!$valid)
 	{
 		print '<div class="error">Bad value for key.</div>';
 		//print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
@@ -247,11 +247,11 @@ 
 }
 
 // Common variables
-$creditor=$mysoc->name;
-$paramcreditor='ONLINE_PAYMENT_CREDITOR';
-$paramcreditorlong='ONLINE_PAYMENT_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditorlong)) $creditor=$conf->global->$paramcreditorlong;
-else if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+$creditor = $mysoc->name;
+$paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
+$paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
+if (!empty($conf->global->$paramcreditorlong)) $creditor = $conf->global->$paramcreditorlong;
+else if (!empty($conf->global->$paramcreditor)) $creditor = $conf->global->$paramcreditor;
 
 
 
@@ -264,34 +264,34 @@ 
 {
 	if ($paymentmethod == 'paypal')
 	{
-		$PAYPAL_API_PRICE=price2num(GETPOST("newamount",'alpha'),'MT');
-		$PAYPAL_PAYMENT_TYPE='Sale';
-
-		$origfulltag=GETPOST("fulltag",'alpha');
-		$shipToName=GETPOST("shipToName",'alpha');
-		$shipToStreet=GETPOST("shipToStreet",'alpha');
-		$shipToCity=GETPOST("shipToCity",'alpha');
-		$shipToState=GETPOST("shipToState",'alpha');
-		$shipToCountryCode=GETPOST("shipToCountryCode",'alpha');
-		$shipToZip=GETPOST("shipToZip",'alpha');
-		$shipToStreet2=GETPOST("shipToStreet2",'alpha');
-		$phoneNum=GETPOST("phoneNum",'alpha');
-		$email=GETPOST("email",'alpha');
-		$desc=GETPOST("desc",'alpha');
-		$thirdparty_id=GETPOST('thirdparty_id', 'int');
-
-		$mesg='';
-		if (empty($PAYPAL_API_PRICE) || ! is_numeric($PAYPAL_API_PRICE))
+		$PAYPAL_API_PRICE = price2num(GETPOST("newamount", 'alpha'), 'MT');
+		$PAYPAL_PAYMENT_TYPE = 'Sale';
+
+		$origfulltag = GETPOST("fulltag", 'alpha');
+		$shipToName = GETPOST("shipToName", 'alpha');
+		$shipToStreet = GETPOST("shipToStreet", 'alpha');
+		$shipToCity = GETPOST("shipToCity", 'alpha');
+		$shipToState = GETPOST("shipToState", 'alpha');
+		$shipToCountryCode = GETPOST("shipToCountryCode", 'alpha');
+		$shipToZip = GETPOST("shipToZip", 'alpha');
+		$shipToStreet2 = GETPOST("shipToStreet2", 'alpha');
+		$phoneNum = GETPOST("phoneNum", 'alpha');
+		$email = GETPOST("email", 'alpha');
+		$desc = GETPOST("desc", 'alpha');
+		$thirdparty_id = GETPOST('thirdparty_id', 'int');
+
+		$mesg = '';
+		if (empty($PAYPAL_API_PRICE) || !is_numeric($PAYPAL_API_PRICE))
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-			$action='';
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
+			$action = '';
 		}
 		//elseif (empty($EMAIL))          $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
 		//elseif (! isValidEMail($EMAIL)) $mesg=$langs->trans("ErrorBadEMail",$EMAIL);
-		elseif (! $origfulltag)
+		elseif (!$origfulltag)
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-			$action='';
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
+			$action = '';
 		}
 
 		//var_dump($_POST);
@@ -300,15 +300,15 @@ 
 			dol_syslog("newpayment.php call paypal api and do redirect", LOG_DEBUG);
 
 			// Other
-			$PAYPAL_API_DEVISE="USD";
+			$PAYPAL_API_DEVISE = "USD";
 			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
 			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
-			if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+			if (!empty($currency)) $PAYPAL_API_DEVISE = $currency;
 
 			// Show var initialized by include fo paypal lib at begin of this file
 			dol_syslog("Submit Paypal form", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_USER: $PAYPAL_API_USER", LOG_DEBUG);
-			dol_syslog("PAYPAL_API_PASSWORD: ".preg_replace('/./', '*', $PAYPAL_API_PASSWORD), LOG_DEBUG);  // No password into log files
+			dol_syslog("PAYPAL_API_PASSWORD: ".preg_replace('/./', '*', $PAYPAL_API_PASSWORD), LOG_DEBUG); // No password into log files
 			dol_syslog("PAYPAL_API_SIGNATURE: $PAYPAL_API_SIGNATURE", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_SANDBOX: $PAYPAL_API_SANDBOX", LOG_DEBUG);
 			dol_syslog("PAYPAL_API_OK: $PAYPAL_API_OK", LOG_DEBUG);
@@ -327,13 +327,13 @@ 
 			dol_syslog("email: $email", LOG_DEBUG);
 			dol_syslog("desc: $desc", LOG_DEBUG);
 
-			dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG);	// If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
+			dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 			//$_SESSION["PaymentType"]=$PAYPAL_PAYMENT_TYPE;
 			//$_SESSION["currencyCodeType"]=$PAYPAL_API_DEVISE;
 			//$_SESSION["FinalPaymentAmt"]=$PAYPAL_API_PRICE;
 
 			// A redirect is added if API call successfull
-			$mesg = print_paypal_redirect($PAYPAL_API_PRICE,$PAYPAL_API_DEVISE,$PAYPAL_PAYMENT_TYPE,$PAYPAL_API_OK,$PAYPAL_API_KO, $FULLTAG);
+			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
 			$action = '';
@@ -342,23 +342,23 @@ 
 
 	if ($paymentmethod == 'paybox')
 	{
-		$PRICE=price2num(GETPOST("newamount"),'MT');
-		$email=GETPOST("email",'alpha');
-		$thirdparty_id=GETPOST('thirdparty_id', 'int');
+		$PRICE = price2num(GETPOST("newamount"), 'MT');
+		$email = GETPOST("email", 'alpha');
+		$thirdparty_id = GETPOST('thirdparty_id', 'int');
 
-		$origfulltag=GETPOST("fulltag",'alpha');
+		$origfulltag = GETPOST("fulltag", 'alpha');
 
 		// Securekey into back url useless for back url and we need an url lower than 150.
 		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
-		$mesg='';
-		if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-		elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-		elseif (! isValidEMail($email))   $mesg=$langs->trans("ErrorBadEMail",$email);
-		elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-		elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
-		elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
+		$mesg = '';
+		if (empty($PRICE) || !is_numeric($PRICE)) $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
+		elseif (empty($email))            $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("YourEMail"));
+		elseif (!isValidEMail($email))   $mesg = $langs->trans("ErrorBadEMail", $email);
+		elseif (!$origfulltag)           $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
+		elseif (dol_strlen($urlok) > 150) $mesg = 'Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
+		elseif (dol_strlen($urlko) > 150) $mesg = 'Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
 
 		if (empty($mesg))
 		{
@@ -374,7 +374,7 @@ 
 
 	if ($paymentmethod == 'stripe')
 	{
-		if (GETPOST('newamount','alpha')) $amount = price2num(GETPOST('newamount','alpha'),'MT');
+		if (GETPOST('newamount', 'alpha')) $amount = price2num(GETPOST('newamount', 'alpha'), 'MT');
 		else
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
@@ -385,22 +385,22 @@ 
 
 
 // Called when choosing Stripe mode, after the 'dopayment'
-if ($action == 'charge' && ! empty($conf->stripe->enabled))
+if ($action == 'charge' && !empty($conf->stripe->enabled))
 {
 	$amountstripe = $amount;
 
 	// Correct the amount according to unit of currency
 	// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
-	$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-	if (! in_array($currency, $arrayzerounitcurrency)) $amountstripe=$amountstripe * 100;
+	$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+	if (!in_array($currency, $arrayzerounitcurrency)) $amountstripe = $amountstripe * 100;
 
 	dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
 
-	$stripeToken = GETPOST("stripeToken",'alpha');
-	$email = GETPOST("email",'alpha');
-	$thirdparty_id=GETPOST('thirdparty_id', 'int');
-	$vatnumber = GETPOST('vatnumber','alpha');
+	$stripeToken = GETPOST("stripeToken", 'alpha');
+	$email = GETPOST("email", 'alpha');
+	$thirdparty_id = GETPOST('thirdparty_id', 'int');
+	$vatnumber = GETPOST('vatnumber', 'alpha');
 
 	dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
 	dol_syslog("email = ".$email, LOG_DEBUG, 0, '_stripe');
@@ -413,11 +413,11 @@ 
 		$metadata = array(
 			'dol_version'=>DOL_VERSION,
 			'dol_entity'=>$conf->entity,
-			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
+			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])
 		);
-		if (! empty($dol_id))        $metadata["dol_id"] = $dol_id;
-		if (! empty($dol_type))      $metadata["dol_type"] = $dol_type;
-		if (! empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
+		if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
+		if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
+		if (!empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
 
 		if ($thirdparty_id > 0)
 		{
@@ -425,12 +425,12 @@ 
 
 			$service = 'StripeTest';
 			$servicestatus = 0;
-			if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
+			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
 			{
 				$service = 'StripeLive';
 				$servicestatus = 1;
 			}
-			$stripeacc = null;	// No Oauth/connect use for public pages
+			$stripeacc = null; // No Oauth/connect use for public pages
 
 			$thirdparty = new Societe($db);
 			$thirdparty->fetch($thirdparty_id);
@@ -446,7 +446,7 @@ 
 				$error++;
 				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
 				setEventMessages('Failed to create card record', null, 'errors');
-				$action='';
+				$action = '';
 			}
 			else
 			{
@@ -454,9 +454,9 @@ 
 				$charge = \Stripe\Charge::create(array(
 					'amount'   => price2num($amountstripe, 'MU'),
 					'currency' => $currency,
-					'capture'  => true,							// Charge immediatly
+					'capture'  => true, // Charge immediatly
 					'description' => 'Stripe payment: '.$FULLTAG,
-					'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])),
+					'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])),
 					'customer' => $customer->id,
 					'source' => $card,
 					'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars that appears on bank receipt
@@ -467,7 +467,7 @@ 
 					$error++;
 					dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
 					setEventMessages('Failed to charge card', null, 'errors');
-					$action='';
+					$action = '';
 				}
 			}
 		}
@@ -476,9 +476,9 @@ 
 			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
 			$customer = \Stripe\Customer::create(array(
 				'email' => $email,
-				'description' => ($email?'Anonymous customer for '.$email:'Anonymous customer'),
+				'description' => ($email ? 'Anonymous customer for '.$email : 'Anonymous customer'),
 				'metadata' => $metadata,
-				'business_vat_id' => ($vatnumber?$vatnumber:null),
+				'business_vat_id' => ($vatnumber ? $vatnumber : null),
 				'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
 			));
 			// Return $customer = array('id'=>'cus_XXXX', ...)
@@ -490,9 +490,9 @@ 
 				'customer' => $customer->id,
 				'amount'   => price2num($amountstripe, 'MU'),
 				'currency' => $currency,
-				'capture'  => true,							// Charge immediatly
+				'capture'  => true, // Charge immediatly
 				'description' => 'Stripe payment: '.$FULLTAG,
-				'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])),
+				'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])),
 				'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars that appears on bank receipt
 			));
 			// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
@@ -501,72 +501,72 @@ 
 				$error++;
 				dol_syslog('Failed to charge card', LOG_WARNING, 0, '_stripe');
 				setEventMessages('Failed to charge card', null, 'errors');
-				$action='';
+				$action = '';
 			}
 		}
-	} catch(\Stripe\Error\Card $e) {
+	} catch (\Stripe\Error\Card $e) {
 		// Since it's a decline, \Stripe\Error\Card will be caught
 		$body = $e->getJsonBody();
 		$err  = $body['error'];
 
-		print('Status is:' . $e->getHttpStatus() . "\n");
-		print('Type is:' . $err['type'] . "\n");
-		print('Code is:' . $err['code'] . "\n");
+		print('Status is:'.$e->getHttpStatus()."\n");
+		print('Type is:'.$err['type']."\n");
+		print('Code is:'.$err['code']."\n");
 		// param is '' in this case
-		print('Param is:' . $err['param'] . "\n");
-		print('Message is:' . $err['message'] . "\n");
+		print('Param is:'.$err['param']."\n");
+		print('Message is:'.$err['message']."\n");
 
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (\Stripe\Error\RateLimit $e) {
 		// Too many requests made to the API too quickly
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (\Stripe\Error\InvalidRequest $e) {
 		// Invalid parameters were supplied to Stripe's API
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (\Stripe\Error\Authentication $e) {
 		// Authentication with Stripe's API failed
 		// (maybe you changed API keys recently)
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (\Stripe\Error\ApiConnection $e) {
 		// Network communication with Stripe failed
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (\Stripe\Error\Base $e) {
 		// Display a very generic error to the user, and maybe send
 		// yourself an email
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	} catch (Exception $e) {
 		// Something else happened, completely unrelated to Stripe
 		$error++;
 		dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
 		setEventMessages($e->getMessage(), null, 'errors');
-		$action='';
+		$action = '';
 	}
 
 	$_SESSION["onlinetoken"] = $stripeToken;
 	$_SESSION["FinalPaymentAmt"] = $amount;
 	$_SESSION["currencyCodeType"] = $currency;
 	$_SESSION["paymentType"] = '';
-	$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];  // Payer ip
-	$_SESSION['payerID'] = is_object($customer)?$customer->id:'';
-	$_SESSION['TRANSACTIONID'] = is_object($charge)?$charge->id:'';
+	$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
+	$_SESSION['payerID'] = is_object($customer) ? $customer->id : '';
+	$_SESSION['TRANSACTIONID'] = is_object($charge) ? $charge->id : '';
 
 	dol_syslog("Action charge stripe result=".$error." ip=".$_SESSION['ipaddress'], LOG_DEBUG, 0, '_stripe');
 	dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
@@ -591,11 +591,11 @@ 
  * View
  */
 
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
 
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
 
 llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
 
@@ -611,13 +611,13 @@ 
 
 
 // Show sandbox warning
-if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')))		// We can force sand box with param 'forcesandbox'
+if (!empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha')))		// We can force sand box with param 'forcesandbox'
 {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
 }
-if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
+if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
 {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
 
@@ -626,25 +626,25 @@ 
 print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 print '<input type="hidden" name="action" value="dopayment">'."\n";
-print '<input type="hidden" name="tag" value="'.GETPOST("tag",'alpha').'">'."\n";
-print '<input type="hidden" name="suffix" value="'.GETPOST("suffix",'alpha').'">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'">'."\n";
 print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
 print '<input type="hidden" name="e" value="'.$entity.'" />';
-print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox','alpha').'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'alpha').'" />';
 print "\n";
 print '<!-- Form to send a payment -->'."\n";
 print '<!-- creditor = '.$creditor.' -->'."\n";
 // Additionnal information for each payment system
-if (! empty($conf->paypal->enabled))
+if (!empty($conf->paypal->enabled))
 {
 	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
 	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
 }
-if (! empty($conf->paybox->enabled))
+if (!empty($conf->paybox->enabled))
 {
 
 }
-if (! empty($conf->stripe->enabled))
+if (!empty($conf->stripe->enabled))
 {
 	print '<!-- STRIPE_LIVE = '.$conf->global->STRIPE_LIVE.' -->'."\n";
 }
@@ -655,25 +655,25 @@ 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
 // Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width=0;
+$width = 0;
 // Define logo and logosmall
-$logosmall=$mysoc->logo_small;
-$logo=$mysoc->logo;
-$paramlogo='ONLINE_PAYMENT_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall=$conf->global->ONLINE_PAYMENT_LOGO;
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) $logosmall = $conf->global->$paramlogo;
+else if (!empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
-$urllogo='';
-if (! empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+$urllogo = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
-	$width=150;
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
+	$width = 150;
 }
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
-	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
-	$width=150;
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
+	$width = 150;
 }
 // Output html code for logo
 if ($urllogo)
@@ -686,18 +686,18 @@ 
 }
 
 // Output introduction text
-$text='';
-if (! empty($conf->global->PAYMENT_NEWFORM_TEXT))
+$text = '';
+if (!empty($conf->global->PAYMENT_NEWFORM_TEXT))
 {
 	$langs->load("members");
-	if (preg_match('/^\((.*)\)$/',$conf->global->PAYMENT_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-	else $text.=$conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
-	$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
+	else $text .= $conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
+	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
 {
-	$text.='<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong></td></tr>'."\n";
-	$text.='<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToPay",$creditor).'<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnPaymentPage").'</strong></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToPay", $creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -706,34 +706,34 @@ 
 print '<table with="100%" id="tablepublicpayment">';
 print '<tr><td align="left" colspan="2" class="opacitymedium">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
 
-$found=false;
-$error=0;
-$var=false;
+$found = false;
+$error = 0;
+$var = false;
 
 $object = null;
 
 
 // Free payment
-if (! $source)
+if (!$source)
 {
-	$found=true;
-	$tag=GETPOST("tag");
-	$fulltag=$tag;
+	$found = true;
+	$tag = GETPOST("tag");
+	$fulltag = $tag;
 
 	// Creditor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	if (empty($amount) || !is_numeric($amount))
 	{
-		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -746,8 +746,8 @@ 
 	print '</td></tr>'."\n";
 
 	// Tag
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -760,71 +760,71 @@ 
 // Payment on customer order
 if ($source == 'order')
 {
-	$found=true;
+	$found = true;
 	$langs->load("orders");
 
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-	$order=new Commande($db);
-	$result=$order->fetch('',$ref);
+	$order = new Commande($db);
+	$result = $order->fetch('', $ref);
 	if ($result <= 0)
 	{
-		$mesg=$order->error;
+		$mesg = $order->error;
 		$error++;
 	}
 	else
 	{
-		$result=$order->fetch_thirdparty($order->socid);
+		$result = $order->fetch_thirdparty($order->socid);
 
 		$object = $order;
 	}
 
 	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
 	{
-		$amount=$order->total_ttc;
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-		$amount=price2num($amount);
+		$amount = $order->total_ttc;
+		if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+		$amount = price2num($amount);
 	}
 
-	$fulltag='ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
+	$fulltag = 'ORD='.$order->ref.'.CUS='.$order->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($order->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
+	if (!empty($TAG)) { $tag = $TAG; $fulltag .= '.TAG='.$TAG; }
+	$fulltag = dol_string_unaccent($fulltag);
 
 	// Creditor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	$text = '<b>'.$langs->trans("PaymentOrderRef", $order->ref).'</b>';
+	if (GETPOST('desc', 'alpha')) $text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($order->ref).'">';
 	$directdownloadlink = $order->getLastMainDocLink('commande');
 	if ($directdownloadlink)
 	{
 		print '<br><a href="'.$directdownloadlink.'">';
-		print img_mime($order->last_main_doc,'');
+		print img_mime($order->last_main_doc, '');
 		print $langs->trans("DownloadDocument").'</a>';
 	}
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	if (empty($amount) || !is_numeric($amount))
 	{
-		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -837,21 +837,21 @@ 
 	print '</td></tr>'."\n";
 
 	// Tag
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
 
 	// Shipping address
-	$shipToName=$order->thirdparty->name;
-	$shipToStreet=$order->thirdparty->address;
-	$shipToCity=$order->thirdparty->town;
-	$shipToState=$order->thirdparty->state_code;
-	$shipToCountryCode=$order->thirdparty->country_code;
-	$shipToZip=$order->thirdparty->zip;
-	$shipToStreet2='';
-	$phoneNum=$order->thirdparty->phone;
+	$shipToName = $order->thirdparty->name;
+	$shipToStreet = $order->thirdparty->address;
+	$shipToCity = $order->thirdparty->town;
+	$shipToState = $order->thirdparty->state_code;
+	$shipToCountryCode = $order->thirdparty->country_code;
+	$shipToZip = $order->thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $order->thirdparty->phone;
 	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
 	{
 		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
@@ -870,8 +870,8 @@ 
 	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
 	print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$order->thirdparty->tva_intra.'">'."\n";
-	$labeldesc=$langs->trans("Order").' '.$order->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	$labeldesc = $langs->trans("Order").' '.$order->ref;
+	if (GETPOST('desc', 'alpha')) $labeldesc = GETPOST('desc', 'alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
@@ -879,73 +879,73 @@ 
 // Payment on customer invoice
 if ($source == 'invoice')
 {
-	$found=true;
+	$found = true;
 	$langs->load("bills");
 
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-	$invoice=new Facture($db);
-	$result=$invoice->fetch('',$ref);
+	$invoice = new Facture($db);
+	$result = $invoice->fetch('', $ref);
 	if ($result <= 0)
 	{
-		$mesg=$invoice->error;
+		$mesg = $invoice->error;
 		$error++;
 	}
 	else
 	{
-		$result=$invoice->fetch_thirdparty($invoice->socid);
+		$result = $invoice->fetch_thirdparty($invoice->socid);
 
 		$object = $invoice;
 	}
 
 	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
 	{
-		$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-		$amount=price2num($amount);
+		$amount = price2num($invoice->total_ttc - $invoice->getSommePaiement());
+		if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+		$amount = price2num($amount);
 	}
 
-	$fulltag='INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
+	$fulltag = 'INV='.$invoice->ref.'.CUS='.$invoice->thirdparty->id;
 	//$fulltag.='.NAM='.strtr($invoice->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
+	if (!empty($TAG)) { $tag = $TAG; $fulltag .= '.TAG='.$TAG; }
+	$fulltag = dol_string_unaccent($fulltag);
 
 	// Creditor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.dol_escape_htmltag($creditor).'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	$text = '<b>'.$langs->trans("PaymentInvoiceRef", $invoice->ref).'</b>';
+	if (GETPOST('desc', 'alpha')) $text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->ref).'">';
 	$directdownloadlink = $invoice->getLastMainDocLink('facture');
 	if ($directdownloadlink)
 	{
 		print '<br><a href="'.$directdownloadlink.'">';
-		print img_mime($invoice->last_main_doc,'');
+		print img_mime($invoice->last_main_doc, '');
 		print $langs->trans("DownloadDocument").'</a>';
 	}
 	print '</td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentAmount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentAmount");
 	if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
 	if (empty($object->paye))
 	{
-		if (empty($amount) || ! is_numeric($amount))
+		if (empty($amount) || !is_numeric($amount))
 		{
-			print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"), 'MT').'">';
+			print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
+			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
 		}
 		else {
 			print '<b>'.price($amount).'</b>';
@@ -963,8 +963,8 @@ 
 	print '</td></tr>'."\n";
 
 	// Tag
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
@@ -972,21 +972,21 @@ 
 	// Add download link
 	if ($download > 0)
 	{
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Document");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">';
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Document");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
 		print $invoice->getDirectExternalLink(1);
 		print '</td></tr>'."\n";
 	}
 
 	// Shipping address
-	$shipToName=$invoice->thirdparty->name;
-	$shipToStreet=$invoice->thirdparty->address;
-	$shipToCity=$invoice->thirdparty->town;
-	$shipToState=$invoice->thirdparty->state_code;
-	$shipToCountryCode=$invoice->thirdparty->country_code;
-	$shipToZip=$invoice->thirdparty->zip;
-	$shipToStreet2='';
-	$phoneNum=$invoice->thirdparty->phone;
+	$shipToName = $invoice->thirdparty->name;
+	$shipToStreet = $invoice->thirdparty->address;
+	$shipToCity = $invoice->thirdparty->town;
+	$shipToState = $invoice->thirdparty->state_code;
+	$shipToCountryCode = $invoice->thirdparty->country_code;
+	$shipToZip = $invoice->thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $invoice->thirdparty->phone;
 	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
 	{
 		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
@@ -1005,26 +1005,26 @@ 
 	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
 	print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$invoice->thirdparty->tva_intra.'">'."\n";
-	$labeldesc=$langs->trans("Invoice").' '.$invoice->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	$labeldesc = $langs->trans("Invoice").' '.$invoice->ref;
+	if (GETPOST('desc', 'alpha')) $labeldesc = GETPOST('desc', 'alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
 // Payment on contract line
 if ($source == 'contractline')
 {
-	$found=true;
+	$found = true;
 	$langs->load("contracts");
 
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
-	$contract=new Contrat($db);
-	$contractline=new ContratLigne($db);
+	$contract = new Contrat($db);
+	$contractline = new ContratLigne($db);
 
-	$result=$contractline->fetch('',$ref);
+	$result = $contractline->fetch('', $ref);
 	if ($result <= 0)
 	{
-		$mesg=$contractline->error;
+		$mesg = $contractline->error;
 		$error++;
 	}
 	else
@@ -1033,35 +1033,35 @@ 
 		{
 			$object = $contractline;
 
-			$result=$contract->fetch($contractline->fk_contrat);
+			$result = $contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
-				$result=$contract->fetch_thirdparty($contract->socid);
+				$result = $contract->fetch_thirdparty($contract->socid);
 			}
 			else
 			{
-				$mesg=$contract->error;
+				$mesg = $contract->error;
 				$error++;
 			}
 		}
 		else
 		{
-			$mesg='ErrorRecordNotFound';
+			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
 	}
 
 	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
 	{
-		$amount=$contractline->total_ttc;
+		$amount = $contractline->total_ttc;
 
-		if ($contractline->fk_product && ! empty($conf->global->PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES))
+		if ($contractline->fk_product && !empty($conf->global->PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES))
 		{
-			$product=new Product($db);
-			$result=$product->fetch($contractline->fk_product);
+			$product = new Product($db);
+			$result = $product->fetch($contractline->fk_product);
 
 			// We define price for product (TODO Put this in a method in product class)
-			if (! empty($conf->global->PRODUIT_MULTIPRICES))
+			if (!empty($conf->global->PRODUIT_MULTIPRICES))
 			{
 				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
@@ -1074,100 +1074,100 @@ 
 				$price_base_type = $product->price_base_type;
 			}
 
-			$amount=$pu_ttc;
+			$amount = $pu_ttc;
 			if (empty($amount))
 			{
-				dol_print_error('','ErrorNoPriceDefinedForThisProduct');
+				dol_print_error('', 'ErrorNoPriceDefinedForThisProduct');
 				exit;
 			}
 		}
 
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-		$amount=price2num($amount);
+		if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+		$amount = price2num($amount);
 	}
 
-	$fulltag='COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
+	$fulltag = 'COL='.$contractline->ref.'.CON='.$contract->ref.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M');
 	//$fulltag.='.NAM='.strtr($contract->thirdparty->name,"-"," ");
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
+	if (!empty($TAG)) { $tag = $TAG; $fulltag .= '.TAG='.$TAG; }
+	$fulltag = dol_string_unaccent($fulltag);
 
-	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
+	$qty = 1;
+	if (GETPOST('qty')) $qty = GETPOST('qty');
 
 	// Creditor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
+	$text = '<b>'.$langs->trans("PaymentRenewContractId", $contract->ref, $contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
-		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
+		$text .= '<br>'.$product->ref.($product->label ? ' - '.$product->label : '');
 	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	if ($contractline->description) $text .= '<br>'.dol_htmlentitiesbr($contractline->description);
 	//if ($contractline->date_fin_validite) {
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dol_print_date($contractline->date_fin_validite);
 	//}
 	if ($contractline->date_fin_validite)
 	{
-		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
+		$text .= '<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
 	}
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	if (GETPOST('desc', 'alpha')) $text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($contractline->ref).'">';
 	$directdownloadlink = $contract->getLastMainDocLink('contract');
 	if ($directdownloadlink)
 	{
 		print '<br><a href="'.$directdownloadlink.'">';
-		print img_mime($contract->last_main_doc,'');
+		print img_mime($contract->last_main_doc, '');
 		print $langs->trans("DownloadDocument").'</a>';
 	}
 	print '</td></tr>'."\n";
 
 	// Quantity
-	$label=$langs->trans("Quantity");
-	$qty=1;
-	$duration='';
+	$label = $langs->trans("Quantity");
+	$qty = 1;
+	$duration = '';
 	if ($contractline->fk_product)
 	{
 		if ($product->isService() && $product->duration_value > 0)
 		{
-			$label=$langs->trans("Duration");
+			$label = $langs->trans("Duration");
 
 			// TODO Put this in a global method
 			if ($product->duration_value > 1)
 			{
-				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
+				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
 			}
 			else
 			{
-				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
+				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
-			$duration=$product->duration_value.' '.$dur[$product->duration_unit];
+			$duration = $product->duration_value.' '.$dur[$product->duration_unit];
 		}
 	}
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$label.'</td>';
-	print '<td class="CTableRow'.($var?'1':'2').'"><b>'.($duration?$duration:$qty).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$label.'</td>';
+	print '<td class="CTableRow'.($var ? '1' : '2').'"><b>'.($duration ? $duration : $qty).'</b>';
 	print '<input type="hidden" name="newqty" value="'.dol_escape_htmltag($qty).'">';
 	print '</b></td></tr>'."\n";
 
 	// Amount
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	if (empty($amount) || !is_numeric($amount))
 	{
-		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
-		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
+		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
 	}
 	else {
 		print '<b>'.price($amount).'</b>';
@@ -1180,21 +1180,21 @@ 
 	print '</td></tr>'."\n";
 
 	// Tag
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
 
 	// Shipping address
-	$shipToName=$contract->thirdparty->name;
-	$shipToStreet=$contract->thirdparty->address;
-	$shipToCity=$contract->thirdparty->town;
-	$shipToState=$contract->thirdparty->state_code;
-	$shipToCountryCode=$contract->thirdparty->country_code;
-	$shipToZip=$contract->thirdparty->zip;
-	$shipToStreet2='';
-	$phoneNum=$contract->thirdparty->phone;
+	$shipToName = $contract->thirdparty->name;
+	$shipToStreet = $contract->thirdparty->address;
+	$shipToCity = $contract->thirdparty->town;
+	$shipToState = $contract->thirdparty->state_code;
+	$shipToCountryCode = $contract->thirdparty->country_code;
+	$shipToZip = $contract->thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $contract->thirdparty->phone;
 	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
 	{
 		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
@@ -1213,66 +1213,66 @@ 
 	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
 	print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$contract->thirdparty->tva_intra.'">'."\n";
-	$labeldesc=$langs->trans("Contract").' '.$contract->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	$labeldesc = $langs->trans("Contract").' '.$contract->ref;
+	if (GETPOST('desc', 'alpha')) $labeldesc = GETPOST('desc', 'alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
 // Payment on member subscription
 if ($source == 'membersubscription')
 {
-	$found=true;
+	$found = true;
 	$langs->load("members");
 
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-	$member=new Adherent($db);
-	$result=$member->fetch('',$ref);
+	$member = new Adherent($db);
+	$result = $member->fetch('', $ref);
 	if ($result <= 0)
 	{
-		$mesg=$member->error;
+		$mesg = $member->error;
 		$error++;
 	}
 	else
 	{
 		$member->fetch_thirdparty();
 		$object = $member;
-		$subscription=new Subscription($db);
+		$subscription = new Subscription($db);
 	}
 
 	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
 	{
-		$amount=$subscription->total_ttc;
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
-		$amount=price2num($amount);
+		$amount = $subscription->total_ttc;
+		if (GETPOST("amount", 'int')) $amount = GETPOST("amount", 'int');
+		$amount = price2num($amount);
 	}
 
-	$fulltag='MEM='.$member->id.'.DAT='.dol_print_date(dol_now(),'%Y%m%d%H%M');
-	if (! empty($TAG)) { $tag=$TAG; $fulltag.='.TAG='.$TAG; }
-	$fulltag=dol_string_unaccent($fulltag);
+	$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M');
+	if (!empty($TAG)) { $tag = $TAG; $fulltag .= '.TAG='.$TAG; }
+	$fulltag = dol_string_unaccent($fulltag);
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	if ($member->morphy == 'mor' && !empty($member->societe)) print $member->societe;
 	else print $member->getFullName($langs);
 	print '</b>';
 
 	// Object
 
-	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
+	$text = '<b>'.$langs->trans("PaymentSubscription").'</b>';
+	if (GETPOST('desc', 'alpha')) $text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
 	print '</td></tr>'."\n";
@@ -1281,58 +1281,58 @@ 
 	{
 		// Last subscription date
 
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionDate");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.dol_print_date($member->last_subscription_date,'day');
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionDate");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.dol_print_date($member->last_subscription_date, 'day');
 		print '</td></tr>'."\n";
 
 		// Last subscription amount
 
-		print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("LastSubscriptionAmount");
-		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
+		print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("LastSubscriptionAmount");
+		print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount','alpha')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && !GETPOST('newamount', 'alpha')) $_GET['newamount'] = $member->last_subscription_amount;
 	}
 
 	// Amount
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
 		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
 		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) print ')';
 	}
-	print '</td><td class="CTableRow'.($var?'1':'2').'">';
-	$valtoshow='';
-	if (empty($amount) || ! is_numeric($amount))
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	$valtoshow = '';
+	if (empty($amount) || !is_numeric($amount))
 	{
-		$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
+		$valtoshow = price2num(GETPOST("newamount", 'alpha'), 'MT');
 		// force default subscription amount to value defined into constant...
 		if (empty($valtoshow))
 		{
-			if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+			if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
+				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
 			}
 			else {
-				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
 			}
 		}
 	}
-	if (empty($amount) || ! is_numeric($amount))
+	if (empty($amount) || !is_numeric($amount))
 	{
 		//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
-		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
-		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
+		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
+		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
 	}
 	else {
-		$valtoshow=$amount;
-		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		$valtoshow = $amount;
+		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
 		print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@@ -1344,21 +1344,21 @@ 
 
 	// Tag
 
-	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
-	print '</td><td class="CTableRow'.($var?'1':'2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
 	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
 	print '</td></tr>'."\n";
 
 	// Shipping address
-	$shipToName=$member->getFullName($langs);
-	$shipToStreet=$member->address;
-	$shipToCity=$member->town;
-	$shipToState=$member->state_code;
-	$shipToCountryCode=$member->country_code;
-	$shipToZip=$member->zip;
-	$shipToStreet2='';
-	$phoneNum=$member->phone;
+	$shipToName = $member->getFullName($langs);
+	$shipToStreet = $member->address;
+	$shipToCity = $member->town;
+	$shipToState = $member->state_code;
+	$shipToCountryCode = $member->country_code;
+	$shipToZip = $member->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $member->phone;
 	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
 	{
 		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
@@ -1377,14 +1377,14 @@ 
 	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
 	print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
 	$labeldesc = $langs->trans("PaymentSubscription");
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	if (GETPOST('desc', 'alpha')) $labeldesc = GETPOST('desc', 'alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
 
 
 
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters");
 
 if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
 
@@ -1393,7 +1393,7 @@ 
 
 if ($action != 'dopayment')
 {
-	if ($found && ! $error)	// We are in a management option and no error
+	if ($found && !$error)	// We are in a management option and no error
 	{
 		if ($source == 'invoice' && $object->paye)
 		{
@@ -1403,21 +1403,21 @@ 
 		{
 			// Buttons for all payments registration methods
 
-			if (! empty($conf->paybox->enabled))
+			if (!empty($conf->paybox->enabled))
 			{
 				// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of paybox
-				print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->PAYBOX_PICTO_FOR_PAYMENT)?'paybox':$conf->global->PAYBOX_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
+				print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->PAYBOX_PICTO_FOR_PAYMENT) ? 'paybox' : $conf->global->PAYBOX_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment_paybox" value="'.$langs->trans("PayBoxDoPayment").'">';
 			}
 
-			if (! empty($conf->stripe->enabled))
+			if (!empty($conf->stripe->enabled))
 			{
 				// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe
-				print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->STRIPE_PICTO_FOR_PAYMENT)?'stripe':$conf->global->STRIPE_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
+				print '<br><input class="button buttonpayment buttonpayment'.(empty($conf->global->STRIPE_PICTO_FOR_PAYMENT) ? 'stripe' : $conf->global->STRIPE_PICTO_FOR_PAYMENT).'" type="submit" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
 			}
 
-			if (! empty($conf->paypal->enabled))
+			if (!empty($conf->paypal->enabled))
 			{
-				if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+				if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 
 				if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
 				{
@@ -1451,11 +1451,11 @@ 
 
 
 // Add more content on page for some services
-if (preg_match('/^dopayment/',$action))
+if (preg_match('/^dopayment/', $action))
 {
 
 	// Strip
-	if (GETPOST('dopayment_stripe','alpha'))
+	if (GETPOST('dopayment_stripe', 'alpha'))
 	{
 		// Simple checkout
 		/*
@@ -1514,9 +1514,9 @@ 
 		print '<input type="hidden" name="e" value="'.$entity.'" />';
 		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
 		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox','alpha').'" />';
-		print '<input type="hidden" name="email" value="'.GETPOST('email','alpha').'" />';
-		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id','int').'" />';
+		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'alpha').'" />';
+		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
+		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
 
 		print '
 	    <table id="dolpaymenttable" summary="Payment form" class="center">
@@ -1628,7 +1628,7 @@ 
 }
 
 
-htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix,$object);
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');
 

Braces +226 added lines, -124 removed lines

@@ -34,7 +34,9 @@ 
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 // TODO This should be useless. Because entity must be retreive from object ref and not from url.
 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -59,8 +61,11 @@ 
 
 $suffix=GETPOST("suffix",'aZ09');
 $amount=price2num(GETPOST("amount",'alpha'));
-if (! GETPOST("currency",'alpha')) $currency=$conf->currency;
-else $currency=GETPOST("currency",'alpha');
+if (! GETPOST("currency",'alpha')) {
+	$currency=$conf->currency;
+} else {
+	$currency=GETPOST("currency",'alpha');
+}
 $source = GETPOST("s",'alpha')?GETPOST("s",'alpha'):GETPOST("source",'alpha');
 $download = GETPOST('d','int')?GETPOST('d','int'):GETPOST('download','int');
 
@@ -111,7 +116,9 @@ 
 $TAG=GETPOST("tag",'alpha');
 $FULLTAG=GETPOST("fulltag",'alpha');		// fulltag is tag with more informations
 $SECUREKEY=GETPOST("securekey");	        // Secure key
-if ($paymentmethod && ! preg_match('/'.preg_quote('PM='.$paymentmethod,'/').'/', $FULLTAG)) $FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
+if ($paymentmethod && ! preg_match('/'.preg_quote('PM='.$paymentmethod,'/').'/', $FULLTAG)) {
+	$FULLTAG.=($FULLTAG?'.':'').'PM='.$paymentmethod;
+}
 
 if (! empty($suffix))
 {
@@ -164,9 +171,13 @@ 
 
 	// Check parameters
 	$PAYPAL_API_OK="";
-	if ($urlok) $PAYPAL_API_OK=$urlok;
+	if ($urlok) {
+		$PAYPAL_API_OK=$urlok;
+	}
 	$PAYPAL_API_KO="";
-	if ($urlko) $PAYPAL_API_KO=$urlko;
+	if ($urlko) {
+		$PAYPAL_API_KO=$urlko;
+	}
 	if (empty($PAYPAL_API_USER))
 	{
 		dol_print_error('',"Paypal setup param PAYPAL_API_USER not defined");
@@ -218,17 +229,26 @@ 
 {
 	if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 	{
-		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $source . $REF, 2);    // Use the source in the hash to avoid duplicates if the references are identical
-		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-	}
-	else
+		if ($source && $REF) {
+			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $source . $REF, 2);
+		}
+		// Use the source in the hash to avoid duplicates if the references are identical
+		else {
+			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+		}
+	} else
 	{
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
 	if ($SECUREKEY != $token)
 	{
-		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) $valid=false;	// PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
-		else dol_syslog("Warning: PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is on", LOG_WARNING);
+		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+			$valid=false;
+		}
+		// PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
+		else {
+			dol_syslog("Warning: PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is on", LOG_WARNING);
+		}
 	}
 
 	if (! $valid)
@@ -250,8 +270,11 @@ 
 $creditor=$mysoc->name;
 $paramcreditor='ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong='ONLINE_PAYMENT_CREDITOR_'.$suffix;
-if (! empty($conf->global->$paramcreditorlong)) $creditor=$conf->global->$paramcreditorlong;
-else if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
+if (! empty($conf->global->$paramcreditorlong)) {
+	$creditor=$conf->global->$paramcreditorlong;
+} else if (! empty($conf->global->$paramcreditor)) {
+	$creditor=$conf->global->$paramcreditor;
+}
 
 
 
@@ -303,7 +326,9 @@ 
 			$PAYPAL_API_DEVISE="USD";
 			//if ($currency == 'EUR') $PAYPAL_API_DEVISE="EUR";
 			//if ($currency == 'USD') $PAYPAL_API_DEVISE="USD";
-			if (! empty($currency)) $PAYPAL_API_DEVISE=$currency;
+			if (! empty($currency)) {
+				$PAYPAL_API_DEVISE=$currency;
+			}
 
 			// Show var initialized by include fo paypal lib at begin of this file
 			dol_syslog("Submit Paypal form", LOG_DEBUG);
@@ -353,12 +378,19 @@ 
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		$mesg='';
-		if (empty($PRICE) || ! is_numeric($PRICE)) $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
-		elseif (empty($email))            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
-		elseif (! isValidEMail($email))   $mesg=$langs->trans("ErrorBadEMail",$email);
-		elseif (! $origfulltag)           $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
-		elseif (dol_strlen($urlok) > 150) $mesg='Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
-		elseif (dol_strlen($urlko) > 150) $mesg='Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
+		if (empty($PRICE) || ! is_numeric($PRICE)) {
+			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount"));
+		} elseif (empty($email)) {
+			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("YourEMail"));
+		} elseif (! isValidEMail($email)) {
+			$mesg=$langs->trans("ErrorBadEMail",$email);
+		} elseif (! $origfulltag) {
+			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentCode"));
+		} elseif (dol_strlen($urlok) > 150) {
+			$mesg='Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
+		} elseif (dol_strlen($urlko) > 150) {
+			$mesg='Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
+		}
 
 		if (empty($mesg))
 		{
@@ -374,8 +406,9 @@ 
 
 	if ($paymentmethod == 'stripe')
 	{
-		if (GETPOST('newamount','alpha')) $amount = price2num(GETPOST('newamount','alpha'),'MT');
-		else
+		if (GETPOST('newamount','alpha')) {
+			$amount = price2num(GETPOST('newamount','alpha'),'MT');
+		} else
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$action = '';
@@ -392,7 +425,9 @@ 
 	// Correct the amount according to unit of currency
 	// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
 	$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-	if (! in_array($currency, $arrayzerounitcurrency)) $amountstripe=$amountstripe * 100;
+	if (! in_array($currency, $arrayzerounitcurrency)) {
+		$amountstripe=$amountstripe * 100;
+	}
 
 	dol_syslog("POST keys  : ".join(',', array_keys($_POST)), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST values: ".join(',', $_POST), LOG_DEBUG, 0, '_stripe');
@@ -415,9 +450,15 @@ 
 			'dol_entity'=>$conf->entity,
 			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
 		);
-		if (! empty($dol_id))        $metadata["dol_id"] = $dol_id;
-		if (! empty($dol_type))      $metadata["dol_type"] = $dol_type;
-		if (! empty($thirdparty_id)) $metadata["dol_thirdparty_id"] = $thirdparty_id;
+		if (! empty($dol_id)) {
+			$metadata["dol_id"] = $dol_id;
+		}
+		if (! empty($dol_type)) {
+			$metadata["dol_type"] = $dol_type;
+		}
+		if (! empty($thirdparty_id)) {
+			$metadata["dol_thirdparty_id"] = $thirdparty_id;
+		}
 
 		if ($thirdparty_id > 0)
 		{
@@ -447,8 +488,7 @@ 
 				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
 				setEventMessages('Failed to create card record', null, 'errors');
 				$action='';
-			}
-			else
+			} else
 			{
 				dol_syslog("Create charge on card ".$card->id, LOG_DEBUG, 0, '_stripe');
 				$charge = \Stripe\Charge::create(array(
@@ -470,8 +510,7 @@ 
 					$action='';
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog("Create anonymous customer card profile", LOG_DEBUG, 0, '_stripe');
 			$customer = \Stripe\Customer::create(array(
@@ -577,8 +616,7 @@ 
 	{
 		header("Location: ".$urlko);
 		exit;
-	}
-	else
+	} else
 	{
 		header("Location: ".$urlok);
 		exit;
@@ -592,7 +630,9 @@ 
  */
 
 $head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
 
 $conf->dol_hide_topmenu=1;
 $conf->dol_hide_leftmenu=1;
@@ -611,10 +651,12 @@ 
 
 
 // Show sandbox warning
-if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')))		// We can force sand box with param 'forcesandbox'
+if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))) {
+	// We can force sand box with param 'forcesandbox'
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
 }
+}
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
@@ -660,8 +702,11 @@ 
 $logosmall=$mysoc->logo_small;
 $logo=$mysoc->logo;
 $paramlogo='ONLINE_PAYMENT_LOGO_'.$suffix;
-if (! empty($conf->global->$paramlogo)) $logosmall=$conf->global->$paramlogo;
-else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall=$conf->global->ONLINE_PAYMENT_LOGO;
+if (! empty($conf->global->$paramlogo)) {
+	$logosmall=$conf->global->$paramlogo;
+} else if (! empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall=$conf->global->ONLINE_PAYMENT_LOGO;
+}
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
 $urllogo='';
@@ -669,8 +714,7 @@ 
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('thumbs/'.$logosmall);
 	$width=150;
-}
-elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo=DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode($logo);
 	$width=150;
@@ -680,7 +724,9 @@ 
 {
 	print '<tr>';
 	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
+	if ($width) {
+		print ' width="'.$width.'"';
+	}
 	print '></td>';
 	print '</tr>'."\n";
 }
@@ -690,8 +736,11 @@ 
 if (! empty($conf->global->PAYMENT_NEWFORM_TEXT))
 {
 	$langs->load("members");
-	if (preg_match('/^\((.*)\)$/',$conf->global->PAYMENT_NEWFORM_TEXT,$reg)) $text.=$langs->trans($reg[1])."<br>\n";
-	else $text.=$conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
+	if (preg_match('/^\((.*)\)$/',$conf->global->PAYMENT_NEWFORM_TEXT,$reg)) {
+		$text.=$langs->trans($reg[1])."<br>\n";
+	} else {
+		$text.=$conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
+	}
 	$text='<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
 if (empty($text))
@@ -728,14 +777,15 @@ 
 
 	// Amount
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -771,18 +821,21 @@ 
 	{
 		$mesg=$order->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$order->fetch_thirdparty($order->socid);
 
 		$object = $order;
 	}
 
-	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+	if ($action != 'dopayment') {
+		// Do not change amount if we just click on first dopayment
 	{
 		$amount=$order->total_ttc;
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+	}
+		if (GETPOST("amount",'int')) {
+			$amount=GETPOST("amount",'int');
+		}
 		$amount=price2num($amount);
 	}
 
@@ -803,7 +856,9 @@ 
 
 	// Object
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	if (GETPOST('desc','alpha')) {
+		$text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	}
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
@@ -819,14 +874,15 @@ 
 
 	// Amount
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -862,16 +918,19 @@ 
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
+	} else
 	{
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
-	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
+	if (is_object($order->thirdparty)) {
+		print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
+	}
 	print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$order->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Order").' '.$order->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	if (GETPOST('desc','alpha')) {
+		$labeldesc=GETPOST('desc','alpha');
+	}
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
@@ -890,18 +949,21 @@ 
 	{
 		$mesg=$invoice->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$result=$invoice->fetch_thirdparty($invoice->socid);
 
 		$object = $invoice;
 	}
 
-	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+	if ($action != 'dopayment') {
+		// Do not change amount if we just click on first dopayment
 	{
 		$amount=price2num($invoice->total_ttc - $invoice->getSommePaiement());
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+	}
+		if (GETPOST("amount",'int')) {
+			$amount=GETPOST("amount",'int');
+		}
 		$amount=price2num($amount);
 	}
 
@@ -922,7 +984,9 @@ 
 
 	// Object
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	if (GETPOST('desc','alpha')) {
+		$text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	}
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
@@ -938,7 +1002,9 @@ 
 
 	// Amount
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentAmount");
-	if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount) && empty($object->paye)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($object->paye))
 	{
@@ -946,8 +1012,7 @@ 
 		{
 			print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"), 'MT').'">';
-		}
-		else {
+		} else {
 			print '<b>'.price($amount).'</b>';
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -955,8 +1020,7 @@ 
 		// Currency
 		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 		print '<input type="hidden" name="currency" value="'.$currency.'">';
-	}
-	else
+	} else
 	{
 		print price($object->total_ttc, 1, $langs);
 	}
@@ -997,16 +1061,19 @@ 
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
+	} else
 	{
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
-	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
+	if (is_object($invoice->thirdparty)) {
+		print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
+	}
 	print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$invoice->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Invoice").' '.$invoice->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	if (GETPOST('desc','alpha')) {
+		$labeldesc=GETPOST('desc','alpha');
+	}
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
@@ -1026,8 +1093,7 @@ 
 	{
 		$mesg=$contractline->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		if ($contractline->fk_contrat > 0)
 		{
@@ -1037,23 +1103,23 @@ 
 			if ($result > 0)
 			{
 				$result=$contract->fetch_thirdparty($contract->socid);
-			}
-			else
+			} else
 			{
 				$mesg=$contract->error;
 				$error++;
 			}
-		}
-		else
+		} else
 		{
 			$mesg='ErrorRecordNotFound';
 			$error++;
 		}
 	}
 
-	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+	if ($action != 'dopayment') {
+		// Do not change amount if we just click on first dopayment
 	{
 		$amount=$contractline->total_ttc;
+	}
 
 		if ($contractline->fk_product && ! empty($conf->global->PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES))
 		{
@@ -1066,8 +1132,7 @@ 
 				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
 				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-			}
-			else
+			} else
 			{
 				$pu_ht = $product->price;
 				$pu_ttc = $product->price_ttc;
@@ -1082,7 +1147,9 @@ 
 			}
 		}
 
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+		if (GETPOST("amount",'int')) {
+			$amount=GETPOST("amount",'int');
+		}
 		$amount=price2num($amount);
 	}
 
@@ -1092,7 +1159,9 @@ 
 	$fulltag=dol_string_unaccent($fulltag);
 
 	$qty=1;
-	if (GETPOST('qty')) $qty=GETPOST('qty');
+	if (GETPOST('qty')) {
+		$qty=GETPOST('qty');
+	}
 
 	// Creditor
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
@@ -1110,7 +1179,9 @@ 
 	{
 		$text.='<br>'.$product->ref.($product->label?' - '.$product->label:'');
 	}
-	if ($contractline->description) $text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	if ($contractline->description) {
+		$text.='<br>'.dol_htmlentitiesbr($contractline->description);
+	}
 	//if ($contractline->date_fin_validite) {
 	//	$text.='<br>'.$langs->trans("DateEndPlanned").': ';
 	//	$text.=dol_print_date($contractline->date_fin_validite);
@@ -1119,7 +1190,9 @@ 
 	{
 		$text.='<br>'.$langs->trans("ExpiredSince").': '.dol_print_date($contractline->date_fin_validite);
 	}
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	if (GETPOST('desc','alpha')) {
+		$text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	}
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
@@ -1147,8 +1220,7 @@ 
 			if ($product->duration_value > 1)
 			{
 				$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("DurationDays"),"w"=>$langs->trans("DurationWeeks"),"m"=>$langs->trans("DurationMonths"),"y"=>$langs->trans("DurationYears"));
-			}
-			else
+			} else
 			{
 				$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("DurationDay"),"w"=>$langs->trans("DurationWeek"),"m"=>$langs->trans("DurationMonth"),"y"=>$langs->trans("DurationYear"));
 			}
@@ -1162,14 +1234,15 @@ 
 
 	// Amount
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
-	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
+	if (empty($amount)) {
+		print ' ('.$langs->trans("ToComplete").')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount","alpha"),'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1205,16 +1278,19 @@ 
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
+	} else
 	{
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
-	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
+	if (is_object($contract->thirdparty)) {
+		print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
+	}
 	print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
 	print '<input type="hidden" name="vatnumber" value="'.$contract->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Contract").' '.$contract->ref;
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	if (GETPOST('desc','alpha')) {
+		$labeldesc=GETPOST('desc','alpha');
+	}
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
@@ -1233,18 +1309,21 @@ 
 	{
 		$mesg=$member->error;
 		$error++;
-	}
-	else
+	} else
 	{
 		$member->fetch_thirdparty();
 		$object = $member;
 		$subscription=new Subscription($db);
 	}
 
-	if ($action != 'dopayment') // Do not change amount if we just click on first dopayment
+	if ($action != 'dopayment') {
+		// Do not change amount if we just click on first dopayment
 	{
 		$amount=$subscription->total_ttc;
-		if (GETPOST("amount",'int')) $amount=GETPOST("amount",'int');
+	}
+		if (GETPOST("amount",'int')) {
+			$amount=GETPOST("amount",'int');
+		}
 		$amount=price2num($amount);
 	}
 
@@ -1263,14 +1342,19 @@ 
 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
-	if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
-	else print $member->getFullName($langs);
+	if ($member->morphy == 'mor' && ! empty($member->societe)) {
+		print $member->societe;
+	} else {
+		print $member->getFullName($langs);
+	}
 	print '</b>';
 
 	// Object
 
 	$text='<b>'.$langs->trans("PaymentSubscription").'</b>';
-	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	if (GETPOST('desc','alpha')) {
+		$text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
+	}
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
@@ -1291,7 +1375,9 @@ 
 		print '</td><td class="CTableRow'.($var?'1':'2').'">'.price($member->last_subscription_amount);
 		print '</td></tr>'."\n";
 
-		if (empty($amount) && ! GETPOST('newamount','alpha')) $_GET['newamount']=$member->last_subscription_amount;
+		if (empty($amount) && ! GETPOST('newamount','alpha')) {
+			$_GET['newamount']=$member->last_subscription_amount;
+		}
 	}
 
 	// Amount
@@ -1299,9 +1385,15 @@ 
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount))
 	{
-		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) print ' ('.$langs->trans("ToComplete");
-		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
-		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) print ')';
+		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+			print ' ('.$langs->trans("ToComplete");
+		}
+		if (! empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+			print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		}
+		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+			print ')';
+		}
 	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	$valtoshow='';
@@ -1315,8 +1407,7 @@ 
 				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1326,13 +1417,16 @@ 
 	if (empty($amount) || ! is_numeric($amount))
 	{
 		//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
-		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+			$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		}
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount",'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow=$amount;
-		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		if (! empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
+			$valtoshow=max($conf->global->MEMBER_MIN_AMOUNT,$valtoshow);
+		}
 		print '<b>'.price($valtoshow).'</b>';
 		print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@@ -1369,37 +1463,45 @@ 
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
+	} else
 	{
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
-	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
+	if (is_object($member->thirdparty)) {
+		print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
+	}
 	print '<input type="hidden" name="email" value="'.$member->email.'">'."\n";
 	$labeldesc = $langs->trans("PaymentSubscription");
-	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
+	if (GETPOST('desc','alpha')) {
+		$labeldesc=GETPOST('desc','alpha');
+	}
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
 
 
 
-if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");
+if (! $found && ! $mesg) {
+	$mesg=$langs->trans("ErrorBadParameters");
+}
 
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+if ($mesg) {
+	print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+}
 
 print '</table>'."\n";
 print "\n";
 
 if ($action != 'dopayment')
 {
-	if ($found && ! $error)	// We are in a management option and no error
+	if ($found && ! $error) {
+		// We are in a management option and no error
 	{
 		if ($source == 'invoice' && $object->paye)
 		{
 			print '<br><br>'.$langs->trans("InvoicePaid");
-		}
-		else
+	}
+		} else
 		{
 			// Buttons for all payments registration methods
 
@@ -1417,7 +1519,9 @@ 
 
 			if (! empty($conf->paypal->enabled))
 			{
-				if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+				if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) {
+					$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+				}
 
 				if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
 				{
@@ -1429,13 +1533,11 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error_email('ERRORNEWPAYMENT');
 	}
-}
-else
+} else
 {
 	// Print
 }

htdocs/holiday/card.php

Indentation +1080 added lines, -1080 removed lines

@@ -72,121 +72,121 @@ 
 {
 	$object = new Holiday($db);
 
-    // If no right to create a request
-    if (! $cancreate)
-    {
-    	$error++;
-    	setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
-    	$action='request';
-    }
-
-    if (! $error)
-    {
-    	$db->begin();
-
-	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
-	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
-	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
-	    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-	    $starthalfday=GETPOST('starthalfday');
-	    $endhalfday=GETPOST('endhalfday');
-	    $type=GETPOST('type');
-	    $halfday=0;
-	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	    else if ($starthalfday == 'afternoon') $halfday=-1;
-	    else if ($endhalfday == 'morning') $halfday=1;
-
-	    $valideur = GETPOST('valideur');
-	    $description = trim(GETPOST('description'));
-
-    	// If no type
-	    if ($type <= 0)
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
+	// If no right to create a request
+	if (! $cancreate)
+	{
+		$error++;
+		setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
+		$action='request';
+	}
 
-	    // If no start date
-	    if (empty($date_debut))
-	    {
-	        setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
-	    // If no end date
-	    if (empty($date_fin))
-	    {
-	        setEventMessages($langs->trans("NoDateFin"), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
-	    // If start date after end date
-	    if ($date_debut > $date_fin)
-	    {
-	        setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
-
-	    // Check if there is already holiday for this period
-	    $verifCP = $object->verifDateHolidayCP($fuserid, $date_debut, $date_fin, $halfday);
-	    if (! $verifCP)
-	    {
-	        setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
-
-	    // If there is no Business Days within request
-	    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-	    if($nbopenedday < 0.5)
-	    {
-	        setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
-	        $error++;
-	        $action='create';
-	    }
+	if (! $error)
+	{
+		$db->begin();
+
+		$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
+		$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+		$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+		$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+		$starthalfday=GETPOST('starthalfday');
+		$endhalfday=GETPOST('endhalfday');
+		$type=GETPOST('type');
+		$halfday=0;
+		if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
+		else if ($starthalfday == 'afternoon') $halfday=-1;
+		else if ($endhalfday == 'morning') $halfday=1;
+
+		$valideur = GETPOST('valideur');
+		$description = trim(GETPOST('description'));
+
+		// If no type
+		if ($type <= 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$error++;
+			$action='create';
+		}
 
-	    // If no validator designated
-	    if ($valideur < 1)
-	    {
-	        setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
-	        $error++;
-	    }
+		// If no start date
+		if (empty($date_debut))
+		{
+			setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
+			$error++;
+			$action='create';
+		}
+		// If no end date
+		if (empty($date_fin))
+		{
+			setEventMessages($langs->trans("NoDateFin"), null, 'errors');
+			$error++;
+			$action='create';
+		}
+		// If start date after end date
+		if ($date_debut > $date_fin)
+		{
+			setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
+			$error++;
+			$action='create';
+		}
 
-	    $result = 0;
+		// Check if there is already holiday for this period
+		$verifCP = $object->verifDateHolidayCP($fuserid, $date_debut, $date_fin, $halfday);
+		if (! $verifCP)
+		{
+			setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
+			$error++;
+			$action='create';
+		}
 
-	    if (! $error)
-	    {
-    	    $object->fk_user = $fuserid;
-    	    $object->description = $description;
-    	    $object->fk_validator = $valideur;
-    		$object->fk_type = $type;
-    		$object->date_debut = $date_debut;
-    		$object->date_fin = $date_fin;
-    		$object->halfday = $halfday;
-
-    		$result = $object->create($user);
-    		if ($result <= 0)
-    		{
-    			setEventMessages($object->error, $object->errors, 'errors');
-    			$error++;
-    		}
-	    }
-
-	    // If no SQL error we redirect to the request card
-	    if (! $error)
-	    {
+		// If there is no Business Days within request
+		$nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+		if($nbopenedday < 0.5)
+		{
+			setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
+			$error++;
+			$action='create';
+		}
+
+		// If no validator designated
+		if ($valideur < 1)
+		{
+			setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
+			$error++;
+		}
+
+		$result = 0;
+
+		if (! $error)
+		{
+			$object->fk_user = $fuserid;
+			$object->description = $description;
+			$object->fk_validator = $valideur;
+			$object->fk_type = $type;
+			$object->date_debut = $date_debut;
+			$object->date_fin = $date_fin;
+			$object->halfday = $halfday;
+
+			$result = $object->create($user);
+			if ($result <= 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+
+		// If no SQL error we redirect to the request card
+		if (! $error)
+		{
 			$db->commit();
 
-	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	        exit;
-	    }
-	    else
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+		else
 		{
-	    	$db->rollback();
-	    }
-    }
+			$db->rollback();
+		}
+	}
 }
 
 if ($action == 'update')
@@ -202,61 +202,61 @@ 
 	else if ($starthalfday == 'afternoon') $halfday=-1;
 	else if ($endhalfday == 'morning') $halfday=1;
 
-    // If no right to modify a request
-    if (! $user->rights->holiday->write)
-    {
-        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=CantUpdate');
-        exit;
-    }
+	// If no right to modify a request
+	if (! $user->rights->holiday->write)
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=CantUpdate');
+		exit;
+	}
 
-    $object = new Holiday($db);
-    $object->fetch($id);
+	$object = new Holiday($db);
+	$object->fetch($id);
 
 	// If under validation
-    if ($object->statut == 1)
-    {
-        // If this is the requestor or has read/write rights
-        if ($cancreate)
-        {
-            $valideur = $_POST['valideur'];
-            $description = trim($_POST['description']);
-
-            // If no start date
-            if (empty($_POST['date_debut_'])) {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
-                exit;
-            }
-
-            // If no end date
-            if (empty($_POST['date_fin_'])) {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
-                exit;
-            }
-
-            // If start date after end date
-            if ($date_debut > $date_fin) {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
-                exit;
-            }
-
-            // If no validator designated
-            if ($valideur < 1) {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
-                exit;
-            }
-
-            // If there is no Business Days within request
-            $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-            if ($nbopenedday < 0.5)
-            {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=DureeHoliday');
-                exit;
-            }
-
-            $object->description = $description;
-            $object->date_debut = $date_debut;
-            $object->date_fin = $date_fin;
-            $object->fk_validator = $valideur;
+	if ($object->statut == 1)
+	{
+		// If this is the requestor or has read/write rights
+		if ($cancreate)
+		{
+			$valideur = $_POST['valideur'];
+			$description = trim($_POST['description']);
+
+			// If no start date
+			if (empty($_POST['date_debut_'])) {
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
+				exit;
+			}
+
+			// If no end date
+			if (empty($_POST['date_fin_'])) {
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
+				exit;
+			}
+
+			// If start date after end date
+			if ($date_debut > $date_fin) {
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
+				exit;
+			}
+
+			// If no validator designated
+			if ($valideur < 1) {
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
+				exit;
+			}
+
+			// If there is no Business Days within request
+			$nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+			if ($nbopenedday < 0.5)
+			{
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=DureeHoliday');
+				exit;
+			}
+
+			$object->description = $description;
+			$object->date_debut = $date_debut;
+			$object->date_fin = $date_fin;
+			$object->fk_validator = $valideur;
 			$object->halfday = $halfday;
 
 			// Update
@@ -272,18 +272,18 @@ 
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
 			}
-        }
-        else
-        {
-        	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-        	$action='';
-        }
-    }
-    else
-    {
-    	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
-    	$action='';
-    }
+		}
+		else
+		{
+			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+			$action='';
+		}
+	}
+	else
+	{
+		setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
+		$action='';
+	}
 }
 
 // If delete of request
@@ -296,7 +296,7 @@ 
 	$object = new Holiday($db);
 	$object->fetch($id);
 
-    // If this is a rough draft, approved, canceled or refused
+	// If this is a rough draft, approved, canceled or refused
 	if ($object->statut == 1 || $object->statut == 4 || $object->statut == 5)
 	{
 		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
@@ -327,276 +327,276 @@ 
 // Si envoi de la demande
 if ($action == 'confirm_send')
 {
-    $object = new Holiday($db);
-    $object->fetch($id);
-
-    // Si brouillon et créateur
-    if($object->statut == 1 && $cancreate)
-    {
-        $object->statut = 2;
-
-        $verif = $object->update($user);
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if ($verif > 0)
-        {
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($object->fk_validator);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($object->fk_user);
-            $emailFrom = $expediteur->email;
-
-            // Subject
+	$object = new Holiday($db);
+	$object->fetch($id);
+
+	// Si brouillon et créateur
+	if($object->statut == 1 && $cancreate)
+	{
+		$object->statut = 2;
+
+		$verif = $object->update($user);
+
+		// Si pas d'erreur SQL on redirige vers la fiche de la demande
+		if ($verif > 0)
+		{
+			// To
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_validator);
+			$emailTo = $destinataire->email;
+
+			if (!$emailTo)
+			{
+				dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+
+			// From
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user);
+			$emailFrom = $expediteur->email;
+
+			// Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
-
-            // Content
-            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.= $langs->transnoentities("HolidaysToValidateBody")."\n";
-
-            $delayForRequest = $object->getConfCP('delayForRequest');
-            //$delayForRequest = $delayForRequest * (60*60*24);
-
-            $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
-
-            // Si l'option pour avertir le valideur en cas de délai trop court
-            if($object->getConfCP('AlertValidatorDelay'))
-            {
-                if($object->date_debut < $nextMonth)
-                {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateDelay",$object->getConfCP('delayForRequest'))."\n";
-                }
-            }
-
-            // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
-            if ($object->getConfCP('AlertValidatorSolde'))
-            {
-            	$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
-                if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type))
-                {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
-                }
-            }
-
-            $message.= "\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin,'day')."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
-
-            $trackid='leav'.$object->id;
-
-            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
-
-            // Envoi du mail
-            $result=$mail->sendfile();
-
-            if (!$result)
-            {
-                setEventMessages($mail->error, $mail->errors, 'warnings');
-                $action='';
-            }
-            else
-            {
-            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-            	exit;
-            }
-        }
-        else
-        {
-        	setEventMessages($object->error, $object->errors, 'errors');
-        	$action='';
-        }
-    }
+			if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+			$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
+
+			// Content
+			$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+			$message.= "\n";
+			$message.= $langs->transnoentities("HolidaysToValidateBody")."\n";
+
+			$delayForRequest = $object->getConfCP('delayForRequest');
+			//$delayForRequest = $delayForRequest * (60*60*24);
+
+			$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+
+			// Si l'option pour avertir le valideur en cas de délai trop court
+			if($object->getConfCP('AlertValidatorDelay'))
+			{
+				if($object->date_debut < $nextMonth)
+				{
+					$message.= "\n";
+					$message.= $langs->transnoentities("HolidaysToValidateDelay",$object->getConfCP('delayForRequest'))."\n";
+				}
+			}
+
+			// Si l'option pour avertir le valideur en cas de solde inférieur à la demande
+			if ($object->getConfCP('AlertValidatorSolde'))
+			{
+				$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+				if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type))
+				{
+					$message.= "\n";
+					$message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+				}
+			}
+
+			$message.= "\n";
+			$message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+			$message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin,'day')."\n";
+			$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+			$message.= "\n";
+
+			$trackid='leav'.$object->id;
+
+			$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+
+			// Envoi du mail
+			$result=$mail->sendfile();
+
+			if (!$result)
+			{
+				setEventMessages($mail->error, $mail->errors, 'warnings');
+				$action='';
+			}
+			else
+			{
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+		}
+		else
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action='';
+		}
+	}
 }
 
 
 // Si Validation de la demande
 if ($action == 'confirm_valid')
 {
-    $object = new Holiday($db);
-    $object->fetch($id);
-
-    // Si statut en attente de validation et valideur = utilisateur
-    if ($object->statut == 2 && $user->id == $object->fk_validator)
-    {
-        $object->date_valid = dol_now();
-        $object->fk_user_valid = $user->id;
-        $object->statut = 3;
-
-        $verif = $object->update($user);
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if ($verif > 0)
-        {
-            // Calculcate number of days consummed
-            $nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
-
-            $soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
-            $newSolde = $soldeActuel - ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
-
-            // On ajoute la modification dans le LOG
-            $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $object->fk_type);
-
-            // Mise à jour du solde
-            $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
-
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($object->fk_user);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($object->fk_validator);
-            $emailFrom = $expediteur->email;
-
-            // Subject
+	$object = new Holiday($db);
+	$object->fetch($id);
+
+	// Si statut en attente de validation et valideur = utilisateur
+	if ($object->statut == 2 && $user->id == $object->fk_validator)
+	{
+		$object->date_valid = dol_now();
+		$object->fk_user_valid = $user->id;
+		$object->statut = 3;
+
+		$verif = $object->update($user);
+
+		// Si pas d'erreur SQL on redirige vers la fiche de la demande
+		if ($verif > 0)
+		{
+			// Calculcate number of days consummed
+			$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+
+			$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
+			$newSolde = $soldeActuel - ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
+
+			// On ajoute la modification dans le LOG
+			$object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $object->fk_type);
+
+			// Mise à jour du solde
+			$object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
+
+			// To
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user);
+			$emailTo = $destinataire->email;
+
+			if (!$emailTo)
+			{
+				dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+
+			// From
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_validator);
+			$emailFrom = $expediteur->email;
+
+			// Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
-
-            // Content
-            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.=  $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut,'day'),dol_print_date($object->date_fin,'day'))."\n";
-
-            $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
-
-            $trackid='leav'.$object->id;
-
-            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
-
-            // Envoi du mail
-            $result=$mail->sendfile();
-
-            if (!$result)
-            {
-            	setEventMessages($mail->error, $mail->errors, 'warnings');
-            	$action='';
-            }
-            else
-            {
-            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-            	exit;
-            }
-        }
-        else
-        {
-        	setEventMessages($object->error, $object->errors, 'errors');
-        	$action='';
-        }
-    }
+			if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+			$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
+
+			// Content
+			$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+			$message.= "\n";
+			$message.=  $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut,'day'),dol_print_date($object->date_fin,'day'))."\n";
+
+			$message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+			$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+			$message.= "\n";
+
+			$trackid='leav'.$object->id;
+
+			$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+
+			// Envoi du mail
+			$result=$mail->sendfile();
+
+			if (!$result)
+			{
+				setEventMessages($mail->error, $mail->errors, 'warnings');
+				$action='';
+			}
+			else
+			{
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+		}
+		else
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action='';
+		}
+	}
 }
 
 if ($action == 'confirm_refuse' && GETPOST('confirm','alpha') == 'yes')
 {
 	if (! empty($_POST['detail_refuse']))
-    {
-        $object = new Holiday($db);
-        $object->fetch($id);
-
-        // Si statut en attente de validation et valideur = utilisateur
-        if ($object->statut == 2 && $user->id == $object->fk_validator)
-        {
-            $object->date_refuse = dol_print_date('dayhour', dol_now());
-            $object->fk_user_refuse = $user->id;
-            $object->statut = 5;
-            $object->detail_refuse = GETPOST('detail_refuse','alphanohtml');
-
-            $verif = $object->update($user);
-
-            // Si pas d'erreur SQL on redirige vers la fiche de la demande
-            if ($verif > 0)
-            {
-                // To
-                $destinataire = new User($db);
-                $destinataire->fetch($object->fk_user);
-                $emailTo = $destinataire->email;
-
-                if (!$emailTo)
-                {
-                    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                    exit;
-                }
-
-                // From
-                $expediteur = new User($db);
-                $expediteur->fetch($object->fk_validator);
-                $emailFrom = $expediteur->email;
-
-	            // Subject
+	{
+		$object = new Holiday($db);
+		$object->fetch($id);
+
+		// Si statut en attente de validation et valideur = utilisateur
+		if ($object->statut == 2 && $user->id == $object->fk_validator)
+		{
+			$object->date_refuse = dol_print_date('dayhour', dol_now());
+			$object->fk_user_refuse = $user->id;
+			$object->statut = 5;
+			$object->detail_refuse = GETPOST('detail_refuse','alphanohtml');
+
+			$verif = $object->update($user);
+
+			// Si pas d'erreur SQL on redirige vers la fiche de la demande
+			if ($verif > 0)
+			{
+				// To
+				$destinataire = new User($db);
+				$destinataire->fetch($object->fk_user);
+				$emailTo = $destinataire->email;
+
+				if (!$emailTo)
+				{
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
+
+				// From
+				$expediteur = new User($db);
+				$expediteur->fetch($object->fk_validator);
+				$emailFrom = $expediteur->email;
+
+				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
-
-                // Content
-            	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	            $message.= "\n";
-                $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
-                $message.= GETPOST('detail_refuse','alpha')."\n\n";
-
-	            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-
-	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-                $message.= "\n";
-
-	            $trackid='leav'.$object->id;
-
-	            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
-
-                // Envoi du mail
-                $result=$mail->sendfile();
-
-                if (!$result)
-                {
-                	setEventMessages($mail->error, $mail->errors, 'warnings');
-                	$action='';
-                }
-                else
-                {
-                	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                	exit;
-                }
-            }
-            else
-            {
-            	setEventMessages($object->error, $object->errors, 'errors');
-            	$action='';
-            }
-        }
-    } else {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DetailRefusCP")), null, 'errors');
-    	$action='refuse';
-    }
+				if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
+
+				// Content
+				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+				$message.= "\n";
+				$message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
+				$message.= GETPOST('detail_refuse','alpha')."\n\n";
+
+				$message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+				$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+				$message.= "\n";
+
+				$trackid='leav'.$object->id;
+
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+
+				// Envoi du mail
+				$result=$mail->sendfile();
+
+				if (!$result)
+				{
+					setEventMessages($mail->error, $mail->errors, 'warnings');
+					$action='';
+				}
+				else
+				{
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
+			}
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action='';
+			}
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DetailRefusCP")), null, 'errors');
+		$action='refuse';
+	}
 }
 
 
@@ -605,30 +605,30 @@ 
 {
 	$error = 0;
 
-    $object = new Holiday($db);
-    $object->fetch($id);
-
-    $oldstatus = $object->statut;
-    $object->statut = 1;
-
-    $result = $object->update($user);
-    if ($result < 0)
-    {
-    	$error++;
-    	setEventMessages($langs->trans('ErrorBackToDraft').' '.$object->error, $object->errors, 'errors');
-    }
-
-    if (! $error)
-    {
-        $db->commit();
-
-        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-        exit;
-    }
-    else
-    {
-        $db->rollback();
-    }
+	$object = new Holiday($db);
+	$object->fetch($id);
+
+	$oldstatus = $object->statut;
+	$object->statut = 1;
+
+	$result = $object->update($user);
+	if ($result < 0)
+	{
+		$error++;
+		setEventMessages($langs->trans('ErrorBackToDraft').' '.$object->error, $object->errors, 'errors');
+	}
+
+	if (! $error)
+	{
+		$db->commit();
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 // Si Validation de la demande
@@ -636,105 +636,105 @@ 
 {
 	$error = 0;
 
-    $object = new Holiday($db);
-    $object->fetch($id);
-
-    // Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
-    if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)))
-    {
-    	$db->begin();
-
-    	$oldstatus = $object->statut;
-        $object->date_cancel = dol_now();
-        $object->fk_user_cancel = $user->id;
-        $object->statut = 4;
-
-        $result = $object->update($user);
-
-        if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
-        {
-        	// Calculcate number of days consummed
-        	$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
-
-        	$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
-        	$newSolde = $soldeActuel + ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
-
-        	// On ajoute la modification dans le LOG
-        	$result1=$object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
-
-        	// Mise à jour du solde
-        	$result2=$object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
-
-        	if ($result1 < 0 || $result2 < 0)
-        	{
-        		$error++;
-        		setEventMessages($langs->trans('ErrorCantDeleteCP').' '.$object->error, $object->errors, 'errors');
-        	}
-        }
-
-        if (! $error)
-        {
-        	$db->commit();
-        }
-        else
-        {
-        	$db->rollback();
-        }
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if (! $error && $result > 0)
-        {
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($object->fk_user);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($object->fk_user_cancel);
-            $emailFrom = $expediteur->email;
-
-            // Subject
+	$object = new Holiday($db);
+	$object->fetch($id);
+
+	// Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
+	if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)))
+	{
+		$db->begin();
+
+		$oldstatus = $object->statut;
+		$object->date_cancel = dol_now();
+		$object->fk_user_cancel = $user->id;
+		$object->statut = 4;
+
+		$result = $object->update($user);
+
+		if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
+		{
+			// Calculcate number of days consummed
+			$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+
+			$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
+			$newSolde = $soldeActuel + ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
+
+			// On ajoute la modification dans le LOG
+			$result1=$object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
+
+			// Mise à jour du solde
+			$result2=$object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
+
+			if ($result1 < 0 || $result2 < 0)
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorCantDeleteCP').' '.$object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+		}
+		else
+		{
+			$db->rollback();
+		}
+
+		// Si pas d'erreur SQL on redirige vers la fiche de la demande
+		if (! $error && $result > 0)
+		{
+			// To
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user);
+			$emailTo = $destinataire->email;
+
+			if (!$emailTo)
+			{
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+
+			// From
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_cancel);
+			$emailFrom = $expediteur->email;
+
+			// Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+			if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
+			$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
 
-            // Content
-           	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
+			// Content
+		   	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+			$message.= "\n";
 
-            $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+			$message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
+			$message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
+			$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+			$message.= "\n";
 
-            $trackid='leav'.$object->id;
+			$trackid='leav'.$object->id;
 
-            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+			$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
-            // Envoi du mail
-            $result=$mail->sendfile();
+			// Envoi du mail
+			$result=$mail->sendfile();
 
-            if (!$result)
-            {
-            	setEventMessages($mail->error, $mail->errors, 'warnings');
-            	$action='';
-            }
-            else
-            {
-            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-            	exit;
-            }
-        }
-    }
+			if (!$result)
+			{
+				setEventMessages($mail->error, $mail->errors, 'warnings');
+				$action='';
+			}
+			else
+			{
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+		}
+	}
 
 }
 
@@ -753,54 +753,54 @@ 
 
 if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create')
 {
-    // Si l'utilisateur n'a pas le droit de faire une demande
-    if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
-    {
-        $errors[]=$langs->trans('CantCreateCP');
-    }
-    else
-    {
-        // Formulaire de demande de congés payés
-        print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
-
-        // Si il y a une erreur
-        if (GETPOST('error')) {
-
-            switch(GETPOST('error')) {
-                case 'datefin' :
-                    $errors[] = $langs->trans('ErrorEndDateCP');
-                    break;
-                case 'SQL_Create' :
-                    $errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
-                    break;
-                case 'CantCreate' :
-                    $errors[] = $langs->trans('CantCreateCP');
-                    break;
-                case 'Valideur' :
-                    $errors[] = $langs->trans('InvalidValidatorCP');
-                    break;
-                case 'nodatedebut' :
-                    $errors[] = $langs->trans('NoDateDebut');
-                    break;
-                case 'nodatefin' :
-                    $errors[] = $langs->trans('NoDateFin');
-                    break;
-                case 'DureeHoliday' :
-                    $errors[] = $langs->trans('ErrorDureeCP');
-                    break;
-                case 'alreadyCP' :
-                    $errors[] = $langs->trans('alreadyCPexist');
-                    break;
-            }
-
-	        setEventMessages($errors, null, 'errors');
-        }
-
-
-        $delayForRequest = $object->getConfCP('delayForRequest');
-        //$delayForRequest = $delayForRequest * (60*60*24);
-
-        $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+	// Si l'utilisateur n'a pas le droit de faire une demande
+	if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
+	{
+		$errors[]=$langs->trans('CantCreateCP');
+	}
+	else
+	{
+		// Formulaire de demande de congés payés
+		print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
+
+		// Si il y a une erreur
+		if (GETPOST('error')) {
+
+			switch(GETPOST('error')) {
+				case 'datefin' :
+					$errors[] = $langs->trans('ErrorEndDateCP');
+					break;
+				case 'SQL_Create' :
+					$errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
+					break;
+				case 'CantCreate' :
+					$errors[] = $langs->trans('CantCreateCP');
+					break;
+				case 'Valideur' :
+					$errors[] = $langs->trans('InvalidValidatorCP');
+					break;
+				case 'nodatedebut' :
+					$errors[] = $langs->trans('NoDateDebut');
+					break;
+				case 'nodatefin' :
+					$errors[] = $langs->trans('NoDateFin');
+					break;
+				case 'DureeHoliday' :
+					$errors[] = $langs->trans('ErrorDureeCP');
+					break;
+				case 'alreadyCP' :
+					$errors[] = $langs->trans('alreadyCPexist');
+					break;
+			}
+
+			setEventMessages($errors, null, 'errors');
+		}
+
+
+		$delayForRequest = $object->getConfCP('delayForRequest');
+		//$delayForRequest = $delayForRequest * (60*60*24);
+
+		$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
 		print '<script type="text/javascript">
 	    function valider()
@@ -831,510 +831,510 @@ 
        	}
        </script>'."\n";
 
-        // Formulaire de demande
-        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
-        print '<input type="hidden" name="action" value="create" />'."\n";
+		// Formulaire de demande
+		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
+		print '<input type="hidden" name="action" value="create" />'."\n";
 
-        if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
-        {
-	        dol_fiche_head('', '', '', -1);
+		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
+		{
+			dol_fiche_head('', '', '', -1);
 
-	        $out='';
-	        $typeleaves=$object->getTypes(1,1);
-	    	foreach($typeleaves as $key => $val)
+			$out='';
+			$typeleaves=$object->getTypes(1,1);
+			foreach($typeleaves as $key => $val)
 			{
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
 				$nb_holiday += $nb_type;
 				$out .= ' - '.$val['label'].': <strong>'.($nb_type?price2num($nb_type):0).'</strong><br>';
 			}
-	        print $langs->trans('SoldeCPUser', round($nb_holiday,5)).'<br>';
+			print $langs->trans('SoldeCPUser', round($nb_holiday,5)).'<br>';
 			print $out;
 
-	        dol_fiche_end();
-        }
-        elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
-        {
-        	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
-        }
-
-        dol_fiche_head();
-
-        //print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
-
-        print '<table class="border" width="100%">';
-        print '<tbody>';
-
-        // User
-        print '<tr>';
-        print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
-        print '<td>';
-        if (empty($user->rights->holiday->write_all))
-        {
-        	print $form->select_dolusers(($fuserid?$fuserid:$user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
-        	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-        }
-        else print $form->select_dolusers(GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
-        print '</td>';
-        print '</tr>';
-
-        // Type
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
-        print '<td>';
-        $typeleaves=$object->getTypes(1,-1);
-        $arraytypeleaves=array();
-        foreach($typeleaves as $key => $val)
-        {
-        	$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
-        	$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
+			dol_fiche_end();
+		}
+		elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+		{
+			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
+		}
+
+		dol_fiche_head();
+
+		//print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
+
+		print '<table class="border" width="100%">';
+		print '<tbody>';
+
+		// User
+		print '<tr>';
+		print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
+		print '<td>';
+		if (empty($user->rights->holiday->write_all))
+		{
+			print $form->select_dolusers(($fuserid?$fuserid:$user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
+			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
+		}
+		else print $form->select_dolusers(GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
+		print '</td>';
+		print '</tr>';
+
+		// Type
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
+		print '<td>';
+		$typeleaves=$object->getTypes(1,-1);
+		$arraytypeleaves=array();
+		foreach($typeleaves as $key => $val)
+		{
+			$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
+			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
 			$arraytypeleaves[$val['rowid']]=$labeltoshow;
-        }
-        print $form->selectarray('type', $arraytypeleaves, (GETPOST('type','alpha')?GETPOST('type','alpha'):''), 1);
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-        print '</td>';
-        print '</tr>';
-
-        // Date start
-        print '<tr>';
-        print '<td class="fieldrequired">';
-        print $langs->trans("DateDebCP");
-        print ' ('.$langs->trans("FirstDayOfHoliday").')';
-        print '</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if (! GETPOST('date_debut_')) {
-            $form->select_date(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month','int'), GETPOST('date_debut_day','int'), GETPOST('date_debut_year','int'));
-            $form->select_date($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday','alpha')?GETPOST('starthalfday','alpha'):'morning'));
-        print '</td>';
-        print '</tr>';
-
-        // Date end
-        print '<tr>';
-        print '<td class="fieldrequired">';
-        print $langs->trans("DateFinCP");
-        print ' ('.$langs->trans("LastDayOfHoliday").')';
-        print '</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if (! GETPOST('date_fin_')) {
-            $form->select_date(-1,'date_fin_', 0, 0, 0, '', 1, 1);
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month','int'), GETPOST('date_fin_day','int'), GETPOST('date_fin_year','int'));
-            $form->select_date($tmpdate,'date_fin_', 0, 0, 0, '', 1, 1);
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday','alpha')?GETPOST('endhalfday','alpha'):'afternoon'));
-        print '</td>';
-        print '</tr>';
-
-        // Approved by
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
-        print '<td>';
-        print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
-        print '</td>';
-        print '</tr>';
-
-        // Description
-        print '<tr>';
-        print '<td>'.$langs->trans("DescCP").'</td>';
-        print '<td class="tdtop">';
-        $doleditor = new DolEditor('description', GETPOST('description','none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        print $doleditor->Create(1);
-        print '</td></tr>';
-
-        print '</tbody>';
-        print '</table>';
-
-        dol_fiche_end();
-
-        print '<div class="center">';
-        print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
-        print '&nbsp; &nbsp; ';
-        print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
-        print '</div>';
-
-        print '</from>'."\n";
-    }
+		}
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type','alpha')?GETPOST('type','alpha'):''), 1);
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td>';
+		print '</tr>';
+
+		// Date start
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $langs->trans("DateDebCP");
+		print ' ('.$langs->trans("FirstDayOfHoliday").')';
+		print '</td>';
+		print '<td>';
+		// Si la demande ne vient pas de l'agenda
+		if (! GETPOST('date_debut_')) {
+			$form->select_date(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month','int'), GETPOST('date_debut_day','int'), GETPOST('date_debut_year','int'));
+			$form->select_date($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday','alpha')?GETPOST('starthalfday','alpha'):'morning'));
+		print '</td>';
+		print '</tr>';
+
+		// Date end
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $langs->trans("DateFinCP");
+		print ' ('.$langs->trans("LastDayOfHoliday").')';
+		print '</td>';
+		print '<td>';
+		// Si la demande ne vient pas de l'agenda
+		if (! GETPOST('date_fin_')) {
+			$form->select_date(-1,'date_fin_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month','int'), GETPOST('date_fin_day','int'), GETPOST('date_fin_year','int'));
+			$form->select_date($tmpdate,'date_fin_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday','alpha')?GETPOST('endhalfday','alpha'):'afternoon'));
+		print '</td>';
+		print '</tr>';
+
+		// Approved by
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
+		print '<td>';
+		print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
+		print '</td>';
+		print '</tr>';
+
+		// Description
+		print '<tr>';
+		print '<td>'.$langs->trans("DescCP").'</td>';
+		print '<td class="tdtop">';
+		$doleditor = new DolEditor('description', GETPOST('description','none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		print '</td></tr>';
+
+		print '</tbody>';
+		print '</table>';
+
+		dol_fiche_end();
+
+		print '<div class="center">';
+		print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
+		print '&nbsp; &nbsp; ';
+		print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
+		print '</div>';
+
+		print '</from>'."\n";
+	}
 }
 else
 {
-    if ($error)
-    {
-        print '<div class="tabBar">';
-        print $error;
-        print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-        print '</div>';
-    }
-    else
-    {
-        // Affichage de la fiche d'une demande de congés payés
-        if ($id > 0)
-        {
-            $object->fetch($id);
-
-            $valideur = new User($db);
-            $valideur->fetch($object->fk_validator);
-
-            $userRequest = new User($db);
-            $userRequest->fetch($object->fk_user);
-
-            //print load_fiche_titre($langs->trans('TitreRequestCP'));
-
-            // Si il y a une erreur
-            if (GETPOST('error'))
-            {
-                switch(GETPOST('error'))
-                {
-                    case 'datefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
-                        break;
-                    case 'SQL_Create' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
-                        break;
-                    case 'CantCreate' :
-                        $errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
-                        break;
-                    case 'Valideur' :
-                        $errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
-                        break;
-                    case 'nodatedebut' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
-                        break;
-                    case 'nodatefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateFin');
-                        break;
-                    case 'DureeHoliday' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
-                        break;
-                    case 'NoMotifRefuse' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
-                        break;
-                    case 'mail' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
-                        break;
-                }
-
-	            setEventMessages($errors, null, 'errors');
-            }
-
-            // On vérifie si l'utilisateur à le droit de lire cette demande
-            if ($cancreate)
-            {
-                $head=holiday_prepare_head($object);
-
-                if ($action == 'edit' && $object->statut == 1)
-                {
-                    $edit = true;
-                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'."\n";
-                    print '<input type="hidden" name="action" value="update"/>'."\n";
-                    print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
-                }
-
-                dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
-
-                $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-                dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
-
-
-                print '<div class="fichecenter">';
-                print '<div class="fichehalfleft">';
-                print '<div class="underbanner clearboth"></div>';
-
-                print '<table class="border centpercent">';
-                print '<tbody>';
-
-                // User
-                print '<tr>';
-                print '<td class="titlefield">'.$langs->trans("User").'</td>';
-        		print '<td>';
-        		print $userRequest->getNomUrl(-1, 'leave');
-        		print '</td></tr>';
-
-		        // Type
-		        print '<tr>';
-		        print '<td>'.$langs->trans("Type").'</td>';
-		        print '<td>';
-		        $typeleaves=$object->getTypes(1,-1);
-		        $labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code'])!=$typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-		        print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved",$object->fk_type) : $labeltoshow;
-		        print '</td>';
-		        print '</tr>';
-
-			    $starthalfday=($object->halfday == -1 || $object->halfday == 2)?'afternoon':'morning';
-			    $endhalfday=($object->halfday == 1 || $object->halfday == 2)?'morning':'afternoon';
-
-                if(!$edit)
-                {
-                    print '<tr>';
-                    print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($object->date_debut,'day');
-			        print ' &nbsp; &nbsp; ';
-			        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-                    print '</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-                    print '<td>';
-                    $form->select_date($object->date_debut,'date_debut_');
-			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
-                    print '</td>';
-                    print '</tr>';
-                }
-
-                if (!$edit)
-                {
-                    print '<tr>';
-                    print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($object->date_fin,'day');
-                    print ' &nbsp; &nbsp; ';
-                    print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
-                    print '</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
-                    print '<td>';
-                    $form->select_date($object->date_fin,'date_fin_');
-			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
-                    print '</td>';
-                    print '</tr>';
-                }
-                // Nb of days
-                print '<tr>';
-                print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
-                print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
-                print '</tr>';
-
-                if ($object->statut == 5)
-                {
-                	print '<tr>';
-                	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
-                	print '<td>'.$object->detail_refuse.'</td>';
-                	print '</tr>';
-                }
-
-                // Description
-                if (!$edit)
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DescCP').'</td>';
-                    print '<td>'.nl2br($object->description).'</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DescCP').'</td>';
-                    print '<td class="tdtop">';
-                    $doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-                    print $doleditor->Create(1);
-                    print '</td></tr>';
-                }
-
-                print '</tbody>';
-                print '</table>'."\n";
-
-                print '</div>';
-                print '<div class="fichehalfright">';
-                print '<div class="ficheaddleft">';
-
-                print '<div class="underbanner clearboth"></div>';
+	if ($error)
+	{
+		print '<div class="tabBar">';
+		print $error;
+		print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+		print '</div>';
+	}
+	else
+	{
+		// Affichage de la fiche d'une demande de congés payés
+		if ($id > 0)
+		{
+			$object->fetch($id);
+
+			$valideur = new User($db);
+			$valideur->fetch($object->fk_validator);
+
+			$userRequest = new User($db);
+			$userRequest->fetch($object->fk_user);
+
+			//print load_fiche_titre($langs->trans('TitreRequestCP'));
+
+			// Si il y a une erreur
+			if (GETPOST('error'))
+			{
+				switch(GETPOST('error'))
+				{
+					case 'datefin' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
+						break;
+					case 'SQL_Create' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
+						break;
+					case 'CantCreate' :
+						$errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
+						break;
+					case 'Valideur' :
+						$errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
+						break;
+					case 'nodatedebut' :
+						$errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
+						break;
+					case 'nodatefin' :
+						$errors[] = $langs->transnoentitiesnoconv('NoDateFin');
+						break;
+					case 'DureeHoliday' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
+						break;
+					case 'NoMotifRefuse' :
+						$errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
+						break;
+					case 'mail' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
+						break;
+				}
+
+				setEventMessages($errors, null, 'errors');
+			}
+
+			// On vérifie si l'utilisateur à le droit de lire cette demande
+			if ($cancreate)
+			{
+				$head=holiday_prepare_head($object);
+
+				if ($action == 'edit' && $object->statut == 1)
+				{
+					$edit = true;
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'."\n";
+					print '<input type="hidden" name="action" value="update"/>'."\n";
+					print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
+				}
+
+				dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
+
+				$linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+				dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
+
+
+				print '<div class="fichecenter">';
+				print '<div class="fichehalfleft">';
+				print '<div class="underbanner clearboth"></div>';
+
+				print '<table class="border centpercent">';
+				print '<tbody>';
+
+				// User
+				print '<tr>';
+				print '<td class="titlefield">'.$langs->trans("User").'</td>';
+				print '<td>';
+				print $userRequest->getNomUrl(-1, 'leave');
+				print '</td></tr>';
+
+				// Type
+				print '<tr>';
+				print '<td>'.$langs->trans("Type").'</td>';
+				print '<td>';
+				$typeleaves=$object->getTypes(1,-1);
+				$labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code'])!=$typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+				print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved",$object->fk_type) : $labeltoshow;
+				print '</td>';
+				print '</tr>';
+
+				$starthalfday=($object->halfday == -1 || $object->halfday == 2)?'afternoon':'morning';
+				$endhalfday=($object->halfday == 1 || $object->halfday == 2)?'morning':'afternoon';
+
+				if(!$edit)
+				{
+					print '<tr>';
+					print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+					print '<td>'.dol_print_date($object->date_debut,'day');
+					print ' &nbsp; &nbsp; ';
+					print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+					print '</td>';
+					print '</tr>';
+				}
+				else
+				{
+					print '<tr>';
+					print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+					print '<td>';
+					$form->select_date($object->date_debut,'date_debut_');
+					print ' &nbsp; &nbsp; ';
+					print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
+					print '</td>';
+					print '</tr>';
+				}
+
+				if (!$edit)
+				{
+					print '<tr>';
+					print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+					print '<td>'.dol_print_date($object->date_fin,'day');
+					print ' &nbsp; &nbsp; ';
+					print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+					print '</td>';
+					print '</tr>';
+				}
+				else
+				{
+					print '<tr>';
+					print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+					print '<td>';
+					$form->select_date($object->date_fin,'date_fin_');
+					print ' &nbsp; &nbsp; ';
+					print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+					print '</td>';
+					print '</tr>';
+				}
+				// Nb of days
+				print '<tr>';
+				print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
+				print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
+				print '</tr>';
+
+				if ($object->statut == 5)
+				{
+					print '<tr>';
+					print '<td>'.$langs->trans('DetailRefusCP').'</td>';
+					print '<td>'.$object->detail_refuse.'</td>';
+					print '</tr>';
+				}
+
+				// Description
+				if (!$edit)
+				{
+					print '<tr>';
+					print '<td>'.$langs->trans('DescCP').'</td>';
+					print '<td>'.nl2br($object->description).'</td>';
+					print '</tr>';
+				}
+				else
+				{
+					print '<tr>';
+					print '<td>'.$langs->trans('DescCP').'</td>';
+					print '<td class="tdtop">';
+					$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+					print $doleditor->Create(1);
+					print '</td></tr>';
+				}
+
+				print '</tbody>';
+				print '</table>'."\n";
+
+				print '</div>';
+				print '<div class="fichehalfright">';
+				print '<div class="ficheaddleft">';
+
+				print '<div class="underbanner clearboth"></div>';
 
 				// Info workflow
-                print '<table class="border centpercent">'."\n";
-                print '<tbody>';
-
-                if (! empty($object->fk_user_create))
-                {
-                	$userCreate=new User($db);
-                	$userCreate->fetch($object->fk_user_create);
-	                print '<tr>';
-	                print '<td class="titlefield">'.$langs->trans('RequestByCP').'</td>';
-	                print '<td>'.$userCreate->getNomUrl(-1).'</td>';
-	                print '</tr>';
-                }
-
-                // Validator
-                if (!$edit) {
-                    print '<tr>';
-                    print '<td class="titlefield">';
-                    if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy');
-                    else print $langs->trans('ReviewedByCP');
-                    print '</td>';
-                    print '<td>'.$valideur->getNomUrl(-1).'</td>';
-                    print '</tr>';
-                } else {
-                	print '<tr>';
-                    print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
-                    print '<td>';
-        			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
-                    print '</td>';
-                    print '</tr>';
-                }
-
-                print '<tr>';
-                print '<td>'.$langs->trans('DateCreateCP').'</td>';
-                print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
-                print '</tr>';
-                if ($object->statut == 3 || $object->statut == 4) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateValidCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';		// warning: date_valid is approval date on holiday module
-                    print '</tr>';
-                }
-                if ($object->statut == 4) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateCancelCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_cancel,'dayhour').'</td>';
-                    print '</tr>';
-                }
-                if ($object->statut == 5) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateRefusCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_refuse,'dayhour').'</td>';
-                    print '</tr>';
-                }
-                print '</tbody>';
-                print '</table>';
-
-                print '</div>';
-                print '</div>';
-                print '</div>';
-
-                print '<div class="clearboth"></div>';
-
-                dol_fiche_end();
-
-
-                // Confirmation messages
-                if ($action == 'delete')
-                {
-                	if ($user->rights->holiday->delete)
-                	{
-                		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
-                	}
-                }
-
-                // Si envoi en validation
-                if ($action == 'sendToValidate' && $object->statut == 1)
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
-                }
-
-                // Si validation de la demande
-                if ($action == 'valid')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
-                }
-
-                // Si refus de la demande
-                if ($action == 'refuse')
-                {
-                	$array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
-                }
-
-                // Si annulation de la demande
-                if ($action == 'cancel')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
-                }
-
-                // Si back to draft
-                if ($action == 'backtodraft')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
-                }
-
-
-                if ($action == 'edit' && $object->statut == 1)
-                {
-                    print '<div align="center">';
-                    if ($cancreate && $object->statut == 1)
-                    {
-                        print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
-                    }
-                    print '</div>';
-
-                    print '</form>';
-                }
-
-
-                if (! $edit)
-                {
-		            print '<div class="tabsAction">';
-
-                    // Boutons d'actions
-                    if ($cancreate && $object->statut == 1)
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
-                    }
-                    if ($cancreate && $object->statut == 1)		// If draft
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
-                    }
-                    if ($user->rights->holiday->delete && ($object->statut == 1 || $object->statut == 4 || $object->statut == 5))	// If draft or canceled or refused
-                    {
-                    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
-                    }
-
-                    if ($object->statut == 2)	// If validated
-                    {
-                        if ($user->id == $object->fk_validator)
-                        {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                        else
-                        {
-                            print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
-                            print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                    }
-
-                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
-                    {
-                    	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
-                    	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
-                    }
-
-                    if ($cancreate && $object->statut == 4)
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
-                    }
-
-                    print '</div>';
-                }
-
-            } else {
-                print '<div class="tabBar">';
-                print $langs->trans('ErrorUserViewCP');
-                print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-                print '</div>';
-            }
-
-        } else {
-            print '<div class="tabBar">';
-            print $langs->trans('ErrorIDFicheCP');
-            print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-            print '</div>';
-        }
-
-    }
+				print '<table class="border centpercent">'."\n";
+				print '<tbody>';
+
+				if (! empty($object->fk_user_create))
+				{
+					$userCreate=new User($db);
+					$userCreate->fetch($object->fk_user_create);
+					print '<tr>';
+					print '<td class="titlefield">'.$langs->trans('RequestByCP').'</td>';
+					print '<td>'.$userCreate->getNomUrl(-1).'</td>';
+					print '</tr>';
+				}
+
+				// Validator
+				if (!$edit) {
+					print '<tr>';
+					print '<td class="titlefield">';
+					if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy');
+					else print $langs->trans('ReviewedByCP');
+					print '</td>';
+					print '<td>'.$valideur->getNomUrl(-1).'</td>';
+					print '</tr>';
+				} else {
+					print '<tr>';
+					print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
+					print '<td>';
+					print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
+					print '</td>';
+					print '</tr>';
+				}
+
+				print '<tr>';
+				print '<td>'.$langs->trans('DateCreateCP').'</td>';
+				print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
+				print '</tr>';
+				if ($object->statut == 3 || $object->statut == 4) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateValidCP').'</td>';
+					print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';		// warning: date_valid is approval date on holiday module
+					print '</tr>';
+				}
+				if ($object->statut == 4) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateCancelCP').'</td>';
+					print '<td>'.dol_print_date($object->date_cancel,'dayhour').'</td>';
+					print '</tr>';
+				}
+				if ($object->statut == 5) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateRefusCP').'</td>';
+					print '<td>'.dol_print_date($object->date_refuse,'dayhour').'</td>';
+					print '</tr>';
+				}
+				print '</tbody>';
+				print '</table>';
+
+				print '</div>';
+				print '</div>';
+				print '</div>';
+
+				print '<div class="clearboth"></div>';
+
+				dol_fiche_end();
+
+
+				// Confirmation messages
+				if ($action == 'delete')
+				{
+					if ($user->rights->holiday->delete)
+					{
+						print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
+					}
+				}
+
+				// Si envoi en validation
+				if ($action == 'sendToValidate' && $object->statut == 1)
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
+				}
+
+				// Si validation de la demande
+				if ($action == 'valid')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
+				}
+
+				// Si refus de la demande
+				if ($action == 'refuse')
+				{
+					$array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
+				}
+
+				// Si annulation de la demande
+				if ($action == 'cancel')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
+				}
+
+				// Si back to draft
+				if ($action == 'backtodraft')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
+				}
+
+
+				if ($action == 'edit' && $object->statut == 1)
+				{
+					print '<div align="center">';
+					if ($cancreate && $object->statut == 1)
+					{
+						print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
+					}
+					print '</div>';
+
+					print '</form>';
+				}
+
+
+				if (! $edit)
+				{
+					print '<div class="tabsAction">';
+
+					// Boutons d'actions
+					if ($cancreate && $object->statut == 1)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
+					}
+					if ($cancreate && $object->statut == 1)		// If draft
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
+					}
+					if ($user->rights->holiday->delete && ($object->statut == 1 || $object->statut == 4 || $object->statut == 5))	// If draft or canceled or refused
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
+					}
+
+					if ($object->statut == 2)	// If validated
+					{
+						if ($user->id == $object->fk_validator)
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+						}
+						else
+						{
+							print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
+							print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
+						}
+					}
+
+					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+					{
+						if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
+						else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
+					}
+
+					if ($cancreate && $object->statut == 4)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
+					}
+
+					print '</div>';
+				}
+
+			} else {
+				print '<div class="tabBar">';
+				print $langs->trans('ErrorUserViewCP');
+				print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+				print '</div>';
+			}
+
+		} else {
+			print '<div class="tabBar">';
+			print $langs->trans('ErrorIDFicheCP');
+			print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+			print '</div>';
+		}
+
+	}
 
 }
 

Spacing +165 added lines, -165 removed lines

@@ -39,28 +39,28 @@ 
 
 // Get parameters
 $myparam = GETPOST("myparam");
-$action=GETPOST('action', 'alpha');
-$id=GETPOST('id', 'int');
-$fuserid = (GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id);
+$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
-$now=dol_now();
+$now = dol_now();
 
 $langs->load("holiday");
 
 $childids = $user->getAllChildIds(1);
 
 $cancreate = 0;
-if (! empty($user->rights->holiday->write_all)) $cancreate=1;
-if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
+if (!empty($user->rights->holiday->write_all)) $cancreate = 1;
+if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate = 1;
 
 $candelete = 0;
-if (! empty($user->rights->holiday->delete)) $candelete=1;
+if (!empty($user->rights->holiday->delete)) $candelete = 1;
 
 $morefilter = 'AND employee = 1';
-if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
 
 
 /*
@@ -73,14 +73,14 @@ 
 	$object = new Holiday($db);
 
     // If no right to create a request
-    if (! $cancreate)
+    if (!$cancreate)
     {
     	$error++;
     	setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
-    	$action='request';
+    	$action = 'request';
     }
 
-    if (! $error)
+    if (!$error)
     {
     	$db->begin();
 
@@ -88,13 +88,13 @@ 
 	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
 	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
 	    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-	    $starthalfday=GETPOST('starthalfday');
-	    $endhalfday=GETPOST('endhalfday');
-	    $type=GETPOST('type');
-	    $halfday=0;
-	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	    else if ($starthalfday == 'afternoon') $halfday=-1;
-	    else if ($endhalfday == 'morning') $halfday=1;
+	    $starthalfday = GETPOST('starthalfday');
+	    $endhalfday = GETPOST('endhalfday');
+	    $type = GETPOST('type');
+	    $halfday = 0;
+	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday = 2;
+	    else if ($starthalfday == 'afternoon') $halfday = -1;
+	    else if ($endhalfday == 'morning') $halfday = 1;
 
 	    $valideur = GETPOST('valideur');
 	    $description = trim(GETPOST('description'));
@@ -104,7 +104,7 @@ 
 	    {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 
 	    // If no start date
@@ -112,39 +112,39 @@ 
 	    {
 	        setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 	    // If no end date
 	    if (empty($date_fin))
 	    {
 	        setEventMessages($langs->trans("NoDateFin"), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 	    // If start date after end date
 	    if ($date_debut > $date_fin)
 	    {
 	        setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 
 	    // Check if there is already holiday for this period
 	    $verifCP = $object->verifDateHolidayCP($fuserid, $date_debut, $date_fin, $halfday);
-	    if (! $verifCP)
+	    if (!$verifCP)
 	    {
 	        setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 
 	    // If there is no Business Days within request
-	    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-	    if($nbopenedday < 0.5)
+	    $nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+	    if ($nbopenedday < 0.5)
 	    {
 	        setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
 	        $error++;
-	        $action='create';
+	        $action = 'create';
 	    }
 
 	    // If no validator designated
@@ -156,7 +156,7 @@ 
 
 	    $result = 0;
 
-	    if (! $error)
+	    if (!$error)
 	    {
     	    $object->fk_user = $fuserid;
     	    $object->description = $description;
@@ -175,7 +175,7 @@ 
 	    }
 
 	    // If no SQL error we redirect to the request card
-	    if (! $error)
+	    if (!$error)
 	    {
 			$db->commit();
 
@@ -195,15 +195,15 @@ 
 	$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
 	$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
 	$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-	$starthalfday=GETPOST('starthalfday');
-	$endhalfday=GETPOST('endhalfday');
-	$halfday=0;
-	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	else if ($starthalfday == 'afternoon') $halfday=-1;
-	else if ($endhalfday == 'morning') $halfday=1;
+	$starthalfday = GETPOST('starthalfday');
+	$endhalfday = GETPOST('endhalfday');
+	$halfday = 0;
+	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday = 2;
+	else if ($starthalfday == 'afternoon') $halfday = -1;
+	else if ($endhalfday == 'morning') $halfday = 1;
 
     // If no right to modify a request
-    if (! $user->rights->holiday->write)
+    if (!$user->rights->holiday->write)
     {
         header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=CantUpdate');
         exit;
@@ -246,7 +246,7 @@ 
             }
 
             // If there is no Business Days within request
-            $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+            $nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
             if ($nbopenedday < 0.5)
             {
                 header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=DureeHoliday');
@@ -265,7 +265,7 @@ 
 			if ($verif <= 0)
 			{
 				setEventMessages($object->error, $object->errors, 'warnings');
-				$action='edit';
+				$action = 'edit';
 			}
 			else
 			{
@@ -276,20 +276,20 @@ 
         else
         {
         	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-        	$action='';
+        	$action = '';
         }
     }
     else
     {
     	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
-    	$action='';
+    	$action = '';
     }
 }
 
 // If delete of request
 if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes' && $user->rights->holiday->delete)
 {
-	$error=0;
+	$error = 0;
 
 	$db->begin();
 
@@ -302,17 +302,17 @@ 
 		// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
 		if ($candelete)
 		{
-			$result=$object->delete($user);
+			$result = $object->delete($user);
 		}
 		else
 		{
 			$error++;
 			setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
-			$action='';
+			$action = '';
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		header('Location: list.php?restore_lastsearch_values=1');
@@ -331,7 +331,7 @@ 
     $object->fetch($id);
 
     // Si brouillon et créateur
-    if($object->statut == 1 && $cancreate)
+    if ($object->statut == 1 && $cancreate)
     {
         $object->statut = 2;
 
@@ -359,14 +359,14 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
 
             // Content
             $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.= $langs->transnoentities("HolidaysToValidateBody")."\n";
+            $message .= "\n";
+            $message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
 
             $delayForRequest = $object->getConfCP('delayForRequest');
             //$delayForRequest = $delayForRequest * (60*60*24);
@@ -374,43 +374,43 @@ 
             $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
             // Si l'option pour avertir le valideur en cas de délai trop court
-            if($object->getConfCP('AlertValidatorDelay'))
+            if ($object->getConfCP('AlertValidatorDelay'))
             {
-                if($object->date_debut < $nextMonth)
+                if ($object->date_debut < $nextMonth)
                 {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateDelay",$object->getConfCP('delayForRequest'))."\n";
+                    $message .= "\n";
+                    $message .= $langs->transnoentities("HolidaysToValidateDelay", $object->getConfCP('delayForRequest'))."\n";
                 }
             }
 
             // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
             if ($object->getConfCP('AlertValidatorSolde'))
             {
-            	$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+            	$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
                 if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type))
                 {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+                    $message .= "\n";
+                    $message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
                 }
             }
 
-            $message.= "\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin,'day')."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
+            $message .= "\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+            $message .= "\n";
 
-            $trackid='leav'.$object->id;
+            $trackid = 'leav'.$object->id;
 
             $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
             // Envoi du mail
-            $result=$mail->sendfile();
+            $result = $mail->sendfile();
 
             if (!$result)
             {
                 setEventMessages($mail->error, $mail->errors, 'warnings');
-                $action='';
+                $action = '';
             }
             else
             {
@@ -421,7 +421,7 @@ 
         else
         {
         	setEventMessages($object->error, $object->errors, 'errors');
-        	$action='';
+        	$action = '';
         }
     }
 }
@@ -446,7 +446,7 @@ 
         if ($verif > 0)
         {
             // Calculcate number of days consummed
-            $nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+            $nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
             $soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
             $newSolde = $soldeActuel - ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
@@ -476,31 +476,31 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
 
             // Content
             $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.=  $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut,'day'),dol_print_date($object->date_fin,'day'))."\n";
+            $message .= "\n";
+            $message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+            $message .= "\n";
 
-            $trackid='leav'.$object->id;
+            $trackid = 'leav'.$object->id;
 
             $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
             // Envoi du mail
-            $result=$mail->sendfile();
+            $result = $mail->sendfile();
 
             if (!$result)
             {
             	setEventMessages($mail->error, $mail->errors, 'warnings');
-            	$action='';
+            	$action = '';
             }
             else
             {
@@ -511,14 +511,14 @@ 
         else
         {
         	setEventMessages($object->error, $object->errors, 'errors');
-        	$action='';
+        	$action = '';
         }
     }
 }
 
-if ($action == 'confirm_refuse' && GETPOST('confirm','alpha') == 'yes')
+if ($action == 'confirm_refuse' && GETPOST('confirm', 'alpha') == 'yes')
 {
-	if (! empty($_POST['detail_refuse']))
+	if (!empty($_POST['detail_refuse']))
     {
         $object = new Holiday($db);
         $object->fetch($id);
@@ -529,7 +529,7 @@ 
             $object->date_refuse = dol_print_date('dayhour', dol_now());
             $object->fk_user_refuse = $user->id;
             $object->statut = 5;
-            $object->detail_refuse = GETPOST('detail_refuse','alphanohtml');
+            $object->detail_refuse = GETPOST('detail_refuse', 'alphanohtml');
 
             $verif = $object->update($user);
 
@@ -554,32 +554,32 @@ 
 
 	            // Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+	            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
 
                 // Content
             	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	            $message.= "\n";
-                $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
-                $message.= GETPOST('detail_refuse','alpha')."\n\n";
+	            $message .= "\n";
+                $message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+                $message .= GETPOST('detail_refuse', 'alpha')."\n\n";
 
-	            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+	            $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-                $message.= "\n";
+	            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+                $message .= "\n";
 
-	            $trackid='leav'.$object->id;
+	            $trackid = 'leav'.$object->id;
 
 	            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
                 // Envoi du mail
-                $result=$mail->sendfile();
+                $result = $mail->sendfile();
 
                 if (!$result)
                 {
                 	setEventMessages($mail->error, $mail->errors, 'warnings');
-                	$action='';
+                	$action = '';
                 }
                 else
                 {
@@ -590,12 +590,12 @@ 
             else
             {
             	setEventMessages($object->error, $object->errors, 'errors');
-            	$action='';
+            	$action = '';
             }
         }
     } else {
     	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DetailRefusCP")), null, 'errors');
-    	$action='refuse';
+    	$action = 'refuse';
     }
 }
 
@@ -618,7 +618,7 @@ 
     	setEventMessages($langs->trans('ErrorBackToDraft').' '.$object->error, $object->errors, 'errors');
     }
 
-    if (! $error)
+    if (!$error)
     {
         $db->commit();
 
@@ -640,7 +640,7 @@ 
     $object->fetch($id);
 
     // Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
-    if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)))
+    if (($object->statut == 2 || $object->statut == 3) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)))
     {
     	$db->begin();
 
@@ -654,16 +654,16 @@ 
         if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
         {
         	// Calculcate number of days consummed
-        	$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+        	$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
         	$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
         	$newSolde = $soldeActuel + ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
 
         	// On ajoute la modification dans le LOG
-        	$result1=$object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
+        	$result1 = $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
 
         	// Mise à jour du solde
-        	$result2=$object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
+        	$result2 = $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
 
         	if ($result1 < 0 || $result2 < 0)
         	{
@@ -672,7 +672,7 @@ 
         	}
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$db->commit();
         }
@@ -682,7 +682,7 @@ 
         }
 
         // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if (! $error && $result > 0)
+        if (!$error && $result > 0)
         {
             // To
             $destinataire = new User($db);
@@ -702,31 +702,31 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
 
             // Content
            	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
+            $message .= "\n";
 
-            $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+            $message .= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-            $message.= "\n";
+            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+            $message .= "\n";
 
-            $trackid='leav'.$object->id;
+            $trackid = 'leav'.$object->id;
 
             $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
             // Envoi du mail
-            $result=$mail->sendfile();
+            $result = $mail->sendfile();
 
             if (!$result)
             {
             	setEventMessages($mail->error, $mail->errors, 'warnings');
-            	$action='';
+            	$action = '';
             }
             else
             {
@@ -747,7 +747,7 @@ 
 $form = new Form($db);
 $object = new Holiday($db);
 
-$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
+$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
 
 llxHeader('', $langs->trans('CPTitreMenu'));
 
@@ -756,7 +756,7 @@ 
     // Si l'utilisateur n'a pas le droit de faire une demande
     if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
     {
-        $errors[]=$langs->trans('CantCreateCP');
+        $errors[] = $langs->trans('CantCreateCP');
     }
     else
     {
@@ -766,7 +766,7 @@ 
         // Si il y a une erreur
         if (GETPOST('error')) {
 
-            switch(GETPOST('error')) {
+            switch (GETPOST('error')) {
                 case 'datefin' :
                     $errors[] = $langs->trans('ErrorEndDateCP');
                     break;
@@ -839,20 +839,20 @@ 
         {
 	        dol_fiche_head('', '', '', -1);
 
-	        $out='';
-	        $typeleaves=$object->getTypes(1,1);
-	    	foreach($typeleaves as $key => $val)
+	        $out = '';
+	        $typeleaves = $object->getTypes(1, 1);
+	    	foreach ($typeleaves as $key => $val)
 			{
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
 				$nb_holiday += $nb_type;
-				$out .= ' - '.$val['label'].': <strong>'.($nb_type?price2num($nb_type):0).'</strong><br>';
+				$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
 			}
-	        print $langs->trans('SoldeCPUser', round($nb_holiday,5)).'<br>';
+	        print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
 			print $out;
 
 	        dol_fiche_end();
         }
-        elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+        elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
         {
         	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
         }
@@ -870,10 +870,10 @@ 
         print '<td>';
         if (empty($user->rights->holiday->write_all))
         {
-        	print $form->select_dolusers(($fuserid?$fuserid:$user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
+        	print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
         	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
         }
-        else print $form->select_dolusers(GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
+        else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
         print '</td>';
         print '</tr>';
 
@@ -881,16 +881,16 @@ 
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
         print '<td>';
-        $typeleaves=$object->getTypes(1,-1);
-        $arraytypeleaves=array();
-        foreach($typeleaves as $key => $val)
+        $typeleaves = $object->getTypes(1, -1);
+        $arraytypeleaves = array();
+        foreach ($typeleaves as $key => $val)
         {
-        	$labeltoshow = ($langs->trans($val['code'])!=$val['code'] ? $langs->trans($val['code']) : $val['label']);
-        	$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
-			$arraytypeleaves[$val['rowid']]=$labeltoshow;
+        	$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+        	$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
+			$arraytypeleaves[$val['rowid']] = $labeltoshow;
         }
-        print $form->selectarray('type', $arraytypeleaves, (GETPOST('type','alpha')?GETPOST('type','alpha'):''), 1);
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
         print '</tr>';
 
@@ -902,14 +902,14 @@ 
         print '</td>';
         print '<td>';
         // Si la demande ne vient pas de l'agenda
-        if (! GETPOST('date_debut_')) {
+        if (!GETPOST('date_debut_')) {
             $form->select_date(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
         } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month','int'), GETPOST('date_debut_day','int'), GETPOST('date_debut_year','int'));
+            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
             $form->select_date($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
         }
         print ' &nbsp; &nbsp; ';
-        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday','alpha')?GETPOST('starthalfday','alpha'):'morning'));
+        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ?GETPOST('starthalfday', 'alpha') : 'morning'));
         print '</td>';
         print '</tr>';
 
@@ -921,14 +921,14 @@ 
         print '</td>';
         print '<td>';
         // Si la demande ne vient pas de l'agenda
-        if (! GETPOST('date_fin_')) {
-            $form->select_date(-1,'date_fin_', 0, 0, 0, '', 1, 1);
+        if (!GETPOST('date_fin_')) {
+            $form->select_date(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
         } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month','int'), GETPOST('date_fin_day','int'), GETPOST('date_fin_year','int'));
-            $form->select_date($tmpdate,'date_fin_', 0, 0, 0, '', 1, 1);
+            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
+            $form->select_date($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
         }
         print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday','alpha')?GETPOST('endhalfday','alpha'):'afternoon'));
+        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ?GETPOST('endhalfday', 'alpha') : 'afternoon'));
         print '</td>';
         print '</tr>';
 
@@ -936,7 +936,7 @@ 
         print '<tr>';
         print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
         print '<td>';
-        print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
+        print $form->select_dolusers((GETPOST('valideur', 'int') > 0 ?GETPOST('valideur', 'int') : $user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1); // By default, hierarchical parent
         print '</td>';
         print '</tr>';
 
@@ -944,7 +944,7 @@ 
         print '<tr>';
         print '<td>'.$langs->trans("DescCP").'</td>';
         print '<td class="tdtop">';
-        $doleditor = new DolEditor('description', GETPOST('description','none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+        $doleditor = new DolEditor('description', GETPOST('description', 'none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
         print $doleditor->Create(1);
         print '</td></tr>';
 
@@ -989,7 +989,7 @@ 
             // Si il y a une erreur
             if (GETPOST('error'))
             {
-                switch(GETPOST('error'))
+                switch (GETPOST('error'))
                 {
                     case 'datefin' :
                         $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
@@ -1026,7 +1026,7 @@ 
             // On vérifie si l'utilisateur à le droit de lire cette demande
             if ($cancreate)
             {
-                $head=holiday_prepare_head($object);
+                $head = holiday_prepare_head($object);
 
                 if ($action == 'edit' && $object->statut == 1)
                 {
@@ -1038,7 +1038,7 @@ 
 
                 dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
-                $linkback='<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+                $linkback = '<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
                 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
 
@@ -1061,20 +1061,20 @@ 
 		        print '<tr>';
 		        print '<td>'.$langs->trans("Type").'</td>';
 		        print '<td>';
-		        $typeleaves=$object->getTypes(1,-1);
-		        $labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code'])!=$typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
-		        print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved",$object->fk_type) : $labeltoshow;
+		        $typeleaves = $object->getTypes(1, -1);
+		        $labeltoshow = (($typeleaves[$object->fk_type]['code'] && $langs->trans($typeleaves[$object->fk_type]['code']) != $typeleaves[$object->fk_type]['code']) ? $langs->trans($typeleaves[$object->fk_type]['code']) : $typeleaves[$object->fk_type]['label']);
+		        print empty($labeltoshow) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $labeltoshow;
 		        print '</td>';
 		        print '</tr>';
 
-			    $starthalfday=($object->halfday == -1 || $object->halfday == 2)?'afternoon':'morning';
-			    $endhalfday=($object->halfday == 1 || $object->halfday == 2)?'morning':'afternoon';
+			    $starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
+			    $endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
 
-                if(!$edit)
+                if (!$edit)
                 {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($object->date_debut,'day');
+                    print '<td>'.dol_print_date($object->date_debut, 'day');
 			        print ' &nbsp; &nbsp; ';
 			        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
                     print '</td>';
@@ -1085,9 +1085,9 @@ 
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
                     print '<td>';
-                    $form->select_date($object->date_debut,'date_debut_');
+                    $form->select_date($object->date_debut, 'date_debut_');
 			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
+        			print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ?GETPOST('starthalfday') : $starthalfday));
                     print '</td>';
                     print '</tr>';
                 }
@@ -1096,7 +1096,7 @@ 
                 {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($object->date_fin,'day');
+                    print '<td>'.dol_print_date($object->date_fin, 'day');
                     print ' &nbsp; &nbsp; ';
                     print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
                     print '</td>';
@@ -1107,9 +1107,9 @@ 
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
                     print '<td>';
-                    $form->select_date($object->date_fin,'date_fin_');
+                    $form->select_date($object->date_fin, 'date_fin_');
 			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+        			print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
                     print '</td>';
                     print '</tr>';
                 }
@@ -1158,9 +1158,9 @@ 
                 print '<table class="border centpercent">'."\n";
                 print '<tbody>';
 
-                if (! empty($object->fk_user_create))
+                if (!empty($object->fk_user_create))
                 {
-                	$userCreate=new User($db);
+                	$userCreate = new User($db);
                 	$userCreate->fetch($object->fk_user_create);
 	                print '<tr>';
 	                print '<td class="titlefield">'.$langs->trans('RequestByCP').'</td>';
@@ -1181,31 +1181,31 @@ 
                 	print '<tr>';
                     print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
                     print '<td>';
-        			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
+        			print $form->select_dolusers($object->fk_validator, "valideur", 1, ($user->admin ? '' : array($user->id))); // By default, hierarchical parent
                     print '</td>';
                     print '</tr>';
                 }
 
                 print '<tr>';
                 print '<td>'.$langs->trans('DateCreateCP').'</td>';
-                print '<td>'.dol_print_date($object->date_create,'dayhour').'</td>';
+                print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
                 print '</tr>';
                 if ($object->statut == 3 || $object->statut == 4) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateValidCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_valid,'dayhour').'</td>';		// warning: date_valid is approval date on holiday module
+                    print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module
                     print '</tr>';
                 }
                 if ($object->statut == 4) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateCancelCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_cancel,'dayhour').'</td>';
+                    print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
                     print '</tr>';
                 }
                 if ($object->statut == 5) {
                     print '<tr>';
                     print '<td>'.$langs->trans('DateRefusCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_refuse,'dayhour').'</td>';
+                    print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';
                     print '</tr>';
                 }
                 print '</tbody>';
@@ -1225,39 +1225,39 @@ 
                 {
                 	if ($user->rights->holiday->delete)
                 	{
-                		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
+                		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleDeleteCP"), $langs->trans("ConfirmDeleteCP"), "confirm_delete", '', 0, 1);
                 	}
                 }
 
                 // Si envoi en validation
                 if ($action == 'sendToValidate' && $object->statut == 1)
                 {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
+                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleToValidCP"), $langs->trans("ConfirmToValidCP"), "confirm_send", '', 1, 1);
                 }
 
                 // Si validation de la demande
                 if ($action == 'valid')
                 {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
+                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleValidCP"), $langs->trans("ConfirmValidCP"), "confirm_valid", '', 1, 1);
                 }
 
                 // Si refus de la demande
                 if ($action == 'refuse')
                 {
-                	$array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+                	$array_input = array(array('type'=>"text", 'label'=> $langs->trans('DetailRefusCP'), 'name'=>"detail_refuse", 'size'=>"50", 'value'=>""));
                 	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
                 }
 
                 // Si annulation de la demande
                 if ($action == 'cancel')
                 {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
+                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleCancelCP"), $langs->trans("ConfirmCancelCP"), "confirm_cancel", '', 1, 1);
                 }
 
                 // Si back to draft
                 if ($action == 'backtodraft')
                 {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("TitleSetToDraft"),$langs->trans("ConfirmSetToDraft"),"confirm_draft", '', 1, 1);
+                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleSetToDraft"), $langs->trans("ConfirmSetToDraft"), "confirm_draft", '', 1, 1);
                 }
 
 
@@ -1274,7 +1274,7 @@ 
                 }
 
 
-                if (! $edit)
+                if (!$edit)
                 {
 		            print '<div class="tabsAction">';
 
@@ -1306,7 +1306,7 @@ 
                         }
                     }
 
-                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
                     {
                     	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
                     	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';

Braces +94 added lines, -72 removed lines

@@ -44,7 +44,9 @@ 
 $fuserid = (GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id);
 
 // Protection if external user
-if ($user->societe_id > 0) accessforbidden();
+if ($user->societe_id > 0) {
+	accessforbidden();
+}
 
 $now=dol_now();
 
@@ -53,14 +55,22 @@ 
 $childids = $user->getAllChildIds(1);
 
 $cancreate = 0;
-if (! empty($user->rights->holiday->write_all)) $cancreate=1;
-if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
+if (! empty($user->rights->holiday->write_all)) {
+	$cancreate=1;
+}
+if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) {
+	$cancreate=1;
+}
 
 $candelete = 0;
-if (! empty($user->rights->holiday->delete)) $candelete=1;
+if (! empty($user->rights->holiday->delete)) {
+	$candelete=1;
+}
 
 $morefilter = 'AND employee = 1';
-if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) {
+	$morefilter = '';
+}
 
 
 /*
@@ -92,9 +102,13 @@ 
 	    $endhalfday=GETPOST('endhalfday');
 	    $type=GETPOST('type');
 	    $halfday=0;
-	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	    else if ($starthalfday == 'afternoon') $halfday=-1;
-	    else if ($endhalfday == 'morning') $halfday=1;
+	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') {
+	    	$halfday=2;
+	    } else if ($starthalfday == 'afternoon') {
+	    	$halfday=-1;
+	    } else if ($endhalfday == 'morning') {
+	    	$halfday=1;
+	    }
 
 	    $valideur = GETPOST('valideur');
 	    $description = trim(GETPOST('description'));
@@ -181,8 +195,7 @@ 
 
 	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
-	    }
-	    else
+	    } else
 		{
 	    	$db->rollback();
 	    }
@@ -198,9 +211,13 @@ 
 	$starthalfday=GETPOST('starthalfday');
 	$endhalfday=GETPOST('endhalfday');
 	$halfday=0;
-	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	else if ($starthalfday == 'afternoon') $halfday=-1;
-	else if ($endhalfday == 'morning') $halfday=1;
+	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') {
+		$halfday=2;
+	} else if ($starthalfday == 'afternoon') {
+		$halfday=-1;
+	} else if ($endhalfday == 'morning') {
+		$halfday=1;
+	}
 
     // If no right to modify a request
     if (! $user->rights->holiday->write)
@@ -266,20 +283,17 @@ 
 			{
 				setEventMessages($object->error, $object->errors, 'warnings');
 				$action='edit';
-			}
-			else
+			} else
 			{
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
 			}
-        }
-        else
+        } else
         {
         	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
         	$action='';
         }
-    }
-    else
+    } else
     {
     	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
     	$action='';
@@ -303,8 +317,7 @@ 
 		if ($candelete)
 		{
 			$result=$object->delete($user);
-		}
-		else
+		} else
 		{
 			$error++;
 			setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
@@ -317,8 +330,7 @@ 
 		$db->commit();
 		header('Location: list.php?restore_lastsearch_values=1');
 		exit;
-	}
-	else
+	} else
 	{
 		$db->rollback();
 	}
@@ -359,7 +371,9 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+            	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            }
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
 
@@ -411,14 +425,12 @@ 
             {
                 setEventMessages($mail->error, $mail->errors, 'warnings');
                 $action='';
-            }
-            else
+            } else
             {
             	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
             	exit;
             }
-        }
-        else
+        } else
         {
         	setEventMessages($object->error, $object->errors, 'errors');
         	$action='';
@@ -476,7 +488,9 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+            	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            }
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
 
@@ -501,14 +515,12 @@ 
             {
             	setEventMessages($mail->error, $mail->errors, 'warnings');
             	$action='';
-            }
-            else
+            } else
             {
             	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
             	exit;
             }
-        }
-        else
+        } else
         {
         	setEventMessages($object->error, $object->errors, 'errors');
         	$action='';
@@ -554,7 +566,9 @@ 
 
 	            // Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	            	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+	            }
 
 	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
 
@@ -580,14 +594,12 @@ 
                 {
                 	setEventMessages($mail->error, $mail->errors, 'warnings');
                 	$action='';
-                }
-                else
+                } else
                 {
                 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
                 	exit;
                 }
-            }
-            else
+            } else
             {
             	setEventMessages($object->error, $object->errors, 'errors');
             	$action='';
@@ -624,8 +636,7 @@ 
 
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
         exit;
-    }
-    else
+    } else
     {
         $db->rollback();
     }
@@ -651,10 +662,12 @@ 
 
         $result = $object->update($user);
 
-        if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
+        if ($result >= 0 && $oldstatus == 3) {
+        	// holiday was already validated, status 3, so we must increase back sold
         {
         	// Calculcate number of days consummed
         	$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday);
+        }
 
         	$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
         	$newSolde = $soldeActuel + ($nbopenedday * $object->getConfCP('nbHolidayDeducted'));
@@ -675,8 +688,7 @@ 
         if (! $error)
         {
         	$db->commit();
-        }
-        else
+        } else
         {
         	$db->rollback();
         }
@@ -702,7 +714,9 @@ 
 
             // Subject
 			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+            	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+            }
 
             $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
 
@@ -727,8 +741,7 @@ 
             {
             	setEventMessages($mail->error, $mail->errors, 'warnings');
             	$action='';
-            }
-            else
+            } else
             {
             	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
             	exit;
@@ -757,8 +770,7 @@ 
     if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
     {
         $errors[]=$langs->trans('CantCreateCP');
-    }
-    else
+    } else
     {
         // Formulaire de demande de congés payés
         print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
@@ -851,8 +863,7 @@ 
 			print $out;
 
 	        dol_fiche_end();
-        }
-        elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+        } elseif(! is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
         {
         	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
         }
@@ -872,8 +883,9 @@ 
         {
         	print $form->select_dolusers(($fuserid?$fuserid:$user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
         	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
+        } else {
+        	print $form->select_dolusers(GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
         }
-        else print $form->select_dolusers(GETPOST('fuserid','int')?GETPOST('fuserid','int'):$user->id, 'fuserid', 0, '', 0, '', '', 0, 0, 0, $morefilter, 0, '', 'maxwidth300');
         print '</td>';
         print '</tr>';
 
@@ -890,7 +902,9 @@ 
 			$arraytypeleaves[$val['rowid']]=$labeltoshow;
         }
         print $form->selectarray('type', $arraytypeleaves, (GETPOST('type','alpha')?GETPOST('type','alpha'):''), 1);
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin) {
+        	print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
         print '</td>';
         print '</tr>';
 
@@ -961,8 +975,7 @@ 
 
         print '</from>'."\n";
     }
-}
-else
+} else
 {
     if ($error)
     {
@@ -970,8 +983,7 @@ 
         print $error;
         print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
         print '</div>';
-    }
-    else
+    } else
     {
         // Affichage de la fiche d'une demande de congés payés
         if ($id > 0)
@@ -1079,8 +1091,7 @@ 
 			        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else
+                } else
                 {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
@@ -1101,8 +1112,7 @@ 
                     print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else
+                } else
                 {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
@@ -1134,8 +1144,7 @@ 
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td>'.nl2br($object->description).'</td>';
                     print '</tr>';
-                }
-                else
+                } else
                 {
                     print '<tr>';
                     print '<td>'.$langs->trans('DescCP').'</td>';
@@ -1172,8 +1181,11 @@ 
                 if (!$edit) {
                     print '<tr>';
                     print '<td class="titlefield">';
-                    if ($object->statut == 3 || $object->statut == 4) print $langs->trans('ApprovedBy');
-                    else print $langs->trans('ReviewedByCP');
+                    if ($object->statut == 3 || $object->statut == 4) {
+                    	print $langs->trans('ApprovedBy');
+                    } else {
+                    	print $langs->trans('ReviewedByCP');
+                    }
                     print '</td>';
                     print '<td>'.$valideur->getNomUrl(-1).'</td>';
                     print '</tr>';
@@ -1283,33 +1295,41 @@ 
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
                     }
-                    if ($cancreate && $object->statut == 1)		// If draft
+                    if ($cancreate && $object->statut == 1) {
+                    	// If draft
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
                     }
-                    if ($user->rights->holiday->delete && ($object->statut == 1 || $object->statut == 4 || $object->statut == 5))	// If draft or canceled or refused
+                    }
+                    if ($user->rights->holiday->delete && ($object->statut == 1 || $object->statut == 4 || $object->statut == 5)) {
+                    	// If draft or canceled or refused
                     {
                     	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
                     }
+                    }
 
-                    if ($object->statut == 2)	// If validated
+                    if ($object->statut == 2) {
+                    	// If validated
                     {
                         if ($user->id == $object->fk_validator)
                         {
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+                    }
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                        else
+                        } else
                         {
                             print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
                             print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
                     }
 
-                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3)) {
+                    	// Status validated or approved
                     {
                     	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
-                    	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
+                    } else {
+                    		print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
+                    	}
                     }
 
                     if ($cancreate && $object->statut == 4)
@@ -1341,4 +1361,6 @@ 
 // End of page
 llxFooter();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}

htdocs/adherents/admin/adherent_emails.php

Spacing +37 added lines, -37 removed lines

@@ -36,12 +36,12 @@ 
 $langs->load("admin");
 $langs->load("members");
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
 
-$type=array('yesno','texte','chaine');
+$type = array('yesno', 'texte', 'chaine');
 
-$action = GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 
 /*
@@ -52,19 +52,19 @@ 
 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'), 'chaine', 0, '', $conf->entity);
-    $res2=dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $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);
+    $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
+    $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $res2 = dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
+    $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)
     {
-        $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))
+        $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))
         {
-            $res6=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
+            $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)
@@ -82,23 +82,23 @@ 
 // Action mise a jour ou ajout d'une constante
 if ($action == 'update' || $action == 'add')
 {
-	$constname=GETPOST('constname','alpha');
-	$constvalue=(GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
+	$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_CARD_TYPE' || $constname == 'ADHERENT_ETIQUETTE_TYPE' || $constname == 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue = '';
+	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
 	{
-		if ($constvalue) $constvalue=0;
-		else $constvalue=1;
+		if ($constvalue) $constvalue = 0;
+		else $constvalue = 1;
 	}
 
-	$consttype=GETPOST('consttype','alpha');
-	$constnote=GETPOST('constnote');
-	$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
+	$consttype = GETPOST('consttype', 'alpha');
+	$constnote = GETPOST('constnote');
+	$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
 
-	if (! $res > 0) $error++;
+	if (!$res > 0) $error++;
 
-	if (! $error)
+	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
@@ -111,7 +111,7 @@ 
 // Action activation d'un sous module du module adherent
 if ($action == 'set')
 {
-    $result=dolibarr_set_const($db, GETPOST('name','alpha'),GETPOST('value'),'',0,'',$conf->entity);
+    $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
     if ($result < 0)
     {
         print $db->error();
@@ -121,7 +121,7 @@ 
 // Action desactivation d'un sous module du module adherent
 if ($action == 'unset')
 {
-    $result=dolibarr_del_const($db,GETPOST('name','alpha'),$conf->entity);
+    $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
     if ($result < 0)
     {
         print $db->error();
@@ -136,13 +136,13 @@ 
 
 $form = new Form($db);
 
-$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+$help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
 
-llxHeader('',$langs->trans("MembersSetup"),$help_url);
+llxHeader('', $langs->trans("MembersSetup"), $help_url);
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 
 $head = member_admin_prepare_head();
@@ -156,7 +156,7 @@ 
 /*
  * Editing global variables not related to a specific theme
  */
-$constantes=array(
+$constantes = array(
 		'ADHERENT_MAIL_FROM',
 		'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT',
 		'ADHERENT_AUTOREGISTER_NOTIF_MAIL',
@@ -170,14 +170,14 @@ 
 		'ADHERENT_MAIL_RESIL',
 		);
 
-$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext.='__YEAR__, __MONTH__, __DAY__';
+$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
+$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
+$helptext .= '__YEAR__, __MONTH__, __DAY__';
 
-$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
+$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
+$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
 //$helptext.='__YEAR__, __MONTH__, __DAY__';	// Not supported
 
 form_constantes($constantes, 0, $helptext);

htdocs/adherents/class/adherent.class.php

Spacing +676 added lines, -676 removed lines

@@ -41,9 +41,9 @@ 
  */
 class Adherent extends CommonObject
 {
-	public $element='member';
-	public $table_element='adherent';
-	public $ismultientitymanaged = 1;  // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = 'member';
+	public $table_element = 'adherent';
+	public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 
 	var $mesgs;
 
@@ -62,9 +62,9 @@ 
 	var $zip;
 	var $town;
 
-	var $state_id;              // Id of department
-	var $state_code;            // Code of department
-	var $state;                 // Label of department
+	var $state_id; // Id of department
+	var $state_code; // Code of department
+	var $state; // Label of department
 
 	var $email;
 	var $skype;
@@ -74,7 +74,7 @@ 
 
 	var $morphy;
 	var $public;
-	var $statut;			// -1:brouillon, 0:resilie, >=1:valide,paye
+	var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye
 	var $photo;
 
 	var $datec;
@@ -86,8 +86,8 @@ 
 	var $note_public;
 	var $note_private;
 
-	var $typeid;			// Id type adherent
-	var $type;				// Libelle type adherent
+	var $typeid; // Id type adherent
+	var $type; // Libelle type adherent
 	var $need_subscription;
 
 	var $user_id;
@@ -102,9 +102,9 @@ 
 	var $last_subscription_date_start;
 	var $last_subscription_date_end;
 	var $last_subscription_amount;
-	var $subscriptions=array();
+	var $subscriptions = array();
 
-	var $oldcopy;		// To contains a clone of this when we need to save old properties of object
+	var $oldcopy; // To contains a clone of this when we need to save old properties of object
 
 	public $entity;
 
@@ -120,7 +120,7 @@ 
 		// l'adherent n'est pas public par defaut
 		$this->public = 0;
 		// les champs optionnels sont vides
-		$this->array_options=array();
+		$this->array_options = array();
 	}
 
 
@@ -139,24 +139,24 @@ 
 	 *  @param	string	$errors_to			erros to
 	 *  @return	int							<0 if KO, >0 if OK
 	 */
-	function send_an_email($text, $subject, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=-1, $errors_to='')
+	function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Detect if message is HTML
 		if ($msgishtml == -1)
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text,1)) $msgishtml = 1;
+			if (dol_textishtml($text, 1)) $msgishtml = 1;
 		}
 
-		$texttosend=$this->makeSubstitution($text);
-		$subjecttosend=$this->makeSubstitution($subject);
-		if ($msgishtml) $texttosend=dol_htmlentitiesbr($texttosend);
+		$texttosend = $this->makeSubstitution($text);
+		$subjecttosend = $this->makeSubstitution($subject);
+		if ($msgishtml) $texttosend = dol_htmlentitiesbr($texttosend);
 
 		// Envoi mail confirmation
-		$from=$conf->email_from;
-		if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
+		$from = $conf->email_from;
+		if (!empty($conf->global->ADHERENT_MAIL_FROM)) $from = $conf->global->ADHERENT_MAIL_FROM;
 
 		// Send email (substitutionarray must be done just before this)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -167,7 +167,7 @@ 
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorFailedToSendMail",$from,$this->email).'. '.$mailfile->error;
+			$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
 			return -1;
 		}
 	}
@@ -181,55 +181,55 @@ 
 	 */
 	function makeSubstitution($text)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$birthday = dol_print_date($this->birth,'day');
+		$birthday = dol_print_date($this->birth, 'day');
 
 		$msgishtml = 0;
-		if (dol_textishtml($text,1)) $msgishtml = 1;
-
-		$infos='';
-		if ($this->civility_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
-		$infos.= $langs->transnoentities("id").": ".$this->id."\n";
-		$infos.= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
-		$infos.= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
-		$infos.= $langs->transnoentities("Company").": ".$this->societe."\n";
-		$infos.= $langs->transnoentities("Address").": ".$this->address."\n";
-		$infos.= $langs->transnoentities("Zip").": ".$this->zip."\n";
-		$infos.= $langs->transnoentities("Town").": ".$this->town."\n";
-		$infos.= $langs->transnoentities("Country").": ".$this->country."\n";
-		$infos.= $langs->transnoentities("EMail").": ".$this->email."\n";
-		$infos.= $langs->transnoentities("PhonePro").": ".$this->phone."\n";
-		$infos.= $langs->transnoentities("PhonePerso").": ".$this->phone_perso."\n";
-		$infos.= $langs->transnoentities("PhoneMobile").": ".$this->phone_mobile."\n";
+		if (dol_textishtml($text, 1)) $msgishtml = 1;
+
+		$infos = '';
+		if ($this->civility_id) $infos .= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
+		$infos .= $langs->transnoentities("id").": ".$this->id."\n";
+		$infos .= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
+		$infos .= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
+		$infos .= $langs->transnoentities("Company").": ".$this->societe."\n";
+		$infos .= $langs->transnoentities("Address").": ".$this->address."\n";
+		$infos .= $langs->transnoentities("Zip").": ".$this->zip."\n";
+		$infos .= $langs->transnoentities("Town").": ".$this->town."\n";
+		$infos .= $langs->transnoentities("Country").": ".$this->country."\n";
+		$infos .= $langs->transnoentities("EMail").": ".$this->email."\n";
+		$infos .= $langs->transnoentities("PhonePro").": ".$this->phone."\n";
+		$infos .= $langs->transnoentities("PhonePerso").": ".$this->phone_perso."\n";
+		$infos .= $langs->transnoentities("PhoneMobile").": ".$this->phone_mobile."\n";
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
-			$infos.= $langs->transnoentities("Login").": ".$this->login."\n";
-			$infos.= $langs->transnoentities("Password").": ".$this->pass."\n";
+			$infos .= $langs->transnoentities("Login").": ".$this->login."\n";
+			$infos .= $langs->transnoentities("Password").": ".$this->pass."\n";
 		}
-		$infos.= $langs->transnoentities("Birthday").": ".$birthday."\n";
-		$infos.= $langs->transnoentities("Photo").": ".$this->photo."\n";
-		$infos.= $langs->transnoentities("Public").": ".yn($this->public);
+		$infos .= $langs->transnoentities("Birthday").": ".$birthday."\n";
+		$infos .= $langs->transnoentities("Photo").": ".$this->photo."\n";
+		$infos .= $langs->transnoentities("Public").": ".yn($this->public);
 
 		// Substitutions
-		$substitutionarray=array(
+		$substitutionarray = array(
 			'__CIVILITY__'=>$this->getCivilityLabel(),
-			'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
-			'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
-			'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
-			'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-			'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
-			'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
-			'__TOWN__'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
-			'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
-			'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
-			'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
-			'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
-			'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
-			'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-			'__PHONE__'=>$msgishtml?dol_htmlentitiesbr($this->phone):$this->phone,
-			'__PHONEPRO__'=>$msgishtml?dol_htmlentitiesbr($this->phone_perso):$this->phone_perso,
-			'__PHONEMOBILE__'=>$msgishtml?dol_htmlentitiesbr($this->phone_mobile):$this->phone_mobile,
+			'__FIRSTNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->firstname) : $this->firstname,
+			'__LASTNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->lastname) : $this->lastname,
+			'__FULLNAME__'=>$msgishtml ?dol_htmlentitiesbr($this->getFullName($langs)) : $this->getFullName($langs),
+			'__COMPANY__'=>$msgishtml ?dol_htmlentitiesbr($this->societe) : $this->societe,
+			'__ADDRESS__'=>$msgishtml ?dol_htmlentitiesbr($this->address) : $this->address,
+			'__ZIP__'=>$msgishtml ?dol_htmlentitiesbr($this->zip) : $this->zip,
+			'__TOWN__'=>$msgishtml ?dol_htmlentitiesbr($this->town) : $this->town,
+			'__COUNTRY__'=>$msgishtml ?dol_htmlentitiesbr($this->country) : $this->country,
+			'__EMAIL__'=>$msgishtml ?dol_htmlentitiesbr($this->email) : $this->email,
+			'__BIRTH__'=>$msgishtml ?dol_htmlentitiesbr($birthday) : $birthday,
+			'__PHOTO__'=>$msgishtml ?dol_htmlentitiesbr($this->photo) : $this->photo,
+			'__LOGIN__'=>$msgishtml ?dol_htmlentitiesbr($this->login) : $this->login,
+			'__PASSWORD__'=>$msgishtml ?dol_htmlentitiesbr($this->pass) : $this->pass,
+			'__PHONE__'=>$msgishtml ?dol_htmlentitiesbr($this->phone) : $this->phone,
+			'__PHONEPRO__'=>$msgishtml ?dol_htmlentitiesbr($this->phone_perso) : $this->phone_perso,
+			'__PHONEMOBILE__'=>$msgishtml ?dol_htmlentitiesbr($this->phone_mobile) : $this->phone_mobile,
 		);
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
@@ -244,10 +244,10 @@ 
 	 *	@param	string		$morphy		Nature of the adherent (physical or moral)
 	 *	@return	string					Label
 	 */
-	function getmorphylib($morphy='')
+	function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if (! $morphy) { $morphy=$this->morphy; }
+		if (!$morphy) { $morphy = $this->morphy; }
 		if ($morphy == 'phy') { return $langs->trans("Physical"); }
 		if ($morphy == 'mor') { return $langs->trans("Moral"); }
 		return $morphy;
@@ -260,30 +260,30 @@ 
 	 *	@param  int		$notrigger		1 ne declenche pas les triggers, 0 sinon
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function create($user,$notrigger=0)
+	function create($user, $notrigger = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
 		$this->import_key = trim($this->import_key);
 
 		// Check parameters
-		if (! empty($conf->global->ADHERENT_MAIL_REQUIRED) && ! isValidEMail($this->email))
+		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email))
 		{
 			$langs->load("errors");
-			$this->error = $langs->trans("ErrorBadEMail",$this->email);
+			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
-		if (! $this->datec) $this->datec=$now;
+		if (!$this->datec) $this->datec = $now;
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
 			if (empty($this->login))
 			{
-				$this->error = $langs->trans("ErrorWrongValueForParameterX","Login");
+				$this->error = $langs->trans("ErrorWrongValueForParameterX", "Login");
 				return -1;
 			}
 		}
@@ -292,16 +292,16 @@ 
 
 		// Insert member
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent";
-		$sql.= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
-		$sql.= " VALUES (";
-		$sql.= " '".$this->db->idate($this->datec)."'";
-		$sql.= ", ".($this->login?"'".$this->db->escape($this->login)."'":"null");
-		$sql.= ", ".($user->id>0?$user->id:"null");	// Can be null because member can be created by a guest or a script
-		$sql.= ", null, null, '".$this->db->escape($this->morphy)."'";
-		$sql.= ", ".$this->typeid;
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".(! empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
+		$sql .= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
+		$sql .= " VALUES (";
+		$sql .= " '".$this->db->idate($this->datec)."'";
+		$sql .= ", ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
+		$sql .= ", ".($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
+		$sql .= ", null, null, '".$this->db->escape($this->morphy)."'";
+		$sql .= ", ".$this->typeid;
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -310,11 +310,11 @@ 
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent");
 			if ($id > 0)
 			{
-				$this->id=$id;
-				$this->ref=(string) $id;
+				$this->id = $id;
+				$this->ref = (string) $id;
 
 				// Update minor fields
-				$result=$this->update($user,1,1,0,0,'add'); // nosync is 1 to avoid update data of user
+				$result = $this->update($user, 1, 1, 0, 0, 'add'); // nosync is 1 to avoid update data of user
 				if ($result < 0)
 				{
 					$this->db->rollback();
@@ -326,29 +326,29 @@ 
 				{
 					// Add link to user
 					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-					$sql.= " fk_member = ".$this->id;
-					$sql.= " WHERE rowid = ".$this->user_id;
+					$sql .= " fk_member = ".$this->id;
+					$sql .= " WHERE rowid = ".$this->user_id;
 					dol_syslog(get_class($this)."::create", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (! $resql)
+					if (!$resql)
 					{
-						$this->error='Failed to update user to make link with member';
+						$this->error = 'Failed to update user to make link with member';
 						$this->db->rollback();
 						return -4;
 					}
 				}
 
-				if (! $notrigger)
+				if (!$notrigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('MEMBER_CREATE',$user);
+					$result = $this->call_trigger('MEMBER_CREATE', $user);
 					if ($result < 0) { $error++; }
 					// End call triggers
 				}
 
 				if (count($this->errors))
 				{
-					dol_syslog(get_class($this)."::create ".implode(',',$this->errors), LOG_ERR);
+					dol_syslog(get_class($this)."::create ".implode(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
@@ -360,7 +360,7 @@ 
 			}
 			else
 			{
-				$this->error='Failed to get last insert id';
+				$this->error = 'Failed to get last insert id';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
@@ -368,7 +368,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -386,67 +386,67 @@ 
 	 * 	@param	string	$action				Current action for hookmanager
 	 * 	@return	int							<0 if KO, >0 if OK
 	 */
-	function update($user,$notrigger=0,$nosyncuser=0,$nosyncuserpass=0,$nosyncthirdparty=0,$action='update')
+	function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
 
-		$nbrowsaffected=0;
-		$error=0;
+		$nbrowsaffected = 0;
+		$error = 0;
 
 		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncuser=".$nosyncuser.", nosyncuserpass=".$nosyncuserpass." nosyncthirdparty=".$nosyncthirdparty.", email=".$this->email);
 
 		// Clean parameters
-		$this->lastname=trim($this->lastname)?trim($this->lastname):trim($this->lastname);
-		$this->firstname=trim($this->firstname)?trim($this->firstname):trim($this->firstname);
-		$this->address=($this->address?$this->address:$this->address);
-		$this->zip=($this->zip?$this->zip:$this->zip);
-		$this->town=($this->town?$this->town:$this->town);
-		$this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
-		$this->state_id=($this->state_id > 0?$this->state_id:$this->state_id);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords(trim($this->lastname));
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords(trim($this->firstname));
-		$this->note_public=($this->note_public?$this->note_public:$this->note_public);
-		$this->note_private=($this->note_private?$this->note_private:$this->note_private);
+		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
+		$this->firstname = trim($this->firstname) ?trim($this->firstname) : trim($this->firstname);
+		$this->address = ($this->address ? $this->address : $this->address);
+		$this->zip = ($this->zip ? $this->zip : $this->zip);
+		$this->town = ($this->town ? $this->town : $this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords(trim($this->lastname));
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords(trim($this->firstname));
+		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
+		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 
 		// Check parameters
-		if (! empty($conf->global->ADHERENT_MAIL_REQUIRED) && ! isValidEMail($this->email))
+		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email))
 		{
 			$langs->load("errors");
-			$this->error = $langs->trans("ErrorBadEMail",$this->email);
+			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
 		}
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql.= " civility = ".($this->civility_id?"'".$this->db->escape($this->civility_id)."'":"null");
-		$sql.= ", firstname = ".($this->firstname?"'".$this->db->escape($this->firstname)."'":"null");
-		$sql.= ", lastname = ".($this->lastname?"'".$this->db->escape($this->lastname)."'":"null");
-		$sql.= ", login = ".($this->login?"'".$this->db->escape($this->login)."'":"null");
-		$sql.= ", societe = ".($this->societe?"'".$this->db->escape($this->societe)."'":"null");
-		$sql.= ", fk_soc = ".($this->fk_soc > 0?$this->db->escape($this->fk_soc):"null");
-		$sql.= ", address = ".($this->address?"'".$this->db->escape($this->address)."'":"null");
-		$sql.= ", zip = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
-		$sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
-		$sql.= ", country = ".($this->country_id>0?$this->db->escape($this->country_id):"null");
-		$sql.= ", state_id = ".($this->state_id>0?$this->db->escape($this->state_id):"null");
-		$sql.= ", email = '".$this->db->escape($this->email)."'";
-		$sql.= ", skype = '".$this->db->escape($this->skype)."'";
-		$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
-		$sql.= ", phone_perso = ".($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
-		$sql.= ", phone_mobile = ".($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
-		$sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
-		$sql.= ", public = '".$this->db->escape($this->public)."'";
-		$sql.= ", statut = ".$this->db->escape($this->statut);
-		$sql.= ", fk_adherent_type = ".$this->db->escape($this->typeid);
-		$sql.= ", morphy = '".$this->db->escape($this->morphy)."'";
-		$sql.= ", birth = ".($this->birth?"'".$this->db->idate($this->birth)."'":"null");
-		if ($this->datefin)   $sql.= ", datefin = '".$this->db->idate($this->datefin)."'";		// Must be modified only when deleting a subscription
-		if ($this->datevalid) $sql.= ", datevalid = '".$this->db->idate($this->datevalid)."'";	// Must be modified only when validating a member
-		$sql.= ", fk_user_mod = ".($user->id>0?$user->id:'null');	// Can be null because member can be create by a guest
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " civility = ".($this->civility_id ? "'".$this->db->escape($this->civility_id)."'" : "null");
+		$sql .= ", firstname = ".($this->firstname ? "'".$this->db->escape($this->firstname)."'" : "null");
+		$sql .= ", lastname = ".($this->lastname ? "'".$this->db->escape($this->lastname)."'" : "null");
+		$sql .= ", login = ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
+		$sql .= ", societe = ".($this->societe ? "'".$this->db->escape($this->societe)."'" : "null");
+		$sql .= ", fk_soc = ".($this->fk_soc > 0 ? $this->db->escape($this->fk_soc) : "null");
+		$sql .= ", address = ".($this->address ? "'".$this->db->escape($this->address)."'" : "null");
+		$sql .= ", zip = ".($this->zip ? "'".$this->db->escape($this->zip)."'" : "null");
+		$sql .= ", town = ".($this->town ? "'".$this->db->escape($this->town)."'" : "null");
+		$sql .= ", country = ".($this->country_id > 0 ? $this->db->escape($this->country_id) : "null");
+		$sql .= ", state_id = ".($this->state_id > 0 ? $this->db->escape($this->state_id) : "null");
+		$sql .= ", email = '".$this->db->escape($this->email)."'";
+		$sql .= ", skype = '".$this->db->escape($this->skype)."'";
+		$sql .= ", phone = ".($this->phone ? "'".$this->db->escape($this->phone)."'" : "null");
+		$sql .= ", phone_perso = ".($this->phone_perso ? "'".$this->db->escape($this->phone_perso)."'" : "null");
+		$sql .= ", phone_mobile = ".($this->phone_mobile ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
+		$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
+		$sql .= ", public = '".$this->db->escape($this->public)."'";
+		$sql .= ", statut = ".$this->db->escape($this->statut);
+		$sql .= ", fk_adherent_type = ".$this->db->escape($this->typeid);
+		$sql .= ", morphy = '".$this->db->escape($this->morphy)."'";
+		$sql .= ", birth = ".($this->birth ? "'".$this->db->idate($this->birth)."'" : "null");
+		if ($this->datefin)   $sql .= ", datefin = '".$this->db->idate($this->datefin)."'"; // Must be modified only when deleting a subscription
+		if ($this->datevalid) $sql .= ", datevalid = '".$this->db->idate($this->datevalid)."'"; // Must be modified only when validating a member
+		$sql .= ", fk_user_mod = ".($user->id > 0 ? $user->id : 'null'); // Can be null because member can be create by a guest
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update update member", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -457,21 +457,21 @@ 
 			unset($this->state_code);
 			unset($this->state);
 
-			$nbrowsaffected+=$this->db->affected_rows($resql);
+			$nbrowsaffected += $this->db->affected_rows($resql);
 
-			$action='update';
+			$action = 'update';
 
 			// Actions on extra fields (by external module)
 			// TODO le hook fait double emploi avec le trigger !!
 			$hookmanager->initHooks(array('memberdao'));
-			$parameters=array('id'=>$this->id);
-			$action='';
-			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('id'=>$this->id);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook))
 			{
 				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$this->insertExtraFields();
+					$result = $this->insertExtraFields();
 					if ($result < 0)
 					{
 						$error++;
@@ -481,48 +481,48 @@ 
 			else if ($reshook < 0) $error++;
 
 			// Update password
-			if (! $error && $this->pass)
+			if (!$error && $this->pass)
 			{
 				dol_syslog(get_class($this)."::update update password");
 				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted)
 				{
-					$isencrypted = empty($conf->global->DATABASE_PWD_ENCRYPTED)?0:1;
+					$isencrypted = empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1;
 
 					// If password to set differs from the one found into database
-					$result=$this->setPassword($user,$this->pass,$isencrypted,$notrigger,$nosyncuserpass);
-					if (! $nbrowsaffected) $nbrowsaffected++;
+					$result = $this->setPassword($user, $this->pass, $isencrypted, $notrigger, $nosyncuserpass);
+					if (!$nbrowsaffected) $nbrowsaffected++;
 				}
 			}
 
 			// Remove links to user and replace with new one
-			if (! $error)
+			if (!$error)
 			{
 				dol_syslog(get_class($this)."::update update link to user");
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
 				dol_syslog(get_class($this)."::update", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
+				if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
 				// If there is a user linked to this member
 				if ($this->user_id > 0)
 				{
 					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id." WHERE rowid = ".$this->user_id;
 					dol_syslog(get_class($this)."::update", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
+					if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -5; }
 				}
 			}
 
-			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)
+				if (!$error && $this->user_id > 0 && !$nosyncuser)
 				{
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 					dol_syslog(get_class($this)."::update update linked user");
 
-					$luser=new User($this->db);
-					$result=$luser->fetch($this->user_id);
+					$luser = new User($this->db);
+					$result = $luser->fetch($this->user_id);
 
 					if ($result >= 0)
 					{
@@ -530,38 +530,38 @@ 
 						//var_dump($this->login);exit;
 
 						// If option ADHERENT_LOGIN_NOT_REQUIRED is on, there is no login of member, so we do not overwrite user login to keep existing one.
-						if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $luser->login=$this->login;
+						if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $luser->login = $this->login;
 
-						$luser->civility_id=$this->civility_id;
-						$luser->firstname=$this->firstname;
-						$luser->lastname=$this->lastname;
-						$luser->pass=$this->pass;
-						$luser->societe_id=$this->societe;
+						$luser->civility_id = $this->civility_id;
+						$luser->firstname = $this->firstname;
+						$luser->lastname = $this->lastname;
+						$luser->pass = $this->pass;
+						$luser->societe_id = $this->societe;
 
-						$luser->email=$this->email;
-						$luser->skype=$this->skype;
-						$luser->office_phone=$this->phone;
-						$luser->user_mobile=$this->phone_mobile;
+						$luser->email = $this->email;
+						$luser->skype = $this->skype;
+						$luser->office_phone = $this->phone;
+						$luser->user_mobile = $this->phone_mobile;
 
-						$luser->fk_member=$this->id;
+						$luser->fk_member = $this->id;
 
-						$result=$luser->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
+						$result = $luser->update($user, 0, 1, 1); // Use nosync to 1 to avoid cyclic updates
 						if ($result < 0)
 						{
-							$this->error=$luser->error;
-							dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+							$this->error = $luser->error;
+							dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 							$error++;
 						}
 					}
 					else
 					{
-						$this->error=$luser->error;
+						$this->error = $luser->error;
 						$error++;
 					}
 				}
 
 				// Update information on linked thirdparty if it is an update
-				if (! $error && $this->fk_soc > 0 && ! $nosyncthirdparty)
+				if (!$error && $this->fk_soc > 0 && !$nosyncthirdparty)
 				{
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -569,47 +569,47 @@ 
 
 					// This member is linked with a thirdparty, so we also update thirdparty informations
 					// if this is an update.
-					$lthirdparty=new Societe($this->db);
-					$result=$lthirdparty->fetch($this->fk_soc);
+					$lthirdparty = new Societe($this->db);
+					$result = $lthirdparty->fetch($this->fk_soc);
 
 					if ($result >= 0)
 					{
-						$lthirdparty->address=$this->address;
-						$lthirdparty->zip=$this->zip;
-						$lthirdparty->town=$this->town;
-						$lthirdparty->email=$this->email;
-						$lthirdparty->skype=$this->skype;
-						$lthirdparty->phone=$this->phone;
-						$lthirdparty->state_id=$this->state_id;
-						$lthirdparty->country_id=$this->country_id;
-						$lthirdparty->country_id=$this->country_id;
+						$lthirdparty->address = $this->address;
+						$lthirdparty->zip = $this->zip;
+						$lthirdparty->town = $this->town;
+						$lthirdparty->email = $this->email;
+						$lthirdparty->skype = $this->skype;
+						$lthirdparty->phone = $this->phone;
+						$lthirdparty->state_id = $this->state_id;
+						$lthirdparty->country_id = $this->country_id;
+						$lthirdparty->country_id = $this->country_id;
 						//$lthirdparty->phone_mobile=$this->phone_mobile;
 
-						$result=$lthirdparty->update($this->fk_soc,$user,0,1,1,'update');	// Use sync to 0 to avoid cyclic updates
+						$result = $lthirdparty->update($this->fk_soc, $user, 0, 1, 1, 'update'); // Use sync to 0 to avoid cyclic updates
 						if ($result < 0)
 						{
-							$this->error=$lthirdparty->error;
-							dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+							$this->error = $lthirdparty->error;
+							dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 							$error++;
 						}
 					}
 					else
 					{
-						$this->error=$lthirdparty->error;
+						$this->error = $lthirdparty->error;
 						$error++;
 					}
 				}
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('MEMBER_MODIFY',$user);
+					$result = $this->call_trigger('MEMBER_MODIFY', $user);
 					if ($result < 0) { $error++; }
 					// End call triggers
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return $nbrowsaffected;
@@ -623,7 +623,7 @@ 
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 	}
@@ -642,31 +642,31 @@ 
 
 		// Search for last subscription id and end date
 		$sql = "SELECT rowid, datec as dateop, dateadh as datedeb, datef as datefin";
-		$sql.= " FROM ".MAIN_DB_PREFIX."subscription";
-		$sql.= " WHERE fk_adherent=".$this->id;
-		$sql.= " ORDER by dateadh DESC";	// Sort by start subscription date
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
+		$sql .= " WHERE fk_adherent=".$this->id;
+		$sql .= " ORDER by dateadh DESC"; // Sort by start subscription date
 
 		dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj=$this->db->fetch_object($resql);
-			$dateop=$this->db->jdate($obj->dateop);
-			$datedeb=$this->db->jdate($obj->datedeb);
-			$datefin=$this->db->jdate($obj->datefin);
+			$obj = $this->db->fetch_object($resql);
+			$dateop = $this->db->jdate($obj->dateop);
+			$datedeb = $this->db->jdate($obj->datedeb);
+			$datefin = $this->db->jdate($obj->datefin);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-			$sql.= " datefin=".($datefin != '' ? "'".$this->db->idate($datefin)."'" : "null");
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " datefin=".($datefin != '' ? "'".$this->db->idate($datefin)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$this->last_subscription_date=$dateop;
-				$this->last_subscription_date_start=$datedeb;
-				$this->last_subscription_date_end=$datefin;
-				$this->datefin=$datefin;
+				$this->last_subscription_date = $dateop;
+				$this->last_subscription_date_start = $datedeb;
+				$this->last_subscription_date_end = $datefin;
+				$this->datefin = $datefin;
 				$this->db->commit();
 				return 1;
 			}
@@ -678,7 +678,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -693,23 +693,23 @@ 
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return	int					<0 if KO, 0=nothing to do, >0 if OK
 	 */
-	function delete($rowid, $user, $notrigger=0)
+	function delete($rowid, $user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		$result = 0;
-		$error=0;
-		$errorflag=0;
+		$error = 0;
+		$errorflag = 0;
 
 		// Check parameters
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) $rowid = $this->id;
 
 		$this->db->begin();
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call trigger
-			$result=$this->call_trigger('MEMBER_DELETE',$user);
+			$result = $this->call_trigger('MEMBER_DELETE', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
@@ -717,70 +717,70 @@ 
 		// Remove category
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
 			$error++;
 			$this->error .= $this->db->lasterror();
-			$errorflag=-1;
+			$errorflag = -1;
 		}
 
 		// Remove subscription
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE fk_adherent = ".$rowid;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$error++;
 				$this->error .= $this->db->lasterror();
-				$errorflag=-2;
+				$errorflag = -2;
 			}
 		}
 
 		// Remove linked user
-		if (! $error)
+		if (!$error)
 		{
-			$ret=$this->setUserId(0);
+			$ret = $this->setUserId(0);
 			if ($ret < 0)
 			{
 				$error++;
 				$this->error .= $this->db->lasterror();
-				$errorflag=-3;
+				$errorflag = -3;
 			}
 		}
 
 		// Removed extrafields
-		if (! $error)
+		if (!$error)
 		{
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				$result=$this->deleteExtraFields();
+				$result = $this->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
-					$errorflag=-4;
+					$errorflag = -4;
 					dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
 				}
 			}
 		}
 
 		// Remove adherent
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$error++;
 				$this->error .= $this->db->lasterror();
-				$errorflag=-5;
+				$errorflag = -5;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -803,26 +803,26 @@ 
 	 *    @param	int		$nosyncuser		Do not synchronize linked user
 	 *    @return   string           		If OK return clear password, 0 if no change, < 0 if error
 	 */
-	function setPassword($user, $password='', $isencrypted=0, $notrigger=0, $nosyncuser=0)
+	function setPassword($user, $password = '', $isencrypted = 0, $notrigger = 0, $nosyncuser = 0)
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
-		dol_syslog(get_class($this)."::setPassword user=".$user->id." password=".preg_replace('/./i','*',$password)." isencrypted=".$isencrypted);
+		dol_syslog(get_class($this)."::setPassword user=".$user->id." password=".preg_replace('/./i', '*', $password)." isencrypted=".$isencrypted);
 
 		// If new password not provided, we generate one
-		if (! $password)
+		if (!$password)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$password=getRandomPassword(false);
+			$password = getRandomPassword(false);
 		}
 
 		// Crypt password
 		$password_crypted = dol_hash($password);
 
 		$password_indatabase = '';
-		if (! $isencrypted)
+		if (!$isencrypted)
 		{
 			$password_indatabase = $password;
 		}
@@ -831,61 +831,61 @@ 
 
 		// Mise a jour
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-		$sql.= " SET pass_crypted = '".$this->db->escape($password_crypted)."'";
+		$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."'";
 		//if (! empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		if ($isencrypted)
 		{
-			$sql.= ", pass = null";
+			$sql .= ", pass = null";
 		}
 		else
 		{
-			$sql.= ", pass = '".$this->db->escape($password_indatabase)."'";
+			$sql .= ", pass = '".$this->db->escape($password_indatabase)."'";
 		}
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		//dol_syslog("Adherent::Password sql=hidden");
 		dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$nbaffectedrows=$this->db->affected_rows($result);
+			$nbaffectedrows = $this->db->affected_rows($result);
 
 			if ($nbaffectedrows)
 			{
-				$this->pass=$password;
-				$this->pass_indatabase=$password_indatabase;
-				$this->pass_indatabase_crypted=$password_crypted;
+				$this->pass = $password;
+				$this->pass_indatabase = $password_indatabase;
+				$this->pass_indatabase_crypted = $password_crypted;
 
-				if ($this->user_id && ! $nosyncuser)
+				if ($this->user_id && !$nosyncuser)
 				{
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 					// This member is linked with a user, so we also update users informations
 					// if this is an update.
-					$luser=new User($this->db);
-					$result=$luser->fetch($this->user_id);
+					$luser = new User($this->db);
+					$result = $luser->fetch($this->user_id);
 
 					if ($result >= 0)
 					{
-						$result=$luser->setPassword($user,$this->pass,0,0,1);
+						$result = $luser->setPassword($user, $this->pass, 0, 0, 1);
 						if ($result < 0)
 						{
-							$this->error=$luser->error;
-							dol_syslog(get_class($this)."::setPassword ".$this->error,LOG_ERR);
+							$this->error = $luser->error;
+							dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
 							$error++;
 						}
 					}
 					else
 					{
-						$this->error=$luser->error;
+						$this->error = $luser->error;
 						$error++;
 					}
 				}
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
 					// Call trigger
-					$result=$this->call_trigger('MEMBER_NEW_PASSWORD',$user);
+					$result = $this->call_trigger('MEMBER_NEW_PASSWORD', $user);
 					if ($result < 0) { $error++; $this->db->rollback(); return -1; }
 					// End call triggers
 				}
@@ -924,16 +924,16 @@ 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
 		dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -1; }
+		if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -1; }
 
 		// Set link to user
 		if ($userid > 0)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id;
-			$sql.= " WHERE rowid = ".$userid;
+			$sql .= " WHERE rowid = ".$userid;
 			dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -2; }
+			if (!$resql) { $this->error = $this->db->error(); $this->db->rollback(); return -2; }
 		}
 
 		$this->db->commit();
@@ -958,15 +958,15 @@ 
 		if ($thirdpartyid > 0)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = null";
-			$sql.= " WHERE fk_soc = '".$thirdpartyid."'";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " WHERE fk_soc = '".$thirdpartyid."'";
+			$sql .= " AND entity = ".$conf->entity;
 			dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 		}
 
 		// Add link to third party for current member
-		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid>0 ? $thirdpartyid : 'null');
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid > 0 ? $thirdpartyid : 'null');
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -977,7 +977,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -995,10 +995,10 @@ 
 		global $conf;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-		$sql.= " WHERE login='".$this->db->escape($login)."'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " WHERE login='".$this->db->escape($login)."'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -1020,16 +1020,16 @@ 
 	 *	@param	string	$lastname	Lastname
 	 *	@return	void
 	 */
-	function fetch_name($firstname,$lastname)
+	function fetch_name($firstname, $lastname)
 	{
 		global $conf;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-		$sql.= " WHERE firstname='".$this->db->escape($firstname)."'";
-		$sql.= " AND lastname='".$this->db->escape($lastname)."'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " WHERE firstname='".$this->db->escape($firstname)."'";
+		$sql .= " AND lastname='".$this->db->escape($lastname)."'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -1053,83 +1053,83 @@ 
 	 * 	@param	string	$ref_ext	External reference
 	 *	@return int         		>0 if OK, 0 if not found, <0 if KO
 	 */
-	function fetch($rowid,$ref='',$fk_soc='',$ref_ext='')
+	function fetch($rowid, $ref = '', $fk_soc = '', $ref_ext = '')
 	{
 		global $langs;
 
 		$sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,";
-		$sql.= " d.note_public,";
-		$sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
-		$sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
-		$sql.= " d.datec as datec,";
-		$sql.= " d.tms as datem,";
-		$sql.= " d.datefin as datefin,";
-		$sql.= " d.birth as birthday,";
-		$sql.= " d.datevalid as datev,";
-		$sql.= " d.country,";
-		$sql.= " d.state_id,";
-		$sql.= " d.model_pdf,";
-		$sql.= " c.rowid as country_id, c.code as country_code, c.label as country,";
-		$sql.= " dep.nom as state, dep.code_departement as state_code,";
-		$sql.= " t.libelle as type, t.subscription as subscription,";
-		$sql.= " u.rowid as user_id, u.login as user_login";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
-		$sql.= " WHERE d.fk_adherent_type = t.rowid";
-		if ($rowid) $sql.= " AND d.rowid=".$rowid;
+		$sql .= " d.note_public,";
+		$sql .= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,";
+		$sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
+		$sql .= " d.datec as datec,";
+		$sql .= " d.tms as datem,";
+		$sql .= " d.datefin as datefin,";
+		$sql .= " d.birth as birthday,";
+		$sql .= " d.datevalid as datev,";
+		$sql .= " d.country,";
+		$sql .= " d.state_id,";
+		$sql .= " d.model_pdf,";
+		$sql .= " c.rowid as country_id, c.code as country_code, c.label as country,";
+		$sql .= " dep.nom as state, dep.code_departement as state_code,";
+		$sql .= " t.libelle as type, t.subscription as subscription,";
+		$sql .= " u.rowid as user_id, u.login as user_login";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
+		$sql .= " WHERE d.fk_adherent_type = t.rowid";
+		if ($rowid) $sql .= " AND d.rowid=".$rowid;
 		elseif ($ref || $fk_soc) {
-			$sql.= " AND d.entity IN (".getEntity('adherent').")";
-			if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
-			elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
+			$sql .= " AND d.entity IN (".getEntity('adherent').")";
+			if ($ref) $sql .= " AND d.rowid='".$this->db->escape($ref)."'";
+			elseif ($fk_soc > 0) $sql .= " AND d.fk_soc=".$fk_soc;
 		}
 		elseif ($ref_ext)
 		{
-			$sql.= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
+			$sql .= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->entity			= $obj->entity;
-				$this->ref				= $obj->rowid;
-				$this->id				= $obj->rowid;
-				$this->ref_ext			= $obj->ref_ext;
-				$this->civility_id		= $obj->civility_id;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->rowid;
+				$this->id = $obj->rowid;
+				$this->ref_ext = $obj->ref_ext;
+				$this->civility_id = $obj->civility_id;
 				$this->firstname		= $obj->firstname;
 				$this->lastname			= $obj->lastname;
-				$this->login			= $obj->login;
+				$this->login = $obj->login;
 				$this->societe			= $obj->company;
 				$this->company			= $obj->company;
-				$this->fk_soc			= $obj->fk_soc;
+				$this->fk_soc = $obj->fk_soc;
 				$this->address			= $obj->address;
-				$this->zip				= $obj->zip;
+				$this->zip = $obj->zip;
 				$this->town				= $obj->town;
 
 				$this->pass				= $obj->pass;
-				$this->pass_indatabase  = $obj->pass;
+				$this->pass_indatabase = $obj->pass;
 				$this->pass_indatabase_crypted = $obj->pass_crypted;
 
-				$this->state_id			= $obj->state_id;
-				$this->state_code		= $obj->state_id?$obj->state_code:'';
-				$this->state			= $obj->state_id?$obj->state:'';
+				$this->state_id = $obj->state_id;
+				$this->state_code		= $obj->state_id ? $obj->state_code : '';
+				$this->state = $obj->state_id ? $obj->state : '';
 
 				$this->country_id		= $obj->country_id;
-				$this->country_code		= $obj->country_code;
+				$this->country_code = $obj->country_code;
 				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
 					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
 				else
-					$this->country=$obj->country;
+					$this->country = $obj->country;
 
 				$this->phone			= $obj->phone;
-				$this->phone_perso		= $obj->phone_perso;
-				$this->phone_mobile		= $obj->phone_mobile;
+				$this->phone_perso = $obj->phone_perso;
+				$this->phone_mobile = $obj->phone_mobile;
 				$this->email			= $obj->email;
 				$this->skype			= $obj->skype;
 
@@ -1139,29 +1139,29 @@ 
 
 				$this->datec			= $this->db->jdate($obj->datec);
 				$this->datem			= $this->db->jdate($obj->datem);
-				$this->datefin			= $this->db->jdate($obj->datefin);
-				$this->datevalid		= $this->db->jdate($obj->datev);
+				$this->datefin = $this->db->jdate($obj->datefin);
+				$this->datevalid = $this->db->jdate($obj->datev);
 				$this->birth			= $this->db->jdate($obj->birthday);
 
-				$this->note_private		= $obj->note_private;
-				$this->note_public		= $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->note_public = $obj->note_public;
 				$this->morphy			= $obj->morphy;
 
 				$this->typeid			= $obj->fk_adherent_type;
-				$this->type				= $obj->type;
-				$this->need_subscription 	= $obj->subscription;
+				$this->type = $obj->type;
+				$this->need_subscription = $obj->subscription;
 
-				$this->user_id			= $obj->user_id;
-				$this->user_login		= $obj->user_login;
+				$this->user_id = $obj->user_id;
+				$this->user_login = $obj->user_login;
 
-				$this->model_pdf        = $obj->model_pdf;
+				$this->model_pdf = $obj->model_pdf;
 
 				// Retreive all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
 				// Load other properties
-				$result=$this->fetch_subscriptions();
+				$result = $this->fetch_subscriptions();
 
 				return $this->id;
 			}
@@ -1172,7 +1172,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1194,43 +1194,43 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
 		$sql = "SELECT c.rowid, c.fk_adherent, c.subscription, c.note, c.fk_bank,";
-		$sql.= " c.tms as datem,";
-		$sql.= " c.datec as datec,";
-		$sql.= " c.dateadh as dateh,";
-		$sql.= " c.datef as datef";
-		$sql.= " FROM ".MAIN_DB_PREFIX."subscription as c";
-		$sql.= " WHERE c.fk_adherent = ".$this->id;
-		$sql.= " ORDER BY c.dateadh";
+		$sql .= " c.tms as datem,";
+		$sql .= " c.datec as datec,";
+		$sql .= " c.dateadh as dateh,";
+		$sql .= " c.datef as datef";
+		$sql .= " FROM ".MAIN_DB_PREFIX."subscription as c";
+		$sql .= " WHERE c.fk_adherent = ".$this->id;
+		$sql .= " ORDER BY c.dateadh";
 		dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->subscriptions=array();
+			$this->subscriptions = array();
 
-			$i=0;
+			$i = 0;
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				if ($i==0)
+				if ($i == 0)
 				{
-					$this->first_subscription_date=$obj->dateh;
-					$this->first_subscription_amount=$obj->subscription;
+					$this->first_subscription_date = $obj->dateh;
+					$this->first_subscription_amount = $obj->subscription;
 				}
-				$this->last_subscription_date=$obj->dateh;
-				$this->last_subscription_amount=$obj->subscription;
-
-				$subscription=new Subscription($this->db);
-				$subscription->id=$obj->rowid;
-				$subscription->fk_adherent=$obj->fk_adherent;
-				$subscription->amount=$obj->subscription;
-				$subscription->note=$obj->note;
-				$subscription->fk_bank=$obj->fk_bank;
-				$subscription->datem=$this->db->jdate($obj->datem);
-				$subscription->datec=$this->db->jdate($obj->datec);
-				$subscription->dateh=$this->db->jdate($obj->dateh);
-				$subscription->datef=$this->db->jdate($obj->datef);
-
-				$this->subscriptions[]=$subscription;
+				$this->last_subscription_date = $obj->dateh;
+				$this->last_subscription_amount = $obj->subscription;
+
+				$subscription = new Subscription($this->db);
+				$subscription->id = $obj->rowid;
+				$subscription->fk_adherent = $obj->fk_adherent;
+				$subscription->amount = $obj->subscription;
+				$subscription->note = $obj->note;
+				$subscription->fk_bank = $obj->fk_bank;
+				$subscription->datem = $this->db->jdate($obj->datem);
+				$subscription->datec = $this->db->jdate($obj->datec);
+				$subscription->dateh = $this->db->jdate($obj->dateh);
+				$subscription->datef = $this->db->jdate($obj->datef);
+
+				$this->subscriptions[] = $subscription;
 
 				$i++;
 			}
@@ -1238,7 +1238,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
 	}
@@ -1258,55 +1258,55 @@ 
 	 *	@param	int     	$datesubend			Date end subscription
 	 *	@return int         					rowid of record added, <0 if KO
 	 */
-	function subscription($date, $amount, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0)
+	function subscription($date, $amount, $accountid = 0, $operation = '', $label = '', $num_chq = '', $emetteur_nom = '', $emetteur_banque = '', $datesubend = 0)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (! $amount) $amount=0;
+		if (!$amount) $amount = 0;
 
 		$this->db->begin();
 
 		if ($datesubend)
 		{
-			$datefin=$datesubend;
+			$datefin = $datesubend;
 		}
 		else
 		{
 			// If no end date, end date = date + 1 year - 1 day
-			$datefin = dol_time_plus_duree($date,1,'y');
-			$datefin = dol_time_plus_duree($datefin,-1,'d');
+			$datefin = dol_time_plus_duree($date, 1, 'y');
+			$datefin = dol_time_plus_duree($datefin, -1, 'd');
 		}
 
 		// Create subscription
-		$subscription=new Subscription($this->db);
-		$subscription->fk_adherent=$this->id;
-		$subscription->dateh=$date;		// Date of new subscription
-		$subscription->datef=$datefin;	// End data of new subscription
-		$subscription->amount=$amount;
-		$subscription->note=$label;		// deprecated
-		$subscription->note_public=$label;
-
-		$rowid=$subscription->create($user);
+		$subscription = new Subscription($this->db);
+		$subscription->fk_adherent = $this->id;
+		$subscription->dateh = $date; // Date of new subscription
+		$subscription->datef = $datefin; // End data of new subscription
+		$subscription->amount = $amount;
+		$subscription->note = $label; // deprecated
+		$subscription->note_public = $label;
+
+		$rowid = $subscription->create($user);
 		if ($rowid > 0)
 		{
 			// Update denormalized subscription end date (read database subscription to find values)
 			// This will also update this->datefin
-			$result=$this->update_end_date($user);
+			$result = $this->update_end_date($user);
 			if ($result > 0)
 			{
 				// Change properties of object (used by triggers)
-				$this->last_subscription_date=dol_now();
-				$this->last_subscription_amount=$amount;
-				$this->last_subscription_date_start=$date;
-				$this->last_subscription_date_end=$datefin;
+				$this->last_subscription_date = dol_now();
+				$this->last_subscription_amount = $amount;
+				$this->last_subscription_date_start = $date;
+				$this->last_subscription_date_end = $datefin;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return $rowid;
@@ -1319,8 +1319,8 @@ 
 		}
 		else
 		{
-			$this->error=$subscription->error;
-			$this->errors=$subscription->errors;
+			$this->error = $subscription->error;
+			$this->errors = $subscription->errors;
 			$this->db->rollback();
 			return -1;
 		}
@@ -1344,55 +1344,55 @@ 
 	 *  @param	string		$autocreatethirdparty	Auto create new thirdparty if member not linked to a thirdparty.
 	 *	@return int									<0 if KO, >0 if OK
 	 */
-	function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom='', $emetteur_banque='', $autocreatethirdparty=0)
+	function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom = '', $emetteur_banque = '', $autocreatethirdparty = 0)
 	{
 		global $conf, $langs, $user, $mysoc;
 
 		$error = 0;
 
-		$this->invoice = null;	// This will contains invoice if an invoice is created
+		$this->invoice = null; // This will contains invoice if an invoice is created
 
 		// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect'
 		if ($option == 'bankdirect' && $accountid)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-			$acct=new Account($this->db);
-			$result=$acct->fetch($accountid);
+			$acct = new Account($this->db);
+			$result = $acct->fetch($accountid);
 
-			$dateop=$paymentdate;
+			$dateop = $paymentdate;
 
-			$insertid=$acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
+			$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
 			if ($insertid > 0)
 			{
-				$inserturlid=$acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
+				$inserturlid = $acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $this->getFullname($langs), 'member');
 				if ($inserturlid > 0)
 				{
 					// Update table subscription
-					$sql ="UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
-					$sql.=" WHERE rowid=".$subscriptionid;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET fk_bank=".$insertid;
+					$sql .= " WHERE rowid=".$subscriptionid;
 
 					dol_syslog("subscription::subscription", LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if (! $resql)
+					if (!$resql)
 					{
 						$error++;
-						$this->error=$this->db->lasterror();
-						$this->errors[]=$this->error;
+						$this->error = $this->db->lasterror();
+						$this->errors[] = $this->error;
 					}
 				}
 				else
 				{
 					$error++;
-					$this->error=$acct->error;
-					$this->errors=$acct->errors;
+					$this->error = $acct->error;
+					$this->errors = $acct->errors;
 				}
 			}
 			else
 			{
 				$error++;
-				$this->error=$acct->error;
-				$this->errors=$acct->errors;
+				$this->error = $acct->error;
+				$this->errors = $acct->errors;
 			}
 		}
 
@@ -1402,31 +1402,31 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 
-			$invoice=new Facture($this->db);
-			$customer=new Societe($this->db);
+			$invoice = new Facture($this->db);
+			$customer = new Societe($this->db);
 
-			if (! $error)
+			if (!$error)
 			{
-				if (! ($this->fk_soc > 0))
+				if (!($this->fk_soc > 0))
 				{
 					if ($autocreatethirdparty)
 					{
 						// Create a linked thirdparty to member
-						$companyalias='';
+						$companyalias = '';
 						$fullname = $this->getFullName($langs);
 
 						if ($this->morphy == 'mor')
 						{
-							$companyname=$this->societe;
-							if (! empty($fullname)) $companyalias=$fullname;
+							$companyname = $this->societe;
+							if (!empty($fullname)) $companyalias = $fullname;
 						}
 						else
 						{
-							$companyname=$fullname;
-							if (! empty($this->societe)) $companyalias=$this->societe;
+							$companyname = $fullname;
+							if (!empty($this->societe)) $companyalias = $this->societe;
 						}
 
-						$result=$customer->create_from_member($this, $companyname, $companyalias);
+						$result = $customer->create_from_member($this, $companyname, $companyalias);
 						if ($result < 0)
 						{
 							$this->error = $customer->error;
@@ -1441,54 +1441,54 @@ 
 					else
 					{
 						 $langs->load("errors");
-						 $this->error=$langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
-						 $this->errors[]=$this->error;
+						 $this->error = $langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
+						 $this->errors[] = $this->error;
 						 $error++;
 					}
 				}
 			}
-			if (! $error)
+			if (!$error)
 			{
-				$result=$customer->fetch($this->fk_soc);
+				$result = $customer->fetch($this->fk_soc);
 				if ($result <= 0)
 				{
-					$this->error=$customer->error;
-					$this->errors=$customer->errors;
+					$this->error = $customer->error;
+					$this->errors = $customer->errors;
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Create draft invoice
-				$invoice->type=Facture::TYPE_STANDARD;
-				$invoice->cond_reglement_id=$customer->cond_reglement_id;
+				$invoice->type = Facture::TYPE_STANDARD;
+				$invoice->cond_reglement_id = $customer->cond_reglement_id;
 				if (empty($invoice->cond_reglement_id))
 				{
-					$paymenttermstatic=new PaymentTerm($this->db);
-					$invoice->cond_reglement_id=$paymenttermstatic->getDefaultId();
+					$paymenttermstatic = new PaymentTerm($this->db);
+					$invoice->cond_reglement_id = $paymenttermstatic->getDefaultId();
 					if (empty($invoice->cond_reglement_id))
 					{
 						$error++;
-						$this->error='ErrorNoPaymentTermRECEPFound';
-						$this->errors[]=$this->error;
+						$this->error = 'ErrorNoPaymentTermRECEPFound';
+						$this->errors[] = $this->error;
 					}
 				}
-				$invoice->socid=$this->fk_soc;
-				$invoice->date=$datesubscription;
+				$invoice->socid = $this->fk_soc;
+				$invoice->date = $datesubscription;
 
 				// Possibility to add external linked objects with hooks
 				$invoice->linked_objects['subscription'] = $subscriptionid;
-				if (! empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects']))
+				if (!empty($_POST['other_linked_objects']) && is_array($_POST['other_linked_objects']))
 				{
 					$invoice->linked_objects = array_merge($invoice->linked_objects, $_POST['other_linked_objects']);
 				}
 
-				$result=$invoice->create($user);
+				$result = $invoice->create($user);
 				if ($result <= 0)
 				{
-					$this->error=$invoice->error;
-					$this->errors=$invoice->errors;
+					$this->error = $invoice->error;
+					$this->errors = $invoice->errors;
 					$error++;
 				}
 				else
@@ -1497,46 +1497,46 @@ 
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Add line to draft invoice
-				$idprodsubscription=0;
-				if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+				$idprodsubscription = 0;
+				if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
 
-				$vattouse=0;
+				$vattouse = 0;
 				if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
 				{
-					$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
+					$vattouse = get_default_tva($mysoc, $mysoc, $idprodsubscription);
 				}
 				//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
-				$result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datesubscription,'',0,0,'','TTC',$amount,1);
+				$result = $invoice->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
 				if ($result <= 0)
 				{
-					$this->error=$invoice->error;
-					$this->errors=$invoice->errors;
+					$this->error = $invoice->error;
+					$this->errors = $invoice->errors;
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Validate invoice
-				$result=$invoice->validate($user);
+				$result = $invoice->validate($user);
 				if ($result <= 0)
 				{
-					$this->error=$invoice->error;
-					$this->errors=$invoice->errors;
+					$this->error = $invoice->error;
+					$this->errors = $invoice->errors;
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// TODO Link invoice with subscription ?
 			}
 
 			// Add payment onto invoice
-			if (! $error && $option == 'bankviainvoice' && $accountid)
+			if (!$error && $option == 'bankviainvoice' && $accountid)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 				require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -1548,66 +1548,66 @@ 
 				$paiement = new Paiement($this->db);
 				$paiement->datepaye     = $paymentdate;
 				$paiement->amounts      = $amounts;
-				$paiement->paiementid   = dol_getIdFromCode($this->db,$operation,'c_paiement','code','id',1);
+				$paiement->paiementid   = dol_getIdFromCode($this->db, $operation, 'c_paiement', 'code', 'id', 1);
 				$paiement->num_paiement = $num_chq;
 				$paiement->note         = $label;
 				$paiement->note_public  = $label;
 
-				if (! $error)
+				if (!$error)
 				{
 					// Create payment line for invoice
 					$paiement_id = $paiement->create($user);
-					if (! $paiement_id > 0)
+					if (!$paiement_id > 0)
 					{
-						$this->error=$paiement->error;
-						$this->errors=$paiement->errors;
+						$this->error = $paiement->error;
+						$this->errors = $paiement->errors;
 						$error++;
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					// Add transaction into bank account
-					$bank_line_id=$paiement->addPaymentToBank($user,'payment','(SubscriptionPayment)',$accountid,$emetteur_nom,$emetteur_banque);
-					if (! ($bank_line_id > 0))
+					$bank_line_id = $paiement->addPaymentToBank($user, 'payment', '(SubscriptionPayment)', $accountid, $emetteur_nom, $emetteur_banque);
+					if (!($bank_line_id > 0))
 					{
-						$this->error=$paiement->error;
-						$this->errors=$paiement->errors;
+						$this->error = $paiement->error;
+						$this->errors = $paiement->errors;
 						$error++;
 					}
 				}
 
-				if (! $error && !empty($bank_line_id))
+				if (!$error && !empty($bank_line_id))
 				{
 					// Update fk_bank into subscription table
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
-					$sql.= ' WHERE rowid='.$subscriptionid;
+					$sql .= ' WHERE rowid='.$subscriptionid;
 
 					$result = $this->db->query($sql);
-					if (! $result)
+					if (!$result)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					// Set invoice as paid
 					$invoice->set_paid($user);
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				$lang_id=GETPOST('lang_id');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($lang_id))
+				$lang_id = GETPOST('lang_id');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($lang_id))
 					$newlang = $lang_id;
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
 					$newlang = $customer->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -1637,10 +1637,10 @@ 
 	 */
 	function validate($user)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
-		$error=0;
-		$now=dol_now();
+		$error = 0;
+		$now = dol_now();
 
 		// Check parameters
 		if ($this->statut == 1)
@@ -1652,19 +1652,19 @@ 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql.= " statut = 1";
-		$sql.= ", datevalid = '".$this->db->idate($now)."'";
-		$sql.= ", fk_user_valid=".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " statut = 1";
+		$sql .= ", datevalid = '".$this->db->idate($now)."'";
+		$sql .= ", fk_user_valid=".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$this->statut=1;
+			$this->statut = 1;
 
 			// Call trigger
-			$result=$this->call_trigger('MEMBER_VALIDATE',$user);
+			$result = $this->call_trigger('MEMBER_VALIDATE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
 			// End call triggers
 
@@ -1673,7 +1673,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1688,9 +1688,9 @@ 
 	 */
 	function resiliate($user)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
 		// Check paramaters
 		if ($this->statut == 0)
@@ -1702,17 +1702,17 @@ 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-		$sql.= " statut = 0";
-		$sql.= ", fk_user_valid=".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " statut = 0";
+		$sql .= ", fk_user_valid=".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$this->statut=0;
+			$this->statut = 0;
 
 			// Call trigger
-			$result=$this->call_trigger('MEMBER_RESILIATE',$user);
+			$result = $this->call_trigger('MEMBER_RESILIATE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
 			// End call triggers
 
@@ -1721,7 +1721,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1735,43 +1735,43 @@ 
 	 */
 	function add_to_abo()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-		$mailmanspip=new MailmanSpip($this->db);
+		$mailmanspip = new MailmanSpip($this->db);
 
-		$err=0;
+		$err = 0;
 
 		// mailman
-		if (! empty($conf->global->ADHERENT_USE_MAILMAN) && ! empty($conf->mailmanspip->enabled))
+		if (!empty($conf->global->ADHERENT_USE_MAILMAN) && !empty($conf->mailmanspip->enabled))
 		{
-			$result=$mailmanspip->add_to_mailman($this);
+			$result = $mailmanspip->add_to_mailman($this);
 
 			if ($result < 0)
 			{
-				if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
-				$err+=1;
+				if (!empty($mailmanspip->error)) $this->errors[] = $mailmanspip->error;
+				$err += 1;
 			}
 			foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail)
 			{
 				$langs->load("errors");
-				$this->errors[]=$langs->trans("ErrorFailedToAddToMailmanList",$tmpemail,$tmplist);
+				$this->errors[] = $langs->trans("ErrorFailedToAddToMailmanList", $tmpemail, $tmplist);
 			}
 			foreach ($mailmanspip->mladded_ok as $tmplist => $tmpemail)
 			{
 				$langs->load("mailmanspip");
-				$this->mesgs[]=$langs->trans("SuccessToAddToMailmanList",$tmpemail,$tmplist);
+				$this->mesgs[] = $langs->trans("SuccessToAddToMailmanList", $tmpemail, $tmplist);
 			}
 		}
 
 		// spip
-		if (! empty($conf->global->ADHERENT_USE_SPIP) && ! empty($conf->mailmanspip->enabled))
+		if (!empty($conf->global->ADHERENT_USE_SPIP) && !empty($conf->mailmanspip->enabled))
 		{
-			$result=$mailmanspip->add_to_spip($this);
+			$result = $mailmanspip->add_to_spip($this);
 			if ($result < 0)
 			{
-				$this->errors[]=$mailmanspip->error;
-				$err+=1;
+				$this->errors[] = $mailmanspip->error;
+				$err += 1;
 			}
 		}
 		if ($err)
@@ -1792,42 +1792,42 @@ 
 	 */
 	function del_to_abo()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-		$mailmanspip=new MailmanSpip($this->db);
+		$mailmanspip = new MailmanSpip($this->db);
 
-		$err=0;
+		$err = 0;
 
 		// mailman
-		if (! empty($conf->global->ADHERENT_USE_MAILMAN))
+		if (!empty($conf->global->ADHERENT_USE_MAILMAN))
 		{
-			$result=$mailmanspip->del_to_mailman($this);
+			$result = $mailmanspip->del_to_mailman($this);
 			if ($result < 0)
 			{
-				if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
-				$err+=1;
+				if (!empty($mailmanspip->error)) $this->errors[] = $mailmanspip->error;
+				$err += 1;
 			}
 
 			foreach ($mailmanspip->mlremoved_ko as $tmplist => $tmpemail)
 			{
 				$langs->load("errors");
-				$this->errors[]=$langs->trans("ErrorFailedToRemoveToMailmanList",$tmpemail,$tmplist);
+				$this->errors[] = $langs->trans("ErrorFailedToRemoveToMailmanList", $tmpemail, $tmplist);
 			}
 			foreach ($mailmanspip->mlremoved_ok as $tmplist => $tmpemail)
 			{
 				$langs->load("mailmanspip");
-				$this->mesgs[]=$langs->trans("SuccessToRemoveToMailmanList",$tmpemail,$tmplist);
+				$this->mesgs[] = $langs->trans("SuccessToRemoveToMailmanList", $tmpemail, $tmplist);
 			}
 		}
 
-		if ($conf->global->ADHERENT_USE_SPIP && ! empty($conf->mailmanspip->enabled))
+		if ($conf->global->ADHERENT_USE_SPIP && !empty($conf->mailmanspip->enabled))
 		{
-			$result=$mailmanspip->del_to_spip($this);
+			$result = $mailmanspip->del_to_spip($this);
 			if ($result < 0)
 			{
-				$this->errors[]=$mailmanspip->error;
-				$err+=1;
+				$this->errors[] = $mailmanspip->error;
+				$err += 1;
 			}
 		}
 		if ($err)
@@ -1852,7 +1852,7 @@ 
 		global $langs;
 		$langs->load("dict");
 
-		$code=(empty($this->civility_id)?'':$this->civility_id);
+		$code = (empty($this->civility_id) ? '' : $this->civility_id);
 		if (empty($code)) return '';
 		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
@@ -1868,31 +1868,31 @@ 
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpictoimg=0, $maxlen=0, $option='card', $mode='', $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $conf, $langs;
 
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg = 0;
 
-		$notooltip=0;
+		$notooltip = 0;
 
-		$result=''; $label='';
-		$link=''; $linkstart=''; $linkend='';
+		$result = ''; $label = '';
+		$link = ''; $linkstart = ''; $linkend = '';
 
-		if (! empty($this->photo))
+		if (!empty($this->photo))
 		{
-			$label.= '<div class="photointooltip">';
-			$label.= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
-			$label.= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip">';
+			$label .= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
+			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-		$label.= '<div class="centpercent">';
-		$label.= '<u>' . $langs->trans("Member") . '</u>';
-		if (! empty($this->ref))
-			$label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-		if (! empty($this->firstname) || ! empty($this->lastname))
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
-		$label.='</div>';
+		$label .= '<div class="centpercent">';
+		$label .= '<u>'.$langs->trans("Member").'</u>';
+		if (!empty($this->ref))
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->firstname) || !empty($this->lastname))
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
+		$label .= '</div>';
 
 		$url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
 		if ($option == 'subscription')
@@ -1903,49 +1903,49 @@ 
 		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;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$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;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
 		$link = '<a href="'.$url.'"';
-		$linkclose="";
+		$linkclose = "";
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
 				$langs->load("users");
-				$label=$langs->trans("ShowUser");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowUser");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		}
 
-		$link.=$linkclose.'>';
-		$linkend='</a>';
+		$link .= $linkclose.'>';
+		$linkend = '</a>';
 
 		//if ($withpictoimg == -1) $result.='<div class="nowrap">';
-		$result.=$link;
+		$result .= $link;
 		if ($withpictoimg)
 		{
-			$paddafterimage='';
-			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
+			$paddafterimage = '';
+			if (abs($withpictoimg) == 1) $paddafterimage = 'style="margin-right: 3px;"';
 			// Only picto
-			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			if ($withpictoimg > 0) $picto = '<div class="inline-block nopadding valignmiddle'.($morecss ? ' userimg'.$morecss : '').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).'</div>';
 			// Picto must be a photo
-			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
-			$result.=$picto;
+			else $picto = '<div class="inline-block nopadding valignmiddle'.($morecss ? ' userimg'.$morecss : '').'"'.($paddafterimage ? ' '.$paddafterimage : '').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg == -3 ? 'small' : ''), 'mini', 0, 1).'</div>';
+			$result .= $picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2)
 		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
-			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref') $result.=$this->id;
-			else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<div class="inline-block nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' usertext'.$morecss : '').'">';
+			if ($mode == 'login') $result .= dol_trunc($this->login, $maxlen);
+			elseif ($mode == 'ref') $result .= $this->id;
+			else $result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</div>';
 		}
-		$result.=$linkend;
+		$result .= $linkend;
 		//if ($withpictoimg == -1) $result.='</div>';
 
 		return $result;
@@ -1957,9 +1957,9 @@ 
 	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string				Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$this->need_subscription,$this->datefin,$mode);
+		return $this->LibStatut($this->statut, $this->need_subscription, $this->datefin, $mode);
 	}
 
 	/**
@@ -1971,7 +1971,7 @@ 
 	 *  @param  int			$mode        			0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string      						Label
 	 */
-	function LibStatut($statut,$need_subscription,$date_end_subscription,$mode=0)
+	function LibStatut($statut, $need_subscription, $date_end_subscription, $mode = 0)
 	{
 		global $langs;
 		$langs->load("members");
@@ -1980,7 +1980,7 @@ 
 			if ($statut == -1) return $langs->trans("MemberStatusDraft");
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return $langs->trans("MemberStatusActive");
+				if (!$date_end_subscription)            return $langs->trans("MemberStatusActive");
 				elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLate");
 				else                                     return $langs->trans("MemberStatusPaid");
 			}
@@ -1991,7 +1991,7 @@ 
 			if ($statut == -1) return $langs->trans("MemberStatusDraftShort");
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return $langs->trans("MemberStatusActiveShort");
+				if (!$date_end_subscription)            return $langs->trans("MemberStatusActiveShort");
 				elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLateShort");
 				else                                     return $langs->trans("MemberStatusPaidShort");
 			}
@@ -1999,58 +1999,58 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraftShort");
+			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0').' '.$langs->trans("MemberStatusDraftShort");
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActiveShort");
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLateShort");
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaidShort");
+				if (!$date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'), 'statut1').' '.$langs->trans("MemberStatusActiveShort");
+				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3').' '.$langs->trans("MemberStatusActiveLateShort");
+				else                                     return img_picto($langs->trans('MemberStatusPaid'), 'statut4').' '.$langs->trans("MemberStatusPaidShort");
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliatedShort");
+			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'), 'statut5').' '.$langs->trans("MemberStatusResiliatedShort");
 		}
 		if ($mode == 3)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0');
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (!$date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'), 'statut1');
+				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
+				else                                     return img_picto($langs->trans('MemberStatusPaid'), 'statut4');
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5');
+			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraft");
+			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'), 'statut0').' '.$langs->trans("MemberStatusDraft");
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActive");
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLate");
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaid");
+				if (!$date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'), 'statut1').' '.$langs->trans("MemberStatusActive");
+				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'), 'statut3').' '.$langs->trans("MemberStatusActiveLate");
+				else                                     return img_picto($langs->trans('MemberStatusPaid'), 'statut4').' '.$langs->trans("MemberStatusPaid");
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliated");
+			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'), 'statut5').' '.$langs->trans("MemberStatusResiliated");
 		}
 		if ($mode == 5)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'), 'statut0');
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveShort").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLateShort").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaidShort").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (!$date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveShort").' </span>'.img_picto($langs->trans('MemberStatusActive'), 'statut1');
+				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLateShort").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
+				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaidShort").' </span>'.img_picto($langs->trans('MemberStatusPaid'), 'statut4');
 			}
-			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
+			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
 		}
 		if ($mode == 6)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'), 'statut0');
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActive").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLate").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaid").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (!$date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActive").' </span>'.img_picto($langs->trans('MemberStatusActive'), 'statut1');
+				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLate").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'), 'statut3');
+				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaid").' </span>'.img_picto($langs->trans('MemberStatusPaid'), 'statut4');
 			}
-			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
+			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'), 'statut5');
 		}
 	}
 
@@ -2064,19 +2064,19 @@ 
 	{
 		global $conf;
 
-		$this->nb=array();
+		$this->nb = array();
 
 		$sql = "SELECT count(a.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		$sql.= " WHERE a.statut > 0";
-		$sql.= " AND a.entity IN (".getEntity('adherent').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " WHERE a.statut > 0";
+		$sql .= " AND a.entity IN (".getEntity('adherent').")";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["members"]=$obj->nb;
+				$this->nb["members"] = $obj->nb;
 			}
 			$this->db->free($resql);
 			return 1;
@@ -2084,7 +2084,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 
@@ -2100,30 +2100,30 @@ 
 	{
 		global $conf, $langs;
 
-		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+		if ($user->societe_id) return -1; // protection pour eviter appel par utilisateur externe
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$sql = "SELECT a.rowid, a.datefin, a.statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		$sql.= " WHERE a.statut = 1";
-		$sql.= " AND a.entity IN (".getEntity('adherent').")";
-		$sql.= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " WHERE a.statut = 1";
+		$sql .= " AND a.entity IN (".getEntity('adherent').")";
+		$sql .= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$langs->load("members");
 
 			$response = new WorkboardResponse();
-			$response->warning_delay=$conf->adherent->subscription->warning_delay/60/60/24;
-			$response->label=$langs->trans("MembersWithSubscriptionToReceive");
-			$response->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
-			$response->img=img_object('',"user");
+			$response->warning_delay = $conf->adherent->subscription->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("MembersWithSubscriptionToReceive");
+			$response->url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
+			$response->img = img_object('', "user");
 
 			$adherentstatic = new Adherent($this->db);
 
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$response->nbtodo++;
 
@@ -2140,7 +2140,7 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2156,19 +2156,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("orders");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'standard';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->ADHERENT_ADDON_PDF)) {
+			} elseif (!empty($conf->global->ADHERENT_ADDON_PDF)) {
 				$modele = $conf->global->ADHERENT_ADDON_PDF;
 			}
 		}
@@ -2188,16 +2188,16 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs;
+		global $user, $langs;
 
 		// Initialise parametres
-		$this->id=0;
-		$this->specimen=1;
+		$this->id = 0;
+		$this->specimen = 1;
 		$this->civility_id = 0;
 		$this->lastname = 'DOLIBARR';
 		$this->firstname = 'SPECIMEN';
-		$this->login='dolibspec';
-		$this->pass='dolibspec';
+		$this->login = 'dolibspec';
+		$this->pass = 'dolibspec';
 		$this->societe = 'Societe ABC';
 		$this->address = '61 jump street';
 		$this->zip = '75000';
@@ -2211,23 +2211,23 @@ 
 		$this->phone        = '0999999999';
 		$this->phone_perso  = '0999999998';
 		$this->phone_mobile = '0999999997';
-		$this->note_private='No comment';
-		$this->birth=time();
-		$this->photo='';
-		$this->public=1;
-		$this->statut=0;
-
-		$this->datefin=time();
-		$this->datevalid=time();
-
-		$this->typeid=1;				// Id type adherent
-		$this->type='Type adherent';	// Libelle type adherent
-		$this->need_subscription=0;
-
-		$this->first_subscription_date=time();
-		$this->first_subscription_amount=10;
-		$this->last_subscription_date=time();
-		$this->last_subscription_amount=10;
+		$this->note_private = 'No comment';
+		$this->birth = time();
+		$this->photo = '';
+		$this->public = 1;
+		$this->statut = 0;
+
+		$this->datefin = time();
+		$this->datevalid = time();
+
+		$this->typeid = 1; // Id type adherent
+		$this->type = 'Type adherent'; // Libelle type adherent
+		$this->need_subscription = 0;
+
+		$this->first_subscription_date = time();
+		$this->first_subscription_amount = 10;
+		$this->last_subscription_date = time();
+		$this->last_subscription_amount = 10;
 	}
 
 
@@ -2240,13 +2240,13 @@ 
 	 *								2=Return key only (uid=qqq)
 	 *	@return	string				DN
 	 */
-	function _load_ldap_dn($info,$mode=0)
+	function _load_ldap_dn($info, $mode = 0)
 	{
 		global $conf;
-		$dn='';
-		if ($mode==0) $dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS].",".$conf->global->LDAP_MEMBER_DN;
-		if ($mode==1) $dn=$conf->global->LDAP_MEMBER_DN;
-		if ($mode==2) $dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS];
+		$dn = '';
+		if ($mode == 0) $dn = $conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS].",".$conf->global->LDAP_MEMBER_DN;
+		if ($mode == 1) $dn = $conf->global->LDAP_MEMBER_DN;
+		if ($mode == 2) $dn = $conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS];
 		return $dn;
 	}
 
@@ -2258,15 +2258,15 @@ 
 	 */
 	function _load_ldap_info()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$info=array();
-		$keymodified=false;
+		$info = array();
+		$keymodified = false;
 
 		// Object classes
-		$info["objectclass"]=explode(',',$conf->global->LDAP_MEMBER_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_OBJECT_CLASS);
 
-		$this->fullname=$this->getFullName($langs);
+		$this->fullname = $this->getFullName($langs);
 
 		// For avoid ldap error when firstname and lastname are empty
 		if ($this->morphy == 'mor' && (empty($this->fullname) || $this->fullname == $this->societe)) {
@@ -2286,50 +2286,50 @@ 
 		// Member
 		foreach ($ldapkey as $constname => $varname)
 		{
-			if (! empty($this->$varname) && ! empty($conf->global->$constname))
+			if (!empty($this->$varname) && !empty($conf->global->$constname))
 			{
 				$info[$conf->global->$constname] = $this->$varname;
 
 				// Check if it is the LDAP key and if its value has been changed
-				if (! empty($conf->global->LDAP_KEY_MEMBERS) && $conf->global->LDAP_KEY_MEMBERS == $conf->global->$constname)
+				if (!empty($conf->global->LDAP_KEY_MEMBERS) && $conf->global->LDAP_KEY_MEMBERS == $conf->global->$constname)
 				{
-					if (! empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) $keymodified=true; // For check if LDAP key has been modified
+					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) $keymodified = true; // For check if LDAP key has been modified
 				}
 			}
 		}
-		if ($this->firstname && ! empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME))			$info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
-		if ($this->poste && ! empty($conf->global->LDAP_MEMBER_FIELD_TITLE))					$info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
-		if ($this->societe && ! empty($conf->global->LDAP_MEMBER_FIELD_COMPANY))				$info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->societe;
-		if ($this->address && ! empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))				$info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && ! empty($conf->global->LDAP_MEMBER_FIELD_ZIP))						$info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
-		if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN))					$info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
-		if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))			$info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
-		if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))					$info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
-		if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE))					$info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
-		if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO))		$info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
-		if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE))			$info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX))						$info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
-		if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION))		$info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private;
-		if ($this->note_public && ! empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC))		$info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public;
-		if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE))				$info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap');
-		if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))			$info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
-		if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION))	$info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap');
+		if ($this->firstname && !empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME))			$info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
+		if ($this->poste && !empty($conf->global->LDAP_MEMBER_FIELD_TITLE))					$info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
+		if ($this->societe && !empty($conf->global->LDAP_MEMBER_FIELD_COMPANY))				$info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->societe;
+		if ($this->address && !empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))				$info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
+		if ($this->zip && !empty($conf->global->LDAP_MEMBER_FIELD_ZIP))						$info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
+		if ($this->town && !empty($conf->global->LDAP_MEMBER_FIELD_TOWN))					$info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
+		if ($this->country_code && !empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))			$info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
+		if ($this->skype && !empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))					$info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
+		if ($this->phone && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE))					$info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
+		if ($this->phone_perso && !empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO))		$info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
+		if ($this->phone_mobile && !empty($conf->global->LDAP_MEMBER_FIELD_MOBILE))			$info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
+		if ($this->fax && !empty($conf->global->LDAP_MEMBER_FIELD_FAX))						$info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
+		if ($this->note_private && !empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION))		$info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private;
+		if ($this->note_public && !empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC))		$info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public;
+		if ($this->birth && !empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE))				$info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth, 'dayhourldap');
+		if (isset($this->statut) && !empty($conf->global->LDAP_FIELD_MEMBER_STATUS))			$info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
+		if ($this->datefin && !empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION))	$info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin, 'dayhourldap');
 
 		// When password is modified
-		if (! empty($this->pass))
+		if (!empty($this->pass))
 		{
-			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)
+			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
 		else if ($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))
+			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 			{
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO))
 				{
-					if ($this->pass_indatabase_crypted && ! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED))	{
+					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
 						// Create OpenLDAP MD5 password from Dolibarr MD5 password
 						// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
 						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}'.base64_encode(hex2bin($this->pass_indatabase_crypted));
@@ -2337,18 +2337,18 @@ 
 				}
 			}
 			// Use $this->pass_indatabase value if exists
-			else if (! empty($this->pass_indatabase))
+			else if (!empty($this->pass_indatabase))
 			{
-				if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase;	// $this->pass_indatabase = 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_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = 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_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
 			}
 		}
 
 		// Subscriptions
-		if ($this->first_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE))     $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]  = dol_print_date($this->first_subscription_date,'dayhourldap');
-		if (isset($this->first_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)) $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT] = $this->first_subscription_amount;
-		if ($this->last_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE))       $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]   = dol_print_date($this->last_subscription_date,'dayhourldap');
-		if (isset($this->last_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT))   $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
+		if ($this->first_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE))     $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]  = dol_print_date($this->first_subscription_date, 'dayhourldap');
+		if (isset($this->first_subscription_amount) && !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)) $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT] = $this->first_subscription_amount;
+		if ($this->last_subscription_date && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE))       $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]   = dol_print_date($this->last_subscription_date, 'dayhourldap');
+		if (isset($this->last_subscription_amount) && !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT))   $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
 
 		return $info;
 	}
@@ -2363,14 +2363,14 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT a.rowid, a.datec as datec,';
-		$sql.= ' a.datevalid as datev,';
-		$sql.= ' a.tms as datem,';
-		$sql.= ' a.fk_user_author, a.fk_user_valid, a.fk_user_mod';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'adherent as a';
-		$sql.= ' WHERE a.rowid = '.$id;
+		$sql .= ' a.datevalid as datev,';
+		$sql .= ' a.tms as datem,';
+		$sql .= ' a.fk_user_author, a.fk_user_valid, a.fk_user_mod';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'adherent as a';
+		$sql .= ' WHERE a.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -2381,7 +2381,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -2429,7 +2429,7 @@ 
 		}
 
 		// Get current categories
-		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$c = new Categorie($this->db);
 		$existing = $c->containing($this->id, Categorie::TYPE_MEMBER, 'id');
 
@@ -2485,7 +2485,7 @@ 
 
 		//Only valid members
 		if ($this->statut <= 0) return false;
-		if (! $this->datefin) return false;
+		if (!$this->datefin) return false;
 
 		$now = dol_now();
 
@@ -2502,12 +2502,12 @@ 
 	 * @param	int			$daysbeforeend		Nb of days before end of subscription (negative number = after subscription)
 	 * @return	int								0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function sendReminderForExpiredSubscription($daysbeforeend=10)
+	public function sendReminderForExpiredSubscription($daysbeforeend = 10)
 	{
 		global $conf, $langs, $mysoc, $user;
 
 		$this->output = '';
-		$this->error='';
+		$this->error = '';
 
 		$blockingerrormsg = '';
 
@@ -2522,11 +2522,11 @@ 
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$tmp=dol_getdate($now);
+		$tmp = dol_getdate($now);
 		$datetosearchfor = dol_time_plus_duree(dol_mktime(0, 0, 0, $tmp['mon'], $tmp['mday'], $tmp['year']), -1 * $daysbeforeend, 'd');
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'adherent';
-		$sql.= " WHERE datefin = '".$this->db->idate($datetosearchfor)."'";
+		$sql .= " WHERE datefin = '".$this->db->idate($datetosearchfor)."'";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2535,9 +2535,9 @@ 
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$adherent = new Adherent($this->db);
-			$formmail=new FormMail($db);
+			$formmail = new FormMail($db);
 
-			$i=0;
+			$i = 0;
 			$nbok = 0;
 			$nbko = 0;
 			while ($i < $num_rows)
@@ -2562,11 +2562,11 @@ 
 					$outputlangs->setDefaultLang(empty($adherent->thirdparty->default_lang) ? $mysoc->default_lang : $adherent->thirdparty->default_lang);
 					$outputlangs->loadLangs(array("main", "members"));
 
-					$arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'member', $user, $outputlangs, 0, 1, '(SendReminderForExpiredSubscriptionTitle)');
+					$arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'member', $user, $outputlangs, 0, 1, '(SendReminderForExpiredSubscriptionTitle)');
 
 					if (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
 					{
-						$substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $adherent);
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $adherent);
 						//if (is_array($adherent->thirdparty)) $substitutionarraycomp = ...
 						complete_substitutions_array($substitutionarray, $outputlangs, $adherent);
 
@@ -2577,7 +2577,7 @@ 
 
 						$cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
 						$result = $cmail->sendfile();
-						if (! $result)
+						if (!$result)
 						{
 							$error++;
 							$this->error = $cmail->error;
@@ -2591,7 +2591,7 @@ 
 					}
 					else
 					{
-						$blockingerrormsg="Can't find email template '(SendReminderForExpiredSubscriptionTitle)'";
+						$blockingerrormsg = "Can't find email template '(SendReminderForExpiredSubscriptionTitle)'";
 						$nbko++;
 						break;
 					}
@@ -2614,8 +2614,8 @@ 
 		else
 		{
 			$this->output = 'Found '.($nbok + $nbko).' members to send reminder to.';
-			$this->output.= ' Send successfull to '.$nbok.' members';
-			if ($nbko) $this->output.= ' - Canceled for '.$nbko.' member (no email or email sending error)';
+			$this->output .= ' Send successfull to '.$nbok.' members';
+			if ($nbko) $this->output .= ' - Canceled for '.$nbko.' member (no email or email sending error)';
 		}
 
 		return 0;

Braces +375 added lines, -209 removed lines

@@ -147,16 +147,22 @@ 
 		if ($msgishtml == -1)
 		{
 			$msgishtml = 0;
-			if (dol_textishtml($text,1)) $msgishtml = 1;
+			if (dol_textishtml($text,1)) {
+				$msgishtml = 1;
+			}
 		}
 
 		$texttosend=$this->makeSubstitution($text);
 		$subjecttosend=$this->makeSubstitution($subject);
-		if ($msgishtml) $texttosend=dol_htmlentitiesbr($texttosend);
+		if ($msgishtml) {
+			$texttosend=dol_htmlentitiesbr($texttosend);
+		}
 
 		// Envoi mail confirmation
 		$from=$conf->email_from;
-		if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
+		if (! empty($conf->global->ADHERENT_MAIL_FROM)) {
+			$from=$conf->global->ADHERENT_MAIL_FROM;
+		}
 
 		// Send email (substitutionarray must be done just before this)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -164,8 +170,7 @@ 
 		if ($mailfile->sendfile())
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorFailedToSendMail",$from,$this->email).'. '.$mailfile->error;
 			return -1;
@@ -186,10 +191,14 @@ 
 		$birthday = dol_print_date($this->birth,'day');
 
 		$msgishtml = 0;
-		if (dol_textishtml($text,1)) $msgishtml = 1;
+		if (dol_textishtml($text,1)) {
+			$msgishtml = 1;
+		}
 
 		$infos='';
-		if ($this->civility_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
+		if ($this->civility_id) {
+			$infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
+		}
 		$infos.= $langs->transnoentities("id").": ".$this->id."\n";
 		$infos.= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
 		$infos.= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
@@ -278,7 +287,9 @@ 
 			$this->error = $langs->trans("ErrorBadEMail",$this->email);
 			return -1;
 		}
-		if (! $this->datec) $this->datec=$now;
+		if (! $this->datec) {
+			$this->datec=$now;
+		}
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
 			if (empty($this->login))
@@ -351,22 +362,19 @@ 
 					dol_syslog(get_class($this)."::create ".implode(',',$this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -3;
-				}
-				else
+				} else
 				{
 					$this->db->commit();
 					return $this->id;
 				}
-			}
-			else
+			} else
 			{
 				$this->error='Failed to get last insert id';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -403,8 +411,12 @@ 
 		$this->town=($this->town?$this->town:$this->town);
 		$this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
 		$this->state_id=($this->state_id > 0?$this->state_id:$this->state_id);
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords(trim($this->lastname));
-		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords(trim($this->firstname));
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->lastname=ucwords(trim($this->lastname));
+		}
+		if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+			$this->firstname=ucwords(trim($this->firstname));
+		}
 		$this->note_public=($this->note_public?$this->note_public:$this->note_public);
 		$this->note_private=($this->note_private?$this->note_private:$this->note_private);
 
@@ -443,8 +455,14 @@ 
 		$sql.= ", fk_adherent_type = ".$this->db->escape($this->typeid);
 		$sql.= ", morphy = '".$this->db->escape($this->morphy)."'";
 		$sql.= ", birth = ".($this->birth?"'".$this->db->idate($this->birth)."'":"null");
-		if ($this->datefin)   $sql.= ", datefin = '".$this->db->idate($this->datefin)."'";		// Must be modified only when deleting a subscription
-		if ($this->datevalid) $sql.= ", datevalid = '".$this->db->idate($this->datevalid)."'";	// Must be modified only when validating a member
+		if ($this->datefin) {
+			$sql.= ", datefin = '".$this->db->idate($this->datefin)."'";
+		}
+		// Must be modified only when deleting a subscription
+		if ($this->datevalid) {
+			$sql.= ", datevalid = '".$this->db->idate($this->datevalid)."'";
+		}
+		// Must be modified only when validating a member
 		$sql.= ", fk_user_mod = ".($user->id>0?$user->id:'null');	// Can be null because member can be create by a guest
 		$sql.= " WHERE rowid = ".$this->id;
 
@@ -469,16 +487,19 @@ 
 			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook))
 			{
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+					// For avoid conflicts if trigger used
 				{
 					$result=$this->insertExtraFields();
+				}
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
+			} else if ($reshook < 0) {
+				$error++;
 			}
-			else if ($reshook < 0) $error++;
 
 			// Update password
 			if (! $error && $this->pass)
@@ -490,7 +511,9 @@ 
 
 					// If password to set differs from the one found into database
 					$result=$this->setPassword($user,$this->pass,$isencrypted,$notrigger,$nosyncuserpass);
-					if (! $nbrowsaffected) $nbrowsaffected++;
+					if (! $nbrowsaffected) {
+						$nbrowsaffected++;
+					}
 				}
 			}
 
@@ -512,12 +535,14 @@ 
 				}
 			}
 
-			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';
+			}
 
 					dol_syslog(get_class($this)."::update update linked user");
 
@@ -530,7 +555,9 @@ 
 						//var_dump($this->login);exit;
 
 						// If option ADHERENT_LOGIN_NOT_REQUIRED is on, there is no login of member, so we do not overwrite user login to keep existing one.
-						if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $luser->login=$this->login;
+						if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+							$luser->login=$this->login;
+						}
 
 						$luser->civility_id=$this->civility_id;
 						$luser->firstname=$this->firstname;
@@ -552,8 +579,7 @@ 
 							dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 							$error++;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$luser->error;
 						$error++;
@@ -592,8 +618,7 @@ 
 							dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 							$error++;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$lthirdparty->error;
 						$error++;
@@ -613,14 +638,12 @@ 
 			{
 				$this->db->commit();
 				return $nbrowsaffected;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
@@ -669,14 +692,12 @@ 
 				$this->datefin=$datefin;
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -702,7 +723,9 @@ 
 		$errorflag=0;
 
 		// Check parameters
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) {
+			$rowid=$this->id;
+		}
 
 		$this->db->begin();
 
@@ -710,7 +733,9 @@ 
 		{
 			// Call trigger
 			$result=$this->call_trigger('MEMBER_DELETE',$user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -754,9 +779,11 @@ 
 		// Removed extrafields
 		if (! $error)
 		{
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+				// For avoid conflicts if trigger used
 			{
 				$result=$this->deleteExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -784,8 +811,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return $errorflag;
@@ -836,8 +862,7 @@ 
 		if ($isencrypted)
 		{
 			$sql.= ", pass = null";
-		}
-		else
+		} else
 		{
 			$sql.= ", pass = '".$this->db->escape($password_indatabase)."'";
 		}
@@ -874,8 +899,7 @@ 
 							dol_syslog(get_class($this)."::setPassword ".$this->error,LOG_ERR);
 							$error++;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$luser->error;
 						$error++;
@@ -892,14 +916,12 @@ 
 
 				$this->db->commit();
 				return $this->pass;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			dol_print_error($this->db);
@@ -974,8 +996,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -1006,8 +1027,7 @@ 
 				$obj = $this->db->fetch_object($resql);
 				$this->fetch($obj->rowid);
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -1037,8 +1057,7 @@ 
 				$obj = $this->db->fetch_object($resql);
 				$this->fetch($obj->rowid);
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -1078,13 +1097,16 @@ 
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
 		$sql.= " WHERE d.fk_adherent_type = t.rowid";
-		if ($rowid) $sql.= " AND d.rowid=".$rowid;
-		elseif ($ref || $fk_soc) {
+		if ($rowid) {
+			$sql.= " AND d.rowid=".$rowid;
+		} elseif ($ref || $fk_soc) {
 			$sql.= " AND d.entity IN (".getEntity('adherent').")";
-			if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
-			elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
-		}
-		elseif ($ref_ext)
+			if ($ref) {
+				$sql.= " AND d.rowid='".$this->db->escape($ref)."'";
+			} elseif ($fk_soc > 0) {
+				$sql.= " AND d.fk_soc=".$fk_soc;
+			}
+		} elseif ($ref_ext)
 		{
 			$sql.= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
 		}
@@ -1122,10 +1144,11 @@ 
 
 				$this->country_id		= $obj->country_id;
 				$this->country_code		= $obj->country_code;
-				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
-					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
-				else
-					$this->country=$obj->country;
+				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) {
+									$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
+				} else {
+									$this->country=$obj->country;
+				}
 
 				$this->phone			= $obj->phone;
 				$this->phone_perso		= $obj->phone_perso;
@@ -1164,13 +1187,11 @@ 
 				$result=$this->fetch_subscriptions();
 
 				return $this->id;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -1235,8 +1256,7 @@ 
 				$i++;
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
 			return -1;
@@ -1267,15 +1287,16 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (! $amount) $amount=0;
+		if (! $amount) {
+			$amount=0;
+		}
 
 		$this->db->begin();
 
 		if ($datesubend)
 		{
 			$datefin=$datesubend;
-		}
-		else
+		} else
 		{
 			// If no end date, end date = date + 1 year - 1 day
 			$datefin = dol_time_plus_duree($date,1,'y');
@@ -1310,14 +1331,12 @@ 
 			{
 				$this->db->commit();
 				return $rowid;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$subscription->error;
 			$this->errors=$subscription->errors;
@@ -1380,15 +1399,13 @@ 
 						$this->error=$this->db->lasterror();
 						$this->errors[]=$this->error;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$acct->error;
 					$this->errors=$acct->errors;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$acct->error;
@@ -1418,12 +1435,15 @@ 
 						if ($this->morphy == 'mor')
 						{
 							$companyname=$this->societe;
-							if (! empty($fullname)) $companyalias=$fullname;
-						}
-						else
+							if (! empty($fullname)) {
+								$companyalias=$fullname;
+							}
+						} else
 						{
 							$companyname=$fullname;
-							if (! empty($this->societe)) $companyalias=$this->societe;
+							if (! empty($this->societe)) {
+								$companyalias=$this->societe;
+							}
 						}
 
 						$result=$customer->create_from_member($this, $companyname, $companyalias);
@@ -1432,13 +1452,11 @@ 
 							$this->error = $customer->error;
 							$this->errors = $customer->errors;
 							$error++;
-						}
-						else
+						} else
 						{
 							$this->fk_soc = $result;
 						}
-					}
-					else
+					} else
 					{
 						 $langs->load("errors");
 						 $this->error=$langs->trans("ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst");
@@ -1490,8 +1508,7 @@ 
 					$this->error=$invoice->error;
 					$this->errors=$invoice->errors;
 					$error++;
-				}
-				else
+				} else
 				{
 					$this->invoice = $invoice;
 				}
@@ -1501,7 +1518,9 @@ 
 			{
 				// Add line to draft invoice
 				$idprodsubscription=0;
-				if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) $idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+				if (! empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) {
+					$idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+				}
 
 				$vattouse=0;
 				if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
@@ -1603,10 +1622,12 @@ 
 				$outputlangs = $langs;
 				$newlang = '';
 				$lang_id=GETPOST('lang_id');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($lang_id))
-					$newlang = $lang_id;
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $customer->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($lang_id)) {
+									$newlang = $lang_id;
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+									$newlang = $customer->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1621,8 +1642,7 @@ 
 		if ($error)
 		{
 			return -1;
-		}
-		else
+		} else
 		{
 			return 1;
 		}
@@ -1670,8 +1690,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -1718,8 +1737,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -1749,7 +1767,9 @@ 
 
 			if ($result < 0)
 			{
-				if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
+				if (! empty($mailmanspip->error)) {
+					$this->errors[]=$mailmanspip->error;
+				}
 				$err+=1;
 			}
 			foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail)
@@ -1777,8 +1797,7 @@ 
 		if ($err)
 		{
 			return -$err;
-		}
-		else
+		} else
 		{
 			return 1;
 		}
@@ -1805,7 +1824,9 @@ 
 			$result=$mailmanspip->del_to_mailman($this);
 			if ($result < 0)
 			{
-				if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
+				if (! empty($mailmanspip->error)) {
+					$this->errors[]=$mailmanspip->error;
+				}
 				$err+=1;
 			}
 
@@ -1834,8 +1855,7 @@ 
 		{
 			// error
 			return -$err;
-		}
-		else
+		} else
 		{
 			return 1;
 		}
@@ -1853,7 +1873,9 @@ 
 		$langs->load("dict");
 
 		$code=(empty($this->civility_id)?'':$this->civility_id);
-		if (empty($code)) return '';
+		if (empty($code)) {
+			return '';
+		}
 		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
 
@@ -1872,7 +1894,9 @@ 
 	{
 		global $conf, $langs;
 
-		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
+		if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) {
+			$withpictoimg=0;
+		}
 
 		$notooltip=0;
 
@@ -1888,10 +1912,12 @@ 
 
 		$label.= '<div class="centpercent">';
 		$label.= '<u>' . $langs->trans("Member") . '</u>';
-		if (! empty($this->ref))
-			$label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-		if (! empty($this->firstname) || ! empty($this->lastname))
-			$label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
+		if (! empty($this->ref)) {
+					$label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		}
+		if (! empty($this->firstname) || ! empty($this->lastname)) {
+					$label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
+		}
 		$label.='</div>';
 
 		$url = DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id;
@@ -1904,8 +1930,12 @@ 
 		{
 			// 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;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url.='&save_lastsearch_values=1';
+			}
 		}
 
 		$link = '<a href="'.$url.'"';
@@ -1930,20 +1960,34 @@ 
 		if ($withpictoimg)
 		{
 			$paddafterimage='';
-			if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
+			if (abs($withpictoimg) == 1) {
+				$paddafterimage='style="margin-right: 3px;"';
+			}
 			// Only picto
-			if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			if ($withpictoimg > 0) {
+				$picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
+			}
 			// Picto must be a photo
-			else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+			else {
+				$picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
+			}
 			$result.=$picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2)
 		{
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
-			if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref') $result.=$this->id;
-			else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
+			}
+			if ($mode == 'login') {
+				$result.=dol_trunc($this->login, $maxlen);
+			} elseif ($mode == 'ref') {
+				$result.=$this->id;
+			} else {
+				$result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
+			}
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$result.='</div>';
+			}
 		}
 		$result.=$linkend;
 		//if ($withpictoimg == -1) $result.='</div>';
@@ -1977,80 +2021,136 @@ 
 		$langs->load("members");
 		if ($mode == 0)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraft");
+			if ($statut == -1) {
+				return $langs->trans("MemberStatusDraft");
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return $langs->trans("MemberStatusActive");
-				elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLate");
-				else                                     return $langs->trans("MemberStatusPaid");
+				if (! $date_end_subscription) {
+					return $langs->trans("MemberStatusActive");
+				} elseif ($date_end_subscription < time()) {
+					return $langs->trans("MemberStatusActiveLate");
+				} else {
+					return $langs->trans("MemberStatusPaid");
+				}
+			}
+			if ($statut == 0) {
+				return $langs->trans("MemberStatusResiliated");
 			}
-			if ($statut == 0)  return $langs->trans("MemberStatusResiliated");
 		}
 		if ($mode == 1)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraftShort");
+			if ($statut == -1) {
+				return $langs->trans("MemberStatusDraftShort");
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return $langs->trans("MemberStatusActiveShort");
-				elseif ($date_end_subscription < time()) return $langs->trans("MemberStatusActiveLateShort");
-				else                                     return $langs->trans("MemberStatusPaidShort");
+				if (! $date_end_subscription) {
+					return $langs->trans("MemberStatusActiveShort");
+				} elseif ($date_end_subscription < time()) {
+					return $langs->trans("MemberStatusActiveLateShort");
+				} else {
+					return $langs->trans("MemberStatusPaidShort");
+				}
+			}
+			if ($statut == 0) {
+				return $langs->trans("MemberStatusResiliatedShort");
 			}
-			if ($statut == 0)  return $langs->trans("MemberStatusResiliatedShort");
 		}
 		if ($mode == 2)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraftShort");
+			if ($statut == -1) {
+				return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraftShort");
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActiveShort");
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLateShort");
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaidShort");
+				if (! $date_end_subscription) {
+					return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActiveShort");
+				} elseif ($date_end_subscription < time()) {
+					return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLateShort");
+				} else {
+					return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaidShort");
+				}
+			}
+			if ($statut == 0) {
+				return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliatedShort");
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliatedShort");
 		}
 		if ($mode == 3)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) {
+				return img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (! $date_end_subscription) {
+					return img_picto($langs->trans('MemberStatusActive'),'statut1');
+				} elseif ($date_end_subscription < time()) {
+					return img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
+				} else {
+					return img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				}
+			}
+			if ($statut == 0) {
+				return img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($statut == -1) return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraft");
+			if ($statut == -1) {
+				return img_picto($langs->trans('MemberStatusDraft'),'statut0').' '.$langs->trans("MemberStatusDraft");
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActive");
-				elseif ($date_end_subscription < time()) return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLate");
-				else                                     return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaid");
+				if (! $date_end_subscription) {
+					return img_picto($langs->trans('MemberStatusActive'),'statut1').' '.$langs->trans("MemberStatusActive");
+				} elseif ($date_end_subscription < time()) {
+					return img_picto($langs->trans('MemberStatusActiveLate'),'statut3').' '.$langs->trans("MemberStatusActiveLate");
+				} else {
+					return img_picto($langs->trans('MemberStatusPaid'),'statut4').' '.$langs->trans("MemberStatusPaid");
+				}
+			}
+			if ($statut == 0) {
+				return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliated");
 			}
-			if ($statut == 0)  return img_picto($langs->trans('MemberStatusResiliated'),'statut5').' '.$langs->trans("MemberStatusResiliated");
 		}
 		if ($mode == 5)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) {
+				return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveShort").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLateShort").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaidShort").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (! $date_end_subscription) {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveShort").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
+				} elseif ($date_end_subscription < time()) {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLateShort").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
+				} else {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaidShort").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				}
+			}
+			if ($statut == 0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 			}
-			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 		}
 		if ($mode == 6)
 		{
-			if ($statut == -1) return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			if ($statut == -1) {
+				return $langs->trans("MemberStatusDraft").' '.img_picto($langs->trans('MemberStatusDraft'),'statut0');
+			}
 			if ($statut >= 1)
 			{
-				if (! $date_end_subscription)            return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActive").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
-				elseif ($date_end_subscription < time()) return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLate").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
-				else                                     return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaid").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				if (! $date_end_subscription) {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActive").' </span>'.img_picto($langs->trans('MemberStatusActive'),'statut1');
+				} elseif ($date_end_subscription < time()) {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusActiveLate").' </span>'.img_picto($langs->trans('MemberStatusActiveLate'),'statut3');
+				} else {
+					return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusPaid").' </span>'.img_picto($langs->trans('MemberStatusPaid'),'statut4');
+				}
+			}
+			if ($statut == 0) {
+				return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 			}
-			if ($statut == 0)  return '<span class="hideonsmartphone">'.$langs->trans("MemberStatusResiliated").' </span>'.img_picto($langs->trans('MemberStatusResiliated'),'statut5');
 		}
 	}
 
@@ -2080,8 +2180,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2100,7 +2199,10 @@ 
 	{
 		global $conf, $langs;
 
-		if ($user->societe_id) return -1;   // protection pour eviter appel par utilisateur externe
+		if ($user->societe_id) {
+			return -1;
+		}
+		// protection pour eviter appel par utilisateur externe
 
 		$now=dol_now();
 
@@ -2136,8 +2238,7 @@ 
 			}
 
 			return $response;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2244,9 +2345,15 @@ 
 	{
 		global $conf;
 		$dn='';
-		if ($mode==0) $dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS].",".$conf->global->LDAP_MEMBER_DN;
-		if ($mode==1) $dn=$conf->global->LDAP_MEMBER_DN;
-		if ($mode==2) $dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS];
+		if ($mode==0) {
+			$dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS].",".$conf->global->LDAP_MEMBER_DN;
+		}
+		if ($mode==1) {
+			$dn=$conf->global->LDAP_MEMBER_DN;
+		}
+		if ($mode==2) {
+			$dn=$conf->global->LDAP_KEY_MEMBERS."=".$info[$conf->global->LDAP_KEY_MEMBERS];
+		}
 		return $dn;
 	}
 
@@ -2293,36 +2400,80 @@ 
 				// Check if it is the LDAP key and if its value has been changed
 				if (! empty($conf->global->LDAP_KEY_MEMBERS) && $conf->global->LDAP_KEY_MEMBERS == $conf->global->$constname)
 				{
-					if (! empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) $keymodified=true; // For check if LDAP key has been modified
+					if (! empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
+						$keymodified=true;
+					}
+					// For check if LDAP key has been modified
 				}
 			}
 		}
-		if ($this->firstname && ! empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME))			$info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
-		if ($this->poste && ! empty($conf->global->LDAP_MEMBER_FIELD_TITLE))					$info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
-		if ($this->societe && ! empty($conf->global->LDAP_MEMBER_FIELD_COMPANY))				$info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->societe;
-		if ($this->address && ! empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))				$info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && ! empty($conf->global->LDAP_MEMBER_FIELD_ZIP))						$info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
-		if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN))					$info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
-		if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))			$info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
-		if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))					$info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
-		if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE))					$info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
-		if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO))		$info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
-		if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE))			$info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX))						$info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
-		if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION))		$info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private;
-		if ($this->note_public && ! empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC))		$info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public;
-		if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE))				$info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap');
-		if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))			$info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
-		if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION))	$info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap');
+		if ($this->firstname && ! empty($conf->global->LDAP_MEMBER_FIELD_FIRSTNAME)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_FIRSTNAME] = $this->firstname;
+		}
+		if ($this->poste && ! empty($conf->global->LDAP_MEMBER_FIELD_TITLE)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
+		}
+		if ($this->societe && ! empty($conf->global->LDAP_MEMBER_FIELD_COMPANY)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_COMPANY] = $this->societe;
+		}
+		if ($this->address && ! empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
+		}
+		if ($this->zip && ! empty($conf->global->LDAP_MEMBER_FIELD_ZIP)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->zip;
+		}
+		if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
+		}
+		if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
+		}
+		if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
+		}
+		if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
+		}
+		if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
+		}
+		if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;
+		}
+		if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax;
+		}
+		if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private;
+		}
+		if ($this->note_public && ! empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public;
+		}
+		if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE)) {
+			$info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap');
+		}
+		if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut;
+		}
+		if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap');
+		}
 
 		// When password is modified
 		if (! empty($this->pass))
 		{
-			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)
+			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
-		else if ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
+		else if ($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))
 			{
@@ -2333,22 +2484,37 @@ 
 						// Create OpenLDAP MD5 password from Dolibarr MD5 password
 						// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
 						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}'.base64_encode(hex2bin($this->pass_indatabase_crypted));
+		}
 					}
 				}
 			}
 			// Use $this->pass_indatabase value if exists
 			else if (! empty($this->pass_indatabase))
 			{
-				if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase;	// $this->pass_indatabase = 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_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+				if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
+					$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase;
+				}
+				// $this->pass_indatabase = 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_indatabase, 4);
+				}
+				// md5 for OpenLdap TODO add type of encryption
 			}
 		}
 
 		// Subscriptions
-		if ($this->first_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE))     $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]  = dol_print_date($this->first_subscription_date,'dayhourldap');
-		if (isset($this->first_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)) $info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT] = $this->first_subscription_amount;
-		if ($this->last_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE))       $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]   = dol_print_date($this->last_subscription_date,'dayhourldap');
-		if (isset($this->last_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT))   $info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
+		if ($this->first_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]  = dol_print_date($this->first_subscription_date,'dayhourldap');
+		}
+		if (isset($this->first_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT] = $this->first_subscription_amount;
+		}
+		if ($this->last_subscription_date && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]   = dol_print_date($this->last_subscription_date,'dayhourldap');
+		}
+		if (isset($this->last_subscription_amount) && ! empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT)) {
+			$info[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT] = $this->last_subscription_amount;
+		}
 
 		return $info;
 	}
@@ -2405,8 +2571,7 @@ 
 
 			$this->db->free($result);
 
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2484,8 +2649,12 @@ 
 		global $conf;
 
 		//Only valid members
-		if ($this->statut <= 0) return false;
-		if (! $this->datefin) return false;
+		if ($this->statut <= 0) {
+			return false;
+		}
+		if (! $this->datefin) {
+			return false;
+		}
 
 		$now = dol_now();
 
@@ -2549,8 +2718,7 @@ 
 				if (empty($adherent->email))
 				{
 					$nbko++;
-				}
-				else
+				} else
 				{
 					$adherent->fetch_thirdparty();
 
@@ -2583,13 +2751,11 @@ 
 							$this->error = $cmail->error;
 							$this->errors += $cmail->errors;
 							$nbko++;
-						}
-						else
+						} else
 						{
 							$nbok++;
 						}
-					}
-					else
+					} else
 					{
 						$blockingerrormsg="Can't find email template '(SendReminderForExpiredSubscriptionTitle)'";
 						$nbko++;
@@ -2599,8 +2765,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			return 1;
@@ -2610,12 +2775,13 @@ 
 		{
 			$this->error = $blockingerrormsg;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->output = 'Found '.($nbok + $nbko).' members to send reminder to.';
 			$this->output.= ' Send successfull to '.$nbok.' members';
-			if ($nbko) $this->output.= ' - Canceled for '.$nbko.' member (no email or email sending error)';
+			if ($nbko) {
+				$this->output.= ' - Canceled for '.$nbko.' member (no email or email sending error)';
+			}
 		}
 
 		return 0;