alxarafe / alixar

dolibarr/htdocs/core/lib/price.lib.php

Indentation +248 added lines, -248 removed lines

@@ -84,330 +84,330 @@
  */
 function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0)
 {
-	global $conf,$mysoc,$db;
-
-	$result=array();
-
-	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
-	if (empty($seller) || ! is_object($seller))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
-		{
-			$mysoc=new Societe($db);
-			$mysoc->setMysoc($conf);
-		}
-		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
-		//var_dump($seller->country_id);exit;
-	}
-	if (empty($localtaxes_array) || ! is_array($localtaxes_array))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
-	}
-	// Too verbose. Enable for debug only
-	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
-
-	$countryid=$seller->country_id;
-
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
-
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
-
-	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
-	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
+    global $conf,$mysoc,$db;
+
+    $result=array();
+
+    // Clean parameters
+    if (empty($info_bits)) $info_bits=0;
+    if (empty($txtva)) $txtva=0;
+    if (empty($seller) || ! is_object($seller))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
+        if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+        {
+            $mysoc=new Societe($db);
+            $mysoc->setMysoc($conf);
+        }
+        $seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
+        //var_dump($seller->country_id);exit;
+    }
+    if (empty($localtaxes_array) || ! is_array($localtaxes_array))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
+    }
+    // Too verbose. Enable for debug only
+    //dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
+
+    $countryid=$seller->country_id;
+
+    if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
+    if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+
+    if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
+    if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+
+    //var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
+    dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
     // Now we search localtaxes information ourself (rates and types).
-	$localtax1_type=0;
-	$localtax2_type=0;
-
-	if (is_array($localtaxes_array))
-	{
-		$localtax1_type = $localtaxes_array[0];
-		$localtax1_rate = $localtaxes_array[1];
-		$localtax2_type = $localtaxes_array[2];
-		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
-	{
-		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-		$sql.= " WHERE cv.taux = ".$txtva;
-		$sql.= " AND cv.fk_pays = ".$countryid;
-		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				$localtax1_rate=$obj->localtax1;
-				$localtax2_rate=$obj->localtax2;
-				$localtax1_type=$obj->localtax1_type;
-				$localtax2_type=$obj->localtax2_type;
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
-			}
-		}
-		else dol_print_error($db);
-	}
-
-	// pu calculation from pu_devise if pu empty
-	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
-			return array();
-		}
-	}
-	if ($pu === '') $pu=0;
-	// pu_devise calculation from pu
-	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
-			return array();
-		}
-	}
-
-	// initialize total (may be HT or TTC depending on price_base_type)
-	$tot_sans_remise = $pu * $qty * $progress / 100;
-	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
-	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
-
-	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
-
-	// if there's some localtax including vat, we calculate localtaxes (we will add later)
+    $localtax1_type=0;
+    $localtax2_type=0;
+
+    if (is_array($localtaxes_array))
+    {
+        $localtax1_type = $localtaxes_array[0];
+        $localtax1_rate = $localtaxes_array[1];
+        $localtax2_type = $localtaxes_array[2];
+        $localtax2_rate = $localtaxes_array[3];
+    }
+    else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+    {
+        $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
+        $sql.= " WHERE cv.taux = ".$txtva;
+        $sql.= " AND cv.fk_pays = ".$countryid;
+        dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                $localtax1_rate=$obj->localtax1;
+                $localtax2_rate=$obj->localtax2;
+                $localtax1_type=$obj->localtax1_type;
+                $localtax2_type=$obj->localtax2_type;
+                //var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
+            }
+        }
+        else dol_print_error($db);
+    }
+
+    // pu calculation from pu_devise if pu empty
+    if (empty($pu) && !empty($pu_devise)) {
+        if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
+            return array();
+        }
+    }
+    if ($pu === '') $pu=0;
+    // pu_devise calculation from pu
+    if (empty($pu_devise) && !empty($multicurrency_tx)) {
+        if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
+            return array();
+        }
+    }
+
+    // initialize total (may be HT or TTC depending on price_base_type)
+    $tot_sans_remise = $pu * $qty * $progress / 100;
+    $tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
+    $tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
+
+    // initialize result array
+    for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+
+    // if there's some localtax including vat, we calculate localtaxes (we will add later)
 
     //If input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
     if ($price_base_type != 'TTC')
     {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
+        $pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
     }
     else
     {
-    	$tot_sans_remise_wt = $tot_sans_remise;
-    	$tot_avec_remise_wt = $tot_avec_remise;
-    	$pu_wt = $pu;
+        $tot_sans_remise_wt = $tot_sans_remise;
+        $tot_avec_remise_wt = $tot_avec_remise;
+        $pu_wt = $pu;
     }
 
-	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
+    //print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
     $localtaxes = array(0,0,0);
     $apply_tax = false;
-  	switch($localtax1_type) {
-      case '2':     // localtax on product or service
+        switch($localtax1_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
 
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[14];
+            $result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[9];
+            $result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[11];
+            $result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[11];
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '2':     // localtax on product or service
+        switch($localtax2_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[15];
+            $result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[15];
+
+            $result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[10];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[10];
+            $result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[12];
+    }
 
-  		$result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[12];
+    //dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
+    if ($price_base_type == 'HT')
+    {
+        // We work to define prices using the price without tax
+        $result[6] = price2num($tot_sans_remise, 'MT');
+        $result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
+        $result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
+
+        $result[0] = price2num($tot_avec_remise, 'MT');
+        $result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
+        $result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[3] = price2num($pu, 'MU');
+        $result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
+        $result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
+    }
+    else
+    {
+        // We work to define prices using the price with tax
+        $result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
+        $result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
+
+        $result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
+        $result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[5] = price2num($pu + $localtaxes[2], 'MU');
+        $result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
+        $result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
     }
 
-	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
-	if ($price_base_type == 'HT')
-	{
-		// We work to define prices using the price without tax
-		$result[6] = price2num($tot_sans_remise, 'MT');
-		$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
-		$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
-
-		$result[0] = price2num($tot_avec_remise, 'MT');
-		$result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
-		$result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[3] = price2num($pu, 'MU');
-		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
-		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
-	{
-		// We work to define prices using the price with tax
-		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
-		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
-
-		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
-		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[5] = price2num($pu + $localtaxes[2], 'MU');
-		$result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
-		$result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
-	}
-
-	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
+    // if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
     if ($price_base_type == 'TTC')
     {
-    	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
+        $pu = price2num($pu / (1 + ($txtva / 100)),'MU');
     }
 
-	$apply_tax = false;
+    $apply_tax = false;
     switch($localtax1_type) {
-      case '1':     // localtax on product or service
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14];																				// total_ttc_without_discount + tax1
+            $result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
+            $result[8] += $result[14];																				// total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
-  		$result[2] += $result[9];																				// total_ttc + tax1
+            $result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
+            $result[2] += $result[9];																				// total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
-  		$result[5] += $result[11];																				// pu_ht + tax1
+            $result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
+            $result[5] += $result[11];																				// pu_ht + tax1
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '1':     // localtax on product or service
+        switch($localtax2_type) {
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15];																				// total_ttc_without_discount + tax2
+            $result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
+            $result[8] += $result[15];																				// total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
-  		$result[2] += $result[10];																				// total_ttc + tax2
+            $result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
+            $result[2] += $result[10];																				// total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
-  		$result[5] += $result[12];																				// pu_ht + tax2
+            $result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
+            $result[5] += $result[12];																				// pu_ht + tax2
     }
 
-	// If rounding is not using base 10 (rare)
-	if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
-	{
-		if ($price_base_type == 'HT')
-		{
-			$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=price2num($result[0]+$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
-		{
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[0]=price2num($result[2]-$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-	}
-
-	// Multicurrency
-	if ($multicurrency_tx != 1)
-	{
-		// Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
-		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
-
-		$result[16] = $newresult[0];
-		$result[17] = $newresult[1];
-		$result[18] = $newresult[2];
-		$result[19] = $newresult[3];
-		$result[20] = $newresult[4];
-		$result[21] = $newresult[5];
-		$result[22] = $newresult[6];
-		$result[23] = $newresult[7];
-		$result[24] = $newresult[8];
-		$result[25] = $newresult[9];
-		$result[26] = $newresult[10];
-		/*
+    // If rounding is not using base 10 (rare)
+    if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+    {
+        if ($price_base_type == 'HT')
+        {
+            $result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=price2num($result[0]+$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+        else
+        {
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[0]=price2num($result[2]-$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+    }
+
+    // Multicurrency
+    if ($multicurrency_tx != 1)
+    {
+        // Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
+        $newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
+
+        $result[16] = $newresult[0];
+        $result[17] = $newresult[1];
+        $result[18] = $newresult[2];
+        $result[19] = $newresult[3];
+        $result[20] = $newresult[4];
+        $result[21] = $newresult[5];
+        $result[22] = $newresult[6];
+        $result[23] = $newresult[7];
+        $result[24] = $newresult[8];
+        $result[25] = $newresult[9];
+        $result[26] = $newresult[10];
+        /*
 		$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
 		$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
-	{
-		$result[16] = $result[0];
-		$result[17] = $result[1];
-		$result[18] = $result[2];
-		$result[19] = $result[3];
-		$result[20] = $result[4];
-		$result[21] = $result[5];
-		$result[22] = $result[6];
-		$result[23] = $result[7];
-		$result[24] = $result[8];
-		$result[25] = $result[9];
-		$result[26] = $result[10];
-	}
-
-	//var_dump($result);
-	// initialize result array
-	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
-
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
-
-	return $result;
+    }
+    else
+    {
+        $result[16] = $result[0];
+        $result[17] = $result[1];
+        $result[18] = $result[2];
+        $result[19] = $result[3];
+        $result[20] = $result[4];
+        $result[21] = $result[5];
+        $result[22] = $result[6];
+        $result[23] = $result[7];
+        $result[24] = $result[8];
+        $result[25] = $result[9];
+        $result[26] = $result[10];
+    }
+
+    //var_dump($result);
+    // initialize result array
+    //for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
+
+    dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+
+    return $result;
 }
 

Spacing +82 added lines, -82 removed lines

@@ -82,47 +82,47 @@ 
  * 						25=multicurrency_total_tax1 for total_ht
  *                      26=multicurrency_total_tax2 for total_ht
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0)
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array = '', $progress = 100, $multicurrency_tx = 1, $pu_devise = 0)
 {
-	global $conf,$mysoc,$db;
+	global $conf, $mysoc, $db;
 
-	$result=array();
+	$result = array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
-	if (empty($seller) || ! is_object($seller))
+	if (empty($info_bits)) $info_bits = 0;
+	if (empty($txtva)) $txtva = 0;
+	if (empty($seller) || !is_object($seller))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+		if (!is_object($mysoc))	// mysoc may be not defined (during migration process)
 		{
-			$mysoc=new Societe($db);
+			$mysoc = new Societe($db);
 			$mysoc->setMysoc($conf);
 		}
-		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
+		$seller = $mysoc; // If sell is done to a customer, $seller is not provided, we use $mysoc
 		//var_dump($seller->country_id);exit;
 	}
-	if (empty($localtaxes_array) || ! is_array($localtaxes_array))
+	if (empty($localtaxes_array) || !is_array($localtaxes_array))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
 	}
 	// Too verbose. Enable for debug only
 	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
 
-	$countryid=$seller->country_id;
+	$countryid = $seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate = (float) $uselocaltax1_rate;
+	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate = (float) $uselocaltax2_rate;
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) $uselocaltax1_rate = $seller->localtax1_assuj;
+	if ($uselocaltax2_rate < 0) $uselocaltax2_rate = $seller->localtax2_assuj;
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
     // Now we search localtaxes information ourself (rates and types).
-	$localtax1_type=0;
-	$localtax2_type=0;
+	$localtax1_type = 0;
+	$localtax2_type = 0;
 
 	if (is_array($localtaxes_array))
 	{
@@ -134,9 +134,9 @@ 
 	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-		$sql.= " WHERE cv.taux = ".$txtva;
-		$sql.= " AND cv.fk_pays = ".$countryid;
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
+		$sql .= " WHERE cv.taux = ".$txtva;
+		$sql .= " AND cv.fk_pays = ".$countryid;
 		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 		$resql = $db->query($sql);
 		if ($resql)
@@ -144,10 +144,10 @@ 
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				$localtax1_rate=$obj->localtax1;
-				$localtax2_rate=$obj->localtax2;
-				$localtax1_type=$obj->localtax1_type;
-				$localtax2_type=$obj->localtax2_type;
+				$localtax1_rate = $obj->localtax1;
+				$localtax2_rate = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
 		}
@@ -156,14 +156,14 @@ 
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
 		else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu=0;
+	if ($pu === '') $pu = 0;
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
 		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
@@ -176,20 +176,20 @@ 
 
 	// initialize total (may be HT or TTC depending on price_base_type)
 	$tot_sans_remise = $pu * $qty * $progress / 100;
-	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
+	$tot_avec_remise_ligne = $tot_sans_remise * (1 - ($remise_percent_ligne / 100));
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i = 0; $i <= 15; $i++) $result[$i] = 0;
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
     //If input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
     if ($price_base_type != 'TTC')
     {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
+    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
+    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
+    	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
     }
     else
     {
@@ -200,9 +200,9 @@ 
 
 	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
-    $localtaxes = array(0,0,0);
+    $localtaxes = array(0, 0, 0);
     $apply_tax = false;
-  	switch($localtax1_type) {
+  	switch ($localtax1_type) {
       case '2':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -215,18 +215,18 @@ 
     }
 
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
   		$localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
+  		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[11];
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
+  	switch ($localtax2_type) {
       case '2':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -238,13 +238,13 @@ 
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
   		$localtaxes[0] += $result[15];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
   		$localtaxes[1] += $result[10];
 
-  		$result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
+  		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
   		$localtaxes[2] += $result[12];
     }
 
@@ -253,36 +253,36 @@ 
 	{
 		// We work to define prices using the price without tax
 		$result[6] = price2num($tot_sans_remise, 'MT');
-		$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
-		$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
+		$result[8] = price2num($tot_sans_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[0], 'MT'); // Selon TVA NPR ou non
+		$result8bis = price2num($tot_sans_remise * (1 + ($txtva / 100)) + $localtaxes[0], 'MT'); // Si TVA consideree normale (non NPR)
 		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
 
 		$result[0] = price2num($tot_avec_remise, 'MT');
-		$result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
-		$result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+		$result[2] = price2num($tot_avec_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[1], 'MT'); // Selon TVA NPR ou non
+		$result2bis = price2num($tot_avec_remise * (1 + ($txtva / 100)) + $localtaxes[1], 'MT'); // Si TVA consideree normale (non NPR)
+		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[3] = price2num($pu, 'MU');
-		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
-		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
+		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
+		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
 	}
 	else
 	{
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
-		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
+		$result6bis = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
 		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
 
 		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
-		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
+		$result0bis = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT'); // Si TVA consideree normale (non NPR)
+		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT'); // Total VAT = TTC - (HT + localtax)
 
 		$result[5] = price2num($pu + $localtaxes[2], 'MU');
-		$result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
-		$result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
+		$result[3] = price2num($pu / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MU'); // Selon TVA NPR ou non
+		$result3bis = price2num($pu / (1 + ($txtva / 100)), 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
 	}
 
@@ -291,13 +291,13 @@ 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
     if ($price_base_type == 'TTC')
     {
-    	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
+    	$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
+    	$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
+    	$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
     }
 
 	$apply_tax = false;
-    switch($localtax1_type) {
+    switch ($localtax1_type) {
       case '1':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -309,18 +309,18 @@ 
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14];																				// total_ttc_without_discount + tax1
+  		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
+  		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
-  		$result[2] += $result[9];																				// total_ttc + tax1
+  		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht
+  		$result[2] += $result[9]; // total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
-  		$result[5] += $result[11];																				// pu_ht + tax1
+  		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
+  		$result[5] += $result[11]; // pu_ht + tax1
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
+  	switch ($localtax2_type) {
       case '1':     // localtax on product or service
         $apply_tax = true;
         break;
@@ -332,34 +332,34 @@ 
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15];																				// total_ttc_without_discount + tax2
+  		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
+  		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
-  		$result[2] += $result[10];																				// total_ttc + tax2
+  		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht
+  		$result[2] += $result[10]; // total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
-  		$result[5] += $result[12];																				// pu_ht + tax2
+  		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
+  		$result[5] += $result[12]; // pu_ht + tax2
     }
 
 	// If rounding is not using base 10 (rare)
-	if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
 	{
 		if ($price_base_type == 'HT')
 		{
-			$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=price2num($result[0]+$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[0] = round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[2] = price2num($result[0] + $result[1], 'MT');
+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
 		else
 		{
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[0]=price2num($result[2]-$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[0] = price2num($result[2] - $result[1], 'MT');
+			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 		}
 	}
 

Braces +64 added lines, -32 removed lines

@@ -89,14 +89,20 @@ 
 	$result=array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
+	if (empty($info_bits)) {
+	    $info_bits=0;
+	}
+	if (empty($txtva)) {
+	    $txtva=0;
+	}
 	if (empty($seller) || ! is_object($seller))
 	{
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+		if (! is_object($mysoc)) {
+		    // mysoc may be not defined (during migration process)
 		{
 			$mysoc=new Societe($db);
+		}
 			$mysoc->setMysoc($conf);
 		}
 		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
@@ -111,11 +117,19 @@ 
 
 	$countryid=$seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) {
+	    $uselocaltax1_rate=(float) $uselocaltax1_rate;
+	}
+	if (is_numeric($uselocaltax2_rate)) {
+	    $uselocaltax2_rate=(float) $uselocaltax2_rate;
+	}
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) {
+	    $uselocaltax1_rate=$seller->localtax1_assuj;
+	}
+	if ($uselocaltax2_rate < 0) {
+	    $uselocaltax2_rate=$seller->localtax2_assuj;
+	}
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
@@ -130,8 +144,7 @@ 
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+	} else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
 	{
 		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
@@ -150,24 +163,29 @@ 
 				$localtax2_type=$obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
+		} else {
+		    dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
+		if (! empty($multicurrency_tx)) {
+		    $pu = $pu_devise / $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu=0;
+	if ($pu === '') {
+	    $pu=0;
+	}
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) {
+		    $pu_devise = $pu * $multicurrency_tx;
+		} else
 		{
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
@@ -180,7 +198,9 @@ 
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i=0; $i <= 15; $i++) {
+	    $result[$i] = 0;
+	}
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
@@ -190,8 +210,7 @@ 
     	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
-    }
-    else
+    } else
     {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
@@ -207,10 +226,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
 
@@ -231,10 +254,14 @@ 
         $apply_tax = true;
         break;
       case '4':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '6':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -266,8 +293,7 @@ 
 		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
 		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
+	} else
 	{
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
@@ -302,10 +328,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
@@ -325,10 +355,14 @@ 
         $apply_tax = true;
         break;
       case '3':     // localtax on product
-        if ($type == 0) $apply_tax = true;
+        if ($type == 0) {
+            $apply_tax = true;
+        }
         break;
       case '5':     // localtax on service
-        if ($type == 1) $apply_tax = true;
+        if ($type == 1) {
+            $apply_tax = true;
+        }
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
@@ -352,8 +386,7 @@ 
 			$result[2]=price2num($result[0]+$result[1], 'MT');
 			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
+		} else
 		{
 			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
@@ -386,8 +419,7 @@ 
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
+	} else
 	{
 		$result[16] = $result[0];
 		$result[17] = $result[1];

dolibarr/htdocs/core/lib/ldap.lib.php

Indentation +122 added lines, -122 removed lines

@@ -30,66 +30,66 @@ 
  */
 function ldap_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$langs->load("ldap");
-
-	// Onglets
-	$head=array();
-	$h = 0;
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
-	$head[$h][1] = $langs->trans("LDAPGlobalParameters");
-	$head[$h][2] = 'ldap';
-	$h++;
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
-		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
-		$head[$h][2] = 'users';
-		$h++;
-	}
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
-		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
-		$head[$h][2] = 'groups';
-		$h++;
-	}
-
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
-		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
-		$head[$h][2] = 'contacts';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
-		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
-		$head[$h][2] = 'members';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
-		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
-		$head[$h][2] = 'memberstypes';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
-
-	return $head;
+    global $langs, $conf, $user;
+
+    $langs->load("ldap");
+
+    // Onglets
+    $head=array();
+    $h = 0;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
+    $head[$h][1] = $langs->trans("LDAPGlobalParameters");
+    $head[$h][2] = 'ldap';
+    $h++;
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
+        $head[$h][1] = $langs->trans("LDAPUsersSynchro");
+        $head[$h][2] = 'users';
+        $h++;
+    }
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
+        $head[$h][1] = $langs->trans("LDAPGroupsSynchro");
+        $head[$h][2] = 'groups';
+        $h++;
+    }
+
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
+        $head[$h][1] = $langs->trans("LDAPContactsSynchro");
+        $head[$h][2] = 'contacts';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
+        $head[$h][1] = $langs->trans("LDAPMembersSynchro");
+        $head[$h][2] = 'members';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
+        $head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
+        $head[$h][2] = 'memberstypes';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
+
+    return $head;
 }
 
 
@@ -105,28 +105,28 @@ 
  */
 function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass)
 {
-	global $langs, $conf, $user;
-	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
-
-	print '<br>';
-	if (! function_exists("ldap_connect"))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
-	{
-		$langs->load("errors");
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
-	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
-	}
-	print '<br><br>';
+    global $langs, $conf, $user;
+    //print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
+
+    print '<br>';
+    if (! function_exists("ldap_connect"))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
+    }
+    else if (empty($conf->global->LDAP_SERVER_HOST))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else if (empty($key) || empty($dn) || empty($objectclass))
+    {
+        $langs->load("errors");
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else
+    {
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
+    }
+    print '<br><br>';
 }
 
 
@@ -143,45 +143,45 @@ 
  */
 function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
 {
-	global $bc, $conf;
-
-	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
-
-	foreach($result as $key => $val)
-	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
-
-		$lastkey[$level]=$key;
-
-		if (is_array($val))
-		{
-			$hide=0;
-			if (! is_numeric($key))
-			{
-
-				print '<tr '.$bc[$var].' valign="top">';
-				print '<td>';
-				print $key;
-				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
-			}
-			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
-		}
-		else if ($subcount)
-		{
-			$subcount--;
-			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
-			else print $newstring;
-			print '<br>';
-		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
-	}
-	return 1;
+    global $bc, $conf;
+
+    $count--;
+    if ($count == 0) return -1;	// To stop loop
+    if (! is_array($result)) return -1;
+
+    foreach($result as $key => $val)
+    {
+        if ("$key" == "objectclass") continue;
+        if ("$key" == "count") continue;
+        if ("$key" == "dn") continue;
+        if ("$val" == "objectclass") continue;
+
+        $lastkey[$level]=$key;
+
+        if (is_array($val))
+        {
+            $hide=0;
+            if (! is_numeric($key))
+            {
+
+                print '<tr '.$bc[$var].' valign="top">';
+                print '<td>';
+                print $key;
+                print '</td><td>';
+                if (strtolower($key) == 'userpassword') $hide=1;
+            }
+            show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
+        }
+        else if ($subcount)
+        {
+            $subcount--;
+            $newstring=dol_htmlentitiesbr($val);
+            if ($hide) print preg_replace('/./i','*',$newstring);
+            else print $newstring;
+            print '<br>';
+        }
+        if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+    }
+    return 1;
 }
 

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
 	$langs->load("ldap");
 
 	// Onglets
-	$head=array();
+	$head = array();
 	$h = 0;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
@@ -43,7 +43,7 @@ 
 	$head[$h][2] = 'ldap';
 	$h++;
 
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
 		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
@@ -51,7 +51,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
 		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
@@ -59,7 +59,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+	if (!empty($conf->societe->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
 		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
@@ -67,7 +67,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
@@ -75,7 +75,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
 		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
@@ -87,7 +87,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'ldap');
 
 	return $head;
 }
@@ -103,13 +103,13 @@ 
  *  @param	string	$objectclass	Class
  *  @return	void
  */
-function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass)
+function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 {
 	global $langs, $conf, $user;
 	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
 
 	print '<br>';
-	if (! function_exists("ldap_connect"))
+	if (!function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
 	}
@@ -141,42 +141,42 @@ 
  * @param   int		$subcount	Subcount
  * @return  int
  */
-function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
+function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount = 0)
 {
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
+	if ($count == 0) return -1; // To stop loop
+	if (!is_array($result)) return -1;
 
-	foreach($result as $key => $val)
+	foreach ($result as $key => $val)
 	{
 		if ("$key" == "objectclass") continue;
 		if ("$key" == "count") continue;
 		if ("$key" == "dn") continue;
 		if ("$val" == "objectclass") continue;
 
-		$lastkey[$level]=$key;
+		$lastkey[$level] = $key;
 
 		if (is_array($val))
 		{
-			$hide=0;
-			if (! is_numeric($key))
+			$hide = 0;
+			if (!is_numeric($key))
 			{
 
 				print '<tr '.$bc[$var].' valign="top">';
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
+				if (strtolower($key) == 'userpassword') $hide = 1;
 			}
-			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
+			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
 		}
 		else if ($subcount)
 		{
 			$subcount--;
-			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
+			$newstring = dol_htmlentitiesbr($val);
+			if ($hide) print preg_replace('/./i', '*', $newstring);
 			else print $newstring;
 			print '<br>';
 		}

Braces +34 added lines, -18 removed lines

@@ -112,17 +112,14 @@ 
 	if (! function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
+	} else if (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
+	} else if (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
+	} else
 	{
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
@@ -146,15 +143,28 @@ 
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
+	if ($count == 0) {
+	    return -1;
+	}
+	// To stop loop
+	if (! is_array($result)) {
+	    return -1;
+	}
 
 	foreach($result as $key => $val)
 	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
+		if ("$key" == "objectclass") {
+		    continue;
+		}
+		if ("$key" == "count") {
+		    continue;
+		}
+		if ("$key" == "dn") {
+		    continue;
+		}
+		if ("$val" == "objectclass") {
+		    continue;
+		}
 
 		$lastkey[$level]=$key;
 
@@ -168,19 +178,25 @@ 
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
+				if (strtolower($key) == 'userpassword') {
+				    $hide=1;
+				}
 			}
 			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
-		}
-		else if ($subcount)
+		} else if ($subcount)
 		{
 			$subcount--;
 			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
-			else print $newstring;
+			if ($hide) {
+			    print preg_replace('/./i','*',$newstring);
+			} else {
+			    print $newstring;
+			}
 			print '<br>';
 		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+		if ("$val" != $lastkey[$level] && !$subcount) {
+		    print '</td></tr>';
+		}
 	}
 	return 1;
 }

