diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 840cf464ba22e3ecf14661910999379dc344c330..7b0194a27bb41e478a4f8a1d9dea3e20a36a5046 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/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)); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index dbc37e1ca207c83062f6a480cc0fa0d6c51e3356..090fe25b42b73f26d011fb5a77e4cba42762e507 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -136,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)); diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index bab01ecf2dd7a65b4f9ccdf2fbc5449f07baa499..603263db58a3c72d7af7347476a49e9f91ef008d 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -101,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)); diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index b36aced01b0b426e6ff2763ff555e2977eb49d44..86910c45f65407ebedf39a824c8fdfee9366df48 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -90,7 +90,7 @@ if (! isset($argv[1])) { print "Usage: $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n"; exit(-1); } -$groupid=$argv[3]; + if ($argv[1] == 'commitiferror') $forcecommit=1; @@ -114,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));