diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index c5307b176732c..072d78f6317cb 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -82,6 +82,7 @@ $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)); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 9a662839a3f8b..07cf3f45ac39d 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -95,8 +95,6 @@ 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 @@ } -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)); diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index fa29e4465c0fc..1da80e57d4e66 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -72,8 +72,6 @@ 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 "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)); diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index a1237b999cb0c..b7d041f64f9e1 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -85,14 +85,12 @@ 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 "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));