dolibarr/htdocs/core/lib/security.lib.php

Indentation +550 added lines, -550 removed lines

@@ -36,29 +36,29 @@ 
  */
 function dol_encode($chain, $key='1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
-		}
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return base64_encode($chain);
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+        }
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return base64_encode($chain);
 }
 
 /**
@@ -72,32 +72,32 @@ 
  */
 function dol_decode($chain, $key='1')
 {
-	$chain = base64_decode($chain);
-
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength;$i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
-		}
-
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return $chain;
+    $chain = base64_decode($chain);
+
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength;$i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+        }
+
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return $chain;
 }
 
 
@@ -113,27 +113,27 @@ 
  */
 function dol_hash($chain, $type='0')
 {
-	global $conf;
-
-	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
-	{
-		return password_hash($chain, PASSWORD_DEFAULT);
-	}
-
-	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
-
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
-
-	// No particular encoding defined, use default
-	return md5($chain);
+    global $conf;
+
+    // No need to add salt for password_hash
+    if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+    {
+        return password_hash($chain, PASSWORD_DEFAULT);
+    }
+
+    // Salt value
+    if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+
+    if ($type == '1' || $type == 'sha1') return sha1($chain);
+    else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
+    else if ($type == '3' || $type == 'md5') return md5($chain);
+    else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+    else if ($type == '5') return hash('sha256',$chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+
+    // No particular encoding defined, use default
+    return md5($chain);
 }
 
 /**
@@ -149,17 +149,17 @@ 
  */
 function dol_verifyHash($chain, $hash, $type='0')
 {
-	global $conf;
+    global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+    if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
+        if ($hash[0] == '$') return password_verify($chain, $hash);
+        else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+        else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
 
-		return false;
-	}
+        return false;
+    }
 
-	return dol_hash($chain, $type) == $hash;
+    return dol_hash($chain, $type) == $hash;
 }
 
 
@@ -180,242 +180,242 @@ 
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $isdraft=0)
 {
-	global $db, $conf;
-	global $hookmanager;
-
-	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
-	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
-	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
-	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
-
-	// Get more permissions checks from hooks
-	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
-	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
-	if ($reshook > 0) return false;
-
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
-
-	// Features/modules to check
-	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
-
-	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-
-	// Check read permission from module
-	$readok=1; $nbko=0;
-	foreach ($featuresarray as $feature)	// first we check nb of test ko
-	{
-		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
-		{
-			$readok=0; $nbko++;
-			continue;
-		}
-
-		if ($feature == 'societe')
-		{
-			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'contact')
-		{
-			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'produit|service')
-		{
-			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'prelevement')
-		{
-			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'cheque')
-		{
-			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'projet')
-		{
-			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-		}
-		else if (! empty($feature2))	// This should be used for future changes
-		{
-			$tmpreadok=1;
-			foreach($feature2 as $subfeature)
-			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
-			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
-			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
-				$nbko++;
-			}
-		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
-		{
-			if (empty($user->rights->$feature->lire)
-				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
-		}
-	}
-
-	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
-
-	if (! $readok) accessforbidden();
-	//print "Read access is ok";
-
-	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
-	$createok=1; $nbko=0;
-	if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'prelevement')
-			{
-				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-			}
-			else if (! empty($feature2))	// This should be used
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->creer)
-						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
-				if (empty($user->rights->$feature->creer)
-					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
-
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
-		//print "Write access is ok";
-	}
-
-	// Check create user permission
-	$createuserok=1;
-	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
-	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
-
-		if (! $createuserok) accessforbidden();
-		//print "Create user access is ok";
-	}
-
-	// Check delete permission from module
-	$deleteok=1; $nbko=0;
-	if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
-			}
-			else if ($feature == 'ecm')
-			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
-			}
-			else if ($feature == 'ftp')
-			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
-				if (empty($user->rights->$feature->supprimer)
-					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok=0;
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
-
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
-		//print "Delete access is ok";
-	}
-
-	// If we have a particular object to check permissions on, we check this object
-	// is linked to a company allowed to $user.
-	if (! empty($objectid) && $objectid > 0)
-	{
-		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
-		return $ok ? 1 : accessforbidden();
-	}
-
-	return 1;
+    global $db, $conf;
+    global $hookmanager;
+
+    //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
+    //print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
+    //print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
+    //print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
+
+    // Get more permissions checks from hooks
+    $parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+    $reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
+    if (! empty($hookmanager->resArray['result'])) return true;
+    if ($reshook > 0) return false;
+
+    if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+
+    // Features/modules to check
+    $featuresarray = array($features);
+    if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
+    else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+
+    // More subfeatures to check
+    if (! empty($feature2)) $feature2 = explode("|", $feature2);
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+
+    // Check read permission from module
+    $readok=1; $nbko=0;
+    foreach ($featuresarray as $feature)	// first we check nb of test ko
+    {
+        $featureforlistofmodule=$feature;
+        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
+        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+        {
+            $readok=0; $nbko++;
+            continue;
+        }
+
+        if ($feature == 'societe')
+        {
+            if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'contact')
+        {
+            if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'produit|service')
+        {
+            if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'prelevement')
+        {
+            if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'cheque')
+        {
+            if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'projet')
+        {
+            if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+        }
+        else if (! empty($feature2))	// This should be used for future changes
+        {
+            $tmpreadok=1;
+            foreach($feature2 as $subfeature)
+            {
+                if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
+                else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
+                else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+            }
+            if (! $tmpreadok)	// We found a test on feature that is ko
+            {
+                $readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+                $nbko++;
+            }
+        }
+        else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+        {
+            if (empty($user->rights->$feature->lire)
+                && empty($user->rights->$feature->read)
+                && empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+        }
+    }
+
+    // If a or and at least one ok
+    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+
+    if (! $readok) accessforbidden();
+    //print "Read access is ok";
+
+    // Check write permission from module (we need to know write permission to create but also to delete drafts record)
+    $createok=1; $nbko=0;
+    if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'prelevement')
+            {
+                if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+            }
+            else if (! empty($feature2))	// This should be used
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->creer)
+                        && empty($user->rights->$feature->$subfeature->write)
+                        && empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
+                        else { $createok=1; break; } // Break to bypass second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
+                if (empty($user->rights->$feature->creer)
+                    && empty($user->rights->$feature->write)
+                    && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+
+        if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+        //print "Write access is ok";
+    }
+
+    // Check create user permission
+    $createuserok=1;
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
+    {
+        if (! $user->rights->user->user->creer) $createuserok=0;
+
+        if (! $createuserok) accessforbidden();
+        //print "Create user access is ok";
+    }
+
+    // Check delete permission from module
+    $deleteok=1; $nbko=0;
+    if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) $deleteok=0;
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) $deleteok=0;
+            }
+            else if ($feature == 'ecm')
+            {
+                if (! $user->rights->ecm->upload) $deleteok=0;
+            }
+            else if ($feature == 'ftp')
+            {
+                if (! $user->rights->ftp->write) $deleteok=0;
+            }else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if (! empty($feature2))	// This should be used for permissions on 2 levels
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
+                    else { $deleteok=1; break; } // For bypass the second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is used for permissions on 1 level
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
+                if (empty($user->rights->$feature->supprimer)
+                    && empty($user->rights->$feature->delete)
+                    && empty($user->rights->$feature->run)) $deleteok=0;
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+
+        if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+        //print "Delete access is ok";
+    }
+
+    // If we have a particular object to check permissions on, we check this object
+    // is linked to a company allowed to $user.
+    if (! empty($objectid) && $objectid > 0)
+    {
+        $ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
+        return $ok ? 1 : accessforbidden();
+    }
+
+    return 1;
 }
 
 /**
@@ -434,216 +434,216 @@ 
  */
 function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
 {
-	global $db, $conf;
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	foreach ($featuresarray as $feature)
-	{
-		$sql='';
-
-		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
-
-		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
-		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
-		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
-
-		// If dbtablename not defined, we use same name for table than module name
-		if (empty($dbtablename))
-		{
-			$dbtablename = $feature;
-			$sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
-		}
-
-		// Check permission for object with entity
-		if (in_array($feature,$check))
-		{
-			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
-			{
-				if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-				{
-					if ($conf->entity == 1 && $user->admin && ! $user->entity)
-					{
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND dbt.entity IS NOT NULL";
-					}
-					else
-					{
-						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND (ug.fk_user = dbt.rowid";
-						$sql.= " AND ug.entity IN (".getEntity('user')."))";
-						$sql.= " OR dbt.entity = 0"; // Show always superadmin
-					}
-				}
-				else {
-					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				}
-			}
-			else
-			{
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc IN (".$objectid.")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(s.rowid) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid IN (".$objectid.")";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkproject))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checktask))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				$task = new Task($db);
-				$task->fetch($objectid);
-
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-
-		if ($sql)
-		{
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-	return true;
+    global $db, $conf;
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    foreach ($featuresarray as $feature)
+    {
+        $sql='';
+
+        // For backward compatibility
+        if ($feature == 'member')  $feature='adherent';
+        if ($feature == 'project') $feature='projet';
+        if ($feature == 'task')    $feature='projet_task';
+
+        $check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
+        $checksoc = array('societe');	 // Test for societe object
+        $checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+        $checkproject = array('projet','project'); // Test for project object
+        $checktask = array('projet_task');
+        $nocheck = array('barcode','stock');	// No test
+        $checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
+
+        // If dbtablename not defined, we use same name for table than module name
+        if (empty($dbtablename))
+        {
+            $dbtablename = $feature;
+            $sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
+        }
+
+        // Check permission for object with entity
+        if (in_array($feature,$check))
+        {
+            $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+            $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+            if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
+            {
+                if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+                {
+                    if ($conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND dbt.entity IS NOT NULL";
+                    }
+                    else
+                    {
+                        $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND (ug.fk_user = dbt.rowid";
+                        $sql.= " AND ug.entity IN (".getEntity('user')."))";
+                        $sql.= " OR dbt.entity = 0"; // Show always superadmin
+                    }
+                }
+                else {
+                    $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                    $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                }
+            }
+            else
+            {
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checksoc))	// We check feature = checksoc
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if ($user->socid <> $objectid) return false;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s)";
+                $sql.= " WHERE sc.fk_soc IN (".$objectid.")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+                $sql.= " AND sc.fk_soc = s.rowid";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(s.rowid) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+                $sql.= " WHERE s.rowid IN (".$objectid.")";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.fk_soc = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkproject))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($objectid,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checktask))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                $task = new Task($db);
+                $task->fetch($objectid);
+
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($task->fk_project,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.rowid IN (".$objectid.")";
+                $sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+                $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+                $sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+
+        if ($sql)
+        {
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $obj = $db->fetch_object($resql);
+                if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -666,30 +666,30 @@ 
         $langs->setDefaultLang();
     }
 
-	$langs->load("errors");
-
-	if ($printheader)
-	{
-		if (function_exists("llxHeader")) llxHeader('');
-		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
-	}
-	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
-	else print $message;
-	print '</div>';
-	print '<br>';
-	if (empty($showonlymessage))
-	{
-		if ($user->login)
-		{
-			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-		}
-		else
-		{
-			print $langs->trans("ErrorForbidden3");
-		}
-	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
-	exit(0);
+    $langs->load("errors");
+
+    if ($printheader)
+    {
+        if (function_exists("llxHeader")) llxHeader('');
+        else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+    }
+    print '<div class="error">';
+    if (! $message) print $langs->trans("ErrorForbidden");
+    else print $message;
+    print '</div>';
+    print '<br>';
+    if (empty($showonlymessage))
+    {
+        if ($user->login)
+        {
+            print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
+            print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+        }
+        else
+        {
+            print $langs->trans("ErrorForbidden3");
+        }
+    }
+    if ($printfooter && function_exists("llxFooter")) llxFooter();
+    exit(0);
 }

Spacing +207 added lines, -207 removed lines

@@ -34,28 +34,28 @@ 
  *	@return  string					encoded string
  *  @see dol_decode
  */
-function dol_encode($chain, $key='1')
+function dol_encode($chain, $key = '1')
 {
 	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$output_tab = array();
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
-		$chain = implode("",$output_tab);
+		$chain = implode("", $output_tab);
 	}
 	elseif ($key)
 	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$result = '';
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
+			$result .= chr(ord(substr($chain, $i, 1)) + (ord($keychar) - 65));
 		}
-		$chain=$result;
+		$chain = $result;
 	}
 
 	return base64_encode($chain);
@@ -70,31 +70,31 @@ 
  *	@return  string					decoded string
  *  @see dol_encode
  */
-function dol_decode($chain, $key='1')
+function dol_decode($chain, $key = '1')
 {
 	$chain = base64_decode($chain);
 
 	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
 	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength;$i++)
+		$output_tab = array();
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) - 17);
 		}
 
-		$chain = implode("",$output_tab);
+		$chain = implode("", $output_tab);
 	}
 	elseif ($key)
 	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
+		$result = '';
+		$strlength = dol_strlen($chain);
+		for ($i = 0; $i < $strlength; $i++)
 		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
+			$result .= chr(ord(substr($chain, $i, 1)) - (ord($keychar) - 65));
 		}
-		$chain=$result;
+		$chain = $result;
 	}
 
 	return $chain;
@@ -111,26 +111,26 @@ 
  * 	@return		string					Hash of string
  *  @getRandomPassword
  */
-function dol_hash($chain, $type='0')
+function dol_hash($chain, $type = '0')
 {
 	global $conf;
 
 	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
 	{
 		return password_hash($chain, PASSWORD_DEFAULT);
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (!empty($conf->global->MAIN_SECURITY_SALT)) $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 
 	if ($type == '1' || $type == 'sha1') return sha1($chain);
 	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
 	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+	else if ($type == '5') return hash('sha256', $chain);
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+	else if (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -147,14 +147,14 @@ 
  * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		bool					True if the computed hash is the same as the given one
  */
-function dol_verifyHash($chain, $hash, $type='0')
+function dol_verifyHash($chain, $hash, $type = '0')
 {
 	global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
+	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
 		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		else if (strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+		else if (strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
 
 		return false;
 	}
@@ -178,7 +178,7 @@ 
  * 	@return	int						Always 1, die process if not allowed
  *  @see dol_check_secure_access_document
  */
-function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $isdraft=0)
+function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0)
 {
 	global $db, $conf;
 	global $hookmanager;
@@ -189,9 +189,9 @@ 
 	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
 
 	// Get more permissions checks from hooks
-	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
-	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
+	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
+	if (!empty($hookmanager->resArray['result'])) return true;
 	if ($reshook > 0) return false;
 
 	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
@@ -202,214 +202,214 @@ 
 	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
 
 	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
+	if (!empty($feature2)) $feature2 = explode("|", $feature2);
 
 	// More parameters
 	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+	$dbtablename = (!empty($params[0]) ? $params[0] : '');
+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 
 	// Check read permission from module
-	$readok=1; $nbko=0;
+	$readok = 1; $nbko = 0;
 	foreach ($featuresarray as $feature)	// first we check nb of test ko
 	{
-		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+		$featureforlistofmodule = $feature;
+		if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';
+		if (!empty($user->societe_id) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
 		{
-			$readok=0; $nbko++;
+			$readok = 0; $nbko++;
 			continue;
 		}
 
 		if ($feature == 'societe')
 		{
-			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'contact')
 		{
-			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'produit|service')
 		{
-			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'prelevement')
 		{
-			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'cheque')
 		{
-			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
 		}
 		else if ($feature == 'projet')
 		{
-			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
 		}
-		else if (! empty($feature2))	// This should be used for future changes
+		else if (!empty($feature2))	// This should be used for future changes
 		{
-			$tmpreadok=1;
-			foreach($feature2 as $subfeature)
+			$tmpreadok = 1;
+			foreach ($feature2 as $subfeature)
 			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
+				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
+				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
+			if (!$tmpreadok)	// We found a test on feature that is ko
 			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
 		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+		else if (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is for old permissions
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+				&& empty($user->rights->$feature->run)) { $readok = 0; $nbko++; }
 		}
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;
 
-	if (! $readok) accessforbidden();
+	if (!$readok) accessforbidden();
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
-	$createok=1; $nbko=0;
-	if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
+	$createok = 1; $nbko = 0;
+	if (GETPOST('action', 'aZ09') == 'create' || ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete'))
 	{
 		foreach ($featuresarray as $feature)
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'prelevement')
 			{
-				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
 			}
 			else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
 			}
-			else if (! empty($feature2))	// This should be used
+			else if (!empty($feature2))	// This should be used
 			{
-				foreach($feature2 as $subfeature)
+				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->creer)
 						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
+						&& empty($user->rights->$feature->$subfeature->create)) { $createok = 0; $nbko++; }
+						else { $createok = 1; break; } // Break to bypass second test if the first is ok
 				}
 			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+			else if (!empty($feature))		// This is for old permissions ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
 					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+					&& empty($user->rights->$feature->create)) { $createok = 0; $nbko++; }
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;
 
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+		if (GETPOST('action', 'aZ09') == 'create' && !$createok) accessforbidden();
 		//print "Write access is ok";
 	}
 
 	// Check create user permission
-	$createuserok=1;
-	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
+	$createuserok = 1;
+	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes')
 	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
+		if (!$user->rights->user->user->creer) $createuserok = 0;
 
-		if (! $createuserok) accessforbidden();
+		if (!$createuserok) accessforbidden();
 		//print "Create user access is ok";
 	}
 
 	// Check delete permission from module
-	$deleteok=1; $nbko=0;
-	if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
+	$deleteok = 1; $nbko = 0;
+	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete')
 	{
 		foreach ($featuresarray as $feature)
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
 			}
 			else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
+				if (!$user->rights->banque->modifier) $deleteok = 0;
 			}
 			else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
