From faa5eba2033ae5b445309eb0d75ee0545a24a0e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 4 Jul 2014 18:43:37 +0200 Subject: [PATCH 1/3] Fix: Substitution for external module at wrong place. --- .../societe/doc/doc_generic_odt.modules.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index fbf3cc5c6b0..323f54b1630 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -293,29 +293,29 @@ class doc_generic_odt extends ModeleThirdPartyDoc // setVars failed, probably because key not found } } - - + + // Replace tags of lines for contacts $contact_arrray=array(); - + $sql = "SELECT p.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql .= " WHERE p.fk_soc = ".$object->id; - + dol_syslog('doc_generic_odt :: sql='.$sql,LOG_DEBUG); $result = $this->db->query($sql); $num = $this->db->num_rows($result); - + $var=true; if ($num) { $i=0; $contactstatic = new Contact($this->db); - + while($i < $num) { $obj = $this->db->fetch_object($result); - + $contact_arrray[$i] = $obj->rowid; $i++; } @@ -325,7 +325,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc try { $listlines = $odfHandler->setSegment('companycontacts'); - + foreach($contact_arrray as $array_key => $contact_id) { $res_contact = $contactstatic->fetch($contact_id); @@ -354,11 +354,16 @@ class doc_generic_odt extends ModeleThirdPartyDoc //return -1; } } - + + // Make substitutions into odt of thirdparty + external modules + $tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs); + complete_substitutions_array($tmparray, $outputlangs, $object); + // Call the ODTSubstitution hook $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - //var_dump($object->id); exit; + + // Replace variables into document foreach($tmparray as $key=>$value) { try { @@ -389,11 +394,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc { } } - - - // Make substitutions into odt of thirdparty + external modules - $tmparray=$this->get_substitutionarray_thirdparty($object,$outputlangs); - complete_substitutions_array($tmparray, $outputlangs, $object); // Call the beforeODTSave hook $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs); From fe547de0e3572c24a9e5c20a290daf8be0ba34ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jul 2014 11:32:44 +0200 Subject: [PATCH 2/3] Fix: Removed duplicate lines --- scripts/members/sync_members_ldap2dolibarr.php | 2 -- scripts/user/sync_groups_ldap2dolibarr.php | 2 -- scripts/user/sync_users_ldap2dolibarr.php | 2 -- 3 files changed, 6 deletions(-) diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 56c91255c7e..dbc37e1ca20 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/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); diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index e7bf8773a25..bab01ecf2dd 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/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"; diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index 60cb1118c37..b36aced01b0 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -85,8 +85,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"; From dec4ff2e199621c5ac6eb8b5ddff971a6f02168d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 Jul 2014 11:50:25 +0200 Subject: [PATCH 3/3] 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));