alxarafe / alixar

Controllers/Categories.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     {

 

 // Load translation files required by the page

-       Globals::$langs->load("categories");

+        Globals::$langs->load("categories");

 

 // Security check

         $socid = DolUtils::GETPOST('socid', 'int');

Helpers/DolUtils2.php

Indentation +405 added lines, -405 removed lines

@@ -36,11 +36,11 @@ 
 {

 

     /**

- * Same function than javascript unescape() function but in PHP.

- *

- * @param 	string	$source		String to decode

- * @return	string				Unescaped string

- */

+     * Same function than javascript unescape() function but in PHP.

+     *

+     * @param 	string	$source		String to decode

+     * @return	string				Unescaped string

+     */

 function jsUnEscape($source)

 {

     $decodedStr = "";

@@ -130,7 +130,7 @@ 
 

     $selected='EUA4';

     if (!$outputlangs) {

-    	$outputlangs=$langs;

+        $outputlangs=$langs;

     }

 

     if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada

@@ -234,15 +234,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>';

@@ -270,15 +270,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>';

@@ -307,14 +307,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>';

@@ -343,14 +343,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>';

@@ -406,15 +406,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>';

@@ -442,15 +442,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>';

@@ -496,8 +496,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]:'');

 }

 

 /**

@@ -623,33 +623,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;

 }

 

 

@@ -787,24 +787,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}

@@ -820,12 +820,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);

@@ -886,7 +886,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';

         }

@@ -894,11 +894,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";

 

@@ -908,20 +908,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

@@ -942,11 +942,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."')";

@@ -957,13 +957,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).')';

 

@@ -982,7 +982,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

@@ -990,11 +990,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;

 

@@ -1012,8 +1012,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;

 

@@ -1039,11 +1039,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;

 

@@ -1065,7 +1065,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))

@@ -1097,9 +1097,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."')";

@@ -1114,25 +1114,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);

 

@@ -1162,9 +1162,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);

         }

     }

 

@@ -1183,11 +1183,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);

 }

 

 /**

@@ -1535,7 +1535,7 @@ 
     }

     else

     {

-    	$string = vatrate($reduction,true);

+        $string = vatrate($reduction,true);

     }

 

     return $string;

@@ -1628,7 +1628,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);

@@ -1639,8 +1639,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);

                     }

                 }

@@ -1696,19 +1696,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;

 }

 

 /**

@@ -1748,25 +1748,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;

@@ -1784,118 +1784,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;

 }

 

 

@@ -1909,113 +1909,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;

+    }

 }

 

 /**

@@ -2147,21 +2147,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;

 }

 

 

@@ -2176,9 +2176,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]));

 }

 

 /**

@@ -2193,15 +2193,15 @@ 
  */

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

 }

 

 /**

@@ -2247,7 +2247,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';

@@ -2274,7 +2274,7 @@ 
         $moduledirforclass = 'commande';

     }

     elseif ($module == 'shipments') {

-    	$moduledirforclass = 'expedition';

+        $moduledirforclass = 'expedition';

     }

     elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {

         $moduledirforclass = 'compta/facture';

@@ -2292,7 +2292,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';

@@ -2304,10 +2304,10 @@ 
         $moduledirforclass = 'user';

     }

     elseif ($module == 'ficheinter' || $module == 'interventions') {

-    	$moduledirforclass = 'fichinter';

+        $moduledirforclass = 'fichinter';

     }

     elseif ($module == 'tickets') {

-    	$moduledirforclass = 'ticket';

+        $moduledirforclass = 'ticket';

     }

 

     return $moduledirforclass;

Helpers/NoValeConfig.php

Indentation +41 added lines, -41 removed lines

@@ -57,11 +57,11 @@ 
 {

     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);

 

-	if ($db->error)

-	{

-		dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

-		exit;

-	}

+    if ($db->error)

+    {

+        dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);

+        exit;

+    }

 }

 

 // Now database connexion is known, so we can forget password

@@ -80,19 +80,19 @@ 
 // By default conf->entity is 1, but we change this if we ask another value.

 if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session

 {

-	$conf->entity = $_SESSION["dol_entity"];

+    $conf->entity = $_SESSION["dol_entity"];

 }

 else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script

 {

-	$conf->entity = $_ENV["dol_entity"];

+    $conf->entity = $_ENV["dol_entity"];

 }

 else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page

 {

-	$conf->entity = GETPOST("entity",'int');

+    $conf->entity = GETPOST("entity",'int');

 }

 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module

 {

-	$conf->entity = DOLENTITY;

+    $conf->entity = DOLENTITY;

 }

 

 // Sanitize entity

@@ -100,16 +100,16 @@ 
 

 if (! defined('NOREQUIREDB'))

 {

-	//print "Will work with data into entity instance number '".$conf->entity."'";

+    //print "Will work with data into entity instance number '".$conf->entity."'";

 

-	// Here we read database (llx_const table) and define $conf->global->XXX var.

-	$conf->setValues($db);

+    // Here we read database (llx_const table) and define $conf->global->XXX var.

+    $conf->setValues($db);

 }

 

 // Overwrite database value

 if (! empty($conf->file->mailing_limit_sendbyweb))

 {

-	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

+    $conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;

 }

 if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))

 {

@@ -127,41 +127,41 @@ 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.

 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))

 {

-	$ok=0;

-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

-	if (! $ok)

-	{

-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

-		{

-			print 'Sorry, your application is offline.'."\n";

-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/user/logout.php';

-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

-		}

-		else

-		{

-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

-			$nexturl=DOL_URL_ROOT.'/';

-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

-		}

-		exit;

-	}

+    $ok=0;

+    if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)

+    elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)

+    elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)

+    elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)

+    elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin

+    if (! $ok)

+    {

+        if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)

+        {

+            print 'Sorry, your application is offline.'."\n";

+            print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+            $nexturl=DOL_URL_ROOT.'/user/logout.php';

+            print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";

+        }

+        else

+        {

+            print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";

+            $nexturl=DOL_URL_ROOT.'/';

+            print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";

+        }

+        exit;

+    }

 }

 

 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.

 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))

 {

-	require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';

+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';

 

-	$mysoc=new Societe($db);

-	$mysoc->setMysoc($conf);

+    $mysoc=new Societe($db);

+    $mysoc->setMysoc($conf);

 

-	// For some countries, we need to invert our address with customer address

-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

+    // For some countries, we need to invert our address with customer address

+    if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;

 }

 

 

Helpers/login/functions_ldap.php

Indentation +195 added lines, -195 removed lines

@@ -34,190 +34,190 @@ 
  */

 function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)

 {

-	global $db,$conf,$langs;

-	global $_POST;

-	global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;

-	global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;

-	global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;

-	global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;

-	global $dolibarr_main_auth_ldap_filter;

-	global $dolibarr_main_auth_ldap_debug;

-

-	// Force master entity in transversal mode

-	$entity=$entitytotest;

-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

-

-	$login='';

-	$resultFetchUser='';

-

-	if (! function_exists("ldap_connect"))

-	{

-		dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");

-		sleep(1);

-

-		// Load translation files required by the page

+    global $db,$conf,$langs;

+    global $_POST;

+    global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port;

+    global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype;

+    global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn;

+    global $dolibarr_main_auth_ldap_admin_login,$dolibarr_main_auth_ldap_admin_pass;

+    global $dolibarr_main_auth_ldap_filter;

+    global $dolibarr_main_auth_ldap_debug;

+

+    // Force master entity in transversal mode

+    $entity=$entitytotest;

+    if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;

+

+    $login='';

+    $resultFetchUser='';

+

+    if (! function_exists("ldap_connect"))

+    {

+        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP");

+        sleep(1);

+

+        // Load translation files required by the page

         $langs->loadLangs(array('main', 'other'));

 

-		$_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

-		return;

-	}

-

-	if ($usertotest)

-	{

-		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);

-

-		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko

-		$ldaphost=$dolibarr_main_auth_ldap_host;

-		$ldapport=$dolibarr_main_auth_ldap_port;

-		$ldapversion=$dolibarr_main_auth_ldap_version;

-		$ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

-

-		$ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;

-		$ldapdn=$dolibarr_main_auth_ldap_dn;

-		$ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;

-		$ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

-		$ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

-

-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

-

-		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

-		$ldap=new Ldap();

-		$ldap->server=explode(',',$ldaphost);

-		$ldap->serverPort=$ldapport;

-		$ldap->ldapProtocolVersion=$ldapversion;

-		$ldap->serverType=$ldapservertype;

-		$ldap->searchUser=$ldapadminlogin;

-		$ldap->searchPassword=$ldapadminpass;

-

-		if ($ldapdebug)

-		{

-			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

-			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);

-			print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

-			print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";

-		}

-

-		$resultFetchLdapUser=0;

-

-		// Define $userSearchFilter

-		$userSearchFilter = "";

-		if (empty($dolibarr_main_auth_ldap_filter)) {

-			$userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";

-		} else {

-			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);

-		}

