From bd8e0e88a58fa41909f255a3acf53351582b6863 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Apr 2011 13:44:58 +0000 Subject: [PATCH] Fix: Libraries not used inside a web container must not use a GETPOST function. --- htdocs/comm/propal.php | 20 ++++++------- htdocs/commande/fiche.php | 28 +++++++++---------- htdocs/compta/paiement/rapport.php | 1 - .../modules/commande/modules_commande.php | 4 ++- .../modules/facture/modules_facture.php | 3 +- .../modules/propale/modules_propale.php | 5 ++-- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 449c6c6ad22..d79c3e2f43b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -168,7 +168,7 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes' $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; @@ -198,7 +198,7 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes' & $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } else { @@ -348,7 +348,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$id); exit; @@ -606,7 +606,7 @@ if ($_GET['action'] == 'modif' && $user->rights->propale->creer) $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } if ($_POST['action'] == "setabsolutediscount" && $user->rights->propale->creer) @@ -760,7 +760,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); unset($_POST['qty']); unset($_POST['type']); @@ -838,7 +838,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } } @@ -865,7 +865,7 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + $result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); if ($result <= 0) { dol_print_error($db,$result); @@ -943,7 +943,7 @@ if ($_GET['action'] == 'up' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']); exit; @@ -965,7 +965,7 @@ if ($_GET['action'] == 'down' && $user->rights->propale->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - propale_pdf_create($db, $object, $object->modelpdf, $outputlangs); + propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']); exit; @@ -1425,7 +1425,7 @@ if ($id > 0 || ! empty($ref)) } print ''; - + // Show object lines if (! empty($object->lines)) $object->printObjectLines(0,$mysoc,$soc); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 6cdd5642532..3fc16249193 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -165,7 +165,7 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes' $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } else { @@ -241,10 +241,10 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer) { $lines = $srcobject->lines; if (empty($lines) && method_exists($srcobject,'fetch_lines')) $lines = $srcobject->fetch_lines(); - + $fk_parent_line=0; $num=sizeof($lines); - + for ($i=0;$i<$num;$i++) { $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle); @@ -258,7 +258,7 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer) $date_end=$lines[$i]->date_fin_prevue; if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel; if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end; - + // Reset fk_parent_line for no child products and special product if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) { $fk_parent_line = 0; @@ -291,13 +291,13 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer) $error++; break; } - + // Defined the new fk_parent_line if ($result > 0 && $lines[$i]->product_type == 9) { $fk_parent_line = $result; } } - + // Hooks if (! empty($object->hooks)) { @@ -612,7 +612,7 @@ if ($_POST['action'] == 'addline' && $user->rights->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); unset($_POST['qty']); unset($_POST['type']); @@ -720,7 +720,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->commande->creer && $_POS $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } else { @@ -754,7 +754,7 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes' & $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } } @@ -793,7 +793,7 @@ if ($_GET['action'] == 'modif' && $user->rights->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); } } @@ -818,7 +818,7 @@ if ($_GET['action'] == 'up' && $user->rights->commande->creer) $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$comid.'#'.$_GET['rowid']); exit; @@ -840,7 +840,7 @@ if ($_GET['action'] == 'down' && $user->rights->commande->creer) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$comid.'#'.$_GET['rowid']); exit; @@ -872,7 +872,7 @@ if ($_REQUEST['action'] == 'builddoc') // In get or post $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs); + $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref')); if ($result <= 0) { dol_print_error($db,$result); @@ -1377,7 +1377,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) print_titre($title); print '
'; - + $objectsrc->printOriginLinesList($object); print '
'; diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index bf270c5c897..b9dd40bb979 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -71,7 +71,6 @@ if ($_POST["action"] == 'builddoc') else { $outputlangs->charset_output=$sav_charset_output; - dol_syslog("Erreur dans commande_pdf_create"); dol_print_error($db,$obj->error); } diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 36e9a8b0e39..1b84ccd8ea9 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -142,8 +142,10 @@ class ModeleNumRefCommandes * @param outputlangs objet lang a utiliser pour traduction * @param hidedetails Hide details of lines * @param hidedesc Hide description + * @param hideref Hide ref + * @return int 0 if KO, 1 if OK */ -function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0) +function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { global $conf,$langs; $langs->load("orders"); diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index f3212296f82..b3bae8ac373 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -142,9 +142,10 @@ class ModeleNumRefFactures * @param outputlangs objet lang a utiliser pour traduction * @param hidedetails Hide details of lines * @param hidedesc Hide description + * @param hideref Hide ref * @return int <0 if KO, >0 if OK */ -function facture_pdf_create($db, $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0) +function facture_pdf_create($db, $object, $message, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { global $conf,$langs; $langs->load("bills"); diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 3de854facb0..d67b171717c 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -138,9 +138,10 @@ class ModeleNumRefPropales * @param outputlangs objet lang a utiliser pour traduction * @param hidedetails Hide details of lines * @param hidedesc Hide description - * @return int 0 si KO, 1 si OK + * @param hideref Hide ref + * @return int 0 if KO, 1 if OK */ -function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0) +function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) { global $langs; $langs->load("propale");