+				if (!$user->rights->banque->cheque) $deleteok = 0;
 			}
 			else if ($feature == 'ecm')
 			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
+				if (!$user->rights->ecm->upload) $deleteok = 0;
 			}
 			else if ($feature == 'ftp')
 			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
+				if (!$user->rights->ftp->write) $deleteok = 0;
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
+				if (!$user->rights->salaries->delete) $deleteok = 0;
 			}
 			else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
+				if (!$user->rights->salaries->delete) $deleteok = 0;
 			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
+			else if (!empty($feature2))	// This should be used for permissions on 2 levels
 			{
-				foreach($feature2 as $subfeature)
+				foreach ($feature2 as $subfeature)
 				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
+					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
+					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
 			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
+			else if (!empty($feature))		// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok=0;
+					&& empty($user->rights->$feature->run)) $deleteok = 0;
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;
 
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+		if (!$deleteok && !($isdraft && $createok)) accessforbidden();
 		//print "Delete access is ok";
 	}
 
 	// If we have a particular object to check permissions on, we check this object
 	// is linked to a company allowed to $user.
-	if (! empty($objectid) && $objectid > 0)
+	if (!empty($objectid) && $objectid > 0)
 	{
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
 		return $ok ? 1 : accessforbidden();
@@ -432,74 +432,74 @@ 
  * @return	bool						True if user has access, False otherwise
  * @see restrictedArea
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
+function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid')
 {
 	global $db, $conf;
 
 	// More parameters
 	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+	$dbtablename = (!empty($params[0]) ? $params[0] : '');
+	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
 	foreach ($featuresarray as $feature)
 	{
-		$sql='';
+		$sql = '';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
-
-		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
+		if ($feature == 'member')  $feature = 'adherent';
+		if ($feature == 'project') $feature = 'projet';
+		if ($feature == 'task')    $feature = 'projet_task';
+
+		$check = array('adherent', 'banque', 'don', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource'); // Test on entity only (Objects with no link to company)
+		$checksoc = array('societe'); // Test for societe object
+		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+		$checkproject = array('projet', 'project'); // Test for project object
 		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
+		$nocheck = array('barcode', 'stock'); // No test
 		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtablename not defined, we use same name for table than module name
 		if (empty($dbtablename))
 		{
 			$dbtablename = $feature;
-			$sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
+			$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.
 		}
 
 		// Check permission for object with entity
-		if (in_array($feature,$check))
+		if (in_array($feature, $check))
 		{
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
+			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled))
 			{
-				if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+				if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				{
-					if ($conf->entity == 1 && $user->admin && ! $user->entity)
+					if ($conf->entity == 1 && $user->admin && !$user->entity)
 					{
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND dbt.entity IS NOT NULL";
+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+						$sql .= " AND dbt.entity IS NOT NULL";
 					}
 					else
 					{
-						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND (ug.fk_user = dbt.rowid";
-						$sql.= " AND ug.entity IN (".getEntity('user')."))";
-						$sql.= " OR dbt.entity = 0"; // Show always superadmin
+						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+						$sql .= " AND (ug.fk_user = dbt.rowid";
+						$sql .= " AND ug.entity IN (".getEntity('user')."))";
+						$sql .= " OR dbt.entity = 0"; // Show always superadmin
 					}
 				}
 				else {
-					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
 			else
 			{
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		else if (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -507,135 +507,135 @@ 
 				if ($user->socid <> $objectid) return false;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc IN (".$objectid.")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s)";
+				$sql .= " WHERE sc.fk_soc IN (".$objectid.")";
+				$sql .= " AND sc.fk_user = ".$user->id;
+				$sql .= " AND sc.fk_soc = s.rowid";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(s.rowid) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid IN (".$objectid.")";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+				$sql .= " WHERE s.rowid IN (".$objectid.")";
+				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		else if (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.fk_soc = ".$user->socid;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.fk_soc = ".$user->socid;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checkproject))
+		else if (in_array($feature, $checkproject))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($objectid, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (in_array($feature,$checktask))
+		else if (in_array($feature, $checktask))
 		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				$task = new Task($db);
 				$task->fetch($objectid);
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
+				$projectstatic = new Project($db);
+				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+				$tmparray = explode(',', $tmps);
+				if (!in_array($task->fk_project, $tmparray)) return false;
 			}
 			else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		else if (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
+				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+			else if (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " AND sc.fk_user = ".$user->id;
 			}
 			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
+			else if (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		}
 
 		if ($sql)
 		{
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
 			}
 			else
 			{
@@ -656,13 +656,13 @@ 
  *  @param  int		$showonlymessage     Show only message parameter. Otherwise add more information.
  *  @return	void
  */
-function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymessage=0)
+function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0)
 {
     global $conf, $db, $user, $langs;
-    if (! is_object($langs))
+    if (!is_object($langs))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-        $langs=new Translate('',$conf);
+        $langs = new Translate('', $conf);
         $langs->setDefaultLang();
     }
 
@@ -674,7 +674,7 @@ 
 		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
 	}
 	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
+	if (!$message) print $langs->trans("ErrorForbidden");
 	else print $message;
 	print '</div>';
 	print '<br>';
@@ -683,7 +683,7 @@ 
 		if ($user->login)
 		{
 			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+			print $langs->trans("ErrorForbidden2", $langs->trans("Home"), $langs->trans("Users"));
 		}
 		else
 		{

Braces +217 added lines, -137 removed lines

@@ -36,17 +36,18 @@ 
  */
 function dol_encode($chain, $key='1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+	    // rule 1 is offset of 17 for char
 	{
 		$output_tab=array();
+	}
 		$strlength=dol_strlen($chain);
 		for ($i=0; $i < $strlength; $i++)
 		{
 			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
 		}
 		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result='';
 		$strlength=dol_strlen($chain);
@@ -74,9 +75,11 @@ 
 {
 	$chain = base64_decode($chain);
 
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+	if (is_numeric($key) && $key == '1') {
+	    // rule 1 is offset of 17 for char
 	{
 		$output_tab=array();
+	}
 		$strlength=dol_strlen($chain);
 		for ($i=0; $i < $strlength;$i++)
 		{
@@ -84,8 +87,7 @@ 
 		}
 
 		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result='';
 		$strlength=dol_strlen($chain);
@@ -122,15 +124,27 @@ 
 	}
 
 	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	if (! empty($conf->global->MAIN_SECURITY_SALT)) {
+	    $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+	}
 
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	if ($type == '1' || $type == 'sha1') {
+	    return sha1($chain);
+	} else if ($type == '2' || $type == 'sha1md5') {
+	    return sha1(md5($chain));
+	} else if ($type == '3' || $type == 'md5') {
+	    return md5($chain);
+	} else if ($type == '4' || $type == 'md5openldap') {
+	    return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain));
+	}
+	// For OpenLdap with md5 (based on an unencrypted password in base)
+	else if ($type == '5') {
+	    return hash('sha256',$chain);
+	} else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
+	    return sha1($chain);
+	} else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {
+	    return sha1(md5($chain));
+	}
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -152,9 +166,16 @@ 
 	global $conf;
 
 	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		if ($hash[0] == '$') {
+		    return password_verify($chain, $hash);
+		} else if(strlen($hash) == 32) {
+		    return dol_verifyHash($chain, $hash, '3');
+		}
+		// md5
+		else if(strlen($hash) == 40) {
+		    return dol_verifyHash($chain, $hash, '2');
+		}
+		// sha1md5
 
 		return false;
 	}
@@ -191,18 +212,29 @@ 
 	// Get more permissions checks from hooks
 	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
 	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
-	if ($reshook > 0) return false;
+	if (! empty($hookmanager->resArray['result'])) {
+	    return true;
+	}
+	if ($reshook > 0) {
+	    return false;
+	}
 
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+	    $objectid = "'".$objectid."'";
+	}
 
 	// Features/modules to check
 	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+	if (preg_match('/&/', $features)) {
+	    $featuresarray = explode("&", $features);
+	} else if (preg_match('/\|/', $features)) {
+	    $featuresarray = explode("|", $features);
+	}
 
 	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
+	if (! empty($feature2)) {
+	    $feature2 = explode("|", $feature2);
+	}
 
 	// More parameters
 	$params = explode('&', $tableandshare);
@@ -213,67 +245,77 @@ 
 
 	// Check read permission from module
 	$readok=1; $nbko=0;
-	foreach ($featuresarray as $feature)	// first we check nb of test ko
+	foreach ($featuresarray as $feature) {
+	    // first we check nb of test ko
 	{
 		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+	}
+		if ($featureforlistofmodule == 'produit') {
+		    $featureforlistofmodule='product';
+		}
+		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules)) {
+		    // If limits on modules for external users, module must be into list of modules for external users
 		{
-			$readok=0; $nbko++;
+			$readok=0;
+		}
+		$nbko++;
 			continue;
 		}
 
 		if ($feature == 'societe')
 		{
 			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'contact')
+		} else if ($feature == 'contact')
 		{
 			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'produit|service')
+		} else if ($feature == 'produit|service')
 		{
 			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'prelevement')
+		} else if ($feature == 'prelevement')
 		{
 			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'cheque')
+		} else if ($feature == 'cheque')
 		{
 			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'projet')
+		} else if ($feature == 'projet')
 		{
 			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-		}
-		else if (! empty($feature2))	// This should be used for future changes
+		} else if (! empty($feature2)) {
+		    // This should be used for future changes
 		{
 			$tmpreadok=1;
+		}
 			foreach($feature2 as $subfeature)
 			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; } else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; } else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
 			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
+			if (! $tmpreadok) {
+			    // We found a test on feature that is ko
 			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+				$readok=0;
+			}
+			// All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
-		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+		} else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) {
+		    // This is for old permissions
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+				&& empty($user->rights->$feature->run)) { $readok=0;
+		}
+		$nbko++; }
 		}
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+	    $readok=1;
+	}
 
-	if (! $readok) accessforbidden();
+	if (! $readok) {
+	    accessforbidden();
+	}
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
@@ -285,50 +327,52 @@ 
 			if ($feature == 'contact')
 			{
 				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'produit|service')
+			} else if ($feature == 'produit|service')
 			{
 				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'prelevement')
+			} else if ($feature == 'prelevement')
 			{
 				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'commande_fournisseur')
+			} else if ($feature == 'commande_fournisseur')
 			{
 				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'banque')
+			} else if ($feature == 'banque')
 			{
 				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'cheque')
+			} else if ($feature == 'cheque')
 			{
 				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-			}
-			else if (! empty($feature2))	// This should be used
+			} else if (! empty($feature2)) {
+			    // This should be used
 			{
 				foreach($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->creer)
 						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
-				}
+						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0;
 			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+			$nbko++; } else { $createok=1; break; } // Break to bypass second test if the first is ok
+				}
+			} else if (! empty($feature)) {
+			    // This is for old permissions ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
 					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+					&& empty($user->rights->$feature->create)) { $createok=0;
+			}
+			$nbko++; }
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		    $createok=1;
+		}
 
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+		if (GETPOST('action','aZ09') == 'create' && ! $createok) {
+		    accessforbidden();
+		}
 		//print "Write access is ok";
 	}
 
@@ -336,9 +380,13 @@ 
 	$createuserok=1;
 	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
 	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
+		if (! $user->rights->user->user->creer) {
+		    $createuserok=0;
+		}
 
-		if (! $createuserok) accessforbidden();
+		if (! $createuserok) {
+		    accessforbidden();
+		}
 		//print "Create user access is ok";
 	}
 
@@ -350,60 +398,76 @@ 
 		{
 			if ($feature == 'contact')
 			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'produit|service')
+				if (! $user->rights->societe->contact->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'produit|service')
 			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'commande_fournisseur')
+				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'commande_fournisseur')
 			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'banque')
+				if (! $user->rights->fournisseur->commande->supprimer) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'banque')
 			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
-			}
-			else if ($feature == 'cheque')
+				if (! $user->rights->banque->modifier) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'cheque')
 			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
-			}
-			else if ($feature == 'ecm')
+				if (! $user->rights->banque->cheque) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'ecm')
 			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
-			}
-			else if ($feature == 'ftp')
+				if (! $user->rights->ecm->upload) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'ftp')
 			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
+				if (! $user->rights->ftp->write) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if ($feature == 'salaries')
+				if (! $user->rights->salaries->delete) {
+				    $deleteok=0;
+				}
+			} else if ($feature == 'salaries')
 			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
+				if (! $user->rights->salaries->delete) {
+				    $deleteok=0;
+				}
+			} else if (! empty($feature2)) {
+			    // This should be used for permissions on 2 levels
 			{
 				foreach($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
+			} else { $deleteok=1; break; } // For bypass the second test if the first is ok
 				}
-			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
+			} else if (! empty($feature)) {
+			    // This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
 					&& empty($user->rights->$feature->run)) $deleteok=0;
 			}
+			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		    $deleteok=1;
+		}
 
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+		if (! $deleteok && ! ($isdraft && $createok)) {
+		    accessforbidden();
+		}
 		//print "Delete access is ok";
 	}
 
@@ -446,9 +510,15 @@ 
 		$sql='';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
+		if ($feature == 'member') {
+		    $feature='adherent';
+		}
+		if ($feature == 'project') {
+		    $feature='projet';
+		}
+		if ($feature == 'task') {
+		    $feature='projet_task';
+		}
 
 		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe');	 // Test for societe object
@@ -478,8 +548,7 @@ 
 					{
 						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql.= " AND dbt.entity IS NOT NULL";
-					}
-					else
+					} else
 					{
 						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
@@ -487,24 +556,23 @@ 
 						$sql.= " AND ug.entity IN (".getEntity('user')."))";
 						$sql.= " OR dbt.entity = 0"; // Show always superadmin
 					}
-				}
-				else {
+				} else {
 					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
-			}
-			else
+			} else
 			{
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
+		} else if (in_array($feature,$checksoc)) {
+		    // We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
+		}
 			}
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
@@ -525,13 +593,14 @@ 
 				$sql.= " WHERE s.rowid IN (".$objectid.")";
 				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} else if (in_array($feature,$checkother)) {
+		    // Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+		}
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.fk_soc = ".$user->socid;
@@ -554,8 +623,7 @@ 
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checkproject))
+		} else if (in_array($feature,$checkproject))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -563,17 +631,17 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
+				if (! in_array($objectid,$tmparray)) {
+				    return false;
+				}
+			} else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (in_array($feature,$checktask))
+		} else if (in_array($feature,$checktask))
 		{
 			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -584,22 +652,24 @@ 
 				$projectstatic=new Project($db);
 				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
 				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
+				if (! in_array($task->fk_project,$tmparray)) {
+				    return false;
+				}
+			} else
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} else if (! in_array($feature,$nocheck)) {
+		    // By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+		}
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
@@ -608,7 +678,9 @@ 
 			// If internal user: Check permission for internal users that are restricted on their objects
 			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
 			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) {
+				    dol_print_error('','Param dbt_keyfield is required but not defined');
+				}
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
 				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -635,9 +707,10 @@ 
 			if ($resql)
 			{
 				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
+				if (! $obj || $obj->nb < count(explode(',', $objectid))) {
+				    return false;
+				}
+			} else
 			{
 				return false;
 			}
@@ -670,12 +743,18 @@ 
 
 	if ($printheader)
 	{
-		if (function_exists("llxHeader")) llxHeader('');
-		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+		if (function_exists("llxHeader")) {
+		    llxHeader('');
+		} else if (function_exists("llxHeaderVierge")) {
+		    llxHeaderVierge('');
+		}
 	}
 	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
-	else print $message;
+	if (! $message) {
+	    print $langs->trans("ErrorForbidden");
+	} else {
+	    print $message;
+	}
 	print '</div>';
 	print '<br>';
 	if (empty($showonlymessage))
@@ -684,12 +763,13 @@ 
 		{
 			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-		}
-		else
+		} else
 		{
 			print $langs->trans("ErrorForbidden3");
 		}
 	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
+	if ($printfooter && function_exists("llxFooter")) {
+	    llxFooter();
+	}
 	exit(0);
 }

dolibarr/htdocs/core/lib/functions2.lib.php

Indentation +400 added lines, -400 removed lines

@@ -126,7 +126,7 @@ 
 
     $selected='EUA4';
     if (!$outputlangs) {
-    	$outputlangs=$langs;
+        $outputlangs=$langs;
     }
 
     if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
