Commit 52a54efa authored by Florian Azizian's avatar Florian Azizian

Clean useless code + update version to 20.03

parent ec324f7b
===Maarch Courrier 19.04===
===Maarch Courrier 20.03===
Voir le changelog complet ici : https://community.maarch.org/c/maarch-courrier/changelogs
Documentation d'installation :
https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_installation/debian.html
https://docs.maarch.org/gitbook/html/MaarchCourrier/20.03/guat/guat_installation/debian.html
......@@ -6,25 +6,25 @@
# Maarch Courrier
Gestionnaire Électronique de Correspondances – Libre et Open Source –
**Dernière version stable V19.04**
**Dernière version stable V20.03**
Démonstration : http://demo.maarchcourrier.com/
Documentation : https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/
Documentation : https://docs.maarch.org/gitbook/html/MaarchCourrier/20.03/
## Installation
1. Vérifiez que vous avez l'ensemble des [pré-requis](https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_prerequisites/home.html)
2. Décompressez *MaarchCourrier-19.04.tar.gz* dans votre zone web
1. Vérifiez que vous avez l'ensemble des [pré-requis](https://docs.maarch.org/gitbook/html/MaarchCourrier/20.03/guat/guat_prerequisites/home.html)
2. Décompressez *MaarchCourrier-20.03.tar.gz* dans votre zone web
3. Vérifiez votre vhost Apache
4. Laissez-vous guider par notre installeur à [http://IP.ouDomaine.tld/MaarchCourrier/install/](https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_installation/online_install.html)
4. Laissez-vous guider par notre installeur à [http://IP.ouDomaine.tld/MaarchCourrier/install/](https://docs.maarch.org/gitbook/html/MaarchCourrier/20.03/guat/guat_installation/online_install.html)
## Requis techniques
* Apache2.x
* PostgreSQL 9.x
* PHP 7.0, 7.1, 7.2. 7.3
* PHP 7.1, 7.2. 7.3
* Extensions PHP (adaptées à votre version de PHP) : PHP-[XSL](http://php.net/manual/en/book.xsl.php), PHP-[XML-RPC](http://php.net/manual/en/book.xmlrpc.php), PHP-[Gettext](http://php.net/manual/en/b$
* Bibliothèques pear/CLITools
* [ImageMagick](http://imagemagick.org/), avec PHP-[ImageMagick](http://php.net/manual/en/book.imagick.php)
......
.default_style, .doctypes, .documents
{
color: #000000;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-weight: normal;
font-style: normal;
font-size: 12px;
}
/*option[disabled]*/
.disabled_entity
{
color: #135F7F33;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-weight: normal;
font-style: normal;
font-size: 10px;
}
.blue_style_big, .blue_style_big[selected=selected]
{
color: #0000FF;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 14px;
}
.orange_style_big, .orange_style_big[selected=selected]
{
color: #FF4500;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 14px;
}
.black_style_big, .black_style_big[selected=selected]
{
color: #000000;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 14px;
}
.black_style, .black_style[selected=selected]
{
color: #000000;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.blue_style, .blue_style[selected=selected]
{
color: #0000FF;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.yellow_style, .yellow_style[selected=selected]
{
color: #FFFF00;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.green_style, .green_style[selected]
{
color: #008000;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.beige_style, .beige_style[selected=selected]
{
color: #D2B48C;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.pink_style, .pink_style[selected="selected"]
{
color: #FF00FF;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.red_style, .red_style[selected=selected]
{
color: #FF0000;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.violet_style, .violet_style[selected=selected]
{
color: #800080;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.grey_style, .grey_style[selected=selected]
{
color: #808080;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.orange_style, .orange_style[selected=selected]
{
color: #FF4500;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
.brown_style, .brown_style[selected=selected]
{
color: #800000;
font-weight: bold;
font-style: normal;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
}
......@@ -3045,16 +3045,10 @@ div.autocomplete ul li span.informal {
margin-bottom: 4px;
}
.zero_padding td {
padding: 4px 3px 1px 1px;
}
.popup_content {
/*padding: 10px;*/
}
.block .check {
background-color: #F2F2F2;
}
......
......@@ -33,8 +33,6 @@ $core_tools->load_lang();
$db = new Database();
$req = new request();
$tmp = false;
// var_dump($_POST['action']);
// var_dump($_POST['name']);
if ($_POST['action'] == 'creation') {
if (isset($_POST['name']) && !empty($_POST['name'])) {
......@@ -50,22 +48,22 @@ if ($_POST['action'] == 'creation') {
$tmp = $db->query(
'INSERT INTO ' . $_SESSION['tablename']['saved_queries']
. ' (user_id, query_name, creation_date, created_by, '
. " query_type, query_txt) VALUES (?, ?, CURRENT_TIMESTAMP, ?, 'my_search', ? )",
. " query_type, query_txt) VALUES (?, ?, CURRENT_TIMESTAMP, ?, 'my_search', ? )",
array($_SESSION['user']['UserId'], $_POST['name'], $_SESSION['user']['UserId'], $_SESSION['current_search_query']), true
);
} else {
if($stmt->rowCount() >= 1){
if ($stmt->rowCount() >= 1) {
//si il existe déjà une ligne dans la base avec les mêmes infos, on va demander confirmation
$_SESSION['seekName'] = $_POST['name'];
echo '{status : 4}';
exit();
exit();
}
$res = $stmt->fetchObject();
$id = $res->query_id;
$tmp = $db->query(
'UPDATE ' . $_SESSION['tablename']['saved_queries']
. " SET query_txt = ?, last_modification_date = CURRENT_TIMESTAMP WHERE user_id = ? and query_name= ?"
, array($_SESSION['current_search_query'], $_SESSION['user']['UserId'], $_POST['name']), true
, array ($_SESSION['current_search_query'], $_SESSION['user']['UserId'], $_POST['name']), true
);
}
if (!$tmp) {
......@@ -78,7 +76,7 @@ if ($_POST['action'] == 'creation') {
} else {
echo '{status : 3}';
}
} else if ($_POST['action'] == 'load') {
} elseif ($_POST['action'] == 'load') {
if (isset($_POST['id']) && !empty($_POST['id'])) {
$tmp = $db->query(
'SELECT query_txt FROM ' . $_SESSION['tablename']['saved_queries']
......@@ -91,7 +89,7 @@ if ($_POST['action'] == 'creation') {
$res = $tmp->fetchObject();
echo "{'status' : 0, 'query':".$res->query_txt."}";
}
} else if($_POST['action'] == 'delete') {
} elseif ($_POST['action'] == 'delete') {
if (isset($_POST['id']) && !empty($_POST['id'])) {
$tmp = $db->query(
'DELETE FROM ' . $_SESSION['tablename']['saved_queries']
......@@ -103,16 +101,16 @@ if ($_POST['action'] == 'creation') {
} else {
echo "{'status' : 0}";
}
} else if($_POST['action'] == 'creation_ok') {
} elseif ($_POST['action'] == 'creation_ok') {
$tmp = $db->query(
'UPDATE ' . $_SESSION['tablename']['saved_queries']
. " SET query_txt = ?, last_modification_date = CURRENT_TIMESTAMP WHERE user_id = ? and query_name= ?"
, array($_SESSION['current_search_query'], $_SESSION['user']['UserId'], $_SESSION['seekName']), true
);
$_SESSION['seekName'] = null;
$_SESSION['seekName'] = null;
echo "{'status' : 0}";
} else {
echo "{status : 1}";
}
exit();
\ No newline at end of file
}
exit();
......@@ -19,10 +19,6 @@
* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('_MEP_VERSION')) {
define('_MEP_VERSION', 'Maarch v19.04');
}
//if (!defined("_ID_TO_DISPAY")) define("_ID_TO_DISPAY", "res_id"); // value res_id || chrono_number
if (!defined('_ID_TO_DISPLAY')) {
define('_ID_TO_DISPLAY', 'res_id');
......@@ -846,9 +842,6 @@ if (!defined('_CSS_STYLE')) {
if (!defined('_CHOOSE_STYLE')) {
define('_CHOOSE_STYLE', 'Choose a style');
}
if (!defined('_DEFAULT_STYLE')) {
define('_DEFAULT_STYLE', 'Default style');
}
/********************** colors style ***************************/
if (!defined('_BLACK')) {
......@@ -899,34 +892,6 @@ if (!defined('_SUBFOLDER')) {
define('_SUBFOLDER', 'sub-folder');
}
if (!defined('_ADD_SUBFOLDER')) {
define('_ADD_SUBFOLDER', 'Add a new sub-folder');
}
if (!defined('_THE_SUBFOLDER')) {
define('_THE_SUBFOLDER', 'The new sub-folder');
}
if (!defined('_SUBFOLDER_MODIF')) {
define('_SUBFOLDER_MODIF', 'Sub-folder modification');
}
if (!defined('_SUBFOLDER_CREATION')) {
define('_SUBFOLDER_CREATION', 'Sub-folder creation');
}
if (!defined('_SUBFOLDER_ID_PB')) {
define('_SUBFOLDER_ID_PB', 'There is a problem with the sub-folder ID');
}
if (!defined('_SUBFOLDER_ADDED')) {
define('_SUBFOLDER_ADDED', 'New sub-folder addition');
}
if (!defined('_NEW_SUBFOLDER')) {
define('_NEW_SUBFOLDER', 'New sub-folder');
}
if (!defined('_STRUCTURE_MANDATORY')) {
define('_STRUCTURE_MANDATORY', 'The sub-folder is mandatory');
}
if (!defined('_SUBFOLDER_DESC_MISSING')) {
define('_SUBFOLDER_DESC_MISSING', "It's missing the sub-folder description");
}
if (!defined('_ATTACH_STRUCTURE')) {
define('_ATTACH_STRUCTURE', 'linked to a sub-folder');
}
......@@ -1785,21 +1750,6 @@ if (!defined('_CHOOSE_TYPE')) {
define('_CHOOSE_TYPE', 'Choose a type');
}
if (!defined('_FILE_LOADED_BUT_NOT_VISIBLE')) {
define('_FILE_LOADED_BUT_NOT_VISIBLE', 'The file is loaded and ready to be saved on the server.<br/>');
}
if (!defined('_ONLY_FILETYPES_AUTHORISED')) {
define('_ONLY_FILETYPES_AUTHORISED', 'Only the following files can be displayed in this window');
}
if (!defined('_PROBLEM_LOADING_FILE_TMP_DIR')) {
define('_PROBLEM_LOADING_FILE_TMP_DIR', 'problem during the file loading on the temporary folder of the server');
}
if (!defined('_NO_FILE_SELECTED')) {
define('_NO_FILE_SELECTED', 'No loaded file');
}
if (!defined('_DOWNLOADED_FILE')) {
define('_DOWNLOADED_FILE', 'Loaded file');
}
if (!defined('_WRONG_FILE_TYPE')) {
define('_WRONG_FILE_TYPE', 'This kind of file is not allowed');
}
......@@ -1819,9 +1769,6 @@ if (!defined('_APA_COLL')) {
if (!defined('_DOCUMENTS_LIST')) {
define('_DOCUMENTS_LIST', 'List');
}
if (!defined('_LOGS_LIST')) {
define('_LOGS_LIST', 'Logs list');
}
/********* Contacts ************/
if (!defined('_ADMIN_CONTACTS')) {
......@@ -2542,9 +2489,6 @@ if (!defined('_QUICKLAUNCH')) {
if (!defined('_SHOW_DETAILS_DOC')) {
define('_SHOW_DETAILS_DOC', 'See the document details');
}
if (!defined('_VISIBLEBY')) {
define('_VISIBLEBY', 'Visible by');
}
if (!defined('_VIEW_DOC_FULL')) {
define('_VIEW_DOC_FULL', 'see the document');
}
......@@ -2586,9 +2530,6 @@ if (!defined('_CLEAR_FORM')) {
define('_CLEAR_FORM', 'Clear the form');
}
if (!defined('_MAX_SIZE_UPLOAD_REACHED')) {
define('_MAX_SIZE_UPLOAD_REACHED', 'File maximum size is exceeded');
}
if (!defined('_NOT_ALLOWED')) {
define('_NOT_ALLOWED', 'Forbidden');
}
......
......@@ -10,9 +10,6 @@
* @author dev <dev@maarch.org>
* @ingroup lang
*/
if (!defined('_MEP_VERSION')) {
define('_MEP_VERSION', 'Maarch v19.04');
}
if (!defined('_ID_TO_DISPLAY')) { // value res_id || chrono_number
define('_ID_TO_DISPLAY', 'chrono_number');
......@@ -838,9 +835,6 @@ if (!defined('_CSS_STYLE')) {
if (!defined('_CHOOSE_STYLE')) {
define('_CHOOSE_STYLE', 'Choisissez un style');
}
if (!defined('_DEFAULT_STYLE')) {
define('_DEFAULT_STYLE', 'Style par défaut');
}
/********************** colors style ***************************/
if (!defined('_BLACK')) {
......@@ -891,34 +885,6 @@ if (!defined('_SUBFOLDER')) {
define('_SUBFOLDER', 'sous-chemise');
}
if (!defined('_ADD_SUBFOLDER')) {
define('_ADD_SUBFOLDER', 'Ajouter une nouvelle sous-chemise');
}
if (!defined('_THE_SUBFOLDER')) {
define('_THE_SUBFOLDER', 'La sous-chemise');
}
if (!defined('_SUBFOLDER_MODIF')) {
define('_SUBFOLDER_MODIF', 'Modification de la sous-chemise');
}
if (!defined('_SUBFOLDER_CREATION')) {
define('_SUBFOLDER_CREATION', 'Création de la sous-chemise');
}
if (!defined('_SUBFOLDER_ID_PB')) {
define('_SUBFOLDER_ID_PB', "Il y a un probleme avec l'identifiant de la sous-chemise");
}
if (!defined('_SUBFOLDER_ADDED')) {
define('_SUBFOLDER_ADDED', "Ajout d'une nouvelle sous-chemise");
}
if (!defined('_NEW_SUBFOLDER')) {
define('_NEW_SUBFOLDER', 'Nouvelle sous-chemise');
}
if (!defined('_STRUCTURE_MANDATORY')) {
define('_STRUCTURE_MANDATORY', 'La chemise est obligatoire');
}
if (!defined('_SUBFOLDER_DESC_MISSING')) {
define('_SUBFOLDER_DESC_MISSING', 'Il manque la description de la sous-chemise');
}
if (!defined('_ATTACH_STRUCTURE')) {
define('_ATTACH_STRUCTURE', 'Rattacher à une chemise');
}
......@@ -1658,9 +1624,6 @@ if (!defined('_ANSWER')) {
if (!defined('_DETAILS')) {
define('_DETAILS', 'Fiche détaillée');
}
if (!defined('_VISIBLEBY')) {
define('_VISIBLEBY', 'Visible par');
}
if (!defined('_DOWNLOAD')) {
define('_DOWNLOAD', 'Télécharger');
}
......@@ -1799,21 +1762,6 @@ if (!defined('_CHOOSE_TYPE')) {
define('_CHOOSE_TYPE', 'Choisissez un type');
}
if (!defined('_FILE_LOADED_BUT_NOT_VISIBLE')) {
define('_FILE_LOADED_BUT_NOT_VISIBLE', 'Le fichier est chargé et prêt à être enregistré sur le serveur.<br/>');
}
if (!defined('_ONLY_FILETYPES_AUTHORISED')) {
define('_ONLY_FILETYPES_AUTHORISED', 'Seuls les fichiers suivants peuvent être affichés dans cette fenêtre');
}
if (!defined('_PROBLEM_LOADING_FILE_TMP_DIR')) {
define('_PROBLEM_LOADING_FILE_TMP_DIR', 'Problème lors du chargement du fichier sur le répertoire temporaire du serveur');
}
if (!defined('_NO_FILE_SELECTED')) {
define('_NO_FILE_SELECTED', 'Aucun fichier chargé');
}
if (!defined('_DOWNLOADED_FILE')) {
define('_DOWNLOADED_FILE', 'Fichier chargé');
}
if (!defined('_WRONG_FILE_TYPE')) {
define('_WRONG_FILE_TYPE', "Ce type de fichier n'est pas permis");
}
......@@ -1833,9 +1781,6 @@ if (!defined('_APA_COLL')) {
if (!defined('_DOCUMENTS_LIST')) {
define('_DOCUMENTS_LIST', 'Liste');
}
if (!defined('_LOGS_LIST')) {
define('_LOGS_LIST', 'Liste des logs');
}
/********* Contacts ************/
if (!defined('_ADMIN_CONTACTS')) {
......@@ -2606,9 +2551,6 @@ if (!defined('_CLEAR_FORM')) {
define('_CLEAR_FORM', 'Effacer le formulaire');
}
if (!defined('_MAX_SIZE_UPLOAD_REACHED')) {
define('_MAX_SIZE_UPLOAD_REACHED', 'Taille maximum de fichier dépassée');
}
if (!defined('_NOT_ALLOWED')) {
define('_NOT_ALLOWED', 'interdit');
}
......
......@@ -10,7 +10,6 @@
* @author dev <dev@maarch.org>
* @ingroup lang
*/
if (!defined('_MEP_VERSION')) { define('_MEP_VERSION', 'Maarch v19.04');}
if (!defined('_ID_TO_DISPLAY')) { define('_ID_TO_DISPLAY', 'chrono_number');}
if (!defined('_ADDED')) { define('_ADDED', 'toegevoegd');}
if (!defined('_UPDATED')) { define('_UPDATED', 'gewijzigd');}
......@@ -271,7 +270,6 @@ if (!defined('_FONT_COLOR')) { define('_FONT_COLOR', 'Kleur van het lettertype')
if (!defined('_FONT_SIZE')) { define('_FONT_SIZE', 'Grootte van het lettertype');}
if (!defined('_CSS_STYLE')) { define('_CSS_STYLE', 'Stijl');}
if (!defined('_CHOOSE_STYLE')) { define('_CHOOSE_STYLE', 'Kies een stijl');}
if (!defined('_DEFAULT_STYLE')) { define('_DEFAULT_STYLE', 'Standaardstijl');}
if (!defined('_BLACK')) { define('_BLACK', 'Zwart');}
if (!defined('_BEIGE')) { define('_BEIGE', 'Beige');}
if (!defined('_BLUE')) { define('_BLUE', 'Blauw');}
......@@ -287,15 +285,6 @@ if (!defined('_RED')) { define('_RED', 'Rood');}
if (!defined('_GREEN')) { define('_GREEN', 'Groen');}
if (!defined('_PURPLE')) { define('_PURPLE', 'Paars');}
if (!defined('_SUBFOLDER')) { define('_SUBFOLDER', 'submap');}
if (!defined('_ADD_SUBFOLDER')) { define('_ADD_SUBFOLDER', 'Een nieuwe submap toevoegen');}
if (!defined('_THE_SUBFOLDER')) { define('_THE_SUBFOLDER', 'De submap');}
if (!defined('_SUBFOLDER_MODIF')) { define('_SUBFOLDER_MODIF', 'Submap wijzigen');}
if (!defined('_SUBFOLDER_CREATION')) { define('_SUBFOLDER_CREATION', 'Submap aanmaken');}
if (!defined('_SUBFOLDER_ID_PB')) { define('_SUBFOLDER_ID_PB', 'Er is een probleem met de gebruikersnaam van de submap');}
if (!defined('_SUBFOLDER_ADDED')) { define('_SUBFOLDER_ADDED', 'Een nieuwe submap toevoegen');}
if (!defined('_NEW_SUBFOLDER')) { define('_NEW_SUBFOLDER', 'Nieuwe submap');}
if (!defined('_STRUCTURE_MANDATORY')) { define('_STRUCTURE_MANDATORY', 'De map is verplicht');}
if (!defined('_SUBFOLDER_DESC_MISSING')) { define('_SUBFOLDER_DESC_MISSING', 'Beschrijving van de submap ontbreekt');}
if (!defined('_ATTACH_STRUCTURE')) { define('_ATTACH_STRUCTURE', 'Aan een map koppelen');}
if (!defined('_CHOOSE_STRUCTURE')) { define('_CHOOSE_STRUCTURE', 'Een map kiezen');}
if (!defined('_DEL_SUBFOLDER')) { define('_DEL_SUBFOLDER', 'Submap verwijderen');}
......@@ -526,7 +515,6 @@ if (!defined('_DIRECT_CONTACT')) { define('_DIRECT_CONTACT', 'Rechtstreekse cont
if (!defined('_NO_ANSWER')) { define('_NO_ANSWER', 'Geen antwoord');}
if (!defined('_ANSWER')) { define('_ANSWER', 'Antwoord');}
if (!defined('_DETAILS')) { define('_DETAILS', 'Gedetailleerde fiche');}
if (!defined('_VISIBLEBY')) { define('_VISIBLEBY', 'Zichtbaar door');}
if (!defined('_DOWNLOAD')) { define('_DOWNLOAD', 'Downloaden');}
if (!defined('_SEARCH_RESULTS')) { define('_SEARCH_RESULTS', 'Resultaat van de opzoeking');}
if (!defined('_MAIL_PRIORITY')) { define('_MAIL_PRIORITY', 'Prioriteit van de brief');}
......@@ -572,18 +560,12 @@ if (!defined('_MAIL_DATE')) { define('_MAIL_DATE', 'Datum van de brief');}
if (!defined('_DOC_HISTORY')) { define('_DOC_HISTORY', 'Geschiedenis');}
if (!defined('_CHOOSE_FILE')) { define('_CHOOSE_FILE', 'Kies het bestand');}
if (!defined('_CHOOSE_TYPE')) { define('_CHOOSE_TYPE', 'Kies een type');}
if (!defined('_FILE_LOADED_BUT_NOT_VISIBLE')) { define('_FILE_LOADED_BUT_NOT_VISIBLE', 'Het bestand is geladen en is klaar om bewaard te worden op de server.<br/>');}
if (!defined('_ONLY_FILETYPES_AUTHORISED')) { define('_ONLY_FILETYPES_AUTHORISED', 'Enkel de volgende bestanden kunnen in dit venster weergegeven worden');}
if (!defined('_PROBLEM_LOADING_FILE_TMP_DIR')) { define('_PROBLEM_LOADING_FILE_TMP_DIR', 'Probleem bij het uploaden van het bestand naar de tijdelijke directory van de server');}
if (!defined('_NO_FILE_SELECTED')) { define('_NO_FILE_SELECTED', 'Geen bestand geladen');}
if (!defined('_DOWNLOADED_FILE')) { define('_DOWNLOADED_FILE', 'Bestand geladen');}
if (!defined('_WRONG_FILE_TYPE')) { define('_WRONG_FILE_TYPE', 'Dit bestandstype is niet toegelaten');}
if (!defined('_LETTERBOX')) { define('_LETTERBOX', 'Verzameling van de brieven');}
if (!defined('_ATTACHMENTS_COLL')) { define('_ATTACHMENTS_COLL', 'Verzameling van de bijlagen');}
if (!defined('_ATTACHMENTS_VERS_COLL')) { define('_ATTACHMENTS_VERS_COLL', 'Verzameling van de bijlageversies');}
if (!defined('_APA_COLL')) { define('_APA_COLL', 'Verzameling van de fysieke archivering');}
if (!defined('_DOCUMENTS_LIST')) { define('_DOCUMENTS_LIST', 'Lijst');}
if (!defined('_LOGS_LIST')) { define('_LOGS_LIST', 'Logslijst');}
if (!defined('_ADMIN_CONTACTS')) { define('_ADMIN_CONTACTS', 'Contacten');}
if (!defined('_ADMIN_CONTACTS_DESC')) { define('_ADMIN_CONTACTS_DESC', 'Contactenbeheer');}
if (!defined('_CONTACTS_LIST')) { define('_CONTACTS_LIST', 'Contactenlijst');}
......@@ -826,7 +808,6 @@ if (!defined('_NUMERO_GED')) { define('_NUMERO_GED', 'GED-nummer heeft het verke
if (!defined('_APPS_COMMENT')) { define('_APPS_COMMENT', 'Maarch Applicatie');}
if (!defined('_CORE_COMMENT')) { define('_CORE_COMMENT', 'Kern van het Framework');}
if (!defined('_CLEAR_FORM')) { define('_CLEAR_FORM', 'Het formulier wissen');}
if (!defined('_MAX_SIZE_UPLOAD_REACHED')) { define('_MAX_SIZE_UPLOAD_REACHED', 'Maximumgrootte van het bestand overschreden');}
if (!defined('_NOT_ALLOWED')) { define('_NOT_ALLOWED', 'verboden');}
if (!defined('_CHOOSE_TITLE')) { define('_CHOOSE_TITLE', 'Kies een aanspreking');}
if (!defined('_INDEXING_STATUSES')) { define('_INDEXING_STATUSES', 'Indexeren naar de statussen');}
......
......@@ -56,7 +56,6 @@ foreach (array_keys($_SESSION['modules_loaded']) as $value) {
}
}
require_once 'apps/'.$_SESSION['config']['app_id'].'/css/doctype_levels.css';
require_once 'apps/'.$_SESSION['config']['app_id'].'/css/bootstrapTree.css';
//Dependencies
......
......@@ -57,7 +57,6 @@ require_once 'core/class/ServiceControler.php';
$core = new core_tools();
$core->load_lang();
//require_once('lib/FirePHP/Init.php');
class security extends Database
{
......@@ -313,25 +312,6 @@ class security extends Database
}
/**
* Returns a script related to a collection.
*
* @param $coll_id string Collection identifier
* @param $script_name string Script name "script_add", "script_search", "script_search_result", "script_details"
*
* @return string Script name or empty string if not found
*/
public function get_script_from_coll($coll_id, $script_name)
{
for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
if (trim($_SESSION['collections'][$i]['id']) == trim($coll_id)) {
return trim($_SESSION['collections'][$i][$script_name]);
}
}
return '';
}
/**
* Returns the collection identifier from a table.
*
* @param $table string Tablename
......@@ -375,60 +355,6 @@ class security extends Database
}
/**
* Returns the adr table from a table.
*
* @param $table string Tablename
*
* @return string adr table or empty string if not found
*/
public function retrieve_adr_table_from_table($table)
{
for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
if ($_SESSION['collections'][$i]['table'] == $table) {
return $_SESSION['collections'][$i]['adr'];
}
}
return '';
}
/**
* Returns the collection table from a view.
*
* @param $view string View
*
* @return string Collection table or empty string if not found
*/
public function retrieve_coll_table_from_view($view)
{
for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
if ($_SESSION['collections'][$i]['view'] == $view) {
return $_SESSION['collections'][$i]['table'];
}
}
return '';
}
/**
* Returns the collection identifier from a view.
*
* @param $view string View
*
* @return string Collection identifier or empty string if not found
*/
public function retrieve_coll_id_from_view($view)
{
for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
if ($_SESSION['collections'][$i]['view'] == $view) {
return $_SESSION['collections'][$i]['id'];
}
}
return '';
}
/**
* Returns the view of a collection from the collection identifier.
*
* @param string $coll_id Collection identifier
......@@ -483,147 +409,6 @@ class security extends Database
}
/**
* Returns the adr table of the collection from the collection identifier.
*
* @param string $collId Collection identifier
*
* @return string adr table name or empty string if not found
*/
public function retrieveAdrFromColl($collId)
{
for ($i = 0; $i < count($_SESSION['collections']); ++$i) {
if ($_SESSION['collections'][$i]['id'] == $collId) {
return $_SESSION['collections'][$i]['adr'];
}
}
return '';
}