diff --git a/apps/maarch_entreprise/admin/contacts/ajaxLoadDeleteContactDiv.php b/apps/maarch_entreprise/admin/contacts/ajaxLoadDeleteContactDiv.php
deleted file mode 100755
index 01758b4678b832ee55c416505775faf56b7460e0..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/admin/contacts/ajaxLoadDeleteContactDiv.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-require_once('core/class/class_core_tools.php');
-$Core_Tools = new core_tools;
-$Core_Tools->load_lang();
-$db = new Database();
-$return = '';
-$arrayPDO = array();
-if ($_REQUEST['society_label'] <> '') {
- $selectDuplicates = "SELECT contact_id, user_id, society, lower(society) as lowsoc, society_short,"
- . "is_corporate_person, lastname, firstname "
- . "from contacts_v2 "
- . "WHERE lower(society) in ("
- . "SELECT lower(society) FROM contacts_v2 GROUP BY lower(society) "
- . " HAVING Count(lower(society)) > 1 and lower(society) <> '' ) and contact_id <> ? and lower(society) = lower(?) "
- . "order by lower(society)";
- $arrayPDO = array($_REQUEST['contact_id'], $_REQUEST['society_label']);
-}
-if ($_REQUEST['name'] <> '') {
- $selectDuplicates = "SELECT contact_id, lower(lastname||' '||firstname) as lastname_firstname, society, society_short,"
- . "is_corporate_person, lastname, firstname, title "
- . "from contacts_v2 "
- . "WHERE lower(lastname||' '||firstname) in ("
- . "SELECT lower(lastname||' '||firstname) as lastname_firstname FROM contacts_v2 GROUP BY lastname_firstname "
- . " HAVING Count(lower(lastname||' '||firstname)) > 1 and lower(lastname||' '||firstname) <> ' ') and contact_id <> ? and lower(lastname||' '||firstname) = ? "
- . "order by lower(lastname||' '||firstname)";
- $arrayPDO = array($_REQUEST['contact_id'], $_REQUEST['name']);
-}
-if (isset($_REQUEST['contact_id'])) {
- //test if res attached to the contact
- $query = "SELECT res_id FROM res_view_letterbox WHERE (exp_contact_id = ? or dest_contact_id = ?) and status <> 'DEL'";
- $stmt = $db->query($query, array($_REQUEST['contact_id'], $_REQUEST['contact_id']));
- $flagResAttached = false;
- $return_db = $stmt->fetchObject();
- if ($return_db->res_id <> '') {
- $flagResAttached = true;
- $stmt = $db->query($selectDuplicates, $arrayPDO);
-
- $contactList = array();
- array_push($contactList, "Selectionner un contact");
- while($lineDoubl = $stmt->fetchObject()) {
- $stmt2 = $db->query("SELECT id FROM contact_addresses WHERE contact_id = ?", array($lineDoubl->contact_id));
-
- $result_address = $stmt2->fetchObject();
-
- if ($result_address->id <> '') {
- array_push($contactList, $lineDoubl->contact_id);
- }
- }
- }
- if ($flagResAttached) {
- $return .= _RES_ATTACHED . '. ' . _SELECT_CONTACT_TO_REPLACE;
- $return .= ' : <br/>'._NEW_CONTACT.' : <select onchange="loadAddressAttached(this.options[this.selectedIndex].value, '.$_REQUEST['contact_id'].')" id="selectContact_'
- . $_REQUEST['contact_id'] . '" name="selectContact_'
- . $_REQUEST['contact_id'] . '">"';
- for ($cpt=0;$cpt<count($contactList);$cpt++) {
- $return .= '<option value="' . $contactList[$cpt] . '">'
- . $contactList[$cpt] . '</option>';
- }
- $return .= '</select>';
-
- $return .= '<br/>' . _NEW_ADDRESS. ' : <select id="selectContactAddress_'
- . $_REQUEST['contact_id'] . '" name="selectContactAddress_'
- . $_REQUEST['contact_id'] . '">"';
- $return .= '</select>';
- $return .= '<br/>';
- }
- $return .= _ARE_YOU_SURE_TO_DELETE_CONTACT;
- if ($flagResAttached) {
- $return .= ' <input type="button" class="button" value="' . _YES . '"'
- . ' onclick="deleteContact(' . $_REQUEST['contact_id']
- . ', $(\'selectContact_' . $_REQUEST['contact_id'] . '\').value, $(\'selectContactAddress_' . $_REQUEST['contact_id'] . '\').value);" />';
- } else {
- $return .= ' <input type="button" class="button" value="' . _YES . '"'
- . ' onclick="deleteContact(' . $_REQUEST['contact_id']
- . ', false, false);" />';
- }
- $return .= ' <input type="button" class="button" value="' . _NO . '"'
- . ' onclick="new Effect.toggle(\'deleteContactDiv_\'+'
- . $_REQUEST['contact_id'] . ', \'blind\' , {delay:0.2});" />';
-
- $status = 0;
-} else {
- $status = 1;
- $return .= '<td colspan="8" style="background-color: red;">';
- $return .= '<p style="padding: 10px; color: black;">';
- $return .= 'Error loading documents';
- $return .= '</p>';
- $return .= '</td>';
-}
-
-echo "{status : " . $status . ", toShow : '" . addslashes($return) . "'}";
-exit ();
diff --git a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
index 3733ce1fae1cf072cd5af75acab049896069361c..a6551b9d0543254a7d9bd3216a770ce3c2c04181 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_purposes/contact_purposes_up.php
@@ -216,7 +216,6 @@ if (isset($_REQUEST['valid'])) {
exit();
} else {
if($mode <> 'popup'){
- $core->start_page_stat();
?>
<div id="header">
<div id="nav">
diff --git a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
index 83a7d6233f851d67bd1936e6d833ca1d02886caa..ad72c08a6ef5b3fcc83f763b2c8802e8a16f4ad2 100755
--- a/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
+++ b/apps/maarch_entreprise/admin/contacts/contact_types/contact_types_up.php
@@ -205,7 +205,6 @@ if (isset($_REQUEST['valid'])) {
}
exit();
} else {
- $core->start_page_stat();
?>
<div id="header">
<div id="nav">
diff --git a/apps/maarch_entreprise/change_pass.php b/apps/maarch_entreprise/change_pass.php
deleted file mode 100755
index 66bdeaaef6eb702cd5e44d6b13d75e49b42909b5..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/change_pass.php
+++ /dev/null
@@ -1,115 +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 change_pass
-*
-* @author dev <dev@maarch.org>
-* @ingroup apps
-*/
-$core_tools = new core_tools();
-$core_tools->load_lang();
-$core_tools->load_html();
-//here we building the header
-$core_tools->load_header(_MODIFICATION_PSW);
-$time = $core_tools->get_session_time_expire();
-
-$html = "<body onload='setTimeout(window.close, {$time}*60*1000);'>";
-$html .= "<div id='container'>";
-$html .= "<div id='content'>";
-
-if (!empty($_SESSION['error'])) {
- $html .= "<div class='error' style='display:block;'>{$_SESSION['error']}</div>";
-}
-$_SESSION['error'] = '';
-
-$html .= '<div id="inner_content" class="clearfix">';
-$html .= '<h2 class="tit">';
-$html .= "<img src='{$_SESSION['config']['businessappurl']}static.php?filename=logo.svg' style='height:130px;'>";
-$html .= '<br/><br/>';
-
-if ($_SESSION['user']['cookie_date']) {
- $html .= _MODIFICATION_PSW;
-} else {
- $html .= _FIRST_CONN;
-}
-$html .= '</h2>';
-
-$html .= '<div class="block">';
-
-if (!$_SESSION['user']['cookie_date']) {
- $html .= '<h3>'._YOUR_FIRST_CONNEXION.', '._PLEASE_CHANGE_PSW.'<br/>'._ASKED_ONLY_ONCE.'</h3>';
-} else {
- $html .= '<h3>'._PSW_REINI.'</h3>';
-}
-
-$html .= '<div class="blank_space"> </div>';
-
-$html .= "<form name='frmuser' method='post' action='{$_SESSION['config']['businessappurl']}index.php?display=true&page=verif_pass' class='forms' >";
-$html .= '<input type="hidden" name="display" value="true" />';
-$html .= '<input type="hidden" name="page" value="verif_pass" />';
-
-$html .= '<p>';
-$html .= '<label>'._ID.' : </label>';
-$html .= "<input type='text' readonly='readonly' class='readonly' value='{$_SESSION['user']['UserId']}'/>";
-$html .= '</p>';
-
-$html .= '<p>';
-$html .= '<label>'._PASSWORD.' : </label>';
-$html .= '<input name="pass1" type="password" id="pass1" value="" /> <span class="red_asterisk"><i class="fa fa-star"></i></span>';
-$html .= '</p>';
-
-$html .= '<p>';
-$html .= '<label>'._REENTER_PSW.' : </label>';
-$html .= '<input name="pass2" type="password" id="pass2" value="" /> <span class="red_asterisk"><i class="fa fa-star"></i></span>';
-$html .= '</p>';
-
-$html .= '<p>';
-$html .= '<label>'._LASTNAME.' : </label>';
-$html .= "<input name='LastName' type='text' id='LastName' value='{$_SESSION['user']['LastName']}' /> <span class='red_asterisk'><i class='fa fa-star'></i></span>";
-$html .= '</p>';
-
-$html .= '<p>';
-$html .= '<label>'._FIRSTNAME.' : </label>';
-$html .= "<input name='FirstName' type='text' id='FirstName' value='{$_SESSION['user']['FirstName']}' /> <span class='red_asterisk'><i class='fa fa-star'></i></span>";
-$html .= '</p>';
-
-if (!$core_tools->is_module_loaded('entities')) {
- $html .= '<p>';
- $html .= '<label>'._DEPARTMENT.' : </label>';
- $html .= "<input name='Department' type='text' id='Department' value='{$_SESSION['user']['department']}' />";
- $html .= '</p>';
-}
-
-$html .= '<p>';
-$html .= '<label>'._PHONE_NUMBER.' : </label>';
-$html .= "<input name='Phone' type='text' id='Phone' value='{$_SESSION['user']['Phone']}' />";
-$html .= '</p>';
-
-$html .= '<p>';
-$html .= '<label>'._MAIL.' : </label>';
-$html .= "<input name='Mail' type='text' id='Mail' value='{$_SESSION['user']['Mail']}'/> <span class='red_asterisk'><i class='fa fa-star'></i></span>";
-$html .= '</p>';
-
-$html .= '<p class="buttons">';
-$html .= '<input type="submit" name="Submit" value="'._VALIDATE.'" class="button" />';
-$html .= ' <input type="button" name="cancel" value="'._CANCEL.'" class="button" onclick="window.location.href=\''.$_SESSION['config']['businessappurl'].'index.php?display=true&page=login\';" />';
-$html .= '</p>';
-
-$html .= '</form>';
-$html .= '</div>';
-
-$html .= '<div class="block_end"> </div>';
-$html .= '</div>';
-
-$html .= '</div>';
-$html .= '<div id="footer"> </div>';
-$html .= '</div>';
-
-$html .= '</body>';
-$html .= '</html>';
-
-echo $html;
diff --git a/apps/maarch_entreprise/css/styles.css b/apps/maarch_entreprise/css/styles.css
index 6f8b4548198b5a2bff54ca9d5172112ff4039a3c..d117537b8bab7c81fa4752fd32f9485dd8efedbf 100755
--- a/apps/maarch_entreprise/css/styles.css
+++ b/apps/maarch_entreprise/css/styles.css
@@ -354,22 +354,6 @@ a:hover {
display: block;
}
-/*admin docservers CSS*/
-
-#admin_docservers {
- background: url(static.php?filename=maarch_box_tmp.gif) no-repeat 2px top;
- width: 315px;
- min-height: 110px;
- float: left;
- padding-top: 0px;
- padding-right: 18px;
- padding-bottom: 0px;
- padding-left: 0px;
- margin: 0px 0px 15px;
- position: relative;
- display: block;
-}
-
/* floated blocks */
.clear {
@@ -435,7 +419,6 @@ acronym, abbr {
a.next, a.change, a.suspend, a.delete, a.authorize, a.prev, a.up, a.down, a.view {
padding-left: 20px;
- /*background: transparent url(static.php?filename=puce_prev.gif) 10px center no-repeat;*/
background: transparent 10px center no-repeat;
color: #135F7F;
}
@@ -452,13 +435,6 @@ a.prev {
padding-left: 10px;
}
-/*a.next {
- background-image: url(static.php?filename=puce_next.gif);
- background-position: center right;
- padding-left: 0;
- padding-right: 10px;
-}*/
-
a.change, a.suspend, a.delete, a.authorize, a.up, a.down, a.view {
padding: 5px 0 5px 20px;
background-position: center left;
@@ -1306,27 +1282,6 @@ th.ref {
left: 262px;
}
-#quicksearchform #search {
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: .9em;
- color: #666;
- border: none;
- padding: .2em .6em .4em .6em;
- width: 10.7em;
- background: transparent url(static.php?filename=bg_inputsearch.gif) top left no-repeat;
-}
-
-#quicksearchform label {
- clear: right;
- padding-left: 15px;
- padding-bottom: 12px;
-}
-
-#quicksearchform input {
- float: left;
- margin: 0 5px 0 0;
-}
-
#help {
text-align: right;
padding-right: 12px;
diff --git a/apps/maarch_entreprise/img/arrow_primary.gif b/apps/maarch_entreprise/img/arrow_primary.gif
deleted file mode 100755
index e2f8c3e1feeb0541239db4061812008af2225105..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/arrow_primary.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/bg_but.gif b/apps/maarch_entreprise/img/bg_but.gif
deleted file mode 100755
index f32fd47b917047a72511f4869605af81df311b2a..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/bg_but.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/bg_inputsearch.gif b/apps/maarch_entreprise/img/bg_inputsearch.gif
deleted file mode 100755
index 719cceaf8f57444d5668659f55ffdba08b6e8067..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/bg_inputsearch.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/border_top.gif b/apps/maarch_entreprise/img/border_top.gif
deleted file mode 100755
index 9dae95f1bfd2d56b316b0d21cd02ae3834f7568c..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/border_top.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/cadenas_rouge.png b/apps/maarch_entreprise/img/cadenas_rouge.png
deleted file mode 100755
index 78953c9e5c0a282bdb22ccdb9ca683d233c660ed..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/cadenas_rouge.png and /dev/null differ
diff --git a/apps/maarch_entreprise/img/dir_close.gif b/apps/maarch_entreprise/img/dir_close.gif
deleted file mode 100755
index 4663ee130cf9e3d9aa115e5f4243a6c121c98747..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/dir_close.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/dir_open.gif b/apps/maarch_entreprise/img/dir_open.gif
deleted file mode 100755
index 15bd1e7e31c17233f8c4edb1b4851168a4d1a951..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/dir_open.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/goToTop.png b/apps/maarch_entreprise/img/goToTop.png
deleted file mode 100755
index 945411d0b30492647bdb105c8ed35ce2f191e3a8..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/goToTop.png and /dev/null differ
diff --git a/apps/maarch_entreprise/img/maarch_box_tmp.gif b/apps/maarch_entreprise/img/maarch_box_tmp.gif
deleted file mode 100755
index b7f2bdd64faf25bc419fc0be3b067a6b022ecf8e..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/maarch_box_tmp.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/puce_next.gif b/apps/maarch_entreprise/img/puce_next.gif
deleted file mode 100755
index b683ccb28e2c6a8b95700978fd2cb74c85f194ca..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/puce_next.gif and /dev/null differ
diff --git a/apps/maarch_entreprise/img/toggle.png b/apps/maarch_entreprise/img/toggle.png
deleted file mode 100755
index 056edb774112259701b119c2265597f46d4f6c0f..0000000000000000000000000000000000000000
Binary files a/apps/maarch_entreprise/img/toggle.png and /dev/null differ
diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index 78f26bdb6860fff8b6502aa64306b50b72eefd6b..545a32aec0ad3e285e6fece88885ea8029f3a5ff 100755
--- a/apps/maarch_entreprise/index.php
+++ b/apps/maarch_entreprise/index.php
@@ -218,8 +218,6 @@ if (!empty($_REQUEST['page']) && empty($_REQUEST['triggerAngular'])) {
}
//DISPLAY FULL PAGE
- $core->start_page_stat();
- // $core->configPosition();
// if (isset($_SESSION['HTTP_REFERER'])) {
// $url = $_SESSION['HTTP_REFERER'];
// unset($_SESSION['HTTP_REFERER']);
diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js
index 93fb1a82cf66896d0ee8c6be6c5b7f8d351ac437..f6324823e54a6e2f2e9ab3ec8f3a3640f9988a93 100755
--- a/apps/maarch_entreprise/js/functions.js
+++ b/apps/maarch_entreprise/js/functions.js
@@ -2864,20 +2864,6 @@ function simpleAjax(url) {
});
}
-function loadAddressAttached(contact_id, select) {
- var path_manage_script = 'index.php?display=true&page=select_attachedAddress';
- new Ajax.Request(path_manage_script, {
- method: 'post',
- parameters: {
- contact_id: contact_id,
- select: select
- },
- onSuccess: function (answer) {
- $('selectContactAddress_' + select).innerHTML = answer.responseText;
- }
- });
-}
-
function loadDiffListHistory(listinstance_history_id) {
new Effect.toggle('diffListHistory_' + listinstance_history_id, 'appear', {
delay: 0.2
@@ -3528,16 +3514,6 @@ function ChangeH2(objet) {
}
}
-function Change2H2(objet) {
- if (objet.getElementsByTagName('img')[0].src.indexOf("folderopen") > -1) {
- objet.getElementsByTagName('img')[0].src = "img/folder.gif";
- objet.getElementsByTagName('span')[0].firstChild.nodeValue = " ";
- } else {
- objet.getElementsByTagName('img')[0].src = "img/folderopen.gif";
- objet.getElementsByTagName('span')[0].firstChild.nodeValue = " ";
- }
-}
-
var initialized = 0;
var etat = new Array();
@@ -3568,18 +3544,6 @@ function ouvre(id) {
etat[id]["etat"] = 1;
}
-function ferme2(id) {
- Effect.SlideUp(etat[id]["desc"]);
- Change2H2(etat[id]["h2"]);
- etat[id]["etat"] = 0;
-}
-
-function ouvre2(id) {
- Effect.SlideDown(etat[id]["desc"]);
- Change2H2(etat[id]["h2"]);
- etat[id]["etat"] = 1;
-}
-
function ferme3(id) {
Effect.SlideUp(etat[id]["desc"]);
etat[id]["etat"] = 0;
@@ -3607,17 +3571,6 @@ function change(id) {
}
}
-function change2(id) {
- if (!initialized) {
- initialise()
- }
- if (etat[id]["etat"]) {
- ferme2(id);
- } else {
- ouvre2(id);
- }
-}
-
function change3(id) {
if (!initialized) {
initialise()
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index cefe3a3cf00412c1bc55f4fb51838b6e2570a95d..69085a24d45ba2f1ed20a4f8da41d84dd5afb89b 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -62,9 +62,6 @@ if (!defined('_PROCESSING_MODE')) {
if (!defined('_ADMIN_USERS')) {
define('_ADMIN_USERS', 'Users');
}
-if (!defined('_ADMIN_DOCSERVERS')) {
- define('_ADMIN_DOCSERVERS', 'Storage zones');
-}
if (!defined('_ADMIN_GROUPS')) {
define('_ADMIN_GROUPS', 'users groups');
}
@@ -571,24 +568,6 @@ if (!defined('_CARD')) {
}
/************************* First login ***********************************/
-if (!defined('_MODIFICATION_PSW')) {
- define('_MODIFICATION_PSW', 'Password modification');
-}
-if (!defined('_YOUR_FIRST_CONNEXION')) {
- define('_YOUR_FIRST_CONNEXION', ' Welcome on Maarch !<br/> This is your first connection');
-}
-if (!defined('_PLEASE_CHANGE_PSW')) {
- define('_PLEASE_CHANGE_PSW', ' Please define your password');
-}
-if (!defined('_ASKED_ONLY_ONCE')) {
- define('_ASKED_ONLY_ONCE', 'This will be asked once');
-}
-if (!defined('_PSW_REINI')) {
- define('_PSW_REINI', 'Your password has been rebooted. Please define a new one.');
-}
-if (!defined('_FIRST_CONN')) {
- define('_FIRST_CONN', 'First connection');
-}
if (!defined('_LOGIN')) {
define('_LOGIN', 'Connection');
}
@@ -785,15 +764,6 @@ if (!defined('_ROLE')) {
define('_ROLE', 'Role');
}
-if (!defined('_THE_PSW')) {
- define('_THE_PSW', 'The password');
-}
-if (!defined('_THE_PSW_VALIDATION')) {
- define('_THE_PSW_VALIDATION', 'The password validation');
-}
-if (!defined('_MODIFICATION_PSW_SNTE')) {
- define('_MODIFICATION_PSW_SNTE', 'To modify your password, please confirm it.');
-}
if (!defined('_USER_ACCESS_DEPARTMENT')) {
define('_USER_ACCESS_DEPARTMENT', 'The user has access to the following departments');
}
@@ -2114,15 +2084,6 @@ if (!defined('_DUPLICATES_BY_NAME')) {
if (!defined('_IS_ATTACHED_TO_DOC')) {
define('_IS_ATTACHED_TO_DOC', 'Attached to documents ?');
}
-if (!defined('_RES_ATTACHED')) {
- define('_RES_ATTACHED', 'Attached documents');
-}
-if (!defined('_SELECT_CONTACT_TO_REPLACE')) {
- define('_SELECT_CONTACT_TO_REPLACE', 'Select the contact and the address to replace');
-}
-if (!defined('_ARE_YOU_SURE_TO_DELETE_CONTACT')) {
- define('_ARE_YOU_SURE_TO_DELETE_CONTACT', 'Are you sure to delete this contact ?');
-}
if (!defined('_CONTACT_CHECK')) {
define('_CONTACT_CHECK', 'A recently recorded mail at least is affected to the same contact.');
}
@@ -3198,9 +3159,6 @@ if (!defined('_MANAGE_DOCSERVER_TYPES')) {
if (!defined('_MANAGE_DOCSERVER_TYPES_DESC')) {
define('_MANAGE_DOCSERVER_TYPES_DESC', 'Add, modify, delete the types of storage zones ');
}
-if (!defined('_ADMIN_DOCSERVERS')) {
- define('_ADMIN_DOCSERVERS', ' Administration of storage zones');
-}
if (!defined('_DOCSERVER_ID')) {
define('_DOCSERVER_ID', 'Document server ID');
}
@@ -4236,9 +4194,6 @@ if (!defined('_CURRENT_PSW')) {
if (!defined('_NEW_PSW')) {
define('_NEW_PSW', 'New password');
}
-if (!defined('_REENTER_PSW')) {
- define('_REENTER_PSW', 'Enter the password again');
-}
if (!defined('_UPDATED_PROFILE')) {
define('_UPDATED_PROFILE', 'Your profile has been updated');
}
@@ -4246,9 +4201,6 @@ if (!defined('_UPDATED_PROFILE')) {
if (!defined('_WRONG_PSW')) {
define('_WRONG_PSW', 'Wrong password');
}
-if (!defined('_WRONG_SECOND_PSW')) {
- define('_WRONG_SECOND_PSW', 'The second password isn\'t equivalent to the first password !');
-}
if (!defined('_EMPTY_PSW_FORM')) {
define('_EMPTY_PSW_FORM', 'Password form is not complete');
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 248b141eca8095f31f36be7218a62ec2dd543064..8bdaf3ce7c5c7d4b24ff67a3c8a00b9d585124d3 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -57,9 +57,6 @@ if (!defined('_PROCESSING_MODE')) {
if (!defined('_ADMIN_USERS')) {
define('_ADMIN_USERS', 'Utilisateurs');
}
-if (!defined('_ADMIN_DOCSERVERS')) {
- define('_ADMIN_DOCSERVERS', 'Zones de stockage');
-}
if (!defined('_ADMIN_GROUPS')) {
define('_ADMIN_GROUPS', "Groupes d'utilisateurs");
}
@@ -567,24 +564,6 @@ if (!defined('_CARD')) {
}
/************************* First login ***********************************/
-if (!defined('_MODIFICATION_PSW')) {
- define('_MODIFICATION_PSW', 'Modification du mot de passe');
-}
-if (!defined('_YOUR_FIRST_CONNEXION')) {
- define('_YOUR_FIRST_CONNEXION', 'Bienvenue sur Maarch ! <br/>Ceci est votre première connexion');
-}
-if (!defined('_PLEASE_CHANGE_PSW')) {
- define('_PLEASE_CHANGE_PSW', ' veuillez définir votre mot de passe');
-}
-if (!defined('_ASKED_ONLY_ONCE')) {
- define('_ASKED_ONLY_ONCE', "Cela ne vous sera demandé qu'une seule fois");
-}
-if (!defined('_PSW_REINI')) {
- define('_PSW_REINI', 'Votre mot de passe a été réinitialisé. Veuillez en définir un nouveau.');
-}
-if (!defined('_FIRST_CONN')) {
- define('_FIRST_CONN', 'Première connexion');
-}
if (!defined('_LOGIN')) {
define('_LOGIN', 'Connexion');
}
@@ -784,15 +763,6 @@ if (!defined('_ROLE')) {
define('_ROLE', 'Rôle');
}
-if (!defined('_THE_PSW')) {
- define('_THE_PSW', 'Le mot de passe');
-}
-if (!defined('_THE_PSW_VALIDATION')) {
- define('_THE_PSW_VALIDATION', 'La validation du mot de passe');
-}
-if (!defined('_MODIFICATION_PSW_SNTE')) {
- define('_MODIFICATION_PSW_SNTE', 'Pour modifier votre mot de passe, vous devez confirmer celui-ci.');
-}
if (!defined('_USER_ACCESS_DEPARTMENT')) {
define('_USER_ACCESS_DEPARTMENT', "L'utilisateur a accès aux entités suivantes");
}
@@ -2135,15 +2105,6 @@ if (!defined('_DUPLICATES_BY_NAME')) {
if (!defined('_IS_ATTACHED_TO_DOC')) {
define('_IS_ATTACHED_TO_DOC', 'Attaché à des documents ?');
}
-if (!defined('_RES_ATTACHED')) {
- define('_RES_ATTACHED', 'Documents attachés');
-}
-if (!defined('_SELECT_CONTACT_TO_REPLACE')) {
- define('_SELECT_CONTACT_TO_REPLACE', "Sélectionner le contact et l'adresse remplaçant");
-}
-if (!defined('_ARE_YOU_SURE_TO_DELETE_CONTACT')) {
- define('_ARE_YOU_SURE_TO_DELETE_CONTACT', 'êtes vous sûr de supprimer le contact ?');
-}
if (!defined('_CONTACT_CHECK')) {
define('_CONTACT_CHECK', 'Au moins un courrier enregistré récemment est affecté au même contact.');
}
@@ -3225,9 +3186,6 @@ if (!defined('_MANAGE_DOCSERVER_TYPES')) {
if (!defined('_MANAGE_DOCSERVER_TYPES_DESC')) {
define('_MANAGE_DOCSERVER_TYPES_DESC', 'Ajouter, modifier, supprimer les types de zones de stockage ');
}
-if (!defined('_ADMIN_DOCSERVERS')) {
- define('_ADMIN_DOCSERVERS', ' Administration des zones de stockage');
-}
if (!defined('_DOCSERVER_ID')) {
define('_DOCSERVER_ID', 'Identifiant docserver');
}
@@ -4319,9 +4277,6 @@ if (!defined('_CURRENT_PSW')) {
if (!defined('_NEW_PSW')) {
define('_NEW_PSW', 'Nouveau mot de passe');
}
-if (!defined('_REENTER_PSW')) {
- define('_REENTER_PSW', 'Retaper le mot de passe');
-}
if (!defined('_UPDATED_PROFILE')) {
define('_UPDATED_PROFILE', 'Votre profil a bien été modifié');
}
@@ -4329,9 +4284,6 @@ if (!defined('_UPDATED_PROFILE')) {
if (!defined('_WRONG_PSW')) {
define('_WRONG_PSW', 'Le mot de passe actuel n\'est pas correct');
}
-if (!defined('_WRONG_SECOND_PSW')) {
- define('_WRONG_SECOND_PSW', 'Le deuxième mot de passe ne correspond pas au premier mot de passe !');
-}
if (!defined('_EMPTY_PSW_FORM')) {
define('_EMPTY_PSW_FORM', 'Le formulaire de mot de passe n\'est pas complet');
}
diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php
index 8ea6145f626812ca9d06c465c62a802eaec3a2cc..7b7b0d1a3ffa6a2f0d9cd60b3a13b7b87bcdc006 100755
--- a/apps/maarch_entreprise/lang/nl.php
+++ b/apps/maarch_entreprise/lang/nl.php
@@ -25,7 +25,6 @@ if (!defined('_SEND_ATTACHMENTS_TO_CONTACT')) { define('_SEND_ATTACHMENTS_TO_CON
if (!defined('_SEND_ATTACHMENTS_TO_CONTACT_DESC')) { define('_SEND_ATTACHMENTS_TO_CONTACT_DESC', 'Opent een mailverzendingsmodaliteit met de e-mail van het aan het document gekoppelde contact als bestemmeling.');}
if (!defined('_PROCESSING_MODE')) { define('_PROCESSING_MODE', 'Verwerkingswijze');}
if (!defined('_ADMIN_USERS')) { define('_ADMIN_USERS', 'Gebruikers');}
-if (!defined('_ADMIN_DOCSERVERS')) { define('_ADMIN_DOCSERVERS', 'Opslagruimtes');}
if (!defined('_ADMIN_GROUPS')) { define('_ADMIN_GROUPS', 'Gebruikersgroepen');}
if (!defined('_VIEW_HISTORY')) { define('_VIEW_HISTORY', 'Geschiedenis');}
if (!defined('_VIEW_HISTORY_BATCH')) { define('_VIEW_HISTORY_BATCH', 'Geschiedenis van de batches');}
@@ -188,12 +187,6 @@ if (!defined('_BAD_FEBRUARY')) { define('_BAD_FEBRUARY', 'De maand februari mag
if (!defined('_CHAPTER_SHORT')) { define('_CHAPTER_SHORT', 'Hfst');}
if (!defined('_PROCESS_SHORT')) { define('_PROCESS_SHORT', 'Verwerking');}
if (!defined('_CARD')) { define('_CARD', 'Fiche');}
-if (!defined('_MODIFICATION_PSW')) { define('_MODIFICATION_PSW', 'Wachtwoord wijzigen');}
-if (!defined('_YOUR_FIRST_CONNEXION')) { define('_YOUR_FIRST_CONNEXION', 'Welkom bij Maarch ! <br/>Dit is uw eerste verbinding');}
-if (!defined('_PLEASE_CHANGE_PSW')) { define('_PLEASE_CHANGE_PSW', 'Definieer uw wachtwoord');}
-if (!defined('_ASKED_ONLY_ONCE')) { define('_ASKED_ONLY_ONCE', 'Dit wordt u maar éénmaal gevraagd');}
-if (!defined('_PSW_REINI')) { define('_PSW_REINI', 'Uw wachtwoord werd gereset. Definieer een nieuw wachtwoord.');}
-if (!defined('_FIRST_CONN')) { define('_FIRST_CONN', 'Eerste verbinding');}
if (!defined('_LOGIN')) { define('_LOGIN', 'Aanmelden');}
if (!defined('_RELOGIN')) { define('_RELOGIN', 'Nieuwe verbinding');}
if (!defined('_RA_CODE')) { define('_RA_CODE', 'Bijkomende toegangscode');}
@@ -255,9 +248,6 @@ if (!defined('_USER_BELONGS_NO_ENTITY')) { define('_USER_BELONGS_NO_ENTITY', 'De
if (!defined('_CHOOSE_ONE_GROUP')) { define('_CHOOSE_ONE_GROUP', 'Kies minstens een groep');}
if (!defined('_CHOOSE_GROUP')) { define('_CHOOSE_GROUP', 'Kies een groep');}
if (!defined('_ROLE')) { define('_ROLE', 'Functie');}
-if (!defined('_THE_PSW')) { define('_THE_PSW', 'Het wachtwoord');}
-if (!defined('_THE_PSW_VALIDATION')) { define('_THE_PSW_VALIDATION', 'De bevestiging van het wachtwoord');}
-if (!defined('_MODIFICATION_PSW_SNTE')) { define('_MODIFICATION_PSW_SNTE', 'Om uw wachtwoord te wijzigen moet u dit bevestigen.');}
if (!defined('_USER_ACCESS_DEPARTMENT')) { define('_USER_ACCESS_DEPARTMENT', 'De gebruiker heeft toegang tot de volgende diensten');}
if (!defined('_FIRST_PSW')) { define('_FIRST_PSW', 'Het eerste wachtwoord');}
if (!defined('_SECOND_PSW')) { define('_SECOND_PSW', 'Het tweede wachtwoord');}
@@ -683,9 +673,6 @@ if (!defined('_MANAGE_DUPLICATES')) { define('_MANAGE_DUPLICATES', 'Beheer van d
if (!defined('_DUPLICATES_BY_SOCIETY')) { define('_DUPLICATES_BY_SOCIETY', 'Dubbele elementen per organisatie/vennootschap');}
if (!defined('_DUPLICATES_BY_NAME')) { define('_DUPLICATES_BY_NAME', 'Dubbele elementen per familienaam/voornaam');}
if (!defined('_IS_ATTACHED_TO_DOC')) { define('_IS_ATTACHED_TO_DOC', 'Bij documenten gevoegd?');}
-if (!defined('_RES_ATTACHED')) { define('_RES_ATTACHED', 'Bijgevoegde documenten');}
-if (!defined('_SELECT_CONTACT_TO_REPLACE')) { define('_SELECT_CONTACT_TO_REPLACE', 'Het contact en het adres van de vervanger selecteren');}
-if (!defined('_ARE_YOU_SURE_TO_DELETE_CONTACT')) { define('_ARE_YOU_SURE_TO_DELETE_CONTACT', 'Weet u zeker dat u het contact wil verwijderen?');}
if (!defined('_CONTACT_CHECK')) { define('_CONTACT_CHECK', 'Minstens één recent bewaarde brief is aan hetzelfde contact toegewezen.');}
if (!defined('_NO_SOCIETY_DUPLICATES')) { define('_NO_SOCIETY_DUPLICATES', 'Geen dubbel element voor rechtscontacten');}
if (!defined('_NO_NAME_DUPLICATES')) { define('_NO_NAME_DUPLICATES', 'Geen dubbel element voor contacten met natuurlijke personen (voornaam familienaam)');}
@@ -1021,7 +1008,6 @@ if (!defined('_MANAGE_DOCSERVERS_LOCATIONS')) { define('_MANAGE_DOCSERVERS_LOCAT
if (!defined('_MANAGE_DOCSERVERS_LOCATIONS_DESC')) { define('_MANAGE_DOCSERVERS_LOCATIONS_DESC', 'De opslagruimtes van documenten toevoegen, verwijderen, wijzigen');}
if (!defined('_MANAGE_DOCSERVER_TYPES')) { define('_MANAGE_DOCSERVER_TYPES', 'De opslagruimtetypes beheren');}
if (!defined('_MANAGE_DOCSERVER_TYPES_DESC')) { define('_MANAGE_DOCSERVER_TYPES_DESC', 'Opslagruimtes toevoegen, wijzigen, verwijderen');}
-if (!defined('_ADMIN_DOCSERVERS')) { define('_ADMIN_DOCSERVERS', 'Beheer van opslagruimtes');}
if (!defined('_DOCSERVER_ID')) { define('_DOCSERVER_ID', 'Gebruikersnaam docserver');}
if (!defined('_YOU_CANNOT_DELETE')) { define('_YOU_CANNOT_DELETE', 'Verwijderen onmogelijk');}
if (!defined('_UNKNOWN')) { define('_UNKNOWN', 'Onbekend');}
@@ -1378,10 +1364,8 @@ if (!defined('_DIGITAL_FINGERPRINT')) { define('_DIGITAL_FINGERPRINT', 'Digitale
if (!defined('_UPDATE_PSW')) { define('_UPDATE_PSW', 'Uw wachtwoord wijzigen');}
if (!defined('_CURRENT_PSW')) { define('_CURRENT_PSW', 'Huidig wachtwoord');}
if (!defined('_NEW_PSW')) { define('_NEW_PSW', 'Nieuw wachtwoord');}
-if (!defined('_REENTER_PSW')) { define('_REENTER_PSW', 'Wachtwoord opnieuw intypen');}
if (!defined('_UPDATED_PROFILE')) { define('_UPDATED_PROFILE', 'Uw profiel werd wel degelijk gewijzigd');}
if (!defined('_WRONG_PSW')) { define('_WRONG_PSW', 'Het huidige wachtwoord is niet correct');}
-if (!defined('_WRONG_SECOND_PSW')) { define('_WRONG_SECOND_PSW', 'Het tweede wachtwoord komt niet met het eerste wachtwoord overeen!');}
if (!defined('_EMPTY_PSW_FORM')) { define('_EMPTY_PSW_FORM', 'Het formulier van het wachtwoord is onvolledig');}
if (!defined('_UPDATED_PASSWORD')) { define('_UPDATED_PASSWORD', 'Uw wachtwoord werd wel degelijk gewijzigd');}
if (!defined('_SB_SIGNATURES')) { define('_SB_SIGNATURES', 'Handtekeningen van de parafeerder');}
diff --git a/apps/maarch_entreprise/select_attachedAddress.php b/apps/maarch_entreprise/select_attachedAddress.php
deleted file mode 100755
index 99ac336c128a012e7ada5e28d613917cbdfa5658..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/select_attachedAddress.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-*
-* @since 04/2015
-* @license GPL
-* @author <dev@maarch.org>
-*/
-
-$contactAddresses = array();
-$db = new Database();
-
-require_once("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR
- ."class".DIRECTORY_SEPARATOR."class_contacts_v2.php");
-$contact = new contacts_v2();
-$core_tools = new core_tools('');
-$core_tools->test_user();
-
-$query = "SELECT ca.id, ca.lastname as ca_lastname, ca.firstname, ca.contact_purpose_id, cp.label
- FROM ".$_SESSION['tablename']['contact_addresses']." ca
- LEFT JOIN contact_purposes cp on ca.contact_purpose_id = cp.id
- WHERE ca.contact_id = ?";
-
-$arrayPDO = array($_POST['contact_id']);
-
-$query .= " order by ca_lastname";
-$stmt = $db->query($query, $arrayPDO);
-
-$listArray = array();
-while($line = $stmt->fetchObject())
-{
- $contactAddress = $contact->get_label_contact(
- $line->contact_purpose_id, $_SESSION['tablename']['contact_purposes']
- );
-
- if ($line->ca_lastname <> "" || $line->firstname) {
- $contactAddress .= " :";
- if ($line->ca_lastname <> "") {
- $contactAddress .= " " . functions::xssafe($line->ca_lastname);
- }
- if ($line->firstname <> "") {
- $contactAddress .= " " . functions::xssafe($line->firstname);
- }
- }
- array_push($contactAddresses,array('contact_id' => $line->id,'name' => $contactAddress ));
-}
-
-$frmStr .= '<select name="selectContactAddress_'.functions::xssafe($_POST['select'])
- .'" id="selectContactAddress_'.functions::xssafe($_POST['select']).'" > ';
-
-$countsContactAddress = count($contactAddresses);
-$frmStr .= '<option value="">Sélectionner une adresse</option>';
-for ($cptsContacts = 0;$cptsContacts< $countsContactAddress;$cptsContacts++) {
-
- $frmStr .= '<option value="'.functions::xssafe($contactAddresses[$cptsContacts]['contact_id']).'">'
- . functions::xssafe(functions::show_string($contactAddresses[$cptsContacts]['name']))
- . '</option>';
-}
-$frmStr .= '</select></td>';
-
-echo $frmStr;
-
\ No newline at end of file
diff --git a/apps/maarch_entreprise/template/admin_parameter.html b/apps/maarch_entreprise/template/admin_parameter.html
deleted file mode 100755
index 7dbdb36bcf8e063e77384777bf24c89004685e42..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/template/admin_parameter.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<br/>
-<div class="block">
-<div id="parameter" class="forms" style="width:400px;margin:auto;">
- <h1>_PARAMETER</h1>
- <datalist id="messages">
- <option id='_ID_IS_MANDATORY' value="_ID_IS_MANDATORY">
- <option id='_VALUE_IS_MANDATORY' value="_VALUE_IS_MANDATORY">
- <option id='_INVALID_PARAMETER_ID' value="_INVALID_PARAMETER_ID">
- </datalist>
- <input name="mode" id="mode" type="hidden" />
- <p/>
- <p>
- <label for="id" style="" >_ID</label>
- <input name="id" id="id" type="text" /><span class="red_asterisk"><i class="fa fa-star"></i></span>
- </p>
- <p>
- <label for="type">_TYPE</label>
- <select name="type" id="type" onChange="display_input_value();">
- <option value="string" >_STRING</option>
- <option value="int" >_INT</option>
- <option value="date" >_DATE</option>
- </select>
- <span class="red_asterisk"><i class="fa fa-star"></i></span>
- </p>
- <p>
- <label for="param_value_string">_VALUE</label>
- <input name="param_value_string" id="param_value_string" type="text" style="display:none"/>
- <input name="param_value_int" id="param_value_int" type="text" style="display:none"/>
- <input name="param_value_date" id="param_value_date" type="text" style="display:none" onclick="showCalender(this);"/>
- </p>
- <p>
- <label for="description">_DESC</label>
- <textarea name="description" id="description" ></textarea>
- </p>
- <p class="buttons" style="text-align:center;">
- <input type="button" value="_SUBMIT" class="button" onclick="save_parameter();" />
- <input type="button" value="_CANCEL" id="cancel" class="button" />
- </p>
- <script type="text/javascript">
- // Execution
- //*************************************************************************
- // If mode is DEL, direct call to save function
- var mode = $('mode').value;
- if(mode == 'del')
- save_parameter();
-
- // Else display value and remain on view
- display_input_value();
-
- // Functions
- //*************************************************************************
- function display_input_value()
- {
- var type = $('type').value;
-
- $('param_value_string').style.display = 'none';
- $('param_value_int').style.display = 'none';
- $('param_value_date').style.display = 'none';
-
- $('param_value_' + type).style.display = 'block';
- }
-
- function save_parameter()
- {
- var main_error = $('main_error');
-
- var mode = $('mode').value;
- var id = $('id').value;
- var type = $('type').value;
- var description = $('description').value;
- var param_value_string = $('param_value_string').value;
- var param_value_int = $('param_value_int').value;
- var param_value_date = $('param_value_date').value;
-
- // Control
- //***********************************************************************
- var valid = true;
- main_error.innerHTML = '';
-
- if(id == '') {
- main_error.innerHTML += "<br/>" + $('_ID_IS_MANDATORY').value;
- valid = false;
- }
- if(
- (type == 'string' && param_value_string == '')
- || (type == 'int' && param_value_int == '')
- || (type == 'date' && param_value_date == '')
- ){
- main_error.innerHTML += "<br/>" + $('_VALUE_IS_MANDATORY').value;
- valid = false;
- }
- var token = id.match(/[\w_]+/g);
- if(!token || token[0] != id) {
- main_error.innerHTML += "<br/>" + $('_INVALID_PARAMETER_ID').value;
- valid = false;
- }
-
- // Save
- //***********************************************************************
- if(valid == true) {
- new Ajax.Request(
- 'index.php?display=true&admin=parameters&page=admin_parameter_save',
- {
- method:'post',
- parameters:
- {
- mode : mode,
- id : id,
- type : type,
- description : description,
- param_value_string : param_value_string,
- param_value_int : param_value_int,
- param_value_date : param_value_date
- },
- onSuccess: function(answer){
- if(answer.responseText)
- main_error.innerHTML = answer.responseText;
- else {
- goTo('index.php?admin=parameters&page=admin_parameters');
- }
- }
- }
- );
- }
-
- }
-
- </script>
-</div>
-</div>
-
diff --git a/apps/maarch_entreprise/verif_pass.php b/apps/maarch_entreprise/verif_pass.php
deleted file mode 100755
index e8408a45c37aee371ab91d22c10bf347b0c8cc70..0000000000000000000000000000000000000000
--- a/apps/maarch_entreprise/verif_pass.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-* File : verif_pass.php
-*
-* Treat the user modification (new password)
-*
-* @package Maarch PeopleBox 1.0
-* @version 2.0
-* @since 06/2006
-* @license GPL
-* @author Claire Figueras <dev@maarch.org>
-*/
-
-require_once('core' . DIRECTORY_SEPARATOR . 'class'
- . DIRECTORY_SEPARATOR . 'class_security.php');
-
-$core_tools = new core_tools();
-$core_tools->load_lang();
-$func = new functions();
-
-$_SESSION['error'] ="";
-$_SESSION['user']['pass'] = $func->wash($_REQUEST['pass1'], "no", _THE_PSW);
-
-$pass2 = $func->wash($_REQUEST['pass2'], "no", _THE_PSW_VALIDATION);
-
-if($_SESSION['user']['pass'] <> $pass2)
-{
- $_SESSION['error'] = _WRONG_SECOND_PSW;
-}
-else
-{
- $sec = new security();
- $_SESSION['user']['pass'] = $sec->getPasswordHash($pass2);
-}
-
-$_SESSION['user']['FirstName'] = $func->wash($_REQUEST['FirstName'], "no", _THE_LASTNAME);
-$_SESSION['user']['LastName'] = $func->wash($_REQUEST['LastName'], "no", _THE_FIRSTNAME);
-
-if(isset($_REQUEST['Department']) && !empty($_REQUEST['Department']))
-{
- $_SESSION['user']['department'] = $func->wash($_REQUEST['Department'], "no", _THE_DEPARTMENT);
-}
-
-if(isset($_REQUEST['Phone']) && !empty($_REQUEST['Phone']))
-{
- $_SESSION['user']['Phone'] = $_REQUEST['Phone'];
-}
-$_SESSION['user']['Mail'] = '';
-$tmp=$func->wash($_REQUEST['Mail'], "mail", _MAIL);
-if($tmp <> false)
-{
- $_SESSION['user']['Mail'] = $tmp;
-}
-if(!empty($_SESSION['error']))
-{
- header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=change_pass");
- exit();
-}
-else
-{
- $db = new Database();
-
- $tmp_fn = $_SESSION['user']['FirstName'];
- $tmp_ln = $_SESSION['user']['LastName'];
- $tmp_dep = $_SESSION['user']['department'];
-
- $db->query("UPDATE ".$_SESSION['tablename']['users']." SET firstname = ?, lastname = ?, phone = ?, mail = ? , change_password = 'N' where user_id = ?",
- array($tmp_fn, $tmp_ln, $_SESSION['user']['Phone'], $_SESSION['user']['Mail'], $_SESSION['user']['UserId']));
-
- $user = \User\models\UserModel::getByLogin(['select' => ['id'], 'login' => $_SESSION['user']['UserId']]);
- \User\models\UserModel::updatePassword(['id' => $user['id'], 'password' => $pass2]);
-
- header("location: ".$_SESSION['config']['businessappurl']."index.php");
- exit();
-
-}
diff --git a/apps/maarch_entreprise/xml/IVS/requests_definitions.xml b/apps/maarch_entreprise/xml/IVS/requests_definitions.xml
index c4f17cd1d993b0c472481fb112ec720606b27397..6fd08e78f3e913e16d85cdb71a8a668b3a955cab 100755
--- a/apps/maarch_entreprise/xml/IVS/requests_definitions.xml
+++ b/apps/maarch_entreprise/xml/IVS/requests_definitions.xml
@@ -79,11 +79,6 @@
<parameter name="admin" value="contacts"/>
<parameter name="display" value="true"/>
</requestDefinition>
- <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="ajaxLoadDeleteContact" >
- <parameter name="page" value="ajaxLoadDeleteContactDiv"/>
- <parameter name="admin" value="contacts"/>
- <parameter name="display" value="true"/>
- </requestDefinition>
<requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="ajaxDeleteContact" >
<parameter name="page" value="ajaxDeleteContact"/>
<parameter name="admin" value="contacts"/>
@@ -440,11 +435,6 @@
<parameter name="display" value="true"/>
</requestDefinition>
- <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="verif_pass" >
- <parameter name="page" value="verif_pass"/>
- <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"/>
@@ -476,11 +466,6 @@
<parameter name="Input"/>
</requestDefinition>
- <requestDefinition method="POST" path="/apps/maarch_entreprise/index.php" validationRule="select_address" >
- <parameter name="page" value="select_attachedAddress"/>
- <parameter name="display" value="true"/>
- </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"/>
diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
index de78c11edf8d247f5932f70cfb160cd7a3210a6f..6a39032e32bbd59434f94ad941affdeed2db99c2 100755
--- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml
+++ b/apps/maarch_entreprise/xml/IVS/validation_rules.xml
@@ -33,12 +33,6 @@
<parameter name="contact_id" type="integer" />
</validationRule>
- <validationRule name="ajaxLoadDeleteContact" extends="standardForm" mode="error">
- <parameter name="contact_id" type="integer" />
- <parameter name="name" type="string" />
- <parameter name="society_label" type="string" />
- </validationRule>
-
<validationRule name="ajaxDeleteContact" extends="standardForm" mode="error">
<parameter name="contactId" type="integer" />
<parameter name="replacedAddressId" type="string" />
@@ -588,16 +582,6 @@
<parameter name="tableHist" type="res_view_table_list" />
</validationRule>
- <validationRule name="verif_pass" extends="standardForm" mode="error">
- <parameter name="FirstName" type="string" />
- <parameter name="LastName" type="personname" />
- <parameter name="Mail" type="email" />
- <parameter name="Phone" type="phone" />
- <parameter name="Submit" type="identifier" />
- <parameter name="pass1" type="string" />
- <parameter name="pass2" type="string" />
- </validationRule>
-
<validationRule name="id_identifier" extends="standardForm" mode="error">
<parameter name="id" type="identifier" />
</validationRule>
diff --git a/core/class/class_functions.php b/core/class/class_functions.php
index ea00bcc12a55b3a7b4f61bf2b8f585dcb24ef6bb..509fee12debc6ad5fa17bdf4fd52778a0fad4514 100755
--- a/core/class/class_functions.php
+++ b/core/class/class_functions.php
@@ -46,21 +46,6 @@ class functions
*/
private $f_page;
- /**
- * To calculate the page generation time
- * Integer
- */
- private $start_page;
-
- /**
- * Loads in the start_page variable the start time of the page loading
- *
- */
- public function start_page_stat()
- {
- $this->start_page = microtime(true);
- }
-
public function normalize ($string)
{
$a = 'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞ'
@@ -95,47 +80,6 @@ class functions
}
}
- /**
- * Ends the page loading time and displays it
- *
- */
- public function show_page_stat()
- {
- $end_page = microtime(true);
- $page_total = round($end_page - $this->start_page,3);
- if($page_total > 1)
- {
- $page_seconds = _SECONDS;
- }
- else
- {
- $page_seconds = _SECOND;
- }
- echo _PAGE_GENERATED_IN." <b>".$page_total."</b> ".$page_seconds;
- }
-
- /**
- * Configures the actual position of the visitor with all query strings to go to the right page after the logging action
- *
- * @param $index string "index.php?" by default
- */
- public function configPosition($index ="index.php?")
- {
- $querystring = $_SERVER['QUERY_STRING'];
- $tab_query = explode("&",$querystring);
- $querystring = "";
-
- for($i=0;$i<count($tab_query);$i++)
- {
- if(substr($tab_query[$i],0,3) <> "css" && substr($tab_query[$i],0,3) <> "CSS")
- {
- $querystring .= $tab_query[$i]."&";
- }
- }
- $querystring = substr($querystring,0,strlen($querystring)-1);
- $_SESSION['position'] = $index.$querystring;
- }
-
/**
* Adds en error to the errors log
*
@@ -525,41 +469,6 @@ class functions
return '';
}
- /**
- * Writes an error in pre formating format with header and footer
- *
- * @param $title string Error title
- * @param $message string Error message
- * @param $type string If 'title' then displays the title otherwise do not displays it (empty by default)
- * @param $img_src string Source of the image to show (empty by default)
- */
- public function echo_error($title,$message, $type = '', $img_src = '')
- {
- if ($type == 'title' || $type <> '')
- {
- if($img_src <> '')
- {
- echo '<h1><img src="'.$img_src.'" alt="" />'.$title.'</h1>';
- }
- else
- {
- echo "<h1>".$title."</h1>";
- }
- echo '<div id="inner_content">';
- } ?>
- <p> </p>
- <p> </p>
- <p> </p>
- <p> </p>
- <p> </p>
- <p> </p>
- <?php functions::xecho($message);
- if ($type <> '')
- {
- echo '</div>';
- }
- }
-
/**
* Returns a formated date for SQL queries
*
@@ -1049,55 +958,6 @@ class functions
}
return $foundDoc;
}
-
- /**
- * Generate an UUID v4
- * @return string UUID
- */
- function gen_uuid()
- {
- return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
- // 32 bits for "time_low"
- mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-
- // 16 bits for "time_mid"
- mt_rand( 0, 0xffff ),
-
- // 16 bits for "time_hi_and_version",
- // four most significant bits holds version number 4
- mt_rand( 0, 0x0fff ) | 0x4000,
-
- // 16 bits, 8 bits for "clk_seq_hi_res",
- // 8 bits for "clk_seq_low",
- // two most significant bits holds zero and one for variant DCE1.1
- mt_rand( 0, 0x3fff ) | 0x8000,
-
- // 48 bits for "node"
- mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
- );
- }
-
- /**
- * Return the amount corresponding to the currency
- * @param $currency string currency of the amount
- * @param $amount float the amount
- */
- function formatAmount($currency, $amount)
- {
- $formattedAmount = '';
- if ($currency == 'EUR') {
- $formattedAmount = '€' . number_format($amount , 2 , ',' , '.' );
- } elseif ($currency == 'DOL') {
- $formattedAmount = '$' . number_format($amount , 2 , ',' , '.' );
- } elseif ($currency == 'YEN') {
- $formattedAmount = 'Â¥' . number_format($amount , 2 , ',' , '.' );
- } elseif ($currency == 'POU') {
- $formattedAmount = '£' . number_format($amount , 2 , ',' , '.' );
- } else {
- $formattedAmount = ' ' . number_format($amount , 2 , ',' , '.' );
- }
- return $formattedAmount;
- }
/**
* xss mitigation functions
diff --git a/install/class/Class_Install.php b/install/class/Class_Install.php
index 797ea05ebdf90b2657ccaa066c7ee62a4b6c1fe1..04c1646b5ae93e7afb24b24bb0f48c98684c4b2d 100755
--- a/install/class/Class_Install.php
+++ b/install/class/Class_Install.php
@@ -36,16 +36,12 @@ class Install extends functions
array('FASTHD_AI', 'ai'),
array('FASTHD_MAN', 'manual'),
array('FASTHD_ATTACH', 'manual_attachments'),
- array('FASTHD_ATTACH_VERSION', 'manual_attachments_version'),
array('CONVERT_MLB', 'convert_mlb'),
array('CONVERT_ATTACH', 'convert_attachments'),
- array('CONVERT_ATTACH_VERSION', 'convert_attachments_version'),
array('TNL_MLB', 'thumbnails_mlb'),
array('TNL_ATTACH', 'thumbnails_attachments'),
- array('TNL_ATTACH_VERSION', 'thumbnails_attachments_version'),
array('FULLTEXT_MLB', 'fulltext_mlb'),
array('FULLTEXT_ATTACH', 'fulltext_attachments'),
- array('FULLTEXT_ATTACH_VERSION', 'fulltext_attachments_version'),
array('TEMPLATES', 'templates'),
array('ARCHIVETRANSFER', 'archive_transfer'),
array('ACKNOWLEDGEMENT_RECEIPTS', 'acknowledgment_receipts'),
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 22613fd79f0b4334ce4e71ce760c8b0ff27a83f6..4fb1f0c206265f085e147312f70ce20e3b29856e 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -810,26 +810,18 @@ VALUES ('FASTHD_MAN', 'DOC', 'Dépôt documentaire de numérisation manuelle', '
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('FASTHD_ATTACH', 'FASTHD', 'Dépôt des pièces jointes', 'N', 50000000000, 1, '/opt/maarch/docservers/manual_attachments/', '2011-01-13 14:47:49.197164', 'attachments_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
-VALUES ('FASTHD_ATTACH_VERSION', 'FASTHD', 'Dépôt des pièces jointes versionnées', 'N', 50000000000, 1, '/opt/maarch/docservers/manual_attachments_version/', '2011-01-13 14:47:49.197164', 'attachments_version_coll');
-INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('CONVERT_MLB', 'CONVERT', 'Dépôt des formats des documents numérisés', 'N', 50000000000, 0, '/opt/maarch/docservers/convert_mlb/', '2015-03-16 14:47:49.197164', 'letterbox_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('CONVERT_ATTACH', 'CONVERT', 'Dépôt des formats des pièces jointes', 'N', 50000000000, 0, '/opt/maarch/docservers/convert_attachments/', '2015-03-16 14:47:49.197164', 'attachments_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
-VALUES ('CONVERT_ATTACH_VERSION', 'CONVERT', 'Dépôt des formats des pièces jointes versionnées', 'N', 50000000000, 0, '/opt/maarch/docservers/convert_attachments_version/', '2015-03-16 14:47:49.197164', 'attachments_version_coll');
-INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('TNL_MLB', 'TNL', 'Dépôt des maniatures des documents numérisés', 'N', 50000000000, 0, '/opt/maarch/docservers/thumbnails_mlb/', '2015-03-16 14:47:49.197164', 'letterbox_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('TNL_ATTACH', 'TNL', 'Dépôt des maniatures des pièces jointes', 'N', 50000000000, 0, '/opt/maarch/docservers/thumbnails_attachments/', '2015-03-16 14:47:49.197164', 'attachments_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
-VALUES ('TNL_ATTACH_VERSION', 'TNL', 'Dépôt des maniatures des pièces jointes versionnées', 'N', 50000000000, 0, '/opt/maarch/docservers/thumbnails_attachments_version/', '2015-03-16 14:47:49.197164', 'attachments_version_coll');
-INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('FULLTEXT_MLB', 'FULLTEXT', 'Dépôt de l''extraction plein texte des documents numérisés', 'N', 50000000000, 0, '/opt/maarch/docservers/fulltext_mlb/', '2015-03-16 14:47:49.197164', 'letterbox_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('FULLTEXT_ATTACH', 'FULLTEXT', 'Dépôt de l''extraction plein texte des pièces jointes', 'N', 50000000000, 0, '/opt/maarch/docservers/fulltext_attachments/', '2015-03-16 14:47:49.197164', 'attachments_coll');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
-VALUES ('FULLTEXT_ATTACH_VERSION', 'FULLTEXT', 'Dépôt de l''extraction plein texte des pièces jointes versionnées', 'N', 50000000000, 0, '/opt/maarch/docservers/fulltext_attachments_version/', '2015-03-16 14:47:49.197164', 'attachments_version_coll');
-INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('TEMPLATES', 'TEMPLATES', 'Dépôt des modèles de documents', 'N', 50000000000, 71511, '/opt/maarch/docservers/templates/', '2012-04-01 14:49:05.095119', 'templates');
INSERT INTO docservers (docserver_id, docserver_type_id, device_label, is_readonly, size_limit_number, actual_size_number, path_template, creation_date, coll_id)
VALUES ('ARCHIVETRANSFER', 'ARCHIVETRANSFER', 'Dépôt des archives numériques', 'N', 50000000000, 1, '/opt/maarch/docservers/archive_transfer/', '2017-01-13 14:47:49.197164', 'archive_transfer_coll');