@@ -230,15 +230,15 @@ 
         else print ': ';
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -266,15 +266,15 @@ 
         else print ': ';
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -303,14 +303,14 @@ 
         if (is_object($object->user_validation))
         {
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -339,14 +339,14 @@ 
         if (is_object($object->user_approve))
         {
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -402,15 +402,15 @@ 
         else print ': ';
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -438,15 +438,15 @@ 
         else print ': ';
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -492,8 +492,8 @@ 
  */
 function dolAddEmailTrackId($email, $trackingid)
 {
-	$tmp=explode('@',$email);
-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
+    $tmp=explode('@',$email);
+    return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
 }
 
 /**
@@ -619,33 +619,33 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
-	$tab = explode('@', $mail);
-	$tab2 = explode('.',$tab[1]);
-	$string_replace = '';
-	$mail_name = $tab[0];
-	$mail_domaine = $tab2[0];
-	$mail_tld = '';
-
-	$nbofelem = count($tab2);
-	for($i=1; $i < $nbofelem && $displaytld; $i++)
-	{
-		$mail_tld .= '.'.$tab2[$i];
-	}
-
-	for($i=0; $i < $nbreplace; $i++){
-		$string_replace .= $replace;
-	}
-
-	if(strlen($mail_name) > $nbdisplaymail){
-		$mail_name = substr($mail_name, 0, $nbdisplaymail);
-	}
-
-	if(strlen($mail_domaine) > $nbdisplaydomain){
-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
-	}
-
-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+    if(!isValidEmail($mail))return '';
+    $tab = explode('@', $mail);
+    $tab2 = explode('.',$tab[1]);
+    $string_replace = '';
+    $mail_name = $tab[0];
+    $mail_domaine = $tab2[0];
+    $mail_tld = '';
+
+    $nbofelem = count($tab2);
+    for($i=1; $i < $nbofelem && $displaytld; $i++)
+    {
+        $mail_tld .= '.'.$tab2[$i];
+    }
+
+    for($i=0; $i < $nbreplace; $i++){
+        $string_replace .= $replace;
+    }
+
+    if(strlen($mail_name) > $nbdisplaymail){
+        $mail_name = substr($mail_name, 0, $nbdisplaymail);
+    }
+
+    if(strlen($mail_domaine) > $nbdisplaydomain){
+        $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+    }
+
+    return $mail_name . $string_replace . $mail_domaine . $mail_tld;
 }
 
 
@@ -783,24 +783,24 @@ 
     }
     else
     {
-    	$masktype='';
-    	$masktype_value='';
+        $masktype='';
+        $masktype_value='';
     }
 
     // Extract value for user
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
-    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+        $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
+        if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+        $maskuser=$regType[1];
+        $maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
+        $maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+        $maskuser='';
+        $maskuser_value='';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
@@ -816,12 +816,12 @@ 
 
     if (strstr($mask,'user_extra_'))
     {
-			$start = "{user_extra_";
-			$end = "\}";
-			$extra= get_string_between($mask, "user_extra_", "}");
-			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
-			}
+            $start = "{user_extra_";
+            $end = "\}";
+            $extra= get_string_between($mask, "user_extra_", "}");
+            if(!empty($user->array_options['options_'.$extra])){
+                $mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+            }
     }
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
@@ -882,7 +882,7 @@ 
         else // if reset is for a specific month in year, we need year
         {
             if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
+            else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
             else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
             else return 'ErrorCantUseRazIfNoYearInMask';
         }
@@ -890,11 +890,11 @@ 
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
         $monthlen = $posm?dol_strlen($reg[$posm]):0;
         // Define pos
-       	$yearpos = (dol_strlen($reg[1])+1);
+            $yearpos = (dol_strlen($reg[1])+1);
         $monthpos = ($yearpos+$yearlen);
         if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1])+1);
-           	$yearpos = ($monthpos+$monthlen);
+                $monthpos = (dol_strlen($reg[1])+1);
+                $yearpos = ($monthpos+$monthlen);
         }
         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
@@ -904,20 +904,20 @@ 
 
         if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
-        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
-
-        	// If after or equal of current fiscal date
-        	if ($date >= $fiscaldate)
-        	{
-        		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
-        	}
-        	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+            $currentyear=date("Y", $date);
+            $fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
+            $newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
+            $nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
+            //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
+
+            // If after or equal of current fiscal date
+            if ($date >= $fiscaldate)
+            {
+                // If before of next new year date
+                if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+            }
+            // If after or equal of current new year date
+            else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
@@ -938,11 +938,11 @@ 
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
         }
-		else if ($resetEveryMonth)
-		{
-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+        else if ($resetEveryMonth)
+        {
+            $sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
+        }
         else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
@@ -953,13 +953,13 @@ 
 
     // Define $sqlstring
     if (function_exists('mb_strrpos'))
-    	{
-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
-	{
-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);
-	}	// Pos of counter in final string (from 0 to ...)
+        {
+        $posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
+    }
+    else
+    {
+        $posnumstart=strrpos($maskwithnocode,$maskcounter);
+    }	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
@@ -978,7 +978,7 @@ 
     if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
     foreach($maskperso as $key => $val)
     {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
+        $maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
     }
 
     // Get counter in database
@@ -986,11 +986,11 @@ 
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND entity IN (".getEntity($sharetable).")";
     else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
+        $sql.= " AND entity IN (".$forceentity.")";
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1008,8 +1008,8 @@ 
     if (empty($counter)) $counter=$maskoffset;
     else if (preg_match('/[^0-9]/i',$counter))
     {
-    	$counter=0;
-    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+        $counter=0;
+        dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
     }
     else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
@@ -1035,11 +1035,11 @@ 
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+        if ($bentityon) // only if entity enable
+            $sql.= " AND entity IN (".getEntity($sharetable).")";
         else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
+            $sql.= " AND entity IN (".$forceentity.")";
         if ($where) $sql.=$where;
         if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1061,7 +1061,7 @@ 
         // If value for $counter has a length higher than $maskcounter chars
         if ($counter >= pow(10, dol_strlen($maskcounter)))
         {
-        	$counter='ErrorMaxNumberReachForThisMask';
+            $counter='ErrorMaxNumberReachForThisMask';
         }
 
         if (! empty($maskrefclient_maskcounter))
@@ -1093,9 +1093,9 @@ 
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
             if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
+                $maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
             else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
+                $sql.= " AND entity IN (".$forceentity.")";
             if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
             if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
@@ -1110,25 +1110,25 @@ 
             else dol_print_error($db);
 
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
-			$maskrefclient_counter++;
+            $maskrefclient_counter++;
         }
 
         // Build numFinal
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
-		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
-		{
-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
-		}
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
+        }
+        else	// we want yyyy to be current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
+        }
         $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);
         $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);
 
@@ -1158,9 +1158,9 @@ 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
+            $maskuser_maskbefore='{'.$maskuser.'}';
+            $maskuser_maskafter=$maskuser_value;
+            $numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
         }
     }
 
@@ -1179,11 +1179,11 @@ 
 function get_string_between($string, $start, $end)
 {
     $string = " ".$string;
-     $ini = strpos($string,$start);
-     if ($ini == 0) return "";
-     $ini += strlen($start);
-     $len = strpos($string,$end,$ini) - $ini;
-     return substr($string,$ini,$len);
+        $ini = strpos($string,$start);
+        if ($ini == 0) return "";
+        $ini += strlen($start);
+        $len = strpos($string,$end,$ini) - $ini;
+        return substr($string,$ini,$len);
 }
 
 /**
@@ -1531,7 +1531,7 @@ 
     }
     else
     {
-    	$string = vatrate($reduction,true);
+        $string = vatrate($reduction,true);
     }
 
     return $string;
@@ -1624,7 +1624,7 @@ 
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
                 $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
 
-		$listoffiles=array();
+        $listoffiles=array();
 
                 // Now we add models found in directories scanned
                 $listofdir=explode(',',$dirtoscan);
@@ -1635,8 +1635,8 @@ 
                     if (! $tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
-			// all type of template is allowed
-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+            // all type of template is allowed
+            $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
                         if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
                     }
                 }
@@ -1692,19 +1692,19 @@ 
  */
 function is_ip($ip)
 {
-	// First we test if it is a valid IPv4
-	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+    // First we test if it is a valid IPv4
+    if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
-		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+        // Then we test if it is a private range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
 
-		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+        // Then we test if it is a reserved range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
 
-		return 1;
-	}
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 
 /**
@@ -1744,25 +1744,25 @@ 
     if ($proxyuse)
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 1,
-                      'proxy_host'     => $proxyhost,
-                      'proxy_port'     => $proxyport,
-                      'proxy_login'    => $proxyuser,
-                      'proxy_password' => $proxypass,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 1,
+                        'proxy_host'     => $proxyhost,
+                        'proxy_port'     => $proxyport,
+                        'proxy_login'    => $proxyuser,
+                        'proxy_password' => $proxypass,
+                        'trace'		   => 1
         );
     }
     else
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 0,
-                      'proxy_host'     => false,
-                      'proxy_port'     => false,
-                      'proxy_login'    => false,
-                      'proxy_password' => false,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 0,
+                        'proxy_host'     => false,
+                        'proxy_port'     => false,
+                        'proxy_login'    => false,
+                        'proxy_password' => false,
+                        'trace'		   => 1
         );
     }
     return $params;
@@ -1780,118 +1780,118 @@ 
  */
 function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
 {
-	global $db, $conf, $langs;
-
-	$ret='';
-
-	// Parse element/subelement (ex: project_task)
-	$module = $element = $subelement = $objecttype;
-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
-	{
-		$module = $element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	$classpath = $element.'/class';
-
-	// To work with non standard path
-	if ($objecttype == 'facture' || $objecttype == 'invoice') {
-		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
-	}
-	if ($objecttype == 'commande' || $objecttype == 'order') {
-		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
-	}
-	if ($objecttype == 'propal')  {
-		$classpath = 'comm/propal/class';
-	}
-	if ($objecttype == 'supplier_proposal')  {
-		$classpath = 'supplier_proposal/class';
-	}
-	if ($objecttype == 'shipping') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
-	}
-	if ($objecttype == 'delivery') {
-		$classpath = 'livraison/class';
-		$subelement = 'livraison';
-		$module = 'livraison_bon';
-	}
-	if ($objecttype == 'contract') {
-		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
-	}
-	if ($objecttype == 'member') {
-		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
-	}
-	if ($objecttype == 'cabinetmed_cons') {
-		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
-	}
-	if ($objecttype == 'fichinter') {
-		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
-	}
-	if ($objecttype == 'task') {
-		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
-	}
-	if ($objecttype == 'stock') {
-		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
-	}
-
-	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
-
-	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
-	if ($objecttype == 'invoice_supplier') {
-		$classfile = 'fournisseur.facture';
-		$classname='FactureFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
-		$classfile = 'fournisseur.commande';
-		$classname='CommandeFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
-		$classpath = 'product/stock/class';
-		$classfile='entrepot';
-		$classname='Entrepot';
-	}
-	if (! empty($conf->$module->enabled))
-	{
-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-		if ($res)
-		{
-			if (class_exists($classname))
-			{
-				$object = new $classname($db);
-				$res=$object->fetch($objectid);
-				if ($res > 0) {
-					$ret=$object->getNomUrl($withpicto,$option);
-				} elseif($res==0) {
-					$ret=$langs->trans('Deleted');
-				}
-				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
-		}
-	}
-	return $ret;
+    global $db, $conf, $langs;
+
+    $ret='';
+
+    // Parse element/subelement (ex: project_task)
+    $module = $element = $subelement = $objecttype;
+    if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+    {
+        $module = $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    $classpath = $element.'/class';
+
+    // To work with non standard path
+    if ($objecttype == 'facture' || $objecttype == 'invoice') {
+        $classpath = 'compta/facture/class';
+        $module='facture';
+        $subelement='facture';
+    }
+    if ($objecttype == 'commande' || $objecttype == 'order') {
+        $classpath = 'commande/class';
+        $module='commande';
+        $subelement='commande';
+    }
+    if ($objecttype == 'propal')  {
+        $classpath = 'comm/propal/class';
+    }
+    if ($objecttype == 'supplier_proposal')  {
+        $classpath = 'supplier_proposal/class';
+    }
+    if ($objecttype == 'shipping') {
+        $classpath = 'expedition/class';
+        $subelement = 'expedition';
+        $module = 'expedition_bon';
+    }
+    if ($objecttype == 'delivery') {
+        $classpath = 'livraison/class';
+        $subelement = 'livraison';
+        $module = 'livraison_bon';
+    }
+    if ($objecttype == 'contract') {
+        $classpath = 'contrat/class';
+        $module='contrat';
+        $subelement='contrat';
+    }
+    if ($objecttype == 'member') {
+        $classpath = 'adherents/class';
+        $module='adherent';
+        $subelement='adherent';
+    }
+    if ($objecttype == 'cabinetmed_cons') {
+        $classpath = 'cabinetmed/class';
+        $module='cabinetmed';
+        $subelement='cabinetmedcons';
+    }
+    if ($objecttype == 'fichinter') {
+        $classpath = 'fichinter/class';
+        $module='ficheinter';
+        $subelement='fichinter';
+    }
+    if ($objecttype == 'task') {
+        $classpath = 'projet/class';
+        $module='projet';
+        $subelement='task';
+    }
+    if ($objecttype == 'stock') {
+        $classpath = 'product/stock/class';
+        $module='stock';
+        $subelement='stock';
+    }
+
+    //print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
+
+    $classfile = strtolower($subelement); $classname = ucfirst($subelement);
+    if ($objecttype == 'invoice_supplier') {
+        $classfile = 'fournisseur.facture';
+        $classname='FactureFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'order_supplier')   {
+        $classfile = 'fournisseur.commande';
+        $classname='CommandeFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'stock')   {
+        $classpath = 'product/stock/class';
+        $classfile='entrepot';
+        $classname='Entrepot';
+    }
+    if (! empty($conf->$module->enabled))
+    {
+        $res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+        if ($res)
+        {
+            if (class_exists($classname))
+            {
+                $object = new $classname($db);
+                $res=$object->fetch($objectid);
+                if ($res > 0) {
+                    $ret=$object->getNomUrl($withpicto,$option);
+                } elseif($res==0) {
+                    $ret=$langs->trans('Deleted');
+                }
+                unset($object);
+            }
+            else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+        }
+    }
+    return $ret;
 }
 
 
@@ -1905,113 +1905,113 @@ 
  */
 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 {
-	$totalnb=0;
-	$listofid=array();
-	$listofparentid=array();
-
-	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
-			$i++;
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	if (count($listofid))
-	{
-		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
-
-		// Check loops on each other
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				print '<br>Some record that were parent of themself were cleaned.';
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check other loops
-		$listofidtoclean=array();
-		foreach($listofparentid as $id => $pid)
-		{
-			// Check depth
-			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
-
-			$cursor=$id; $arrayidparsed=array();	// We start from child $id
-			while ($cursor > 0)
-			{
-				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
-				{
-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
-					unset($arrayidparsed);
-					$listofidtoclean[$cursor]=$id;
-					break;
-				}
-				$cursor=$listofparentid[$cursor];
-			}
-
-			if (count($listofidtoclean)) break;
-		}
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
-				print join(',',$listofidtoclean);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check and clean orphelins
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
-				print join(',',$listofid);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
-		return $totalnb;
-	}
+    $totalnb=0;
+    $listofid=array();
+    $listofparentid=array();
+
+    // Get list of all id in array listofid and all parents in array listofparentid
+    $sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            $listofid[]=$obj->rowid;
+            if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+            $i++;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    if (count($listofid))
+    {
+        print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
+
+        // Check loops on each other
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                print '<br>Some record that were parent of themself were cleaned.';
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check other loops
+        $listofidtoclean=array();
+        foreach($listofparentid as $id => $pid)
+        {
+            // Check depth
+            //print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
+
+            $cursor=$id; $arrayidparsed=array();	// We start from child $id
+            while ($cursor > 0)
+            {
+                $arrayidparsed[$cursor]=1;
+                if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+                {
+                    print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+                    unset($arrayidparsed);
+                    $listofidtoclean[$cursor]=$id;
+                    break;
+                }
+                $cursor=$listofparentid[$cursor];
+            }
+
+            if (count($listofidtoclean)) break;
+        }
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
+                print join(',',$listofidtoclean);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check and clean orphelins
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
+                print join(',',$listofid);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
+        return $totalnb;
+    }
 }
 
 /**
@@ -2143,21 +2143,21 @@ 
 function fetchObjectByElement($element_id, $element_type, $element_ref='')
 {
     global $conf;
-	global $db,$conf;
+    global $db,$conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
     {
         dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
-		$objecttmp = new $element_prop['classname']($db);
-		$ret = $objecttmp->fetch($element_id, $element_ref);
-		if ($ret >= 0)
-		{
-			return $objecttmp;
-		}
-	}
-	return 0;
+        $objecttmp = new $element_prop['classname']($db);
+        $ret = $objecttmp->fetch($element_id, $element_ref);
+        if ($ret >= 0)
+        {
+            return $objecttmp;
+        }
+    }
+    return 0;
 }
 
 
@@ -2172,9 +2172,9 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
+    if (! is_array($arraycolor)) return $colorifnotfound;
+    if (empty($arraycolor)) return $colorifnotfound;
+    return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
 /**
@@ -2189,15 +2189,15 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
-	if (! $tmp)
-	{
-		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
-		return $tmp;
-	}
-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+    if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+    $tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+    if (! $tmp)
+    {
+        $tmp=explode(',',$stringcolor);
+        if (count($tmp) < 3) return $colorifnotfound;
+        return $tmp;
+    }
+    return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
 }
 
 /**
@@ -2243,7 +2243,7 @@ 
     if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
 
     if ($module == 'contracts') {
-    	$moduledirforclass = 'contrat';
+        $moduledirforclass = 'contrat';
     }
     elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
@@ -2270,7 +2270,7 @@ 
         $moduledirforclass = 'commande';
     }
     elseif ($module == 'shipments') {
-    	$moduledirforclass = 'expedition';
+        $moduledirforclass = 'expedition';
     }
     elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
@@ -2288,7 +2288,7 @@ 
         $moduledirforclass = 'product/stock';
     }
     elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
-    	$moduledirforclass = 'supplier_proposal';
+        $moduledirforclass = 'supplier_proposal';
     }
     elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
@@ -2300,10 +2300,10 @@ 
         $moduledirforclass = 'user';
     }
     elseif ($module == 'ficheinter' || $module == 'interventions') {
-    	$moduledirforclass = 'fichinter';
+        $moduledirforclass = 'fichinter';
     }
     elseif ($module == 'tickets') {
-    	$moduledirforclass = 'ticket';
+        $moduledirforclass = 'ticket';
     }
 
     return $moduledirforclass;

Spacing +548 added lines, -548 removed lines

@@ -52,7 +52,7 @@ 
                 $pos++;
                 $unicodeHexVal = substr($source, $pos, 4);
                 $unicode = hexdec($unicodeHexVal);
-                $entity = "&#". $unicode . ';';
+                $entity = "&#".$unicode.';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
             }
@@ -78,32 +78,32 @@ 
  * @param	string	$subdir		Sub directory (Example: '/mailings')
  * @return	array				Array of directories that can contains module descriptors
  */
-function dolGetModulesDirs($subdir='')
+function dolGetModulesDirs($subdir = '')
 {
     global $conf;
 
-    $modulesdir=array();
+    $modulesdir = array();
 
     foreach ($conf->file->dol_document_root as $type => $dirroot)
     {
         // Default core/modules dir
         if ($type === 'main') {
-            $modulesdir[$dirroot . '/core/modules' . $subdir . '/'] = $dirroot . '/core/modules' . $subdir . '/';
+            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
         }
 
         // Scan dir from external modules
-        $handle=@opendir($dirroot);
+        $handle = @opendir($dirroot);
         if (is_resource($handle))
         {
-            while (($file = readdir($handle))!==false)
+            while (($file = readdir($handle)) !== false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
-                    if (is_dir($dirroot . '/' . $file . '/core/modules'.$subdir.'/'))
+                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
                     {
-                        $modulesdir[$dirroot . '/' . $file . '/core/modules'.$subdir.'/'] = $dirroot . '/' . $file . '/core/modules'.$subdir.'/';
+                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
                     }
                 }
             }
@@ -124,13 +124,13 @@ 
 {
     global $langs;
 
-    $selected='EUA4';
+    $selected = 'EUA4';
     if (!$outputlangs) {
-    	$outputlangs=$langs;
+    	$outputlangs = $langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
+    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
     return $selected;
 }
 
@@ -142,20 +142,20 @@ 
  *  @param  int			$searchalt      1=Search also in alternative languages
  *	@return	boolean						true if OK, false if KO
  */
-function dol_print_file($langs,$filename,$searchalt=0)
+function dol_print_file($langs, $filename, $searchalt = 0)
 {
     global $conf;
 
     // Test if file is in lang directory
-    foreach($langs->dir as $searchdir)
+    foreach ($langs->dir as $searchdir)
     {
-        $formfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);
+        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
         dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
         if (is_readable($formfile))
         {
-            $content=file_get_contents($formfile);
-            $isutf8=utf8_check($content);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+            $content = file_get_contents($formfile);
+            $isutf8 = utf8_check($content);
+            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
             elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
             else print $content;
             return true;
@@ -170,9 +170,9 @@ 
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
-                $content=file_get_contents($formfilealt);
-                $isutf8=utf8_check($content);
-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+                $content = file_get_contents($formfilealt);
+                $isutf8 = utf8_check($content);
+                if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
                 elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
                 else print $content;
                 return true;
@@ -192,7 +192,7 @@ 
  *  @param  int     $usetable       Output into a table
  *	@return	void
  */
-function dol_print_object_info($object, $usetable=0)
+function dol_print_object_info($object, $usetable = 0)
 {
     global $langs, $db;
 
@@ -201,16 +201,16 @@ 
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-    $deltadateforserver=getServerTimeZoneInt('now');
-    $deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+    $deltadateforserver = getServerTimeZoneInt('now');
+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
     //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
-    $deltadateforuser=round($deltadateforclient-$deltadateforserver);
+    $deltadateforuser = round($deltadateforclient - $deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
     if ($usetable) print '<table class="border centpercent">';
 
     // Import key
-    if (! empty($object->import_key))
+    if (!empty($object->import_key))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ImportedWithSet");
@@ -222,7 +222,7 @@ 
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_creation) || ! empty($object->user_creation_id))
+    if (!empty($object->user_creation) || !empty($object->user_creation_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("CreatedBy");
@@ -235,7 +235,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -245,20 +245,20 @@ 
     }
 
     // Date creation
-    if (! empty($object->date_creation))
+    if (!empty($object->date_creation))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateCreation");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_modification) || ! empty($object->user_modification_id))
+    if (!empty($object->user_modification) || !empty($object->user_modification_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ModifiedBy");
@@ -271,7 +271,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -281,20 +281,20 @@ 
     }
 
     // Date change
-    if (! empty($object->date_modification))
+    if (!empty($object->date_modification))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateLastModification");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_validation) || ! empty($object->user_validation_id))
+    if (!empty($object->user_validation) || !empty($object->user_validation_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ValidatedBy");
@@ -307,7 +307,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -317,20 +317,20 @@ 
     }
 
     // Date validation
-    if (! empty($object->date_validation))
+    if (!empty($object->date_validation))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateValidation");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
-    if (! empty($object->user_approve) || ! empty($object->user_approve_id))
+    if (!empty($object->user_approve) || !empty($object->user_approve_id))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ApprovedBy");
@@ -343,7 +343,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -353,26 +353,26 @@ 
     }
 
     // Date approve
-    if (! empty($object->date_approve))
+    if (!empty($object->date_approve))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateApprove");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User approve
-    if (! empty($object->user_approve_id2))
+    if (!empty($object->user_approve_id2))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ApprovedBy");
         if ($usetable) print '</td><td>';
         else print ': ';
-        $userstatic=new User($db);
+        $userstatic = new User($db);
         $userstatic->fetch($object->user_approve_id2);
         if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         else print $langs->trans("Unknown");
@@ -381,20 +381,20 @@ 
     }
 
     // Date approve
-    if (! empty($object->date_approve2))
+    if (!empty($object->date_approve2))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateApprove2");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User close
-    if (! empty($object->user_cloture))
+    if (!empty($object->user_cloture))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ClosedBy");
@@ -407,7 +407,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_cloture);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -417,20 +417,20 @@ 
     }
 
     // Date close
-    if (! empty($object->date_cloture))
+    if (!empty($object->date_cloture))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateClosing");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // User conciliate
-    if (! empty($object->user_rappro))
+    if (!empty($object->user_rappro))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("ConciliatedBy");
@@ -443,7 +443,7 @@ 
         }
         else
         {
-            $userstatic=new User($db);
+            $userstatic = new User($db);
             $userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
@@ -453,27 +453,27 @@ 
     }
 
     // Date conciliate
-    if (! empty($object->date_rappro))
+    if (!empty($object->date_rappro))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateConciliating");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
 
     // Date send
-    if (! empty($object->date_envoi))
+    if (!empty($object->date_envoi))
     {
         if ($usetable) print '<tr><td class="titlefield">';
         print $langs->trans("DateLastSend");
         if ($usetable) print '</td><td>';
         else print ': ';
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
         if ($usetable) print '</td></tr>';
         else print '<br>';
     }
@@ -492,8 +492,8 @@ 
  */
 function dolAddEmailTrackId($email, $trackingid)
 {
-	$tmp=explode('@',$email);
-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
+	$tmp = explode('@', $email);
+	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1]) ? $tmp[1] : '');
 }
 
 /**
@@ -528,7 +528,7 @@ 
  *  @param  int		$anchor		1: verify anchor is provided, 0: not verify anchor
  *	@return int					1=Check is OK, 0=Check is KO
  */
-function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)
+function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)
 {
     $ValidUrl = 0;
     $urlregex = '';
@@ -542,7 +542,7 @@ 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x
-    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*";  // x ou x.xx (2 x ou plus)
+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
     //use only one of the above
 
     // PORT
@@ -571,33 +571,33 @@ 
  *	@param  integer	$http		1 = keep both http:// and https://, 0: remove http:// but not https://
  *	@return string				Cleaned url
  */
-function clean_url($url,$http=1)
+function clean_url($url, $http = 1)
 {
     // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
     // To include the minus sign in a char class, we must not escape it but put it at the end of the class
     // Also, there's no need of escape a dot sign in a class
-    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i',$url,$regs))
+    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
     {
-        $proto=$regs[1];
-        $domain=$regs[2];
-        $port=isset($regs[3])?$regs[3]:'';
+        $proto = $regs[1];
+        $domain = $regs[2];
+        $port = isset($regs[3]) ? $regs[3] : '';
         //print $url." -> ".$proto." - ".$domain." - ".$port;
         //$url = dol_string_nospecial(trim($url));
         $url = trim($url);
 
         // Si http: defini on supprime le http (Si https on ne supprime pas)
-        $newproto=$proto;
-        if ($http==0)
+        $newproto = $proto;
+        if ($http == 0)
         {
-            if (preg_match('/^http:[\\/]+/i',$url))
+            if (preg_match('/^http:[\\/]+/i', $url))
             {
-                $url = preg_replace('/^http:[\\/]+/i','',$url);
+                $url = preg_replace('/^http:[\\/]+/i', '', $url);
                 $newproto = '';
             }
         }
 
         // On passe le nom de domaine en minuscule
-        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
+        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
     }
@@ -617,35 +617,35 @@ 
  * 	@param 		bool		$displaytld			Display tld (default: true)
  * 	@return		string							Return email with hidden parts or '';
  */
-function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
+function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail = 4, $nbdisplaydomain = 3, $displaytld = true)
 {
-	if(!isValidEmail($mail))return '';
+	if (!isValidEmail($mail))return '';
 	$tab = explode('@', $mail);
-	$tab2 = explode('.',$tab[1]);
+	$tab2 = explode('.', $tab[1]);
 	$string_replace = '';
 	$mail_name = $tab[0];
 	$mail_domaine = $tab2[0];
 	$mail_tld = '';
 
 	$nbofelem = count($tab2);
-	for($i=1; $i < $nbofelem && $displaytld; $i++)
+	for ($i = 1; $i < $nbofelem && $displaytld; $i++)
 	{
 		$mail_tld .= '.'.$tab2[$i];
 	}
 
-	for($i=0; $i < $nbreplace; $i++){
+	for ($i = 0; $i < $nbreplace; $i++) {
 		$string_replace .= $replace;
 	}
 
-	if(strlen($mail_name) > $nbdisplaymail){
+	if (strlen($mail_name) > $nbdisplaymail) {
 		$mail_name = substr($mail_name, 0, $nbdisplaymail);
 	}
 
-	if(strlen($mail_domaine) > $nbdisplaydomain){
-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+	if (strlen($mail_domaine) > $nbdisplaydomain) {
+		$mail_domaine = substr($mail_domaine, strlen($mail_domaine) - $nbdisplaydomain);
 	}
 
-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+	return $mail_name.$string_replace.$mail_domaine.$mail_tld;
 }
 
 
@@ -658,14 +658,14 @@ 
  * 	@param	string	$tdoptions	Options for td
  * 	@return	string
  */
-function array2tr($data,$troptions='',$tdoptions='')
+function array2tr($data, $troptions = '', $tdoptions = '')
 {
-    $text = '<tr '.$troptions.'>' ;
-    foreach($data as $key => $item){
-        $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;
+    $text = '<tr '.$troptions.'>';
+    foreach ($data as $key => $item) {
+        $text .= '<td '.$tdoptions.'>'.$item.'</td>';
     }
-    $text.= '</tr>' ;
-    return $text ;
+    $text .= '</tr>';
+    return $text;
 }
 
 /**
@@ -678,22 +678,22 @@ 
  * 	@param	string	$tdoptions		Options for td
  * 	@return	string
  */
-function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
+function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')
 {
-    $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
-    foreach($data as $key => $item){
-        if(is_array($item)){
-            $text.=array2tr($item,$troptions,$tdoptions);
+    $text = '';
+    if ($tableMarkup) $text = '<table '.$tableoptions.'>';
+    foreach ($data as $key => $item) {
+        if (is_array($item)) {
+            $text .= array2tr($item, $troptions, $tdoptions);
         } else {
-            $text.= '<tr '.$troptions.'>' ;
-            $text.= '<td '.$tdoptions.'>'.$key.'</td>' ;
-            $text.= '<td '.$tdoptions.'>'.$item.'</td>' ;
-            $text.= '</tr>' ;
+            $text .= '<tr '.$troptions.'>';
+            $text .= '<td '.$tdoptions.'>'.$key.'</td>';
+            $text .= '<td '.$tdoptions.'>'.$item.'</td>';
+            $text .= '</tr>';
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
-    return $text ;
+    if ($tableMarkup) $text .= '</table>';
+    return $text;
 }
 
 /**
@@ -712,19 +712,19 @@ 
  * @param	int			$forceentity	Entity id to force
  * @return 	string						New value (numeric) or error message
  */
-function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true, $objuser=null, $forceentity=null)
+function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
 {
-    global $conf,$user;
+    global $conf, $user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (!is_object($objsoc)) $valueforccc = $objsoc;
+    else if ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = $objsoc->code_fournisseur;
+    else $valueforccc = $objsoc->code_client;
 
     $sharetable = $table;
     if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -734,132 +734,132 @@ 
     //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
     //$date=dol_stringtotime('20130101');
 
-    $hasglobalcounter=false;
+    $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$mask,$reg))
+    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
     {
-        $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
-        $maskcounter=$reg[1];
-        $hasglobalcounter=true;
+        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
+        $maskcounter = $reg[1];
+        $hasglobalcounter = true;
     }
     else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri='00000';
-        $maskcounter='00000';
+        $masktri = '00000';
+        $maskcounter = '00000';
     }
 
-    $maskraz=-1;
-    $maskoffset=0;
-    $resetEveryMonth=false;
+    $maskraz = -1;
+    $maskoffset = 0;
+    $resetEveryMonth = false;
     if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
-        $maskrefclient=$regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode=$regClientRef[1];
-        $maskrefclient_maskcounter=$regClientRef[2];
-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
+        $maskrefclient = $regClientRef[1].$regClientRef[2];
+        $maskrefclient_maskclientcode = $regClientRef[1];
+        $maskrefclient_maskcounter = $regClientRef[2];
+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
-    else $maskrefclient='';
+    else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
         return 'ErrorBadMask';
     }
 
     // Extract value for third party type
-    if (preg_match('/\{(t+)\}/i',$mask,$regType))
+    if (preg_match('/\{(t+)\}/i', $mask, $regType))
     {
-        $masktype=$regType[1];
-        $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
-        $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+        $masktype = $regType[1];
+        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$masktype='';
-    	$masktype_value='';
+    	$masktype = '';
+    	$masktype_value = '';
     }
 
     // Extract value for user
-    if (preg_match('/\{(u+)\}/i',$mask,$regType))
+    if (preg_match('/\{(u+)\}/i', $mask, $regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
     	if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+    	$maskuser = $regType[1];
+    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
+    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+    	$maskuser = '';
+    	$maskuser_value = '';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
-    $maskperso=array();
-    $maskpersonew=array();
-    $tmpmask=$mask;
-    while (preg_match('/\{([A-Z]+)\-([1-9])\}/',$tmpmask,$regKey))
+    $maskperso = array();
+    $maskpersonew = array();
+    $tmpmask = $mask;
+    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
     {
-        $maskperso[$regKey[1]]='{'.$regKey[1].'-'.$regKey[2].'}';
-        $maskpersonew[$regKey[1]]=str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
-        $tmpmask=preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
+        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
     }
 
-    if (strstr($mask,'user_extra_'))
+    if (strstr($mask, 'user_extra_'))
     {
 			$start = "{user_extra_";
 			$end = "\}";
-			$extra= get_string_between($mask, "user_extra_", "}");
-			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+			$extra = get_string_between($mask, "user_extra_", "}");
+			if (!empty($user->array_options['options_'.$extra])) {
+				$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 			}
     }
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(t+)\}/i',$masktype_value,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(u+)\}/i',$maskuser_value,$maskwithonlyymcode);
-    foreach($maskperso as $key => $val)
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
+    foreach ($maskperso as $key => $val)
     {
-        $maskwithonlyymcode=preg_replace('/'.preg_quote($val,'/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
+        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
     }
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
-    $sqlwhere='';
-    $yearoffset=0;	// Use year of current $date by default
-    $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
+    $sqlwhere = '';
+    $yearoffset = 0; // Use year of current $date by default
+    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
     if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
+        $maskraz = $yearoffsettype; // For backward compatibility
+    else if ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
         $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
     //print "maskraz=".$maskraz;	// -1=no reset
 
@@ -873,79 +873,79 @@ 
         // Define posy, posm and reg
         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
+            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
             else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
 
             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
         }
         else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
+        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
+            else if (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }
             else return 'ErrorCantUseRazIfNoYearInMask';
         }
         // Define length
-        $yearlen = $posy?dol_strlen($reg[$posy]):0;
-        $monthlen = $posm?dol_strlen($reg[$posm]):0;
+        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
+        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
         // Define pos
-       	$yearpos = (dol_strlen($reg[1])+1);
-        $monthpos = ($yearpos+$yearlen);
+       	$yearpos = (dol_strlen($reg[1]) + 1);
+        $monthpos = ($yearpos + $yearlen);
         if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1])+1);
-           	$yearpos = ($monthpos+$monthlen);
+          	$monthpos = (dol_strlen($reg[1]) + 1);
+           	$yearpos = ($monthpos + $monthlen);
         }
         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
         // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)
-        $monthcomp=$maskraz;
-        $yearcomp=0;
+        $monthcomp = $maskraz;
+        $yearcomp = 0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
+        	$currentyear = date("Y", $date);
+        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
+        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
+        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
         	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
 
         	// If after or equal of current fiscal date
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
         }
         // For backward compatibility
-        else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
+        else if (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
+        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
+        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
         if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
-            if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
-
-            $sqlwhere.="(";
-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-            $sqlwhere.=" OR";
-            $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
-            $sqlwhere.=')';
+            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
+            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+
+            $sqlwhere .= "(";
+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+            $sqlwhere .= " OR";
+            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
+            $sqlwhere .= ')';
         }
 		else if ($resetEveryMonth)
 		{
-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
 		}
         else   // reset is done on january
         {
-            $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
+            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
     }
     //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
@@ -954,49 +954,49 @@ 
     // Define $sqlstring
     if (function_exists('mb_strrpos'))
     	{
-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
+    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
 	}
 	else
 	{
-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);
+    	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
-    $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
+    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
     $maskLike = dol_string_nospecial($mask);
-    $maskLike = str_replace("%","_",$maskLike);
+    $maskLike = str_replace("%", "_", $maskLike);
     // Replace protected special codes with matching number of _ as wild card caracter
-    $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
-    $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
-    $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
-    $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
-    $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
-    foreach($maskperso as $key => $val)
+    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
+    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+    foreach ($maskperso as $key => $val)
     {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
+    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);
     }
 
     // Get counter in database
-    $counter=0;
+    $counter = 0;
     $sql = "SELECT MAX(".$sqlstring.") as val";
-    $sql.= " FROM ".MAIN_DB_PREFIX.$table;
-    $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
+    $sql .= " FROM ".MAIN_DB_PREFIX.$table;
+    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
+	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	$sql .= " AND entity IN (".getEntity($sharetable).")";
+    else if (!empty($forceentity))
+    	$sql .= " AND entity IN (".$forceentity.")";
+    if ($where) $sql .= $where;
+    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $obj = $db->fetch_object($resql);
@@ -1005,46 +1005,46 @@ 
     else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) $counter = $maskoffset;
