alxarafe / alixar

dolibarr/scripts/contracts/email_expire_services_to_representatives.php

Indentation +42 added lines, -42 removed lines

@@ -33,17 +33,17 @@ 
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
 {
-	print "Usage: $script_file (test|confirm) [delay]\n";
-	print "\n";
-	print "Send an email to remind all contracts services to expire, to users that are sale representative for.\n";
-	print "If you choose 'test' mode, no emails are sent.\n";
-	print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
-	exit(-1);
+    print "Usage: $script_file (test|confirm) [delay]\n";
+    print "\n";
+    print "Send an email to remind all contracts services to expire, to users that are sale representative for.\n";
+    print "If you choose 'test' mode, no emails are sent.\n";
+    print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
+    exit(-1);
 }
 $mode=$argv[1];
 
@@ -90,9 +90,9 @@ 
     $i = 0;
     $oldemail = 'none'; $olduid = 0; $oldlang='';
     $total = 0; $foundtoprocess = 0;
-	print "We found ".$num." couples (services to expire - sale representative) qualified\n";
+    print "We found ".$num." couples (services to expire - sale representative) qualified\n";
     dol_syslog("We found ".$num." couples (services to expire - sale representative) qualified");
-	$message='';
+    $message='';
 
     if ($num)
     {
@@ -105,11 +105,11 @@ 
                 // Break onto sales representative (new email or uid)
                 if (dol_strlen($oldemail) && $oldemail != 'none')
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
+                        envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
                 }
                 else
-				{
-					if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+                {
+                    if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                 }
                 $oldemail = $obj->email;
                 $olduid = $obj->uid;
@@ -131,18 +131,18 @@ 
 
             if (dol_strlen($obj->email))
             {
-            	$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel,$obj->description)." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
-            	dol_syslog("email_expire_services_to_representatives.php: ".$obj->email);
-            	$foundtoprocess++;
+                $message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel,$obj->description)." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
+                dol_syslog("email_expire_services_to_representatives.php: ".$obj->email);
+                $foundtoprocess++;
             }
             print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel,$obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite),'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
             if (dol_strlen($obj->email)) print "qualified.";
             else print "disqualified (no email).";
-			print "\n";
+            print "\n";
 
-			unset($outputlangs);
+            unset($outputlangs);
 
-			$total += $obj->total_ttc;
+            $total += $obj->total_ttc;
             $i++;
         }
 
@@ -151,16 +151,16 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none')	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
+                    envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
             }
             else
-			{
-            	if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+            {
+                if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
             }
         }
     }
     else
-	{
+    {
         print "No services to expire (for companies linked to a particular commercial dolibarr user) found\n";
     }
 
@@ -194,23 +194,23 @@ 
     if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
 
     $newlangs=new Translate('',$conf);
-	$newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
+    $newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
     $newlangs->load("main");
     $newlangs->load("contracts");
 
     if ($duration_value)
     {
-    	if ($duration_value > 0) $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
-    	else $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
+        if ($duration_value > 0) $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
+        else $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
     }
     else
-    	$title= $newlangs->transnoentities("ListOfServicesToExpire");
+        $title= $newlangs->transnoentities("ListOfServicesToExpire");
 
     $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT)?$title:$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = -1;
+    $msgishtml = -1;
 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
