[Noalyss-commit] [noalyss] 91/119: Follow-up correct link

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 3e109f941c07c53d2fa8bb28ff09a0757e26c148
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Mon Oct 12 18:38:20 2020 +0200

    Follow-up correct link
---
 include/category_card.inc.php     |  2 +-
 include/category_followup.inc.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/category_card.inc.php b/include/category_card.inc.php
index 42f0e2f..63bceb8 100644
--- a/include/category_card.inc.php
+++ b/include/category_card.inc.php
@@ -34,7 +34,7 @@ global $http;
 
 $str_dossier=Dossier::get();
 
-$root="?".http_build_query(["ac"=>$http->request("ac"),"sb"=>"detail","f_id"=>$http->request("f_id","number")]);
+$root="do.php?".http_build_query(["ac"=>$http->request("ac"),"sb"=>"detail","f_id"=>$http->request("f_id","number")]);
 $root.="&".$str_dossier;
 
 $ss_action=$http->request("sc", "string", "dc");
diff --git a/include/category_followup.inc.php 
b/include/category_followup.inc.php
index da20ee7..37e9ac8 100644
--- a/include/category_followup.inc.php
+++ b/include/category_followup.inc.php
@@ -40,8 +40,14 @@ $ag_id=$http->request("ag_id","string","0");
 if (! isset($_GET['submit_query'])) 
{$_REQUEST['closed_action']=1;$_GET['closed_action']=1;}
 
 $p_action=$http->request('ac');
-$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("closed_action","remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","searchtag","sb","sc"),"");
-$retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base);
+$base="do.php?".http_build_query(["ac"=>$p_action,
+                                "sc"=>"sv",
+                                "sb"=>"detail",
+                                "f_id"=>$http->request("f_id","number"),
+                                "gDossier"=>Dossier::id()
+                                ])."&amp;"
+        ;
+$retour=HtmlInput::button_anchor(_('retour'),$base);
 
 $fiche=new Fiche($cn,$http->request("f_id","number"));