-

-		// If admin login provided

-		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)

-		if ($ldapadminlogin)

-		{

-			$result=$ldap->connect_bind();

-			if ($result > 0)

-			{

-				$resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

-				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

-				{

-					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');

-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";

-					$ldap->close();

-					sleep(1);

-					$langs->load('ldap');

-					$_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

-					return '';

-				}

-			}

-			else

-			{

-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";

-			}

-			$ldap->close();

-		}

-

-		// Forge LDAP user and password to test with them

-		// If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with

-		// admin login no exectued.

-		$ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

-		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

-		// dn detected into ldapUserDN.

-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

-		$ldap->searchPassword=$passwordtotest;

-

-		// Test with this->seachUser and this->searchPassword

-		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;

-		$result=$ldap->connect_bind();

-		if ($result > 0)

-		{

-			if ($result == 2)	// Connection is ok for user/pass into LDAP

-			{

-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

-				$login=$usertotest;

-

-				// ldap2dolibarr synchronisation

-				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

-				{

-						dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

-

-						// On charge les attributs du user ldap

-						if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

-						$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

-

-						if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

-						if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

-						if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

-

-						// On recherche le user dolibarr en fonction de son SID ldap

-						$sid = $ldap->getObjectSid($login);

-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

-

-						$usertmp=new User($db);

-						$resultFetchUser=$usertmp->fetch('',$login,$sid);

-						if ($resultFetchUser > 0)

-						{

-							dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);

-							// On verifie si le login a change et on met a jour les attributs dolibarr

-

-							if ($usertmp->login != $ldap->login && $ldap->login)

-							{

-								$usertmp->login = $ldap->login;

-								$usertmp->update($usertmp);

-								// TODO Que faire si update echoue car on update avec un login deja existant.

-							}

-

-							//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);

-						}

-						unset($usertmp);

-				}

-

-				if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

-				{

-					global $mc;

-

-					$usertmp=new User($db);

-					$usertmp->fetch('',$login);

-					$ret=$mc->checkRight($usertmp->id, $entitytotest);

-					if ($ret < 0)

-					{

-						dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");

-						$login=''; // force authentication failure

-					}

-					unset($usertmp);

-				}

-			}

-			if ($result == 1)

-			{

-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");

-				sleep(1);

-

-				// Load translation files required by the page

+        $_SESSION["dol_loginmesg"]=$langs->trans("ErrorLDAPFunctionsAreDisabledOnThisPHP").' '.$langs->trans("TryAnotherConnectionMode");

+        return;

+    }

+

+    if ($usertotest)

+    {

+        dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);

+

+        // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko

+        $ldaphost=$dolibarr_main_auth_ldap_host;

+        $ldapport=$dolibarr_main_auth_ldap_port;

+        $ldapversion=$dolibarr_main_auth_ldap_version;

+        $ldapservertype=(empty($dolibarr_main_auth_ldap_servertype) ? 'openldap' : $dolibarr_main_auth_ldap_servertype);

+

+        $ldapuserattr=$dolibarr_main_auth_ldap_login_attribute;

+        $ldapdn=$dolibarr_main_auth_ldap_dn;

+        $ldapadminlogin=$dolibarr_main_auth_ldap_admin_login;

+        $ldapadminpass=$dolibarr_main_auth_ldap_admin_pass;

+        $ldapdebug=(empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug=="false" ? false : true);

+

+        if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";

+

+        require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';

+        $ldap=new Ldap();

+        $ldap->server=explode(',',$ldaphost);

+        $ldap->serverPort=$ldapport;

+        $ldap->ldapProtocolVersion=$ldapversion;

+        $ldap->serverType=$ldapservertype;

+        $ldap->searchUser=$ldapadminlogin;

+        $ldap->searchPassword=$ldapadminpass;

+

+        if ($ldapdebug)

+        {

+            dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);

+            dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);

+            print "DEBUG: Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";

+            print "DEBUG: uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword."<br>\n";

+        }

+

+        $resultFetchLdapUser=0;

+

+        // Define $userSearchFilter

+        $userSearchFilter = "";

