From 40cd45c16692f6f30c76dff7a361c27cc4c6d81e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 11:49:59 +0200 Subject: [PATCH 1/5] Fix: Better fix for cleaning vars --- htdocs/core/class/hookmanager.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index a98886cfa9d..2fd003f042e 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -143,6 +143,8 @@ class HookManager { foreach($modules as $module => $actionclassinstance) { + //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n"; + //print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action; // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; @@ -186,11 +188,11 @@ class HookManager if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; } - //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction; + $actionclassinstance->results=''; + $actionclassinstance->resprints=''; + + //print "After hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n"; } - - unset($actionclassinstance->results); - unset($actionclassinstance->resprints); } } From 897d1251c884744cb78c7acab89390cbe8e46cc0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 12:10:02 +0200 Subject: [PATCH 2/5] Fix: Better fix for cleaning vars (i'm tired today) --- htdocs/core/class/hookmanager.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 2fd003f042e..bfd8f63d9a4 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -188,10 +188,10 @@ class HookManager if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; } - $actionclassinstance->results=''; - $actionclassinstance->resprints=''; - //print "After hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n"; + + unset($actionclassinstance->results); + unset($actionclassinstance->resprints); } } } From 4ba24ed8d7bd8bf855a2bc783b31116b1182b7be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Jun 2013 12:58:52 +0200 Subject: [PATCH 3/5] Fix: Missing empty value --- htdocs/product/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index fa1f0fa5621..8971b93a3df 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -732,7 +732,7 @@ else { print ''.$langs->trans("Nature").''; $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); - print $form->selectarray('finished',$statutarray,GETPOST('finished')); + print $form->selectarray('finished',$statutarray,GETPOST('finished'),1); print ''; } From c7868e2471c25588f5374e1bd97e489c006e7125 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Jun 2013 21:57:09 +0200 Subject: [PATCH 4/5] Fix: css --- htdocs/theme/bureau2crea/style.css.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 8464761c5d7..30f1b354068 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1157,13 +1157,12 @@ div.tabs a.tab:hover { text-align: ; } -div.tabBar { - color: #234046; - margin: 0px 0px 10px 0px; - background: #dee7ec url() repeat-x; -} */ +div.tabBar { + margin: 0px 0px 10px 0px; +} + div.tabsAction { margin: 20px 0em 1px 0em; padding: 0em 0em; From 977cd8ca4c1a0995461e0721c2211051dc95c40c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 12 Jun 2013 22:12:06 +0200 Subject: [PATCH 5/5] Fix: filtering was deleting data ! --- htdocs/comm/mailing/cibles.php | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 08b0e150227..90c01d54725 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -220,8 +220,10 @@ if ($object->fetch($id) >= 0) $var=!$var; + $allowaddtarget=($object->statut == 0 || $object->statut == 1); + // Show email selectors - if ($object->statut == 0 && $user->rights->mailing->creer) + if ($allowaddtarget && $user->rights->mailing->creer) { print_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),''); @@ -291,7 +293,7 @@ if ($object->fetch($id) >= 0) $var = !$var; print ''; - if ($object->statut == 0) + if ($allowaddtarget) { print '
'; print ''; @@ -326,7 +328,7 @@ if ($object->fetch($id) >= 0) print ''; print ''; - if ($object->statut == 0) + if ($allowaddtarget) { print ''; } @@ -337,7 +339,7 @@ if ($object->fetch($id) >= 0) } print ''; - if ($object->statut == 0) print '
'; + if ($allowaddtarget) print ''; print "\n"; } @@ -349,13 +351,6 @@ if ($object->fetch($id) >= 0) } // List of selected targets - print "\n\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " WHERE mc.fk_mailing=".$object->id; @@ -375,10 +370,26 @@ if ($object->fetch($id) >= 0) if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname); if ($search_email) $param.= "&search_email=".urlencode($search_email); + print ''; + print ''; + print ''; + print ''; + print ''; + $cleartext='
'.$langs->trans("ToClearAllRecipientsClickHere").': '.''; print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,''); + print ''; + + print "\n\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + + if ($page) $param.= "&page=".$page; print ''; print ''; @@ -510,6 +521,8 @@ if ($object->fetch($id) >= 0) } print "

"; + print '
'; + $db->free($resql); } else @@ -517,7 +530,6 @@ if ($object->fetch($id) >= 0) dol_print_error($db); } - print ''; print "\n\n"; }