[Noalyss-commit] [noalyss] 85/119: Follow-up fix order

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 41fb176fe3740ba76bd78e7275260b32d18fa3f6
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Mon Oct 12 12:26:13 2020 +0200

    Follow-up fix order
---
 include/action.inc.php            | 3 +--
 include/class/follow_up.class.php | 5 +++--
 include/lib/html_input.class.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/action.inc.php b/include/action.inc.php
index 70406bb..e27e5f1 100644
--- a/include/action.inc.php
+++ b/include/action.inc.php
@@ -55,8 +55,7 @@ $sub_action=$http->request("sa","string","");
  */
 $ag_id=$http->request("ag_id","string","0");
 
-$ac=$http->request("ac");
-$base=HtmlInput::request_to_string(array('ac','gDossier'),"");
+$base="do.php?".http_build_query(["ac"=>$http->request("ac"),"gDossier"=>Dossier::id()]);
 echo '<div class="content">';
 require_once NOALYSS_INCLUDE.'/action.common.inc.php';
 echo "</div>";
diff --git a/include/class/follow_up.class.php 
b/include/class/follow_up.class.php
index b04bc90..e24b46e 100644
--- a/include/class/follow_up.class.php
+++ b/include/class/follow_up.class.php
@@ -610,7 +610,8 @@ class Follow_Up
     function myList($p_base, $p_filter="", $p_search="")
     {
         // for the sort
-        $url=HtmlInput::get_to_string(array("closed_action", 
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", 
"ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", 
"searchtag")).'&'.$p_base;
+        $arg=HtmlInput::get_to_string(array("closed_action", 
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state", "qcode", 
"ag_dest_query", "action_query", "tdoc", "date_start", "date_end", "hsstate", 
"searchtag"),"");
+        $url=$p_base.$arg;
 
         $table=new Sort_Table();
         $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by 
ag_timestamp desc', 'da', 'dd');
@@ -689,7 +690,7 @@ class Follow_Up
         //show the sub_action
         foreach ($a_row as $row)
         {
-            $href='<A class="document" 
HREF="do.php?'.$p_base.HtmlInput::get_to_string(array("closed_action", 
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state", 
"gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", 
"date_end", "hsstate", "searchtag", "ac"), 
"&").'&sa=detail&ag_id='.$row['ag_id'].'">';
+            $href='<A class="document" 
HREF="'.$p_base.HtmlInput::get_to_string(array("closed_action", 
"remind_date_end", "remind_date", "sag_ref", "only_internal", "state", 
"gDossier", "qcode", "ag_dest_query", "action_query", "tdoc", "date_start", 
"date_end", "hsstate", "searchtag", "ac"), 
"").'&sa=detail&ag_id='.$row['ag_id'].'" title="detail">';
             $i++;
             $tr=($i%2==0)?'even':'odd';
             if ($row['ag_priority']<2)
diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php
index 7ca7c55..0cbbabb 100755
--- a/include/lib/html_input.class.php
+++ b/include/lib/html_input.class.php
@@ -680,7 +680,7 @@ class HtmlInput
     static function array_to_string($array, $global_array, $start="?")
     {
 
-        $r=$start;
+        $r="";
 
         if (count($global_array)==0)
             return '';
@@ -704,7 +704,7 @@ class HtmlInput
             }
             $and="&amp;";
         }
-
+        if (trim ($r) != "") $r=$start.$r;
         return $r;
     }