+    else if (preg_match('/[^0-9]/i', $counter))
     {
-    	$counter=0;
+    	$counter = 0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
     }
-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
+    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
 
     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
-        $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
-        $maskLike = str_replace("%","_",$maskLike);
+        $maskLike = str_replace("%", "_", $maskLike);
         // Replace protected special codes with matching number of _ as wild card caracter
-        $maskLike = preg_replace('/\{yyyy\}/i','____',$maskLike);
-        $maskLike = preg_replace('/\{yy\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{y\}/i','_',$maskLike);
-        $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
-        $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
-
-        $ref='';
+        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
+        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+
+        $ref = '';
         $sql = "SELECT ".$field." as ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$table;
-        $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$table;
+        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
+    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";
     	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+        	$sql .= " AND entity IN (".getEntity($sharetable).")";
+        else if (!empty($forceentity))
+        	$sql .= " AND entity IN (".$forceentity.")";
+        if ($where) $sql .= $where;
+        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
@@ -1052,7 +1052,7 @@ 
         }
         else dol_print_error($db);
 
-        $numFinal=$ref;
+        $numFinal = $ref;
     }
     else if ($mode == 'next')
     {
@@ -1061,47 +1061,47 @@ 
         // If value for $counter has a length higher than $maskcounter chars
         if ($counter >= pow(10, dol_strlen($maskcounter)))
         {
-        	$counter='ErrorMaxNumberReachForThisMask';
+        	$counter = 'ErrorMaxNumberReachForThisMask';
         }
 
-        if (! empty($maskrefclient_maskcounter))
+        if (!empty($maskrefclient_maskcounter))
         {
             //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
 
             // Define $sqlstring
-            $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
+            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)
             if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
-            $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
+            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
             // Define $maskrefclient_maskLike
             $maskrefclient_maskLike = dol_string_nospecial($mask);
-            $maskrefclient_maskLike = str_replace("%","_",$maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);
             // Replace protected special codes with matching number of _ as wild card caracter
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'),'____',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'),'_',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'),'__',$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),$maskrefclient_clientcode.str_pad("",dol_strlen($maskrefclient_maskcounter),"_"),$maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);
+            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
 
             // Get counter in database
-            $maskrefclient_counter=0;
+            $maskrefclient_counter = 0;
             $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
-            $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
+            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
-            $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
+            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
             if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
-            $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
+            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
+            else if (!empty($forceentity))
+            	$sql .= " AND entity IN (".$forceentity.")";
+            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask
+            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
-            $maskrefclient_resql=$db->query($maskrefclient_sql);
+            $maskrefclient_resql = $db->query($maskrefclient_sql);
             if ($maskrefclient_resql)
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
@@ -1109,7 +1109,7 @@ 
             }
             else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
 			$maskrefclient_counter++;
         }
 
@@ -1117,54 +1117,54 @@ 
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
 		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
+	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
 		}
 		else	// we want yyyy to be current year
 		{
-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
+        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
+        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
+        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);
 		}
-        $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);
-        $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);
+        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);
+        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);
 
         // Now we replace the counter
-        $maskbefore='{'.$masktri.'}';
-        $maskafter=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+        $maskbefore = '{'.$masktri.'}';
+        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
         //print 'x'.$maskbefore.'-'.$maskafter.'y';
-        $numFinal = str_replace($maskbefore,$maskafter,$numFinal);
+        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);
 
         // Now we replace the refclient
         if ($maskrefclient)
         {
             //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
-            $maskrefclient_maskbefore='{'.$maskrefclient.'}';
-            $maskrefclient_maskafter=$maskrefclient_clientcode.str_pad($maskrefclient_counter,dol_strlen($maskrefclient_maskcounter),"0",STR_PAD_LEFT);
-            $numFinal = str_replace($maskrefclient_maskbefore,$maskrefclient_maskafter,$numFinal);
+            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';
+            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
         }
 
         // Now we replace the type
         if ($masktype)
         {
-            $masktype_maskbefore='{'.$masktype.'}';
-            $masktype_maskafter=$masktype_value;
-            $numFinal = str_replace($masktype_maskbefore,$masktype_maskafter,$numFinal);
+            $masktype_maskbefore = '{'.$masktype.'}';
+            $masktype_maskafter = $masktype_value;
+            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
         }
 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
+        	$maskuser_maskbefore = '{'.$maskuser.'}';
+        	$maskuser_maskafter = $maskuser_value;
+        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
         }
     }
 
-    dol_syslog("functions2::get_next_value return ".$numFinal,LOG_DEBUG);
+    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);
     return $numFinal;
 }
 
@@ -1179,11 +1179,11 @@ 
 function get_string_between($string, $start, $end)
 {
     $string = " ".$string;
-     $ini = strpos($string,$start);
+     $ini = strpos($string, $start);
      if ($ini == 0) return "";
      $ini += strlen($start);
-     $len = strpos($string,$end,$ini) - $ini;
-     return substr($string,$ini,$len);
+     $len = strpos($string, $end, $ini) - $ini;
+     return substr($string, $ini, $len);
 }
 
 /**
@@ -1193,78 +1193,78 @@ 
  * @param 	string	$value		Value
  * @return	int|string		    <0 or error string if KO, 0 if OK
  */
-function check_value($mask,$value)
+function check_value($mask, $value)
 {
-    $result=0;
+    $result = 0;
 
-    $hasglobalcounter=false;
+    $hasglobalcounter = false;
     // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$mask,$reg))
+    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
     {
-        $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
-        $maskcounter=$reg[1];
-        $hasglobalcounter=true;
+        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
+        $maskcounter = $reg[1];
+        $hasglobalcounter = true;
     }
     else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri='00000';
-        $maskcounter='00000';
+        $masktri = '00000';
+        $maskcounter = '00000';
     }
 
-    $maskraz=-1;
-    $maskoffset=0;
+    $maskraz = -1;
+    $maskoffset = 0;
     if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
     // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
+    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
     {
-        $maskrefclient=$regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode=$regClientRef[1];
-        $maskrefclient_maskcounter=$regClientRef[2];
-        $maskrefclient_maskoffset=0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
-        $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
+        $maskrefclient = $regClientRef[1].$regClientRef[2];
+        $maskrefclient_maskclientcode = $regClientRef[1];
+        $maskrefclient_maskcounter = $regClientRef[2];
+        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
+        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
     }
-    else $maskrefclient='';
+    else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
-    if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
+    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
     {
         return 'ErrorBadMask';
     }
 
-    $maskwithonlyymcode=$mask;
-    $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
-    $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
-    $maskwithnocode=$maskwithonlyymcode;
-    $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
-    $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
+    $maskwithonlyymcode = $mask;
+    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+    $maskwithnocode = $maskwithonlyymcode;
+    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
     // Now maskwithnocode = 0000ddmmyyyyccc for example
     // and maskcounter    = 0000 for example
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
+    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
     if ($maskraz >= 0)
     {
         if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1273,8 +1273,8 @@ 
     //
 
     // Check length
-    $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    $len = dol_strlen($maskwithnocode);
+    if (dol_strlen($value) != $len) $result = -1;
 
     // Define $maskLike
     /* seems not used
@@ -1290,7 +1290,7 @@ 
     if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);
 	*/
 
-    dol_syslog("functions2::check_value result=".$result,LOG_DEBUG);
+    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
     return $result;
 }
 
