alxarafe / alixar

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) != '');
 }
 

Spacing +61 added lines, -61 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -42,11 +42,11 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
-$excludeuser=array();
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
+$excludeuser = array();
+$confirmed = 0;
 
 /*
  * Main
@@ -54,7 +54,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
@@ -80,31 +80,31 @@ 
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
+$required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
-if (! isset($argv[1])) {
+if (!isset($argv[1])) {
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
     exit(-1);
 }
 
-foreach($argv as $key => $val)
+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";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-if (! empty($conf->global->LDAP_FILTER_CONNECTION)) print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";	// Note: filter is defined into function getRecords
+if (!empty($conf->global->LDAP_FILTER_CONNECTION)) print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
 else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
@@ -114,11 +114,11 @@ 
 print "database=".$conf->db->name."\n";
 print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
-print "excludeuser=".join(',',$excludeuser)."\n";
-print "Mapped LDAP fields=".join(',',$required_fields)."\n";
+print "excludeuser=".join(',', $excludeuser)."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
@@ -132,13 +132,13 @@ 
 
 
 // Load table of correspondence of countries
-$hashlib2rowid=array();
-$countries=array();
+$hashlib2rowid = array();
+$countries = array();
 $sql = "SELECT rowid, code, label, active";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-$sql.= " WHERE active = 1";
-$sql.= " ORDER BY code ASC";
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
+$sql .= " WHERE active = 1";
+$sql .= " ORDER BY code ASC";
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -151,8 +151,8 @@ 
 			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);
+				$hashlib2rowid[strtolower($obj->label)] = $obj->rowid;
+				$countries[$obj->rowid] = array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
 			}
 			$i++;
 		}
@@ -170,13 +170,13 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
+	$justthese = array();
 
 
 	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_SYNCHRO_ACTIVE=0;
+	$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
+	$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();
@@ -185,7 +185,7 @@ 
 		foreach ($ldaprecords as $key => $ldapuser)
 		{
 			// If login into exclude list, we discard record
-			if (in_array($ldapuser[$conf->global->LDAP_FIELD_LOGIN],$excludeuser))
+			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;
@@ -193,18 +193,18 @@ 
 
 			$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
+			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];
+			$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;
 			/*
@@ -216,20 +216,20 @@ 
 			$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->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->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;
+			$fuser->statut = 1;
 			// TODO : revoir la gestion du status
 			/*if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
 			{
@@ -241,9 +241,9 @@ 
 
 			//print_r($ldapuser);
 
-			if($fuser->id > 0) { // User update
+			if ($fuser->id > 0) { // User update
 				print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
-				$res=$fuser->update($user);
+				$res = $fuser->update($user);
 
 				if ($res < 0)
 				{
@@ -256,7 +256,7 @@ 
 				}
 			} else { // User creation
 				print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
-				$res=$fuser->create($user);
+				$res = $fuser->create($user);
 
 				if ($res > 0)
 				{
@@ -280,28 +280,28 @@ 
 			}*/
 		}
 
-		if (! $error || $forcecommit)
+		if (!$error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			if (!$error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
 			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		}
 		else
 		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
 			$db->rollback();
 		}
 		print "\n";
 	}
 	else
 	{
-		dol_print_error('',$ldap->error);
+		dol_print_error('', $ldap->error);
 		$error++;
 	}
 }
 else
 {
-	dol_print_error('',$ldap->error);
+	dol_print_error('', $ldap->error);
 	$error++;
 }
 

Braces +31 added lines, -21 removed lines

@@ -89,11 +89,19 @@ 
 
 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";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -104,8 +112,13 @@ 
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-if (! empty($conf->global->LDAP_FILTER_CONNECTION)) print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";	// Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_FILTER_CONNECTION)) {
+    print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";
+}
+// Note: filter is defined into function getRecords
+else {
+    print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -157,8 +170,7 @@ 
 			$i++;
 		}
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	exit(-1);
@@ -249,8 +261,7 @@ 
 				{
 					$error++;
 					print ' --> '.$res.' '.$fuser->error;
-				}
-				else
+				} else
 				{
 					print ' --> Updated user id='.$fuser->id.' login='.$fuser->login;
 				}
@@ -261,8 +272,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$fuser->error;
@@ -282,24 +292,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

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

Spacing +15 added lines, -15 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,19 +34,19 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: ".$script_file." now\n";
 	exit(-1);
 }
-$now=$argv[1];
+$now = $argv[1];
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -55,7 +55,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
@@ -74,12 +74,12 @@ 
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$ldap=new Ldap();
+	$ldap = new Ldap();
 	$ldap->connect_bind();
 
 	while ($i < $num)
 	{
-		$ldap->error="";
+		$ldap->error = "";
 
 		$obj = $db->fetch_object($resql);
 
@@ -89,16 +89,16 @@ 
 
 		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);
+		$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");

Braces +2 added lines, -4 removed lines