@@ -222,19 +222,19 @@ 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
     }
     else
     {
-    	$allmessage.= $title.($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+        $allmessage.= $title.($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+        $allmessage.= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
     }
     $allmessage.= $message.($usehtml?"<br>\n":"\n");
     $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER;
+        if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
     }
 
     $mail = new CMailFile(
@@ -256,19 +256,19 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+        $result=$mail->sendfile();
+        if (! $result)
+        {
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
+        }
     }
     else
     {
-    	print "No email sent (test mode)\n";
-    	dol_syslog("No email sent (test mode)");
-    	$mail->dump_mail();
-    	$result=1;
+        print "No email sent (test mode)\n";
+        dol_syslog("No email sent (test mode)");
+        $mail->dump_mail();
+        $result=1;
     }
 
     if ($result)

dolibarr/scripts/invoices/rebuild_merge_pdf.php

Indentation +136 added lines, -136 removed lines

@@ -30,7 +30,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 // Include Dolibarr environment
@@ -62,8 +62,8 @@ 
 // Check parameters
 if (! isset($argv[1]))
 {
-	usage();
-	exit(-1);
+    usage();
+    exit(-1);
 }
 
 $diroutputpdf=$conf->facture->dir_output . '/temp';
@@ -75,98 +75,98 @@ 
 
 foreach ($argv as $key => $value)
 {
-	$found=false;
-
-	// Define options
-	if (preg_match('/^lang=/i',$value))
-	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$newlangid=$valarray[1];
-		print 'Use language '.$newlangid.".\n";
-	}
-	if (preg_match('/^prefix=/i',$value))
-	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$fileprefix=$valarray[1];
-		print 'Use prefix for filename '.$fileprefix.".\n";
-	}
-
-	if (preg_match('/^regenerate=(.*)/i',$value,$reg))
-	{
-	    if (! in_array($reg[1],array('','0','no')))
-	    {
-		    $found=true;
-		    $regenerate=$reg[1];
-		    print 'Regeneration of PDF is requested with template '.$regenerate."\n";
-	    }
-	}
-
-	if ($value == 'filter=all')
-	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'all';
-		$filter[]='all';
-
-		print 'Rebuild PDF for all invoices'."\n";
-	}
-
-	if ($value == 'filter=date')
-	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'date_'.$argv[$key+1].'_'.$argv[$key+2];
-		$filter[]='date';
-
-		$dateafterdate=dol_stringtotime($argv[$key+1]);
-		$datebeforedate=dol_stringtotime($argv[$key+2]);
-		print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate,'day','gmt')." and ".dol_print_date($datebeforedate,'day','gmt').".\n";
-	}
-
-	if ($value == 'filter=payments')
-	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'payments_'.$argv[$key+1].'_'.$argv[$key+2];
-		$filter[]='payments';
-
-		$paymentdateafter=dol_stringtotime($argv[$key+1].'000000');
-		$paymentdatebefore=dol_stringtotime($argv[$key+2].'235959');
-		if (empty($paymentdateafter) || empty($paymentdatebefore))
-		{
-			print 'Error: Bad date format or value'."\n";
-			exit(-1);
-		}
-		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day','gmt')." and ".dol_print_date($paymentdatebefore,'day','gmt').".\n";
-	}
-
-	if ($value == 'filter=nopayment')
-	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'nopayment';
-		$filter[]='nopayment';
-
-		print 'Rebuild PDF for invoices with no payment done yet.'."\n";
-	}
-
-	if ($value == 'filter=bank')
-	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'bank_'.$argv[$key+1];
-		$filter[]='bank';
-
-		$paymentonbankref=$argv[$key+1];
-		$bankaccount=new Account($db);
-		$result=$bankaccount->fetch(0,$paymentonbankref);
-		if ($result <= 0)
-		{
-			print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
-			exit(-1);
-		}
-		$paymentonbankid=$bankaccount->id;
-		print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
-	}
-
-	if ($value == 'filter=nodeposit')
+    $found=false;
+
+    // Define options
+    if (preg_match('/^lang=/i',$value))
+    {
+        $found=true;
+        $valarray=explode('=',$value);
+        $newlangid=$valarray[1];
+        print 'Use language '.$newlangid.".\n";
+    }
+    if (preg_match('/^prefix=/i',$value))
+    {
+        $found=true;
+        $valarray=explode('=',$value);
+        $fileprefix=$valarray[1];
+        print 'Use prefix for filename '.$fileprefix.".\n";
+    }
+
+    if (preg_match('/^regenerate=(.*)/i',$value,$reg))
+    {
+        if (! in_array($reg[1],array('','0','no')))
+        {
+            $found=true;
+            $regenerate=$reg[1];
+            print 'Regeneration of PDF is requested with template '.$regenerate."\n";
+        }
+    }
+
+    if ($value == 'filter=all')
+    {
+        $found=true;
+        $option.=(empty($option)?'':'_').'all';
+        $filter[]='all';
+
+        print 'Rebuild PDF for all invoices'."\n";
+    }
+
+    if ($value == 'filter=date')
+    {
+        $found=true;
+        $option.=(empty($option)?'':'_').'date_'.$argv[$key+1].'_'.$argv[$key+2];
+        $filter[]='date';
+
+        $dateafterdate=dol_stringtotime($argv[$key+1]);
+        $datebeforedate=dol_stringtotime($argv[$key+2]);
+        print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate,'day','gmt')." and ".dol_print_date($datebeforedate,'day','gmt').".\n";
+    }
+
+    if ($value == 'filter=payments')
+    {
+        $found=true;
+        $option.=(empty($option)?'':'_').'payments_'.$argv[$key+1].'_'.$argv[$key+2];
+        $filter[]='payments';
+
+        $paymentdateafter=dol_stringtotime($argv[$key+1].'000000');
+        $paymentdatebefore=dol_stringtotime($argv[$key+2].'235959');
+        if (empty($paymentdateafter) || empty($paymentdatebefore))
+        {
+            print 'Error: Bad date format or value'."\n";
+            exit(-1);
+        }
+        print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day','gmt')." and ".dol_print_date($paymentdatebefore,'day','gmt').".\n";
+    }
+
+    if ($value == 'filter=nopayment')
+    {
+        $found=true;
+        $option.=(empty($option)?'':'_').'nopayment';
+        $filter[]='nopayment';
+
+        print 'Rebuild PDF for invoices with no payment done yet.'."\n";
+    }
+
+    if ($value == 'filter=bank')
+    {
+        $found=true;
+        $option.=(empty($option)?'':'_').'bank_'.$argv[$key+1];
+        $filter[]='bank';
+
+        $paymentonbankref=$argv[$key+1];
+        $bankaccount=new Account($db);
+        $result=$bankaccount->fetch(0,$paymentonbankref);
+        if ($result <= 0)
+        {
+            print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
+            exit(-1);
+        }
+        $paymentonbankid=$bankaccount->id;
+        print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
+    }
+
+    if ($value == 'filter=nodeposit')
     {
         $found=true;
         $option.=(empty($option)?'':'_').'nodeposit';
@@ -193,48 +193,48 @@ 
 
     if ($value == 'filter=excludethirdparties')
     {
-    	$found=true;
-    	$filter[]='excludethirdparties';
+        $found=true;
+        $filter[]='excludethirdparties';
 
-    	$thirdpartiesid=explode(',',$argv[$key+1]);
-    	print 'Exclude thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
+        $thirdpartiesid=explode(',',$argv[$key+1]);
+        print 'Exclude thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
 
-    	$option.=(empty($option)?'':'_').'excludethirdparties'.join('-',$thirdpartiesid);
+        $option.=(empty($option)?'':'_').'excludethirdparties'.join('-',$thirdpartiesid);
     }
     if ($value == 'filter=onlythirdparties')
     {
-    	$found=true;
-    	$filter[]='onlythirdparties';
+        $found=true;
+        $filter[]='onlythirdparties';
 
-    	$thirdpartiesid=explode(',',$argv[$key+1]);
-    	print 'Only thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
+        $thirdpartiesid=explode(',',$argv[$key+1]);
+        print 'Only thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
 
-    	$option.=(empty($option)?'':'_').'onlythirdparty'.join('-',$thirdpartiesid);
+        $option.=(empty($option)?'':'_').'onlythirdparty'.join('-',$thirdpartiesid);
     }
 
-	if (! $found && preg_match('/filter=/i',$value))
-	{
-		usage();
-		exit(-1);
-	}
+    if (! $found && preg_match('/filter=/i',$value))
+    {
+        usage();
+        exit(-1);
+    }
 }
 
 // Check if an option and a filter has been provided
 if (empty($option) && count($filter) <= 0)
 {
-	usage();
-	exit(-1);
+    usage();
+    exit(-1);
 }
 // Check if there is no uncompatible choice
 if (in_array('payments',$filter) && in_array('nopayment',$filter))
 {
-	usage();
-	exit(-1);
+    usage();
+    exit(-1);
 }
 if (in_array('bank',$filter) && in_array('nopayment',$filter))
 {
-	usage();
-	exit(-1);
+    usage();
+    exit(-1);
 }
 
 
@@ -248,13 +248,13 @@ 
 
 if ($result >= 0)
 {
-	$error=0;
-	print '--- end ok'."\n";
+    $error=0;
+    print '--- end ok'."\n";
 }
 else
 {
-	$error=$result;
-	print '--- end error code='.$error."\n";
+    $error=$result;
+    print '--- end error code='.$error."\n";
 }
 
 $db->close();
@@ -270,20 +270,20 @@ 
  */
 function usage()
 {
-	global $script_file;
+    global $script_file;
 
     print "Rebuild PDF files for some invoices and merge PDF files into one.\n";
-	print "\n";
-	print "To build/merge PDF for invoices in a date range:\n";
-	print "Usage:   ".$script_file." filter=date dateafter datebefore\n";
-	print "To build/merge PDF for invoices with at least one payment in a date range:\n";
-	print "Usage:   ".$script_file." filter=payments dateafter datebefore\n";
-	print "To build/merge PDF for invoices with at least one payment onto a bank account:\n";
-	print "Usage:   ".$script_file." filter=bank bankref\n";
-	print "To build/merge PDF for all invoices, use filter=all\n";
-	print "Usage:   ".$script_file." filter=all\n";
-	print "To build/merge PDF for invoices with no payments, use filter=nopayment\n";
-	print "Usage:   ".$script_file." filter=nopayment\n";
+    print "\n";
+    print "To build/merge PDF for invoices in a date range:\n";
+    print "Usage:   ".$script_file." filter=date dateafter datebefore\n";
+    print "To build/merge PDF for invoices with at least one payment in a date range:\n";
+    print "Usage:   ".$script_file." filter=payments dateafter datebefore\n";
+    print "To build/merge PDF for invoices with at least one payment onto a bank account:\n";
+    print "Usage:   ".$script_file." filter=bank bankref\n";
+    print "To build/merge PDF for all invoices, use filter=all\n";
+    print "Usage:   ".$script_file." filter=all\n";
+    print "To build/merge PDF for invoices with no payments, use filter=nopayment\n";
+    print "Usage:   ".$script_file." filter=nopayment\n";
     print "To exclude credit notes, use filter=nocreditnote\n";
     print "To exclude replacement invoices, use filter=noreplacement\n";
     print "To exclude deposit invoices, use filter=nodeposit\n";
@@ -293,8 +293,8 @@ 
     print "To generate invoices in a language, use lang=xx_XX\n";
     print "To set prefix of generated file name, use prefix=myfileprefix\n";
     print "\n";
-	print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
-	print "Example: ".$script_file." filter=all lang=en_US\n";
-	print "\n";
-	print "Note that some filters can be cumulated.\n";
+    print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
+    print "Example: ".$script_file." filter=all lang=en_US\n";
+    print "\n";
+    print "Note that some filters can be cumulated.\n";
 }