+        if (empty($dolibarr_main_auth_ldap_filter)) {

+            $userSearchFilter = "(" . $ldapuserattr . "=" . $usertotest . ")";

+        } else {

+            $userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);

+        }

+

+        // If admin login provided

+        // Code to get user in LDAP from an admin connection (may differ from user connection, done later)

+        if ($ldapadminlogin)

+        {

+            $result=$ldap->connect_bind();

+            if ($result > 0)

+            {

+                $resultFetchLdapUser = $ldap->fetch($usertotest,$userSearchFilter);

+                //dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);

+                if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset

+                {

+                    dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');

+                    if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";

+                    $ldap->close();

+                    sleep(1);

+                    $langs->load('ldap');

+                    $_SESSION["dol_loginmesg"]=$langs->trans("YouMustChangePassNextLogon",$usertotest,$ldap->domainFQDN);

+                    return '';

+                }

+            }

+            else

+            {

+                    if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";

+            }

+            $ldap->close();

+        }

+

+        // Forge LDAP user and password to test with them

+        // If LDAP need a dn with login like "uid=jbloggs,ou=People,dc=foo,dc=com", default dn may work even if previous code with

+        // admin login no exectued.

+        $ldap->searchUser=$ldapuserattr."=".$usertotest.",".$ldapdn;  // Default dn (will work if LDAP accept a dn with login value inside)

+        // But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have

+        // dn detected into ldapUserDN.

+        if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;

+        $ldap->searchPassword=$passwordtotest;

+

+        // Test with this->seachUser and this->searchPassword

+        //print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;

+        $result=$ldap->connect_bind();

+        if ($result > 0)

+        {

+            if ($result == 2)	// Connection is ok for user/pass into LDAP

+            {

+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");

+                $login=$usertotest;

+

+                // ldap2dolibarr synchronisation

+                if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation

+                {

+                        dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");

+

+                        // On charge les attributs du user ldap

+                        if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";

+                        $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);

+

+                        if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."<br>\n";

+                        if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."<br>\n";

+                        if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."<br>\n";

+

+                        // On recherche le user dolibarr en fonction de son SID ldap

+                        $sid = $ldap->getObjectSid($login);

+                        if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";

+

+                        $usertmp=new User($db);

+                        $resultFetchUser=$usertmp->fetch('',$login,$sid);

+                        if ($resultFetchUser > 0)

+                        {

+                            dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);

+                            // On verifie si le login a change et on met a jour les attributs dolibarr

+

+                            if ($usertmp->login != $ldap->login && $ldap->login)

+                            {

+                                $usertmp->login = $ldap->login;

+                                $usertmp->update($usertmp);

+                                // TODO Que faire si update echoue car on update avec un login deja existant.

+                            }

+

+                            //$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);

+                        }

+                        unset($usertmp);

+                }

+

+                if (! empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)

+                {

+                    global $mc;

+

+                    $usertmp=new User($db);

+                    $usertmp->fetch('',$login);

+                    $ret=$mc->checkRight($usertmp->id, $entitytotest);

+                    if ($ret < 0)

+                    {

+                        dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'");

+                        $login=''; // force authentication failure

+                    }

+                    unset($usertmp);

+                }

+            }

+            if ($result == 1)

+            {

+                dol_syslog("functions_ldap::check_user_password_ldap Authentification ko bad user/password for '".$usertotest."'");

+                sleep(1);

+

+                // Load translation files required by the page

                 $langs->loadLangs(array('main', 'other'));

 

-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

-			}

-		}

-		else

-		{

-			/* Login failed. Return false, together with the error code and text from

+                $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");

+            }

+        }

+        else

+        {

+            /* Login failed. Return false, together with the error code and text from

              ** the LDAP server. The common error codes and reasons are listed below :

              ** (for iPlanet, other servers may differ)

              ** 19 - Account locked out (too many invalid login attempts)

@@ -225,24 +225,24 @@ 
              ** 49 - Wrong password

              ** 53 - Account inactive (manually locked out by administrator)

              */

-			dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");

-			if (is_resource($ldap->connection))    // If connection ok but bind ko

-			{

-				$ldap->ldapErrorCode = ldap_errno($ldap->connection);

-				$ldap->ldapErrorText = ldap_error($ldap->connection);

-				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

-			}

-			sleep(2);      // Anti brut force protection

-

-			// Load translation files required by the page

+            dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP for '".$usertotest."'");

+            if (is_resource($ldap->connection))    // If connection ok but bind ko

+            {

+                $ldap->ldapErrorCode = ldap_errno($ldap->connection);

+                $ldap->ldapErrorText = ldap_error($ldap->connection);

+                dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

+            }

+            sleep(2);      // Anti brut force protection

+

+            // Load translation files required by the page

             $langs->loadLangs(array('main', 'other', 'errors'));

 ;

-			$_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));

-		}

+            $_SESSION["dol_loginmesg"]=($ldap->error?$ldap->error:$langs->trans("ErrorBadLoginPassword"));

+        }

 

-		$ldap->close();

-	}

+        $ldap->close();

+    }

 

-	return $login;

+    return $login;

 }

 

Helpers/login/functions_forceuser.php

Indentation +8 added lines, -8 removed lines

@@ -34,16 +34,16 @@
  */

 function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest)

 {

-	// Variable dolibarr_auto_user must be defined in conf.php file

-	global $dolibarr_auto_user;

+    // Variable dolibarr_auto_user must be defined in conf.php file

+    global $dolibarr_auto_user;

 

-	dol_syslog("functions_forceuser::check_user_password_forceuser");

+    dol_syslog("functions_forceuser::check_user_password_forceuser");

 

-	$login=$dolibarr_auto_user;

-	if (empty($login)) $login='auto';

+    $login=$dolibarr_auto_user;

+    if (empty($login)) $login='auto';

 

-	if ($_SESSION["dol_loginmesg"]) $login='';

+    if ($_SESSION["dol_loginmesg"]) $login='';

 

-	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

-	return $login;

+    dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);

+    return $login;

 }

Helpers/login/functions_http.php

Indentation +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@
 */

 function check_user_password_http($usertotest,$passwordtotest,$entitytotest)

 {

-	DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=" . (empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

+    DolUtils::dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=" . (empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));

 

     $login='';

-	if (! empty($_SERVER["REMOTE_USER"]))

-	{

-		$login=$_SERVER["REMOTE_USER"];

-	}

+    if (! empty($_SERVER["REMOTE_USER"]))

+    {

+        $login=$_SERVER["REMOTE_USER"];

+    }

 

-	return $login;

+    return $login;

 }