@@ -102,8 +102,7 @@ 
 		if ($result > 0)
 		{
 			print " - ".$langs->trans("OK");
-		}
-		else
+		} else
 		{
 			$error++;
 			print " - ".$langs->trans("KO").' - '.$ldap->error;
@@ -115,8 +114,7 @@ 
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

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) != '');
 }
 

Spacing +40 added lines, -40 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -44,10 +44,10 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
+$confirmed = 0;
 
 
 /*
@@ -56,7 +56,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
@@ -67,31 +67,31 @@ 
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
+$required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
 
-if (! isset($argv[1])) {
+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);
 }
 
-foreach($argv as $key => $val)
+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";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_GROUP_DN."\n";
 print 'Filter=('.$conf->global->LDAP_KEY_GROUPS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
@@ -102,10 +102,10 @@ 
 print "database=".$conf->db->name."\n";
 print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
-print "Mapped LDAP fields=".join(',',$required_fields)."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
@@ -122,13 +122,13 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
+	$justthese = array();
 
 
 	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_SYNCHRO_ACTIVE=0;
+	$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));
+	$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();
@@ -139,15 +139,15 @@ 
 			$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->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
+			if ($group->id > 0) { // Group update
 				print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
-				$res=$group->update();
+				$res = $group->update();
 
 				if ($res > 0)
 				{
@@ -161,7 +161,7 @@ 
 				print "\n";
 			} else { // Group creation
 				print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
-				$res=$group->create();
+				$res = $group->create();
 
 				if ($res > 0)
 				{
@@ -181,24 +181,24 @@ 
 			// 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
+			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'){
+					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;
+					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
+					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;
@@ -209,7 +209,7 @@ 
 				$userIdList[$userdn] = $fuser->id;
 
 				// Ajout de l'utilisateur dans le groupe
-				if(!in_array($fuser->id, array_keys($group->members))) {
+				if (!in_array($fuser->id, array_keys($group->members))) {
 					$fuser->SetInGroup($group->id, $group->entity);
 					echo $fuser->login.' added'."\n";
 				}
@@ -217,35 +217,35 @@ 
 
 			// 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)) {
+				if (!in_array($guser->id, $userIdList)) {
 					$guser->RemoveFromGroup($group->id, $group->entity);
 					echo $guser->login.' removed'."\n";
 				}
 			}
 		}
 
-		if (! $error || $forcecommit)
+		if (!$error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			if (!$error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
 			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		}
 		else
 		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
 			$db->rollback();
 		}
 		print "\n";
 	}
 	else
 	{
-		dol_print_error('',$ldap->error);
+		dol_print_error('', $ldap->error);
 		$error++;
 	}
 }
 else
 {
-	dol_print_error('',$ldap->error);
+	dol_print_error('', $ldap->error);
 	$error++;
 }
 

Braces +29 added lines, -19 removed lines

@@ -78,11 +78,19 @@ 
 
 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";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -152,8 +160,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Updated group id='.$group->id.' name='.$group->name;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$group->error;
@@ -166,8 +173,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created group id='.$group->id.' name='.$group->name;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$group->error;
@@ -182,7 +188,9 @@ 
 			$userList = array();
 			$userIdList = array();
 			foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if($key === 'count') continue;
+				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'){
@@ -191,7 +199,9 @@ 
 						$userFilter = explode(',', $userdn);
 						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
 					}
-					if(!is_array($userKey)) continue;
+					if(!is_array($userKey)) {
+					    continue;
+					}
 
 					$fuser = new User($db);
 
@@ -226,24 +236,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

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) != '');
 }
 

Spacing +74 added lines, -74 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -43,10 +43,10 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
+$confirmed = 0;
 
 
 /*
@@ -55,7 +55,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
@@ -88,32 +88,32 @@ 
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
+$required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
 
-if (! isset($argv[2]) || ! is_numeric($argv[2])) {
+if (!isset($argv[2]) || !is_numeric($argv[2])) {
     print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type  [--server=ldapserverhost] [-y]\n";
 	exit(-1);
 }
 
-$typeid=$argv[2];
-foreach($argv as $key => $val)
+$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";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
-if (! empty($conf->global->LDAP_MEMBER_FILTER)) print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";	// Note: filter is defined into function getRecords
+if (!empty($conf->global->LDAP_MEMBER_FILTER)) print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n"; // Note: filter is defined into function getRecords
 else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
@@ -123,7 +123,7 @@ 
 print "database=".$conf->db->name."\n";
 print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
-print "Mapped LDAP fields=".join(',',$required_fields)."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
 // Check parameters
@@ -139,20 +139,20 @@ 
 }
 
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
 }
 
 // Load table of correspondence of countries
-$hashlib2rowid=array();
-$countries=array();
+$hashlib2rowid = array();
+$countries = array();
 $sql = "SELECT rowid, code, label, active";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
-$sql.= " WHERE active = 1";
-$sql.= " ORDER BY code ASC";
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
+$sql .= " WHERE active = 1";
+$sql .= " ORDER BY code ASC";
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -165,8 +165,8 @@ 
 			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);
+				$hashlib2rowid[strtolower($obj->label)] = $obj->rowid;
+				$countries[$obj->rowid] = array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
 			}
 			$i++;
 		}
@@ -184,13 +184,13 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
+	$justthese = array();
 
 
 	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_MEMBER_ACTIVE=0;
+	$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
+	$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();
@@ -201,48 +201,48 @@ 
 			$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->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;
+			$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];
+				$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;
+			$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);
+			$member_id = $member->create($user);
 			if ($member_id > 0)
 			{
 				print ' --> Created member id='.$member_id.' login='.$member->login;
@@ -256,30 +256,30 @@ 
 
 			//print_r($member);
 
-			$datefirst='';
+			$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]);
+				$datefirst = dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
+				$pricefirst = price2num($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT]);
 			}
 
-			$datelast='';
+			$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]);
+				$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]);
+				$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;
+					$datelast = 0;
+					if (!$pricefirst && $pricelast) $pricefirst = $pricelast;
 				}
 			}
 
@@ -289,7 +289,7 @@ 
 			{
 				// Cree premiere cotisation et met a jour datefin dans adherent
 				//print "xx".$datefirst."\n";
-				$crowid=$member->subscription($datefirst, $pricefirst, 0);
+				$crowid = $member->subscription($datefirst, $pricefirst, 0);
 			}
 
 			// Insert last subscription
@@ -297,32 +297,32 @@ 
 			{
 				// Cree derniere cotisation et met a jour datefin dans adherent
 				//print "yy".dol_print_date($datelast)."\n";
-				$crowid=$member->subscription($datelast, $pricelast, 0);
+				$crowid = $member->subscription($datelast, $pricelast, 0);
 			}
 		}
 
-		if (! $error || $forcecommit)
+		if (!$error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			if (!$error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
 			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		}
 		else
 		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
 			$db->rollback();
 		}
 		print "\n";
 	}
 	else
 	{
-		dol_print_error('',$ldap->error);
+		dol_print_error('', $ldap->error);
 		$error++;
 	}
 }
 else
 {
-	dol_print_error('',$ldap->error);
+	dol_print_error('', $ldap->error);
 	$error++;
 }
 

Braces +31 added lines, -21 removed lines

@@ -99,10 +99,16 @@ 
 $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";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -113,8 +119,13 @@ 
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
-if (! empty($conf->global->LDAP_MEMBER_FILTER)) print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";	// Note: filter is defined into function getRecords
-else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_MEMBER_FILTER)) {
+    print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";
+}
+// Note: filter is defined into function getRecords
+else {
+    print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+}
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -171,8 +182,7 @@ 
 			$i++;
 		}
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	exit(-1);
@@ -246,8 +256,7 @@ 
 			if ($member_id > 0)
 			{
 				print ' --> Created member id='.$member_id.' login='.$member->login;
-			}
-			else
+			} else
 			{
 				$error++;
 				print ' --> '.$member->error;
@@ -268,8 +277,7 @@ 
 			{
 				$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)
+			} 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]);
@@ -279,7 +287,9 @@ 
 				{
 					// On ne va inserer que la premiere
 					$datelast=0;
-					if (! $pricefirst && $pricelast) $pricefirst = $pricelast;
+					if (! $pricefirst && $pricelast) {
+					    $pricefirst = $pricelast;
+					}
 				}
 			}
 
@@ -303,24 +313,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/members/sync_members_dolibarr2ldap.php

Indentation +64 added lines, -64 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";
@@ -56,12 +56,12 @@ 
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now [-y]\n";
-	exit(-1);
+    exit(-1);
 }
 
 foreach($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 $now=$argv[1];
@@ -87,12 +87,12 @@ 
 
 if (! $confirmed)
 {
-	print "Press a key to confirm...\n";
-	$input = trim(fgets(STDIN));
-	print "Warning, this operation may result in data loss if it failed.\n";
-	print "Be sure to have a backup of your LDAP database (With OpenLDAP: slapcat > save.ldif).\n";
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Press a key to confirm...\n";
+    $input = trim(fgets(STDIN));
+    print "Warning, this operation may result in data loss if it failed.\n";
+    print "Be sure to have a backup of your LDAP database (With OpenLDAP: slapcat > save.ldif).\n";
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 /*
@@ -109,64 +109,64 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$ldap=new Ldap();
-	$ldap->connect_bind();
-
-	while ($i < $num)
-	{
-		$ldap->error="";
-
-		$obj = $db->fetch_object($resql);
-
-		$member = new Adherent($db);
-		$result=$member->fetch($obj->rowid);
-		if ($result < 0)
-		{
-			dol_print_error($db,$member->error);
-			exit(-1);
-		}
-		$result=$member->fetch_subscriptions();
-		if ($result < 0)
-		{
-			dol_print_error($db,$member->error);
-			exit(-1);
-		}
-
-		print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
-
-		$oldobject=$member;
-
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
-
-	    $info=$member->_load_ldap_info();
-		$dn=$member->_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->transnoentities("OK");
-		}
-		else
-		{
-			$error++;
-			print " - ".$langs->transnoentities("KO").' - '.$ldap->error;
-		}
-		print "\n";
-
-		$i++;
-	}
-
-	$ldap->unbind();
-	$ldap->close();
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    $ldap=new Ldap();
+    $ldap->connect_bind();
+
+    while ($i < $num)
+    {
+        $ldap->error="";
+
+        $obj = $db->fetch_object($resql);
+
+        $member = new Adherent($db);
+        $result=$member->fetch($obj->rowid);
+        if ($result < 0)
+        {
+            dol_print_error($db,$member->error);
+            exit(-1);
+        }
+        $result=$member->fetch_subscriptions();
+        if ($result < 0)
+        {
+            dol_print_error($db,$member->error);
+            exit(-1);
+        }
+
+        print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
+
+        $oldobject=$member;
+
+        $oldinfo=$oldobject->_load_ldap_info();
+        $olddn=$oldobject->_load_ldap_dn($oldinfo);
+
+        $info=$member->_load_ldap_info();
+        $dn=$member->_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->transnoentities("OK");
+        }
+        else
+        {
+            $error++;
+            print " - ".$langs->transnoentities("KO").' - '.$ldap->error;
+        }
+        print "\n";
+
+        $i++;
+    }
+
+    $ldap->unbind();
+    $ldap->close();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -41,9 +41,9 @@ 
 $langs->load("main");
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$confirmed = 0;
 
 
 /*
@@ -52,22 +52,22 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: $script_file now [-y]\n";
 	exit(-1);
 }
 
-foreach($argv as $key => $val)
+foreach ($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+	if (preg_match('/-y$/', $val, $reg)) $confirmed = 1;
 }
 
-$now=$argv[1];
+$now = $argv[1];
 
 print "Mails sending disabled (useless in batch mode)\n";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
@@ -81,11 +81,11 @@ 
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN target=".$conf->global->LDAP_MEMBER_DN."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Press a key to confirm...\n";
 	$input = trim(fgets(STDIN));
@@ -112,41 +112,41 @@ 
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$ldap=new Ldap();
+	$ldap = new Ldap();
 	$ldap->connect_bind();
 
 	while ($i < $num)
 	{
-		$ldap->error="";
+		$ldap->error = "";
 
 		$obj = $db->fetch_object($resql);
 
 		$member = new Adherent($db);
-		$result=$member->fetch($obj->rowid);
+		$result = $member->fetch($obj->rowid);
 		if ($result < 0)
 		{
-			dol_print_error($db,$member->error);
+			dol_print_error($db, $member->error);
 			exit(-1);
 		}
-		$result=$member->fetch_subscriptions();
+		$result = $member->fetch_subscriptions();
 		if ($result < 0)
 		{
-			dol_print_error($db,$member->error);
+			dol_print_error($db, $member->error);
 			exit(-1);
 		}
 
 		print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
 
-		$oldobject=$member;
+		$oldobject = $member;
 
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
+	    $oldinfo = $oldobject->_load_ldap_info();
+	    $olddn = $oldobject->_load_ldap_dn($oldinfo);
 
-	    $info=$member->_load_ldap_info();
-		$dn=$member->_load_ldap_dn($info);
+	    $info = $member->_load_ldap_info();
+		$dn = $member->_load_ldap_dn($info);
 
-		$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-		$result=$ldap->update($dn,$info,$user,$olddn);
+		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0)
 		{
 			print " - ".$langs->transnoentities("OK");

Braces +6 added lines, -6 removed lines

@@ -61,8 +61,10 @@ 
 
 foreach($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 $now=$argv[1];
 
@@ -150,8 +152,7 @@ 
 		if ($result > 0)
 		{
 			print " - ".$langs->transnoentities("OK");
-		}
-		else
+		} else
 		{
 			$error++;
 			print " - ".$langs->transnoentities("KO").' - '.$ldap->error;
@@ -163,8 +164,7 @@ 
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/members/sync_members_types_dolibarr2ldap.php

Indentation +53 added lines, -53 removed lines

@@ -32,12 +32,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];
 
@@ -72,60 +72,60 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$ldap=new Ldap();
-	$result=$ldap->connect_bind();
-
-	if ($result > 0)
-	{
-		while ($i < $num)
-		{
-			$ldap->error="";
-
-			$obj = $db->fetch_object($resql);
-
-			$membertype = new AdherentType($db);
-			$membertype->id = $obj->rowid;
-			$membertype->fetch($membertype->id);
-
-			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype-label;
-
-			$oldobject=$membertype;
-
-			$oldinfo=$membertype->_load_ldap_info();
-			$olddn=$membertype->_load_ldap_dn($oldinfo);
-
-			$info=$membertype->_load_ldap_info();
-			$dn=$membertype->_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";
-
-			$i++;
-		}
-
-		$ldap->unbind();
-		$ldap->close();
-	}
-	else {
-		print $ldap->error;
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    $ldap=new Ldap();
+    $result=$ldap->connect_bind();
+
+    if ($result > 0)
+    {
+        while ($i < $num)
+        {
+            $ldap->error="";
+
+            $obj = $db->fetch_object($resql);
+
+            $membertype = new AdherentType($db);
+            $membertype->id = $obj->rowid;
+            $membertype->fetch($membertype->id);
+
+            print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype-label;
+
+            $oldobject=$membertype;
+
+            $oldinfo=$membertype->_load_ldap_info();
+            $olddn=$membertype->_load_ldap_dn($oldinfo);
+
+            $info=$membertype->_load_ldap_info();
+            $dn=$membertype->_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";
+
+            $i++;
+        }
+
+        $ldap->unbind();
+        $ldap->close();
+    }
+    else {
+        print $ldap->error;
+    }
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

Spacing +17 added lines, -17 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -35,19 +35,19 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: ".$script_file." now\n";
 	exit(-1);
 }
-$now=$argv[1];
+$now = $argv[1];
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -56,7 +56,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 /*
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
@@ -75,14 +75,14 @@ 
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$ldap=new Ldap();
-	$result=$ldap->connect_bind();
+	$ldap = new Ldap();
+	$result = $ldap->connect_bind();
 
 	if ($result > 0)
 	{
 		while ($i < $num)
 		{
-			$ldap->error="";
+			$ldap->error = "";
 
 			$obj = $db->fetch_object($resql);
 
@@ -90,18 +90,18 @@ 
 			$membertype->id = $obj->rowid;
 			$membertype->fetch($membertype->id);
 
-			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype-label;
+			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype - label;
 
-			$oldobject=$membertype;
+			$oldobject = $membertype;
 
-			$oldinfo=$membertype->_load_ldap_info();
-			$olddn=$membertype->_load_ldap_dn($oldinfo);
+			$oldinfo = $membertype->_load_ldap_info();
+			$olddn = $membertype->_load_ldap_dn($oldinfo);
 
-			$info=$membertype->_load_ldap_info();
-			$dn=$membertype->_load_ldap_dn($info);
+			$info = $membertype->_load_ldap_info();
+			$dn = $membertype->_load_ldap_dn($info);
 
-			$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-			$result=$ldap->update($dn,$info,$user,$olddn);
+			$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");

Braces +3 added lines, -6 removed lines

@@ -105,8 +105,7 @@ 
 			if ($result > 0)
 			{
 				print " - ".$langs->trans("OK");
-			}
-			else
+			} else
 			{
 				$error++;
 				print " - ".$langs->trans("KO").' - '.$ldap->error;
@@ -118,12 +117,10 @@ 
 
 		$ldap->unbind();
 		$ldap->close();
-	}
-	else {
+	} else {
 		print $ldap->error;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/members/sync_members_types_ldap2dolibarr.php

Indentation +92 added lines, -92 removed lines

@@ -33,7 +33,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_MEMBERS_TYPES,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS
+    $conf->global->LDAP_KEY_MEMBERS_TYPES,
+    $conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME,
+    $conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION,
+    $conf->global->LDAP_MEMBER_TYPE_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_MEMBER_TYPE_DN))
 {
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
-	exit(-1);
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
+    exit(-1);
 }
 
 
@@ -122,84 +122,84 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
-
-
-	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_MEMBER_TYPE_ACTIVE=0;
-
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
-	if (is_array($ldaprecords))
-	{
-		$db->begin();
-
-		// Warning $ldapuser has a key in lowercase
-		foreach ($ldaprecords as $key => $ldapgroup)
-		{
-			$membertype = new AdherentType($db);
-			$membertype->fetch('', $ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
-			$membertype->label = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME];
-			$membertype->description = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION];
-			$membertype->entity = $conf->entity;
-
-			//print_r($ldapgroup);
-
-			if ($membertype->id > 0) { // Member type update
-				print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->update($user);
-
-				if ($res > 0)
-				{
-					print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$membertype->error;
-				}
-				print "\n";
-			} else { // Member type creation
-				print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->create($user);
-
-				if ($res > 0)
-				{
-					print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$membertype->error;
-				}
-				print "\n";
-			}
-
-			//print_r($membertype);
-		}
-
-		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_TYPE_ACTIVE=0;
+
+    $ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
+    if (is_array($ldaprecords))
+    {
+        $db->begin();
+
+        // Warning $ldapuser has a key in lowercase
+        foreach ($ldaprecords as $key => $ldapgroup)
+        {
+            $membertype = new AdherentType($db);
+            $membertype->fetch('', $ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
+            $membertype->label = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME];
+            $membertype->description = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION];
+            $membertype->entity = $conf->entity;
+
+            //print_r($ldapgroup);
+
+            if ($membertype->id > 0) { // Member type update
+                print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
+                $res=$membertype->update($user);
+
+                if ($res > 0)
+                {
+                    print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$membertype->error;
+                }
+                print "\n";
+            } else { // Member type creation
+                print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
+                $res=$membertype->create($user);
+
+                if ($res > 0)
+                {
+                    print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$membertype->error;
+                }
+                print "\n";
+            }
+
+            //print_r($membertype);
+        }
+
+        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++;
 }
 
 
@@ -214,6 +214,6 @@ 
  */
 function dolValidElementType($element)
 {
-	return (trim($element) != '');
+    return (trim($element) != '');
 }
 

