[Noalyss-commit] [noalyss] 20/65: Bug#1170 : button with wrong redirect

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 87640c3bfdae9759a978b5154aedc1628d2c4455
Author: Dany De Bontridder <address@hidden>
Date:   Mon Aug 31 18:59:38 2015 +0200

    Bug#1170 : button with wrong redirect
---
 include/class_fiche.php       |   25 +++++++++++++------------
 include/impress_poste.inc.php |    2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/class_fiche.php b/include/class_fiche.php
index a9a0282..a7b2129 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -1388,21 +1388,22 @@ class Fiche
         echo '<TR>';
 
         echo '<TD><form method="GET" ACTION="">'.
-        HtmlInput::submit('bt_other',"Autre poste").
-        dossier::hidden().
-        
$hid->input("type","poste").$hid->input('p_action','impress')."</form></TD>";
+            HtmlInput::submit('bt_other',"Autre poste").
+            HtmlInput::array_to_hidden(array('gDossier','ac'), $_REQUEST).
+            dossier::hidden().
+            
$hid->input("type","poste").$hid->input('p_action','impress')."</form></TD>";
         
$str_ople=(isset($_REQUEST['ople']))?HtmlInput::hidden('ople',$_REQUEST['ople']):'';
 
         echo '<TD><form method="GET" ACTION="export.php">'.
-        HtmlInput::submit('bt_pdf',_("Export PDF")).
-        dossier::hidden().$str_ople.
-         HtmlInput::hidden('act','PDF:fichedetail').
-        $hid->input("type","poste").
-        $hid->input('p_action','impress').
-        $hid->input("f_id",$this->id).
-        dossier::hidden().
-        $hid->input("from_periode",$p_array['from_periode']).
-        $hid->input("to_periode",$p_array['to_periode']);
+            HtmlInput::submit('bt_pdf',_("Export PDF")).
+            dossier::hidden().$str_ople.
+              HtmlInput::hidden('act','PDF:fichedetail').
+            $hid->input("type","poste").
+            $hid->input('p_action','impress').
+            $hid->input("f_id",$this->id).
+            dossier::hidden().
+            $hid->input("from_periode",$p_array['from_periode']).
+            $hid->input("to_periode",$p_array['to_periode']);
         if (isset($p_array['oper_detail']))
             echo $hid->input('oper_detail','on');
 
diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php
index 5b0ccd3..9301503 100644
--- a/include/impress_poste.inc.php
+++ b/include/impress_poste.inc.php
@@ -126,7 +126,7 @@ if ( isset( $_REQUEST['bt_html'] ) )
 {
     if ( isDate($_REQUEST['from_periode'])==null || 
isDate($_REQUEST['to_periode'])==null)
     {
-        echo alert('Date malformée, désolée');
+        echo alert(_('Date malformée, désolée'));
         return;
     }
     require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php';