diff --git a/apps/maarch_entreprise/show_links_tab.php b/apps/maarch_entreprise/show_links_tab.php index 702a75e0bdb4b39dd11858d0841f443f65611702..6f1b4a0786041903308f2e2bfbe55616a5ff9e22 100755 --- a/apps/maarch_entreprise/show_links_tab.php +++ b/apps/maarch_entreprise/show_links_tab.php @@ -8,7 +8,7 @@ if (!empty($_REQUEST['id'])) { $_SESSION['doc_id'] = $_REQUEST['id']; } $security = new security(); -$right = $security->test_right_doc($_SESSION['collection_id_choice'], $_SESSION['doc_id']); +$right = $security->test_right_doc('letterbox_coll', $_SESSION['doc_id']); if (!$right) { exit(_NO_RIGHT_TXT); @@ -24,26 +24,36 @@ $Class_LinkController = new LinkController(); $frm_str .= '<div id="loadLinks">'; $nbLinkDesc = $Class_LinkController->nbDirectLink( - $_SESSION['doc_id'], $_SESSION['collection_id_choice'], 'desc' + $_SESSION['doc_id'], + 'letterbox_coll', + 'desc' ); if ($nbLinkDesc > 0) { $frm_str .= '<i class="fa fa-long-arrow-alt-right fa-2x"></i>'; $frm_str .= $Class_LinkController->formatMap( $Class_LinkController->getMap( - $_SESSION['doc_id'], $_SESSION['collection_id_choice'], 'desc' - ), 'desc' + $_SESSION['doc_id'], + 'letterbox_coll', + 'desc' + ), + 'desc' ); $frm_str .= '<br />'; } $nbLinkAsc = $Class_LinkController->nbDirectLink( - $_SESSION['doc_id'], $_SESSION['collection_id_choice'], 'asc' + $_SESSION['doc_id'], + 'letterbox_coll', + 'asc' ); if ($nbLinkAsc > 0) { $frm_str .= '<i class="fa fa-long-arrow-alt-left fa-2x"></i>'; $frm_str .= $Class_LinkController->formatMap( $Class_LinkController->getMap( - $_SESSION['doc_id'], $_SESSION['collection_id_choice'], 'asc' - ), 'asc' + $_SESSION['doc_id'], + 'letterbox_coll', + 'asc' + ), + 'asc' ); $frm_str .= '<br />'; } diff --git a/core/class/LinkController.php b/core/class/LinkController.php index 828c85a84825629ac6b22e1c2aefc0bd4611d176..cc0f7d8a869fe89a693af3dab1a30adbe8f65080 100755 --- a/core/class/LinkController.php +++ b/core/class/LinkController.php @@ -32,7 +32,7 @@ class LinkController foreach ($arrayToFormat as $key => $value) { //GET RES INFOS - $infos = get_general_data($_SESSION['current_basket']['coll_id'], $key, 'full'); + $infos = get_general_data('letterbox_coll', $key, 'full'); $stmt = $db->query('SELECT dest_user, status FROM res_letterbox WHERE res_id = ?', array($key)); $otherInfos = $stmt->fetchObject(); $chronoNumber = $this->getAltIdentifier($key); @@ -129,13 +129,8 @@ class LinkController $return .= '\''.$delParent.'\' ,'; $return .= '\'del\','; - if ($_SESSION['current_basket']['coll_id'] == 'letterbox_coll') { - $return .= '\'res_view_letterbox\''; - } elseif ($_SESSION['current_basket']['coll_id'] == 'business_coll') { - $return .= '\'res_view_business\''; - } else { - $return .= '\'\''; - } + $return .= '\'res_view_letterbox\''; + $return .= ');}'; $return .= '">'; $return .= '<i class="fa fa-unlink fa-2x" title="'._DEL_LINK.'" style="cursor:pointer;"></i>';