dolibarr/scripts/invoices/email_unpaid_invoices_to_representatives.php

Indentation +37 added lines, -37 removed lines

@@ -33,17 +33,17 @@ 
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
 {
-	print "Usage: $script_file (test|confirm) [delay]\n";
-	print "\n";
-	print "Send an email to users to remind all unpaid customer invoices user is sale representative for.\n";
-	print "If you choose 'test' mode, no emails are sent.\n";
-	print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
-	exit(-1);
+    print "Usage: $script_file (test|confirm) [delay]\n";
+    print "\n";
+    print "Send an email to users to remind all unpaid customer invoices user is sale representative for.\n";
+    print "If you choose 'test' mode, no emails are sent.\n";
+    print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
+    exit(-1);
 }
 $mode=$argv[1];
 
@@ -96,9 +96,9 @@ 
     $i = 0;
     $oldemail = 'none'; $olduid = 0; $oldlang='';
     $total = 0; $foundtoprocess = 0;
-	print "We found ".$num." couples (unpayed validated invoice - sale representative) qualified\n";
+    print "We found ".$num." couples (unpayed validated invoice - sale representative) qualified\n";
     dol_syslog("We found ".$num." couples (unpayed validated invoice - sale representative) qualified");
-	$message='';
+    $message='';
 
     if ($num)
     {
@@ -111,11 +111,11 @@ 
                 // Break onto sales representative (new email or uid)
                 if (dol_strlen($oldemail) && $oldemail != 'none')
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
+                        envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
                 }
                 else
-				{
-					if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+                {
+                    if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                 }
                 $oldemail = $obj->email;
                 $olduid = $obj->uid;
@@ -137,16 +137,16 @@ 
 
             if (dol_strlen($obj->email))
             {
-            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)." : ".$obj->name."\n";
-            	dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email);
-            	$foundtoprocess++;
+                $message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)." : ".$obj->name."\n";
+                dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email);
+                $foundtoprocess++;
             }
             print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
             if (dol_strlen($obj->email)) print "qualified.";
             else print "disqualified (no email).";
-			print "\n";
+            print "\n";
 
-			unset($outputlangs);
+            unset($outputlangs);
 
             $total += $obj->total_ttc;
             $i++;
@@ -157,16 +157,16 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none')	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
+                    envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
             }
             else
-			{
-            	if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+            {
+                if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
             }
         }
     }
     else
-	{
+    {
         print "No unpaid invoices (for companies linked to a particular commercial dolibarr user) found\n";
     }
 
@@ -207,7 +207,7 @@ 
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = -1;
+    $msgishtml = -1;
 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
@@ -219,19 +219,19 @@ 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
     }
     else
     {
-    	$allmessage.= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n");
+        $allmessage.= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+        $allmessage.= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n");
     }
     $allmessage.= $message.($usehtml?"<br>\n":"\n");
     $allmessage.= $langs->trans("Total")." = ".price($total,0,$newlangs,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;
+        if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
     }
 
     $mail = new CMailFile(
@@ -253,19 +253,19 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+        $result=$mail->sendfile();
+        if (! $result)
+        {
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
+        }
     }
     else
     {
-    	print "No email sent (test mode)\n";
-    	dol_syslog("No email sent (test mode)");
-    	$mail->dump_mail();
-    	$result=1;
+        print "No email sent (test mode)\n";
+        dol_syslog("No email sent (test mode)");
+        $mail->dump_mail();
+        $result=1;
     }
 
     if ($result)

dolibarr/scripts/invoices/email_unpaid_invoices_to_customers.php

Indentation +50 added lines, -50 removed lines

@@ -33,18 +33,18 @@ 
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[2]) || ! $argv[2] || ! in_array($argv[1],array('test','confirm')) || ! in_array($argv[2],array('thirdparties','contacts')))
 {
-	print "Usage: $script_file (test|confirm) (thirdparties|contacts) [delay] [after]\n";
-	print "\n";
-	print "Send an email to customers to remind all unpaid customer invoices.\n";
-	print "If you choose 'test' mode, no emails are sent.\n";
-	print "If you add param delay (nb of days), only invoice with due date < today + delay are included.\n";
-	print "If you add param after (nb of days), only invoice with due date >= today + delay are included.\n";
-	exit(-1);
+    print "Usage: $script_file (test|confirm) (thirdparties|contacts) [delay] [after]\n";
+    print "\n";
+    print "Send an email to customers to remind all unpaid customer invoices.\n";
+    print "If you choose 'test' mode, no emails are sent.\n";
+    print "If you add param delay (nb of days), only invoice with due date < today + delay are included.\n";
+    print "If you add param after (nb of days), only invoice with due date >= today + delay are included.\n";
+    exit(-1);
 }
 $mode=$argv[1];
 $targettype=$argv[2];
@@ -102,9 +102,9 @@ 
     $total = 0; $foundtoprocess = 0;
     $trackthirdpartiessent = array();
 
-	print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
+    print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
     dol_syslog("We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified");
-	$message='';
+    $message='';
 
     if ($num)
     {
@@ -116,25 +116,25 @@ 
 
             // Check if this record is a break after previous one
             $startbreak=false;
-			if ($newemail <> $oldemail || $oldemail == 'none') $startbreak=true;
-			if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
-			if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
+            if ($newemail <> $oldemail || $oldemail == 'none') $startbreak=true;
+            if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
+            if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
 
             if ($startbreak)
             {
                 // Break onto sales representative (new email or cid)
                 if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
-                   	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+                        envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
+                        $trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
                 }
                 else
-				{
-                	if ($oldemail != 'none')
-                	{
-                		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-                		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
-                	}
+                {
+                    if ($oldemail != 'none')
+                    {
+                        if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+                        else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                    }
                 }
                 $oldemail = $newemail;
                 $oldsid  = $obj->sid;
@@ -157,9 +157,9 @@ 
 
             if (dol_strlen($newemail))
             {
-            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."\n";
-            	dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
-            	$foundtoprocess++;
+                $message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."\n";
+                dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
+                $foundtoprocess++;
             }
             print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", ":"")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
             if (dol_strlen($newemail)) print "qualified.";
@@ -178,21 +178,21 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
-       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+                    envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
+                    $trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
             }
             else
-			{
-            	if ($oldemail != 'none')
-            	{
-            		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-            		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
-            	}
+            {
+                if ($oldemail != 'none')
+                {
+                    if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+                    else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                }
             }
         }
     }
     else
