Merge remote-tracking branch 'origin/3.5' into 3.6

scripts/members/sync_members_dolibarr2ldap.php

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

scripts/members/sync_members_ldap2dolibarr.php

@@ -95,8 +95,6 @@ $required_fields=array_unique(array_values(array_filter($required_fields, "dolVa
 
 if ($argv[3]) $conf->global->LDAP_SERVER_HOST=$argv[2];
 
-print "***** $script_file ($version) *****\n";
-
 if (! isset($argv[2]) || ! is_numeric($argv[2])) {
     print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type [ldapserverhost]\n";
 	exit(-1);
@@ -138,8 +136,6 @@ if ($typeid <= 0)
 }
 
 
-print "Press a key to confirm...";
-$input = trim(fgets(STDIN));
 print "Hit Enter to continue or CTRL+C to stop...\n";
 $input = trim(fgets(STDIN));
 

scripts/user/sync_groups_ldap2dolibarr.php

@@ -72,8 +72,6 @@ $required_fields=array_unique(array_values(array_filter($required_fields, "dolVa
 
 if ($argv[2]) $conf->global->LDAP_SERVER_HOST=$argv[2];
 
-print "***** $script_file ($version) *****\n";
-
 if (! isset($argv[1])) {
 	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n";
@@ -103,8 +101,7 @@ print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
 print "Mapped LDAP fields=".join(',',$required_fields)."\n";
 print "\n";
-print "Press a key to confirm...";
-$input = trim(fgets(STDIN));
+
 print "Hit Enter to continue or CTRL+C to stop...\n";
 $input = trim(fgets(STDIN));
 

scripts/user/sync_users_ldap2dolibarr.php

@@ -85,14 +85,12 @@ $required_fields=array_unique(array_values(array_filter($required_fields, "dolVa
 
 if ($argv[2]) $conf->global->LDAP_SERVER_HOST=$argv[2];
 
-print "***** $script_file ($version) *****\n";
-
 if (! isset($argv[1])) {
 	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
 	print "Usage:  $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n";
     exit(-1);
 }
-$groupid=$argv[3];
+
 if ($argv[1] == 'commitiferror') $forcecommit=1;
 
 
@@ -116,8 +114,7 @@ print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
 print "Mapped LDAP fields=".join(',',$required_fields)."\n";
 print "\n";
-print "Press a key to confirm...";
-$input = trim(fgets(STDIN));
+
 print "Hit Enter to continue or CTRL+C to stop...\n";
 $input = trim(fgets(STDIN));