From 138b60faedee720f5d0188b3d639b0f37390a610 Mon Sep 17 00:00:00 2001
From: "kevin.dezaphi" <kevin.dezaphi@maarch.org>
Date: Fri, 26 Oct 2018 17:32:42 +0200
Subject: [PATCH] verification emptyness tab before loop

---
 .../contact_addresses/contact_addresses.php   | 338 ++++-----
 .../contact_addresses_list.php                | 248 +++----
 .../contact_purposes/contact_purposes.php     |  53 +-
 .../contacts/contact_types/contact_types.php  |  88 +--
 .../contacts/contacts_v2/contacts_v2_up.php   | 320 ++++-----
 .../documents_list_copies.php                 | 670 +++++++++---------
 .../indexing_searching/addresses_list.php     | 276 ++++----
 .../indexing_searching/document_history.php   |  92 +--
 .../smartphone/list_result.php                |   2 +-
 modules/cases/cases_list.php                  | 150 ++--
 modules/cases/cases_list_search_adv.php       | 148 ++--
 modules/cases/list_results_mlb_frame.php      | 340 ++++-----
 modules/fileplan/fileplan_admin.php           | 106 +--
 modules/fileplan/fileplan_admin_managment.php | 124 ++--
 modules/fileplan/fileplan_managment.php       | 124 ++--
 modules/fileplan/positions_documents_list.php | 266 +++----
 modules/folder/folders_list_search_adv.php    |   2 +-
 .../lc_cycle_steps_management_controler.php   |  62 +-
 .../manage_notifications_controler.php        |  38 +-
 modules/sendmail/sendmail.php                 | 290 ++++----
 20 files changed, 1887 insertions(+), 1850 deletions(-)

diff --git a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php
index f655d295238..79b50829c43 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php
@@ -62,192 +62,194 @@ $request = new request;
 $tab = $request->PDOselect(
     $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype']
 );
-for ($i = 0; $i < count($tab); $i ++) {
-    for ($j = 0; $j < count($tab[$i]); $j ++) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == "id") {
-                $tab[$i][$j]["id"]          = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _ID;
-                $tab[$i][$j]["size"]        = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = false;
-                $tab[$i][$j]["order"]       = 'id';
-            }
-            if ($tab[$i][$j][$value] == "contact_id") {
-                $tab[$i][$j]["contact_id"]  = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _CONTACT_ID;
-                $tab[$i][$j]["size"]        = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = false;
-                $tab[$i][$j]["order"]       = 'contact_id';
-            }
-            if ($tab[$i][$j][$value] == "contact_purpose_id") {
-                $tab[$i][$j]["value"]              = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
-                $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]              = _CONTACT_PURPOSE;
-                $tab[$i][$j]["size"]               = "20";
-                $tab[$i][$j]["label_align"]        = "left";
-                $tab[$i][$j]["align"]              = "left";
-                $tab[$i][$j]["valign"]             = "bottom";
-                $tab[$i][$j]["show"]               = true;
-                $tab[$i][$j]["order"]              = 'contact_purpose_id';
-            }
-            if ($tab[$i][$j][$value] == "departement") {
-                $tab[$i][$j]['value'] = $request->show_string(
-                    $tab[$i][$j]['value']
-                );
-                $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _SERVICE;
-                $tab[$i][$j]["size"]        = "20";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = true;
-                $tab[$i][$j]["order"]       = 'departement';
-            }
-            if ($tab[$i][$j][$value]=="lastname") {
-
-                $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["lastname"]    =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_LASTNAME;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); $i ++) {
+        for ($j = 0; $j < count($tab[$i]); $j ++) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == "id") {
+                    $tab[$i][$j]["id"]          = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _ID;
+                    $tab[$i][$j]["size"]        = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = false;
+                    $tab[$i][$j]["order"]       = 'id';
                 }
-                $tab[$i][$j]["order"] = "lastname";
-            }
-            if ($tab[$i][$j][$value]=="firstname") {
+                if ($tab[$i][$j][$value] == "contact_id") {
+                    $tab[$i][$j]["contact_id"]  = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _CONTACT_ID;
+                    $tab[$i][$j]["size"]        = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = false;
+                    $tab[$i][$j]["order"]       = 'contact_id';
+                }
+                if ($tab[$i][$j][$value] == "contact_purpose_id") {
+                    $tab[$i][$j]["value"]              = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
+                    $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]              = _CONTACT_PURPOSE;
+                    $tab[$i][$j]["size"]               = "20";
+                    $tab[$i][$j]["label_align"]        = "left";
+                    $tab[$i][$j]["align"]              = "left";
+                    $tab[$i][$j]["valign"]             = "bottom";
+                    $tab[$i][$j]["show"]               = true;
+                    $tab[$i][$j]["order"]              = 'contact_purpose_id';
+                }
+                if ($tab[$i][$j][$value] == "departement") {
+                    $tab[$i][$j]['value'] = $request->show_string(
+                        $tab[$i][$j]['value']
+                    );
+                    $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _SERVICE;
+                    $tab[$i][$j]["size"]        = "20";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = true;
+                    $tab[$i][$j]["order"]       = 'departement';
+                }
+                if ($tab[$i][$j][$value]=="lastname") {
 
-                $tab[$i][$j]["firstname"]   = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]       =_FIRSTNAME;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+                    $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["lastname"]    =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_LASTNAME;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"] = "lastname";
                 }
-                $tab[$i][$j]["order"]= "firstname";
-            }
-            if ($tab[$i][$j][$value]=="function") {
+                if ($tab[$i][$j][$value]=="firstname") {
 
-                $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["function"]    =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_FUNCTION;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+                    $tab[$i][$j]["firstname"]   = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]       =_FIRSTNAME;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"]= "firstname";
                 }
-                $tab[$i][$j]["order"]= "function";
-            }
-            if ($tab[$i][$j][$value]=="is_private") {
+                if ($tab[$i][$j][$value]=="function") {
 
-                $is_private = $tab[$i][$j]['value'];
-                $tab[$i][$j]["show"]=false;
-            }
-            if ($tab[$i][$j][$value]=="address_num") {
+                    $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["function"]    =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_FUNCTION;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"]= "function";
+                }
+                if ($tab[$i][$j][$value]=="is_private") {
 
-                $address_num = $tab[$i][$j]['value'];
-                $tab[$i][$j]["show"]=false;
-            }
-            if ($tab[$i][$j][$value]=="address_street") {
-                
-                if ($is_private == "Y") {
-                    $tab[$i][$j]['value'] = "Confidentielle";
-                } else {
-                    $tab[$i][$j]['value'] = $address_num . " " . $request->show_string($tab[$i][$j]['value']);
+                    $is_private = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["show"]=false;
                 }
+                if ($tab[$i][$j][$value]=="address_num") {
 
-                $tab[$i][$j]["address_street"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]          = _ADDRESS;
-                $tab[$i][$j]["size"]           ="15";
-                $tab[$i][$j]["label_align"]    ="left";
-                $tab[$i][$j]["align"]          ="left";
-                $tab[$i][$j]["valign"]         ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                    $address_num = $tab[$i][$j]['value'];
                     $tab[$i][$j]["show"]=false;
-                } else {
-                    $tab[$i][$j]["show"]=true;
                 }
-                $tab[$i][$j]["order"]= "address_street";
-            }
-            if ($tab[$i][$j][$value]=="address_postal_code") {
-                if ($is_private == "Y") {
-                    $tab[$i][$j]['value'] = "Confidentiel";
-                } else {
-                    $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                if ($tab[$i][$j][$value]=="address_street") {
+                    
+                    if ($is_private == "Y") {
+                        $tab[$i][$j]['value'] = "Confidentielle";
+                    } else {
+                        $tab[$i][$j]['value'] = $address_num . " " . $request->show_string($tab[$i][$j]['value']);
+                    }
+
+                    $tab[$i][$j]["address_street"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]          = _ADDRESS;
+                    $tab[$i][$j]["size"]           ="15";
+                    $tab[$i][$j]["label_align"]    ="left";
+                    $tab[$i][$j]["align"]          ="left";
+                    $tab[$i][$j]["valign"]         ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=false;
+                    } else {
+                        $tab[$i][$j]["show"]=true;
+                    }
+                    $tab[$i][$j]["order"]= "address_street";
                 }
-                $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]               =_POSTAL_CODE;
-                $tab[$i][$j]["size"]                ="15";
-                $tab[$i][$j]["label_align"]         ="left";
-                $tab[$i][$j]["align"]               ="left";
-                $tab[$i][$j]["valign"]              ="bottom";
+                if ($tab[$i][$j][$value]=="address_postal_code") {
+                    if ($is_private == "Y") {
+                        $tab[$i][$j]['value'] = "Confidentiel";
+                    } else {
+                        $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                    }
+                    $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]               =_POSTAL_CODE;
+                    $tab[$i][$j]["size"]                ="15";
+                    $tab[$i][$j]["label_align"]         ="left";
+                    $tab[$i][$j]["align"]               ="left";
+                    $tab[$i][$j]["valign"]              ="bottom";
 
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=false;
-                } else {
-                    $tab[$i][$j]["show"]=true;
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=false;
+                    } else {
+                        $tab[$i][$j]["show"]=true;
+                    }
+                    $tab[$i][$j]["order"]= "address_postal_code";
                 }
-                $tab[$i][$j]["order"]= "address_postal_code";
-            }
-            if ($tab[$i][$j][$value]=="address_town") {
+                if ($tab[$i][$j][$value]=="address_town") {
 
-                if ($is_private == "Y") {
-                    $tab[$i][$j]['value'] = "Confidentielle";
+                    if ($is_private == "Y") {
+                        $tab[$i][$j]['value'] = "Confidentielle";
+                    }
+                    $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]        =_TOWN;
+                    $tab[$i][$j]["size"]         ="15";
+                    $tab[$i][$j]["label_align"]  ="left";
+                    $tab[$i][$j]["align"]        ="left";
+                    $tab[$i][$j]["valign"]       ="bottom";
+                    $tab[$i][$j]["show"]         =true;
+                    $tab[$i][$j]["order"]        = "address_town";
                 }
-                $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]        =_TOWN;
-                $tab[$i][$j]["size"]         ="15";
-                $tab[$i][$j]["label_align"]  ="left";
-                $tab[$i][$j]["align"]        ="left";
-                $tab[$i][$j]["valign"]       ="bottom";
-                $tab[$i][$j]["show"]         =true;
-                $tab[$i][$j]["order"]        = "address_town";
-            }
-            if ($tab[$i][$j][$value]=="phone") {
-                if ($is_private == "Y") {
-                    $tab[$i][$j]['value'] = "Confidentiel";
-                } else {
-                    $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                if ($tab[$i][$j][$value]=="phone") {
+                    if ($is_private == "Y") {
+                        $tab[$i][$j]['value'] = "Confidentiel";
+                    } else {
+                        $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                    }
+                    $tab[$i][$j]["phone"]       =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_PHONE;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    $tab[$i][$j]["show"]        =true;
+                    $tab[$i][$j]["order"]       = "phone";
                 }
-                $tab[$i][$j]["phone"]       =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_PHONE;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                $tab[$i][$j]["show"]        =true;
-                $tab[$i][$j]["order"]       = "phone";
-            }
-            if ($tab[$i][$j][$value]=="email") {
-                if ($is_private == "Y") {
-                    $tab[$i][$j]['value'] = "Confidentiel";
+                if ($tab[$i][$j][$value]=="email") {
+                    if ($is_private == "Y") {
+                        $tab[$i][$j]['value'] = "Confidentiel";
+                    }
+                    $tab[$i][$j]["email"]       = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]       =_MAIL;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="center";
+                    $tab[$i][$j]["align"]       ="center";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    $tab[$i][$j]["show"]        =true;
+                    $tab[$i][$j]["order"]       = "email";
                 }
-                $tab[$i][$j]["email"]       = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]       =_MAIL;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="center";
-                $tab[$i][$j]["align"]       ="center";
-                $tab[$i][$j]["valign"]      ="bottom";
-                $tab[$i][$j]["show"]        =true;
-                $tab[$i][$j]["order"]       = "email";
             }
         }
     }
diff --git a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
index 9acc89e301a..987666a424c 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_list.php
@@ -137,129 +137,131 @@ $tab = $request->PDOselect(
 );
 // $request->show();
 