-	{
+    {
         print "No unpaid invoices found\n";
     }
 
@@ -233,7 +233,7 @@ 
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = -1;
+    $msgishtml = -1;
 
     print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
@@ -245,20 +245,20 @@ 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
     }
     else
     {
-    	$allmessage.= "Dear customer".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= "Please, find a summary of the bills with pending payments from you.".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= "Note: This list contains only unpaid invoices.".($usehtml?"<br>\n":"\n");
+        $allmessage.= "Dear customer".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+        $allmessage.= "Please, find a summary of the bills with pending payments from you.".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+        $allmessage.= "Note: This list contains only unpaid invoices.".($usehtml?"<br>\n":"\n");
     }
     $allmessage.= $message.($usehtml?"<br>\n":"\n");
     $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
     if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
+        $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
+        if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
     }
 
     $mail = new CMailFile(
@@ -280,19 +280,19 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
-    	{
-    		print "Error sending email ".$mail->error."\n";
-    		dol_syslog("Error sending email ".$mail->error."\n");
-    	}
+        $result=$mail->sendfile();
+        if (! $result)
+        {
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
+        }
     }
     else
     {
-    	print "No email sent (test mode)\n";
-    	dol_syslog("No email sent (test mode)");
-    	$mail->dump_mail();
-    	$result=1;
+        print "No email sent (test mode)\n";
+        dol_syslog("No email sent (test mode)");
+        $mail->dump_mail();
+        $result=1;
     }
 
     unset($newlangs);

dolibarr/scripts/user/sync_users_dolibarr2ldap.php

Indentation +35 added lines, -35 removed lines

@@ -31,12 +31,12 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
-	exit(-1);
+    exit(-1);
 }
 $now=$argv[1];
 
@@ -71,53 +71,53 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	$ldap=new Ldap();
-	$ldap->connect_bind();
+    $ldap=new Ldap();
+    $ldap->connect_bind();
 
-	while ($i < $num)
-	{
-		$ldap->error="";
+    while ($i < $num)
+    {
+        $ldap->error="";
 
-		$obj = $db->fetch_object($resql);
+        $obj = $db->fetch_object($resql);
 
-		$fuser = new User($db);
-		$fuser->fetch($obj->rowid);
+        $fuser = new User($db);
+        $fuser->fetch($obj->rowid);
 
-		print $langs->trans("UpdateUser")." rowid=".$fuser->id." ".$fuser->getFullName($langs);
+        print $langs->trans("UpdateUser")." rowid=".$fuser->id." ".$fuser->getFullName($langs);
 
-		$oldobject=$fuser;
+        $oldobject=$fuser;
 
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
+        $oldinfo=$oldobject->_load_ldap_info();
+        $olddn=$oldobject->_load_ldap_dn($oldinfo);
 
-	    $info=$fuser->_load_ldap_info();
-		$dn=$fuser->_load_ldap_dn($info);
+        $info=$fuser->_load_ldap_info();
+        $dn=$fuser->_load_ldap_dn($info);
 
-		$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-		$result=$ldap->update($dn,$info,$user,$olddn);
-		if ($result > 0)
-		{
-			print " - ".$langs->trans("OK");
-		}
-		else
-		{
-			$error++;
-			print " - ".$langs->trans("KO").' - '.$ldap->error;
-		}
-		print "\n";
+        $result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
+        $result=$ldap->update($dn,$info,$user,$olddn);
+        if ($result > 0)
+        {
+            print " - ".$langs->trans("OK");
+        }
+        else
+        {
+            $error++;
+            print " - ".$langs->trans("KO").' - '.$ldap->error;
+        }
+        print "\n";
 
-		$i++;
-	}
+        $i++;
+    }
 
-	$ldap->unbind();
-	$ldap->close();
+    $ldap->unbind();
+    $ldap->close();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

dolibarr/scripts/user/sync_users_ldap2dolibarr.php

Indentation +161 added lines, -161 removed lines

@@ -31,7 +31,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -58,41 +58,41 @@ 
 
 // List of fields to get from LDAP
 $required_fields = array(
-	$conf->global->LDAP_KEY_USERS,
-	$conf->global->LDAP_FIELD_FULLNAME,
-	$conf->global->LDAP_FIELD_NAME,
-	$conf->global->LDAP_FIELD_FIRSTNAME,
-	$conf->global->LDAP_FIELD_LOGIN,
-	$conf->global->LDAP_FIELD_LOGIN_SAMBA,
-	$conf->global->LDAP_FIELD_PASSWORD,
-	$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
-	$conf->global->LDAP_FIELD_PHONE,
-	$conf->global->LDAP_FIELD_FAX,
-	$conf->global->LDAP_FIELD_MOBILE,
-	//$conf->global->LDAP_FIELD_ADDRESS,
-	//$conf->global->LDAP_FIELD_ZIP,
-	//$conf->global->LDAP_FIELD_TOWN,
-	//$conf->global->LDAP_FIELD_COUNTRY,
-	$conf->global->LDAP_FIELD_MAIL,
-	$conf->global->LDAP_FIELD_TITLE,
-	$conf->global->LDAP_FIELD_DESCRIPTION,
-	$conf->global->LDAP_FIELD_SID
+    $conf->global->LDAP_KEY_USERS,
+    $conf->global->LDAP_FIELD_FULLNAME,
+    $conf->global->LDAP_FIELD_NAME,
+    $conf->global->LDAP_FIELD_FIRSTNAME,
+    $conf->global->LDAP_FIELD_LOGIN,
+    $conf->global->LDAP_FIELD_LOGIN_SAMBA,
+    $conf->global->LDAP_FIELD_PASSWORD,
+    $conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+    $conf->global->LDAP_FIELD_PHONE,
+    $conf->global->LDAP_FIELD_FAX,
+    $conf->global->LDAP_FIELD_MOBILE,
+    //$conf->global->LDAP_FIELD_ADDRESS,
+    //$conf->global->LDAP_FIELD_ZIP,
+    //$conf->global->LDAP_FIELD_TOWN,
+    //$conf->global->LDAP_FIELD_COUNTRY,
+    $conf->global->LDAP_FIELD_MAIL,
+    $conf->global->LDAP_FIELD_TITLE,
+    $conf->global->LDAP_FIELD_DESCRIPTION,
+    $conf->global->LDAP_FIELD_SID
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
 if (! isset($argv[1])) {
-	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
+    print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
     exit(-1);
 }
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if ($val == 'commitiferror') $forcecommit=1;
+    if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+    if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -120,14 +120,14 @@ 
 
 if (! $confirmed)
 {
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 if (empty($conf->global->LDAP_USER_DN))
 {
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
-	exit(-1);
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
+    exit(-1);
 }
 
 
@@ -141,27 +141,27 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				//print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
-				$hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
-				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
-			}
-			$i++;
-		}
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+    if ($num)
+    {
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                //print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
+                $hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
+                $countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
+            }
+            $i++;
+        }
+    }
 }
 else
 {
-	dol_print_error($db);
-	exit(-1);
+    dol_print_error($db);
+    exit(-1);
 }
 
 
