international: affichage du html, fixed issue #0000237

This commit is contained in:
Sebastien BEAUGRAND 2010-04-12 15:59:12 +00:00
parent 7bb27a363f
commit 556b2e4c0d

View File

@ -57,10 +57,7 @@ if ($action == 'html') {
->from('Report')
->where('order_id = ? and format = "html"', $commande_id)
->fetchOne();
$contenu = preg_replace('/background: #FFFFFF;/', '', $rapport->content);
$contenu = preg_replace('@<script[^>]*?>.*?</script>@si', '', $contenu);
print $contenu;
print '</div>';
print $rapport->content;
exit;
}
@ -166,15 +163,13 @@ function tableFin() {
// boutonPost
// --------------------------------------------------------------------------- //
function boutonPost($action, $nom, $valeur, $etat_enq) {
if ($action == 'xml' ||
$action == 'pdf' ||
$action == 'doc') {
$extra = 'action="pages/international_commandes.php" ';
if ($action == 'html') {
$extra = 'target="_blank" ';
} else {
$extra = '';
}
print
'<form method="post" '.$extra.'style="float:left">'.
print '<form method="post" action="pages/international_commandes.php" '.
$extra.'style="float:left">'.
'<input type="hidden" name="action" value="'.$action.'" />'.
'<input type="hidden" name="'.$nom.'" value="'.$valeur.'" />'.
'<input type="hidden" name="etat_enq" value="'.$etat_enq.'" />'.