From dec4ff2e199621c5ac6eb8b5ddff971a6f02168d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 5 Jul 2014 11:50:25 +0200
Subject: [PATCH] Fix: Duplicate confirmation
---
scripts/members/sync_members_dolibarr2ldap.php | 1 +
scripts/members/sync_members_ldap2dolibarr.php | 2 --
scripts/user/sync_groups_ldap2dolibarr.php | 3 +--
scripts/user/sync_users_ldap2dolibarr.php | 5 ++---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 840cf464ba2..7b0194a27bb 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 dbc37e1ca20..090fe25b42b 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 bab01ecf2dd..603263db58a 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 b36aced01b0..86910c45f65 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));
--
GitLab