@@ -170,44 +170,44 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
-
-
-	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_SYNCHRO_ACTIVE=0;
-
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 'user');	// Fiter on 'user' filter param
-	if (is_array($ldaprecords))
-	{
-		$db->begin();
-
-		// Warning $ldapuser has a key in lowercase
-		foreach ($ldaprecords as $key => $ldapuser)
-		{
-			// If login into exclude list, we discard record
-			if (in_array($ldapuser[$conf->global->LDAP_FIELD_LOGIN],$excludeuser))
-			{
-				print $langs->transnoentities("UserDiscarded").' # '.$key.': login='.$ldapuser[$conf->global->LDAP_FIELD_LOGIN].' --> Discarded'."\n";
-				continue;
-			}
-
-			$fuser = new User($db);
-
-			if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
-				$fuser->fetch('','',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le SID
-			} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
-				$fuser->fetch('',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le login
-			}
-
-			// Propriete membre
-			$fuser->firstname=$ldapuser[$conf->global->LDAP_FIELD_FIRSTNAME];
-			$fuser->lastname=$ldapuser[$conf->global->LDAP_FIELD_NAME];
-			$fuser->login=$ldapuser[$conf->global->LDAP_FIELD_LOGIN];
-			$fuser->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
-			$fuser->pass_indatabase_crypted=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED];
-
-			//$user->societe;
-			/*
+    $justthese=array();
+
+
+    // We disable synchro Dolibarr-LDAP
+    $conf->global->LDAP_SYNCHRO_ACTIVE=0;
+
+    $ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 'user');	// Fiter on 'user' filter param
+    if (is_array($ldaprecords))
+    {
+        $db->begin();
+
+        // Warning $ldapuser has a key in lowercase
+        foreach ($ldaprecords as $key => $ldapuser)
+        {
+            // If login into exclude list, we discard record
+            if (in_array($ldapuser[$conf->global->LDAP_FIELD_LOGIN],$excludeuser))
+            {
+                print $langs->transnoentities("UserDiscarded").' # '.$key.': login='.$ldapuser[$conf->global->LDAP_FIELD_LOGIN].' --> Discarded'."\n";
+                continue;
+            }
+
+            $fuser = new User($db);
+
+            if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
+                $fuser->fetch('','',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le SID
+            } else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
+                $fuser->fetch('',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le login
+            }
+
+            // Propriete membre
+            $fuser->firstname=$ldapuser[$conf->global->LDAP_FIELD_FIRSTNAME];
+            $fuser->lastname=$ldapuser[$conf->global->LDAP_FIELD_NAME];
+            $fuser->login=$ldapuser[$conf->global->LDAP_FIELD_LOGIN];
+            $fuser->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
+            $fuser->pass_indatabase_crypted=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED];
+
+            //$user->societe;
+            /*
 			$fuser->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
 			$fuser->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
 			$fuser->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
@@ -216,93 +216,93 @@ 
 			$fuser->country_code=$countries[$hashlib2rowid[strtolower($fuser->country)]]['code'];
 			*/
 
-			$fuser->office_phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
-			$fuser->user_mobile=$ldapuser[$conf->global->LDAP_FIELD_MOBILE];
-			$fuser->office_fax=$ldapuser[$conf->global->LDAP_FIELD_FAX];
-			$fuser->email=$ldapuser[$conf->global->LDAP_FIELD_MAIL];
-			$fuser->ldap_sid=$ldapuser[$conf->global->LDAP_FIELD_SID];
-
-			$fuser->job=$ldapuser[$conf->global->LDAP_FIELD_TITLE];
-			$fuser->note=$ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
-			$fuser->admin=0;
-			$fuser->societe_id=0;
-			$fuser->contact_id=0;
-			$fuser->fk_member=0;
-
-			$fuser->statut=1;
-			// TODO : revoir la gestion du status
-			/*if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
+            $fuser->office_phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
+            $fuser->user_mobile=$ldapuser[$conf->global->LDAP_FIELD_MOBILE];
+            $fuser->office_fax=$ldapuser[$conf->global->LDAP_FIELD_FAX];
+            $fuser->email=$ldapuser[$conf->global->LDAP_FIELD_MAIL];
+            $fuser->ldap_sid=$ldapuser[$conf->global->LDAP_FIELD_SID];
+
+            $fuser->job=$ldapuser[$conf->global->LDAP_FIELD_TITLE];
+            $fuser->note=$ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
+            $fuser->admin=0;
+            $fuser->societe_id=0;
+            $fuser->contact_id=0;
+            $fuser->fk_member=0;
+
+            $fuser->statut=1;
+            // TODO : revoir la gestion du status
+            /*if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
 			{
 				$fuser->datec=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
 				$fuser->datevalid=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
 				$fuser->statut=$ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS];
 			}*/
-			//if ($fuser->statut > 1) $fuser->statut=1;
-
-			//print_r($ldapuser);
-
-			if($fuser->id > 0) { // User update
-				print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
-				$res=$fuser->update($user);
-
-				if ($res < 0)
-				{
-					$error++;
-					print ' --> '.$res.' '.$fuser->error;
-				}
-				else
-				{
-					print ' --> Updated user id='.$fuser->id.' login='.$fuser->login;
-				}
-			} else { // User creation
-				print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
-				$res=$fuser->create($user);
-
-				if ($res > 0)
-				{
-					print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$fuser->error;
-				}
-			}
-			print "\n";
-			//print_r($fuser);
-
-			// Gestion des groupes
-			// TODO : revoir la gestion des groupes (ou script de sync groupes)
-			/*if(!$error) {
+            //if ($fuser->statut > 1) $fuser->statut=1;
+
+            //print_r($ldapuser);
+
+            if($fuser->id > 0) { // User update
+                print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
+                $res=$fuser->update($user);
+
+                if ($res < 0)
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$fuser->error;
+                }
+                else
+                {
+                    print ' --> Updated user id='.$fuser->id.' login='.$fuser->login;
+                }
+            } else { // User creation
+                print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
+                $res=$fuser->create($user);
+
+                if ($res > 0)
+                {
+                    print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$fuser->error;
+                }
+            }
+            print "\n";
+            //print_r($fuser);
+
+            // Gestion des groupes
+            // TODO : revoir la gestion des groupes (ou script de sync groupes)
+            /*if(!$error) {
 				foreach ($ldapuser[$conf->global->LDAP_FIELD_USERGROUPS] as $groupdn) {
 					$groupdn;
 				}
 			}*/
-		}
-
-		if (! $error || $forcecommit)
-		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
-			$db->commit();
-		}
-		else
-		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
-			$db->rollback();
-		}
-		print "\n";
-	}
-	else
-	{
-		dol_print_error('',$ldap->error);
-		$error++;
-	}
+        }
+
+        if (! $error || $forcecommit)
+        {
+            if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+            else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+            $db->commit();
+        }
+        else
+        {
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+            $db->rollback();
+        }
+        print "\n";
+    }
+    else
+    {
+        dol_print_error('',$ldap->error);
+        $error++;
+    }
 }
 else
 {
-	dol_print_error('',$ldap->error);
-	$error++;
+    dol_print_error('',$ldap->error);
+    $error++;
 }
 
 
@@ -317,6 +317,6 @@ 
  */
 function dolValidElement($element)
 {
-	return (trim($element) != '');
+    return (trim($element) != '');
 }
 