-for ($i = 0; $i < count($tab); ++$i ) {
-    for ($j = 0; $j < count($tab[$i]); ++$j ) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == 'ca_id') {
-                $tab[$i][$j]['id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _ID;
-                $tab[$i][$j]['size'] = '30';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'id';
-            }
-            if ($tab[$i][$j][$value] == 'contact_id') {
-                $tab[$i][$j]['contact_id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _CONTACT_ID;
-                $tab[$i][$j]['size'] = '30';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'contact_id';
-            }
-            if ($tab[$i][$j][$value] == 'society') {
-                $show_string = explode(' - ', $tab[$i][$j]['value']);
-                $show_string[2] = '<i style="font-size:10px;color:#135F7F;">'.$show_string[2].'</i>';
-                $show_string = implode(' - ', $show_string);
-                $tab[$i][$j]['value'] = $show_string;
-                $tab[$i][$j]['society'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _LINKED_CONTACT;
-                $tab[$i][$j]['size'] = '30';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'society';
-            }
-            if ($tab[$i][$j][$value] == 'contact_purpose_id') {
-                $tab[$i][$j]['value'] = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
-                $tab[$i][$j]['contact_purpose_id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _CONTACT_PURPOSE;
-                $tab[$i][$j]['size'] = '20';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'contact_purpose_id';
-            }
-            if ($tab[$i][$j][$value] == 'departement') {
-                $tab[$i][$j]['value'] = $request->show_string(
-                    $tab[$i][$j]['value']
-                );
-                $tab[$i][$j]['departement'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _SERVICE;
-                $tab[$i][$j]['size'] = '20';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'departement';
-            }
-            if ($tab[$i][$j][$value] == 'lastname') {
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['lastname'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _LASTNAME;
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'lastname';
-            }
-            if ($tab[$i][$j][$value] == 'firstname') {
-                $tab[$i][$j]['firstname'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['label'] = _FIRSTNAME;
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'center';
-                $tab[$i][$j]['align'] = 'center';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'firstname';
-            }
-            if ($tab[$i][$j][$value] == 'function') {
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['function'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _FUNCTION;
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'function';
-            }
-            if ($tab[$i][$j][$value] == 'address_town') {
-                $tab[$i][$j]['address_town'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['label'] = _TOWN;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'center';
-                $tab[$i][$j]['align'] = 'center';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'address_town';
-            }
-            if ($tab[$i][$j][$value] == 'phone') {
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['phone'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _PHONE;
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'phone';
-            }
-            if ($tab[$i][$j][$value] == 'email') {
-                $tab[$i][$j]['email'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['label'] = _MAIL;
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'center';
-                $tab[$i][$j]['align'] = 'center';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'email';
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); ++$i ) {
+        for ($j = 0; $j < count($tab[$i]); ++$j ) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == 'ca_id') {
+                    $tab[$i][$j]['id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _ID;
+                    $tab[$i][$j]['size'] = '30';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'id';
+                }
+                if ($tab[$i][$j][$value] == 'contact_id') {
+                    $tab[$i][$j]['contact_id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _CONTACT_ID;
+                    $tab[$i][$j]['size'] = '30';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'contact_id';
+                }
+                if ($tab[$i][$j][$value] == 'society') {
+                    $show_string = explode(' - ', $tab[$i][$j]['value']);
+                    $show_string[2] = '<i style="font-size:10px;color:#135F7F;">'.$show_string[2].'</i>';
+                    $show_string = implode(' - ', $show_string);
+                    $tab[$i][$j]['value'] = $show_string;
+                    $tab[$i][$j]['society'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _LINKED_CONTACT;
+                    $tab[$i][$j]['size'] = '30';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'society';
+                }
+                if ($tab[$i][$j][$value] == 'contact_purpose_id') {
+                    $tab[$i][$j]['value'] = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
+                    $tab[$i][$j]['contact_purpose_id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _CONTACT_PURPOSE;
+                    $tab[$i][$j]['size'] = '20';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'contact_purpose_id';
+                }
+                if ($tab[$i][$j][$value] == 'departement') {
+                    $tab[$i][$j]['value'] = $request->show_string(
+                        $tab[$i][$j]['value']
+                    );
+                    $tab[$i][$j]['departement'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _SERVICE;
+                    $tab[$i][$j]['size'] = '20';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'departement';
+                }
+                if ($tab[$i][$j][$value] == 'lastname') {
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['lastname'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _LASTNAME;
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'lastname';
+                }
+                if ($tab[$i][$j][$value] == 'firstname') {
+                    $tab[$i][$j]['firstname'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['label'] = _FIRSTNAME;
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'center';
+                    $tab[$i][$j]['align'] = 'center';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'firstname';
+                }
+                if ($tab[$i][$j][$value] == 'function') {
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['function'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _FUNCTION;
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'function';
+                }
+                if ($tab[$i][$j][$value] == 'address_town') {
+                    $tab[$i][$j]['address_town'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['label'] = _TOWN;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'center';
+                    $tab[$i][$j]['align'] = 'center';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'address_town';
+                }
+                if ($tab[$i][$j][$value] == 'phone') {
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['phone'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _PHONE;
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'phone';
+                }
+                if ($tab[$i][$j][$value] == 'email') {
+                    $tab[$i][$j]['email'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['label'] = _MAIL;
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'center';
+                    $tab[$i][$j]['align'] = 'center';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'email';
+                }
             }
         }
     }
diff --git a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes.php b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes.php
index 11047f0e5fe..ca4bf3d628d 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes.php
@@ -95,31 +95,34 @@ $request = new request;
 $tab = $request->PDOselect(
     $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $limit, false, '', '', '', true, false, false, $_REQUEST['start']
 );
-for ($i = 0; $i < count($tab); $i ++) {
-    for ($j = 0; $j < count($tab[$i]); $j ++) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == "id") {
-                $tab[$i][$j]["contact_purposes_id"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"] = _ID;
-                $tab[$i][$j]["size"] = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"] = "left";
-                $tab[$i][$j]["valign"] = "bottom";
-                $tab[$i][$j]["show"] = true;
-                $tab[$i][$j]["order"] = 'contact_purposes_id';
-            }
-            if ($tab[$i][$j][$value] == "label") {
-                $tab[$i][$j]['value'] = $request->show_string(
-                    $tab[$i][$j]['value']
-                );
-                $tab[$i][$j]["contact_purposes_label"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"] = _DESC_CONTACT_PURPOSES;
-                $tab[$i][$j]["size"] = "60";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"] = "left";
-                $tab[$i][$j]["valign"] = "bottom";
-                $tab[$i][$j]["show"] = true;
-                $tab[$i][$j]["order"] = 'contact_purposes_label';
+
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); $i ++) {
+        for ($j = 0; $j < count($tab[$i]); $j ++) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == "id") {
+                    $tab[$i][$j]["contact_purposes_id"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"] = _ID;
+                    $tab[$i][$j]["size"] = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"] = "left";
+                    $tab[$i][$j]["valign"] = "bottom";
+                    $tab[$i][$j]["show"] = true;
+                    $tab[$i][$j]["order"] = 'contact_purposes_id';
+                }
+                if ($tab[$i][$j][$value] == "label") {
+                    $tab[$i][$j]['value'] = $request->show_string(
+                        $tab[$i][$j]['value']
+                    );
+                    $tab[$i][$j]["contact_purposes_label"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"] = _DESC_CONTACT_PURPOSES;
+                    $tab[$i][$j]["size"] = "60";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"] = "left";
+                    $tab[$i][$j]["valign"] = "bottom";
+                    $tab[$i][$j]["show"] = true;
+                    $tab[$i][$j]["order"] = 'contact_purposes_label';
+                }
             }
         }
     }
diff --git a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types.php b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types.php
index 6dcee79f66c..8a64a6f3ce0 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types.php
@@ -96,50 +96,52 @@ $request = new request;
 $tab = $request->PDOselect(
     $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $limit, false, '', '', '', true, false, false, $_REQUEST['start']
 );
-for ($i = 0; $i < count($tab); $i ++) {
-    for ($j = 0; $j < count($tab[$i]); $j ++) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == "id") {
-                $tab[$i][$j]["contact_types_id"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"] = _ID;
-                $tab[$i][$j]["size"] = "10";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"] = "left";
-                $tab[$i][$j]["valign"] = "bottom";
-                $tab[$i][$j]["show"] = true;
-                $tab[$i][$j]["order"] = 'contact_types_id';
-            }
-            if ($tab[$i][$j][$value] == "label") {
-                $tab[$i][$j]['value'] = $request->show_string(
-                    $tab[$i][$j]['value']
-                );
-                $tab[$i][$j]["contact_types_label"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"] = _DESC_CONTACT_TYPES;
-                $tab[$i][$j]["size"] = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"] = "left";
-                $tab[$i][$j]["valign"] = "bottom";
-                $tab[$i][$j]["show"] = true;
-                $tab[$i][$j]["order"] = 'contact_types_label';
-            }
-            if ($tab[$i][$j][$value] == "contact_target") {
-                if ($tab[$i][$j]['value'] == "both") {
-                    $tab[$i][$j]['value'] = _IS_CORPORATE_PERSON . " ". _AND ." " . _INDIVIDUAL;
-                } else if ($tab[$i][$j]['value'] == "corporate") {
-                    $tab[$i][$j]['value'] = _IS_CORPORATE_PERSON;
-                } else if($tab[$i][$j]['value'] == "no_corporate") {
-                    $tab[$i][$j]['value'] = _INDIVIDUAL;
-                } else {
-                    $tab[$i][$j]['value'] = "";
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); $i ++) {
+        for ($j = 0; $j < count($tab[$i]); $j ++) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == "id") {
+                    $tab[$i][$j]["contact_types_id"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"] = _ID;
+                    $tab[$i][$j]["size"] = "10";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"] = "left";
+                    $tab[$i][$j]["valign"] = "bottom";
+                    $tab[$i][$j]["show"] = true;
+                    $tab[$i][$j]["order"] = 'contact_types_id';
+                }
+                if ($tab[$i][$j][$value] == "label") {
+                    $tab[$i][$j]['value'] = $request->show_string(
+                        $tab[$i][$j]['value']
+                    );
+                    $tab[$i][$j]["contact_types_label"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"] = _DESC_CONTACT_TYPES;
+                    $tab[$i][$j]["size"] = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"] = "left";
+                    $tab[$i][$j]["valign"] = "bottom";
+                    $tab[$i][$j]["show"] = true;
+                    $tab[$i][$j]["order"] = 'contact_types_label';
+                }
+                if ($tab[$i][$j][$value] == "contact_target") {
+                    if ($tab[$i][$j]['value'] == "both") {
+                        $tab[$i][$j]['value'] = _IS_CORPORATE_PERSON . " ". _AND ." " . _INDIVIDUAL;
+                    } else if ($tab[$i][$j]['value'] == "corporate") {
+                        $tab[$i][$j]['value'] = _IS_CORPORATE_PERSON;
+                    } else if($tab[$i][$j]['value'] == "no_corporate") {
+                        $tab[$i][$j]['value'] = _INDIVIDUAL;
+                    } else {
+                        $tab[$i][$j]['value'] = "";
+                    }
+                    
+                    $tab[$i][$j]["label"] = _CONTACT_TARGET_LIST;
+                    $tab[$i][$j]["size"] = "50";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"] = "left";
+                    $tab[$i][$j]["valign"] = "bottom";
+                    $tab[$i][$j]["show"] = true;
+                    $tab[$i][$j]["order"] = 'contact_target';
                 }
-                
-                $tab[$i][$j]["label"] = _CONTACT_TARGET_LIST;
-                $tab[$i][$j]["size"] = "50";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"] = "left";
-                $tab[$i][$j]["valign"] = "bottom";
-                $tab[$i][$j]["show"] = true;
-                $tab[$i][$j]["order"] = 'contact_target';
             }
         }
     }
diff --git a/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php b/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php
index 290d4a26cac..7e02bd1ef23 100755
--- a/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php
@@ -142,173 +142,175 @@ $tab = $request->PDOselect(
     $orderstr,
     $_SESSION['config']['databasetype'], "default", false, "", "", "", true, false, true, $_REQUEST['start']
 );
-for ($i = 0; $i < count($tab); $i ++) {
-    for ($j = 0; $j < count($tab[$i]); $j ++) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == "id") {
-                $tab[$i][$j]["id"]          = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _ID;
-                $tab[$i][$j]["size"]        = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = false;
-                $tab[$i][$j]["order"]       = 'id';
-            }
-            if ($tab[$i][$j][$value] == "contact_id") {
-                $tab[$i][$j]["contact_id"]  = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _ID;
-                $tab[$i][$j]["size"]        = "30";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = false;
-                $tab[$i][$j]["order"]       = 'contact_id';
-            }
-            if ($tab[$i][$j][$value] == "contact_purpose_id") {
-                $tab[$i][$j]["value"]              = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
-                $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]              = _CONTACT_PURPOSE;
-                $tab[$i][$j]["size"]               = "20";
-                $tab[$i][$j]["label_align"]        = "left";
-                $tab[$i][$j]["align"]              = "left";
-                $tab[$i][$j]["valign"]             = "bottom";
-                $tab[$i][$j]["show"]               = true;
-                $tab[$i][$j]["order"]              = 'contact_purpose_id';
-            }
-            if ($tab[$i][$j][$value] == "departement") {
-                $tab[$i][$j]['value'] = $request->show_string(
-                    $tab[$i][$j]['value']
-                );
-                $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       = _SERVICE;
-                $tab[$i][$j]["size"]        = "20";
-                $tab[$i][$j]["label_align"] = "left";
-                $tab[$i][$j]["align"]       = "left";
-                $tab[$i][$j]["valign"]      = "bottom";
-                $tab[$i][$j]["show"]        = true;
-                $tab[$i][$j]["order"]       = 'departement';
-            }
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); $i ++) {
+        for ($j = 0; $j < count($tab[$i]); $j ++) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == "id") {
+                    $tab[$i][$j]["id"]          = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _ID;
+                    $tab[$i][$j]["size"]        = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = false;
+                    $tab[$i][$j]["order"]       = 'id';
+                }
+                if ($tab[$i][$j][$value] == "contact_id") {
+                    $tab[$i][$j]["contact_id"]  = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _ID;
+                    $tab[$i][$j]["size"]        = "30";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = false;
+                    $tab[$i][$j]["order"]       = 'contact_id';
+                }
+                if ($tab[$i][$j][$value] == "contact_purpose_id") {
+                    $tab[$i][$j]["value"]              = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
+                    $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]              = _CONTACT_PURPOSE;
+                    $tab[$i][$j]["size"]               = "20";
+                    $tab[$i][$j]["label_align"]        = "left";
+                    $tab[$i][$j]["align"]              = "left";
+                    $tab[$i][$j]["valign"]             = "bottom";
+                    $tab[$i][$j]["show"]               = true;
+                    $tab[$i][$j]["order"]              = 'contact_purpose_id';
+                }
+                if ($tab[$i][$j][$value] == "departement") {
+                    $tab[$i][$j]['value'] = $request->show_string(
+                        $tab[$i][$j]['value']
+                    );
+                    $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       = _SERVICE;
+                    $tab[$i][$j]["size"]        = "20";
+                    $tab[$i][$j]["label_align"] = "left";
+                    $tab[$i][$j]["align"]       = "left";
+                    $tab[$i][$j]["valign"]      = "bottom";
+                    $tab[$i][$j]["show"]        = true;
+                    $tab[$i][$j]["order"]       = 'departement';
+                }
 
-            if ($tab[$i][$j][$value]=="lastname") {
-                $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["lastname"]    =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_LASTNAME;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+                if ($tab[$i][$j][$value]=="lastname") {
+                    $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["lastname"]    =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_LASTNAME;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"]= "lastname";
                 }
-                $tab[$i][$j]["order"]= "lastname";
-            }
-            if ($tab[$i][$j][$value]=="firstname") {
-                $tab[$i][$j]["firstname"]   = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]       =_FIRSTNAME;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="center";
-                $tab[$i][$j]["align"]       ="center";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+                if ($tab[$i][$j][$value]=="firstname") {
+                    $tab[$i][$j]["firstname"]   = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]       =_FIRSTNAME;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="center";
+                    $tab[$i][$j]["align"]       ="center";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"]= "firstname";
                 }
-                $tab[$i][$j]["order"]= "firstname";
-            }
-            if ($tab[$i][$j][$value]=="function") {
-                $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["function"]    =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_FUNCTION;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=true;
-                } else {
-                    $tab[$i][$j]["show"]=false;
+                if ($tab[$i][$j][$value]=="function") {
+                    $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["function"]    =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_FUNCTION;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=true;
+                    } else {
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    $tab[$i][$j]["order"]= "function";
                 }
-                $tab[$i][$j]["order"]= "function";
-            }
-            if ($tab[$i][$j][$value]=="address_num") {
-                $address_num = $tab[$i][$j]['value'];
-                $tab[$i][$j]["show"]=false;
-            }
-            if ($tab[$i][$j][$value]=="address_street") {
-                $tab[$i][$j]['value']          = $address_num . " " . $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["address_street"] = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]          = _ADDRESS;
-                $tab[$i][$j]["size"]           ="15";
-                $tab[$i][$j]["label_align"]    ="left";
-                $tab[$i][$j]["align"]          ="left";
-                $tab[$i][$j]["valign"]         ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                if ($tab[$i][$j][$value]=="address_num") {
+                    $address_num = $tab[$i][$j]['value'];
                     $tab[$i][$j]["show"]=false;
-                } else {
-                    $tab[$i][$j]["show"]=true;
                 }
-                $tab[$i][$j]["order"]= "address_street";
-            }
-            if ($tab[$i][$j][$value]=="address_postal_code") {
-                $tab[$i][$j]['value']               =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]               =_POSTAL_CODE;
-                $tab[$i][$j]["size"]                ="15";
-                $tab[$i][$j]["label_align"]         ="left";
-                $tab[$i][$j]["align"]               ="left";
-                $tab[$i][$j]["valign"]              ="bottom";
-                if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
-                    $tab[$i][$j]["show"]=false;
-                } else {
-                    $tab[$i][$j]["show"]=true;
+                if ($tab[$i][$j][$value]=="address_street") {
+                    $tab[$i][$j]['value']          = $address_num . " " . $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["address_street"] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]          = _ADDRESS;
+                    $tab[$i][$j]["size"]           ="15";
+                    $tab[$i][$j]["label_align"]    ="left";
+                    $tab[$i][$j]["align"]          ="left";
+                    $tab[$i][$j]["valign"]         ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=false;
+                    } else {
+                        $tab[$i][$j]["show"]=true;
+                    }
+                    $tab[$i][$j]["order"]= "address_street";
+                }
+                if ($tab[$i][$j][$value]=="address_postal_code") {
+                    $tab[$i][$j]['value']               =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]               =_POSTAL_CODE;
+                    $tab[$i][$j]["size"]                ="15";
+                    $tab[$i][$j]["label_align"]         ="left";
+                    $tab[$i][$j]["align"]               ="left";
+                    $tab[$i][$j]["valign"]              ="bottom";
+                    if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") {
+                        $tab[$i][$j]["show"]=false;
+                    } else {
+                        $tab[$i][$j]["show"]=true;
+                    }
+                    $tab[$i][$j]["order"]= "address_postal_code";
                 }
-                $tab[$i][$j]["order"]= "address_postal_code";
-            }
 
-            if ($tab[$i][$j][$value]=="address_town") {
-                $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]        =_TOWN;
-                $tab[$i][$j]["size"]         ="15";
-                $tab[$i][$j]["label_align"]  ="center";
-                $tab[$i][$j]["align"]        ="center";
-                $tab[$i][$j]["valign"]       ="bottom";
-                $tab[$i][$j]["show"]         =true;
-                $tab[$i][$j]["order"]        = "address_town";
-            }
-            if ($tab[$i][$j][$value]=="phone") {
-                $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["phone"]       =$tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_PHONE;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="left";
-                $tab[$i][$j]["align"]       ="left";
-                $tab[$i][$j]["valign"]      ="bottom";
-                $tab[$i][$j]["show"]        =true;
-                $tab[$i][$j]["order"]       = "phone";
-            }
-            if ($tab[$i][$j][$value]=="email") {
-                $tab[$i][$j]["email"]       = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]["label"]       =_MAIL;
-                $tab[$i][$j]["size"]        ="15";
-                $tab[$i][$j]["label_align"] ="center";
-                $tab[$i][$j]["align"]       ="center";
-                $tab[$i][$j]["valign"]      ="bottom";
-                $tab[$i][$j]["show"]        =true;
-                $tab[$i][$j]["order"]       = "email";
-            }
-            if ($tab[$i][$j][$value]=="enabled") {
-                $tab[$i][$j]["enabled"]     = $tab[$i][$j]['value'];
-                $tab[$i][$j]["label"]       =_STATUS;
-                $tab[$i][$j]["size"]        ="5";
-                $tab[$i][$j]["label_align"] ="center";
-                $tab[$i][$j]["align"]       ="center";
-                $tab[$i][$j]["valign"]      ="bottom";
-                $tab[$i][$j]["show"]        =true;
-                $tab[$i][$j]["order"]       = "enabled";
+                if ($tab[$i][$j][$value]=="address_town") {
+                    $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]        =_TOWN;
+                    $tab[$i][$j]["size"]         ="15";
+                    $tab[$i][$j]["label_align"]  ="center";
+                    $tab[$i][$j]["align"]        ="center";
+                    $tab[$i][$j]["valign"]       ="bottom";
+                    $tab[$i][$j]["show"]         =true;
+                    $tab[$i][$j]["order"]        = "address_town";
+                }
+                if ($tab[$i][$j][$value]=="phone") {
+                    $tab[$i][$j]['value']       =$request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["phone"]       =$tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_PHONE;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="left";
+                    $tab[$i][$j]["align"]       ="left";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    $tab[$i][$j]["show"]        =true;
+                    $tab[$i][$j]["order"]       = "phone";
+                }
+                if ($tab[$i][$j][$value]=="email") {
+                    $tab[$i][$j]["email"]       = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]["label"]       =_MAIL;
+                    $tab[$i][$j]["size"]        ="15";
+                    $tab[$i][$j]["label_align"] ="center";
+                    $tab[$i][$j]["align"]       ="center";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    $tab[$i][$j]["show"]        =true;
+                    $tab[$i][$j]["order"]       = "email";
+                }
+                if ($tab[$i][$j][$value]=="enabled") {
+                    $tab[$i][$j]["enabled"]     = $tab[$i][$j]['value'];
+                    $tab[$i][$j]["label"]       =_STATUS;
+                    $tab[$i][$j]["size"]        ="5";
+                    $tab[$i][$j]["label_align"] ="center";
+                    $tab[$i][$j]["align"]       ="center";
+                    $tab[$i][$j]["valign"]      ="bottom";
+                    $tab[$i][$j]["show"]        =true;
+                    $tab[$i][$j]["order"]       = "enabled";
+                }
             }
         }
     }
diff --git a/apps/maarch_entreprise/documents_list_copies.php b/apps/maarch_entreprise/documents_list_copies.php
index b9bafcd33c3..dc5345a7c7a 100755
--- a/apps/maarch_entreprise/documents_list_copies.php
+++ b/apps/maarch_entreprise/documents_list_copies.php
@@ -221,213 +221,175 @@ if ($selectedTemplate != 'none') {
 $db = new Database();
 $addressId = 0;
 //Result Array
-for ($i = 0; $i < count($tab); ++$i) {
-    for ($j = 0; $j < count($tab[$i]); ++$j) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == 'res_id') {
-                $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _GED_NUM;
-                $tab[$i][$j]['size'] = '4';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'res_id';
-                $_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
-
-                // notes
-                $query = 'SELECT ';
-                $query .= 'notes.id ';
-                $query .= 'FROM ';
-                $query .= 'notes ';
-                $query .= 'left join ';
-                $query .= 'note_entities ';
-                $query .= 'on ';
-                $query .= 'notes.id = note_entities.note_id ';
-                $query .= 'WHERE ';
-                $query .= "tablename = 'res_letterbox' ";
-                $query .= 'AND ';
-                $query .= "coll_id = 'letterbox_coll' ";
-                $query .= 'AND ';
-                $query .= 'identifier = ? ';
-                $arrayPDOnotes = array($tab[$i][$j]['value']);
-                $query .= 'AND ';
-                $query .= '( ';
-                $query .= '( ';
-                $query .= 'item_id IN (';
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); ++$i) {
+        for ($j = 0; $j < count($tab[$i]); ++$j) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == 'res_id') {
+                    $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _GED_NUM;
+                    $tab[$i][$j]['size'] = '4';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'res_id';
+                    $_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
 
-                foreach ($_SESSION['user']['entities'] as $entitiestmpnote) {
-                    $query .= '?, ';
-                    $arrayPDOnotes = array_merge($arrayPDOnotes, array($entitiestmpnote['ENTITY_ID']));
-                }
-                $query = substr($query, 0, -2);
+                    // notes
+                    $query = 'SELECT ';
+                    $query .= 'notes.id ';
+                    $query .= 'FROM ';
+                    $query .= 'notes ';
+                    $query .= 'left join ';
+                    $query .= 'note_entities ';
+                    $query .= 'on ';
+                    $query .= 'notes.id = note_entities.note_id ';
+                    $query .= 'WHERE ';
+                    $query .= "tablename = 'res_letterbox' ";
+                    $query .= 'AND ';
+                    $query .= "coll_id = 'letterbox_coll' ";
+                    $query .= 'AND ';
+                    $query .= 'identifier = ? ';
+                    $arrayPDOnotes = array($tab[$i][$j]['value']);
+                    $query .= 'AND ';
+                    $query .= '( ';
+                    $query .= '( ';
+                    $query .= 'item_id IN (';
 
-                $query .= ') ';
-                $query .= 'OR ';
-                $query .= 'item_id IS NULL ';
-                $query .= ') ';
-                $query .= 'OR ';
-                $query .= 'user_id = ? ';
-                $arrayPDOnotes = array_merge($arrayPDOnotes, array($_SESSION['user']['UserId']));
-                $query .= ') ';
-                $stmt = $db->query($query, $arrayPDOnotes);
-                $tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
-                $tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
-            }
-            if ($tab[$i][$j][$value] == 'address_id') {
-                $addressId = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'creation_date') {
-                $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false, '', true);
-                $tab[$i][$j]['label'] = _CREATION_DATE;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'creation_date';
-            }
-            if ($tab[$i][$j][$value] == 'admission_date') {
-                $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
-                $tab[$i][$j]['label'] = _ADMISSION_DATE;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'admission_date';
-            }
-            if ($tab[$i][$j][$value] == 'process_limit_date') {
-                $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
-                $compareDate = '';
-                if ($tab[$i][$j]['value'] != '' && ($statusCmp == 'NEW' || $statusCmp == 'COU' || $statusCmp == 'VAL' || $statusCmp == 'RET')) {
-                    $compareDate = $core_tools->compare_date($tab[$i][$j]['value'], date('d-m-Y'));
-                    if ($compareDate == 'date2') {
-                        $tab[$i][$j]['value'] = "<span style='color:red;'><b>".$tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates($tab[$i][$j]['value'], date('d-m-Y')).' '._DAYS.')</small></b></span>';
-                    } elseif ($compareDate == 'date1') {
-                        $tab[$i][$j]['value'] = $tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates(date('d-m-Y'), $tab[$i][$j]['value']).' '._DAYS.')</small>';
-                    } elseif ($compareDate == 'equal') {
-                        $tab[$i][$j]['value'] = "<span style='color:blue;'><b>".$tab[$i][$j]['value'].'<br><small>('._LAST_DAY.')</small></b></span>';
+                    foreach ($_SESSION['user']['entities'] as $entitiestmpnote) {
+                        $query .= '?, ';
+                        $arrayPDOnotes = array_merge($arrayPDOnotes, array($entitiestmpnote['ENTITY_ID']));
                     }
+                    $query = substr($query, 0, -2);
+
+                    $query .= ') ';
+                    $query .= 'OR ';
+                    $query .= 'item_id IS NULL ';
+                    $query .= ') ';
+                    $query .= 'OR ';
+                    $query .= 'user_id = ? ';
+                    $arrayPDOnotes = array_merge($arrayPDOnotes, array($_SESSION['user']['UserId']));
+                    $query .= ') ';
+                    $stmt = $db->query($query, $arrayPDOnotes);
+                    $tab[$i][$j]['hasNotes'] = $stmt->fetchObject();
+                    $tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
                 }
-                $tab[$i][$j]['label'] = _PROCESS_LIMIT_DATE;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'process_limit_date';
-            }
-            if ($tab[$i][$j][$value] == 'category_id') {
-                $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['value'] = $_SESSION['coll_categories'][$_SESSION['collection_id_choice']][$tab[$i][$j]['value']];
-                $tab[$i][$j]['label'] = _CATEGORY;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'category_id';
-            }
-            if ($tab[$i][$j][$value] == 'priority') {
-                $fakeId = null;
-                foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
-                    if ($prioValue == $tab[$i][$j]['value']) {
-                        $fakeId = $key;
+                if ($tab[$i][$j][$value] == 'address_id') {
+                    $addressId = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
+                }
+                if ($tab[$i][$j][$value] == 'creation_date') {
+                    $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false, '', true);
+                    $tab[$i][$j]['label'] = _CREATION_DATE;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'creation_date';
+                }
+                if ($tab[$i][$j][$value] == 'admission_date') {
+                    $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+                    $tab[$i][$j]['label'] = _ADMISSION_DATE;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'admission_date';
+                }
+                if ($tab[$i][$j][$value] == 'process_limit_date') {
+                    $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+                    $compareDate = '';
+                    if ($tab[$i][$j]['value'] != '' && ($statusCmp == 'NEW' || $statusCmp == 'COU' || $statusCmp == 'VAL' || $statusCmp == 'RET')) {
+                        $compareDate = $core_tools->compare_date($tab[$i][$j]['value'], date('d-m-Y'));
+                        if ($compareDate == 'date2') {
+                            $tab[$i][$j]['value'] = "<span style='color:red;'><b>".$tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates($tab[$i][$j]['value'], date('d-m-Y')).' '._DAYS.')</small></b></span>';
+                        } elseif ($compareDate == 'date1') {
+                            $tab[$i][$j]['value'] = $tab[$i][$j]['value'].'<br><small>('.$core_tools->nbDaysBetween2Dates(date('d-m-Y'), $tab[$i][$j]['value']).' '._DAYS.')</small>';
+                        } elseif ($compareDate == 'equal') {
+                            $tab[$i][$j]['value'] = "<span style='color:blue;'><b>".$tab[$i][$j]['value'].'<br><small>('._LAST_DAY.')</small></b></span>';
+                        }
                     }
+                    $tab[$i][$j]['label'] = _PROCESS_LIMIT_DATE;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'process_limit_date';
                 }
-                $tab[$i][$j]['value'] = $_SESSION['mail_priorities'][$fakeId];
-                $tab[$i][$j]['label'] = _PRIORITY;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['order'] = 'priority';
-            }
-            if ($tab[$i][$j][$value] == 'subject') {
-                $tab[$i][$j]['value'] = $request->cut_string($request->show_string($tab[$i][$j]['value'], '', '', '', false), 250);
-                $tab[$i][$j]['label'] = _SUBJECT;
-                $tab[$i][$j]['size'] = '12';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'subject';
-            }
-            if ($tab[$i][$j][$value] == 'contact_firstname') {
-                $contact_firstname = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'contact_lastname') {
-                $contact_lastname = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'contact_society') {
-                $contact_society = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'user_firstname') {
-                $user_firstname = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'user_lastname') {
-                $user_lastname = $tab[$i][$j]['value'];
-                $tab[$i][$j]['show'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'exp_user_id') {
-                if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname) && !empty($addressId)) {
-                    $query = 'SELECT ca.firstname, ca.lastname FROM contact_addresses ca WHERE ca.id = ?';
-                    $arrayPDO = array($addressId);
-                    $stmt2 = $db->query($query, $arrayPDO);
-                    $return_contact = $stmt2->fetchObject();
-
-                    if (!empty($return_contact)) {
-                        $contact_firstname = $return_contact->firstname;
-                        $contact_lastname = $return_contact->lastname;
+                if ($tab[$i][$j][$value] == 'category_id') {
+                    $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['value'] = $_SESSION['coll_categories'][$_SESSION['collection_id_choice']][$tab[$i][$j]['value']];
+                    $tab[$i][$j]['label'] = _CATEGORY;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'category_id';
+                }
+                if ($tab[$i][$j][$value] == 'priority') {
+                    $fakeId = null;
+                    foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
+                        if ($prioValue == $tab[$i][$j]['value']) {
+                            $fakeId = $key;
+                        }
                     }
+                    $tab[$i][$j]['value'] = $_SESSION['mail_priorities'][$fakeId];
+                    $tab[$i][$j]['label'] = _PRIORITY;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['order'] = 'priority';
                 }
-
-                $tab[$i][$j]['label'] = _CONTACT;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname) && empty($contact_society)) {
-                    $tab[$i][$j]['value'] = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>';
-                } else {
-                    $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+                if ($tab[$i][$j][$value] == 'subject') {
+                    $tab[$i][$j]['value'] = $request->cut_string($request->show_string($tab[$i][$j]['value'], '', '', '', false), 250);
+                    $tab[$i][$j]['label'] = _SUBJECT;
+                    $tab[$i][$j]['size'] = '12';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'subject';
                 }
-                $tab[$i][$j]['order'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'dest_user') {
-                $tab[$i][$j]['label'] = 'dest_user';
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                if (!empty($tab[$i][$j]['value'])) {
-                    $user = \User\models\UserModel::getByUserId(['userId' => $tab[$i][$j]['value'], 'select' => ['firstname', 'lastname']]);
-                    $dest = $tab[$i][$j]['value'];
-                    $dest = $user['firstname'] . ' ' . $user['lastname'];
-                } else {
-                    $dest = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>';
+                if ($tab[$i][$j][$value] == 'contact_firstname') {
+                    $contact_firstname = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
                 }
-                $tab[$i][$j]["value"]=$dest;
-                if ($tab[$i][15]['value'] == 'outgoing') {
-                    $tab[$i][$j]['value'] = '<b>'._WRITTEN_BY.' : </b>'.$tab[$i][$j]['value'];
-                } else {
-                    $tab[$i][$j]['value'] = '<b>'._PROCESSED_BY.' : </b>'.$tab[$i][$j]['value'];
+                if ($tab[$i][$j][$value] == 'contact_lastname') {
+                    $contact_lastname = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
                 }
-                $tab[$i][$j]['order'] = false;
-            }
-            if ($tab[$i][$j][$value] == 'is_multicontacts') {
-                if ($tab[$i][$j]['value'] == 'Y') {
+                if ($tab[$i][$j][$value] == 'contact_society') {
+                    $contact_society = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
+                }
+                if ($tab[$i][$j][$value] == 'user_firstname') {
+                    $user_firstname = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
+                }
+                if ($tab[$i][$j][$value] == 'user_lastname') {
+                    $user_lastname = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['show'] = false;
+                }
+                if ($tab[$i][$j][$value] == 'exp_user_id') {
+                    if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname) && !empty($addressId)) {
+                        $query = 'SELECT ca.firstname, ca.lastname FROM contact_addresses ca WHERE ca.id = ?';
+                        $arrayPDO = array($addressId);
+                        $stmt2 = $db->query($query, $arrayPDO);
+                        $return_contact = $stmt2->fetchObject();
+
+                        if (!empty($return_contact)) {
+                            $contact_firstname = $return_contact->firstname;
+                            $contact_lastname = $return_contact->lastname;
+                        }
+                    }
+
                     $tab[$i][$j]['label'] = _CONTACT;
                     $tab[$i][$j]['size'] = '10';
                     $tab[$i][$j]['label_align'] = 'left';
@@ -435,155 +397,195 @@ for ($i = 0; $i < count($tab); ++$i) {
                     $tab[$i][$j]['valign'] = 'bottom';
                     $tab[$i][$j]['show'] = false;
                     $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    if (empty($contact_lastname) && empty($contact_firstname) && empty($user_lastname) && empty($user_firstname) && empty($contact_society)) {
+                        $tab[$i][$j]['value'] = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>';
+                    } else {
+                        $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+                    }
                     $tab[$i][$j]['order'] = false;
-                    if ($_SESSION['mlb_search_current_category_id'] == 'incoming') {
-                        $prefix = '<b>'._TO_CONTACT_C.'</b>';
-                    } elseif ($_SESSION['mlb_search_current_category_id'] == 'outgoing' || $_SESSION['mlb_search_current_category_id'] == 'internal') {
-                        $prefix = '<b>'._FOR_CONTACT_C.'</b>';
+                }
+                if ($tab[$i][$j][$value] == 'dest_user') {
+                    $tab[$i][$j]['label'] = 'dest_user';
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    if (!empty($tab[$i][$j]['value'])) {
+                        $user = \User\models\UserModel::getByUserId(['userId' => $tab[$i][$j]['value'], 'select' => ['firstname', 'lastname']]);
+                        $dest = $tab[$i][$j]['value'];
+                        $dest = $user['firstname'] . ' ' . $user['lastname'];
                     } else {
-                        $prefix = '';
+                        $dest = '<i style="opacity:0.5;">'._UNDEFINED_DATA.'</i>';
                     }
-                    $tab[$i][$j]['value'] = $prefix.' '._MULTI_CONTACT;
-                    $tab[$i][$j]['is_multi_contacts'] = 'Y';
-                    $tab[$itContactI][$itContactJ]['value'] = null;
+                    $tab[$i][$j]["value"]=$dest;
+                    if ($tab[$i][15]['value'] == 'outgoing') {
+                        $tab[$i][$j]['value'] = '<b>'._WRITTEN_BY.' : </b>'.$tab[$i][$j]['value'];
+                    } else {
+                        $tab[$i][$j]['value'] = '<b>'._PROCESSED_BY.' : </b>'.$tab[$i][$j]['value'];
+                    }
+                    $tab[$i][$j]['order'] = false;
                 }
-            }
-            if ($tab[$i][$j][$value] == 'type_label') {
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['label'] = _TYPE;
-                $tab[$i][$j]['size'] = '12';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'type_label';
-            }
-            if ($tab[$i][$j][$value] == 'status') {
-                //couleurs des priorités
-                $fakeId = null;
-                foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
-                    if ($prioValue == $tab[$i][8]['value']) {
-                        $fakeId = $key;
+                if ($tab[$i][$j][$value] == 'is_multicontacts') {
+                    if ($tab[$i][$j]['value'] == 'Y') {
+                        $tab[$i][$j]['label'] = _CONTACT;
+                        $tab[$i][$j]['size'] = '10';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = false;
+                        if ($_SESSION['mlb_search_current_category_id'] == 'incoming') {
+                            $prefix = '<b>'._TO_CONTACT_C.'</b>';
+                        } elseif ($_SESSION['mlb_search_current_category_id'] == 'outgoing' || $_SESSION['mlb_search_current_category_id'] == 'internal') {
+                            $prefix = '<b>'._FOR_CONTACT_C.'</b>';
+                        } else {
+                            $prefix = '';
+                        }
+                        $tab[$i][$j]['value'] = $prefix.' '._MULTI_CONTACT;
+                        $tab[$i][$j]['is_multi_contacts'] = 'Y';
+                        $tab[$itContactI][$itContactJ]['value'] = null;
                     }
                 }
-                $style = "style='color:".$_SESSION['mail_priorities_color'][$fakeId].";'";
-                $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
-                $statusCmp = $tab[$i][$j]['value'];
-                $img_class = substr($res_status['IMG_SRC'], 0, 2);
-                if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
-                    $tab[$i][$j]['value'] = '<i  '.$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
-                } else {
-                    $tab[$i][$j]['value'] = '<i '.$style." class = '".$img_class.' '.$res_status['IMG_SRC'].' '.$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+                if ($tab[$i][$j][$value] == 'type_label') {
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['label'] = _TYPE;
+                    $tab[$i][$j]['size'] = '12';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'type_label';
                 }
-                $tab[$i][$j]['label'] = _STATUS;
-                $tab[$i][$j]['size'] = '4';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'status';
-            }
-            if ($tab[$i][$j][$value] == 'category_img') {
-                $tab[$i][$j]['label'] = _CATEGORY;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'right';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
-                $tab[$i][$j]['value'] = $my_imgcat;
-                $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'category_id';
-            }
-            if ($tab[$i][$j][$value] == 'count_attachment') {
-                $query = "SELECT count(res_id) as total FROM res_view_attachments
-                            WHERE res_id_master = ?
-                            AND status NOT IN ('DEL', 'OBS') AND attachment_type NOT IN ('converted_pdf', 'print_folder') AND coll_id = ? AND (status <> 'TMP' or (typist = ? and status = 'TMP'))";
-                $arrayPDO = array($tab[$i][0]['res_id'], $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
-                $stmt2 = $db->query($query, $arrayPDO);
-                $return_count = $stmt2->fetchObject();
-
-                $tab[$i][$j]['label'] = _ATTACHMENTS;
-                $tab[$i][$j]['size'] = '12';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value'] = "$return_count->total";
-                $tab[$i][$j]['order'] = 'count_attachment';
-            }
-            if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
-                $tab[$i][$j]['label'] = _CASE_NUM;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
-                $tab[$i][$j]['order'] = 'case_id';
-            }
-            if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
-                $tab[$i][$j]['label'] = _CASE_LABEL;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_label';
-            }
-            if ($tab[$i][$j][$value] == 'viewed') {
-                $tab[$i][$j]['label'] = _VIEWED;
-                $tab[$i][$j]['size'] = '10';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['order'] = 'viewed';
-                $stmt = $db->query(
-                    'SELECT viewed FROM listinstance WHERE res_id = ? and coll_id = ?'
-                    .' and item_id = ?',
-                    array($_SESSION['mlb_search_current_res_id'], $_SESSION['current_basket']['coll_id'], $_SESSION['user']['UserId'])
-                );
-                $lineViewed = $stmt->fetchObject();
-                $tab[$i][$j]['value'] = "$lineViewed->viewed";
-            }
-            if ($tab[$i][$j][$value] == 'real_dest') {
-                $query = 'SELECT item_id, type FROM resource_contacts WHERE res_id = ?';
-                $arrayPDO = array($tab[$i][$j]['value']);
-                $stmt2 = $db->query($query, $arrayPDO);
-                $return_stmt = $stmt2->fetchObject();
-
-                if ($return_stmt->type == 'contact') {
-                    $query = 'SELECT * FROM view_contacts WHERE ca_id = ?';
-                    $arrayPDO = array($return_stmt->item_id);
-                    $stmt2 = $db->query($query, $arrayPDO);
-                    $return_stmt = $stmt2->fetch(PDO::FETCH_ASSOC);
-                    $formattedContact = \SrcCore\controllers\AutoCompleteController::getFormattedContact(['contact' => $return_stmt]);
-                    $tab[$i][$j]['value'] = $formattedContact['contact']['contact'];
-                } else if ($return_stmt->type == 'entity') {
-                    $query = 'SELECT short_label FROM entities WHERE id = ?';
-                    $arrayPDO = array($return_stmt->item_id);
+                if ($tab[$i][$j][$value] == 'status') {
+                    //couleurs des priorités
+                    $fakeId = null;
+                    foreach ($_SESSION['mail_priorities_id'] as $key => $prioValue) {
+                        if ($prioValue == $tab[$i][8]['value']) {
+                            $fakeId = $key;
+                        }
+                    }
+                    $style = "style='color:".$_SESSION['mail_priorities_color'][$fakeId].";'";
+                    $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
+                    $statusCmp = $tab[$i][$j]['value'];
+                    $img_class = substr($res_status['IMG_SRC'], 0, 2);
+                    if (!isset($res_status['IMG_SRC']) || empty($res_status['IMG_SRC'])) {
+                        $tab[$i][$j]['value'] = '<i  '.$style." class = 'fm fm-letter-status-new fm-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+                    } else {
+                        $tab[$i][$j]['value'] = '<i '.$style." class = '".$img_class.' '.$res_status['IMG_SRC'].' '.$img_class."-3x' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'></i>";
+                    }
+                    $tab[$i][$j]['label'] = _STATUS;
+                    $tab[$i][$j]['size'] = '4';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'status';
+                }
+                if ($tab[$i][$j][$value] == 'category_img') {
+                    $tab[$i][$j]['label'] = _CATEGORY;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'right';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
+                    $tab[$i][$j]['value'] = $my_imgcat;
+                    $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'category_id';
+                }
+                if ($tab[$i][$j][$value] == 'count_attachment') {
+                    $query = "SELECT count(res_id) as total FROM res_view_attachments
+                                WHERE res_id_master = ?
+                                AND status NOT IN ('DEL', 'OBS') AND attachment_type NOT IN ('converted_pdf', 'print_folder') AND coll_id = ? AND (status <> 'TMP' or (typist = ? and status = 'TMP'))";
+                    $arrayPDO = array($tab[$i][0]['res_id'], $_SESSION['collection_id_choice'], $_SESSION['user']['UserId']);
                     $stmt2 = $db->query($query, $arrayPDO);
-                    $return_stmt = $stmt2->fetchObject();
-                    $tab[$i][$j]['value'] = $return_stmt->short_label;
-                } else {
-                    $query = 'SELECT firstname, lastname FROM users WHERE id = ?';
-                    $arrayPDO = array($return_stmt->item_id);
+                    $return_count = $stmt2->fetchObject();
+
+                    $tab[$i][$j]['label'] = _ATTACHMENTS;
+                    $tab[$i][$j]['size'] = '12';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value'] = "$return_count->total";
+                    $tab[$i][$j]['order'] = 'count_attachment';
+                }
+                if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
+                    $tab[$i][$j]['label'] = _CASE_NUM;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
+                    $tab[$i][$j]['order'] = 'case_id';
+                }
+                if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
+                    $tab[$i][$j]['label'] = _CASE_LABEL;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_label';
+                }
+                if ($tab[$i][$j][$value] == 'viewed') {
+                    $tab[$i][$j]['label'] = _VIEWED;
+                    $tab[$i][$j]['size'] = '10';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['order'] = 'viewed';
+                    $stmt = $db->query(
+                        'SELECT viewed FROM listinstance WHERE res_id = ? and coll_id = ?'
+                        .' and item_id = ?',
+                        array($_SESSION['mlb_search_current_res_id'], $_SESSION['current_basket']['coll_id'], $_SESSION['user']['UserId'])
+                    );
+                    $lineViewed = $stmt->fetchObject();
+                    $tab[$i][$j]['value'] = "$lineViewed->viewed";
+                }
+                if ($tab[$i][$j][$value] == 'real_dest') {
+                    $query = 'SELECT item_id, type FROM resource_contacts WHERE res_id = ?';
+                    $arrayPDO = array($tab[$i][$j]['value']);
                     $stmt2 = $db->query($query, $arrayPDO);
                     $return_stmt = $stmt2->fetchObject();
-                    $tab[$i][$j]['value'] = $return_stmt->firstname.' '. $return_stmt->lastname;
-                }
-                if (empty(trim($tab[$i][$j]['value']))) {
-                    $tab[$i][$j]['value'] = null;
-                } else if ($_SESSION['mlb_search_current_category_id'] == 'outgoing') {
-                    $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
-                } else {
-                    $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
+
+                    if ($return_stmt->type == 'contact') {
+                        $query = 'SELECT * FROM view_contacts WHERE ca_id = ?';
+                        $arrayPDO = array($return_stmt->item_id);
+                        $stmt2 = $db->query($query, $arrayPDO);
+                        $return_stmt = $stmt2->fetch(PDO::FETCH_ASSOC);
+                        $formattedContact = \SrcCore\controllers\AutoCompleteController::getFormattedContact(['contact' => $return_stmt]);
+                        $tab[$i][$j]['value'] = $formattedContact['contact']['contact'];
+                    } else if ($return_stmt->type == 'entity') {
+                        $query = 'SELECT short_label FROM entities WHERE id = ?';
+                        $arrayPDO = array($return_stmt->item_id);
+                        $stmt2 = $db->query($query, $arrayPDO);
+                        $return_stmt = $stmt2->fetchObject();
+                        $tab[$i][$j]['value'] = $return_stmt->short_label;
+                    } else {
+                        $query = 'SELECT firstname, lastname FROM users WHERE id = ?';
+                        $arrayPDO = array($return_stmt->item_id);
+                        $stmt2 = $db->query($query, $arrayPDO);
+                        $return_stmt = $stmt2->fetchObject();
+                        $tab[$i][$j]['value'] = $return_stmt->firstname.' '. $return_stmt->lastname;
+                    }
+                    if (empty(trim($tab[$i][$j]['value']))) {
+                        $tab[$i][$j]['value'] = null;
+                    } else if ($_SESSION['mlb_search_current_category_id'] == 'outgoing') {
+                        $tab[$i][$j]['value'] = '<b>'._TO_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
+                    } else {
+                        $tab[$i][$j]['value'] = '<b>'._FOR_CONTACT_C.'</b>'.$tab[$i][$j]['value'];
+                    }
+                    $tab[$i][$j]['order'] = false;
                 }
-                $tab[$i][$j]['order'] = false;
             }
         }
     }
diff --git a/apps/maarch_entreprise/indexing_searching/addresses_list.php b/apps/maarch_entreprise/indexing_searching/addresses_list.php
index f83c279da74..03c4d4c6f46 100755
--- a/apps/maarch_entreprise/indexing_searching/addresses_list.php
+++ b/apps/maarch_entreprise/indexing_searching/addresses_list.php
@@ -157,144 +157,146 @@ if (!$return) {
     );
     // $request->show();
 
-    for ($i = 0; $i < count($tab); $i ++) {
-        for ($j = 0; $j < count($tab[$i]); $j ++) {
-            foreach (array_keys($tab[$i][$j]) as $value) {
-                if ($tab[$i][$j][$value] == "ca_id") {
-                    $tab[$i][$j]["id"] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"] = _ID;
-                    $tab[$i][$j]["size"] = "30";
-                    $tab[$i][$j]["label_align"] = "left";
-                    $tab[$i][$j]["align"] = "left";
-                    $tab[$i][$j]["valign"] = "bottom";
-                    $tab[$i][$j]["show"] = false;
-                    $tab[$i][$j]["order"] = 'id';
-                }
-                if ($tab[$i][$j][$value] == "contact_id") {
-                    $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"] = _CONTACT_ID;
-                    $tab[$i][$j]["size"] = "30";
-                    $tab[$i][$j]["label_align"] = "left";
-                    $tab[$i][$j]["align"] = "left";
-                    $tab[$i][$j]["valign"] = "bottom";
-                    $tab[$i][$j]["show"] = false;
-                    $tab[$i][$j]["order"] = 'contact_id';
-                }
-                if ($tab[$i][$j][$value] == "society") {
-                    $tab[$i][$j]["society"] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"] = _STRUCTURE_ORGANISM;
-                    $tab[$i][$j]["size"] = "30";
-                    $tab[$i][$j]["label_align"] = "left";
-                    $tab[$i][$j]["align"] = "left";
-                    $tab[$i][$j]["valign"] = "bottom";
-                    $tab[$i][$j]["show"] = true;
-                    $tab[$i][$j]["order"] = 'society';
-                }
-                if ($tab[$i][$j][$value] == "contact_purpose_id") {
-                    $tab[$i][$j]["value"]= $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
-                    $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"] = _CONTACT_PURPOSE;
-                    $tab[$i][$j]["size"] = "20";
-                    $tab[$i][$j]["label_align"] = "left";
-                    $tab[$i][$j]["align"] = "left";
-                    $tab[$i][$j]["valign"] = "bottom";
-                    $tab[$i][$j]["show"] = true;
-                    $tab[$i][$j]["order"] = 'contact_purpose_label';
-                }
-	            if($tab[$i][$j][$value]=="is_private")
-	            {
-	                $is_private = $tab[$i][$j]['value'];
-	                $tab[$i][$j]["show"]=false;
-	            }
-                if ($tab[$i][$j][$value] == "departement") {
-	                if ($is_private == "Y") {
-	                    $tab[$i][$j]['value'] = "Confidentiel";
-	                } else {
-	                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);                   
-	                }
+    if (!empty($tab)) {
+        for ($i = 0; $i < count($tab); $i ++) {
+            for ($j = 0; $j < count($tab[$i]); $j ++) {
+                foreach (array_keys($tab[$i][$j]) as $value) {
+                    if ($tab[$i][$j][$value] == "ca_id") {
+                        $tab[$i][$j]["id"] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"] = _ID;
+                        $tab[$i][$j]["size"] = "30";
+                        $tab[$i][$j]["label_align"] = "left";
+                        $tab[$i][$j]["align"] = "left";
+                        $tab[$i][$j]["valign"] = "bottom";
+                        $tab[$i][$j]["show"] = false;
+                        $tab[$i][$j]["order"] = 'id';
+                    }
+                    if ($tab[$i][$j][$value] == "contact_id") {
+                        $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"] = _CONTACT_ID;
+                        $tab[$i][$j]["size"] = "30";
+                        $tab[$i][$j]["label_align"] = "left";
+                        $tab[$i][$j]["align"] = "left";
+                        $tab[$i][$j]["valign"] = "bottom";
+                        $tab[$i][$j]["show"] = false;
+                        $tab[$i][$j]["order"] = 'contact_id';
+                    }
+                    if ($tab[$i][$j][$value] == "society") {
+                        $tab[$i][$j]["society"] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"] = _STRUCTURE_ORGANISM;
+                        $tab[$i][$j]["size"] = "30";
+                        $tab[$i][$j]["label_align"] = "left";
+                        $tab[$i][$j]["align"] = "left";
+                        $tab[$i][$j]["valign"] = "bottom";
+                        $tab[$i][$j]["show"] = true;
+                        $tab[$i][$j]["order"] = 'society';
+                    }
+                    if ($tab[$i][$j][$value] == "contact_purpose_id") {
+                        $tab[$i][$j]["value"]= $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']);
+                        $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"] = _CONTACT_PURPOSE;
+                        $tab[$i][$j]["size"] = "20";
+                        $tab[$i][$j]["label_align"] = "left";
+                        $tab[$i][$j]["align"] = "left";
+                        $tab[$i][$j]["valign"] = "bottom";
+                        $tab[$i][$j]["show"] = true;
+                        $tab[$i][$j]["order"] = 'contact_purpose_label';
+                    }
+                    if($tab[$i][$j][$value]=="is_private")
+                    {
+                        $is_private = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["show"]=false;
+                    }
+                    if ($tab[$i][$j][$value] == "departement") {
+                        if ($is_private == "Y") {
+                            $tab[$i][$j]['value'] = "Confidentiel";
+                        } else {
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);                   
+                        }
 
-                    $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"] = _SERVICE;
-                    $tab[$i][$j]["size"] = "20";
-                    $tab[$i][$j]["label_align"] = "left";
-                    $tab[$i][$j]["align"] = "left";
-                    $tab[$i][$j]["valign"] = "bottom";
-                    $tab[$i][$j]["show"] = true;
-                    $tab[$i][$j]["order"] = 'departement';
-                }
-                if($tab[$i][$j][$value]=="lastname")
-                {
-                    $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]["lastname"]=$tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"]=_LASTNAME;
-                    $tab[$i][$j]["size"]="15";
-                    $tab[$i][$j]["label_align"]="left";
-                    $tab[$i][$j]["align"]="left";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=true;
-                    $tab[$i][$j]["order"]= "lastname";
-                }
-                if($tab[$i][$j][$value]=="firstname")
-                {
-                    $tab[$i][$j]["firstname"]= $request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]["label"]=_FIRSTNAME;
-                    $tab[$i][$j]["size"]="15";
-                    $tab[$i][$j]["label_align"]="center";
-                    $tab[$i][$j]["align"]="center";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=true;
-                    $tab[$i][$j]["order"]= "firstname";
-                }
-                if($tab[$i][$j][$value]=="function")
-                {
-                    $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]["function"]=$tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"]=_FUNCTION;
-                    $tab[$i][$j]["size"]="15";
-                    $tab[$i][$j]["label_align"]="left";
-                    $tab[$i][$j]["align"]="left";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=true;
-                    $tab[$i][$j]["order"]= "function";
-                }
-                if($tab[$i][$j][$value]=="address_town")
-                {
-	                if ($is_private == "Y") {
-	                    $tab[$i][$j]['value'] = "Confidentiel";
-	                } else {
-	                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);                   
-	                }
-                    $tab[$i][$j]["address_town"]= $tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"]=_TOWN;
-                    $tab[$i][$j]["size"]="10";
-                    $tab[$i][$j]["label_align"]="center";
-                    $tab[$i][$j]["align"]="center";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=true;
-                    $tab[$i][$j]["order"]= "address_town";
-                }
-                if($tab[$i][$j][$value]=="phone")
-                {
-                    $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]["phone"]=$tab[$i][$j]['value'];
-                    $tab[$i][$j]["label"]=_PHONE;
-                    $tab[$i][$j]["size"]="15";
-                    $tab[$i][$j]["label_align"]="left";
-                    $tab[$i][$j]["align"]="left";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=false;
-                    $tab[$i][$j]["order"]= "phone";
-                }
-                if($tab[$i][$j][$value]=="email")
-                {
-                    $tab[$i][$j]["email"]= $request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]["label"]=_MAIL;
-                    $tab[$i][$j]["size"]="15";
-                    $tab[$i][$j]["label_align"]="center";
-                    $tab[$i][$j]["align"]="center";
-                    $tab[$i][$j]["valign"]="bottom";
-                    $tab[$i][$j]["show"]=false;
-                    $tab[$i][$j]["order"]= "email";
+                        $tab[$i][$j]["departement"] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"] = _SERVICE;
+                        $tab[$i][$j]["size"] = "20";
+                        $tab[$i][$j]["label_align"] = "left";
+                        $tab[$i][$j]["align"] = "left";
+                        $tab[$i][$j]["valign"] = "bottom";
+                        $tab[$i][$j]["show"] = true;
+                        $tab[$i][$j]["order"] = 'departement';
+                    }
+                    if($tab[$i][$j][$value]=="lastname")
+                    {
+                        $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]["lastname"]=$tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"]=_LASTNAME;
+                        $tab[$i][$j]["size"]="15";
+                        $tab[$i][$j]["label_align"]="left";
+                        $tab[$i][$j]["align"]="left";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=true;
+                        $tab[$i][$j]["order"]= "lastname";
+                    }
+                    if($tab[$i][$j][$value]=="firstname")
+                    {
+                        $tab[$i][$j]["firstname"]= $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]["label"]=_FIRSTNAME;
+                        $tab[$i][$j]["size"]="15";
+                        $tab[$i][$j]["label_align"]="center";
+                        $tab[$i][$j]["align"]="center";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=true;
+                        $tab[$i][$j]["order"]= "firstname";
+                    }
+                    if($tab[$i][$j][$value]=="function")
+                    {
+                        $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]["function"]=$tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"]=_FUNCTION;
+                        $tab[$i][$j]["size"]="15";
+                        $tab[$i][$j]["label_align"]="left";
+                        $tab[$i][$j]["align"]="left";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=true;
+                        $tab[$i][$j]["order"]= "function";
+                    }
+                    if($tab[$i][$j][$value]=="address_town")
+                    {
+                        if ($is_private == "Y") {
+                            $tab[$i][$j]['value'] = "Confidentiel";
+                        } else {
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);                   
+                        }
+                        $tab[$i][$j]["address_town"]= $tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"]=_TOWN;
+                        $tab[$i][$j]["size"]="10";
+                        $tab[$i][$j]["label_align"]="center";
+                        $tab[$i][$j]["align"]="center";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=true;
+                        $tab[$i][$j]["order"]= "address_town";
+                    }
+                    if($tab[$i][$j][$value]=="phone")
+                    {
+                        $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]["phone"]=$tab[$i][$j]['value'];
+                        $tab[$i][$j]["label"]=_PHONE;
+                        $tab[$i][$j]["size"]="15";
+                        $tab[$i][$j]["label_align"]="left";
+                        $tab[$i][$j]["align"]="left";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=false;
+                        $tab[$i][$j]["order"]= "phone";
+                    }
+                    if($tab[$i][$j][$value]=="email")
+                    {
+                        $tab[$i][$j]["email"]= $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]["label"]=_MAIL;
+                        $tab[$i][$j]["size"]="15";
+                        $tab[$i][$j]["label_align"]="center";
+                        $tab[$i][$j]["align"]="center";
+                        $tab[$i][$j]["valign"]="bottom";
+                        $tab[$i][$j]["show"]=false;
+                        $tab[$i][$j]["order"]= "email";
+                    }
                 }
             }
         }