Spacing +27 added lines, -27 removed lines

@@ -28,7 +28,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -44,10 +44,10 @@ 
 $langs->loadLangs(array("main", "errors"));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
+$confirmed = 0;
 
 
 /*
@@ -56,7 +56,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
 $required_fields = array(
@@ -67,31 +67,31 @@ 
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElementType")));
+$required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElementType")));
 
 
-if (! isset($argv[1])) {
+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);
 }
 
-foreach($argv as $key => $val)
+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";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_TYPE_DN."\n";
 print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS_TYPES.'=*)'."\n";
 print "----- To Dolibarr database:\n";
@@ -102,10 +102,10 @@ 
 print "database=".$conf->db->name."\n";
 print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
-print "Mapped LDAP fields=".join(',',$required_fields)."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
@@ -122,13 +122,13 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
+	$justthese = array();
 
 
 	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_MEMBER_TYPE_ACTIVE=0;
+	$conf->global->LDAP_MEMBER_TYPE_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
+	$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
 	if (is_array($ldaprecords))
 	{
 		$db->begin();
@@ -146,7 +146,7 @@ 
 
 			if ($membertype->id > 0) { // Member type update
 				print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->update($user);
+				$res = $membertype->update($user);
 
 				if ($res > 0)
 				{
@@ -160,7 +160,7 @@ 
 				print "\n";
 			} else { // Member type creation
 				print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->create($user);
+				$res = $membertype->create($user);
 
 				if ($res > 0)
 				{
@@ -177,28 +177,28 @@ 
 			//print_r($membertype);
 		}
 
-		if (! $error || $forcecommit)
+		if (!$error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			if (!$error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
 			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		}
 		else
 		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
 			$db->rollback();
 		}
 		print "\n";
 	}
 	else
 	{
-		dol_print_error('',$ldap->error);
+		dol_print_error('', $ldap->error);
 		$error++;
 	}
 }
 else
 {
-	dol_print_error('',$ldap->error);
+	dol_print_error('', $ldap->error);
 	$error++;
 }
 

Braces +23 added lines, -17 removed lines

@@ -78,11 +78,19 @@ 
 
 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";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -151,8 +159,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$membertype->error;
@@ -165,8 +172,7 @@ 
 				if ($res > 0)
 				{
 					print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
+				} else
 				{
 					$error++;
 					print ' --> '.$res.' '.$membertype->error;
@@ -179,24 +185,24 @@ 
 
 		if (! $error || $forcecommit)
 		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (! $error) {
+			    print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+			    print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
-		}
-		else
+		} else
 		{
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
 			$db->rollback();
 		}
 		print "\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',$ldap->error);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error('',$ldap->error);
 	$error++;

dolibarr/scripts/product/migrate_picture_path.php

Indentation +55 added lines, -55 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);
 }
 
 @set_time_limit(0);							// No timeout for this script
@@ -58,7 +58,7 @@ 
 
 if (! isset($argv[1]) || $argv[1] != 'product') {
     print "Usage:  $script_file product\n";
-	exit(-1);
+    exit(-1);
 }
 
 print '--- start'."\n";
@@ -66,24 +66,24 @@ 
 // Case to migrate products path
 if ($argv[1] == 'product')
 {
-	$product = new Product($db);
-
-	$sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product";	// Get list of all products
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($obj = $db->fetch_object($resql))
-		{
-			$product->fetch($obj->pid);
-			print " migrating product id=".$product->id." ref=".$product->ref."\n";
-			migrate_product_photospath($product);
-		}
-	}
-	else
-	{
-		print "\n sql error ".$sql;
-		exit;
-	}
+    $product = new Product($db);
+
+    $sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product";	// Get list of all products
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        while ($obj = $db->fetch_object($resql))
+        {
+            $product->fetch($obj->pid);
+            print " migrating product id=".$product->id." ref=".$product->ref."\n";
+            migrate_product_photospath($product);
+        }
+    }
+    else
+    {
+        print "\n sql error ".$sql;
+        exit;
+    }
 }
 
 
@@ -101,47 +101,47 @@ 
  */
 function migrate_product_photospath($product)
 {
-	global $conf;
+    global $conf;
 
-	$dir = $conf->product->multidir_output[$product->entity];
-	$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
-	$origin = $dir .'/'. get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-	$destin = $dir.'/'.dol_sanitizeFileName($product->ref);
+    $dir = $conf->product->multidir_output[$product->entity];
+    $conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
+    $origin = $dir .'/'. get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+    $destin = $dir.'/'.dol_sanitizeFileName($product->ref);
 
-	$error = 0;
+    $error = 0;
 
-	$origin_osencoded=dol_osencode($origin);
-	$destin_osencoded=dol_osencode($destin);
-	dol_mkdir($destin);
+    $origin_osencoded=dol_osencode($origin);
+    $destin_osencoded=dol_osencode($destin);
+    dol_mkdir($destin);
 
-	if (dol_is_dir($origin))
-	{
-		$handle=opendir($origin_osencoded);
+    if (dol_is_dir($origin))
+    {
+        $handle=opendir($origin_osencoded);
         if (is_resource($handle))
         {
-        	while (($file = readdir($handle)) !== false)
-    		{
-     			if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
-    			{
-    				$thumbs = opendir($origin_osencoded.'/'.$file);
-    				if (is_resource($thumbs))
-        			{
-	     				dol_mkdir($destin.'/'.$file);
-	     				while (($thumb = readdir($thumbs)) !== false)
-		    			{
-		    				dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
-		    			}
+            while (($file = readdir($handle)) !== false)
+            {
+                    if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
+                {
+                    $thumbs = opendir($origin_osencoded.'/'.$file);
+                    if (is_resource($thumbs))
+                    {
+                            dol_mkdir($destin.'/'.$file);
+                            while (($thumb = readdir($thumbs)) !== false)
+                        {
+                            dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
+                        }
 //		    			dol_delete_dir($origin.'/'.$file);
-        			}
-    			}
-    			else
-    			{
-    				if (dol_is_file($origin.'/'.$file) )
-    				{
-    					dol_move($origin.'/'.$file, $destin.'/'.$file);
-    				}
-    			}
-    		}
+                    }
+                }
+                else
+                {
+                    if (dol_is_file($origin.'/'.$file) )
+                    {
+                        dol_move($origin.'/'.$file, $destin.'/'.$file);
+                    }
+                }
+            }
         }
-	}
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -33,8 +33,8 @@ 
 	exit(-1);
 }
 
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
+@set_time_limit(0); // No timeout for this script
+define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
 require_once $path."../../htdocs/master.inc.php";
@@ -44,19 +44,19 @@ 
 // $user is created but empty.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
 
 
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-if (! isset($argv[1]) || $argv[1] != 'product') {
+if (!isset($argv[1]) || $argv[1] != 'product') {
     print "Usage:  $script_file product\n";
 	exit(-1);
 }
@@ -68,7 +68,7 @@ 
 {
 	$product = new Product($db);
 
-	$sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product";	// Get list of all products
+	$sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product"; // Get list of all products
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -87,7 +87,7 @@ 
 }
 
 
-$db->close();	// Close $db database opened handler
+$db->close(); // Close $db database opened handler
 
 exit($error);
 
@@ -105,18 +105,18 @@ 
 
 	$dir = $conf->product->multidir_output[$product->entity];
 	$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
-	$origin = $dir .'/'. get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+	$origin = $dir.'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 	$destin = $dir.'/'.dol_sanitizeFileName($product->ref);
 
 	$error = 0;
 
-	$origin_osencoded=dol_osencode($origin);
-	$destin_osencoded=dol_osencode($destin);
+	$origin_osencoded = dol_osencode($origin);
+	$destin_osencoded = dol_osencode($destin);
 	dol_mkdir($destin);
 
 	if (dol_is_dir($origin))
 	{
-		$handle=opendir($origin_osencoded);
+		$handle = opendir($origin_osencoded);
         if (is_resource($handle))
         {
         	while (($file = readdir($handle)) !== false)
@@ -136,7 +136,7 @@ 
     			}
     			else
     			{
-    				if (dol_is_file($origin.'/'.$file) )
+    				if (dol_is_file($origin.'/'.$file))
     				{
     					dol_move($origin.'/'.$file, $destin.'/'.$file);
     				}

Braces +2 added lines, -4 removed lines

@@ -78,8 +78,7 @@ 
 			print " migrating product id=".$product->id." ref=".$product->ref."\n";
 			migrate_product_photospath($product);
 		}
-	}
-	else
+	} else
 	{
 		print "\n sql error ".$sql;
 		exit;
@@ -133,8 +132,7 @@ 
 		    			}
 //		    			dol_delete_dir($origin.'/'.$file);
         			}