dolibarr/scripts/user/sync_groups_dolibarr2ldap.php

Indentation +36 added lines, -36 removed lines

@@ -31,12 +31,12 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: ".$script_file." now\n";
-	exit(-1);
+    exit(-1);
 }
 $now=$argv[1];
 
@@ -71,54 +71,54 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	$ldap=new Ldap();
-	$ldap->connect_bind();
+    $ldap=new Ldap();
+    $ldap->connect_bind();
 
-	while ($i < $num)
-	{
-		$ldap->error="";
+    while ($i < $num)
+    {
+        $ldap->error="";
 
-		$obj = $db->fetch_object($resql);
+        $obj = $db->fetch_object($resql);
 
-		$fgroup = new UserGroup($db);
-		$fgroup->id = $obj->rowid;
-		$fgroup->fetch($fgroup->id);
+        $fgroup = new UserGroup($db);
+        $fgroup->id = $obj->rowid;
+        $fgroup->fetch($fgroup->id);
 
-		print $langs->trans("UpdateGroup")." rowid=".$fgroup->id." ".$fgroup->name;
+        print $langs->trans("UpdateGroup")." rowid=".$fgroup->id." ".$fgroup->name;
 
-		$oldobject=$fgroup;
+        $oldobject=$fgroup;
 
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
+        $oldinfo=$oldobject->_load_ldap_info();
+        $olddn=$oldobject->_load_ldap_dn($oldinfo);
 
-	    $info=$fgroup->_load_ldap_info();
-		$dn=$fgroup->_load_ldap_dn($info);
+        $info=$fgroup->_load_ldap_info();
+        $dn=$fgroup->_load_ldap_dn($info);
 
-		$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-		$result=$ldap->update($dn,$info,$user,$olddn);
-		if ($result > 0)
-		{
-			print " - ".$langs->trans("OK");
-		}
-		else
-		{
-			$error++;
-			print " - ".$langs->trans("KO").' - '.$ldap->error;
-		}
-		print "\n";
+        $result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
+        $result=$ldap->update($dn,$info,$user,$olddn);
+        if ($result > 0)
+        {
+            print " - ".$langs->trans("OK");
+        }
+        else
+        {
+            $error++;
+            print " - ".$langs->trans("KO").' - '.$ldap->error;
+        }
+        print "\n";
 
-		$i++;
-	}
+        $i++;
+    }
 
-	$ldap->unbind();
-	$ldap->close();
+    $ldap->unbind();
+    $ldap->close();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

dolibarr/scripts/user/sync_groups_ldap2dolibarr.php

Indentation +139 added lines, -139 removed lines

@@ -32,7 +32,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -60,10 +60,10 @@ 
 
 // List of fields to get from LDAP
 $required_fields = array(
-	$conf->global->LDAP_KEY_GROUPS,
-	$conf->global->LDAP_GROUP_FIELD_FULLNAME,
-	$conf->global->LDAP_GROUP_FIELD_DESCRIPTION,
-	$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS
+    $conf->global->LDAP_KEY_GROUPS,
+    $conf->global->LDAP_GROUP_FIELD_FULLNAME,
+    $conf->global->LDAP_GROUP_FIELD_DESCRIPTION,
+    $conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
@@ -71,17 +71,17 @@ 
 
 
 if (! isset($argv[1])) {
-	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
-	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
-	exit(-1);
+    //print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
+    print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
+    exit(-1);
 }
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if ($val == 'commitiferror') $forcecommit=1;
+    if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+    if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -107,14 +107,14 @@ 
 
 if (! $confirmed)
 {
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 if (empty($conf->global->LDAP_GROUP_DN))
 {
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
-	exit(-1);
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
+    exit(-1);
 }
 
 
@@ -122,131 +122,131 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
-
-
-	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_SYNCHRO_ACTIVE=0;
-
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 0, array($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS));
-	if (is_array($ldaprecords))
-	{
-		$db->begin();
-
-		// Warning $ldapuser has a key in lowercase
-		foreach ($ldaprecords as $key => $ldapgroup)
-		{
-			$group = new UserGroup($db);
-			$group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]);
-			$group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
-			$group->nom = $group->name;		// For backward compatibility
-			$group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION];
-			$group->entity = $conf->entity;
-
-			//print_r($ldapgroup);
-
-			if($group->id > 0) { // Group update
-				print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
-				$res=$group->update();
-
-				if ($res > 0)
-				{
-					print ' --> Updated group id='.$group->id.' name='.$group->name;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$group->error;
-				}
-				print "\n";
-			} else { // Group creation
-				print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
-				$res=$group->create();
-
-				if ($res > 0)
-				{
-					print ' --> Created group id='.$group->id.' name='.$group->name;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$group->error;
-				}
-				print "\n";
-			}
-
-			//print_r($group);
-
-			// Gestion des utilisateurs associés au groupe
-			// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
-			$userList = array();
-			$userIdList = array();
-			foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if($key === 'count') continue;
-				if(empty($userList[$userdn])) { // Récupération de l'utilisateur
-					// Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
-					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid'){
-						$userKey = array($userdn);
-					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
-						$userFilter = explode(',', $userdn);
-						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
-					}
-					if(!is_array($userKey)) continue;
-
-					$fuser = new User($db);
-
-					if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
-						$fuser->fetch('','',$userKey[0]); // Chargement du user concerné par le SID
-					} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
-						$fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
-					}
-
-					$userList[$userdn] = $fuser;
-				} else {
-					$fuser = &$userList[$userdn];
-				}
-
-				$userIdList[$userdn] = $fuser->id;
-
-				// Ajout de l'utilisateur dans le groupe
-				if(!in_array($fuser->id, array_keys($group->members))) {
-					$fuser->SetInGroup($group->id, $group->entity);
-					echo $fuser->login.' added'."\n";
-				}
-			}
-
-			// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
-			foreach ($group->members as $guser) {
-				if(!in_array($guser->id, $userIdList)) {
-					$guser->RemoveFromGroup($group->id, $group->entity);
-					echo $guser->login.' removed'."\n";
-				}
-			}
-		}
-
-		if (! $error || $forcecommit)
-		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
-			$db->commit();
-		}
-		else
-		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
-			$db->rollback();
-		}
-		print "\n";
-	}
-	else
-	{
-		dol_print_error('',$ldap->error);
-		$error++;
-	}
+    $justthese=array();
+
+
+    // We disable synchro Dolibarr-LDAP
+    $conf->global->LDAP_SYNCHRO_ACTIVE=0;
+
+    $ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 0, array($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS));
+    if (is_array($ldaprecords))
+    {
+        $db->begin();
+
+        // Warning $ldapuser has a key in lowercase
+        foreach ($ldaprecords as $key => $ldapgroup)
+        {
+            $group = new UserGroup($db);
+            $group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]);
+            $group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
+            $group->nom = $group->name;		// For backward compatibility
+            $group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION];
+            $group->entity = $conf->entity;
+
+            //print_r($ldapgroup);
+
+            if($group->id > 0) { // Group update
+                print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
+                $res=$group->update();
+
+                if ($res > 0)
+                {
+                    print ' --> Updated group id='.$group->id.' name='.$group->name;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$group->error;
+                }
+                print "\n";
+            } else { // Group creation
+                print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
+                $res=$group->create();
+
+                if ($res > 0)
+                {
+                    print ' --> Created group id='.$group->id.' name='.$group->name;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$group->error;
+                }
+                print "\n";
+            }
+
+            //print_r($group);
+
+            // Gestion des utilisateurs associés au groupe
+            // 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
+            $userList = array();
+            $userIdList = array();
+            foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
+                if($key === 'count') continue;
+                if(empty($userList[$userdn])) { // Récupération de l'utilisateur
+                    // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
+                    if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid'){
+                        $userKey = array($userdn);
+                    } else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
+                        $userFilter = explode(',', $userdn);
+                        $userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
+                    }
+                    if(!is_array($userKey)) continue;
+
+                    $fuser = new User($db);
+
+                    if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
+                        $fuser->fetch('','',$userKey[0]); // Chargement du user concerné par le SID
+                    } else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
+                        $fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
+                    }
+
+                    $userList[$userdn] = $fuser;
+                } else {
+                    $fuser = &$userList[$userdn];
+                }
+
+                $userIdList[$userdn] = $fuser->id;
+
+                // Ajout de l'utilisateur dans le groupe
+                if(!in_array($fuser->id, array_keys($group->members))) {
+                    $fuser->SetInGroup($group->id, $group->entity);
+                    echo $fuser->login.' added'."\n";
+                }
+            }
+
+            // 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
+            foreach ($group->members as $guser) {
+                if(!in_array($guser->id, $userIdList)) {
+                    $guser->RemoveFromGroup($group->id, $group->entity);
+                    echo $guser->login.' removed'."\n";
+                }
+            }
+        }
+
+        if (! $error || $forcecommit)
+        {
+            if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+            else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+            $db->commit();
+        }
+        else
+        {
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+            $db->rollback();
+        }
+        print "\n";
+    }
+    else
+    {
+        dol_print_error('',$ldap->error);
+        $error++;
+    }
 }
 else
 {
-	dol_print_error('',$ldap->error);
-	$error++;
+    dol_print_error('',$ldap->error);
+    $error++;
 }
 
 
