diff --git a/apps/maarch_entreprise/class/class_chrono.php b/apps/maarch_entreprise/class/class_chrono.php
deleted file mode 100755
index 30db4e32916d40b322547d03c26d13ff3fb56c0b..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/class/class_chrono.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
-* Copyright 2008-2015 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/>.
-*/
-
-/**
-* Chrono number Class
-*
-* Contains all the specific functions of chrono number
-*
-* @package Maarch LetterBox 3.0
-* @version 3.0
-* @since 06/2007
-* @license GPL
-*
-*/
-
-require_once 'apps/'. $_SESSION['config']['app_id'] .'/class/class_chrono_Abstract.php';
-
-class chrono extends chrono_Abstract
-{
- // custom
-}
diff --git a/apps/maarch_entreprise/class/class_chrono_Abstract.php b/apps/maarch_entreprise/class/class_chrono_Abstract.php
deleted file mode 100755
index 39253da7ae08205f936026ffefca14facd095fe5..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/class/class_chrono_Abstract.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-
-/*
-* Copyright 2008-2015 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/>.
-*/
-
-/**
-* Chrono number Class
-*
-* Contains all the specific functions of chrono number
-*
-* @package Maarch LetterBox 3.0
-* @version 3.0
-* @since 06/2007
-* @license GPL
-* @author LoÃŊc Vinet <dev@maarch.org>
-*
-*/
-
-require_once 'core/core_tables.php';
-
-abstract class chrono_Abstract
-{
- public function get_chrono_number($resId, $view)
- {
- $db = new Database();
- $stmt = $db->query(
- "SELECT alt_identifier FROM " . $view . " where res_id = ?",
- array($resId)
- );
- $res = $stmt->fetchObject();
- return $res->alt_identifier;
- }
- /**
- * Return an array with all structure readed in chorno.xml
- *
- * @param string $xml_file add or up (a supprimer)
- */
- public function get_structure($idChrono)
- {
- $globality = array();
- $parameters = array();
- $chronoArr = array();
-
- if (file_exists(
- $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR
- . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'apps'
- . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR
- . 'chrono.xml'
- )
- ) {
- $path = $_SESSION['config']['corepath'] . 'custom'
- . DIRECTORY_SEPARATOR . $_SESSION['custom_override_id']
- . DIRECTORY_SEPARATOR . 'apps' . DIRECTORY_SEPARATOR
- . $_SESSION['config']['app_id'] . DIRECTORY_SEPARATOR . 'xml'
- . DIRECTORY_SEPARATOR . 'chrono.xml';
- } else {
- $path = 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
- . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR
- . 'chrono.xml';
- }
- $chronoConfig = simplexml_load_file($path);
- if ($chronoConfig) {
- foreach ($chronoConfig -> CHRONO as $chronoTag) {
- if ($chronoTag->id == $idChrono) {
- $chronoId = (string) $chronoTag->id;
- $separator = (string) $chronoTag->separator;
- array_push(
- $parameters,
- array(
- 'ID' => $chronoId ,
- 'SEPARATOR' => $separator,
- )
- );
- foreach ($chronoTag->ELEMENT as $item) {
- $type = $item->type;
- $value = (string) $item->value;
- array_push(
- $chronoArr,
- array(
- 'TYPE' => $type,
- 'VALUE' => $value,
- )
- );
- }
- }
- }
- array_push(
- $globality,
- array(
- 'PARAMETERS' => $parameters,
- 'ELEMENTS' => $chronoArr,
- )
- );
-
- return $globality;
- } else {
- echo "chrono::get_structure error";
- }
-
- }
-
- public function convert_date_field($chronoArray)
- {
- for ($i = 0; $i <= count($chronoArray); $i ++) {
- if (isset($chronoArray[$i]['TYPE'])
- && $chronoArray[$i]['TYPE'] == "date"
- ) {
- if ($chronoArray[$i]['VALUE'] == "year") {
- $chronoArray[$i]['VALUE'] = date('Y');
- } else if ($chronoArray[$i]['VALUE'] == "month") {
- $chronoArray[$i]['VALUE'] = date('m');
- } else if ($chronoArray[$i]['VALUE'] == "day") {
- $chronoArray[$i]['VALUE'] = date('d');
- } else if ($chronoArray[$i]['VALUE'] == "full_date") {
- $chronoArray[$i]['VALUE'] = date('dmY');
- }
- }
- }
- return $chronoArray;
- }
-
-
- public function convert_maarch_var($chronoArray, $phpVar)
- {
- for ($i = 0; $i <= count($chronoArray); $i ++) {
- if (isset($chronoArray[$i]['TYPE'])
- && $chronoArray[$i]['TYPE'] == "maarch_var"
- ) {
- if ($chronoArray[$i]['VALUE'] == "entity_id") {
- $chronoArray[$i]['VALUE'] = $phpVar['entity_id'];;
- } else if ($chronoArray[$i]['VALUE'] == "type_id") {
- $chronoArray[$i]['VALUE'] = $phpVar['type_id'];;
- }
- }
- }
- return $chronoArray;
- }
-
-
- public function convert_maarch_forms($chronoArray, $forms)
- {
- for ($i = 0; $i <= count($chronoArray); $i ++) {
- if (isset($chronoArray[$i]['TYPE'])
- && $chronoArray[$i]['TYPE'] == "maarch_form"
- ) {
- foreach ($forms as $key => $value) {
- if ($chronoArray[$i]['VALUE'] == $key) {
- $chronoArray[$i]['VALUE'] = $value;
- }
- }
- }
- }
- return $chronoArray;
- }
-
-
- public function convert_maarch_functions($chronoArray, $phpVar = 'false')
- {
- for ($i = 0; $i <= count($chronoArray); $i ++) {
- if (isset($chronoArray[$i]['TYPE'])
- && $chronoArray[$i]['TYPE'] == "maarch_functions"
- ) {
- if ($chronoArray[$i]['VALUE'] == "chr_global") {
- $chronoArray[$i]['VALUE'] = $this->execute_chrono_for_this_year();
- } else if ($chronoArray[$i]['VALUE'] == "chr_by_entity") {
- $chronoArray[$i]['VALUE'] = $this->execute_chrono_by_entity(
- $phpVar['entity_id']
- );
- } else if ($chronoArray[$i]['VALUE'] == "chr_by_category") {
- $chronoArray[$i]['VALUE'] = $this->execute_chrono_by_category(
- $phpVar['category_id']
- );
- } else if ($chronoArray[$i]['VALUE'] == "category_char") {
- $chronoArray[$i]['VALUE'] = $this->_executeCategoryChar(
- $phpVar
- );
- } else if ($chronoArray[$i]['VALUE'] == "chr_by_res_id") {
- $chronoArray[$i]['VALUE'] = $this->execute_chrono_by_res_id(
- $phpVar['res_id']
- );
- }
- }
- }
- return $chronoArray;
- }
-
-
- public function execute_chrono_for_this_year()
- {
- $db = new Database();
- //Get the crono key for this year
- $stmt = $db->query(
- "SELECT param_value_int FROM " . PARAM_TABLE
- . " WHERE id = 'chrono_global_" . date('Y') . "' "
- );
- if ($stmt->rowCount() == 0) {
- $chrono = $this->_createNewChronoGlobal($db);
- } else {
- $fetch = $stmt->fetchObject();
- $chrono = $fetch->param_value_int;
- }
- $this->_updateChronoForThisYear($chrono, $db);
- return $chrono;
- }
-
- public function execute_chrono_by_res_id($res_id)
- {
- $db = new Database();
- //Get res_id of document
- if ($res_id=='') {
- $order = "ORDER by res_id DESC";
- $query = $db->limit_select(0, 1, 'res_id', 'res_letterbox', '', '', '', $order);
- $stmt = $db->query($query);
- } else {
- $stmt = $db->query(
- "SELECT res_id FROM res_letterbox WHERE res_id=?",
- array($res_id)
- );
- }
-
- $fetch = $stmt->fetchObject();
- $chrono = $fetch->res_id;
- return $chrono;
- }
-
-
- public function execute_chrono_by_entity($entity)
- {
- $db = new Database();
- //Get the crono key for this year
- $stmt = $db->query(
- "SELECT param_value_int FROM " . PARAM_TABLE
- . " WHERE id = ?",
- array('chrono_' . $entity . '_' . date('Y'))
- );
- if ($stmt->rowCount() == 0) {
- $chrono = $this->_createNewChronoForEntity($db, $entity);
- } else {
- $fetch = $stmt->fetchObject();
- $chrono = $fetch->param_value_int;
- }
- $this->_updateChronoForEntity($chrono, $db, $entity);
- return $entity . "/" . $chrono;
- //return $entity;
- }
-
- public function execute_chrono_by_category($category)
- {
- $db = new Database();
- //Get the crono key for this year
- $stmt = $db->query(
- "SELECT param_value_int FROM " . PARAM_TABLE
- . " WHERE id = ?",
- array('chrono_' . $category . '_' . date('Y'))
- );
- if ($stmt->rowCount() == 0) {
- $chrono = $this->_createNewChronoForCategory($db, $category);
- } else {
- $fetch = $stmt->fetchObject();
- $chrono = $fetch->param_value_int;
- }
- $this->_updateChronoForCategory($chrono, $db, $category);
- return "/" . $chrono;
- //return $category;
-
- }
-
- protected function _executeCategoryChar($phpVar)
- {
- if (! $phpVar['category_id']) {
- return "category::php_var error";
- } else {
- if ($phpVar['category_id'] == "incoming") {
- return "A";
- } else if ($phpVar['category_id'] == "outgoing") {
- return "D";
- } else {
- return '';
- }
- }
- }
-
- //For global chrono
- protected function _updateChronoForThisYear($actualChrono, $db)
- {
- $actualChrono++;
- $db->query(
- "UPDATE " . PARAM_TABLE . " SET param_value_int = ? WHERE id = 'chrono_global_" . date('Y') . "' ",
- array($actualChrono)
- );
- }
-
- protected function _createNewChronoGlobal($db)
- {
- $db->query(
- "INSERT INTO " . PARAM_TABLE . " (id, param_value_int) VALUES "
- . "('chrono_global_" . date('Y') . "', '1')"
- );
- return 1;
- }
-
-
- //For specific chrono =>category
- protected function _updateChronoForCategory($actualChrono, $db, $category)
- {
- $actualChrono++;
- $db->query(
- "UPDATE " . PARAM_TABLE . " SET param_value_int = ? WHERE id = ? ",
- array($actualChrono, 'chrono_' . $category . '_' . date('Y'))
- );
- }
-
- protected function _createNewChronoForCategory($db, $category)
- {
- $db->query(
- "INSERT INTO " . PARAM_TABLE . " (id, param_value_int) VALUES "
- . "(?, '1')",
- array('chrono_' . $category . '_' . date('Y'))
- );
- return 1;
- }
-
-
- //For specific chrono =>entity
- protected function _updateChronoForEntity($actualChrono, $db, $entity)
- {
- $actualChrono++;
- $db->query(
- "UPDATE " . PARAM_TABLE . " SET param_value_int = ? WHERE id = ? ",
- array($actualChrono, 'chrono_' . $entity . '_' . date('Y'))
- );
- }
-
- protected function _createNewChronoForEntity($db, $entity)
- {
- $db->query(
- "INSERT INTO " . PARAM_TABLE . " (id, param_value_int) VALUES "
- . "(?, '1')",
- array('chrono_' . $entity . '_' . date('Y'))
- );
- return 1;
- }
-
- public function generate_chrono($chronoId, $phpVar='false', $form='false')
- {
- $tmp = $this->get_structure($chronoId);
- $elements = $tmp[0]['ELEMENTS'];
- $parameters = $tmp[0]['PARAMETERS'];
-
- //Launch any conversion needed for value in the chrono array
- $elements = $this->convert_date_field($elements); //For type date
- $elements = $this->convert_maarch_var($elements, $phpVar); //For php var in maarch
- $elements = $this->convert_maarch_functions($elements, $phpVar);
- $elements = $this->convert_maarch_forms($elements, $form); //For values used in forms
-
- //Generate chrono string
- $string = $this->convert_in_string($elements, $parameters);
- return $string;
- }
-
-
- public function convert_in_string($elements, $parameters)
- {
- $separator = $parameters[0]['SEPARATOR'];
-
- $thisString = '';
- //Explode each elements of this array
- foreach ($elements as $array) {
- $thisString .= $separator;
- $thisString .= $array['VALUE'];
- }
-
- //$thisString = substr($thisString, 1);
- return $thisString;
- }
-}
diff --git a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
index 4bc1588a88fd779b66898010691d485bd5a79f09..464139a244d5c2aa56990f06561f9e59ac633fff 100755
--- a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
+++ b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php
@@ -17,76 +17,6 @@ abstract class indexing_searching_app_Abstract extends Database
parent::__construct();
}
- public function show_index_frame($ext)
- {
- if (empty($ext)) {
- return false;
- }
- if (file_exists($_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml')) {
- $path = $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- } else {
- $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- }
- $xmlconfig = simplexml_load_file($path);
- foreach ($xmlconfig->FORMAT as $FORMAT) {
- if (strtoupper($ext) == (string) $FORMAT->name) {
- if ($FORMAT->canConvert == 'true') {
- return true;
- } else {
- return false;
- }
- }
- }
-
- return false;
- }
-
- public function filetypes_showed_indexation()
- {
- if (file_exists($_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml')) {
- $path = $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- } else {
- $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- }
- $xmlconfig = simplexml_load_file($path);
- $ext_list = array();
- foreach ($xmlconfig->FORMAT as $FORMAT) {
- if ((string) $FORMAT->canConvert == 'true') {
- array_push($ext_list, (string) $FORMAT->name);
- }
- }
-
- return $ext_list;
- }
-
- public function get_mime_type($ext)
- {
- if (file_exists($_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml')) {
- $path = $_SESSION['config']['corepath'].'custom'.DIRECTORY_SEPARATOR.$_SESSION['custom_override_id'].DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- } else {
- $path = 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'extensions.xml';
- }
- $xmlconfig = simplexml_load_file($path);
- $ext_list = array();
- $i = 0;
- foreach ($xmlconfig->FORMAT as $FORMAT) {
- $ext_list[$i] = array('name' => (string) $FORMAT->name, 'mime' => (string) $FORMAT->mime);
- ++$i;
- }
- for ($i = 0; $i < count($ext_list); ++$i) {
- if ($ext_list[$i]['name'] == strtoupper($ext)) {
- $mime_type = $ext_list[$i]['mime'];
- $type_state = true;
- $i = count($ext_list);
-
- return $mime_type;
- break;
- }
- }
-
- return false;
- }
-
public function send_criteria_data($param)
{
/*list_criteres = Array ("num_courrier" => Array (label => "reference courrier',
diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js
index 3e34183967a42d15055f28edae3b2b5cb4f4a5be..3edd69199d6eeaf3f84bf21969fb354fa9c81d0d 100755
--- a/apps/maarch_entreprise/js/functions.js
+++ b/apps/maarch_entreprise/js/functions.js
@@ -869,210 +869,6 @@ function close_action(id_action, page, path_manage_script, mode_req, res_id_valu
}
}
-/**
- * Validates the form of an action
- *
- * @param current_form_id String Identifier of the form to validate
- * @param path_manage_script String Path to the php script called in the Ajax object to validates the form
- * @param id_action String Action identifier
- * @param values String Action do something on theses items listed in this string
- * @param table String Table used for the action
- * @param module String Action is this module
- * @param coll_id String Collection identifier
- * @param mode String Action mode : mass or page
- * @param protect_string bool
- */
-function valid_action_form(current_form_id, path_manage_script, id_action, values, table, module, coll_id, mode, protect_string, advancedMode) {
- var frm_values;
- var chosen_action_id;
-
- if (typeof advancedMode !== "undefined") {
- frm_values = "so#use#less"; // Sert juste a remplir frm_values pour manage_actions
- chosen_action_id = advancedMode[0];
- } else {
- frm_values = get_form_values(current_form_id);
- chosen_action_id = get_chosen_action(current_form_id);
- }
-
- if (protect_string != false) {
- frm_values = frm_values.replace(/\'/g, "\\'");
- frm_values = frm_values.replace(/\"/g, '\\"');
- frm_values = frm_values.replace(/\r\n/g, ' ');
- frm_values = frm_values.replace(/\r/g, ' ');
- frm_values = frm_values.replace(/\n/g, ' ');
- }
-
- if (values && table && module && coll_id && chosen_action_id != '') {
-
- new Ajax.Request(path_manage_script, {
- method: 'post',
- parameters: {
- action_id: id_action,
- form_to_check: current_form_id,
- req: 'valid_form',
- form_values: frm_values
- },
- onCreate: function (answer) {
- //show loading image in toolbar
- $j("input[type='button']").prop("disabled", true).css("opacity", "0.5");
- },
- onSuccess: function (answer) {
- eval('response=' + answer.responseText);
- if (response.status == 0) { //form values checked
- var hist = '';
- if (chosen_action_id == 'end_action') {
- hist = 'Y';
- } else {
- hist = 'N';
- }
-
- if (response.manage_form_now == false) {
- pile_actions.action_push("action_send_form_confirm_result( '" + path_manage_script + "', '" + mode + "', '" + id_action + "', '" + values + "','" + table + "', '" + module + "','" + coll_id + "', '" + frm_values + "', '" + hist + "');");
- if (chosen_action_id == 'end_action') {
- end_actions();
- } else {
- action_send_first_request(path_manage_script, mode, chosen_action_id, values, table, module, coll_id);
- }
- } else {
- if (chosen_action_id != 'end_action') {
- pile_actions.action_push("action_send_first_request( '" + path_manage_script + "', '" + mode + "', '" + chosen_action_id + "', 'to_define','" + table + "', '" + module + "','" + coll_id + "');");
- }
- action_send_form_confirm_result(path_manage_script, mode, id_action, values, table, module, coll_id, frm_values, hist);
- }
-
- } else { // Form Params errors
- try {
- $('frm_error_' + id_action).innerHTML = response.error_txt;
- alert($('frm_error_' + id_action).innerHTML);
- $j("input[type='button']").prop("disabled", false).css("opacity", "1");
-
- } catch (e) {
-
- }
- }
- },
- onFailure: function (error) {
- console.log(error);
- }
- });
-
- } else if (chosen_action_id == '') {
- alert('Aucune action choisie');
- } else {
- console.log('Action Error!');
- }
-}
-
-/**
- * Get the chosen action identifier in the form
- *
- * @param form_id String Identifier of the form
- */
-function get_chosen_action(form_id) {
- var frm = $(form_id);
- for (var i = 0; i < frm.elements.length; i++) {
- if (frm.elements[i].id == 'chosen_action') {
- if (frm.elements[i].tagName == 'INPUT') {
- return frm.elements[i].value;
- } else if (frm.elements[i].tagName == 'SELECT') {
- return frm.elements[i].options[frm.elements[i].selectedIndex].value;
- } else {
- break;
- }
- }
- }
- return '';
-}
-
-/**
- * Get the values of the form in an string (Id_field1#field_value1$$Id_field2#field_value2$$)
- *
- * @param form_id String Identifier of the form
- * @return String Values of the form
- */
-function get_form_values(form_id, return_string, include_buttons) {
- if (typeof (return_string) == "undefined" || return_string === null) {
- var in_string = true;
- } else {
- var in_string = return_string;
- }
-
- if (typeof (include_buttons) == "undefined" || include_buttons === null) {
- var get_buttons = true;
- } else {
- var get_buttons = include_buttons;
- }
- var frm = $(form_id);
-
- if (in_string == true) {
- var val = '';
- } else {
- var val = {};
- }
- if (frm) {
- for (var i = 0; i < frm.elements.length; i++) {
- if (frm.elements[i].tagName == 'INPUT' || frm.elements[i].tagName == 'TEXTAREA') {
- if ((frm.elements[i].tagName == 'INPUT' && frm.elements[i].type != 'checkbox' && frm.elements[i].type != 'radio') || frm.elements[i].tagName == 'TEXTAREA') {
- if ((frm.elements[i].tagName == 'INPUT' && (get_buttons == true || (get_buttons == false && frm.elements[i].type == 'text'))) || frm.elements[i].tagName == 'TEXTAREA') {
- if (in_string == true) {
- val += frm.elements[i].id + '#' + frm.elements[i].value + '$$';
- } else {
- val[frm.elements[i].id] = frm.elements[i].value;
- }
- }
- } else {
- if (frm.elements[i].checked == true) {
- if (in_string == true) {
- val += frm.elements[i].id + '#' + frm.elements[i].value + '$$';
- } else {
- val[frm.elements[i].id] = frm.elements[i].value;
- }
- }
- }
- } else if (frm.elements[i].tagName == 'SELECT') {
- if (frm.elements[i].type != 'select-multiple') {
- if (in_string == true) {
- val += frm.elements[i].id + '#' + frm.elements[i].options[frm.elements[i].selectedIndex].value + '$$';
- } else {
- val[frm.elements[i].id] = frm.elements[i].options[frm.elements[i].selectedIndex].value;
- }
- } else {
- if (in_string == true) {
- if (frm.elements[i].selectedOptions) {
- val += frm.elements[i].id + '#';
- for (var mult = 0; mult < frm.elements[i].selectedOptions.length; mult++) {
- if (mult == 0) {
- val += frm.elements[i].selectedOptions[mult].value;
- } else {
- val += '__' + frm.elements[i].selectedOptions[mult].value;
- }
-
- }
- val += '$$';
- }
-
- } else {
- var val_s;
- for (var mult = 0; mult < frm.elements[i].selectedOptions.length; mult++) {
- if (mult == 0) {
- val_s += frm.elements[i].selectedOptions[mult].value;
- } else {
- val_s += '__' + frm.elements[i].selectedOptions[mult].value;
- }
-
- }
- val[frm.elements[i].id] = val_s;
- }
- }
- }
- }
- if (in_string == true) {
- val.substring(0, val.length - 3);
- }
- }
- return val;
-}
-
/**
* Sends the first ajax request to create a form or resolve a simple action
*
@@ -1466,22 +1262,6 @@ function unlock(path_script, id, coll) // A FAIRE
}
}
-/**
- * Returns in an array all values selected from check boxes or radio buttons
- *
- * @param name_input String Item Name
- * @return Array Checked values
- **/
-function get_checked_values(name_input) {
- var arr = [];
- var items = document.getElementsByName(name_input);
- for (var i = 0; i < items.length; i++) {
- if (items[i].checked == true) {
- arr.push(items[i].value);
- }
- }
- return arr;
-}
/*************** Apps Reports functions *****************/
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 13d684bb6647428628a800f742a5e9dfc018cae3..99ae13ffbe67d357b5379df24818377582701342 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -3810,9 +3810,6 @@ if (!defined('_IVS_TOO_MANY_DECIMAL_DIGITS')) {
}
//control technical params
-if (!defined('_CONTROL_PARAM_TECHNIC')) {
- define('_CONTROL_PARAM_TECHNIC', 'Control technical configurations');
-}
if (!defined('_COMPONENT')) {
define('_COMPONENT', 'Component');
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 183c508814ebf8253bb90e0f98810df2981db8c8..10531761477094c603b2cf20d43fdbaeea0531c5 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -3864,9 +3864,6 @@ if (!defined('_IVS_TOO_MANY_DECIMAL_DIGITS')) {
}
//control technical params
-if (!defined('_CONTROL_PARAM_TECHNIC')) {
- define('_CONTROL_PARAM_TECHNIC', 'ContrÃīler les paramÃĻtres techniques');
-}
if (!defined('_COMPONENT')) {
define('_COMPONENT', 'Composant');
}
@@ -4226,9 +4223,6 @@ if (!defined('_NO_AVAILABLE_TAG_TO_UPDATE')) {
define('_NO_AVAILABLE_TAG_TO_UPDATE', 'Aucune version disponible pour une mise à jour');
}
//PARAMETERS
-if (!defined('_ID_IS_EMPTY_CONTROLLER')) {
- define('_ID_IS_EMPTY_CONTROLLER', ' L\'identifiant est vide');
-}
if (!defined('_PARAM_VALUE_IS_EMPTY')) {
define('_PARAM_VALUE_IS_EMPTY', ' La valeur du paramÃĻtre est vide');
}
diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php
index 37ba48292b13c448b2dbe11b406b0143db4949ef..427a1a80fafa1ac9f9bff6b05c5c149e2e950b90 100755
--- a/apps/maarch_entreprise/lang/nl.php
+++ b/apps/maarch_entreprise/lang/nl.php
@@ -1231,7 +1231,6 @@ if (!defined('_IVS_VALUE_NOT_ALLOWED')) { define('_IVS_VALUE_NOT_ALLOWED', 'De w
if (!defined('_IVS_FORMAT_NOT_ALLOWED')) { define('_IVS_FORMAT_NOT_ALLOWED', 'Het formaat is niet toegelaten');}
if (!defined('_IVS_TOO_MANY_DIGITS')) { define('_IVS_TOO_MANY_DIGITS', 'Teveel tekens');}
if (!defined('_IVS_TOO_MANY_DECIMAL_DIGITS')) { define('_IVS_TOO_MANY_DECIMAL_DIGITS', 'Teveel decimale tekens');}
-if (!defined('_CONTROL_PARAM_TECHNIC')) { define('_CONTROL_PARAM_TECHNIC', 'De technische instellingen controleren');}
if (!defined('_COMPONENT')) { define('_COMPONENT', 'Component');}
if (!defined('_MARK_AS_READ')) { define('_MARK_AS_READ', 'Markeren als gelezen');}
if (!defined('_MARK_AS_READ_DESC')) { define('_MARK_AS_READ_DESC', 'Markeert het document als gelezen in het bakje. Voegt het gegeven van de res_mark_as_read in de tabel in (nuttig indien gebruikt in de bakjes clauses)');}
@@ -1345,7 +1344,6 @@ if (!defined('_DEPLOY_VERSION')) { define('_DEPLOY_VERSION', 'De versie unzippen
if (!defined('_UPDATE_END')) { define('_UPDATE_END', 'Update geslaagd');}
if (!defined('_UPDATE_DESC_END')) { define('_UPDATE_DESC_END', 'Update geslaagd');}
if (!defined('_NO_AVAILABLE_TAG_TO_UPDATE')) { define('_NO_AVAILABLE_TAG_TO_UPDATE', 'Geen versie beschikbaar voor update');}
-if (!defined('_ID_IS_EMPTY_CONTROLLER')) { define('_ID_IS_EMPTY_CONTROLLER', 'De gebruikersnaam is leeg');}
if (!defined('_PARAM_VALUE_IS_EMPTY')) { define('_PARAM_VALUE_IS_EMPTY', 'De waarde van de instelling is leeg');}
if (!defined('_INVALID_PARAM_DATE')) { define('_INVALID_PARAM_DATE', 'Instelling ongeldige datum');}
if (!defined('_INVALID_INTEGER')) { define('_INVALID_INTEGER', 'Geheel is ongeldig');}
diff --git a/apps/maarch_entreprise/xml/control_params.xml.default b/apps/maarch_entreprise/xml/control_params.xml.default
deleted file mode 100755
index 5a22d56cc216f8c1086a9e6868a8342745c519a4..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/xml/control_params.xml.default
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ROOT>
- <MaarchCapture>
- <testIt>false</testIt>
- <specific>
- <pathToMaarchCapture>/opt/maarch/maarch_capture/</pathToMaarchCapture>
- </specific>
- </MaarchCapture>
- <notifications_sendmail>
- <testIt>false</testIt>
- <specific>
- <sendmailTo>dev@maarch.org</sendmailTo>
- <sendmailConfPath>/etc/ssmtp/ssmtp.conf</sendmailConfPath>
- </specific>
- </notifications_sendmail>
-</ROOT>
diff --git a/apps/maarch_entreprise/xml/datasources.xsd.default b/apps/maarch_entreprise/xml/datasources.xsd.default
deleted file mode 100755
index 0160fae2794e1f60e2466277e5a27fd3026e7e52..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/xml/datasources.xsd.default
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:das="maarch:DataAccessService"
- elementFormDefault="qualified"
- >
- <xsd:annotation>
- <xsd:appinfo>
- <das:source
- name='maarch_entreprise'
- type='database'
- driver='postgresql'
- host='##databaseserver##'
- port='##databaseserverport##'
- dbname='##databasename##'
- user='##databaseuser##'
- password='##databasepassword##' />
- </xsd:appinfo>
- </xsd:annotation>
-</xsd:schema>
diff --git a/modules/visa/lang/en.php b/modules/visa/lang/en.php
index 5a1eb2e39f87caa739cb99cb597a43c415d6214e..5cac2aacaf1ab69567d875bc37894659e7382cd5 100755
--- a/modules/visa/lang/en.php
+++ b/modules/visa/lang/en.php
@@ -174,10 +174,6 @@ if (!defined('_DISPLAY_ATTACHMENTS')) {
}
/***** Signature Book *****/
-if (!defined('_DRAG_N_DROP_CHANGE_ORDER')) {
- define('_DRAG_N_DROP_CHANGE_ORDER', 'Drag/Drop to change order');
-}
-
if (!defined('_NO_USER_SIGNED_DOC')) {
define('_NO_USER_SIGNED_DOC', 'you have NOT signed any attachment!');
}
diff --git a/modules/visa/lang/fr.php b/modules/visa/lang/fr.php
index 5b2f4b539cb91900c8e7b0f835876bf3907a2ca9..544797a1c06d7a5175bbd69794a0a2a91f023540 100755
--- a/modules/visa/lang/fr.php
+++ b/modules/visa/lang/fr.php
@@ -292,34 +292,10 @@ if (!defined('_PARAMETER')) {
define('_PARAMETER', 'paramÃĻtre');
}
-if (!defined('_ID_IS_EMPTY_CONTROLLER')) {
- define('_ID_IS_EMPTY_CONTROLLER', 'L\'identifiant est vide');
-}
-
-if (!defined('_PARAM_CREATED_SUCCESS')) {
- define('_PARAM_CREATED_SUCCESS', 'ParamÃĻtre crÃĐÃĐ avec succÃĻs');
-}
-
-if (!defined('_PARAM_UPDATED_SUCCESS')) {
- define('_PARAM_UPDATED_SUCCESS', 'Mise à jour effectuÃĐe');
-}
-
if (!defined('_DELETE_CONFIRM')) {
define('_DELETE_CONFIRM', 'Voulez-vous vraiment supprimer le paramÃĻtre');
}
-if (!defined('_CONTROL_TECHNICAL_PARAMS')) {
- define('_CONTROL_TECHNICAL_PARAMS', 'ContrÃīler les paramÃĻtres techniques');
-}
-
-if (!defined('_DRAG_N_DROP_CHANGE_ORDER')) {
- define('_DRAG_N_DROP_CHANGE_ORDER', 'Glisser/dÃĐposer pour modifier l\'ordre du circuit');
-}
-
-if (!defined('_DRAG_N_DROP_CHANGE_ORDER')) {
- define('_DRAG_N_DROP_CHANGE_ORDER', 'Glisser/dÃĐposer pour modifier l\'ordre du circuit');
-}
-
if (!defined('_NO_USER_SIGNED_DOC')) {
define('_NO_USER_SIGNED_DOC', "vous n'avez PAS signÃĐ de piÃĻce jointe !");
}
diff --git a/modules/visa/lang/nl.php b/modules/visa/lang/nl.php
index 2289ad326587e5dd7bbccb4a958b6924cf417688..64469bd5985538c2fe74e66210eb4665c4417c8c 100755
--- a/modules/visa/lang/nl.php
+++ b/modules/visa/lang/nl.php
@@ -230,27 +230,9 @@ if (!defined('_PREVIOUS')) {
if (!defined('_PARAMETER')) {
define('_PARAMETER', 'instelling');
}
-if (!defined('_ID_IS_EMPTY_CONTROLLER')) {
- define('_ID_IS_EMPTY_CONTROLLER', 'De gebruikersnaam is leeg');
-}
-if (!defined('_PARAM_CREATED_SUCCESS')) {
- define('_PARAM_CREATED_SUCCESS', 'Instelling met succes aangemaakt');
-}
-if (!defined('_PARAM_UPDATED_SUCCESS')) {
- define('_PARAM_UPDATED_SUCCESS', 'Update uitgevoerd');
-}
if (!defined('_DELETE_CONFIRM')) {
define('_DELETE_CONFIRM', 'Wilt u de instelling echt verwijderen');
}
-if (!defined('_CONTROL_TECHNICAL_PARAMS')) {
- define('_CONTROL_TECHNICAL_PARAMS', 'De technische instellingen controleren');
-}
-if (!defined('_DRAG_N_DROP_CHANGE_ORDER')) {
- define('_DRAG_N_DROP_CHANGE_ORDER', 'Slepen/neerzetten om de circuitvolgorde te wijzigen');
-}
-if (!defined('_DRAG_N_DROP_CHANGE_ORDER')) {
- define('_DRAG_N_DROP_CHANGE_ORDER', 'Slepen/neerzetten om de circuitvolgorde te wijzigen');
-}
if (!defined('_NO_USER_SIGNED_DOC')) {
define('_NO_USER_SIGNED_DOC', 'U heeft de bijlage NIET ondertekend!');
}