diff --git a/apps/maarch_entreprise/indexing_searching/document_history.php b/apps/maarch_entreprise/indexing_searching/document_history.php
index e5008d3d3a2..5d684c7b60c 100755
--- a/apps/maarch_entreprise/indexing_searching/document_history.php
+++ b/apps/maarch_entreprise/indexing_searching/document_history.php
@@ -174,51 +174,53 @@ if (isset($_REQUEST['load'])) {
         $start
     );
         //Result Array
-        for ($i = 0; $i < count($tab); $i++) {
-            for ($j = 0; $j < count($tab[$i]); $j++) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == "id") {
-                        $tab[$i][$j]["id"] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]["label"] = _ID;
-                        $tab[$i][$j]["size"] = "1";
-                        $tab[$i][$j]["label_align"] = "left";
-                        $tab[$i][$j]["align"] = "left";
-                        $tab[$i][$j]["valign"] = "bottom";
-                        $tab[$i][$j]["show"] = true;
-                        $tab[$i][$j]["order"] = 'id';
-                    }
-                    if ($tab[$i][$j][$value] == "event_date") {
-                        $tab[$i][$j]["value"] = $request->dateformat($tab[$i][$j]["value"]);
-                        $tab[$i][$j]["label"] = _DATE;
-                        $tab[$i][$j]["size"] = "10";
-                        $tab[$i][$j]["label_align"] = "left";
-                        $tab[$i][$j]["align"] = "left";
-                        $tab[$i][$j]["valign"] = "bottom";
-                        $tab[$i][$j]["show"] = true;
-                        $tab[$i][$j]["order"] = 'event_date';
-                    }
-                    if ($tab[$i][$j][$value] == "firstname") {
-                        $firstname = $request->show_string($tab[$i][$j]["value"]);
-                    }
-                    if ($tab[$i][$j][$value] == "lastname") {
-                        $tab[$i][$j]["value"] = $firstname . ' ' . $request->show_string($tab[$i][$j]["value"]);
-                        $tab[$i][$j]["label"] = _USER;
-                        $tab[$i][$j]["size"] = $sizeUser;
-                        $tab[$i][$j]["label_align"] = "left";
-                        $tab[$i][$j]["align"] = "left";
-                        $tab[$i][$j]["valign"] = "bottom";
-                        $tab[$i][$j]["show"] = true;
-                        $tab[$i][$j]["order"] = 'lastname';
-                    }
-                    if ($tab[$i][$j][$value] == "info") {
-                        $tab[$i][$j]["value"] = $request->show_string($tab[$i][$j]["value"]);
-                        $tab[$i][$j]["label"] = _EVENT;
-                        $tab[$i][$j]["size"] = $sizeText;
-                        $tab[$i][$j]["label_align"] = "left";
-                        $tab[$i][$j]["align"] = "left";
-                        $tab[$i][$j]["valign"] = "bottom";
-                        $tab[$i][$j]["show"] = true;
-                        $tab[$i][$j]["order"] = 'info';
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); $i++) {
+                for ($j = 0; $j < count($tab[$i]); $j++) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == "id") {
+                            $tab[$i][$j]["id"] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]["label"] = _ID;
+                            $tab[$i][$j]["size"] = "1";
+                            $tab[$i][$j]["label_align"] = "left";
+                            $tab[$i][$j]["align"] = "left";
+                            $tab[$i][$j]["valign"] = "bottom";
+                            $tab[$i][$j]["show"] = true;
+                            $tab[$i][$j]["order"] = 'id';
+                        }
+                        if ($tab[$i][$j][$value] == "event_date") {
+                            $tab[$i][$j]["value"] = $request->dateformat($tab[$i][$j]["value"]);
+                            $tab[$i][$j]["label"] = _DATE;
+                            $tab[$i][$j]["size"] = "10";
+                            $tab[$i][$j]["label_align"] = "left";
+                            $tab[$i][$j]["align"] = "left";
+                            $tab[$i][$j]["valign"] = "bottom";
+                            $tab[$i][$j]["show"] = true;
+                            $tab[$i][$j]["order"] = 'event_date';
+                        }
+                        if ($tab[$i][$j][$value] == "firstname") {
+                            $firstname = $request->show_string($tab[$i][$j]["value"]);
+                        }
+                        if ($tab[$i][$j][$value] == "lastname") {
+                            $tab[$i][$j]["value"] = $firstname . ' ' . $request->show_string($tab[$i][$j]["value"]);
+                            $tab[$i][$j]["label"] = _USER;
+                            $tab[$i][$j]["size"] = $sizeUser;
+                            $tab[$i][$j]["label_align"] = "left";
+                            $tab[$i][$j]["align"] = "left";
+                            $tab[$i][$j]["valign"] = "bottom";
+                            $tab[$i][$j]["show"] = true;
+                            $tab[$i][$j]["order"] = 'lastname';
+                        }
+                        if ($tab[$i][$j][$value] == "info") {
+                            $tab[$i][$j]["value"] = $request->show_string($tab[$i][$j]["value"]);
+                            $tab[$i][$j]["label"] = _EVENT;
+                            $tab[$i][$j]["size"] = $sizeText;
+                            $tab[$i][$j]["label_align"] = "left";
+                            $tab[$i][$j]["align"] = "left";
+                            $tab[$i][$j]["valign"] = "bottom";
+                            $tab[$i][$j]["show"] = true;
+                            $tab[$i][$j]["order"] = 'info';
+                        }
                     }
                 }
             }