@@ -261,6 +261,6 @@ 
  */
 function dolValidElement($element)
 {
-	return (trim($element) != '');
+    return (trim($element) != '');
 }
 

dolibarr/scripts/members/sync_members_ldap2dolibarr.php

Indentation +193 added lines, -193 removed lines

@@ -31,7 +31,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -59,32 +59,32 @@ 
 
 // List of fields to get from LDAP
 $required_fields = array(
-	$conf->global->LDAP_KEY_MEMBERS,
-	$conf->global->LDAP_FIELD_FULLNAME,
-	$conf->global->LDAP_FIELD_LOGIN,
-	$conf->global->LDAP_FIELD_LOGIN_SAMBA,
-	$conf->global->LDAP_FIELD_PASSWORD,
-	$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
-	$conf->global->LDAP_FIELD_NAME,
-	$conf->global->LDAP_FIELD_FIRSTNAME,
-	$conf->global->LDAP_FIELD_MAIL,
-	$conf->global->LDAP_FIELD_PHONE,
-	$conf->global->LDAP_FIELD_PHONE_PERSO,
-	$conf->global->LDAP_FIELD_MOBILE,
-	$conf->global->LDAP_FIELD_FAX,
-	$conf->global->LDAP_FIELD_ADDRESS,
-	$conf->global->LDAP_FIELD_ZIP,
-	$conf->global->LDAP_FIELD_TOWN,
-	$conf->global->LDAP_FIELD_COUNTRY,
-	$conf->global->LDAP_FIELD_DESCRIPTION,
-	$conf->global->LDAP_FIELD_BIRTHDATE,
-	$conf->global->LDAP_FIELD_MEMBER_STATUS,
-	$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION,
-	// Subscriptions
-	$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_KEY_MEMBERS,
+    $conf->global->LDAP_FIELD_FULLNAME,
+    $conf->global->LDAP_FIELD_LOGIN,
+    $conf->global->LDAP_FIELD_LOGIN_SAMBA,
+    $conf->global->LDAP_FIELD_PASSWORD,
+    $conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+    $conf->global->LDAP_FIELD_NAME,
+    $conf->global->LDAP_FIELD_FIRSTNAME,
+    $conf->global->LDAP_FIELD_MAIL,
+    $conf->global->LDAP_FIELD_PHONE,
+    $conf->global->LDAP_FIELD_PHONE_PERSO,
+    $conf->global->LDAP_FIELD_MOBILE,
+    $conf->global->LDAP_FIELD_FAX,
+    $conf->global->LDAP_FIELD_ADDRESS,
+    $conf->global->LDAP_FIELD_ZIP,
+    $conf->global->LDAP_FIELD_TOWN,
+    $conf->global->LDAP_FIELD_COUNTRY,
+    $conf->global->LDAP_FIELD_DESCRIPTION,
+    $conf->global->LDAP_FIELD_BIRTHDATE,
+    $conf->global->LDAP_FIELD_MEMBER_STATUS,
+    $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION,
+    // Subscriptions
+    $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
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
@@ -93,15 +93,15 @@ 
 
 if (! isset($argv[2]) || ! is_numeric($argv[2])) {
     print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type  [--server=ldapserverhost] [-y]\n";
-	exit(-1);
+    exit(-1);
 }
 
 $typeid=$argv[2];
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if ($val == 'commitiferror') $forcecommit=1;
+    if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -129,20 +129,20 @@ 
 // Check parameters
 if (empty($conf->global->LDAP_MEMBER_DN))
 {
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
-	exit(-1);
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
+    exit(-1);
 }
 if ($typeid <= 0)
 {
-	print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
-	exit(-2);
+    print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
+    exit(-2);
 }
 
 
 if (! $confirmed)
 {
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 // Load table of correspondence of countries
@@ -155,27 +155,27 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	if ($num)
-	{
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				//print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
-				$hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
-				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
-			}
-			$i++;
-		}
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+    if ($num)
+    {
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                //print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
+                $hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
+                $countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
+            }
+            $i++;
+        }
+    }
 }
 else
 {
-	dol_print_error($db);
-	exit(-1);
+    dol_print_error($db);
+    exit(-1);
 }
 
 