-    			}
-    			else
+    			} else
     			{
     				if (dol_is_file($origin.'/'.$file) )
     				{

dolibarr/scripts/product/regenerate_thumbs.php

Indentation +21 added lines, -21 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);
 }
 
 @set_time_limit(0);							// No timeout for this script
@@ -69,13 +69,13 @@ 
 $subdir=$argv[1];
 if (empty($dir) || empty($subdir))
 {
-	dol_print_error('', 'dir not defined');
-	exit(1);
+    dol_print_error('', 'dir not defined');
+    exit(1);
 }
 if (! dol_is_dir($dir.'/'.$subdir))
 {
-	print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
-	exit(2);
+    print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
+    exit(2);
 }
 
 $filearray=dol_dir_list($dir.'/'.$subdir,"directories",0,'','temp$');
@@ -84,22 +84,22 @@ 
 
 foreach($filearray as $keyf => $valf)
 {
-	$ref=basename($valf['name']);
-	$filearrayimg=dol_dir_list($valf['fullname'],"files",0,'(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$','(\.meta|_preview.*\.png)$');
-	foreach($filearrayimg as $keyi => $vali)
-	{
-		print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
-
-		// Create small thumbs for image
-		// Used on logon for example
-		$imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbSmall)) print $imgThumbSmall."\n";
-
-		// Create mini thumbs for image (Ratio is near 16/9)
-		// Used on menu or for setup page for example
-		$imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbMini)) print $imgThumbMini."\n";
-	}
+    $ref=basename($valf['name']);
+    $filearrayimg=dol_dir_list($valf['fullname'],"files",0,'(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$','(\.meta|_preview.*\.png)$');
+    foreach($filearrayimg as $keyi => $vali)
+    {
+        print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
+
+        // Create small thumbs for image
+        // Used on logon for example
+        $imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+        if (preg_match('/Error/', $imgThumbSmall)) print $imgThumbSmall."\n";
+
+        // Create mini thumbs for image (Ratio is near 16/9)
+        // Used on menu or for setup page for example
+        $imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+        if (preg_match('/Error/', $imgThumbMini)) print $imgThumbMini."\n";
+    }
 }
 
 $db->close();	// Close $db database opened handler

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -33,8 +33,8 @@ 
 	exit(-1);
 }
 
