From 0912b54e456f293491bf33eb1691bc2ff649de5c Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 23 Oct 2018 16:31:35 +0100
Subject: [PATCH] FEAT #8551 rm folders basketlist
---
modules/basket/xml/basketpage.xml | 11 -
modules/folder/documents_list_in_folder.php | 344 ------------------
modules/folder/folders_list.php | 217 -----------
.../template/folder_documents_list.html | 95 -----
src/frontend/app/about-us.component.html | 2 +-
5 files changed, 1 insertion(+), 668 deletions(-)
delete mode 100755 modules/folder/documents_list_in_folder.php
delete mode 100755 modules/folder/folders_list.php
delete mode 100755 modules/folder/template/folder_documents_list.html
diff --git a/modules/basket/xml/basketpage.xml b/modules/basket/xml/basketpage.xml
index 1f0b714101d..85ace246e99 100755
--- a/modules/basket/xml/basketpage.xml
+++ b/modules/basket/xml/basketpage.xml
@@ -61,15 +61,4 @@
<COLL_ID>letterbox_coll</COLL_ID>
</COLLECTIONS>
</BASKETPAGE>
- <!-- folders lists -->
- <BASKETPAGE>
- <ID>list_folders</ID>
- <LABEL>_FOLDERS_LIST</LABEL>
- <NAME>folders_list</NAME>
- <ORIGIN>module</ORIGIN>
- <MODULE>folder</MODULE>
- <COLLECTIONS>
- <COLL_ID>*</COLL_ID>
- </COLLECTIONS>
- </BASKETPAGE>
</ROOT>
diff --git a/modules/folder/documents_list_in_folder.php b/modules/folder/documents_list_in_folder.php
deleted file mode 100755
index 7d1842aa795..00000000000
--- a/modules/folder/documents_list_in_folder.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/*
-*
-* Copyright 2008,2012 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-* @brief Displays document list in search mode
-*
-* @file
-* @author Yves Christian Kpakpo <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup apps
-*/
-
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_security.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_contacts_v2.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_lists.php";
-
-$status_obj = new manage_status();
-$sec = new security();
-$core_tools = new core_tools();
-$request = new request();
-$contact = new contacts_v2();
-$list = new lists();
-
-//Include definition fields
-include_once('apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'definition_mail_categories.php');
-
-//Init
-if (isset($_REQUEST['coll_id']) && !empty($_REQUEST['coll_id']))
- $_SESSION['collId'] = $_REQUEST['coll_id'];
-
-if (isset($_REQUEST['id']) && !empty($_REQUEST['id']))
- $_SESSION['folderId'] = $_REQUEST['id'];
-
-//Table or view
- $view = $sec->retrieve_view_from_coll_id($_SESSION['collId'] );
- $select = array();
- $select[$view]= array();
-
-//Fields
- //Documents
- array_push($select[$view], "res_id", "status", "subject", "category_id", "category_id as category_img",
- "contact_firstname", "contact_lastname", "contact_society",
- "user_lastname", "user_firstname", "dest_user", "type_label",
- "creation_date", "entity_label", "exp_user_id");
-//Cases fields
- if($core_tools->is_module_loaded("cases") == true) {
- array_push($select[$view], "case_id", "case_label", "case_description");
- }
-//Where clause
- $where_tab = array();
- $where_tab[] = 'folders_system_id = ? ';
- $arrayPDO = array($_SESSION['folderId']);
- //Build where
- $where = implode(' and ', $where_tab);
-//Order
- $order = $order_field = '';
- $order = $list->getOrder();
- $order_field = $list->getOrderField();
- if (!empty($order_field) && !empty($order))
- $orderstr = "order by ".$order_field." ".$order;
- else {
- $list->setOrder();
- $list->setOrderField('creation_date');
- $orderstr = "order by creation_date desc";
- }
-
-//Query
- $tab=$request->PDOselect($select,$where,$arrayPDO,$orderstr,$_SESSION['config']['databasetype'],"default", false, "", "", "", $add_security);
- // $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]=="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'];
- }
- 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"]='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';
- }
- 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"]=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';
- }
- if($tab[$i][$j][$value]=="subject")
- {
- $tab[$i][$j]["value"] = $request->cut_string($request->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"]='subject';
- }
- 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"]=true;
- $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]=="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")
- {
- $res_status = $status_obj->get_status_data($tab[$i][$j]['value'],$extension_icon);
- $statusCmp = $tab[$i][$j]['value'];
- $tab[$i][$j]['value'] = "<img src = '".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['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"]="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]=="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";
- }
- }
- }
- }
- //Cl� de la liste
-$listKey = 'res_id';
-
-//Initialiser le tableau de param�tres
-$paramsTab = array();
-// $paramsTab['bool_sortColumn'] = true; //Affichage Tri
-$paramsTab['bool_bigPageTitle'] = false; //Affichage du titre en grand
-// $paramsTab['bool_showIconDocument'] = true; //Affichage de l'icone du document
-// $paramsTab['bool_showIconDetails'] = true; //Affichage de l'icone de la page de details
-$paramsTab['urlParameters'] = 'coll_id='.$_SESSION['collId'].'&display=true'; //Parametres d'url supplementaires
-$paramsTab['defaultTemplate'] = 'folder_documents_list'; //Default template
-$paramsTab['divListId'] = 'div_sublist_'.$_SESSION['folderId']; //Id du Div de retour ajax
-$paramsTab['listHeight'] = '100%'; //Hauteur de la liste
-$paramsTab['bool_showSmallToolbar'] = true; //
-$paramsTab['linesToShow'] = 10; //
-// $paramsTab['bool_checkBox'] = true; //Affichage Case � cocher
-// $paramsTab['collId'] = $_SESSION['collId']; //ID de la collection
-// $paramsTab['tableName'] = $sec->retrieve_view_from_coll_id($_SESSION['collId']); //Nom de la table
-// $paramsTab['formId']= 'formSubList'; //
-
-//output
-$status = 0;
-$listContent = $list->showList($tab, $paramsTab, $listKey);
-$content = '<div id ="div_sublist_'.$_SESSION['folderId'].'">'.$listContent.'</div>';
-
-// $debug = $list->debug();
-echo "{status : " . $status . ", content : '" . addslashes($debug.$content) . "', error : '" . addslashes($error) . "'}";
-exit ();
-?>
diff --git a/modules/folder/folders_list.php b/modules/folder/folders_list.php
deleted file mode 100755
index ad02be6525f..00000000000
--- a/modules/folder/folders_list.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/*
-*
-* Copyright 2008,2012 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-* @brief Displays the folders list in the following baskets
-*
-* @file
-* @author Yves Christian Kpakpo <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup folder
-*/
-
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_request.php";
-require_once "core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_manage_status.php";
-require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_lists.php";
-
-$status_obj = new manage_status();
-$core_tools = new core_tools();
-$request = new request();
-$func = new functions();
-$list = new lists();
-
-//Basket information
-if(!empty($_SESSION['current_basket']['view'])) {
- $table = $_SESSION['current_basket']['view'];
-} else {
- $table = $_SESSION['current_basket']['table'];
-}
-
-//Collection
-$_SESSION['collection_id_choice'] = $_SESSION['current_basket']['coll_id'];
-
-//Table or view
- $select[$table]= array();
-
-//Fields
- array_push($select[$table],"folders_system_id", "status", "foldertype_label",
- "custom_t2", "folder_id", "folder_name", "creation_date", "folders_system_id as count_document");
-
-//Where
- $where_tab = array();
- if (!empty($_SESSION['current_basket']['clause'])) $where_tab[] = stripslashes($_SESSION['current_basket']['clause']); //Basket clause
- $where = implode(' and ', $where_tab);
-
-//Order
- $order = $order_field = '';
- $order = $list->getOrder();
- $order_field = $list->getOrderField();
- if (!empty($order_field) && !empty($order))
- $orderstr = "order by ".$order_field." ".$order;
- else {
- $list->setOrder();
- $list->setOrderField('folder_name');
- $orderstr = "order by folder_name desc";
- }
-
-//Query
- $tab = $request->PDOselect($select,$where,array(),$orderstr,$_SESSION['config']['databasetype'], '1000');
- // $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]=='folders_system_id')
- {
- $tab[$i][$j]['folders_system_id']=$tab[$i][$j]['value'];
- $tab[$i][$j]["label"]='';
- $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"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]='folders_system_id';
- }
- if ($tab[$i][$j][$value] == "foldertype_label")
- {
- $tab[$i][$j]["label"]=_FOLDERTYPE_LABEL;
- $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]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="foldertype_label";
- }
- if($tab[$i][$j][$value]=="status")
- {
- $res_status = $status_obj->get_status_data($tab[$i][$j]['value'],$extension_icon);
- $statusCmp = $tab[$i][$j]['value'];
- $tab[$i][$j]['value'] = "<img src = '".$res_status['IMG_SRC']."' alt = '".$res_status['LABEL']."' title = '".$res_status['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] == "custom_t2")
- {
- $tab[$i][$j]["label"]=_FOLDERTYPE;
- $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"]="custom_t2";
- }
- if ($tab[$i][$j][$value] == "folder_id")
- {
- $tab[$i][$j]["label"]=_FOLDERID;
- $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]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="folder_id";
- }
- if ($tab[$i][$j][$value] == "folder_name")
- {
- $tab[$i][$j]["label"]=_FOLDERNAME;
- $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]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="folder_name";
- }
- if($tab[$i][$j][$value]=="creation_date")
- {
- $tab[$i][$j]["label"]=_FOLDERDATE;
- $tab[$i][$j]["value"] = $func->format_date($tab[$i][$j]["value"]);
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="right";
- $tab[$i][$j]["align"]="right";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=true;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]="creation_date";
- }
- if($tab[$i][$j][$value]=="count_document")
- {
- $tab[$i][$j]["label"]=_ARCHIVED_DOC;
- $tab[$i][$j]["size"]="15";
- $tab[$i][$j]["label_align"]="right";
- $tab[$i][$j]["align"]="right";
- $tab[$i][$j]["valign"]="bottom";
- $tab[$i][$j]["show"]=false;
- $tab[$i][$j]["value_export"] = $tab[$i][$j]['value'];
- $tab[$i][$j]["order"]=false;
- }
- }
- }
- }
-
-//Clé de la liste
-$listKey = 'folders_system_id';
-
-//Initialiser le tableau de paramètres
-$paramsTab = array();
-$paramsTab['pageTitle'] = _RESULTS." : ".count($tab).' '._FOUND_FOLDER; //Titre de la page
-$paramsTab['bool_sortColumn'] = true; //Affichage Tri
-$paramsTab['bool_bigPageTitle'] = false; //Affichage de l'icone de la page de details
-$paramsTab['urlParameters'] = 'baskets='.$_SESSION['current_basket']['id']; //Parametres d'url supplementaires
-
-// $paramsTab['bool_checkBox'] = true; //Affichage Case à cocher
-$paramsTab['bool_radioButton'] = true; //Affichage Bouttons radion
-
-//Sublist
-$paramsTab['bool_showSublist'] = true; //Affichage de sous liste
-$paramsTab['sublistUrl'] = 'index.php?display=true&page='
- .'documents_list_in_folder&module=folder&coll_id='
- .$_SESSION['current_basket']['coll_id']; //
-
-//Action icons array
-$paramsTab['actionIcons'] = array();
-$details = array(
- "script" => "window.top.location='".$_SESSION['config']['businessappurl']."index.php?page=show_folder&module=folder&id=@@folders_system_id@@'",
- "icon" => 'info-circle',
- "tooltip" => _DETAILS
- );
-array_push($paramsTab['actionIcons'], $details);
-
-//Afficher la liste
-$status = 0;
-$content = $list->showList($tab, $paramsTab, $listKey, $_SESSION['current_basket']);
-// $debug = $list->debug();
-echo "{status : " . $status . ", content : '" . addslashes($debug.$content) . "', error : '" . addslashes($error) . "'}";
-?>
diff --git a/modules/folder/template/folder_documents_list.html b/modules/folder/template/folder_documents_list.html
deleted file mode 100755
index 04377b86e97..00000000000
--- a/modules/folder/template/folder_documents_list.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-
-* basket_list and search_adv_list template
-*
-*
-* @package Maarch LetterBox 3.0
-* @version 3.0
-* @since 10/2005
-* @license GPL
-* @author Loïc Vinet <dev@maarch.org>
-*
-
-
-
-
-Parts :
- ##HEAD< : Begining of the head part
- ##HEAD> : End of the head part
-
- ##RESULT< : Begining of result list
- ##RESULT> : End fo result list
-
-Functions :
-
-
- ##cssLine|arg1|arg2## : load css style for line. arg1,arg2 : switch beetwin style on line one or line two
- ##cssLineReload## : reload last css style loaded by cssLine
- ##sortColumn|arg## : sort list. arg = sort;
- ##defineLang|arg## : show label. arg = constant define in lang.php;
- ##loadImage|arg1|arg2## : show loaded image; arg1= name of img file, arg2 = name of the module (if image in module)
- ##loadValue|arg## : load value in the db; arg= column's value identifier
- ##showActionIcon|arg1|arg2|arg3|arg4## : action icon. arg1 = label, arg2 = image , arg3 = action (javascript), arg4 = disabled rule
- ##includeFile|arg1|arg2## : include file. arg1 = name of the file, arg2 = name of the module (if file in module)
- ##setListParameter|arg1|arg2## : set parameter's value for actual list. arg1 = name of parameter, arg2 = new value
- ##getListParameter|arg## : get parameter's value for actual list. arg1 = name of parameter
- ##ifStatement|arg1|arg2|arg3|arg4## : allow conditional execution . arg1=condition, arg2= statement 1, arg3 = statement 2
- ##isModuleLoaded|arg## : test if module is loaded. arg = module id
-
-Mods
-
-
- ##radioButton## : display radio
- ##checkBox## : display checkbox
- ##checkUncheckAll## : display checkbox for check/uncheck All
- ##clickOnLine## : action on click under the line
- ##showIconDocument## : view document icon
- ##showIconDetails## : view detail's page icon
- ##getBusinessAppUrl## : get business app url
-
-
--->
-
-
-#!#TABLE
-<!-- ------------------------------------------------------------------------->
- <table border="0" cellspacing="0" class="spec zero_padding">
-
-#!#HEAD
-<!-- ------------------------------------------------------------------------->
- <thead border ="1">
- <tr><th colspan="7" style="padding:0px;">##showSmallToolbar##</th></tr>
- <tr>
- <!--<th width ="1%" alt="##defineLang|_CHECK_ALL## / ##defineLang|_UNCHECK_ALL##"><input type="checkbox" id="checkUncheck" name="checkUncheck" value="" onclick="CheckUncheckAll(this);"></th>-->
- <th width ="50x"> ##defineLang|_NUM_GED## ##sortColumn|res_id##</th>
- <th> ##defineLang|_CATEGORY## ##sortColumn|category_id## </th>
- <th> ##defineLang|_TYPE## ##sortColumn|type_label## </th>
- <th> ##defineLang|_SUBJECT## ##sortColumn|subject##</th>
- <th width ="100px"> ##defineLang|_REG_DATE## ##sortColumn|creation_date##</th>
- <th width ="100px"> ##defineLang|_DEST_USER## ##sortColumn|dest_user##</th>
- <th width ="10px"> </th>
- <th width ="10px"> </th>
- </tr>
- </thead>
-
- <tbody>
-
-#!#RESULT
-<!-- ------------------------------------------------------------------------->
- <tr class="##cssLine|col|white##" >
- <!--<td>##checkBox##</td>-->
- <td>##loadValue|res_id##</td>
- <td>##loadValue|category_img##</td>
- <td>##loadValue|type_label##</td>
- <td>##loadValue|subject##</td>
- <td>##loadValue|creation_date##</td>
- <td>##loadValue|dest_user##</td>
- <td>##showIconDocument##</td>
- <td>##showIconDetails##</td>
- </tr>
-
- #!#FOOTER
- <!-- ------------------------------------------------------------------------->
- </tbody>
- </table>
-
diff --git a/src/frontend/app/about-us.component.html b/src/frontend/app/about-us.component.html
index c2d32420ee4..c47cffd3f02 100755
--- a/src/frontend/app/about-us.component.html
+++ b/src/frontend/app/about-us.component.html
@@ -54,7 +54,7 @@
<h3>Crédits</h3>
<hr/>
<ul>
- <li>Florian AZIZIAN, Thierry BACHAUMONT, Damien BUREL, Bruno CARLIN, Carole COTIN, Prosper DE LAURE, Driss DEMIRAY, Gaël DE VILLEBLANCHE, Emmanuel DILLARD, Mathieu DONZEL, Jean-Louis ERCOLANI, Claire FIGUERAS, Laurent GIOVANNONI,
+ <li>Florian AZIZIAN, Damien BUREL, Bruno CARLIN, Carole COTIN, Prosper DE LAURE, Driss DEMIRAY, Gaël DE VILLEBLANCHE, Emmanuel DILLARD, Mathieu DONZEL, Jean-Louis ERCOLANI, Claire FIGUERAS, Laurent GIOVANNONI,
Henri QUENEAU, Kader KANE, Yves-Christian KPAKPO, Alexandre MORIN, Sébastien NANABONDJA, Fodé NDIAYE, Cédric NDOUMBA, Alex ORLUC, Alexis RAGOT, Alexandre STEFANOVIC, Serge THIERRY-MIEG,
Cyril VAZQUEZ, Arnaud VEBER, Loic VINET</li>
<br>
--
GitLab