Helpers/login/functions_empty.php

Indentation +5 added lines, -5 removed lines

@@ -33,12 +33,12 @@
  */

 function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)

 {

-	global $langs;

+    global $langs;

 

-	dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);

+    dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest);

 

-	$login='';

-	$_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");

+    $login='';

+    $_SESSION["dol_loginmesg"]=$langs->trans("FailedToLogin");

 

-	return $login;

+    return $login;

 }

Helpers/DolUtils.php

Indentation +93 added lines, -93 removed lines

@@ -258,7 +258,7 @@ 
      */

     static function dol_shutdown()

     {

-       // global Globals::$conf, $user, $langs, $db;

+        // global Globals::$conf, $user, $langs, $db;

         $disconnectdone = false;

         $depth = 0;

         if (is_object($db) && !empty($db->connected)) {

@@ -305,7 +305,7 @@ 
      */

     static function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $options = null, $noreplace = 0)

     {

-       // global $mysoc, $user, Globals::$conf;

+        // global $mysoc, $user, Globals::$conf;

 

         if (empty($paramname))

             return 'BadFirstParameterForDolUtils::GETPOST';

@@ -364,7 +364,7 @@ 
             elseif (!isset($_GET['sortfield'])) { // If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set

                 if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {

                     // Search default value from $object->field

-                   // global $object;

+                    // global $object;

                     if (is_object($object) && isset($object->fields[$paramname]['default'])) {

                         $out = $object->fields[$paramname]['default'];

                     }

@@ -707,7 +707,7 @@ 
      */

     static function dol_include_once($relpath, $classname = '')

     {

-       // global Globals::$conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

+        // global Globals::$conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

 

         $fullpath = dol_buildpath($relpath);

 

@@ -735,7 +735,7 @@ 
      */

     static function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = preg_replace('/^\//', '', $path);

 

@@ -777,7 +777,7 @@ 
             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                 if ($key == 'main') {

                     if ($type == 3) {

-                       // global $dolibarr_main_url_root;

+                        // global $dolibarr_main_url_root;

                         // Define $urlwithroot

 

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

@@ -801,7 +801,7 @@ 
                             $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

                         }

                         if ($type == 3) {

-                           // global $dolibarr_main_url_root;

+                            // global $dolibarr_main_url_root;

                             // Define $urlwithroot

                             $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

                             $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

@@ -1071,7 +1071,7 @@ 
      */

     static function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '')

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 // If syslog module enabled

         if (empty(Globals::$conf->syslog->enabled))

             return;

@@ -1177,7 +1177,7 @@ 
      */

     static function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '')

     {

-       // global Globals::$conf, $langs, $hookmanager;

+        // global Globals::$conf, $langs, $hookmanager;

 

         $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

 

@@ -1360,7 +1360,7 @@ 
      */

     static function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $onlybanner = 0, $morehtmlright = '')

     {

-       // global Globals::$conf, $form, $user, $langs;

+        // global Globals::$conf, $form, $user, $langs;

 

         $error = 0;

 

@@ -1639,7 +1639,7 @@ 
      */

     static function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         $ret = '';

         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

@@ -1662,7 +1662,7 @@ 
      */

     static function dol_bc($var, $moreclass = '')

     {

-       // global $bc;

+        // global $bc;

         $ret = ' ' . $bc[$var];

         if ($moreclass)

             $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

@@ -1682,7 +1682,7 @@ 
      */

     static function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = '';

         $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

@@ -1773,7 +1773,7 @@ 
      */

     static function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlangs = '', $encodetooutput = false)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 // Clean parameters

         $to_gmt = false;

         $offsettz = $offsetdst = 0;

@@ -1984,7 +1984,7 @@ 
      */

     static function dol_getdate($timestamp, $fast = false)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $usealternatemethod = false;

         if ($timestamp <= 0)

@@ -2022,7 +2022,7 @@ 
      */

     static function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $check = 1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

         if ($hour == -1 || empty($hour))

@@ -2134,7 +2134,7 @@ 
      */

     static function dol_print_size($size, $shortvalue = 0, $shortunit = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         $level = 1024;

 

         if (!empty(Globals::$conf->dol_optimize_smallscreen))

@@ -2171,7 +2171,7 @@ 
      */

     static function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($url))

             return '';

@@ -2205,7 +2205,7 @@ 
      */

     static function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)

     {

-       // global Globals::$conf, $user, $langs, $hookmanager;

+        // global Globals::$conf, $user, $langs, $hookmanager;

 

         $newemail = $email;

 

@@ -2262,7 +2262,7 @@ 
      */

     static function dol_print_socialnetworks($value, $cid, $socid, $type)

     {

-       // global Globals::$conf, $user, $langs;

+        // global Globals::$conf, $user, $langs;

 

         $newskype = $value;

 

@@ -2317,7 +2317,7 @@ 
      */

     static function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addlink = '', $separ = "&nbsp;", $withpicto = '', $titlealt = '', $adddivfloat = 0)

     {

-       // global Globals::$conf, $user, $langs, $mysoc, $hookmanager;

+        // global Globals::$conf, $user, $langs, $mysoc, $hookmanager;

 // Clean phone parameter

         $phone = preg_replace("/[\s.-]/", "", trim($phone));

         if (empty($phone)) {

@@ -2581,7 +2581,7 @@ 
      */

     static function dol_print_ip($ip, $mode = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = '';

 

@@ -2626,7 +2626,7 @@ 
      */

     static function dolGetCountryCodeFromIp($ip)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $countrycode = '';

 

@@ -2653,7 +2653,7 @@ 
      */

     static function dol_user_country()

     {

-       // global Globals::$conf, $langs, $user;

+        // global Globals::$conf, $langs, $user;

 //$ret=$user->xxx;

         $ret = '';

         if (!empty(Globals::$conf->geoipmaxmind->enabled)) {

@@ -2683,7 +2683,7 @@ 
      */

     static function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfornl = '')

     {

-       // global Globals::$conf, $user, $langs, $hookmanager;

+        // global Globals::$conf, $user, $langs, $hookmanager;

 

         $out = '';

 

@@ -2815,7 +2815,7 @@ 
      */

     static function dol_substr($string, $start, $length, $stringencoding = '', $trunconbytes = 0)

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($stringencoding))

             $stringencoding = $langs->charset_output;

@@ -2852,7 +2852,7 @@ 
      */

     static function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF-8', $nodot = 0, $display = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

             return $string;

@@ -2918,7 +2918,7 @@ 
      */

     static function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 // We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_BASE_URI/theme/$conf->theme/img/$picto

 //$url = DOL_BASE_URI;

         $url = DOL_BASE_URI;

@@ -3103,7 +3103,7 @@ 
      */

     static function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3126,7 +3126,7 @@ 
      */

     static function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         if (!preg_match('/(\.png|\.gif)$/i', $picto))

             $picto .= '.png';

@@ -3157,7 +3157,7 @@ 
      */

     static function img_action($titlealt, $numaction)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (empty($titlealt) || $titlealt == 'default') {

             if ($numaction == '-1' || $numaction == 'ST_NO') {

@@ -3195,7 +3195,7 @@ 
      */

     static function img_pdf($titlealt = 'default', $size = 3)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Show');

@@ -3212,7 +3212,7 @@ 
      */

     static function img_edit_add($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Add');

@@ -3229,7 +3229,7 @@ 
      */

     static function img_edit_remove($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Remove');

@@ -3247,7 +3247,7 @@ 
      */

     static function img_edit($titlealt = 'default', $float = 0, $other = 'class="pictoedit"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Modify');

@@ -3265,7 +3265,7 @@ 
      */

     static function img_view($titlealt = 'default', $float = 0, $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('View');

@@ -3284,7 +3284,7 @@ 
      */

     static function img_delete($titlealt = 'default', $other = 'class="pictodelete"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Delete');

@@ -3302,7 +3302,7 @@ 
      */

     static function img_printer($titlealt = "default", $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

         if ($titlealt == "default")

             $titlealt = $langs->trans("Print");

         return img_picto($titlealt, 'printer.png', $other);

@@ -3317,7 +3317,7 @@ 
      */

     static function img_split($titlealt = 'default', $other = 'class="pictosplit"')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Split');

@@ -3334,7 +3334,7 @@ 
      */

     static function img_help($usehelpcursor = 1, $usealttitle = 1)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($usealttitle) {

             if (is_string($usealttitle))

@@ -3354,7 +3354,7 @@ 
      */

     static function img_info($titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Informations');

@@ -3371,7 +3371,7 @@ 
      */

     static function img_warning($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Warning');

@@ -3388,7 +3388,7 @@ 
      */

     static function img_error($titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Error');

@@ -3405,7 +3405,7 @@ 
      */

     static function img_next($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Next');

@@ -3423,7 +3423,7 @@ 
      */

     static function img_previous($titlealt = 'default', $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Previous');

@@ -3442,7 +3442,7 @@ 
      */

     static function img_down($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Down');

@@ -3460,7 +3460,7 @@ 
      */

     static function img_up($titlealt = 'default', $selected = 0, $moreclass = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Up');

@@ -3478,7 +3478,7 @@ 
      */

     static function img_left($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Left');

@@ -3496,7 +3496,7 @@ 
      */

     static function img_right($titlealt = 'default', $selected = 0, $moreatt = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Right');

@@ -3513,7 +3513,7 @@ 
      */

     static function img_allow($allow, $titlealt = 'default')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Active');

@@ -3588,7 +3588,7 @@ 
     {

         dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

 

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Call');

@@ -3610,7 +3610,7 @@ 
      */

     static function img_search($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Search');

@@ -3632,7 +3632,7 @@ 
      */

     static function img_searchclear($titlealt = 'default', $other = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($titlealt == 'default')

             $titlealt = $langs->trans('Search');

@@ -3657,7 +3657,7 @@ 
      */

     static function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if ($infoonimgalt) {

             return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

@@ -3680,7 +3680,7 @@ 
      */

     static function dol_print_error($db = '', $error = '', $errors = null)

     {

-       // global Globals::$conf, $langs, $argv;

+        // global Globals::$conf, $langs, $argv;

         // global $dolibarr_main_prod;

 

         $out = '';

@@ -3799,7 +3799,7 @@ 
      */

     static function dol_print_error_email($prefixcode, $errormessage = '', $errormessages = array(), $morecss = 'error', $email = '')

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 

         if (empty($email))

             $email = Globals::$conf->global->MAIN_INFO_SOCIETE_MAIL;

@@ -3858,7 +3858,7 @@ 
      */

     static function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '')

     {

-       // global Globals::$conf, $langs, $form;

+        // global Globals::$conf, $langs, $form;

 //print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";

 

         $sortorder = strtoupper($sortorder);

@@ -3997,7 +3997,7 @@ 
      */

     static function load_fiche_titre($titre, $morehtmlright = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $id = '', $morecssontable = '', $morehtmlcenter = '')

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $return = '';

 

@@ -4047,7 +4047,7 @@ 
      */

     static function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'title_generic.png', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $savlimit = $limit;

         $savtotalnboflines = $totalnboflines;

@@ -4160,7 +4160,7 @@ 
      */

     static function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         print '<div class="pagination"><ul>';

         if ((int) $limit >= 0 && empty($hideselectlimit)) {

@@ -4283,7 +4283,7 @@ 
      */

     static function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $forcerounding = -1, $currency_code = '')

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 // Clean parameters

         if (empty($amount))

             $amount = 0; // To have a numeric value if amount not defined or = ''

@@ -4376,7 +4376,7 @@ 
      */

     static function price2num($amount, $rounding = '', $alreadysqlnb = 0)

     {

-       // global $langs, Globals::$conf;

+        // global $langs, Globals::$conf;

 // Round PHP static function does not allow number like '1,234.56' nor '1.234,56' nor '1 234,56'

 // Numbers must be '1234.56'

 // Decimal delimiter for PHP and database SQL requests must be '.'

@@ -4499,7 +4499,7 @@ 
      */

     static function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_seller = "", $vatnpr = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

@@ -4639,7 +4639,7 @@ 
      */

     static function get_localtax_by_third($local)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

         $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

@@ -4672,7 +4672,7 @@ 
      */

     static function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid = 1)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

 

@@ -4729,7 +4729,7 @@ 
      */

     static function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisid = 0)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

 

@@ -4783,7 +4783,7 @@ 
      */

     static function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice = 0)

     {

-       // global $db, Globals::$conf, $mysoc;

+        // global $db, Globals::$conf, $mysoc;

 

         require_once DOL_BASE_PATH . '/product/class/product.class.php';

 

@@ -4854,7 +4854,7 @@ 
      */

     static function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)

     {

-       // global $db, $mysoc;

+        // global $db, $mysoc;

 

         if (!class_exists('Product')) {

             require_once DOL_BASE_PATH . 'product/class/product.class.php';

@@ -4922,7 +4922,7 @@ 
      */

     static function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

 

@@ -4997,7 +4997,7 @@ 
      */

     static function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, $idprod = 0, $idprodfournprice = 0)

     {

-       // global $db;

+        // global $db;

 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

@@ -5032,7 +5032,7 @@ 
      */

     static function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod = 0)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (!is_object($thirdparty_seller))

             return -1;

@@ -5077,7 +5077,7 @@ 
      */

     static function yn($yesno, $case = 1, $color = 0)

     {

-       // global $langs;

+        // global $langs;

         $result = 'unknown';

         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

@@ -5127,7 +5127,7 @@ 
      */

     static function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $path = '';

 

@@ -5175,7 +5175,7 @@ 
      */

     static function dol_mkdir($dir, $dataroot = '', $newmask = null)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

@@ -5722,7 +5722,7 @@ 
      */

     static function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $object = null)

     {

-       // global $db, Globals::$conf, $mysoc, $user, $extrafields;

+        // global $db, Globals::$conf, $mysoc, $user, $extrafields;

 

         $substitutionarray = array();

 

@@ -6028,7 +6028,7 @@ 
      */

     static function make_substitutions($text, $substitutionarray, $outputlangs = null)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (!is_array($substitutionarray))

             return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

@@ -6094,7 +6094,7 @@ 
      */

     static function complete_substitutions_array(&$substitutionarray, $outputlangs, $object = null, $parameters = null, $callfunc = "completesubstitutionarray")

     {

-       // global Globals::$conf, $user;

+        // global Globals::$conf, $user;

 

         require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

 

@@ -6164,7 +6164,7 @@ 
      */

     static function get_date_range($date_start, $date_end, $format = '', $outputlangs = '', $withparenthesis = 1)

     {

-       // global $langs;

+        // global $langs;

 

         $out = '';

 

@@ -6194,7 +6194,7 @@ 
      */

     static function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $ret = '';

 // If order not defined, we use the setup

@@ -6318,7 +6318,7 @@ 
      */

     static function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $keepembedded = 0)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $ret = 0;

         $return = '';

@@ -6554,7 +6554,7 @@ 
      */

     function dol_osencode($str)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

@@ -6584,7 +6584,7 @@ 
      */

     static function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)

     {

-       // global $cache_codes;

+        // global $cache_codes;

 // If key empty

         if ($key == '')

             return '';

@@ -6625,7 +6625,7 @@ 
      */

     static function verifCond($strRights)

     {

-       // global $user, Globals::$conf, $langs;

+        // global $user, Globals::$conf, $langs;

         // global $leftmenu;

         // global $rights;    // To export to dol_eval function

 //print $strRights."<br>\n";

@@ -6691,7 +6691,7 @@ 
      */

     static function picto_from_langcode($codelang, $moreatt = '')

     {

-       // global $langs;

+        // global $langs;

 

         if (empty($codelang))

             return '';

@@ -6726,7 +6726,7 @@ 
      */

     static function getLanguageCodeFromCountryCode($countrycode)

     {

-       // global $mysoc;

+        // global $mysoc;

 

         if (strtoupper($countrycode) == 'MQ')

             return 'fr_CA';

@@ -6960,7 +6960,7 @@ 
      */

     static function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')

     {

-       // global $hookmanager;

+        // global $hookmanager;

 

         if (isset(Globals::$conf->modules_parts['tabs'][$type]) && is_array(Globals::$conf->modules_parts['tabs'][$type])) {

             foreach (Globals::$conf->modules_parts['tabs'][$type] as $value) {

@@ -7049,7 +7049,7 @@ 
      */

     static function printCommonFooter($zone = 'private')

     {

-       // global Globals::$conf, $hookmanager, $user;

+        // global Globals::$conf, $hookmanager, $user;

         // global $action;

         // global $micro_start_time;

 

@@ -7289,7 +7289,7 @@ 
      */

     static function natural_search($fields, $value, $mode = 0, $nofirstand = 0)

     {

-       // global $db, $langs;

+        // global $db, $langs;

 

         $value = trim($value);

 

@@ -7422,7 +7422,7 @@ 
      */

     static function showDirectDownloadLink($object)

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         $out = '';

         $url = $object->getLastMainDocLink($object->element);

@@ -7484,7 +7484,7 @@ 
      */

     static function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param = '')

     {

-       // global Globals::$conf, $langs;

+        // global Globals::$conf, $langs;

 

         if (empty(Globals::$conf->use_javascript_ajax))

             return '';

@@ -7517,7 +7517,7 @@ 
      */

     static function ajax_autoselect($htmlname, $addlink = '')

     {

-       // global $langs;

+        // global $langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

@@ -7901,7 +7901,7 @@ 
      */

     static function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')

     {

-       // global $dictvalues, $db, $langs;

+        // global $dictvalues, $db, $langs;

 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

@@ -7969,7 +7969,7 @@ 
      */

     static function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal)

     {

-       // global Globals::$conf;

+        // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

         if (empty($menuentry['enabled']))

Helpers/triggers/interface_50_modLdap_Ldapsynchro.class.php

Indentation +771 added lines, -771 removed lines

@@ -31,781 +31,781 @@
  */

 class InterfaceLdapsynchro extends DolibarrTriggers

 {

-	public $family = 'ldap';

-	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";

-

-	/**

-	 * Version of the trigger

-	 * @var string

-	 */

-	public $version = self::VERSION_DOLIBARR;

-

-	/**

-	 * @var string Image of the trigger

-	 */

-	public $picto = 'technic';

-

-	/**

-	 * Function called when a Dolibarrr business event is done.

-	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)

-	 *

-	 * @param string		$action		Event action code

-	 * @param Object		$object     Object

-	 * @param User		    $user       Object user

-	 * @param Translate 	$langs      Object langs

-	 * @param conf		    $conf       Object conf

-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK

-	 */

-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

-	{

-		if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

-		if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

-

-		if (! function_exists('ldap_connect'))

-		{

-			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);

-			return 0;

-		}

-

-		require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";

-		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";

-

-		$result=0;

-

-		// Users

-		if ($action == 'USER_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

-

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_NEW_PASSWORD')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_ENABLEDISABLE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-		}

-		elseif ($action == 'USER_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_SETINGROUP')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

-					if ($object->newgroupid > 0)

-					{

-						$usergroup->fetch($object->newgroupid);

-

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'USER_REMOVEFROMGROUP')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					// Must edit $object->newgroupid

-					$usergroup=new UserGroup($this->db);

-					if ($object->oldgroupid > 0)

-					{

-						$usergroup->fetch($object->oldgroupid);

-

-						$oldinfo=$usergroup->_load_ldap_info();

-						$olddn=$usergroup->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$usergroup->_load_ldap_dn($oldinfo,1);

-						$search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$usergroup->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Groupes

-		elseif ($action == 'GROUP_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

-						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');

-					}

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'GROUP_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'GROUP_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Contacts

-		elseif ($action == 'CONTACT_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'CONTACT_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'CONTACT_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Members

-		elseif ($action == 'MEMBER_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->add($dn,$info,$user);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						$membertype=new AdherentType($this->db);

-						if ($object->typeid > 0)

-						{

-							$membertype->fetch($object->typeid);

-							$membertype->listMembersForMemberType('', 1);

-

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_VALIDATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_SUBSCRIPTION')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If subscriptions fields are setup to be synchronized

-				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE

-					|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT

-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE

-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT

-					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only subscriptions

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-					$newrdn=$object->_load_ldap_dn($info,2);

-					$newparent=$object->_load_ldap_dn($info,1);

-

-					$result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						/*

+    public $family = 'ldap';

+    public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";

+

+    /**

+     * Version of the trigger

+     * @var string

+     */

+    public $version = self::VERSION_DOLIBARR;

+

+    /**

+     * @var string Image of the trigger

+     */

+    public $picto = 'technic';

+

+    /**

+     * Function called when a Dolibarrr business event is done.

+     * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)

+     *

+     * @param string		$action		Event action code

+     * @param Object		$object     Object

+     * @param User		    $user       Object user

+     * @param Translate 	$langs      Object langs

+     * @param conf		    $conf       Object conf

+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK

+     */

+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)

+    {

+        if (empty($conf->ldap->enabled)) return 0;		// Module not active, we do nothing

+        if (defined('DISABLE_LDAP_SYNCHRO')) return 0;	// If constant defined, we do nothing

+

+        if (! function_exists('ldap_connect'))

+        {

+            dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);

+            return 0;

+        }

+

+        require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";

+        require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";

+

+        $result=0;

+

+        // Users

+        if ($action == 'USER_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+                    $newrdn=$object->_load_ldap_dn($info,2);

+                    $newparent=$object->_load_ldap_dn($info,1);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_NEW_PASSWORD')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_ENABLEDISABLE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+        }

+        elseif ($action == 'USER_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_SETINGROUP')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    // Must edit $object->newgroupid

+                    $usergroup=new UserGroup($this->db);

+                    if ($object->newgroupid > 0)

+                    {

+                        $usergroup->fetch($object->newgroupid);

+

+                        $oldinfo=$usergroup->_load_ldap_info();

+                        $olddn=$usergroup->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$usergroup->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$usergroup->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'USER_REMOVEFROMGROUP')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    // Must edit $object->newgroupid

+                    $usergroup=new UserGroup($this->db);

+                    if ($object->oldgroupid > 0)

+                    {

+                        $usergroup->fetch($object->oldgroupid);

+

+                        $oldinfo=$usergroup->_load_ldap_info();

+                        $olddn=$usergroup->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$usergroup->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$usergroup->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$usergroup->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$usergroup->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Groupes

+        elseif ($action == 'GROUP_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    // Get a gid number for objectclass PosixGroup

+                    if (in_array('posixGroup',$info['objectclass'])) {

+                        $info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_GROUPS');

+                    }

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'GROUP_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'GROUP_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Contacts

+        elseif ($action == 'CONTACT_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'CONTACT_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'CONTACT_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_CONTACT_ACTIVE))

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Members

+        elseif ($action == 'MEMBER_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->add($dn,$info,$user);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        $membertype=new AdherentType($this->db);

+                        if ($object->typeid > 0)

+                        {

+                            $membertype->fetch($object->typeid);

+                            $membertype->listMembersForMemberType('', 1);

+

+                            $oldinfo=$membertype->_load_ldap_info();

+                            $olddn=$membertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$membertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$membertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_VALIDATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If status field is setup to be synchronized

+                if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only status

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_SUBSCRIPTION')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If subscriptions fields are setup to be synchronized

+                if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE

+                    || $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT

+                    || $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE

+                    || $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT

+                    || $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only subscriptions

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+                    $newrdn=$object->_load_ldap_dn($info,2);

+                    $newparent=$object->_load_ldap_dn($info,1);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn,$newrdn,$newparent);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        /*

 						 * Change member info

 						 */

-						$newmembertype=new AdherentType($this->db);

-						$newmembertype->fetch($object->typeid);

-						$newmembertype->listMembersForMemberType('', 1);

-

-						$oldinfo=$newmembertype->_load_ldap_info();

-						$olddn=$newmembertype->_load_ldap_dn($oldinfo);

-

-						// Verify if entry exist

-						$container=$newmembertype->_load_ldap_dn($oldinfo,1);

-						$search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";

-						$records=$ldap->search($container,$search);

-						if (count($records) && $records['count'] == 0)

-						{

-							$olddn = '';

-						}

-

-						$info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-						$dn=$newmembertype->_load_ldap_dn($info);

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-

-						if ($object->oldcopy->typeid != $object->typeid)

-						{

-							/*

+                        $newmembertype=new AdherentType($this->db);

+                        $newmembertype->fetch($object->typeid);

+                        $newmembertype->listMembersForMemberType('', 1);

+

+                        $oldinfo=$newmembertype->_load_ldap_info();

+                        $olddn=$newmembertype->_load_ldap_dn($oldinfo);

+

+                        // Verify if entry exist

+                        $container=$newmembertype->_load_ldap_dn($oldinfo,1);

+                        $search = "(".$newmembertype->_load_ldap_dn($oldinfo,2).")";

+                        $records=$ldap->search($container,$search);

+                        if (count($records) && $records['count'] == 0)

+                        {

+                            $olddn = '';

+                        }

+

+                        $info=$newmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                        $dn=$newmembertype->_load_ldap_dn($info);

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+

+                        if ($object->oldcopy->typeid != $object->typeid)

+                        {

+                            /*

 							 * Remove member in old member type

 							 */

-							$oldmembertype=new AdherentType($this->db);

-							$oldmembertype->fetch($object->oldcopy->typeid);

-							$oldmembertype->listMembersForMemberType('', 1);

-

-							$oldinfo=$oldmembertype->_load_ldap_info();

-							$olddn=$oldmembertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$oldmembertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$oldmembertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_NEW_PASSWORD')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If password field is setup to be synchronized

-				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only password

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_RESILIATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				// If status field is setup to be synchronized

-				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

-				{

-					$ldap=new Ldap();

-					$result=$ldap->connect_bind();

-

-					if ($result > 0)

-					{

-						$info=$object->_load_ldap_info();

-						$dn=$object->_load_ldap_dn($info);

-						$olddn=$dn;	// We know olddn=dn as we change only status

-

-						$result=$ldap->update($dn,$info,$user,$olddn);

-					}

-

-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-				}

-			}

-		}

-		elseif ($action == 'MEMBER_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-

-					// For member type

-					if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-					{

-						if ($object->typeid > 0)

-						{

-							/*

+                            $oldmembertype=new AdherentType($this->db);

+                            $oldmembertype->fetch($object->oldcopy->typeid);

+                            $oldmembertype->listMembersForMemberType('', 1);

+

+                            $oldinfo=$oldmembertype->_load_ldap_info();

+                            $olddn=$oldmembertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$oldmembertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$oldmembertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$oldmembertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$oldmembertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_NEW_PASSWORD')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If password field is setup to be synchronized

+                if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only password

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_RESILIATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                // If status field is setup to be synchronized

+                if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))

+                {

+                    $ldap=new Ldap();

+                    $result=$ldap->connect_bind();

+

+                    if ($result > 0)

+                    {

+                        $info=$object->_load_ldap_info();

+                        $dn=$object->_load_ldap_dn($info);

+                        $olddn=$dn;	// We know olddn=dn as we change only status

+

+                        $result=$ldap->update($dn,$info,$user,$olddn);

+                    }

+

+                    if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+                }

+            }

+        }

+        elseif ($action == 'MEMBER_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+

+                    // For member type

+                    if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+                    {

+                        if ($object->typeid > 0)

+                        {

+                            /*

 							 * Remove member in member type

 							 */

-							$membertype=new AdherentType($this->db);

-							$membertype->fetch($object->typeid);

-							$membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list

-

-							$oldinfo=$membertype->_load_ldap_info();

-							$olddn=$membertype->_load_ldap_dn($oldinfo);

-

-							// Verify if entry exist

-							$container=$membertype->_load_ldap_dn($oldinfo,1);

-							$search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

-							$records=$ldap->search($container,$search);

-							if (count($records) && $records['count'] == 0)

-							{

-								$olddn = '';

-							}

-

-							$info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

-							$dn=$membertype->_load_ldap_dn($info);

-

-							$result=$ldap->update($dn,$info,$user,$olddn);

-						}

-					}

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		// Members types

-		elseif ($action == 'MEMBER_TYPE_CREATE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					// Get a gid number for objectclass PosixGroup

-					if (in_array('posixGroup',$info['objectclass'])) {

-						$info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');

-					}

-

-					$result=$ldap->add($dn,$info,$user);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_TYPE_MODIFY')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					if (empty($object->oldcopy) || ! is_object($object->oldcopy))

-					{

-						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

-						$object->oldcopy = clone $object;

-					}

-

-					$object->oldcopy->listMembersForMemberType('', 1);

-

-					$oldinfo=$object->oldcopy->_load_ldap_info();

-					$olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

-

-					// Verify if entry exist

-					$container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

-					$search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

-					$records=$ldap->search($container,$search);

-					if (count($records) && $records['count'] == 0)

-					{

-						$olddn = '';

-					}

-

-					$object->listMembersForMemberType('', 1);

-

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->update($dn,$info,$user,$olddn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-		elseif ($action == 'MEMBER_TYPE_DELETE')

-		{

-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

-			if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

-			{

-				$ldap=new Ldap();

-				$result=$ldap->connect_bind();

-

-				if ($result > 0)

-				{

-					$info=$object->_load_ldap_info();

-					$dn=$object->_load_ldap_dn($info);

-

-					$result=$ldap->delete($dn);

-				}

-

-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

-			}

-		}

-

-		return $result;

-	}

+                            $membertype=new AdherentType($this->db);

+                            $membertype->fetch($object->typeid);

+                            $membertype->listMembersForMemberType('a.rowid != ' . $object->id, 1); // remove deleted member from the list

+

+                            $oldinfo=$membertype->_load_ldap_info();

+                            $olddn=$membertype->_load_ldap_dn($oldinfo);

+

+                            // Verify if entry exist

+                            $container=$membertype->_load_ldap_dn($oldinfo,1);

+                            $search = "(".$membertype->_load_ldap_dn($oldinfo,2).")";

+                            $records=$ldap->search($container,$search);

+                            if (count($records) && $records['count'] == 0)

+                            {

+                                $olddn = '';

+                            }

+

+                            $info=$membertype->_load_ldap_info();    // Contains all members, included the new one (insert already done before trigger call)

+                            $dn=$membertype->_load_ldap_dn($info);

+

+                            $result=$ldap->update($dn,$info,$user,$olddn);

+                        }

+                    }

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        // Members types

+        elseif ($action == 'MEMBER_TYPE_CREATE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    // Get a gid number for objectclass PosixGroup

+                    if (in_array('posixGroup',$info['objectclass'])) {

+                        $info['gidNumber'] = $ldap->getNextGroupGid('LDAP_KEY_MEMBERS_TYPE');

+                    }

+

+                    $result=$ldap->add($dn,$info,$user);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_TYPE_MODIFY')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    if (empty($object->oldcopy) || ! is_object($object->oldcopy))

+                    {

+                        dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);

+                        $object->oldcopy = clone $object;

+                    }

+

+                    $object->oldcopy->listMembersForMemberType('', 1);

+

+                    $oldinfo=$object->oldcopy->_load_ldap_info();

+                    $olddn=$object->oldcopy->_load_ldap_dn($oldinfo);

+

+                    // Verify if entry exist

+                    $container=$object->oldcopy->_load_ldap_dn($oldinfo,1);

+                    $search = "(".$object->oldcopy->_load_ldap_dn($oldinfo,2).")";

+                    $records=$ldap->search($container,$search);

+                    if (count($records) && $records['count'] == 0)

+                    {

+                        $olddn = '';

+                    }

+

+                    $object->listMembersForMemberType('', 1);

+

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->update($dn,$info,$user,$olddn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+        elseif ($action == 'MEMBER_TYPE_DELETE')

+        {

+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);

+            if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')

+            {

+                $ldap=new Ldap();

+                $result=$ldap->connect_bind();

+

+                if ($result > 0)

+                {

+                    $info=$object->_load_ldap_info();

+                    $dn=$object->_load_ldap_dn($info);

+

+                    $result=$ldap->delete($dn);

+                }

+

+                if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;

+            }

+        }

+

+        return $result;

+    }

 }