-@set_time_limit(0);							// No timeout for this script
-define('EVEN_IF_ONLY_LOGIN_ALLOWED',1);		// Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
+@set_time_limit(0); // No timeout for this script
+define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
 require_once $path."../../htdocs/master.inc.php";
@@ -45,17 +45,17 @@ 
 // $user is created but empty.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$forcecommit=0;
+$version = DOL_VERSION;
+$error = 0;
+$forcecommit = 0;
 
 
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (empty($argv[1])) {
     print "Usage:    $script_file  subdirtoscan\n";
@@ -66,27 +66,27 @@ 
 print '--- start'."\n";
 
 $dir = DOL_DATA_ROOT;
-$subdir=$argv[1];
+$subdir = $argv[1];
 if (empty($dir) || empty($subdir))
 {
 	dol_print_error('', 'dir not defined');
 	exit(1);
 }
-if (! dol_is_dir($dir.'/'.$subdir))
+if (!dol_is_dir($dir.'/'.$subdir))
 {
 	print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
 	exit(2);
 }
 
-$filearray=dol_dir_list($dir.'/'.$subdir,"directories",0,'','temp$');
+$filearray = dol_dir_list($dir.'/'.$subdir, "directories", 0, '', 'temp$');
 
 global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 
-foreach($filearray as $keyf => $valf)
+foreach ($filearray as $keyf => $valf)
 {
-	$ref=basename($valf['name']);
-	$filearrayimg=dol_dir_list($valf['fullname'],"files",0,'(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$','(\.meta|_preview.*\.png)$');
-	foreach($filearrayimg as $keyi => $vali)
+	$ref = basename($valf['name']);
+	$filearrayimg = dol_dir_list($valf['fullname'], "files", 0, '(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$', '(\.meta|_preview.*\.png)$');
+	foreach ($filearrayimg as $keyi => $vali)
 	{
 		print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
 
@@ -102,6 +102,6 @@ 
 	}
 }
 
-$db->close();	// Close $db database opened handler
+$db->close(); // Close $db database opened handler
 
 exit($error);

Braces +6 added lines, -2 removed lines

@@ -93,12 +93,16 @@
 		// Create small thumbs for image
 		// Used on logon for example
 		$imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbSmall)) print $imgThumbSmall."\n";
+		if (preg_match('/Error/', $imgThumbSmall)) {
+		    print $imgThumbSmall."\n";
+		}
 
 		// Create mini thumbs for image (Ratio is near 16/9)
 		// Used on menu or for setup page for example
 		$imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbMini)) print $imgThumbMini."\n";
+		if (preg_match('/Error/', $imgThumbMini)) {
+		    print $imgThumbMini."\n";
+		}
 	}
 }