diff --git a/apps/maarch_entreprise/smartphone/list_result.php b/apps/maarch_entreprise/smartphone/list_result.php
index 5fa7deb260e..f77bb3a1f20 100755
--- a/apps/maarch_entreprise/smartphone/list_result.php
+++ b/apps/maarch_entreprise/smartphone/list_result.php
@@ -58,7 +58,7 @@ if (isset($whereRequest) && !empty($whereRequest)) {
 />
 
 <?php
-    if (count($tab) > 0) {
+    if (!empty($tab)) {
         for ($i = 0; $i < count($tab); ++$i) {
             if ($view == 'view_folders') {
                 $line = '<li>';
diff --git a/modules/cases/cases_list.php b/modules/cases/cases_list.php
index af30e7a8e42..320d8389d9e 100755
--- a/modules/cases/cases_list.php
+++ b/modules/cases/cases_list.php
@@ -93,81 +93,83 @@ if (!empty($_SESSION['current_basket'])) {
 }
 //$request->show();
 
-    //Result array
-for ($i = 0; $i < count($tab); ++$i) {
-    for ($j = 0; $j < count($tab[$i]); ++$j) {
-        foreach (array_keys($tab[$i][$j]) as $value) {
-            if ($tab[$i][$j][$value] == 'case_id') {
-                $tab[$i][$j]['case_id'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['label'] = _NUM_CASE;
-                $tab[$i][$j]['size'] = '4';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'center';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_id';
-            }
-            if ($tab[$i][$j][$value] == 'case_label') {
-                $tab[$i][$j]['label'] = _CASE_LABEL;
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['size'] = '15';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_label';
-            }
-            if ($tab[$i][$j][$value] == 'case_creation_date') {
-                $tab[$i][$j]['label'] = _CASE_CREATION_DATE;
-                $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
-                $tab[$i][$j]['size'] = '5';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_creation_date';
-            }
-            if ($tab[$i][$j][$value] == 'case_closing_date') {
-                $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
-
-                if ($tab[$i][$j]['value'] != '') {
-                    $tab[$i][$j]['value'] = '<b>('._CASE_CLOSED.')</b><br/>';
-                } else {
-                    $tab[$i][$j]['value'] = '';
+//Result array
+if (!empty($tab)) {
+    for ($i = 0; $i < count($tab); ++$i) {
+        for ($j = 0; $j < count($tab[$i]); ++$j) {
+            foreach (array_keys($tab[$i][$j]) as $value) {
+                if ($tab[$i][$j][$value] == 'case_id') {
+                    $tab[$i][$j]['case_id'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['label'] = _NUM_CASE;
+                    $tab[$i][$j]['size'] = '4';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'center';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_id';
+                }
+                if ($tab[$i][$j][$value] == 'case_label') {
+                    $tab[$i][$j]['label'] = _CASE_LABEL;
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['size'] = '15';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_label';
+                }
+                if ($tab[$i][$j][$value] == 'case_creation_date') {
+                    $tab[$i][$j]['label'] = _CASE_CREATION_DATE;
+                    $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
+                    $tab[$i][$j]['size'] = '5';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_creation_date';
+                }
+                if ($tab[$i][$j][$value] == 'case_closing_date') {
+                    $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
+
+                    if ($tab[$i][$j]['value'] != '') {
+                        $tab[$i][$j]['value'] = '<b>('._CASE_CLOSED.')</b><br/>';
+                    } else {
+                        $tab[$i][$j]['value'] = '';
+                    }
+
+                    $tab[$i][$j]['size'] = '5';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_closing_date';
+                }
+                if ($tab[$i][$j][$value] == 'case_typist') {
+                    $tab[$i][$j]['label'] = _CASE_TYPIST;
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['size'] = '25';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = true;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_typist';
+                }
+                if ($tab[$i][$j][$value] == 'case_description') {
+                    $tab[$i][$j]['label'] = _CASE_DESCRIPTION;
+                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                    $tab[$i][$j]['size'] = '25';
+                    $tab[$i][$j]['label_align'] = 'left';
+                    $tab[$i][$j]['align'] = 'left';
+                    $tab[$i][$j]['valign'] = 'bottom';
+                    $tab[$i][$j]['show'] = false;
+                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                    $tab[$i][$j]['order'] = 'case_description';
                 }
-
-                $tab[$i][$j]['size'] = '5';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_closing_date';
-            }
-            if ($tab[$i][$j][$value] == 'case_typist') {
-                $tab[$i][$j]['label'] = _CASE_TYPIST;
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['size'] = '25';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = true;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_typist';
-            }
-            if ($tab[$i][$j][$value] == 'case_description') {
-                $tab[$i][$j]['label'] = _CASE_DESCRIPTION;
-                $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                $tab[$i][$j]['size'] = '25';
-                $tab[$i][$j]['label_align'] = 'left';
-                $tab[$i][$j]['align'] = 'left';
-                $tab[$i][$j]['valign'] = 'bottom';
-                $tab[$i][$j]['show'] = false;
-                $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                $tab[$i][$j]['order'] = 'case_description';
             }
         }
     }
diff --git a/modules/cases/cases_list_search_adv.php b/modules/cases/cases_list_search_adv.php
index 7521b805cfe..c26e48de36d 100755
--- a/modules/cases/cases_list_search_adv.php
+++ b/modules/cases/cases_list_search_adv.php
@@ -116,80 +116,82 @@ $arrayPDO = array();
     $tab = $request->PDOselect($select, $where_request, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], $limit, false, '', '', '', $add_security, false, true, $start);
     //$request->show();
 //Result
-    for ($i = 0; $i < count($tab); ++$i) {
-        for ($j = 0; $j < count($tab[$i]); ++$j) {
-            foreach (array_keys($tab[$i][$j]) as $value) {
-                if ($tab[$i][$j][$value] == 'case_id') {
-                    $tab[$i][$j]['case_id'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['label'] = _NUM_CASE;
-                    $tab[$i][$j]['size'] = '4';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'center';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = true;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_id';
-                }
-                if ($tab[$i][$j][$value] == 'case_label') {
-                    $tab[$i][$j]['label'] = _CASE_LABEL;
-                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]['size'] = '15';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'left';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = true;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_label';
-                }
-                if ($tab[$i][$j][$value] == 'case_creation_date') {
-                    $tab[$i][$j]['label'] = _CASE_CREATION_DATE;
-                    $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
-                    $tab[$i][$j]['size'] = '5';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'left';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = true;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_creation_date';
-                }
-                if ($tab[$i][$j][$value] == 'case_closing_date') {
-                    $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
-
-                    if ($tab[$i][$j]['value'] != '') {
-                        $tab[$i][$j]['value'] = '<b>('._CASE_CLOSED.')</b><br/>';
-                    } else {
-                        $tab[$i][$j]['value'] = '';
+    if (!empty($tab)) {
+        for ($i = 0; $i < count($tab); ++$i) {
+            for ($j = 0; $j < count($tab[$i]); ++$j) {
+                foreach (array_keys($tab[$i][$j]) as $value) {
+                    if ($tab[$i][$j][$value] == 'case_id') {
+                        $tab[$i][$j]['case_id'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['label'] = _NUM_CASE;
+                        $tab[$i][$j]['size'] = '4';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'center';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_id';
+                    }
+                    if ($tab[$i][$j][$value] == 'case_label') {
+                        $tab[$i][$j]['label'] = _CASE_LABEL;
+                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]['size'] = '15';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_label';
+                    }
+                    if ($tab[$i][$j][$value] == 'case_creation_date') {
+                        $tab[$i][$j]['label'] = _CASE_CREATION_DATE;
+                        $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
+                        $tab[$i][$j]['size'] = '5';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_creation_date';
+                    }
+                    if ($tab[$i][$j][$value] == 'case_closing_date') {
+                        $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
+
+                        if ($tab[$i][$j]['value'] != '') {
+                            $tab[$i][$j]['value'] = '<b>('._CASE_CLOSED.')</b><br/>';
+                        } else {
+                            $tab[$i][$j]['value'] = '';
+                        }
+
+                        $tab[$i][$j]['size'] = '5';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_closing_date';
+                    }
+                    if ($tab[$i][$j][$value] == 'case_typist') {
+                        $tab[$i][$j]['label'] = _CASE_TYPIST;
+                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]['size'] = '25';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_typist';
+                    }
+                    if ($tab[$i][$j][$value] == 'case_description') {
+                        $tab[$i][$j]['label'] = _CASE_DESCRIPTION;
+                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]['size'] = '25';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['order'] = 'case_description';
                     }
-
-                    $tab[$i][$j]['size'] = '5';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'left';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = false;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_closing_date';
-                }
-                if ($tab[$i][$j][$value] == 'case_typist') {
-                    $tab[$i][$j]['label'] = _CASE_TYPIST;
-                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]['size'] = '25';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'left';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = true;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_typist';
-                }
-                if ($tab[$i][$j][$value] == 'case_description') {
-                    $tab[$i][$j]['label'] = _CASE_DESCRIPTION;
-                    $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                    $tab[$i][$j]['size'] = '25';
-                    $tab[$i][$j]['label_align'] = 'left';
-                    $tab[$i][$j]['align'] = 'left';
-                    $tab[$i][$j]['valign'] = 'bottom';
-                    $tab[$i][$j]['show'] = false;
-                    $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                    $tab[$i][$j]['order'] = 'case_description';
                 }
             }
         }
diff --git a/modules/cases/list_results_mlb_frame.php b/modules/cases/list_results_mlb_frame.php
index cd6d7955cf8..9b11822055a 100755
--- a/modules/cases/list_results_mlb_frame.php
+++ b/modules/cases/list_results_mlb_frame.php
@@ -239,176 +239,178 @@ if (count($tab) > 0) {
     if (($_REQUEST['template'] == 'group_case') && ($core_tools->is_module_loaded('cases'))) {
         include 'modules'.DIRECTORY_SEPARATOR.'cases'.DIRECTORY_SEPARATOR.'mlb_list_group_case_addon.php';
     } else {
-        for ($i = 0; $i < count($tab); ++$i) {
-            for ($j = 0; $j < count($tab[$i]); ++$j) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == 'res_id') {
-                        $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _GED_NUM;
-                        $tab[$i][$j]['size'] = '4';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'res_id';
-                        $_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
-                    }
-                    if ($tab[$i][$j][$value] == 'type_label') {
-                        $tab[$i][$j]['label'] = _TYPE;
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['size'] = '15';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'type_label';
-                    }
-                    if ($tab[$i][$j][$value] == 'status') {
-                        $tab[$i][$j]['label'] = _STATUS;
-                        $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
-                        $tab[$i][$j]['value'] = "<img src = '".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'>";
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'status';
-                    }
-                    if ($tab[$i][$j][$value] == 'subject') {
-                        $tab[$i][$j]['label'] = _SUBJECT;
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['size'] = '25';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'subject';
-                    }
-                    if ($tab[$i][$j][$value] == 'dest_user') {
-                        $tab[$i][$j]['label'] = _DEST_USER;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'dest_user';
-                    }
-                    if ($tab[$i][$j][$value] == 'creation_date') {
-                        $tab[$i][$j]['label'] = _REG_DATE;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
-                        $tab[$i][$j]['order'] = 'creation_date';
-                    }
-                    if ($tab[$i][$j][$value] == 'destination') {
-                        $tab[$i][$j]['label'] = _ENTITY;
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'destination';
-                    }
-                    if ($tab[$i][$j][$value] == 'category_id') {
-                        $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _CATEGORY;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['value'] = $_SESSION['coll_categories']['letterbox_coll'][$tab[$i][$j]['value']];
-                        $tab[$i][$j]['order'] = 'category_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'category_img') {
-                        $tab[$i][$j]['label'] = _CATEGORY;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
-                        $tab[$i][$j]['value'] = $my_imgcat;
-                        $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'category_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'contact_firstname') {
-                        $contact_firstname = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['show'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'contact_lastname') {
-                        $contact_lastname = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['show'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'contact_society') {
-                        $contact_society = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['show'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'user_firstname') {
-                        $user_firstname = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['show'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'user_lastname') {
-                        $user_lastname = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['show'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'exp_user_id') {
-                        $tab[$i][$j]['label'] = _CONTACT;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
-                        $tab[$i][$j]['order'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
-                        $tab[$i][$j]['label'] = _CASE_NUM;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
-                        $tab[$i][$j]['order'] = 'case_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
-                        $tab[$i][$j]['label'] = _CASE_LABEL;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'case_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'case_closing_date' && $core_tools->is_module_loaded('cases') == true) {
-                        $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        if ($tab[$i][$j]['value'] != '') {
-                            $tab[$i][$j]['value'] = '('._CASE_CLOSED.')';
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); ++$i) {
+                for ($j = 0; $j < count($tab[$i]); ++$j) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == 'res_id') {
+                            $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _GED_NUM;
+                            $tab[$i][$j]['size'] = '4';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'res_id';
+                            $_SESSION['mlb_search_current_res_id'] = $tab[$i][$j]['value'];
+                        }
+                        if ($tab[$i][$j][$value] == 'type_label') {
+                            $tab[$i][$j]['label'] = _TYPE;
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['size'] = '15';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'type_label';
+                        }
+                        if ($tab[$i][$j][$value] == 'status') {
+                            $tab[$i][$j]['label'] = _STATUS;
+                            $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
+                            $tab[$i][$j]['value'] = "<img src = '".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['LABEL']."'>";
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'status';
+                        }
+                        if ($tab[$i][$j][$value] == 'subject') {
+                            $tab[$i][$j]['label'] = _SUBJECT;
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['size'] = '25';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'subject';
+                        }
+                        if ($tab[$i][$j][$value] == 'dest_user') {
+                            $tab[$i][$j]['label'] = _DEST_USER;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'dest_user';
+                        }
+                        if ($tab[$i][$j][$value] == 'creation_date') {
+                            $tab[$i][$j]['label'] = _REG_DATE;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['value'] = $request->format_date_db($tab[$i][$j]['value'], false);
+                            $tab[$i][$j]['order'] = 'creation_date';
+                        }
+                        if ($tab[$i][$j][$value] == 'destination') {
+                            $tab[$i][$j]['label'] = _ENTITY;
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'destination';
+                        }
+                        if ($tab[$i][$j][$value] == 'category_id') {
+                            $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _CATEGORY;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['value'] = $_SESSION['coll_categories']['letterbox_coll'][$tab[$i][$j]['value']];
+                            $tab[$i][$j]['order'] = 'category_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'category_img') {
+                            $tab[$i][$j]['label'] = _CATEGORY;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $my_imgcat = get_img_cat($tab[$i][$j]['value'], $extension_icon);
+                            $tab[$i][$j]['value'] = $my_imgcat;
+                            $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'category_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'contact_firstname') {
+                            $contact_firstname = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['show'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'contact_lastname') {
+                            $contact_lastname = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['show'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'contact_society') {
+                            $contact_society = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['show'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'user_firstname') {
+                            $user_firstname = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['show'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'user_lastname') {
+                            $user_lastname = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['show'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'exp_user_id') {
+                            $tab[$i][$j]['label'] = _CONTACT;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['value'] = $contact->get_contact_information_from_view($_SESSION['mlb_search_current_category_id'], $contact_lastname, $contact_firstname, $contact_society, $user_lastname, $user_firstname);
+                            $tab[$i][$j]['order'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'case_id' && $core_tools->is_module_loaded('cases') == true) {
+                            $tab[$i][$j]['label'] = _CASE_NUM;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['value'] = "<a href='".$_SESSION['config']['businessappurl'].'index.php?page=details_cases&module=cases&id='.$tab[$i][$j]['value']."'>".$tab[$i][$j]['value'].'</a>';
+                            $tab[$i][$j]['order'] = 'case_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'case_label' && $core_tools->is_module_loaded('cases') == true) {
+                            $tab[$i][$j]['label'] = _CASE_LABEL;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'case_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'case_closing_date' && $core_tools->is_module_loaded('cases') == true) {
+                            $tab[$i][$j]['label'] = _CASE_CLOSING_DATE;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            if ($tab[$i][$j]['value'] != '') {
+                                $tab[$i][$j]['value'] = '('._CASE_CLOSED.')';
+                            }
+                            $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['order'] = 'case_id';
                         }
-                        $tab[$i][$j]['value_export'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['order'] = 'case_id';
                     }
                 }
             }
diff --git a/modules/fileplan/fileplan_admin.php b/modules/fileplan/fileplan_admin.php
index 40162c89f9b..13cfd65684a 100755
--- a/modules/fileplan/fileplan_admin.php
+++ b/modules/fileplan/fileplan_admin.php
@@ -157,61 +157,63 @@ if (isset($_REQUEST['load'])) {
         $tab = $request->PDOselect($select, $where, $array_what, $orderstr, $_SESSION['config']['databasetype']);
 
         //Result array
-        for ($i = 0; $i < count($tab); ++$i) {
-            for ($j = 0; $j < count($tab[$i]); ++$j) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == 'fileplan_id') {
-                        $id = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['fileplan_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _ID;
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'fileplan_id';
-                    }
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); ++$i) {
+                for ($j = 0; $j < count($tab[$i]); ++$j) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == 'fileplan_id') {
+                            $id = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['fileplan_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _ID;
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'fileplan_id';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'fileplan_label') {
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _FILEPLAN_NAME;
-                        $tab[$i][$j]['size'] = '45';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'fileplan_label';
-                    }
+                        if ($tab[$i][$j][$value] == 'fileplan_label') {
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _FILEPLAN_NAME;
+                            $tab[$i][$j]['size'] = '45';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'fileplan_label';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'user_id') {
-                        $userArray = $func->infouser($tab[$i][$j]['value']);
-                        $tab[$i][$j]['value'] = (!empty($userArray['FirstName'])) ? $userArray['FirstName'].' '.$userArray['LastName'] : '';
-                        $tab[$i][$j]['label'] = _USER;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'user_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'entity_id') {
-                        $tab[$i][$j]['label'] = _ENTITY;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'entity_id';
-                    }
+                        if ($tab[$i][$j][$value] == 'user_id') {
+                            $userArray = $func->infouser($tab[$i][$j]['value']);
+                            $tab[$i][$j]['value'] = (!empty($userArray['FirstName'])) ? $userArray['FirstName'].' '.$userArray['LastName'] : '';
+                            $tab[$i][$j]['label'] = _USER;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'user_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'entity_id') {
+                            $tab[$i][$j]['label'] = _ENTITY;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'entity_id';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'enabled') {
-                        $tab[$i][$j]['label'] = _ENABLED;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'enabled';
+                        if ($tab[$i][$j][$value] == 'enabled') {
+                            $tab[$i][$j]['label'] = _ENABLED;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'enabled';
+                        }
                     }
                 }
             }
diff --git a/modules/fileplan/fileplan_admin_managment.php b/modules/fileplan/fileplan_admin_managment.php
index e39212cea01..e8899c71fcb 100755
--- a/modules/fileplan/fileplan_admin_managment.php
+++ b/modules/fileplan/fileplan_admin_managment.php
@@ -174,70 +174,72 @@ if (!empty($fileplan_id) && $fileplan->isPersonnalFileplan($fileplan_id) === fal
         // $request->show();
 
         //Result array
-        for ($i = 0; $i < count($tab); ++$i) {
-            for ($j = 0; $j < count($tab[$i]); ++$j) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == 'position_id') {
-                        $id = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['position_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _ID;
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_id';
-                    }
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); ++$i) {
+                for ($j = 0; $j < count($tab[$i]); ++$j) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == 'position_id') {
+                            $id = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['position_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _ID;
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_id';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'position_label') {
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _POSITION_NAME;
-                        $tab[$i][$j]['size'] = '25';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_label';
-                    }
-                    if ($tab[$i][$j][$value] == 'parent_id') {
-                        $tab[$i][$j]['value'] = $fileplan->getPosition($fileplan_id, $tab[$i][$j]['value'], 'position_label');
-                        $tab[$i][$j]['label'] = _POSITION_PARENT;
-                        $tab[$i][$j]['size'] = '25';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'parent_position_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'position_path') {
-                        $tab[$i][$j]['value'] = $fileplan->getPositionPath($fileplan_id, $tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _POSITION_PATH;
-                        $tab[$i][$j]['size'] = '50';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_path';
-                    }
+                        if ($tab[$i][$j][$value] == 'position_label') {
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _POSITION_NAME;
+                            $tab[$i][$j]['size'] = '25';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_label';
+                        }
+                        if ($tab[$i][$j][$value] == 'parent_id') {
+                            $tab[$i][$j]['value'] = $fileplan->getPosition($fileplan_id, $tab[$i][$j]['value'], 'position_label');
+                            $tab[$i][$j]['label'] = _POSITION_PARENT;
+                            $tab[$i][$j]['size'] = '25';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'parent_position_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'position_path') {
+                            $tab[$i][$j]['value'] = $fileplan->getPositionPath($fileplan_id, $tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _POSITION_PATH;
+                            $tab[$i][$j]['size'] = '50';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_path';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'position_enabled') {
-                        $tab[$i][$j]['label'] = _ENABLED;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'position_enabled';
-                    }
+                        if ($tab[$i][$j][$value] == 'position_enabled') {
+                            $tab[$i][$j]['label'] = _ENABLED;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'position_enabled';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'fileplan_id') {
-                        $tab[$i][$j]['label'] = _FILEPLAN_ID;
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'fileplan_id';
+                        if ($tab[$i][$j][$value] == 'fileplan_id') {
+                            $tab[$i][$j]['label'] = _FILEPLAN_ID;
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'fileplan_id';
+                        }
                     }
                 }
             }
diff --git a/modules/fileplan/fileplan_managment.php b/modules/fileplan/fileplan_managment.php
index 7240dd4c594..a9a262d8e78 100755
--- a/modules/fileplan/fileplan_managment.php
+++ b/modules/fileplan/fileplan_managment.php
@@ -250,70 +250,72 @@ if (empty($fileplan_id)) {
         $tab = $request->PDOselect($select, $where, $array_what, $orderstr, $_SESSION['config']['databasetype'], "default", false, "", "", "", true, false, false, $start);
 
         //Result array
-        for ($i = 0; $i < count($tab); ++$i) {
-            for ($j = 0; $j < count($tab[$i]); ++$j) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == 'position_id') {
-                        $id = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['position_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _ID;
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_id';
-                    }
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); ++$i) {
+                for ($j = 0; $j < count($tab[$i]); ++$j) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == 'position_id') {
+                            $id = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['position_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _ID;
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_id';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'position_label') {
-                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _POSITION_NAME;
-                        $tab[$i][$j]['size'] = '25';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_label';
-                    }
-                    if ($tab[$i][$j][$value] == 'parent_id') {
-                        $tab[$i][$j]['value'] = $fileplan->getPosition($fileplan_id, $tab[$i][$j]['value'], 'position_label');
-                        $tab[$i][$j]['label'] = _POSITION_PARENT;
-                        $tab[$i][$j]['size'] = '25';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'parent_position_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'position_path') {
-                        $tab[$i][$j]['value'] = $fileplan->getPositionPath($fileplan_id, $tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _POSITION_PATH;
-                        $tab[$i][$j]['size'] = '50';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = 'position_path';
-                    }
+                        if ($tab[$i][$j][$value] == 'position_label') {
+                            $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _POSITION_NAME;
+                            $tab[$i][$j]['size'] = '25';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_label';
+                        }
+                        if ($tab[$i][$j][$value] == 'parent_id') {
+                            $tab[$i][$j]['value'] = $fileplan->getPosition($fileplan_id, $tab[$i][$j]['value'], 'position_label');
+                            $tab[$i][$j]['label'] = _POSITION_PARENT;
+                            $tab[$i][$j]['size'] = '25';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'parent_position_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'position_path') {
+                            $tab[$i][$j]['value'] = $fileplan->getPositionPath($fileplan_id, $tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _POSITION_PATH;
+                            $tab[$i][$j]['size'] = '50';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = 'position_path';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'position_enabled') {
-                        $tab[$i][$j]['label'] = _ENABLED;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'position_enabled';
-                    }
+                        if ($tab[$i][$j][$value] == 'position_enabled') {
+                            $tab[$i][$j]['label'] = _ENABLED;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'position_enabled';
+                        }
 
-                    if ($tab[$i][$j][$value] == 'fileplan_id') {
-                        $tab[$i][$j]['label'] = _FILEPLAN_ID;
-                        $tab[$i][$j]['size'] = '5';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'center';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'fileplan_id';
+                        if ($tab[$i][$j][$value] == 'fileplan_id') {
+                            $tab[$i][$j]['label'] = _FILEPLAN_ID;
+                            $tab[$i][$j]['size'] = '5';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'center';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'fileplan_id';
+                        }
                     }
                 }
             }
diff --git a/modules/fileplan/positions_documents_list.php b/modules/fileplan/positions_documents_list.php
index 83d4d9abe06..ed7a8b28d98 100755
--- a/modules/fileplan/positions_documents_list.php
+++ b/modules/fileplan/positions_documents_list.php
@@ -126,141 +126,143 @@ if (isset($_REQUEST['id']) && !empty($_REQUEST['id'])) {
         $description = $fileplan->getPositionPath($fileplan_id, $position_id, true);
 
         //Result Array
-        for ($i = 0; $i < count($tab); ++$i) {
-            for ($j = 0; $j < count($tab[$i]); ++$j) {
-                foreach (array_keys($tab[$i][$j]) as $value) {
-                    if ($tab[$i][$j][$value] == 'list_id') {
-                        $tab[$i][$j]['list_id'] = $coll_id . '@@' . $res_id;
-                        $tab[$i][$j]['label'] = _ID;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'res_id') {
-                        $display = false;
-                        $res_id = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['label'] = _GED_NUM;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        if (_ID_TO_DISPLAY == 'res_id') {
-                            $display = true;
+        if (!empty($tab)) {
+            for ($i = 0; $i < count($tab); ++$i) {
+                for ($j = 0; $j < count($tab[$i]); ++$j) {
+                    foreach (array_keys($tab[$i][$j]) as $value) {
+                        if ($tab[$i][$j][$value] == 'list_id') {
+                            $tab[$i][$j]['list_id'] = $coll_id . '@@' . $res_id;
+                            $tab[$i][$j]['label'] = _ID;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = false;
                         }
-                        $tab[$i][$j]['show'] = $display;
-                        $tab[$i][$j]['order'] = 'res_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'alt_identifier') {
-                        $display = false;
-                        $tab[$i][$j]['label'] = _CHRONO_NUMBER;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        if (_ID_TO_DISPLAY == 'chrono_number') {
-                            $display = true;
+                        if ($tab[$i][$j][$value] == 'res_id') {
+                            $display = false;
+                            $res_id = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['label'] = _GED_NUM;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            if (_ID_TO_DISPLAY == 'res_id') {
+                                $display = true;
+                            }
+                            $tab[$i][$j]['show'] = $display;
+                            $tab[$i][$j]['order'] = 'res_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'alt_identifier') {
+                            $display = false;
+                            $tab[$i][$j]['label'] = _CHRONO_NUMBER;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            if (_ID_TO_DISPLAY == 'chrono_number') {
+                                $display = true;
+                            }
+                            $tab[$i][$j]['show'] = $display;
+                            $tab[$i][$j]['order'] = 'alt_identifier';
+                        }
+                        if ($tab[$i][$j][$value] == 'coll_id') {
+                            $coll_id = $tab[$i][$j]['value']; //Keep collection ID
+                            $tab[$i][$j]['label'] = _COLLECTION;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'coll_id';
+                        }
+                        if ($tab[$i][$j][$value] == 'coll_label') {
+                            $tab[$i][$j]['label'] = _COLLECTION;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = 'coll_label';
+                        }
+                        if ($tab[$i][$j][$value] == 'page_details') {
+                            $coll_script_details = $security->get_script_from_coll($coll_id, 'script_details');
+                            $coll_script_details = substr($coll_script_details, 0, strlen($coll_script_details) - 4);
+                            $tab[$i][$j]['value'] = $coll_script_details;
+                            $tab[$i][$j]['label'] = _DETAILS;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'right_doc') {
+                            $tab[$i][$j]['value'] = ($security->test_right_doc($coll_id, $tab[$i][$j]['value']) === true) ? 'true' : 'false';
+                            $tab[$i][$j]['label'] = _RIGHT;
+                            $tab[$i][$j]['size'] = '1';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = false;
                         }
-                        $tab[$i][$j]['show'] = $display;
-                        $tab[$i][$j]['order'] = 'alt_identifier';
-                    }
-                    if ($tab[$i][$j][$value] == 'coll_id') {
-                        $coll_id = $tab[$i][$j]['value']; //Keep collection ID
-                        $tab[$i][$j]['label'] = _COLLECTION;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'coll_id';
-                    }
-                    if ($tab[$i][$j][$value] == 'coll_label') {
-                        $tab[$i][$j]['label'] = _COLLECTION;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = 'coll_label';
-                    }
-                    if ($tab[$i][$j][$value] == 'page_details') {
-                        $coll_script_details = $security->get_script_from_coll($coll_id, 'script_details');
-                        $coll_script_details = substr($coll_script_details, 0, strlen($coll_script_details) - 4);
-                        $tab[$i][$j]['value'] = $coll_script_details;
-                        $tab[$i][$j]['label'] = _DETAILS;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'right_doc') {
-                        $tab[$i][$j]['value'] = ($security->test_right_doc($coll_id, $tab[$i][$j]['value']) === true) ? 'true' : 'false';
-                        $tab[$i][$j]['label'] = _RIGHT;
-                        $tab[$i][$j]['size'] = '1';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = false;
-                    }
 
-                    if ($tab[$i][$j][$value] == 'status') {
-                        $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
-                        $statusCmp = $tab[$i][$j]['value'];
-                        $img_class = substr($res_status['IMG_SRC'], 0, 2);
-                        $tab[$i][$j]['value'] = '<i ' . $style . " class = '" . $img_class . ' ' . $res_status['IMG_SRC'] . ' ' . $img_class . "-3x' alt = '" . $res_status['LABEL'] . "' title = '" . $res_status['LABEL'] . "'></i>";
-                        $tab[$i][$j]['label'] = _STATUS;
-                        $tab[$i][$j]['size'] = '4';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = true;
-                    }
-                    if ($tab[$i][$j][$value] == 'subject') {
-                        $tab[$i][$j]['value'] = functions::cut_string(functions::show_string($tab[$i][$j]['value']), 250);
-                        $tab[$i][$j]['label'] = _SUBJECT;
-                        $tab[$i][$j]['size'] = '12';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = true;
-                    }
-                    if ($tab[$i][$j][$value] == 'category_id') {
-                        $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
-                        $tab[$i][$j]['value'] = $_SESSION['mail_categories'][$tab[$i][$j]['value']];
-                        $tab[$i][$j]['label'] = _CATEGORY;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = false;
-                    }
-                    if ($tab[$i][$j][$value] == 'type_label') {
-                        $tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
-                        $tab[$i][$j]['label'] = _TYPE;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = true;
-                        $tab[$i][$j]['order'] = true;
-                    }
-                    if ($tab[$i][$j][$value] == 'creation_date') {
-                        $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
-                        $tab[$i][$j]['label'] = _CREATION_DATE;
-                        $tab[$i][$j]['size'] = '10';
-                        $tab[$i][$j]['label_align'] = 'left';
-                        $tab[$i][$j]['align'] = 'left';
-                        $tab[$i][$j]['valign'] = 'bottom';
-                        $tab[$i][$j]['show'] = false;
-                        $tab[$i][$j]['order'] = false;
+                        if ($tab[$i][$j][$value] == 'status') {
+                            $res_status = $status_obj->get_status_data($tab[$i][$j]['value'], $extension_icon);
+                            $statusCmp = $tab[$i][$j]['value'];
+                            $img_class = substr($res_status['IMG_SRC'], 0, 2);
+                            $tab[$i][$j]['value'] = '<i ' . $style . " class = '" . $img_class . ' ' . $res_status['IMG_SRC'] . ' ' . $img_class . "-3x' alt = '" . $res_status['LABEL'] . "' title = '" . $res_status['LABEL'] . "'></i>";
+                            $tab[$i][$j]['label'] = _STATUS;
+                            $tab[$i][$j]['size'] = '4';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = true;
+                        }
+                        if ($tab[$i][$j][$value] == 'subject') {
+                            $tab[$i][$j]['value'] = functions::cut_string(functions::show_string($tab[$i][$j]['value']), 250);
+                            $tab[$i][$j]['label'] = _SUBJECT;
+                            $tab[$i][$j]['size'] = '12';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = true;
+                        }
+                        if ($tab[$i][$j][$value] == 'category_id') {
+                            $_SESSION['mlb_search_current_category_id'] = $tab[$i][$j]['value'];
+                            $tab[$i][$j]['value'] = $_SESSION['mail_categories'][$tab[$i][$j]['value']];
+                            $tab[$i][$j]['label'] = _CATEGORY;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = false;
+                        }
+                        if ($tab[$i][$j][$value] == 'type_label') {
+                            $tab[$i][$j]['value'] = functions::show_string($tab[$i][$j]['value']);
+                            $tab[$i][$j]['label'] = _TYPE;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = true;
+                            $tab[$i][$j]['order'] = true;
+                        }
+                        if ($tab[$i][$j][$value] == 'creation_date') {
+                            $tab[$i][$j]['value'] = $core_tools->format_date_db($tab[$i][$j]['value'], false);
+                            $tab[$i][$j]['label'] = _CREATION_DATE;
+                            $tab[$i][$j]['size'] = '10';
+                            $tab[$i][$j]['label_align'] = 'left';
+                            $tab[$i][$j]['align'] = 'left';
+                            $tab[$i][$j]['valign'] = 'bottom';
+                            $tab[$i][$j]['show'] = false;
+                            $tab[$i][$j]['order'] = false;
+                        }
                     }
                 }
             }
diff --git a/modules/folder/folders_list_search_adv.php b/modules/folder/folders_list_search_adv.php
index bd5dac87159..63c10d06435 100755
--- a/modules/folder/folders_list_search_adv.php
+++ b/modules/folder/folders_list_search_adv.php
@@ -73,7 +73,7 @@ if ($_GET['order_field'] != null) {
     $tab = $request->PDOselect($select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype'], "default", false, "", "", "", true, false, false, $_SESSION['save_list']['start']);
     // $request->show();
 //Result Array
-    if (count($tab) > 0) {
+    if (!empty($tab)) {
         for ($i = 0; $i < count($tab); ++$i) {
             for ($j = 0; $j < count($tab[$i]); ++$j) {
                 foreach (array_keys($tab[$i][$j]) as $value) {
diff --git a/modules/life_cycle/lc_cycle_steps_management_controler.php b/modules/life_cycle/lc_cycle_steps_management_controler.php
index fc0503e0ea7..730531987db 100755
--- a/modules/life_cycle/lc_cycle_steps_management_controler.php
+++ b/modules/life_cycle/lc_cycle_steps_management_controler.php
@@ -329,36 +329,38 @@ function display_list()
         $select, $where, $arrayPDO, $orderstr, $_SESSION['config']['databasetype']
     );
     //$request->show();
-    for ($i = 0;$i < count($tab);$i++) {
-        foreach ($tab[$i] as &$item) {
-            switch ($item['column']) {
-                case $idName:
-                    At_formatItem(
-                        $item, _ID, "15", "left", "left", "bottom", true
-                    );
-                    break;
-                case "cycle_step_desc":
-                    At_formatItem(
-                        $item, _CYCLE_STEP_DESC, "40", "left", "left", 
-                        "bottom", true
-                    );
-                    break;
-                case "cycle_id":
-                    At_formatItem(
-                        $item, _CYCLE_ID, "15", "left", "left", "bottom", true
-                    );
-                    break;
-                case "policy_id":
-                    At_formatItem(
-                        $item, _POLICY_ID, "15", "left", "left", "bottom", true
-                    );
-                    break;
-                case "sequence_number":
-                    At_formatItem(
-                        $item, _SEQUENCE_NUMBER, "15", "left", "left", 
-                        "bottom", true
-                    );
-                    break;
+    if (!empty($tab)) {
+        for ($i = 0;$i < count($tab);$i++) {
+            foreach ($tab[$i] as &$item) {
+                switch ($item['column']) {
+                    case $idName:
+                        At_formatItem(
+                            $item, _ID, "15", "left", "left", "bottom", true
+                        );
+                        break;
+                    case "cycle_step_desc":
+                        At_formatItem(
+                            $item, _CYCLE_STEP_DESC, "40", "left", "left", 
+                            "bottom", true
+                        );
+                        break;
+                    case "cycle_id":
+                        At_formatItem(
+                            $item, _CYCLE_ID, "15", "left", "left", "bottom", true
+                        );
+                        break;
+                    case "policy_id":
+                        At_formatItem(
+                            $item, _POLICY_ID, "15", "left", "left", "bottom", true
+                        );
+                        break;
+                    case "sequence_number":
+                        At_formatItem(
+                            $item, _SEQUENCE_NUMBER, "15", "left", "left", 
+                            "bottom", true
+                        );
+                        break;
+                }
             }
         }
     }
diff --git a/modules/notifications/manage_notifications_controler.php b/modules/notifications/manage_notifications_controler.php
index c4c36dcd628..10eb0cb1cb5 100755
--- a/modules/notifications/manage_notifications_controler.php
+++ b/modules/notifications/manage_notifications_controler.php
@@ -211,24 +211,26 @@ function display_list()
     );
     //$request->show();
 
-    for ($i = 0; $i < count($tab); ++$i) {
-        foreach ($tab[$i] as &$item) {
-            switch ($item['column']) {
-                case 'notification_sid':
-                    format_item(
-                        $item, _ID, '15', 'left', 'left', 'bottom', true
-                    );
-                    break;
-                case 'notification_id':
-                    format_item(
-                        $item, _NOTIFICATION_ID, '30', 'left', 'left', 'bottom', true
-                    );
-                    break;
-                case 'description':
-                    format_item(
-                        $item, _DESC, '45', 'left', 'left', 'bottom', true
-                    );
-                    break;
+    if (!empty($tab)) {
+        for ($i = 0; $i < count($tab); ++$i) {
+            foreach ($tab[$i] as &$item) {
+                switch ($item['column']) {
+                    case 'notification_sid':
+                        format_item(
+                            $item, _ID, '15', 'left', 'left', 'bottom', true
+                        );
+                        break;
+                    case 'notification_id':
+                        format_item(
+                            $item, _NOTIFICATION_ID, '30', 'left', 'left', 'bottom', true
+                        );
+                        break;
+                    case 'description':
+                        format_item(
+                            $item, _DESC, '45', 'left', 'left', 'bottom', true
+                        );
+                        break;
+                }
             }
         }
     }
diff --git a/modules/sendmail/sendmail.php b/modules/sendmail/sendmail.php
index 2a646ab6ef8..567ac7867bb 100755
--- a/modules/sendmail/sendmail.php
+++ b/modules/sendmail/sendmail.php
@@ -177,152 +177,154 @@ if (isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
      // $request->show();
 
      //Result Array
-     for ($i = 0; $i < count($tab); ++$i) {
-         for ($j = 0; $j < count($tab[$i]); ++$j) {
-             foreach (array_keys($tab[$i][$j]) as $value) {
-                 if ($tab[$i][$j][$value] == 'email_id') {
-                     $tab[$i][$j]['email_id'] = $tab[$i][$j]['value'];
-                     $tab[$i][$j]['label'] = 'ID';
-                     $tab[$i][$j]['size'] = '1';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'id';
-                 }
-                 if ($tab[$i][$j][$value] == 'creation_date') {
-                     $tab[$i][$j]['value'] = $request->dateformat($tab[$i][$j]['value']);
-                     $tab[$i][$j]['label'] = _CREATION_DATE;
-                     $tab[$i][$j]['size'] = '11';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = 'creation_date';
-                 }
-                 if ($tab[$i][$j][$value] == 'user_id') {
-                     $tab[$i][$j]['label'] = _USER_ID;
-                     $tab[$i][$j]['size'] = '5';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'user_id';
-                 }
-                 if ($tab[$i][$j][$value] == 'firstname') {
-                     $firstname = $request->show_string($tab[$i][$j]['value']);
-                 }
-                 if ($tab[$i][$j][$value] == 'lastname') {
-                     $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']).' '.$firstname;
-                     $tab[$i][$j]['label'] = _USER;
-                     $tab[$i][$j]['size'] = $sizeUser;
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'lastname';
-                 }
+    if (!empty($tab)) {
+        for ($i = 0; $i < count($tab); ++$i) {
+            for ($j = 0; $j < count($tab[$i]); ++$j) {
+                foreach (array_keys($tab[$i][$j]) as $value) {
+                    if ($tab[$i][$j][$value] == 'email_id') {
+                        $tab[$i][$j]['email_id'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['label'] = 'ID';
+                        $tab[$i][$j]['size'] = '1';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'id';
+                    }
+                    if ($tab[$i][$j][$value] == 'creation_date') {
+                        $tab[$i][$j]['value'] = $request->dateformat($tab[$i][$j]['value']);
+                        $tab[$i][$j]['label'] = _CREATION_DATE;
+                        $tab[$i][$j]['size'] = '11';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = 'creation_date';
+                    }
+                    if ($tab[$i][$j][$value] == 'user_id') {
+                        $tab[$i][$j]['label'] = _USER_ID;
+                        $tab[$i][$j]['size'] = '5';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'user_id';
+                    }
+                    if ($tab[$i][$j][$value] == 'firstname') {
+                        $firstname = $request->show_string($tab[$i][$j]['value']);
+                    }
+                    if ($tab[$i][$j][$value] == 'lastname') {
+                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']).' '.$firstname;
+                        $tab[$i][$j]['label'] = _USER;
+                        $tab[$i][$j]['size'] = $sizeUser;
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'lastname';
+                    }
 
-                 if ($tab[$i][$j][$value] == 'email_destinataire') {
-                     $tab_dest = explode(',', $tab[$i][$j]['value']);
-                     $tab[$i][$j]['value'] = implode(', ', $tab_dest);
-                     $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
-                     $tab[$i][$j]['label'] = _RECIPIENT;
-                     $tab[$i][$j]['size'] = $sizeObject;
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = 'email_destinataire';
-                 }
-                 if ($tab[$i][$j][$value] == 'email_object') {
-                     $tab[$i][$j]['value'] = addslashes($tab[$i][$j]['value']);
-                     $tab[$i][$j]['label'] = _EMAIL_OBJECT;
-                     $tab[$i][$j]['size'] = $sizeObject;
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'email_object';
-                 }
-                 if ($tab[$i][$j][$value] == 'email_object_short') {
-                     $tab[$i][$j]['value'] = $request->cut_string($request->show_string($tab[$i][$j]['value']), $cutString);
-                     $tab[$i][$j]['label'] = _EMAIL_OBJECT;
-                     $tab[$i][$j]['size'] = $sizeObject;
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = 'email_object_short';
-                 }
-                 if ($tab[$i][$j][$value] == 'status_label') {
-                     $tab[$i][$j]['value'] = addslashes($_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['label']);
-                     $tab[$i][$j]['label'] = _STATUS;
-                     $tab[$i][$j]['size'] = '1';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'status_label';
-                 }
-                 if ($tab[$i][$j][$value] == 'status_img') {
-                     $tab[$i][$j]['value'] = '<img src="'
-                            .$_SESSION['config']['businessappurl'].'static.php?module=sendmail&filename='
-                            .$_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['img'].'" title="'
-                            .$_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['label'].'" width="20" height="20" />';
-                     $tab[$i][$j]['label'] = _STATUS;
-                     $tab[$i][$j]['size'] = '1';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = 'status_img';
-                 }
-                 if ($tab[$i][$j][$value] == 'mail') {
-                     $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
-                     $tab[$i][$j]['label'] = _SENDER;
-                     $tab[$i][$j]['size'] = $sizeUser;
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'mail';
-                 }
-                 if ($tab[$i][$j][$value] == 'sender_email') {
-                     $tab[$i][$j]['value'] = $sendmail_tools->explodeSenderEmail($tab[$i][$j]['value']);
+                    if ($tab[$i][$j][$value] == 'email_destinataire') {
+                        $tab_dest = explode(',', $tab[$i][$j]['value']);
+                        $tab[$i][$j]['value'] = implode(', ', $tab_dest);
+                        $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
+                        $tab[$i][$j]['label'] = _RECIPIENT;
+                        $tab[$i][$j]['size'] = $sizeObject;
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = 'email_destinataire';
+                    }
+                    if ($tab[$i][$j][$value] == 'email_object') {
+                        $tab[$i][$j]['value'] = addslashes($tab[$i][$j]['value']);
+                        $tab[$i][$j]['label'] = _EMAIL_OBJECT;
+                        $tab[$i][$j]['size'] = $sizeObject;
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'email_object';
+                    }
+                    if ($tab[$i][$j][$value] == 'email_object_short') {
+                        $tab[$i][$j]['value'] = $request->cut_string($request->show_string($tab[$i][$j]['value']), $cutString);
+                        $tab[$i][$j]['label'] = _EMAIL_OBJECT;
+                        $tab[$i][$j]['size'] = $sizeObject;
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = 'email_object_short';
+                    }
+                    if ($tab[$i][$j][$value] == 'status_label') {
+                        $tab[$i][$j]['value'] = addslashes($_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['label']);
+                        $tab[$i][$j]['label'] = _STATUS;
+                        $tab[$i][$j]['size'] = '1';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'status_label';
+                    }
+                    if ($tab[$i][$j][$value] == 'status_img') {
+                        $tab[$i][$j]['value'] = '<img src="'
+                                .$_SESSION['config']['businessappurl'].'static.php?module=sendmail&filename='
+                                .$_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['img'].'" title="'
+                                .$_SESSION['sendmail']['status'][$tab[$i][$j]['value']]['label'].'" width="20" height="20" />';
+                        $tab[$i][$j]['label'] = _STATUS;
+                        $tab[$i][$j]['size'] = '1';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = 'status_img';
+                    }
+                    if ($tab[$i][$j][$value] == 'mail') {
+                        $tab[$i][$j]['value'] = $request->show_string($tab[$i][$j]['value']);
+                        $tab[$i][$j]['label'] = _SENDER;
+                        $tab[$i][$j]['size'] = $sizeUser;
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'mail';
+                    }
+                    if ($tab[$i][$j][$value] == 'sender_email') {
+                        $tab[$i][$j]['value'] = $sendmail_tools->explodeSenderEmail($tab[$i][$j]['value']);
 
-                     $tab[$i][$j]['label'] = _SENDER;
-                     $tab[$i][$j]['size'] = '20';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = 'sender_email';
-                 }
-                 if ($tab[$i][$j][$value] == 'id') {
-                     $tab[$i][$j]['value'] = ($sendmail_tools->haveJoinedFiles($tab[$i][$j]['value'])) ?
-                            '<i class="fa fa-paperclip fa-2x" title="'._JOINED_FILES.'"></i>' :
-                                '';
-                     $tab[$i][$j]['label'] = false;
-                     $tab[$i][$j]['size'] = '1';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = true;
-                     $tab[$i][$j]['order'] = false;
-                 }
-                 if ($tab[$i][$j][$value] == 'email_status') {
-                     $tab[$i][$j]['label'] = _STATUS;
-                     $tab[$i][$j]['size'] = '1';
-                     $tab[$i][$j]['label_align'] = 'left';
-                     $tab[$i][$j]['align'] = 'left';
-                     $tab[$i][$j]['valign'] = 'bottom';
-                     $tab[$i][$j]['show'] = false;
-                     $tab[$i][$j]['order'] = 'email_status';
-                 }
-             }
-         }
-     }
+                        $tab[$i][$j]['label'] = _SENDER;
+                        $tab[$i][$j]['size'] = '20';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = 'sender_email';
+                    }
+                    if ($tab[$i][$j][$value] == 'id') {
+                        $tab[$i][$j]['value'] = ($sendmail_tools->haveJoinedFiles($tab[$i][$j]['value'])) ?
+                                '<i class="fa fa-paperclip fa-2x" title="'._JOINED_FILES.'"></i>' :
+                                    '';
+                        $tab[$i][$j]['label'] = false;
+                        $tab[$i][$j]['size'] = '1';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = true;
+                        $tab[$i][$j]['order'] = false;
+                    }
+                    if ($tab[$i][$j][$value] == 'email_status') {
+                        $tab[$i][$j]['label'] = _STATUS;
+                        $tab[$i][$j]['size'] = '1';
+                        $tab[$i][$j]['label_align'] = 'left';
+                        $tab[$i][$j]['align'] = 'left';
+                        $tab[$i][$j]['valign'] = 'bottom';
+                        $tab[$i][$j]['show'] = false;
+                        $tab[$i][$j]['order'] = 'email_status';
+                    }
+                }
+            }
+        }
+    }
 
      //List
         $listKey = 'email_id';                                                              //Cl� de la liste
-- 
GitLab