diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php index 9a9ee0a8bd99713a8bfa5cf6d355e3860eff778b..80932cf88a80d3191cd57d653dc39495491e4b97 100755 --- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php +++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php @@ -514,39 +514,6 @@ abstract class business_app_tools_Abstract extends Database } } - public function compare_base_version($xmlVersionBase) - { - // Compare version value beetwen version base xml file and version base - // value in the database - $xmlBase = simplexml_load_file($xmlVersionBase); - //Find value in the xml database_version tag - if ($xmlBase) { - $versions = explode('.', (string)$xmlBase->version); - $_SESSION['maarch_entreprise']['xml_versionbase'] = "{$versions[0]}.{$versions[1]}"; - } else { - $_SESSION['maarch_entreprise']['xml_versionbase'] = 'none'; - } - $checkBase = new Database(); - $query = "SELECT param_value_string FROM " . PARAM_TABLE - . " WHERE id = 'database_version'"; - - $stmt = $checkBase->query($query); //Find value in parameters table on database - if ($stmt->rowCount() == 0) { - $_SESSION['maarch_entreprise']['database_version'] = "none"; - } else { - $vbg = $stmt->fetchObject(); - $_SESSION['maarch_entreprise']['database_version'] = $vbg->param_value_string; - } - //If this two parameters is not find, this is the end of this function - if ($_SESSION['maarch_entreprise']['xml_versionbase'] <> 'none') { - if (($_SESSION['maarch_entreprise']['xml_versionbase'] <> $_SESSION['maarch_entreprise']['database_version']) - || ($_SESSION['maarch_entreprise']['database_version'] == 'none') - ) { - $_SESSION['error'] .= _VERSION_BASE_AND_XML_BASEVERSION_NOT_MATCH. "(".$_SESSION['maarch_entreprise']['xml_versionbase']."/".$_SESSION['maarch_entreprise']['database_version'].")"; - } - } - } - public function load_features($xmlFeatures) { $_SESSION['features'] = array(); @@ -700,7 +667,7 @@ abstract class business_app_tools_Abstract extends Database file_exists( 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] . DIRECTORY_SEPARATOR . $listName.'.php' - ) + ) ) { $pathToList = $_SESSION['config']['businessappurl'] . 'index.php?display=true&page='. $listName; @@ -721,14 +688,14 @@ abstract class business_app_tools_Abstract extends Database } else { if ( file_exists( - $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR + $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'modules' . DIRECTORY_SEPARATOR . $listModule . DIRECTORY_SEPARATOR . $listName . '.php' - ) || + ) || file_exists( 'modules' . DIRECTORY_SEPARATOR . $listModule . DIRECTORY_SEPARATOR . $listName . '.php' - ) + ) ) { $pathToList = $_SESSION['config']['businessappurl'] . 'index.php?display=true&page=' . $listName diff --git a/apps/maarch_entreprise/class/class_indexing_searching_app.php b/apps/maarch_entreprise/class/class_indexing_searching_app.php deleted file mode 100755 index cf302a8ad419dd931c9dfac9c67579a434a97939..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_indexing_searching_app.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php - -/* - * - * Copyright 2005-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/>. - */ - -/** -* modules tools Class for workflow -* -* Contains all the functions to load modules tables for workflow -* -* @package maarch -* @version 3.0 -* @since 10/2005 -* @license GPL v3 -* @author Laurent Giovannoni <dev@maarch.org> -* -*/ - -require_once 'apps/'. $_SESSION['config']['app_id'] .'/class/class_indexing_searching_app_Abstract.php'; - -class indexing_searching_app extends indexing_searching_app_Abstract -{ - // custom -} diff --git a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php deleted file mode 100755 index 464139a244d5c2aa56990f06561f9e59ac633fff..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php +++ /dev/null @@ -1,255 +0,0 @@ -<?php -/** -* Copyright Maarch since 2008 under licence GPLv3. -* See LICENCE.txt file at the root folder for more details. -* This file is part of Maarch software. - -* -* @brief class_indexing_searching_app_Apstract -* -* @author dev <dev@maarch.org> -* @ingroup apps -*/ -abstract class indexing_searching_app_Abstract extends Database -{ - public function __construct() - { - parent::__construct(); - } - - public function send_criteria_data($param) - { - /*list_criteres = Array ("num_courrier" => Array (label => "reference courrier', - parametres => Array ( ...), - type => "text", - ), - "date courrier" => array*/ - // $this->show_array($param); - $options_criteria_list = '<option id="default" value="">'._CHOOSE_PARAMETERS.'</option>'; - - $json_tab = ''; - foreach ($param as $key => $value) { - $json_tab .= "'".$key."' : {"; - //echo 'key '.$key."<br/>val "; - //$this->show_array($value); - if ($value['param']['autocompletion']) { - $idListByName = $key.'ListByName'; - $autocompleteId = 'ac_'.$key; - $options_criteria_list .= '<option id="option_'.$key.'" value="'.$value['label'].'" data-load={"id":"'.$key.'","idList":"'.$idListByName.'","autocompleteId":"'.$autocompleteId.'","config":"'.$_SESSION['config']['businessappurl'].'"} > '.$value['label'].'</option>'; - } else { - $options_criteria_list .= '<option id="option_'.$key.'" value="'.$value['label'].'"> '.$value['label'].'</option>'; - } - $json_tab .= $this->json_line($key, $value['type'], $value['param']); - $json_tab .= '} - ,'; - } - $json_tab = preg_replace('/,$/', '', $json_tab); - - $tab = array($options_criteria_list, $json_tab); - - return $tab; - } - - public function json_line($id, $field_type, $param) - { - $str = ''; - $init = "'label' : '".addslashes($param['field_label'])."', 'value' :'"; - $end = "'"; - //$hidden = '<input type="hidden" name="meta[]" value="" />'; - if ($field_type == 'input_text') { - if ($param['autocompletion']) { - $idListByName = $id.'ListByName'; - $autocompleteId = 'ac_'.$id; - $str = $init.'<input type="hidden" name="meta[]" value="'.$id.'#'.$id.'#input_text"/>'; - $str .= '<input name="'.$id.'" id="'.$id.'" type="text" '.$param['other'].' value="" onkeyup="erase_contact_external_id('."\'".$id."\'".','."\'".$autocompleteId."\'".')"/>'; - $str .= '<div id="'.$idListByName.'" class="autocomplete"></div>'; - $str .= '<script type="text/javascript">'; - $str .= 'initList_hidden_input("'.$id.'", "'.$idListByName.'","'.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=users_list_by_name_search", "what", "2", "'.$autocompleteId.'");</script>'; - $str .= '<input id="'.$autocompleteId.'" name="'.$autocompleteId.'" type="hidden" />'.$end; - } else { - $str = $init.'<input type="hidden" name="meta[]" value="'.$id.'#'.$id.'#input_text" /><input name="'.$id.'" id="'.$id.'" type="text" '.$param['other'].' value="" />'.$end; - } - } elseif ($field_type == 'textarea') { - $str = $init.'<input type="hidden" name="meta[]" value="'.$id.'#'.$id.'#textarea" /><textarea name="'.$id.'" id="'.$id.'" '.$param['other'].' rows="2" style="display:block;width:530px;"></textarea>'.$end; - } elseif ($field_type == 'date_range') { - $str = $init.addslashes(_SINCE).' : <input type="text" name="'.$param['id1'].'" id="'.$param['id1'].'" value="" onclick="showCalender(this);" /> ' - .addslashes(_FOR).' : <input type="text" name="'.$param['id2'].'" id="'.$param['id2'].'" value="" onclick="showCalender(this);" />'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$param['id1'].','.$param['id2'].'#date_range" />'.$end; - } elseif ($field_type == 'num_range') { - $str = $init.addslashes(_NUM_BETWEEN).' : <input type="text" name="'.$param['id1'].'" id="'.$param['id1'].'" value=""/ > ' - .addslashes(_AND).' : <input type="text" name="'.$param['id2'].'" id="'.$param['id2'].'" value="" / >'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$param['id1'].','.$param['id2'].'#num_range" />'.$end; - } elseif ($field_type == 'select_simple') { - $str = $init.'<select name="'.$id.'" id="'.$id.'">'; - if (isset($param['default_label']) && !empty($param['default_label'])) { - $str .= '<option value="">'.$param['default_label'].'</option>'; - } - for ($i = 0; $i < count($param['options']); ++$i) { - $str .= '<option value="'.addslashes($param['options'][$i]['VALUE']).'" alt="'.addslashes($param['options'][$i]['LABEL']).'" title="'.addslashes($param['options'][$i]['LABEL']).'">'.addslashes($param['options'][$i]['LABEL']).'</option>'; - } - $str .= '</select>'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$id.'#select_simple" />'.$end; - } elseif ($field_type == 'select_multiple') { - $str .= '<tr><td colspan="3">'.$param['label_title'].' :</td></tr>'; - $str .= '<tr>'; - $str .= '<td width="150" align="left">'; - $str .= '<select name="'.$param['id'].'_available[]" id="'.$param['id'].'_available" size="10" ondblclick="moveclick_ext('." '".$param['id']."_available', '".$param['id']."_chosen'".');" multiple="multiple" >'; - for ($i = 0; $i < count($param['options']); ++$i) { - $str .= '<option value="'.$param['options'][$i]['VALUE'].'" alt="'.addslashes($param['options'][$i]['LABEL']) - .'" title="'.addslashes($param['options'][$i]['LABEL']).'" '; - if (isset($param['options'][$i]['CLASS'])) { - $str .= ' class="'.$param['options'][$i]['CLASS'].'" '; - } - $str .= '>'.$param['options'][$i]['LABEL'].'</option>'; - } - $str .= '</select>'; - $str .= "<br/><em><a href=\"javascript:selectall_ext( '".$param['id']."_available');\" >"._SELECT_ALL.'</a></em>'; - $str .= '</td>'; - $str .= '<td width="135" align="center">'; - $str .= '<input type="button" class="button" value="'._ADD.'" onclick="Move_ext('."'".$param['id']."_available', '".$param['id']."_chosen'".');" /><br />'; - $str .= '<br /><input type="button" class="button" value="'._REMOVE.'" onclick="Move_ext('." '".$param['id']."_chosen', '".$param['id']."_available'".');" />'; - $str .= '</td>'; - $str .= '<td width="150" align="left">'; - $str .= '<select name="'.$param['id'].'_chosen[]" id="'.$param['id'].'_chosen" size="10" ondblclick="moveclick_ext('." '".$param['id']."_chosen', '".$param['id']."_available'".');" multiple="multiple" " >'; - $str .= '</select>'; - $str .= "<br/><em><a href=\"javascript:selectall_ext( '".$param['id']."_chosen');\" >"._SELECT_ALL.'</a></em>'; - $str .= '</td>'; - $str .= '</tr>'; - $str = addslashes($str); - $str = $init.'<table align="center" border="0" width="100%" >'.$str.'<input type="hidden" name="meta[]" value="'.$id.'#'.$param['id'].'_chosen#select_multiple" /></table>'.$end; - } elseif ($field_type == 'checkbox') { - $str = $init.'<table align="center" border="0" width="100%" >'; - - $tmp_ids = ''; - for ($i = 0; $i < count($param['checkbox_data']); $i = $i + 2) { - $tmp_ids .= $param['checkbox_data'][$i]['ID'].','; - $str .= '<tr>'; - if (isset($param['checkbox_data'][$i + 1]['ID'])) { - $tmp_ids .= $param['checkbox_data'][$i + 1]['ID'].','; - $str .= '<td><input type="checkbox" class="check" name="'.$param['checkbox_data'][$i]['ID'].'" id="'.$param['checkbox_data'][$i]['ID'].'" value="'.addslashes($param['checkbox_data'][$i]['VALUE']).'" />'.addslashes($param['checkbox_data'][$i]['LABEL']).'</td>'; - $str .= '<td><input type="checkbox" class="check" name="'.$param['checkbox_data'][$i + 1]['ID'].'" id="'.$param['checkbox_data'][$i + 1]['ID'].'" value="'.addslashes($param['checkbox_data'][$i + 1]['VALUE']).'" />'.addslashes($param['checkbox_data'][$i + 1]['LABEL']).'</td>'; - } else { - $str .= '<td colspan="2"><input type="checkbox" class="check" name="'.$param['checkbox_data'][$i]['ID'].'" id="'.$param['checkbox_data'][$i]['ID'].'" value="'.addslashes($param['checkbox_data'][$i]['VALUE']).'" />'.addslashes($param['checkbox_data'][$i]['LABEL']).'</td>'; - } - $str .= '</tr>'; - } - $tmp_ids = preg_replace('/,$/', '', $tmp_ids); - $str .= '</table>'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$tmp_ids.'#checkbox" />'.$end; - } elseif ($field_type == 'address') { - $str = $init.'<input type="hidden" name="meta[]" value="'.$id.'#'.$param['address_data']['NUM']['ID'].','.$param['address_data']['ROAD']['ID'].','.$param['address_data']['CP']['ID'].','.$param['address_data']['CITY']['ID'].','.$param['address_data']['DISTRICTS']['ID'].'#address" />'; - $str .= '<table align="center" border="0" width="100%" >'; - $str .= '<tr>'; - $str .= '<td>'.$param['address_data']['NUM']['LABEL'].'</td><td><input type="text" name="'.$param['address_data']['NUM']['ID'].'" id="'.$param['address_data']['NUM']['ID'].'" class="small"/></td>'; - $str .= '<td>'.$param['address_data']['ROAD']['LABEL'].'</td><td><input type="text" name="'.$param['address_data']['ROAD']['ID'].'" id="'.$param['address_data']['ROAD']['ID'].'" /></td>'; - $str .= '</tr>'; - $str .= '<tr>'; - $str .= '<td>'.$param['address_data']['CP']['LABEL'].'</td><td><input type="text" name="'.$param['address_data']['CP']['ID'].'" id="'.$param['address_data']['CP']['ID'].'" class="medium" maxlength="5"/></td>'; - $str .= '<td>'.$param['address_data']['CITY']['LABEL'].'</td><td><input type="text" name="'.$param['address_data']['CITY']['ID'].'" id="'.$param['address_data']['CITY']['ID'].'" /></td>'; - $str .= '</tr>'; - if (isset($param['address_data']['DISTRICTS'])) { - $str .= '<tr>'; - $str .= '<td>'.$param['address_data']['DISTRICTS']['LABEL'].'</td><td colspan="3">'; - $str .= '<select name="'.$param['address_data']['DISTRICTS']['ID'].'" id="'.$param['address_data']['DISTRICTS']['ID'].'">'; - $str .= '<option value="">'.$param['address_data']['DISTRICTS']['default_label'].'</option>'; - for ($i = 0; $i < count($param['address_data']['DISTRICTS']['options']); ++$i) { - $str .= '<option value="'.$param['address_data']['DISTRICTS']['options'][$i]['VALUE'].'" >'.$param['address_data']['DISTRICTS']['options'][$i]['LABEL'].'</option>'; - } - $str .= '</select>'; - $str .= '</td>'; - $str .= '</tr>'; - } - $str .= '</table>'.$end; - } elseif ($field_type == 'simple_list_or_input_text') { - // td open in the showing function (js) - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#select_'.$param['id'].',input_'.$param['id'].'#simple_list_or_input_text" />'; - $str .= '<select name="select_'.$param['id'].'" id="select_'.$param['id'].'" onchange="start_action_list('."'".'div_'.$param['id']."', 'select_".$param['id']."', this.selectedIndex".')">'; - $str .= '<option value="">'.$param['default_label_select'].'</option>'; - $str .= '<option value="SHOW_DATA">'.$param['label_define_option'].'</option>'; - for ($i = 0; $i < count($param['options']); ++$i) { - $str .= '<option value="'.addslashes($param['options'][$i]['VALUE']).'">'.addslashes($param['options'][$i]['LABEL']).'</option>'; - } - $str .= '</select>'; - $str .= '</td>'; - $str .= '<td>'; - $str .= '<div id="div_'.$param['id'].'" style="visibility:hidden">'; - $str .= '<table width="100%" border="0">'; - $str .= '<tr>'; - $str .= '<td>'.$param['label_input'].' : <input type="text" name="input_'.$param['id'].'" id="input_'.$param['id'].'" '.$param['other'].' value="" /></td>'; - $str .= '</tr>'; - $str .= '</table>'; - $str .= '</div>'; - // td close in the showing function (js) - $str = addslashes($str); - $str = $init.$str.$end; - } elseif ($field_type == 'inputs_in_2_col') { - $str = $init.'<table align="center" border="0" width="100%" >'; - $tmp = ''; - - for ($i = 0; $i < count($param['input_ids']); ++$i) { - $tmp .= $param['input_ids'][$i]['ID'].','; - - if ($i % 2 != 1 || $i == 0) { // pair - $str .= '<tr>'; - } - $str .= '<td >'.addslashes($param['input_ids'][$i]['LABEL']).'</td><td><input type="text" name="'.$param['input_ids'][$i]['ID'].'" id="'.$param['input_ids'][$i]['ID'].'" value="" /></td>'; - if ($i % 2 == 1 && $i != 0) { // impair - echo '</tr>'; - } else { - if ($i + 1 == count($param['input_ids'])) { - echo '<td colspan="3"> </td></tr>'; - } - } - } - $tmp = preg_replace('/,$/', '', $tmp); - $str .= '</table>'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$tmp.'#inputs_in_2_col" />'.$end; - } elseif ($field_type == 'select_or_other_data') { - // td open in the showing function (js) - $str .= '<table align="center" border="0" width="100%" >'; - $str .= '<tr>'; - $str .= '<td>'; - $str .= '<select name="select_'.$param['id'].'" id="select_'.$param['id'].'" onchange="start_action_list('."'".'div_'.$param['id']."', 'select_".$param['id']."', this.selectedIndex".')">'; - $str .= '<option value="">'.$param['default_label_select'].'</option>'; - $str .= '<option value="SHOW_DATA">'.$param['label_define_option'].'</option>'; - for ($i = 0; $i < count($param['options']); ++$i) { - $str .= '<option value="'.$param['options'][$i]['VALUE'].'">'.$param['options'][$i]['LABEL'].'</option>'; - } - $str .= '</select>'; - $str .= '</td>'; - $str .= '</tr>'; - $str .= '<tr>'; - $str .= '<td>'; - $str .= '<div id="div_'.$param['id'].'" style="display:none;">'; - $str .= '<table align="center" border="0" width="100%" >'; - $tmp = 'select_'.$param['id'].','; - for ($i = 0; $i < count($param['input_ids']); ++$i) { - $tmp .= $param['input_ids'][$i]['ID'].','; - if ($i % 2 != 1 || $i == 0) { // pair - $str .= '<tr>'; - } - $str .= '<td >'.$param['input_ids'][$i]['LABEL'].' :</td><td><input type="text" name="'.$param['input_ids'][$i]['ID'].'" id="'.$param['input_ids'][$i]['ID'].'" value="" /></td>'; - if ($i % 2 == 1 && $i != 0) { // impair - echo '</tr>'; - } else { - if ($i + 1 == count($param['input_ids'])) { - echo '<td colspan="3"> </td></tr>'; - } - } - } - $tmp = preg_replace('/,$/', '', $tmp); - $str .= '</table>'; - $str .= '</div>'; - $str .= '<input type="hidden" name="meta[]" value="'.$id.'#'.$tmp.'#select_or_other_data" />'; - $str .= '</td>'; - $str .= '</tr>'; - $str .= '</table>'; - // td close in the showing function (js) - $str = addslashes($str); - $str = $init.$str.$end; - } else { - } - - return $str; - } -} diff --git a/apps/maarch_entreprise/class/class_login.php b/apps/maarch_entreprise/class/class_login.php deleted file mode 100755 index 4aaa3f5f28c47c90199a24b6376f9d04ce2e2537..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_login.php +++ /dev/null @@ -1,40 +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/>. - */ - -/** -* Login Class -* -* Contains all pre-login function -* -* @package Maarch -* @version 2.1 -* @since 10/2005 -* @license GPL -* @author Loïc Vinet <dev@maarch.org> -* -*/ - -require_once 'apps/'. $_SESSION['config']['app_id'] .'/class/class_login_Abstract.php'; - -class login extends login_Abstract -{ - // custom -} \ No newline at end of file diff --git a/apps/maarch_entreprise/class/class_login_Abstract.php b/apps/maarch_entreprise/class/class_login_Abstract.php deleted file mode 100755 index b02602814f1f5089bcbd34aa39032fa2897fd88c..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_login_Abstract.php +++ /dev/null @@ -1,121 +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/>. - */ - -/** -* Login Class -* -* Contains all pre-login function -* -* @package Maarch -* @version 2.1 -* @since 10/2005 -* @license GPL -* @author Loïc Vinet <dev@maarch.org> -* -*/ - - -abstract class login_Abstract extends functions -{ - function build_login_method() - { - $pathtoxmllogin = ''; - - 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 - . 'login_method.xml' - )) { - $pathtoxmllogin = $_SESSION['config']['corepath'] . 'custom' - . DIRECTORY_SEPARATOR - . $_SESSION['custom_override_id'] - . DIRECTORY_SEPARATOR . 'apps' . DIRECTORY_SEPARATOR - . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR - . 'login_method.xml'; - } else { - $pathtoxmllogin = 'apps' . DIRECTORY_SEPARATOR - . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR - . 'login_method.xml'; - } - - $login_method = array(); - - $xmlconfig = simplexml_load_file($pathtoxmllogin); - if (! $xmlconfig) { - exit(); - } - - foreach ($xmlconfig->METHOD as $METHOD) { - $id = (string) $METHOD->ID; - $brut_label = (string) $METHOD->NAME; - $scriptname = (string) $METHOD->SCRIPT; - $activated = (string) $METHOD->ENABLED; - - array_push( - $login_method, - array( - 'ID' => $id, - 'BRUT_LABEL' => $brut_label, - 'SCRIPTNAME' => $scriptname, - 'ACTIVATED' =>$activated - ) - ); - } - - return $login_method; - } - - public function execute_login_script($array_method) - { - $tmp_engine = array(); - $_SESSION['login_method_bool'] = false; - - foreach ($array_method as $only) { - if ($only['ACTIVATED'] == 'true') { - $tmp_engine = $only; - } - } - - $script_method = $tmp_engine['SCRIPTNAME']; - - if (file_exists( - $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR - . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'apps' - . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . $script_method - )) { - include - $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR - . $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'apps' - . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . $script_method; - } else { - include - 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . $script_method; - } - } - -} \ No newline at end of file diff --git a/apps/maarch_entreprise/class/class_users.php b/apps/maarch_entreprise/class/class_users.php deleted file mode 100755 index aeebc19b4009ecca4a321626be0159cabd7eb9fc..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_users.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php - -/* -* -* Copyright 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/>. -*/ - -/** -* User Class -* -* Contains all the functions to manage users -* -* @package Maarch PeopleBox 1.0 -* @version 2.1 -* @since 10/2005 -* @license GPL -* @author Claire Figueras <dev@maarch.org> -* -*/ - -require_once 'apps/'. $_SESSION['config']['app_id'] .'/class/class_users_Abstract.php'; - -class class_users extends class_users_Abstract -{ - // custom -} - diff --git a/apps/maarch_entreprise/class/class_users_Abstract.php b/apps/maarch_entreprise/class/class_users_Abstract.php deleted file mode 100755 index 8dd66662c822c4e9eff6592d0047f2f03ff35378..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/class/class_users_Abstract.php +++ /dev/null @@ -1,105 +0,0 @@ -<?php - -/* -* -* Copyright 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/>. -*/ - -/** -* User Class -* -* Contains all the functions to manage users -* -* @package Maarch -* @version 2.1 -* @since 10/2005 -* @license GPL -* -*/ - -require_once 'core/core_tables.php'; - -abstract class class_users_Abstract extends Database -{ - /** - * Redefinition of the user object constructor : configure the SQL argument - * order by - */ - public function __construct() - { - parent::__construct(); - } - - /** - * Return a array of user informations - * - */ - public function get_user($user_id) - { - require_once "modules" . DIRECTORY_SEPARATOR . "visa" . DIRECTORY_SEPARATOR. "class" . DIRECTORY_SEPARATOR. "class_user_signatures.php"; - $us = new UserSignatures(); - if (!empty($user_id)) { - $db = new Database(); - $stmt = $db->query( - "SELECT user_id, firstname, lastname, mail, phone, status/*, signature_path, signature_file_name*/ FROM " - . USERS_TABLE . " WHERE user_id = ?", - array($user_id) - ); - if ($stmt->rowCount() >0) { - $line = $stmt->fetchObject(); - /* MODIFICATION POUR LES SIGNATURES */ - - $query = "SELECT path_template FROM " - . _DOCSERVERS_TABLE_NAME - . " WHERE docserver_id = 'TEMPLATES'"; - $stmt = $db->query($query); - $resDs = $stmt->fetchObject(); - $pathToDs = $resDs->path_template; - - $tab_sign = $us->getForUser($line->user_id); - $pathToSignature = array(); - foreach ($tab_sign as $sign) { - $path = $pathToDs . str_replace( - "#", - DIRECTORY_SEPARATOR, - $sign['signature_path'] - ) - . $sign['signature_file_name']; - array_push($pathToSignature, $path); - } - - $user = array( - 'id' => $line->user_id, - 'firstname' => $this->show_string($line->firstname), - 'lastname' => $this->show_string($line->lastname), - 'mail' => $line->mail, - 'phone' => $line->phone, - 'status' => $line->status, - 'signature_path' => $line->signature_path, - 'signature_file_name' => $line->signature_file_name, - 'pathToSignature' => $pathToSignature, - ); - return $user; - } else { - return false; - } - } else { - return false; - } - } -} diff --git a/apps/maarch_entreprise/xml/IVS/data_types.xml b/apps/maarch_entreprise/xml/IVS/data_types.xml deleted file mode 100755 index f2da1573a8aa6930707757b3f5dbf157ff8410b7..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/IVS/data_types.xml +++ /dev/null @@ -1,141 +0,0 @@ - <dataTypes> - <dataType name="identifier" base="string"> - <!-- pattern value="/^\w+$/" / --> - <pattern value="/^[\w.@-]*$/" /> - </dataType> - <dataType name="login" base="graph"> - <!--pattern value="/^\w+$/" /--> - <pattern value="/^[\w.@-]*$/" /> - </dataType> - <dataType name="datefr" base="graph"> - <pattern value="/^(?:(?:31(\/|-|\.)(?:0?[13578]|1[02]))\1|(?:(?:29|30)(\/|-|\.)(?:0?[1,3-9]|1[0-2])\2))(?:(?:1[6-9]|[2-9]\d)?\d{2})$|^(?:29(\/|-|\.)0?2\3(?:(?:(?:1[6-9]|[2-9]\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\d|2[0-8])(\/|-|\.)(?:(?:0?[1-9])|(?:1[0-2]))\4(?:(?:1[6-9]|[2-9]\d)?\d{2})$/" /> - </dataType> - <dataType name="safetext" base="string"> - <pattern value="/^[\w~@'";^*\s()+[\]{}|\\,.?: -à áâãäåçèéêëìÃîïðòóôõöùúûüýÿ]*$/" /> - </dataType> - <dataType name="ajax_ids" base="graph"> - <pattern value="/^[\w#-]+$/" /> - </dataType> - <dataType name="hex" base="graph"> - <pattern value="/^[A-Fa-f0-9]+$/" /> - </dataType> - <dataType name="ipv6" base="graph"> - <pattern value="/^[A-Fa-f0-9:]+$/" /> - </dataType> - <dataType name="order" base="string"> - <enumeration value="asc" /> - <enumeration value="desc" /> - </dataType> - <dataType name="YN" base="string"> - <enumeration value="Y" /> - <enumeration value="N" /> - </dataType> - <dataType name="YesNO" base="string"> - <enumeration value="yes" /> - <enumeration value="no" /> - </dataType> - <dataType name="mode" base="string"> - <enumeration value="add" /> - <enumeration value="up" /> - <enumeration value="list" /> - <enumeration value="del" /> - <enumeration value="page" /> - <enumeration value="normal" /> - <enumeration value="popup" /> - <enumeration value="ban" /> - <enumeration value="allow" /> - <enumeration value="adress" /> - <enumeration value="view" /> - <enumeration value="read" /> - <enumeration value="added" /> - <enumeration value="updated" /> - <enumeration value="transfer" /> - <enumeration value="set" /> - <enumeration value="mass" /> - <enumeration value="search" /> - <enumeration value="destUser" /> - <enumeration value="download" /> - <enumeration value="editDetailSender" /> - <enumeration value="editDetail" /> - </dataType> - <dataType name="size" base="string"> - <enumeration value="full" /> - <enumeration value="medium" /> - </dataType> - <dataType name="collection_list" base="string"> - <enumeration value="letterbox_coll" /> - <enumeration value="attachments_coll" /> - <enumeration value="attachments_version_coll" /> - <enumeration value="business_coll" /> - <enumeration value="res_coll" /> - <enumeration value="apa_coll" /> - <enumeration value="templates" /> - <enumeration value="archive_transfer_coll" /> - </dataType> - <dataType name="res_table_list" base="string"> - <enumeration value="res_letterbox" /> - <enumeration value="res_business" /> - <enumeration value="res_attachments" /> - <enumeration value="business_coll_ext" /> - <enumeration value="folders" /> - </dataType> - <dataType name="res_view_table_list" base="string"> - <enumeration value="res_view_letterbox" /> - <enumeration value="res_letterbox" /> - </dataType> - <dataType name="category_list" base="string"> - <enumeration value="incoming" /> - <enumeration value="outgoing" /> - <enumeration value="internal" /> - <enumeration value="ged_doc" /> - <enumeration value="attachment" /> - </dataType> - <dataType name="contact_user_list" base="string"> - <enumeration value="contacts" /> - <enumeration value="users" /> - <enumeration value="multi" /> - </dataType> - <dataType name="personname" base="string"> - <pattern value="/^[0-9\A-z\s\-\'\é\è\ê\ë\ï\ö\ç\ä\ü\É\È\Ê\Ë\Ã\Ö\Ç\Ä\Ü]+$/" /> - </dataType> - <dataType name="short_word" base="word"> - <pattern value="/^\w{1,5}$/" /> - </dataType> - <dataType name="word" base="string"> - <pattern value="/^\w+$/" /> - </dataType> - <dataType name="arrayOfStrings" base="string" /> - <dataType name="phone" base="string"> - <pattern value="/^[0-9\-\+\.\(\) ]{2,20}$/" /> - </dataType> - <dataType name="filename" base="graph"> - <pattern value="/^[\w\-.]+$/" /> - </dataType> - <dataType name="keyword_id" base="string"> - <pattern value="/^[\w ]+$/" /> - </dataType> - <dataType name="document_id" base="string"> - <pattern value="/^[\w: ]+$/" /> - </dataType> - <dataType name="docserver_file" base="string"> - <pattern value="/^[A-z0-9.]+$/" /> - </dataType> - <dataType name="docserver_path" base="string"> - <pattern value="/^[0-9#]+$/" /> - </dataType> - <dataType name="alnumSpace" base="string"> - <pattern value="/^[A-z0-9 -]+$/" /> - </dataType> - <dataType name="NumComma" base="string"> - <pattern value="/^[0-9,]+$/" /> - </dataType> - <dataType name="identifierPoint" base="graph"> - <pattern value="/^[\w.]+$/" /> - </dataType> - <dataType name="filename_secure" base="string"> - <pattern value="/^[A-z0-9._$]+$/" /> - </dataType> - <dataType name="filename_extension" base="string"> - <pattern value="/\.[0-9a-z]{1,5}$/i" /> - </dataType> - </dataTypes> diff --git a/apps/maarch_entreprise/xml/IVS/requests_definitions.xml b/apps/maarch_entreprise/xml/IVS/requests_definitions.xml deleted file mode 100755 index ea64b4b51d3cf9de65365f2fc69410a6d10601a8..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/IVS/requests_definitions.xml +++ /dev/null @@ -1,328 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inputValidation xmlns:xi="http://www.w3.org/2001/XInclude"> - <!-- - Request definitions - Used to identify the request and bind a validation rule set - --> - <requestDefinitions> - <!-- APPS PART --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="index" /> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="index" /> - - <!-- Admin user --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_ajax_search" > - <parameter name="admin" value="users"/> - <parameter name="page" value="users_list_by_name_search"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <!-- Admin architecture --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_structure" > - <parameter name="page" value="structure_up"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="only_id" > - <parameter name="page" value="structure_del"/> - <parameter name="display" value="true"/> - <parameter name="id"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_structures" > - <parameter name="page" value="structures"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_ajax_search" > - <parameter name="page" value="structures_list_by_name"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_subfolder_up" > - <parameter name="page" value="subfolder_up"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="only_id" > - <parameter name="page" value="subfolder_del"/> - <parameter name="display" value="true"/> - <parameter name="id"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_structures" > - <parameter name="page" value="subfolders"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_ajax_search" > - <parameter name="page" value="subfolders_list_by_name"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="only_collection" > - <parameter name="page" value="get_index"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_ajax_search" > - <parameter name="page" value="types_list_by_name"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="only_id" > - <parameter name="page" value="types_up"/> - <parameter name="id"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="only_id" > - <parameter name="page" value="types_del"/> - <parameter name="id"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="admin_types_up_db" > - <parameter name="page" value="types_up_db"/> - </requestDefinition> - - <!-- indexing_searching --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="addresses_list" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="addresses_list"/> - <parameter name="display" value="true"/> - <parameter name="selectedObject"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="choose_file" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="choose_file"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="indexing_searching_id" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="details"/> - <parameter name="id"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="document_list_indexing" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="documents_list_mlb_search_adv"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="multiLink" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="multiLink"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="manage_query" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="manage_query"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <!-- search_adv --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="search_adv_result" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="search_adv_result"/> - <parameter name="display" value="true"/> - </requestDefinition> - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="view_resource" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="view_resource_controler"/> - <parameter name="display" value="true"/> - <parameter name="id" /> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="search_contacts_result" > - <parameter name="dir" value="indexing_searching"/> - <parameter name="page" value="search_contacts_result"/> - </requestDefinition> - - <!-- My contacts --> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="contactid" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="put_in_session"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="last_contact" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="get_last_contact_address"/> - <parameter name="display" value="false"/> - <parameter name="addressid"/> - <parameter name="contactid"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="check_contact_purpose" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="purpose_check"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="getContacts" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="getContacts"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="info_contact_iframe" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="info_contact_iframe"/> - <parameter name="display" value="false"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="addresses_list" > - <parameter name="dir" value="my_contacts"/> - <parameter name="page" value="my_contacts"/> - <parameter name="display" value="true"/> - <parameter name="selectedObject"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="my_contact_del" > - <parameter name="page" value="my_contact_del"/> - <parameter name="dir" value="my_contacts"/> - <parameter name="id"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="my_contact_del" > - <parameter name="page" value="my_contact_del"/> - <parameter name="dir" value="my_contacts"/> - <parameter name="id"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="contacts_v2_up_db" > - <parameter name="page" value="my_contact_up_db"/> - <parameter name="dir" value="my_contacts"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="indexing_searching_id" > - <parameter name="page" value="my_contact_up"/> - <parameter name="dir" value="my_contacts"/> - <parameter name="id"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="indexing_searching_id" > - <parameter name="page" value="update_address_iframe"/> - <parameter name="display" value="false"/> - <parameter name="id"/> - </requestDefinition> - - <!-- login --> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="login" > - <parameter name="page" value="log"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="add_links" > - <parameter name="page" value="add_links"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="res_id_master" > - <parameter name="page" value="loadRepList"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="identifier_integer" > - <parameter name="page" value="loadNoteList"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="only_id" > - <parameter name="page" value="print"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="users_autocomplete_list" > - <parameter name="page" value="users_autocomplete_list"/> - <parameter name="display" value="true"/> - <parameter name="Input"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="url_path" > - <parameter name="page" value="documents_list_with_attachments"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="url_path" > - <parameter name="page" value="documents_list_copies"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="static_filename" > - <parameter name="filename" value="static"/> - <parameter name="display" value="true"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="static_filename" > - <parameter name="filename" value="static"/> - </requestDefinition> - - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="static_filename" > - <parameter name="filename" value="static"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="static_filename" > - <parameter name="filename" value="static"/> - </requestDefinition> - - <requestDefinition method="GET" path="/apps/maarch_entreprise/index.php" validationRule="static_filename" > - <parameter name="page" value="static"/> - <parameter name="display" value="true"/> - <parameter name="filename"/> - </requestDefinition> - - <!-- CORE PART --> - <xi:include href="../../../../core/xml/IVS/requests_definitions.xml"/> - <!-- MODULES PART --> - <xi:include href="../../../../modules/attachments/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/basket/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/content_management/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/entities/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/ldap/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/life_cycle/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/notes/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/sendmail/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/tags/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/templates/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/visa/xml/IVS/requests_definitions.xml"/> - <xi:include href="../../../../modules/avis/xml/IVS/requests_definitions.xml"/> - </requestDefinitions> - <!-- - Validation rule sets - Each gives a set of request parameters that can be checked - with a type name that refers to defined types or an inline definition - --> - <validationRules> - <!-- APPS PART --> - <xi:include href="validation_rules.xml"/> - <!-- CORE PART --> - <xi:include href="../../../../core/xml/IVS/validation_rules.xml"/> - <!-- MODULES PART --> - <xi:include href="../../../../modules/attachments/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/basket/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/content_management/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/entities/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/ldap/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/life_cycle/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/notes/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/sendmail/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/tags/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/templates/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/visa/xml/IVS/validation_rules.xml"/> - <xi:include href="../../../../modules/avis/xml/IVS/validation_rules.xml"/> - </validationRules> - <!-- - Validation rule sets - Each gives a set of request parameters that can be checked - with a type name that refers to defined types or an inline definition - --> - <dataTypes> - <!-- APPS PART --> - <xi:include href="data_types.xml"/> - <!-- CORE PART --> - <xi:include href="../../../../core/xml/IVS/data_types.xml"/> - <!-- MODULES PART --> - <xi:include href="../../../../modules/attachments/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/basket/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/content_management/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/entities/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/ldap/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/life_cycle/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/notes/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/sendmail/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/tags/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/templates/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/visa/xml/IVS/data_types.xml"/> - <xi:include href="../../../../modules/avis/xml/IVS/data_types.xml"/> - </dataTypes> -</inputValidation> diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml deleted file mode 100755 index 6b8acc5aaa606aca2dcac63ce5b392525e485385..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml +++ /dev/null @@ -1,465 +0,0 @@ -<validationRules> - <validationRule name="index" mode="lax"> - <parameter name="admin" type="string" /> - <parameter name="page" type="string" /> - <parameter name="order" type="order" /> - <parameter name="start" type="integer" /> - <parameter name="display" type="boolean" /> - <parameter name="reinit" type="boolean" /> - <parameter name="what" type="string" /> - <parameter name="order_field" type="identifier" /> - <parameter name="module" type="identifier" /> - <parameter name="level" type="identifier" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="ajax_form_values" extends="standardForm" mode="error"> - <parameter name="form_values" type="string" /> - </validationRule> - - <validationRule name="ajax_usergroups_ids" mode="error"> - <parameter name="usergroups" type="ajax_ids" /> - <parameter name="display" type="identifier" /> - <parameter name="admin" type="identifier" /> - <parameter name="page" type="identifier" /> - </validationRule> - - <validationRule name="admin_ajax_search" extends="standardForm" mode="error"> - <parameter name="what" type="string" /> - <parameter name="idContact" type="integer" /> - </validationRule> - - <validationRule name="contact_id" extends="standardForm" mode="error"> - <parameter name="contact_id" type="integer" /> - </validationRule> - - <validationRule name="admin_types_up_db" extends="standardForm" mode="error"> - <parameter name="Submit" type="string" /> - <parameter name="collection" type="collection_list" /> - <parameter name="delay1" type="integer" /> - <parameter name="delay2" type="integer" /> - <parameter name="e_file" type="YN" /> - <parameter name="id" type="integer" /> - <parameter name="idbis" type="integer" /> - <parameter name="label" type="string" /> - <parameter name="process_delay" type="integer" /> - <parameter name="process" type="string" /> - <parameter name="sous_dossier" type="integer" /> - <parameter name="template" type="string" /> - <parameter name="templates" type="integer" /> - <parameter name="fields" type="identifier" /> - <parameter name="fields_attachments" type="identifier" /> - <parameter name="mandatory_fields" type="identifier" /> - <parameter name="retention_final_disposition" type="string" /> - <parameter name="retention_rule" type="string" /> - <parameter name="duration_current_use" type="integer" /> - </validationRule> - - <validationRule name="val_integer" extends="standardForm" mode="error"> - <parameter name="val" type="integer" /> - </validationRule> - - <validationRule name="security" extends="standardForm" mode="error"> - <parameter name="security" type="docserver_path" /> - </validationRule> - - <validationRule name="admin_groups" extends="standardForm" mode="error"> - <parameter name="desc" type="string" /> - <parameter name="group_id" type="identifier" /> - <parameter name="group_submit" type="string" /> - <parameter name="id" type="identifier" /> - <parameter name="services" type="string" /> - </validationRule> - - <validationRule name="admin_history" extends="standardForm" mode="error"> - <parameter name="action" type="ajax_ids" /> - <parameter name="datefin" type="datefr" /> - <parameter name="datestart" type="datefr" /> - <parameter name="module" type="identifier" /> - <parameter name="search" type="identifier" /> - <parameter name="user" type="string" /> - </validationRule> - - <validationRule name="admin_history_batch" extends="standardForm" mode="error"> - <parameter name="dateend" type="datefr" /> - <parameter name="datestart" type="datefr" /> - <parameter name="module" type="identifier" /> - <parameter name="search" type="identifier" /> - <parameter name="onlyerrors" type="YesNO" /> - <parameter name="admin" type="identifier" /> - </validationRule> - - <validationRule name="admin_parameters" extends="standardForm" mode="error"> - <parameter name="description" type="string" /> - <parameter name="id" type="identifier" /> - <parameter name="param_value_date" type="datefr" /> - <parameter name="param_value_int" type="integer" /> - <parameter name="param_value_string" type="string" /> - <parameter name="type" type="identifier" /> - </validationRule> - - <validationRule name="admin_reopen" extends="standardForm" mode="error"> - <parameter name="Submit" type="identifier" /> - <parameter name="id" type="integer" /> - <parameter name="ref_id" type="string" /> - <parameter name="status_id" type="identifier" /> - </validationRule> - - <validationRule name="admin_architecture" extends="standardForm" mode="error"> - <parameter name="tree_id" type="integer" /> - </validationRule> - - <validationRule name="only_id" extends="standardForm" mode="error"> - <parameter name="id" type="integer" /> - </validationRule> - - <validationRule name="only_id_string" extends="standardForm" mode="error"> - <parameter name="id" type="identifier" /> - </validationRule> - - <validationRule name="admin_structures" extends="standardForm" mode="error"> - <parameter name="what" type="string" /> - <parameter name="Submit" type="string" /> - <parameter name="selectedObject" type="string" /> - <parameter name="foldertypeslist" type="string" /> - </validationRule> - - <validationRule name="admin_structure" extends="standardForm" mode="error"> - <parameter name="ID_structure" type="integer" /> - <parameter name="css_style" type="identifier" /> - <parameter name="desc_structure" type="string" /> - <parameter name="foldertypes" type="integer" /> - <parameter name="valid" type="string" /> - </validationRule> - - <validationRule name="admin_subfolder_up" extends="standardForm" mode="error"> - <parameter name="ID_sd" type="integer" /> - <parameter name="desc_sd" type="string" /> - <parameter name="css_style" type="identifier" /> - <parameter name="structure" type="integer" /> - <parameter name="valid" type="string" /> - </validationRule> - - <validationRule name="only_collection" extends="standardForm" mode="error"> - <parameter name="coll_id" type="collection_list" /> - </validationRule> - - <validationRule name="getTreeChildrenContact" extends="standardForm" mode="error"> - <parameter name="branch" type="string" /> - <parameter name="branch_id" type="identifier" /> - <parameter name="tree_id" type="identifier" /> - </validationRule> - - <validationRule name="listContactId" extends="standardForm" mode="error"> - <parameter name="id" type="integer" /> - </validationRule> - - <validationRule name="login" mode="error"> - <parameter name="login" type="login" /> - <parameter name="pass" type="string" /> - <parameter name="display" type="identifier" /> - <parameter name="page" type="identifier" /> - <parameter name="submit" type="string" /> - </validationRule> - - <validationRule name="manage_query" extends="standardForm" mode="error"> - <parameter name="action" type="identifier" /> - <parameter name="id" type="integer" /> - <parameter name="name" type="string" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="search_adv_result" extends="standardForm" mode="error"> - <parameter name="baskets_clause" type="identifier" /> - <parameter name="sender" type="string" /> - <parameter name="sender_id" type="integer" /> - <parameter name="sender_type" type="string" /> - <parameter name="recipient" type="string" /> - <parameter name="recipient_id" type="integer" /> - <parameter name="recipient_type" type="string" /> - <parameter name="withAddress" type="boolean" /> - <parameter name="contact_type" type="identifier" /> - <parameter name="visa_user" type="string" /> - <parameter name="descriptioncase" type="string" /> - <parameter name="dir" type="identifier" /> - <parameter name="fulltext" type="string" /> - <parameter name="labelcase" type="string" /> - <parameter name="meta" type="string" /> - <parameter name="multifield" type="string" /> - <parameter name="numcase" type="identifier" /> - <parameter name="numged" type="integer" /> - <parameter name="page" type="identifier" /> - <parameter name="select_criteria" type="string" /> - <parameter name="subject" type="string" /> - <parameter name="creation_date_pj_from" type="string" /> - <parameter name="creation_date_pj_to" type="string" /> - <parameter name="attachment_types" type="identifier" /> - <parameter name="description" type="string" /> - <parameter name="category" type="identifier" /> - <parameter name="confidentiality" type="YN" /> - <parameter name="admission_date_from" type="string" /> - <parameter name="admission_date_to" type="string" /> - <parameter name="creation_date_from" type="string" /> - <parameter name="creation_date_to" type="string" /> - <parameter name="signatoryNameId" type="string" /> - <parameter name="ac_signatory_name" type="string" /> - <parameter name="ac_visa_user" type="string" /> - <parameter name="closing_date_from" type="string" /> - <parameter name="closing_date_to" type="string" /> - <parameter name="doc_date_from" type="string" /> - <parameter name="doc_date_to" type="string" /> - <parameter name="process_limit_date_from" type="string" /> - <parameter name="process_limit_date_to" type="string" /> - <parameter name="destinataire_chosen" type="identifier" /> - <parameter name="destinataire_available" type="identifier" /> - <parameter name="folder" type="string" /> - <parameter name="priority" type="string" /> - <parameter name="indexingCustomField_*" type="string" /> - <parameter name="signatory_group" type="identifier" /> - <parameter name="signatory_name_id" type="identifier" /> - <parameter name="tags_chosen" type="string" /> - <parameter name="tags_available" type="string" /> - <parameter name="signatory_name" type="string" /> - <parameter name="doc_notes" type="string" /> - <parameter name="chrono" type="string" /> - <parameter name="identifier" type="string" /> - <parameter name="services_chosen" type="identifier" /> - <parameter name="services_available" type="identifier" /> - <parameter name="initiatorServices_chosen" type="identifier" /> - <parameter name="initiatorServices_available" type="identifier" /> - <parameter name="priority_chosen" type="identifier" /> - <parameter name="priority_available" type="identifier" /> - <parameter name="market" type="string" /> - <parameter name="status_chosen" type="identifier" /> - <parameter name="status_available" type="identifier" /> - <parameter name="doctypes_chosen" type="identifier" /> - <parameter name="doctypes_available" type="identifier" /> - <parameter name="simple_mail" type="boolean" /> - <parameter name="AR" type="boolean" /> - <parameter name="fax" type="boolean" /> - <parameter name="courriel" type="boolean" /> - <parameter name="direct" type="boolean" /> - <parameter name="autre" type="boolean" /> - <parameter name="norep" type="boolean" /> - <parameter name="specific_case" type="identifier" /> - <parameter name="searched_item" type="identifier" /> - <parameter name="action_form" type="identifier" /> - <parameter name="modulename" type="identifier" /> - <parameter name="nodetails" type="boolean" /> - <parameter name="collection" type="collection_list" /> - <parameter name="barcode" type="alnum" /> - <parameter name="exp_date_from" type="datefr" /> - <parameter name="exp_date_to" type="datefr" /> - <parameter name="department_number_chosen" type="string" /> - <parameter name="department_number_available" type="string" /> - <parameter name="welcome" type="string" /> - <parameter name="Submit" type="identifier" /> - </validationRule> - - <validationRule name="view_resource" extends="index"> - <parameter name="id" type="integer" /> - <parameter name="resIdMaster" type="integer" /> - <parameter name="collid" type="collection_list" /> - <parameter name="coll_id" type="collection_list" /> - <parameter name="original" type="boolean" /> - <parameter name="aVersion" type="boolean" /> - <parameter name="dir" type="identifier" /> - <parameter name="editingMode" type="string" /> - <parameter name="watermark_outgoing" type="string" /> - </validationRule> - - <validationRule name="multi_contacts" extends="standardForm" mode="error"> - <parameter name="addressid" type="integer" /> - <parameter name="contact" type="string" /> - <parameter name="contactid" type="string" /> - <parameter name="field" type="identifier" /> - <parameter name="for" type="identifier" /> - <parameter name="index" type="string" /> - <parameter name="url" type="url" /> - <parameter name="coll_id" type="collection_list" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="addresses_list" extends="standardForm" mode="error"> - <parameter name="selectedObject" type="integer" /> - <parameter name="what" type="string" /> - <parameter name="dir" type="identifier" /> - <parameter name="url" type="string" /> - </validationRule> - - <validationRule name="type_id_integer" extends="standardForm" mode="error"> - <parameter name="type_id" type="integer" /> - <parameter name="dir" type="identifier" /> - <parameter name="res_id" type="integer" /> - </validationRule> - - <validationRule name="getContacts" extends="standardForm" mode="error"> - <parameter name="type_id" type="identifier" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="choose_file" extends="standardForm" mode="error"> - <parameter name="with_file" type="boolean" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="addressid" extends="standardForm" mode="error"> - <parameter name="addressid" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="contact_view" extends="standardForm" mode="error"> - <parameter name="id" type="integer" /> - <parameter name="fromSearchContactsList" type="boolean" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="admin_ajax_search_indexing" extends="standardForm" mode="error"> - <parameter name="what" type="string" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="document_list_indexing" extends="standardForm" mode="error"> - <parameter name="url" type="url" /> - <parameter name="dir" type="identifier" /> - <parameter name="template" type="identifier" /> - <parameter name="modulename" type="identifier" /> - <parameter name="action_form" type="identifier" /> - <parameter name="exclude" type="integer" /> - </validationRule> - - <validationRule name="little_details" extends="standardForm" mode="error"> - <parameter name="value" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="indexing_searching_id" extends="standardForm" mode="error"> - <parameter name="id" type="integer" /> - <parameter name="coll_id" type="collection_list" /> - <parameter name="dir" type="identifier" /> - <parameter name="collid" type="collection_list" /> - <parameter name="cat" type="identifier" /> - </validationRule> - - <validationRule name="multiLink" extends="standardForm" mode="error"> - <parameter name="courrier_purpose" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="search_contacts_result" extends="standardForm" mode="error"> - <parameter name="contact_type" type="integer" /> - <parameter name="created_by" type="string" /> - <parameter name="created_by_id" type="string" /> - <parameter name="dir" type="identifier" /> - <parameter name="firstname" type="string" /> - <parameter name="lastname" type="personname" /> - <parameter name="meta" type="string" /> - <parameter name="society" type="string" /> - <parameter name="society_short" type="string" /> - </validationRule> - - <validationRule name="put_in_session" extends="standardForm" mode="error"> - <parameter name="contactid" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="last_contact" extends="standardForm" mode="error"> - <parameter name="contactid" type="integer" /> - <parameter name="addressid" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="check_contact_purpose" extends="standardForm" mode="error"> - <parameter name="contact_purpose" type="string" /> - <parameter name="contact_purpose_id" type="integer" /> - <parameter name="dir" type="identifier" /> - </validationRule> - - <validationRule name="info_contact_iframe" extends="standardForm" mode="error"> - <parameter name="contactid" type="identifier" /> - <parameter name="addressid" type="integer" /> - <parameter name="dir" type="identifier" /> - <parameter name="popup" type="identifier" /> - <parameter name="fromAttachmentContact" type="identifier" /> - <parameter name="seeAllAddresses" type="identifier" /> - <parameter name="sender_recipient_id" type="identifier" /> - <parameter name="sender_recipient_type" type="string" /> - <parameter name="editDetailSender" type="identifier" /> - <parameter name="created" type="string" /> - </validationRule> - - <validationRule name="my_contact_del" extends="standardForm" mode="error"> - <parameter name="id" type="integer" /> - <parameter name="address" type="integer" /> - <parameter name="dir" type="identifier" /> - <parameter name="contact" type="integer" /> - <parameter name="contact_list" type="string" /> - <parameter name="address_list" type="string" /> - <parameter name="documents" type="identifier" /> - <parameter name="valid" type="string" /> - </validationRule> - - <validationRule name="add_links" extends="standardForm" mode="error"> - <parameter name="res_id" type="NumComma" /> - <parameter name="res_id_child" type="integer" /> - <parameter name="tableHist" type="res_view_table_list" /> - </validationRule> - - <validationRule name="id_identifier" extends="standardForm" mode="error"> - <parameter name="id" type="identifier" /> - </validationRule> - - <validationRule name="res_id_master" extends="standardForm" mode="error"> - <parameter name="res_id_master" type="integer" /> - <parameter name="option" type="string" /> - </validationRule> - - <validationRule name="identifier_integer" extends="standardForm" mode="error"> - <parameter name="identifier" type="integer" /> - </validationRule> - - <validationRule name="res_id_integer" extends="standardForm" mode="error"> - <parameter name="res_id" type="integer" /> - </validationRule> - - <validationRule name="users_autocomplete_list" extends="standardForm" mode="error"> - <parameter name="Input" type="string" /> - <parameter name="getDisableUser" type="string" /> - </validationRule> - - <validationRule name="select_address" extends="standardForm" mode="error"> - <parameter name="contact_id" type="identifier" /> - <parameter name="select" type="integer" /> - </validationRule> - - <validationRule name="url_path" extends="standardForm" mode="error"> - <!-- <parameter name="url" type="url" /> --> - <parameter name="url" type="string" /> - <parameter name="baskets" type="identifier" /> - <parameter name="origin" type="identifier" /> - <parameter name="filter" type="identifier" /> - <parameter name="value" type="string" /> - <parameter name="template" type="identifier" /> - </validationRule> - - <validationRule name="standardForm" extends="index"> - <parameter name="mode" type="mode" /> - <parameter name="lines" type="integer" /> - </validationRule> - - <validationRule name="example" extends="baseExample"> - <parameter name="param2" type="short_word" /> - <parameter name="param3" type="integer"> - <totalDigit value="3" /> - </parameter> - <parameter name="param4" type="arrayOfStrings" /> - </validationRule> - <validationRule name="baseExample" > - <parameter name="param1" type="string" /> - </validationRule> - - <validationRule name="static_filename" extends="standardForm" mode="error"> - <parameter name="filename" type="boolean" /> - </validationRule> - -</validationRules> diff --git a/apps/maarch_entreprise/xml/config_sendmail_security.xml b/apps/maarch_entreprise/xml/config_sendmail_security.xml deleted file mode 100755 index f430387f443c18b3929d7778432c167cada74495..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/config_sendmail_security.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ROOT> - <MAILER> - <path_to_mailer>apps/maarch_entreprise/tools/PHPMailer/PHPMailerAutoload.php</path_to_mailer> - <path_to_phpmailer>PHPMailer_v5.1</path_to_phpmailer> - <type>smtp</type><!-- mail (default), smtp, sendmail, qmail --> - <smtp_host>smtp.yourdomain.com</smtp_host><!-- smtp1.example.com:25;smtp2.example.com --> - <smtp_port>25</smtp_port><!-- smtp1.example.com:25;smtp2.example.com --> - <smtp_user>notif@yourdomain.com</smtp_user> - <smtp_password></smtp_password> - <smtp_auth>true</smtp_auth> - <smtp_secure>tls</smtp_secure><!-- tls ou ssl --> - <charset>utf-8</charset><!-- Default : iso-8859-1 --> - <domains></domains><!-- Rewrite Recipient with config->adminmail if mailfrom and mailto is out of the domains --> - <x-mailer></x-mailer><!-- Rewrite X-Mailer header, default : PHP/[phpversion] --> - <mailfrom>notifications@maarch.fr</mailfrom> - <subject>[Maarch Courrier] Votre code d'accès</subject> - <mailfromname>Maarch Courrier</mailfromname> - </MAILER> -</ROOT> \ No newline at end of file diff --git a/apps/maarch_entreprise/xml/index_letterbox.xml b/apps/maarch_entreprise/xml/index_letterbox.xml deleted file mode 100755 index f9cc8b2accce6a345cd44d6739d73e8e350f7617..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/index_letterbox.xml +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ROOT> <!-- If id are numbers, always start with 1, never with 0 --> -<!-- - <INDEX> - <column>custom_t6</column> - <label>Utilisateur contributeur</label> - <type>string</type> - <img>user</img> - <table> - <table_name>users</table_name> - <foreign_key>user_id</foreign_key> - <foreign_label>lastname</foreign_label> - <where_clause>enabled = 'Y'</where_clause> - <order>order by lastname</order> - </table> - <only_detail>true</only_detail> if true, field appear only in detail page and research. Display in all page otherwise. - <default_value></default_value> - </INDEX> ---> - <INDEX> - <column>custom_t1</column> - <label>PO#</label> - <type>string</type> - <img>arrow-right</img> - </INDEX> - <INDEX> - <column>custom_t2</column> - <label>Imput</label> - <type>string</type> - <img>arrow-right</img> - </INDEX> - <INDEX> - <column>custom_f1</column> - <label>Mnt</label> - <type>float</type> - <img>arrow-right</img> - </INDEX> - <INDEX> - <column>custom_t3</column> - <label>Id/Matricule</label> - <type>string</type> - <img>arrow-right</img> - </INDEX> -<!-- - <INDEX> - <column>custom_t2</column> - <label>_CUSTOM_T2</label> - <type>string</type> - <img>default_string.gif</img> - <values_list> - <value> - <id>1</id> - <label>Règlement</label> - </value> - <value> - <id>2</id> - <label>Pas de règlement</label> - </value> - </values_list> - <default_value>1</default_value> - </INDEX> - <INDEX> - <column>custom_d1</column> - <label>_CUSTOM_D1</label> - <type>date</type> - <img>default_date.gif</img> - </INDEX> - - <INDEX> - <column>custom_f1</column> - <label>_CUSTOM_F1</label> - <type>float</type> - <img>default_number.gif</img> - </INDEX> ---> -<!--<INDEX> - <column>custom_t2</column> - <label>champ 2</label> - <type>string</type> - <img>default_string.gif</img> - <values_list> - <value> - <id>1</id> - <label>Contrôle externe</label> - </value> - <value> - <id>2</id> - <label>Autocontrôle</label> - </value> - </values_list> - <default_value>1</default_value> - </INDEX> - <INDEX> - <column>custom_t3</column> - <label>champ 3</label> - <type>string</type> - <img>default_string.gif</img> - <table> - <table_name>ma_table</table_name> - <foreign_key>ma_table_id</foreign_key> - <foreign_label>ma_table_label</foreign_label> - <where_clause>enabled = 'Y'</where_clause> - <order>order by ma_table_label</order> - </table> - <default_value>5678</default_value> - </INDEX>--> -</ROOT> diff --git a/apps/maarch_entreprise/xml/mapping_sso.xml b/apps/maarch_entreprise/xml/mapping_sso.xml deleted file mode 100755 index f186cf0d2d53f02c5a347b149189d72c48a79110..0000000000000000000000000000000000000000 --- a/apps/maarch_entreprise/xml/mapping_sso.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ROOT> - <WEB_SSO_URL>http://192.168.21.26/websso/</WEB_SSO_URL> - <USER_ID>nigend</USER_ID> <!-- user_id dans maarch --> - <USER_NAME> <!-- nom, prenom dans maarch --> - <FULL_NAME>uid</FULL_NAME> - <SEP_TOKEN>.</SEP_TOKEN> - </USER_NAME> - <EMAIL>codeunite</EMAIL> <!-- email de l'utilisateur dans maarch --> - <GROUPS> <!-- groupes dans maarch --> - <GROUP_ID>qualification</GROUP_ID> - <SEP_TOKEN>,</SEP_TOKEN> - </GROUPS> - <ENTITIES> <!-- entites dans maarch (position dans l'organigramme --> - <ENTITY_ID>departement_uid</ENTITY_ID> - <SEP_TOKEN>,</SEP_TOKEN> - </ENTITIES> -</ROOT> diff --git a/core/class/users_controler.php b/core/class/users_controler.php index 172acabf79303d1c32a59930d569e1abb99a07e9..c55c8197fe310bceb2a864e577ddc1e2cfae5af4 100755 --- a/core/class/users_controler.php +++ b/core/class/users_controler.php @@ -38,7 +38,6 @@ try { require_once 'core/class/class_history.php'; require_once('core' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'class_security.php'); - require_once 'modules/entities/class/class_users_entities.php'; } catch (Exception $e) { functions::xecho($e->getMessage()) . ' // '; } diff --git a/core/xml/IVS/data_types.xml b/core/xml/IVS/data_types.xml deleted file mode 100755 index b353d8fa202c9eb0fb34cc23213c1d91b8e1fd9b..0000000000000000000000000000000000000000 --- a/core/xml/IVS/data_types.xml +++ /dev/null @@ -1,5 +0,0 @@ -<dataTypes> - <dataType name="sample_lc" base="graph"> - <pattern value="/^\w+$/" /> - </dataType> -</dataTypes> \ No newline at end of file diff --git a/core/xml/IVS/requests_definitions.xml b/core/xml/IVS/requests_definitions.xml deleted file mode 100755 index d28d047c31031f9e9da1dc3fd67b24525b84eb95..0000000000000000000000000000000000000000 --- a/core/xml/IVS/requests_definitions.xml +++ /dev/null @@ -1,7 +0,0 @@ -<requestDefinitions> - <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="ajax_core_values" > - <parameter name="page" value="manage_action"/> - <parameter name="module" value="core"/> - <parameter name="display" value="true"/> - </requestDefinition> -</requestDefinitions> \ No newline at end of file diff --git a/core/xml/IVS/validation_rules.xml b/core/xml/IVS/validation_rules.xml deleted file mode 100755 index 01e89598e6dcbb87edaab1fedde1ae46fef7bf53..0000000000000000000000000000000000000000 --- a/core/xml/IVS/validation_rules.xml +++ /dev/null @@ -1,14 +0,0 @@ -<validationRules> - <validationRule name="ajax_core_values" extends="standardForm" mode="error"> - <parameter name="action_id" type="integer" /> - <parameter name="coll_id" type="collection_list" /> - <parameter name="module" type="identifier" /> - <parameter name="req" type="identifier" /> - <parameter name="table" type="res_table_list" /> - <parameter name="form_values" type="string" /> - <parameter name="values" type="string" /> - <parameter name="form_to_check" type="identifier" /> - <parameter name="new_status" type="identifier" /> - <parameter name="hist" type="string" /> - </validationRule> -</validationRules> \ No newline at end of file diff --git a/modules/life_cycle/batch/load_process_emails.php b/modules/life_cycle/batch/load_process_emails.php index b00e94d37d0112db2f11892c6fcddc45b96ce094..75c0bfd08a4685861f5984fe00eecad6a1939738 100755 --- a/modules/life_cycle/batch/load_process_emails.php +++ b/modules/life_cycle/batch/load_process_emails.php @@ -175,10 +175,6 @@ try { $GLOBALS['maarchDirectory'] . 'core' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'class_core_tools.php' ); - Bt_myInclude( - $GLOBALS['maarchDirectory'] . 'apps' . DIRECTORY_SEPARATOR . 'maarch_entreprise' - . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'class_users.php' - ); Bt_myInclude( $GLOBALS['maarchDirectory'] . "modules" . DIRECTORY_SEPARATOR . "sendmail" . DIRECTORY_SEPARATOR . "class". DIRECTORY_SEPARATOR . "class_modules_tools.php" @@ -257,7 +253,6 @@ $coreTools = new core_tools(); $coreTools->load_lang($lang, $GLOBALS['maarchDirectory'], $_SESSION['config']['app_id']); $sendmail_tools = new sendmail(); -$users = new class_users(); $GLOBALS['func'] = new functions(); $GLOBALS['db'] = new Database($GLOBALS['configFile']); diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php index d49e2bf5c1a05f1224c28b75f2a36f5d50ecc5b5..5f0c802bda6d25c49cc791d45c1c2590ca651123 100755 --- a/src/core/controllers/AuthenticationController.php +++ b/src/core/controllers/AuthenticationController.php @@ -73,7 +73,8 @@ class AuthenticationController 'loginMessage' => $parameter['param_value_string'] ?? null, 'changeKey' => $encryptKey == 'Security Key Maarch Courrier #2008', 'authMode' => $loggingMethod['id'], - 'authUri' => $authUri + 'authUri' => $authUri, + 'lang' => CoreConfigModel::getLanguage() ]; if (!empty($keycloakState)) { diff --git a/src/frontend/service/auth.service.ts b/src/frontend/service/auth.service.ts index 98627107bd3a493727ae22e693b9ace19ec09b8d..3081bbe736326973faac879de266d84b5ecda31c 100644 --- a/src/frontend/service/auth.service.ts +++ b/src/frontend/service/auth.service.ts @@ -224,9 +224,6 @@ export class AuthService { console.debug('getLoginInformations'); this.setAppSession(data.instanceId); - // FOR TEST - data.lang = 'fr'; - this.localStorage.save('lang', data.lang); this.translate.use(data.lang);