@@ -184,146 +184,146 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
-
-
-	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_MEMBER_ACTIVE=0;
-
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 'member');	// Fiter on 'member' filter param
-	if (is_array($ldaprecords))
-	{
-		$db->begin();
-
-		// Warning $ldapuser has a key in lowercase
-		foreach ($ldaprecords as $key => $ldapuser)
-		{
-			$member = new Adherent($db);
-
-			// Propriete membre
-			$member->firstname=$ldapuser[$conf->global->LDAP_FIELD_FIRSTNAME];
-			$member->lastname=$ldapuser[$conf->global->LDAP_FIELD_NAME];
-			$member->login=$ldapuser[$conf->global->LDAP_FIELD_LOGIN];
-			$member->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
-
-			//$member->societe;
-			$member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
-			$member->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
-			$member->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
-			$member->country=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];
-			$member->country_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid'];
-			$member->country_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code'];
-
-			$member->phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
-			$member->phone_perso=$ldapuser[$conf->global->LDAP_FIELD_PHONE_PERSO];
-			$member->phone_mobile=$ldapuser[$conf->global->LDAP_FIELD_MOBILE];
-			$member->email=$ldapuser[$conf->global->LDAP_FIELD_MAIL];
-
-			$member->note=$ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
-			$member->morphy='phy';
-			$member->photo='';
-			$member->public=1;
-			$member->birth=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_BIRTHDATE]);
-
-			$member->statut=-1;
-			if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
-			{
-				$member->datec=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
-				$member->datevalid=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
-				$member->statut=$ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS];
-			}
-			//if ($member->statut > 1) $member->statut=1;
-
-			//print_r($ldapuser);
-
-			// Propriete type membre
-			$member->typeid=$typeid;
-
-			// Creation membre
-			print $langs->transnoentities("MemberCreate").' # '.$key.': login='.$member->login.', fullname='.$member->getFullName($langs);
-			print ', datec='.$member->datec;
-			$member_id=$member->create($user);
-			if ($member_id > 0)
-			{
-				print ' --> Created member id='.$member_id.' login='.$member->login;
-			}
-			else
-			{
-				$error++;
-				print ' --> '.$member->error;
-			}
-			print "\n";
-
-			//print_r($member);
-
-			$datefirst='';
-			if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)
-			{
-				$datefirst=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
-				$pricefirst=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT]);
-			}
-
-			$datelast='';
-			if ($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)
-			{
-				$datelast=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]);
-				$pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
-			}
-			elseif ($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
-			{
-				$datelast=dol_time_plus_duree(dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION]),-1,'y')+60*60*24;
-				$pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
-
-				// Cas special ou date derniere <= date premiere
-				if ($datefirst && $datelast && $datelast <= $datefirst)
-				{
-					// On ne va inserer que la premiere
-					$datelast=0;
-					if (! $pricefirst && $pricelast) $pricefirst = $pricelast;
-				}
-			}
-
-
-			// Insert first subscription
-			if ($datefirst)
-			{
-				// Cree premiere cotisation et met a jour datefin dans adherent
-				//print "xx".$datefirst."\n";
-				$crowid=$member->subscription($datefirst, $pricefirst, 0);
-			}
-
-			// Insert last subscription
-			if ($datelast)
-			{
-				// Cree derniere cotisation et met a jour datefin dans adherent
-				//print "yy".dol_print_date($datelast)."\n";
-				$crowid=$member->subscription($datelast, $pricelast, 0);
-			}
-		}
-
-		if (! $error || $forcecommit)
-		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
-			$db->commit();
-		}
-		else
-		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
-			$db->rollback();
-		}
-		print "\n";
-	}
-	else
-	{
-		dol_print_error('',$ldap->error);
-		$error++;
-	}
+    $justthese=array();
+
+
+    // We disable synchro Dolibarr-LDAP
+    $conf->global->LDAP_MEMBER_ACTIVE=0;
+
+    $ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 'member');	// Fiter on 'member' filter param
+    if (is_array($ldaprecords))
+    {
+        $db->begin();
+
+        // Warning $ldapuser has a key in lowercase
+        foreach ($ldaprecords as $key => $ldapuser)
+        {
+            $member = new Adherent($db);
+
+            // Propriete membre
+            $member->firstname=$ldapuser[$conf->global->LDAP_FIELD_FIRSTNAME];
+            $member->lastname=$ldapuser[$conf->global->LDAP_FIELD_NAME];
+            $member->login=$ldapuser[$conf->global->LDAP_FIELD_LOGIN];
+            $member->pass=$ldapuser[$conf->global->LDAP_FIELD_PASSWORD];
+
+            //$member->societe;
+            $member->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
+            $member->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
+            $member->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
+            $member->country=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];
+            $member->country_id=$countries[$hashlib2rowid[strtolower($member->country)]]['rowid'];
+            $member->country_code=$countries[$hashlib2rowid[strtolower($member->country)]]['code'];
+
+            $member->phone=$ldapuser[$conf->global->LDAP_FIELD_PHONE];
+            $member->phone_perso=$ldapuser[$conf->global->LDAP_FIELD_PHONE_PERSO];
+            $member->phone_mobile=$ldapuser[$conf->global->LDAP_FIELD_MOBILE];
+            $member->email=$ldapuser[$conf->global->LDAP_FIELD_MAIL];
+
+            $member->note=$ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];
+            $member->morphy='phy';
+            $member->photo='';
+            $member->public=1;
+            $member->birth=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_BIRTHDATE]);
+
+            $member->statut=-1;
+            if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
+            {
+                $member->datec=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
+                $member->datevalid=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
+                $member->statut=$ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS];
+            }
+            //if ($member->statut > 1) $member->statut=1;
+
+            //print_r($ldapuser);
+
+            // Propriete type membre
+            $member->typeid=$typeid;
+
+            // Creation membre
+            print $langs->transnoentities("MemberCreate").' # '.$key.': login='.$member->login.', fullname='.$member->getFullName($langs);
+            print ', datec='.$member->datec;
+            $member_id=$member->create($user);
+            if ($member_id > 0)
+            {
+                print ' --> Created member id='.$member_id.' login='.$member->login;
+            }
+            else
+            {
+                $error++;
+                print ' --> '.$member->error;
+            }
+            print "\n";
+
+            //print_r($member);
+
+            $datefirst='';
+            if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)
+            {
+                $datefirst=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
+                $pricefirst=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT]);
+            }
+
+            $datelast='';
+            if ($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)
+            {
+                $datelast=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE]);
+                $pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
+            }
+            elseif ($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)
+            {
+                $datelast=dol_time_plus_duree(dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION]),-1,'y')+60*60*24;
+                $pricelast=price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT]);
+
+                // Cas special ou date derniere <= date premiere
+                if ($datefirst && $datelast && $datelast <= $datefirst)
+                {
+                    // On ne va inserer que la premiere
+                    $datelast=0;
+                    if (! $pricefirst && $pricelast) $pricefirst = $pricelast;
+                }
+            }
+
+
+            // Insert first subscription
+            if ($datefirst)
+            {
+                // Cree premiere cotisation et met a jour datefin dans adherent
+                //print "xx".$datefirst."\n";
+                $crowid=$member->subscription($datefirst, $pricefirst, 0);
+            }
+
+            // Insert last subscription
+            if ($datelast)
+            {
+                // Cree derniere cotisation et met a jour datefin dans adherent
+                //print "yy".dol_print_date($datelast)."\n";
+                $crowid=$member->subscription($datelast, $pricelast, 0);
+            }
+        }
+
+        if (! $error || $forcecommit)
+        {
+            if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+            else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+            $db->commit();
+        }
+        else
+        {
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+            $db->rollback();
+        }
+        print "\n";
+    }
+    else
+    {
+        dol_print_error('',$ldap->error);
+        $error++;
+    }
 }
 else
 {
-	dol_print_error('',$ldap->error);
-	$error++;
+    dol_print_error('',$ldap->error);
+    $error++;
 }
 
 
@@ -338,6 +338,6 @@ 
  */
 function dolValidElement($element)
 {
-	return (trim($element) != '');
+    return (trim($element) != '');
 }