@@ -1302,13 +1302,13 @@ 
  *	@param   boolean	$upper		Convert to tupper
  *	@return  string					x
  */
-function binhex($bin, $pad=false, $upper=false)
+function binhex($bin, $pad = false, $upper = false)
 {
-    $last = dol_strlen($bin)-1;
-    for($i=0; $i<=$last; $i++){ $x += $bin[$last-$i] * pow(2,$i); }
+    $last = dol_strlen($bin) - 1;
+    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }
     $x = dechex($x);
-    if($pad){ while(dol_strlen($x) < intval(dol_strlen($bin))/4){ $x = "0$x"; } }
-    if($upper){ $x = strtoupper($x); }
+    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }
+    if ($upper) { $x = strtoupper($x); }
     return $x;
 }
 
@@ -1320,11 +1320,11 @@ 
  */
 function hexbin($hexa)
 {
-    $bin='';
+    $bin = '';
     $strLength = dol_strlen($hexa);
-    for($i=0;$i<$strLength;$i++)
+    for ($i = 0; $i < $strLength; $i++)
     {
-        $bin.=str_pad(decbin(hexdec($hexa{$i})),4,'0',STR_PAD_LEFT);
+        $bin .= str_pad(decbin(hexdec($hexa{$i})), 4, '0', STR_PAD_LEFT);
     }
     return $bin;
 }
@@ -1337,9 +1337,9 @@ 
  */
 function numero_semaine($time)
 {
-    $stime = strftime('%Y-%m-%d',$time);
+    $stime = strftime('%Y-%m-%d', $time);
 
-    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i',$stime,$reg))
+    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))
     {
         // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
         $annee = $reg[1];
@@ -1355,47 +1355,47 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
+    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+    else if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
     else // Jeudi
-    $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+    else if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
     }
     else // Jeudi
     {
-        $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
     }
 
     // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
-    $numeroSemaine =     (
+    $numeroSemaine = (
     (
-    date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))
+    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
     -
-    date("z",mktime(12,0,0,date("m",$premierJeudiAnnee),date("d",$premierJeudiAnnee),date("Y",$premierJeudiAnnee)))
+    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
     ) / 7
     ) + 1;
 
     // Cas particulier de la semaine 53
-    if ($numeroSemaine==53)
+    if ($numeroSemaine == 53)
     {
         // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
-        if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
+        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
         {
             $numeroSemaine = 53;
         }
@@ -1407,7 +1407,7 @@ 
 
     //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";
 
-    return sprintf("%02d",$numeroSemaine);
+    return sprintf("%02d", $numeroSemaine);
 }
 
 /**
@@ -1418,26 +1418,26 @@ 
  *	@param  int		$to_unit   		Nouvelle unite  en puissance de 10
  *	@return float	        		Masse convertie
  */
-function weight_convert($weight,&$from_unit,$to_unit)
+function weight_convert($weight, &$from_unit, $to_unit)
 {
     /* Pour convertire 320 gr en Kg appeler
      *  $f = -3
      *  weigh_convert(320, $f, 0) retournera 0.32
      *
      */
-    while ($from_unit  <> $to_unit)
+    while ($from_unit <> $to_unit)
     {
         if ($from_unit > $to_unit)
         {
             $weight = $weight * 10;
             $from_unit = $from_unit - 1;
-            $weight = weight_convert($weight,$from_unit, $to_unit);
+            $weight = weight_convert($weight, $from_unit, $to_unit);
         }
         if ($from_unit < $to_unit)
         {
             $weight = $weight / 10;
             $from_unit = $from_unit + 1;
-            $weight = weight_convert($weight,$from_unit, $to_unit);
+            $weight = weight_convert($weight, $from_unit, $to_unit);
         }
     }
 
@@ -1464,21 +1464,21 @@ 
 
     // We remove old parameters for all keys in $tab
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-    $sql.= " WHERE fk_user = ".$user->id;
-    $sql.= " AND entity = ".$conf->entity;
-    $sql.= " AND param in (";
-    $i=0;
+    $sql .= " WHERE fk_user = ".$user->id;
+    $sql .= " AND entity = ".$conf->entity;
+    $sql .= " AND param in (";
+    $i = 0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
-        $sql.="'".$db->escape($key)."'";
+        if ($i > 0) $sql .= ',';
+        $sql .= "'".$db->escape($key)."'";
         $i++;
     }
-    $sql.= ")";
+    $sql .= ")";
     dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 
-    $resql=$db->query($sql);
-    if (! $resql)
+    $resql = $db->query($sql);
+    if (!$resql)
     {
         dol_print_error($db);
         $db->rollback();
@@ -1491,12 +1491,12 @@ 
         if ($value)
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
-            $sql.= " VALUES (".$user->id.",".$conf->entity.",";
-            $sql.= " '".$db->escape($key)."','".$db->escape($value)."')";
+            $sql .= " VALUES (".$user->id.",".$conf->entity.",";
+            $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
 
             dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
-            $result=$db->query($sql);
-            if (! $result)
+            $result = $db->query($sql);
+            if (!$result)
             {
                 dol_print_error($db);
                 $db->rollback();
@@ -1522,7 +1522,7 @@ 
  *	@param	Translate	$langs			Output language
  *	@return	string						Formated reduction
  */
-function dol_print_reduction($reduction,$langs)
+function dol_print_reduction($reduction, $langs)
 {
     $string = '';
     if ($reduction == 100)
@@ -1531,7 +1531,7 @@ 
     }
     else
     {
-    	$string = vatrate($reduction,true);
+    	$string = vatrate($reduction, true);
     }
 
     return $string;
@@ -1545,7 +1545,7 @@ 
  */
 function version_os()
 {
-    $osversion=php_uname();
+    $osversion = php_uname();
     return $osversion;
 }
 
@@ -1589,18 +1589,18 @@ 
  *  @param  int		    $maxfilenamelength  Max length of value to show
  * 	@return	mixed			    			0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
  */
-function getListOfModels($db,$type,$maxfilenamelength=0)
+function getListOfModels($db, $type, $maxfilenamelength = 0)
 {
-    global $conf,$langs;
-    $liste=array();
-    $found=0;
-    $dirtoscan='';
+    global $conf, $langs;
+    $liste = array();
+    $found = 0;
+    $dirtoscan = '';
 
     $sql = "SELECT nom as id, nom as lib, libelle as label, description as description";
-    $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-    $sql.= " WHERE type = '".$type."'";
-    $sql.= " AND entity IN (0,".$conf->entity.")";
-    $sql.= " ORDER BY description DESC";
+    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+    $sql .= " WHERE type = '".$type."'";
+    $sql .= " AND entity IN (0,".$conf->entity.")";
+    $sql .= " ORDER BY description DESC";
 
     dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
@@ -1610,48 +1610,48 @@ 
         $i = 0;
         while ($i < $num)
         {
-            $found=1;
+            $found = 1;
 
             $obj = $db->fetch_object($resql);
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (!empty($obj->description))	// A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-                $const=$obj->description;
+                $const = $obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
 
-		$listoffiles=array();
+		$listoffiles = array();
 
                 // Now we add models found in directories scanned
-                $listofdir=explode(',',$dirtoscan);
-                foreach($listofdir as $key=>$tmpdir)
+                $listofdir = explode(',', $dirtoscan);
+                foreach ($listofdir as $key=>$tmpdir)
                 {
-                    $tmpdir=trim($tmpdir);
-                    $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-                    if (! $tmpdir) { unset($listofdir[$key]); continue; }
+                    $tmpdir = trim($tmpdir);
+                    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+                    if (!$tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
 			// all type of template is allowed
-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+			$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
                     }
                 }
 
                 if (count($listoffiles))
                 {
-                    foreach($listoffiles as $record)
+                    foreach ($listoffiles as $record)
                     {
-                        $max=($maxfilenamelength?$maxfilenamelength:28);
-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
+                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);
+                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
                 }
                 else
                 {
-                    $liste[0]=$obj->label.': '.$langs->trans("None");
+                    $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
             }
             else
@@ -1660,14 +1660,14 @@ 
                 {
                     global $_Avery_Labels;
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                    foreach($_Avery_Labels as $key => $val)
+                    foreach ($_Avery_Labels as $key => $val)
                     {
-                        $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
+                        $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->lib).' '.$val['name'];
                     }
                 }
                 else    // Common usage
                 {
-                    $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
+                    $liste[$obj->id] = $obj->label ? $obj->label : $obj->lib;
                 }
             }
             $i++;
@@ -1696,10 +1696,10 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
 
 		return 1;
 	}
@@ -1714,12 +1714,12 @@ 
  *  @param  string		$firstname		Firstname
  *	@return	string						Login
  */
-function dol_buildlogin($lastname,$firstname)
+function dol_buildlogin($lastname, $firstname)
 {
-    $login=strtolower(dol_string_unaccent($firstname));
-    $login.=($login?'.':'');
-    $login.=strtolower(dol_string_unaccent($lastname));
-    $login=dol_string_nospecial($login,''); // For special names
+    $login = strtolower(dol_string_unaccent($firstname));
+    $login .= ($login ? '.' : '');
+    $login .= strtolower(dol_string_unaccent($lastname));
+    $login = dol_string_nospecial($login, ''); // For special names
     return $login;
 }
 
@@ -1732,18 +1732,18 @@ 
 {
     global $conf;
 
-    $params=array();
-    $proxyuse =(empty($conf->global->MAIN_PROXY_USE)?false:true);
-    $proxyhost=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_HOST);
-    $proxyport=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PORT);
-    $proxyuser=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_USER);
-    $proxypass=(empty($conf->global->MAIN_PROXY_USE)?false:$conf->global->MAIN_PROXY_PASS);
-    $timeout  =(empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?10:$conf->global->MAIN_USE_CONNECT_TIMEOUT);               // Connection timeout
-    $response_timeout=(empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);    // Response timeout
+    $params = array();
+    $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);
+    $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);
+    $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);
+    $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);
+    $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);
+    $timeout  = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
+    $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
     //print extension_loaded('soap');
     if ($proxyuse)
     {
-        $params=array('connection_timeout'=>$timeout,
+        $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 1,
                       'proxy_host'     => $proxyhost,
@@ -1755,7 +1755,7 @@ 
     }
     else
     {
-        $params=array('connection_timeout'=>$timeout,
+        $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 0,
                       'proxy_host'     => false,
@@ -1778,15 +1778,15 @@ 
  * @param 	string	$option			More options
  * @return	string					URL of link to object id/type
  */
-function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
+function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 {
 	global $db, $conf, $langs;
 
-	$ret='';
+	$ret = '';
 
 	// Parse element/subelement (ex: project_task)
 	$module = $element = $subelement = $objecttype;
-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+	if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 	{
 		$module = $element = $regs[1];
 		$subelement = $regs[2];
@@ -1797,18 +1797,18 @@ 
 	// To work with non standard path
 	if ($objecttype == 'facture' || $objecttype == 'invoice') {
 		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
+		$module = 'facture';
+		$subelement = 'facture';
 	}
 	if ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
+		$module = 'commande';
+		$subelement = 'commande';
 	}
-	if ($objecttype == 'propal')  {
+	if ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
 	}
-	if ($objecttype == 'supplier_proposal')  {
+	if ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
 	}
 	if ($objecttype == 'shipping') {
@@ -1823,33 +1823,33 @@ 
 	}
 	if ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
+		$module = 'contrat';
+		$subelement = 'contrat';
 	}
 	if ($objecttype == 'member') {
 		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
+		$module = 'adherent';
+		$subelement = 'adherent';
 	}
 	if ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
+		$module = 'cabinetmed';
+		$subelement = 'cabinetmedcons';
 	}
 	if ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
+		$module = 'ficheinter';
+		$subelement = 'fichinter';
 	}
 	if ($objecttype == 'task') {
 		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
+		$module = 'projet';
+		$subelement = 'task';
 	}
 	if ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
+		$module = 'stock';
+		$subelement = 'stock';
 	}
 
 	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
@@ -1857,34 +1857,34 @@ 
 	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
 	if ($objecttype == 'invoice_supplier') {
 		$classfile = 'fournisseur.facture';
-		$classname='FactureFournisseur';
+		$classname = 'FactureFournisseur';
 		$classpath = 'fourn/class';
-		$module='fournisseur';
+		$module = 'fournisseur';
 	}
-	elseif ($objecttype == 'order_supplier')   {
+	elseif ($objecttype == 'order_supplier') {
 		$classfile = 'fournisseur.commande';
-		$classname='CommandeFournisseur';
+		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
-		$module='fournisseur';
+		$module = 'fournisseur';
 	}
-	elseif ($objecttype == 'stock')   {
+	elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
-		$classfile='entrepot';
-		$classname='Entrepot';
+		$classfile = 'entrepot';
+		$classname = 'Entrepot';
 	}
-	if (! empty($conf->$module->enabled))
+	if (!empty($conf->$module->enabled))
 	{
-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
 		if ($res)
 		{
 			if (class_exists($classname))
 			{
 				$object = new $classname($db);
-				$res=$object->fetch($objectid);
+				$res = $object->fetch($objectid);
 				if ($res > 0) {
-					$ret=$object->getNomUrl($withpicto,$option);
-				} elseif($res==0) {
-					$ret=$langs->trans('Deleted');
+					$ret = $object->getNomUrl($withpicto, $option);
+				} elseif ($res == 0) {
+					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
 			}
@@ -1905,12 +1905,12 @@ 
  */
 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 {
-	$totalnb=0;
-	$listofid=array();
-	$listofparentid=array();
+	$totalnb = 0;
+	$listofid = array();
+	$listofparentid = array();
 
 	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -1919,8 +1919,8 @@ 
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
-			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			$listofid[] = $obj->rowid;
+			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
 			$i++;
 		}
 	}
@@ -1934,78 +1934,78 @@ 
 		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
 
 		// Check loops on each other
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid"; // So we update only records linked to themself
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				print '<br>Some record that were parent of themself were cleaned.';
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
 		// Check other loops
-		$listofidtoclean=array();
-		foreach($listofparentid as $id => $pid)
+		$listofidtoclean = array();
+		foreach ($listofparentid as $id => $pid)
 		{
 			// Check depth
 			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
 
-			$cursor=$id; $arrayidparsed=array();	// We start from child $id
+			$cursor = $id; $arrayidparsed = array(); // We start from child $id
 			while ($cursor > 0)
 			{
-				$arrayidparsed[$cursor]=1;
+				$arrayidparsed[$cursor] = 1;
 				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
 				{
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
 					unset($arrayidparsed);
-					$listofidtoclean[$cursor]=$id;
+					$listofidtoclean[$cursor] = $id;
 					break;
 				}
-				$cursor=$listofparentid[$cursor];
+				$cursor = $listofparentid[$cursor];
 			}
 
 			if (count($listofidtoclean)) break;
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
+		$sql .= " SET ".$fieldfkparent." = 0";
+		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				// Removed orphelins records
 				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
-				print join(',',$listofidtoclean);
+				print join(',', $listofidtoclean);
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
 		// Check and clean orphelins
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
+		$sql .= " SET ".$fieldfkparent." = 0";
+		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$nb=$db->affected_rows($sql);
+			$nb = $db->affected_rows($sql);
 			if ($nb > 0)
 			{
 				// Removed orphelins records
 				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
-				print join(',',$listofid);
+				print join(',', $listofid);
 			}
 
-			$totalnb+=$nb;
+			$totalnb += $nb;
 		}
 		//else dol_print_error($db);
 
@@ -2026,21 +2026,21 @@ 
     $module = $element = $subelement = $element_type;
 
     // If we ask an resource form external module (instead of default path)
-    if (preg_match('/^([^@]+)@([^@]+)$/i',$element_type,$regs))
+    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))
     {
         $element = $subelement = $regs[1];
         $module 	= $regs[2];
     }
 
     //print '<br>1. element : '.$element.' - module : '.$module .'<br>';
-    if ( preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
     {
         $module = $element = $regs[1];
         $subelement = $regs[2];
     }
 
     // For compat
-    if($element_type == "action") {
+    if ($element_type == "action") {
         $classpath = 'comm/action/class';
         $subelement = 'Actioncomm';
         $module = 'agenda';
@@ -2049,18 +2049,18 @@ 
     // To work with non standard path
     if ($element_type == 'facture' || $element_type == 'invoice') {
         $classpath = 'compta/facture/class';
-        $module='facture';
-        $subelement='facture';
+        $module = 'facture';
+        $subelement = 'facture';
     }
     if ($element_type == 'commande' || $element_type == 'order') {
         $classpath = 'commande/class';
-        $module='commande';
-        $subelement='commande';
+        $module = 'commande';
+        $subelement = 'commande';
     }
-    if ($element_type == 'propal')  {
+    if ($element_type == 'propal') {
         $classpath = 'comm/propal/class';
     }
-    if ($element_type == 'supplier_proposal')  {
+    if ($element_type == 'supplier_proposal') {
         $classpath = 'supplier_proposal/class';
     }
     if ($element_type == 'shipping') {
@@ -2075,45 +2075,45 @@ 
     }
     if ($element_type == 'contract') {
         $classpath = 'contrat/class';
-        $module='contrat';
-        $subelement='contrat';
+        $module = 'contrat';
+        $subelement = 'contrat';
     }
     if ($element_type == 'member') {
         $classpath = 'adherents/class';
-        $module='adherent';
-        $subelement='adherent';
+        $module = 'adherent';
+        $subelement = 'adherent';
     }
     if ($element_type == 'cabinetmed_cons') {
         $classpath = 'cabinetmed/class';
-        $module='cabinetmed';
-        $subelement='cabinetmedcons';
+        $module = 'cabinetmed';
+        $subelement = 'cabinetmedcons';
     }
     if ($element_type == 'fichinter') {
         $classpath = 'fichinter/class';
-        $module='ficheinter';
-        $subelement='fichinter';
+        $module = 'ficheinter';
+        $subelement = 'fichinter';
     }
     if ($element_type == 'dolresource' || $element_type == 'resource') {
         $classpath = 'resource/class';
-        $module='resource';
-        $subelement='dolresource';
+        $module = 'resource';
+        $subelement = 'dolresource';
     }
     if ($element_type == 'propaldet') {
         $classpath = 'comm/propal/class';
-        $module='propal';
-        $subelement='propaleligne';
+        $module = 'propal';
+        $subelement = 'propaleligne';
     }
-    if ($element_type == 'order_supplier')  {
+    if ($element_type == 'order_supplier') {
         $classpath = 'fourn/class';
-        $module='fournisseur';
-        $subelement='commandefournisseur';
-        $classfile='fournisseur.commande';
+        $module = 'fournisseur';
+        $subelement = 'commandefournisseur';
+        $classfile = 'fournisseur.commande';
     }
-    if ($element_type == 'invoice_supplier')  {
+    if ($element_type == 'invoice_supplier') {
         $classpath = 'fourn/class';
-        $module='fournisseur';
-        $subelement='facturefournisseur';
-        $classfile='fournisseur.facture';
+        $module = 'fournisseur';
+        $subelement = 'facturefournisseur';
+        $classfile = 'fournisseur.facture';
     }
 
     if (!isset($classfile)) $classfile = strtolower($subelement);
@@ -2140,10 +2140,10 @@ 
  * @param	ref     	$element_ref 	Element ref (Use this if element_id but not both)
  * @return 	int|object 					object || 0 || -1 if error
  */
-function fetchObjectByElement($element_id, $element_type, $element_ref='')
+function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 {
     global $conf;
-	global $db,$conf;
+	global $db, $conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
@@ -2170,11 +2170,11 @@ 
  *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'
  *  @see	colorStringToArray
  */
-function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
+	if (!is_array($arraycolor)) return $colorifnotfound;
 	if (empty($arraycolor)) return $colorifnotfound;
-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
+	return sprintf("%02s", dechex($arraycolor[0])).sprintf("%02s", dechex($arraycolor[1])).sprintf("%02s", dechex($arraycolor[2]));
 }
 
 /**
@@ -2187,17 +2187,17 @@ 
  *  @return	string						RGB hex value (without # before). For example: FF00FF
  *  @see	colorArrayToHex
  */
-function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
-	if (! $tmp)
+	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is
+	$tmp = preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/', $stringcolor, $reg);
+	if (!$tmp)
 	{
-		$tmp=explode(',',$stringcolor);
+		$tmp = explode(',', $stringcolor);
 		if (count($tmp) < 3) return $colorifnotfound;
 		return $tmp;
 	}
-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+	return array(hexdec($reg[1]), hexdec($reg[2]), hexdec($reg[3]));
 }
 
 /**
@@ -2217,8 +2217,8 @@ 
     foreach ($input as $key => $values) {
         $append = array();
 
-        foreach($result as $product) {
-            foreach($values as $item) {
+        foreach ($result as $product) {
+            foreach ($values as $item) {
                 $product[$key] = $item;
                 $append[] = $product;
             }
@@ -2239,8 +2239,8 @@ 
  */
 function getModuleDirForApiClass($module)
 {
-    $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    $moduledirforclass = $module;
+    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
@@ -2316,9 +2316,9 @@ 
  * @param	$max	int	Between 0 and 255
  * @return String
  */
-function random_color_part($min=0,$max=255)
+function random_color_part($min = 0, $max = 255)
 {
-    return str_pad( dechex( mt_rand( $min, $max) ), 2, '0', STR_PAD_LEFT);
+    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);
 }
 
 /*
@@ -2328,7 +2328,7 @@ 
  * @param	$max	int	Between 0 and 255
  * @return String
  */
-function random_color($min=0, $max=255)
+function random_color($min = 0, $max = 255)
 {
-    return random_color_part($min, $max) . random_color_part($min, $max) . random_color_part($min, $max);
+    return random_color_part($min, $max).random_color_part($min, $max).random_color_part($min, $max);
 }

Braces +696 added lines, -349 removed lines

@@ -55,8 +55,7 @@ 
                 $entity = "&#". $unicode . ';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -97,7 +96,10 @@ 
         {
             while (($file = readdir($handle))!==false)
             {
-                if (preg_match('/disabled/',$file)) continue;   // We discard module if it contains disabled into name.
+                if (preg_match('/disabled/',$file)) {
+                    continue;
+                }
+                // We discard module if it contains disabled into name.
 
                 if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
                 {
@@ -129,8 +131,14 @@ 
     	$outputlangs=$langs;
     }
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected='USLetter';    // US
+    if ($outputlangs->defaultlang == 'ca_CA') {
+        $selected='CAP4';
+    }
+    // Canada
+    if ($outputlangs->defaultlang == 'en_US') {
+        $selected='USLetter';
+    }
+    // US
     return $selected;
 }
 
@@ -155,29 +163,42 @@ 
         {
             $content=file_get_contents($formfile);
             $isutf8=utf8_check($content);
-            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-            else print $content;
+            if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                print utf8_encode($content);
+            } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                print utf8_decode($content);
+            } else {
+                print $content;
+            }
             return true;
+        } else {
+            dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            if ($langs->defaultlang != "en_US") {
+                $formfilealt = $searchdir."/langs/en_US/".$filename;
+            } else {
+                $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+            }
             dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
             //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
             if (is_readable($formfilealt))
             {
                 $content=file_get_contents($formfilealt);
                 $isutf8=utf8_check($content);
-                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-                else print $content;
+                if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') {
+                    print utf8_encode($content);
+                } elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+                    print utf8_decode($content);
+                } else {
+                    print $content;
+                }
                 return true;
+            } else {
+                dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
             }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
     }
 
@@ -207,279 +228,460 @@ 
     $deltadateforuser=round($deltadateforclient-$deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-    if ($usetable) print '<table class="border centpercent">';
+    if ($usetable) {
+        print '<table class="border centpercent">';
+    }
 
     // Import key
     if (! empty($object->import_key))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ImportedWithSet");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print $object->import_key;
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User creation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_creation) || ! empty($object->user_creation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("CreatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_creation->id) {
+        	    print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date creation
     if (! empty($object->date_creation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateCreation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User change (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_modification) || ! empty($object->user_modification_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ModifiedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+        	if ($object->user_modification->id) {
+        	    print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+        	} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) {
+                print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date change
     if (! empty($object->date_modification))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastModification");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User validation (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_validation) || ! empty($object->user_validation_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ValidatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_validation))
         {
-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_validation->id) {
+                print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date validation
     if (! empty($object->date_validation))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateValidation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve (old method using already loaded object and not id is kept for backward compatibility)
     if (! empty($object->user_approve) || ! empty($object->user_approve_id))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_approve))
         {
-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+            if ($object->user_approve->id) {
+                print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+            } else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date approve
     if (! empty($object->date_approve))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User approve
     if (! empty($object->user_approve_id2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         $userstatic=new User($db);
         $userstatic->fetch($object->user_approve_id2);
-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        else print $langs->trans("Unknown");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($userstatic->id) {
+            print $userstatic->getNomUrl(1, '', 0, 0, 0);
+        } else {
+            print $langs->trans("Unknown");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date approve
     if (! empty($object->date_approve2))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateApprove2");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User close
     if (! empty($object->user_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ClosedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_cloture->id) {
+			    print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date close
     if (! empty($object->date_cloture))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateClosing");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // User conciliate
     if (! empty($object->user_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("ConciliatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
+			if ($object->user_rappro->id) {
+			    print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        } else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+			    print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+        	    print $langs->trans("Unknown");
+        	}
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
         }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
     }
 
     // Date conciliate
     if (! empty($object->date_rappro))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateConciliating");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
     // Date send
     if (! empty($object->date_envoi))
     {
-        if ($usetable) print '<tr><td class="titlefield">';
+        if ($usetable) {
+            print '<tr><td class="titlefield">';
+        }
         print $langs->trans("DateLastSend");
-        if ($usetable) print '</td><td>';
-        else print ': ';
+        if ($usetable) {
+            print '</td><td>';
+        } else {
+            print ': ';
+        }
         print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
+        if ($deltadateforuser) {
+            print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi+($deltadateforuser*3600),"dayhour").' &nbsp;'.$langs->trans("ClientHour");
+        }
+        if ($usetable) {
+            print '</td></tr>';
+        } else {
+            print '<br>';
+        }
     }
 
-    if ($usetable) print '</table>';
-}
+    if ($usetable) {
+        print '</table>';
+    }
+    }
 
 
 /**
@@ -508,8 +710,7 @@ 
     if (checkdnsrr($domain, "MX"))
     {
         return true;
-    }
-    else
+    } else
     {
         return false;
     }
@@ -534,10 +735,14 @@ 
     $urlregex = '';
 
     // SCHEME
-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+    if ($http) {
+        $urlregex .= "^(http:\/\/|https:\/\/)";
+    }
 
     // USER AND PASS
-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    if ($pass) {
+        $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+    }
 
     // HOSTNAME OR IP
     //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
@@ -546,13 +751,21 @@ 
     //use only one of the above
 
     // PORT
-    if ($port) $urlregex .= "(\:[0-9]{2,5})";
+    if ($port) {
+        $urlregex .= "(\:[0-9]{2,5})";
+    }
     // PATH
-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    if ($path) {
+        $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+    }
     // GET Query
-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    if ($query) {
+        $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+    }
     // ANCHOR
-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    if ($anchor) {
+        $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+    }
 
     // check
     if (preg_match('/'.$urlregex.'/i', $url))
@@ -600,9 +813,10 @@ 
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain,'/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
+    } else {
+        return $url;
+    }
     }
-    else return $url;
-}
 
 
 
@@ -619,7 +833,9 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
+	if(!isValidEmail($mail)) {
+	    return '';
+	}
 	$tab = explode('@', $mail);
 	$tab2 = explode('.',$tab[1]);
 	$string_replace = '';
@@ -681,7 +897,9 @@ 
 function array2table($data,$tableMarkup=1,$tableoptions='',$troptions='',$tdoptions='')
 {
     $text='' ;
-    if($tableMarkup) $text = '<table '.$tableoptions.'>' ;
+    if($tableMarkup) {
+        $text = '<table '.$tableoptions.'>' ;
+    }
     foreach($data as $key => $item){
         if(is_array($item)){
             $text.=array2tr($item,$troptions,$tdoptions);
@@ -692,7 +910,9 @@ 
             $text.= '</tr>' ;
         }
     }
-    if($tableMarkup) $text.= '</table>' ;
+    if($tableMarkup) {
+        $text.= '</table>' ;
+    }
     return $text ;
 }
 
@@ -716,15 +936,25 @@ 
 {
     global $conf,$user;
 
-    if (! is_object($objsoc)) $valueforccc=$objsoc;
-    else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) $valueforccc=$objsoc->code_fournisseur;
-    else $valueforccc=$objsoc->code_client;
+    if (! is_object($objsoc)) {
+        $valueforccc=$objsoc;
+    } else if ($table == "commande_fournisseur" || $table == "facture_fourn" ) {
+        $valueforccc=$objsoc->code_fournisseur;
+    } else {
+        $valueforccc=$objsoc->code_client;
+    }
 
     $sharetable = $table;
-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+    if ($table == 'facture' || $table == 'invoice') {
+        $sharetable = 'invoicenumber';
+    }
+    // for getEntity function
 
     // Clean parameters
-    if ($date == '') $date=dol_now();	// We use local year and month of PHP server to search numbers
+    if ($date == '') {
+        $date=dol_now();
+    }
+    // We use local year and month of PHP server to search numbers
     // but we should use local year and month of user
 
     // For debugging
@@ -741,8 +971,7 @@ 
         $masktri=$reg[1].(! empty($reg[2])?$reg[2]:'').(! empty($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -752,7 +981,9 @@ 
     $maskraz=-1;
     $maskoffset=0;
     $resetEveryMonth=false;
-    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -764,9 +995,12 @@ 
         $maskrefclient_clientcode=substr($valueforccc,0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code where n is length in mask
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -780,8 +1014,7 @@ 
         $masktype=$regType[1];
         $masktype_value=substr(preg_replace('/^TE_/','',$objsoc->typent_code),0,dol_strlen($regType[1]));// get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value=str_pad($masktype_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$masktype='';
     	$masktype_value='';
@@ -791,13 +1024,14 @@ 
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
     	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+    	if (is_object($objuser)) {
+    	    $lastname = $objuser->lastname;
+    	}
 
     	$maskuser=$regType[1];
     	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
     	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
-    }
-    else
+    } else
     {
     	$maskuser='';
     	$maskuser_value='';
@@ -844,8 +1078,12 @@ 
     //var_dump($reg);
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
     $sqlwhere='';
@@ -853,14 +1091,21 @@ 
     $yearoffsettype=false;		// false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))	$yearoffsettype = preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))	$yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $yearoffsettype = preg_replace('/^@/','',$reg[3]);
+    }
 
     //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz=$yearoffsettype; // For backward compatibility
-    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
+            $maskraz=$yearoffsettype;
+    }
+    // For backward compatibility
+    else if ($yearoffsettype === '0' || (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
+            $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+    }
     //print "maskraz=".$maskraz;	// -1=no reset
 
     if ($maskraz > 0) {   // A reset is required
@@ -868,23 +1113,28 @@ 
             $maskraz = date('m', $date);
             $resetEveryMonth = true;
         }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define posy, posm and reg
-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
+        if ($maskraz > 1) {
+            // if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-
-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2;
         }
-        else // if reset is for a specific month in year, we need year
+        $posm=3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else {
+                return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            }
+
+            if (dol_strlen($reg[$posy]) < 2) {
+                return 'ErrorCantUseRazWithYearOnOneDigit';
+            }
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
-            else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; } else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; } else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; } else {
+                return 'ErrorCantUseRazIfNoYearInMask';
+            }
         }
         // Define length
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
@@ -902,9 +1152,11 @@ 
         $monthcomp=$maskraz;
         $yearcomp=0;
 
-        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+            // $yearoffsettype is - or +
         {
         	$currentyear=date("Y", $date);
+        }
         	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
         	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
         	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
@@ -914,21 +1166,32 @@ 
         	if ($date >= $fiscaldate)
         	{
         		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+        		if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+        		    $yearoffset=1;
+        		}
         	}
         	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+        	else if ($date >= $newyeardate && $yearoffsettype == '-') {
+        	    $yearoffset=-1;
+        	}
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
 
-        if ($yearlen == 4) $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
-        elseif ($yearlen == 2) $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
-        elseif ($yearlen == 1) $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+        if ($yearlen == 4) {
+            $yearcomp=sprintf("%04d",date("Y",$date)+$yearoffset);
+        } elseif ($yearlen == 2) {
+            $yearcomp=sprintf("%02d",date("y",$date)+$yearoffset);
+        } elseif ($yearlen == 1) {
+            $yearcomp=substr(date("y",$date),2,1)+$yearoffset;
+        }
+        if ($monthcomp > 1 && empty($resetEveryMonth)) {
+            // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
         {
             if ($yearlen == 4) $yearcomp1=sprintf("%04d",date("Y",$date)+$yearoffset+1);
-            elseif ($yearlen == 2) $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+        } elseif ($yearlen == 2) {
+                $yearcomp1=sprintf("%02d",date("y",$date)+$yearoffset+1);
+            }
 
             $sqlwhere.="(";
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
@@ -937,13 +1200,11 @@ 
             $sqlwhere.=" (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
-        }
-		else if ($resetEveryMonth)
+        } else if ($resetEveryMonth)
 		{
 			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
+		} else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -955,12 +1216,13 @@ 
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
+	} else
 	{
     	$posnumstart=strrpos($maskwithnocode,$maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    if ($posnumstart < 0) {
+        return 'ErrorBadMaskFailedToLocatePosOfSequence';
+    }
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
     // Define $maskLike
@@ -973,9 +1235,15 @@ 
     $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
     $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
     $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),str_pad("",dol_strlen($maskcounter),"_"),$maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    if ($maskrefclient) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+    }
+    if ($masktype) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+    }
+    if ($maskuser) {
+        $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+    }
     foreach($maskperso as $key => $val)
     {
     	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
@@ -987,12 +1255,18 @@ 
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
 	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
-    if ($bentityon) // only if entity enable
+    if ($bentityon) {
+        // only if entity enable
     	$sql.= " AND entity IN (".getEntity($sharetable).")";
-    else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
-    if ($where) $sql.=$where;
-    if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    } else if (! empty($forceentity)) {
+        	$sql.= " AND entity IN (".$forceentity.")";
+    }
+    if ($where) {
+        $sql.=$where;
+    }
+    if ($sqlwhere) {
+        $sql.=' AND '.$sqlwhere;
+    }
 
     //print $sql.'<br>';
     dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
@@ -1001,21 +1275,26 @@ 
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
+    } else {
+        dol_print_error($db);
     }
-    else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter=$maskoffset;
-    else if (preg_match('/[^0-9]/i',$counter))
+    if (empty($counter)) {
+        $counter=$maskoffset;
+    } else if (preg_match('/[^0-9]/i',$counter))
     {
     	$counter=0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+    } else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+        $counter=$maskoffset;
     }
-    else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
-    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
+    if ($mode == 'last') {
+        // We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
         $counterpadded=str_pad($counter,dol_strlen($maskcounter),"0",STR_PAD_LEFT);
+    }
 
         // Define $maskLike
         $maskLike = dol_string_nospecial($mask);
@@ -1027,34 +1306,48 @@ 
         $maskLike = preg_replace('/\{mm\}/i','__',$maskLike);
         $maskLike = preg_replace('/\{dd\}/i','__',$maskLike);
         $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'),$counterpadded,$maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        if ($maskrefclient) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",dol_strlen($maskrefclient),"_"),$maskLike);
+        }
+        if ($masktype) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'),$masktype_value,$maskLike);
+        }
+        if ($maskuser) {
+            $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
+        }
 
         $ref='';
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
+    	if ($bentityon) {
+    	    // only if entity enable
         	$sql.= " AND entity IN (".getEntity($sharetable).")";
-        else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
-        if ($where) $sql.=$where;
-        if ($sqlwhere) $sql.=' AND '.$sqlwhere;
+    	} else if (! empty($forceentity)) {
+                	$sql.= " AND entity IN (".$forceentity.")";
+        }
+        if ($where) {
+            $sql.=$where;
+        }
+        if ($sqlwhere) {
+            $sql.=' AND '.$sqlwhere;
+        }
 
         dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
-            if ($obj) $ref = $obj->ref;
+            if ($obj) {
+                $ref = $obj->ref;
+            }
+        } else {
+            dol_print_error($db);
         }
-        else dol_print_error($db);
 
         $numFinal=$ref;
-    }
-    else if ($mode == 'next')
+    } else if ($mode == 'next')
     {
         $counter++;
 
@@ -1070,7 +1363,9 @@ 
 
             // Define $sqlstring
             $maskrefclient_posnumstart=strpos($maskwithnocode,$maskrefclient_maskcounter,strpos($maskwithnocode,$maskrefclient));	// Pos of counter in final string (from 0 to ...)
-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+            if ($maskrefclient_posnumstart <= 0) {
+                return 'ErrorBadMask';
+            }
             $maskrefclient_sqlstring='SUBSTRING('.$field.', '.($maskrefclient_posnumstart+1).', '.dol_strlen($maskrefclient_maskcounter).')';
             //print "x".$sqlstring;
 
@@ -1092,12 +1387,20 @@ 
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            if ($bentityon) // only if entity enable
+            if ($bentityon) {
+                // only if entity enable
             	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
-            else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
+            } else if (! empty($forceentity)) {
+                        	$sql.= " AND entity IN (".$forceentity.")";
+            }
+            if ($where) {
+                $maskrefclient_sql.=$where;
+            }
+            //use the same optional where as general mask
+            if ($sqlwhere) {
+                $maskrefclient_sql.=' AND '.$sqlwhere;
+            }
+            //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
             dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
@@ -1106,10 +1409,13 @@ 
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
+            } else {
+                dol_print_error($db);
             }
-            else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
+            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) {
+                $maskrefclient_counter=$maskrefclient_maskoffset;
+            }
 			$maskrefclient_counter++;
         }
 
@@ -1117,13 +1423,14 @@ 
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=') {
+		    // yearoffsettype is - or +, so we don't want current year
 		{
 	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+		}
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+		} else	// we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
@@ -1180,7 +1487,9 @@ 
 {
     $string = " ".$string;
      $ini = strpos($string,$start);
-     if ($ini == 0) return "";
+     if ($ini == 0) {
+         return "";
+     }
      $ini += strlen($start);
      $len = strpos($string,$end,$ini) - $ini;
      return substr($string,$ini,$len);
@@ -1204,8 +1513,7 @@ 
         $masktri=$reg[1].(isset($reg[2])?$reg[2]:'').(isset($reg[3])?$reg[3]:'');
         $maskcounter=$reg[1];
         $hasglobalcounter=true;
-    }
-    else
+    } else
     {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri='00000';
@@ -1214,7 +1522,9 @@ 
 
     $maskraz=-1;
     $maskoffset=0;
-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+    if (dol_strlen($maskcounter) < 3) {
+        return 'ErrorCounterMustHaveMoreThan3Digits';
+    }
 
     // Extract value for third party mask counter
     if (preg_match('/\{(c+)(0*)\}/i',$mask,$regClientRef))
@@ -1226,9 +1536,12 @@ 
         $maskrefclient_clientcode=substr('',0,dol_strlen($maskrefclient_maskclientcode));//get n first characters of client code to form maskrefclient_clientcode
         $maskrefclient_clientcode=str_pad($maskrefclient_clientcode,dol_strlen($maskrefclient_maskclientcode),"#",STR_PAD_RIGHT);//padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode=dol_string_nospecial($maskrefclient_clientcode);//sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+            return 'ErrorCounterMustHaveMoreThan3Digits';
+        }
+    } else {
+        $maskrefclient='';
     }
-    else $maskrefclient='';
 
     // fail if there is neither a global nor a third party counter
     if (! $hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1250,21 +1563,35 @@ 
     //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
     // If an offset is asked
-    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) {
+        $maskoffset=preg_replace('/^\+/','',$reg[3]);
+    }
 
     // Define $sqlwhere
 
     // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (! empty($reg[2]) && preg_match('/^@/',$reg[2]))  $maskraz=preg_replace('/^@/','',$reg[2]);
-    if (! empty($reg[3]) && preg_match('/^@/',$reg[3]))  $maskraz=preg_replace('/^@/','',$reg[3]);
+    if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) {
+        $maskraz=preg_replace('/^@/','',$reg[2]);
+    }
+    if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) {
+        $maskraz=preg_replace('/^@/','',$reg[3]);
+    }
     if ($maskraz >= 0)
     {
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+        if ($maskraz > 12) {
+            return 'ErrorBadMaskBadRazMonth';
+        }
 
         // Define reg
-        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+        if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+        }
+        if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) {
+            return 'ErrorCantUseRazIfNoYearInMask';
+        }
         //print "x".$maskwithonlyymcode." ".$maskraz;
     }
     //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
@@ -1274,7 +1601,9 @@ 
 
     // Check length
     $len=dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result=-1;
+    if (dol_strlen($value) != $len) {
+        $result=-1;
+    }
 
     // Define $maskLike
     /* seems not used
@@ -1355,29 +1684,37 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) // Dimanche
+    if (date("w",mktime(12,0,0,$mois,$jour,$annee))==0) {
+        // Dimanche
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-3*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))<4) {
+        // du Lundi au Mercredi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)+(4-date("w",mktime(12,0,0,$mois,$jour,$annee)))*24*60*60;
-    else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,$mois,$jour,$annee))>4) {
+        // du Vendredi au Samedi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee)-(date("w",mktime(12,0,0,$mois,$jour,$annee))-4)*24*60*60;
-    else // Jeudi
+    } else {
+        // Jeudi
     $jeudiSemaine = mktime(12,0,0,$mois,$jour,$annee);
+    }
 
     // Definition du premier Jeudi de l'annee
-    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) // Dimanche
+    if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==0) {
+        // Dimanche
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+4*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) // du Lundi au Mercredi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))<4) {
+        // du Lundi au Mercredi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(4-date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine))))*24*60*60;
     }
-    else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) // du Vendredi au Samedi
+    } else if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))>4) {
+        // du Vendredi au Samedi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine))+(7-(date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))-4))*24*60*60;
     }
-    else // Jeudi
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
     }
@@ -1398,8 +1735,7 @@ 
         if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
         {
             $numeroSemaine = 53;
-        }
-        else
+        } else
         {
             $numeroSemaine = 1;
         }
@@ -1458,7 +1794,9 @@ 
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
     // Verification parametres
-    if (count($tab) < 1) return -1;
+    if (count($tab) < 1) {
+        return -1;
+    }
 
     $db->begin();
 
@@ -1470,7 +1808,9 @@ 
     $i=0;
     foreach ($tab as $key => $value)
     {
-        if ($i > 0) $sql.=',';
+        if ($i > 0) {
+            $sql.=',';
+        }
         $sql.="'".$db->escape($key)."'";
         $i++;
     }
@@ -1504,8 +1844,7 @@ 
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
+        } else
         {
             unset($user->conf->$key);
         }
@@ -1528,8 +1867,7 @@ 
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else
+    } else
     {
     	$string = vatrate($reduction,true);
     }
@@ -1616,9 +1954,11 @@ 
 
             // If this generation module needs to scan a directory, then description field is filled
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (! empty($obj->description))	// A list of directories to scan is defined
+            if (! empty($obj->description)) {
+                // A list of directories to scan is defined
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            }
 
                 $const=$obj->description;
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
@@ -1637,7 +1977,9 @@ 
                     {
 			// all type of template is allowed
 			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        if (count($tmpfiles)) {
+                            $listoffiles=array_merge($listoffiles,$tmpfiles);
+                        }
                     }
                 }
 
@@ -1648,40 +1990,41 @@ 
                         $max=($maxfilenamelength?$maxfilenamelength:28);
                         $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
                     }
-                }
-                else
+                } else
                 {
                     $liste[0]=$obj->label.': '.$langs->trans("None");
                 }
-            }
-            else
+            } else
             {
-                if ($type == 'member' && $obj->lib == 'standard')   // Special case, if member template, we add variant per format
+                if ($type == 'member' && $obj->lib == 'standard') {
+                    // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
+                }
                     include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
                     foreach($_Avery_Labels as $key => $val)
                     {
                         $liste[$obj->id.':'.$key]=($obj->label?$obj->label:$obj->lib).' '.$val['name'];
                     }
-                }
-                else    // Common usage
+                } else    // Common usage
                 {
                     $liste[$obj->id]=$obj->label?$obj->label:$obj->lib;
                 }
             }
             $i++;
         }
-    }
-    else
+    } else
     {
         dol_print_error($db);
         return -1;
     }
 
-    if ($found) return $liste;
-    else return 0;
-}
+    if ($found) {
+        return $liste;
+    } else {
+        return 0;
+    }
+    }
 
 /**
  * This function evaluates a string that should be a valid IPv4
@@ -1696,10 +2039,14 @@ 
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
 		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+		    return 2;
+		}
 
 		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+		    return 0;
+		}
 
 		return 1;
 	}
@@ -1752,8 +2099,7 @@ 
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else
+    } else
     {
         $params=array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
@@ -1860,14 +2206,12 @@ 
 		$classname='FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
+	} elseif ($objecttype == 'order_supplier')   {
 		$classfile = 'fournisseur.commande';
 		$classname='CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
+	} elseif ($objecttype == 'stock')   {
 		$classpath = 'product/stock/class';
 		$classfile='entrepot';
 		$classname='Entrepot';
@@ -1887,8 +2231,9 @@ 
 					$ret=$langs->trans('Deleted');
 				}
 				unset($object);
+			} else {
+			    dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1920,11 +2265,12 @@ 
 		{
 			$obj = $db->fetch_object($resql);
 			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+			if ($obj->parent_id > 0) {
+			    $listofparentid[$obj->rowid]=$obj->parent_id;
+			}
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -1959,9 +2305,11 @@ 
 			while ($cursor > 0)
 			{
 				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+				if ($arrayidparsed[$listofparentid[$cursor]]) {
+				    // We detect a loop. A record with a parent that was already into child
 				{
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+				}
 					unset($arrayidparsed);
 					$listofidtoclean[$cursor]=$id;
 					break;
@@ -1969,7 +2317,9 @@ 
 				$cursor=$listofparentid[$cursor];
 			}
 
-			if (count($listofidtoclean)) break;
+			if (count($listofidtoclean)) {
+			    break;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
@@ -2116,9 +2466,15 @@ 
         $classfile='fournisseur.facture';
     }
 
-    if (!isset($classfile)) $classfile = strtolower($subelement);
-    if (!isset($classname)) $classname = ucfirst($subelement);
-    if (!isset($classpath)) $classpath = $module.'/class';
+    if (!isset($classfile)) {
+        $classfile = strtolower($subelement);
+    }
+    if (!isset($classname)) {
+        $classname = ucfirst($subelement);
+    }
+    if (!isset($classpath)) {
+        $classpath = $module.'/class';
+    }
 
     $element_properties = array(
         'module' => $module,
@@ -2172,8 +2528,12 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
+	if (! is_array($arraycolor)) {
+	    return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+	    return $colorifnotfound;
+	}
 	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
@@ -2189,12 +2549,17 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	if (is_array($stringcolor)) {
+	    return $stringcolor;
+	}
+	// If already into correct output format, we return as is
 	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
 	if (! $tmp)
 	{
 		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
+		if (count($tmp) < 3) {
+		    return $colorifnotfound;
+		}
 		return $tmp;
 	}
 	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
@@ -2240,69 +2605,51 @@ 
 function getModuleDirForApiClass($module)
 {
     $moduledirforclass=$module;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    if ($moduledirforclass != 'api') {
+        $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
+    }
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
     	$moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
     }
 

dolibarr/htdocs/core/lib/stock.lib.php

Indentation +16 added lines, -16 removed lines

@@ -29,29 +29,29 @@ 
  */
 function stock_prepare_head($object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("StockMovements");
-	$head[$h][2] = 'movements';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("StockMovements");
+    $head[$h][2] = 'movements';
+    $h++;
 
-	/*
+    /*
 	$head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche-valo.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("EnhancedValue");
 	$head[$h][2] = 'value';
 	$h++;
 	*/
 
-	/* Disabled because will never be implemented. Table always empty.
+    /* Disabled because will never be implemented. Table always empty.
 	if (! empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
 	{
 		// Should not be enabled by defaut because does not work yet correctly because
@@ -70,9 +70,9 @@ 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'stock');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'stock','remove');
 

Spacing +2 added lines, -2 removed lines

@@ -67,14 +67,14 @@
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'stock');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'stock','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
 
     return $head;
 }

dolibarr/htdocs/core/lib/salaries.lib.php

Indentation +21 added lines, -21 removed lines

@@ -27,15 +27,15 @@ 
 function salaries_prepare_head($object)
 {
 
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -43,23 +43,23 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
 
-	return $head;
+    return $head;
 }

Spacing +6 added lines, -6 removed lines

@@ -41,16 +41,16 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -59,7 +59,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove');
 
 	return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/signature.lib.php

Indentation +42 added lines, -42 removed lines

@@ -26,18 +26,18 @@ 
  */
 function showOnlineSignatureUrl($type,$ref)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array("payment","paybox"));
 
-	$servicename='Online';
+    $servicename='Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature",$servicename).'<br>';
-	$url = getOnlineSignatureUrl(0, $type, $ref);
-	$out.= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinesignatureurl", 0);
-	return $out;
+    $out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature",$servicename).'<br>';
+    $url = getOnlineSignatureUrl(0, $type, $ref);
+    $out.= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
+    $out.= ajax_autoselect("onlinesignatureurl", 0);
+    return $out;
 }
 
 
@@ -51,45 +51,45 @@ 
  */
 function getOnlineSignatureUrl($mode, $type, $ref='')
 {
-	global $conf, $db, $langs;
+    global $conf, $db, $langs;
 
-	$ref=str_replace(' ','',$ref);
-	$out='';
+    $ref=str_replace(' ','',$ref);
+    $out='';
 
-	if ($type == 'proposal')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='proposal_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if ($mode == 1) $out.='&hashp=<font color="#666666">hash_of_file</font>';
-		else
-		{
-			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$propaltmp=new Propal($db);
-			$res = $propaltmp->fetch(0, $ref);
-			if ($res <= 0) return 'FailedToGetProposal';
+    if ($type == 'proposal')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='proposal_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if ($mode == 1) $out.='&hashp=<font color="#666666">hash_of_file</font>';
+        else
+        {
+            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+            $propaltmp=new Propal($db);
+            $res = $propaltmp->fetch(0, $ref);
+            if ($res <= 0) return 'FailedToGetProposal';
 
-			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-			$ecmfile=new EcmFiles($db);
+            include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+            $ecmfile=new EcmFiles($db);
 
-			$ecmfile->fetch(0, '', $propaltmp->last_main_doc);
+            $ecmfile->fetch(0, '', $propaltmp->last_main_doc);
 
-			$hashp=$ecmfile->share;
-			if (empty($hashp))
-			{
-				$out = $langs->trans("FeatureOnlineSignDisabled");
-				return $out;
-			}
-			else
-			{
-				$out.='&hashp='.$hashp;
-			}
-		}
-	}
+            $hashp=$ecmfile->share;
+            if (empty($hashp))
+            {
+                $out = $langs->trans("FeatureOnlineSignDisabled");
+                return $out;
+            }
+            else
+            {
+                $out.='&hashp='.$hashp;
+            }
+        }
+    }
 
-	// For multicompany
-	if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+    // For multicompany
+    if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
-	return $out;
+    return $out;
 }

Spacing +19 added lines, -19 removed lines

@@ -24,19 +24,19 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlineSignatureUrl($type,$ref)
+function showOnlineSignatureUrl($type, $ref)
 {
 	global $conf, $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("payment","paybox"));
+    $langs->loadLangs(array("payment", "paybox"));
 
-	$servicename='Online';
+	$servicename = 'Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature",$servicename).'<br>';
+	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'<br>';
 	$url = getOnlineSignatureUrl(0, $type, $ref);
-	$out.= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinesignatureurl", 0);
+	$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
+	$out .= ajax_autoselect("onlinesignatureurl", 0);
 	return $out;
 }
 
@@ -49,33 +49,33 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function getOnlineSignatureUrl($mode, $type, $ref='')
+function getOnlineSignatureUrl($mode, $type, $ref = '')
 {
 	global $conf, $db, $langs;
 
-	$ref=str_replace(' ','',$ref);
-	$out='';
+	$ref = str_replace(' ', '', $ref);
+	$out = '';
 
 	if ($type == 'proposal')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='proposal_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if ($mode == 1) $out.='&hashp=<font color="#666666">hash_of_file</font>';
+		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'proposal_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
 		else
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$propaltmp=new Propal($db);
+			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
 			if ($res <= 0) return 'FailedToGetProposal';
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-			$ecmfile=new EcmFiles($db);
+			$ecmfile = new EcmFiles($db);
 
 			$ecmfile->fetch(0, '', $propaltmp->last_main_doc);
 
-			$hashp=$ecmfile->share;
+			$hashp = $ecmfile->share;
 			if (empty($hashp))
 			{
 				$out = $langs->trans("FeatureOnlineSignDisabled");
@@ -83,13 +83,13 @@ 
 			}
 			else
 			{
-				$out.='&hashp='.$hashp;
+				$out .= '&hashp='.$hashp;
 			}
 		}
 	}
 
 	// For multicompany
-	if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
 	return $out;
 }

Braces +17 added lines, -8 removed lines

@@ -59,16 +59,23 @@ 
 	if ($type == 'proposal')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='proposal_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='proposal_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
-		if ($mode == 1) $out.='&hashp=<font color="#666666">hash_of_file</font>';
-		else
+		if ($mode == 1) {
+		    $out.='&hashp=<font color="#666666">hash_of_file</font>';
+		} else
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp=new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
-			if ($res <= 0) return 'FailedToGetProposal';
+			if ($res <= 0) {
+			    return 'FailedToGetProposal';
+			}
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile=new EcmFiles($db);
@@ -80,8 +87,7 @@ 
 			{
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
-			}
-			else
+			} else
 			{
 				$out.='&hashp='.$hashp;
 			}
@@ -89,7 +95,10 @@ 
 	}
 
 	// For multicompany
-	if (! empty($out)) $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (! empty($out)) {
+	    $out.="&entity=".$conf->entity;
+	}
+	// Check the entity because He may be the same reference in several entities
 
 	return $out;
 }

dolibarr/htdocs/core/lib/bank.lib.php

Indentation +62 added lines, -62 removed lines

@@ -67,27 +67,27 @@ 
 
     if ($object->courant != Account::TYPE_CASH)
     {
-    	$nbReceipts=0;
-
-    	// List of all standing receipts
-    	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-    	$sql.= " WHERE b.fk_account = ".$object->id;
-
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj) $nbReceipts = $obj->nb;
-    		$db->free($resql);
-    	}
-
-    	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
-	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
-	    $head[$h][2] = 'statement';
-	    $h++;
-	}
+        $nbReceipts=0;
+
+        // List of all standing receipts
+        $sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+        $sql.= " WHERE b.fk_account = ".$object->id;
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $nbReceipts = $obj->nb;
+            $db->free($resql);
+        }
+
+        $head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
+        $head[$h][1] = $langs->trans("AccountStatements");
+        if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
+        $head[$h][2] = 'statement';
+        $h++;
+    }
 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -101,7 +101,7 @@ 
     $head[$h][2] = 'document';
     $h++;
 
-	// Show more tabs from modules
+    // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
@@ -112,7 +112,7 @@ 
     $head[$h][2] = 'info';
     $h++;*/
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
     return $head;
 }
@@ -124,14 +124,14 @@ 
  */
 function bank_admin_prepare_head($object)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT . '/admin/chequereceipts.php';
     $head[$h][1] = $langs->trans("CheckReceiptShort");
@@ -139,20 +139,20 @@ 
     $h++;
 
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -164,15 +164,15 @@ 
 function various_payment_prepare_head($object)
 {
 
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -180,25 +180,25 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**

Spacing +27 added lines, -27 removed lines

@@ -37,42 +37,42 @@ 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'bankname';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/bankentries_list.php?id=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
     $head[$h][1] = $langs->trans("BankTransactions");
     $head[$h][2] = 'journal';
     $h++;
 
 //    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
 //	{
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/treso.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
     $head[$h][1] = $langs->trans("PlannedTransactions");
     $head[$h][2] = 'cash';
     $h++;
 //	}
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/annuel.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
     $head[$h][1] = $langs->trans("IOMonthlyReporting");
     $head[$h][2] = 'annual';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/graph.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
     $head[$h][1] = $langs->trans("Graph");
     $head[$h][2] = 'graph';
     $h++;
 
     if ($object->courant != Account::TYPE_CASH)
     {
-    	$nbReceipts=0;
+    	$nbReceipts = 0;
 
     	// List of all standing receipts
     	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-    	$sql.= " WHERE b.fk_account = ".$object->id;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+    	$sql .= " WHERE b.fk_account = ".$object->id;
 
     	$resql = $db->query($sql);
     	if ($resql)
@@ -84,7 +84,7 @@ 
 
     	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
 	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
+	    if (($nbReceipts) > 0) $head[$h][1] .= ' <span class="badge">'.($nbReceipts).'</span>';
 	    $head[$h][2] = 'statement';
 	    $h++;
 	}
@@ -92,12 +92,12 @@ 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bank->dir_output . "/" . dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/document.php?account=" . $object->id;
+    $upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
     $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
     $head[$h][2] = 'document';
     $h++;
 
@@ -128,12 +128,12 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
+	$head[$h][0] = DOL_URL_ROOT.'/admin/bank.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
 	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT . '/admin/chequereceipts.php';
+    $head[$h][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
     $head[$h][1] = $langs->trans("CheckReceiptShort");
     $head[$h][2] = 'checkreceipts';
     $h++;
@@ -178,16 +178,16 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->banque->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -196,7 +196,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'various_payment', 'remove');
 
 	return $head;
 }
@@ -252,12 +252,12 @@ 
     if (empty($account->cle))
         $account->cle = $account->cle_rib;
 
-    dol_syslog("bank.lib::checkBanForAccount account->code_banque=" . $account->code_banque . " account->code_guichet=" . $account->code_guichet . " account->number=" . $account->number . " account->cle=" . $account->cle . " account->iban=" . $account->iban . " country_code=" . $country_code, LOG_DEBUG);
+    dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
 
     if ($country_code == 'FR') { // France rules
         $coef = array(62, 34, 3);
         // Concatenation des differents codes.
-        $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet) . trim($account->number) . trim($account->cle));
+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
         // On remplace les eventuelles lettres par des chiffres.
         //$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
         $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
@@ -282,7 +282,7 @@ 
 
     if ($country_code == 'ES') { // Spanish rules
         $CCC = strtolower(trim($account->number));
-        $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet));
+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
         $cle_rib = strtolower(checkES($rib, $CCC));
         if ($cle_rib == strtolower($account->cle)) {
             return true;
@@ -324,7 +324,7 @@ 
         return $keycontrol;
     }
 
-    $ccc = $IentOfi . $InumCta;
+    $ccc = $IentOfi.$InumCta;
     $numbers = "1234567890";
 
     $i = 0;
@@ -356,7 +356,7 @@ 
     $sum = 0;
 
     for ($i = 0; $i < 11; $i++) {
-        $sum += $values[$i] * (int) substr($InumCta, $i, 1);//int to cast result of substr to a number
+        $sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
     }
 
     $key = 11 - $sum % 11;

Braces +47 added lines, -25 removed lines

@@ -78,13 +78,17 @@ 
     	if ($resql)
     	{
     		$obj = $db->fetch_object($resql);
-    		if ($obj) $nbReceipts = $obj->nb;
+    		if ($obj) {
+    		    $nbReceipts = $obj->nb;
+    		}
     		$db->free($resql);
     	}
 
     	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
 	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
+	    if (($nbReceipts) > 0) {
+	        $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
+	    }
 	    $head[$h][2] = 'statement';
 	    $h++;
 	}
@@ -97,7 +101,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT . "/compta/bank/document.php?account=" . $object->id;
     $head[$h][1] = $langs->trans("Documents");
-    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles+$nbLinks) > 0) {
+        $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    }
     $head[$h][2] = 'document';
     $h++;
 
@@ -187,7 +193,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -230,9 +238,12 @@ 
     $iban = new IBAN($account->iban);
     $check = $iban->Verify();
 
-    if ($check) return true;
-    else return false;
-}
+    if ($check) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 /**
  * 		Check account number informations for a bank account
@@ -247,10 +258,12 @@ 
     // For compatibility between
     // account of type CompanyBankAccount class (we use number, cle_rib)
     // account of type Account class (we use num_compte, cle)
-    if (empty($account->number))
-        $account->number = $account->num_compte;
-    if (empty($account->cle))
-        $account->cle = $account->cle_rib;
+    if (empty($account->number)) {
+            $account->number = $account->num_compte;
+    }
+    if (empty($account->cle)) {
+            $account->cle = $account->cle_rib;
+    }
 
     dol_syslog("bank.lib::checkBanForAccount account->code_banque=" . $account->code_banque . " account->code_guichet=" . $account->code_guichet . " account->number=" . $account->number . " account->cle=" . $account->cle . " account->iban=" . $account->iban . " country_code=" . $country_code, LOG_DEBUG);
 
@@ -290,12 +303,17 @@ 
         return false;
     }
     if ($country_code == 'AU') {  // Australian
-        if (strlen($account->code_banque) > 7)
-            return false; // Sould be 6 but can be 123-456
-        else if (strlen($account->code_banque) < 6)
-            return false; // Sould be 6
-        else
-            return true;
+        if (strlen($account->code_banque) > 7) {
+                    return false;
+        }
+        // Sould be 6 but can be 123-456
+        else if (strlen($account->code_banque) < 6) {
+                    return false;
+        }
+        // Sould be 6
+        else {
+                    return true;
+        }
     }
 
     // No particular rule
@@ -346,10 +364,12 @@ 
 
     $key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+    if ($key == 10) {
+            $key = 1;
+    }
+    if ($key == 11) {
+            $key = 0;
+    }
 
     $keycontrol = $key;
 
@@ -361,10 +381,12 @@ 
 
     $key = 11 - $sum % 11;
 
-    if ($key == 10)
-        $key = 1;
-    if ($key == 11)
-        $key = 0;
+    if ($key == 10) {
+            $key = 1;
+    }
+    if ($key == 11) {
+            $key = 0;
+    }
 
     $keycontrol .= $key;
     return $keycontrol;

dolibarr/htdocs/core/lib/fiscalyear.lib.php

Indentation +16 added lines, -16 removed lines

@@ -29,28 +29,28 @@
  */
 function fiscalyear_prepare_head(Fiscalyear $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear');
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
 
-	return $head;
+    return $head;
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -43,14 +43,14 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'fiscalyear');
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'fiscalyear', 'remove');
 
 	return $head;
 }
\ No newline at end of file