From 94409f793de79f4b4d7d233113a74e5edd89bdea Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Sun, 23 Feb 2020 21:31:43 +0100
Subject: [PATCH] Clean useless code
---
.../actions/sendToExternalSignatureBook.php | 96 +------------------
.../indexing_searching/search_adv.php | 2 -
.../indexing_searching/search_adv_result.php | 9 +-
3 files changed, 4 insertions(+), 103 deletions(-)
diff --git a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
index 5575943ae7a..054ce6bf845 100755
--- a/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
+++ b/apps/maarch_entreprise/actions/sendToExternalSignatureBook.php
@@ -69,33 +69,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$htmlModal = FastParapheurController::getModal($config);
} elseif ($config['id'] == 'maarchParapheur') {
- include_once 'modules/visa/class/MaarchParapheurController.php';
-
- $htmlModal = MaarchParapheurController::getInitializeDatas($config);
-
- if (empty($htmlModal['error'])) {
- $aUsersInMP = [];
- foreach ($htmlModal['users'] as $value) {
- $aUsersInMP[] = $value['id'];
- }
- $documentIds = explode(", ", $values_str);
- foreach ($documentIds as $resId) {
- $listinstances = \Entity\models\ListInstanceModel::getVisaCircuitByResId(['select' => ['external_id', 'firstname', 'lastname'], 'id' => $resId]);
- if (empty($listinstances)) {
- $htmlModal['error'] = _EMPTY_VISA_WORKFLOW;
- break;
- }
-
- foreach ($listinstances as $user) {
- $externalId = json_decode($user['external_id'], true);
- if (!in_array($externalId['maarchParapheur'], $aUsersInMP)) {
- $htmlModal['error'] = _EMPTY_VISA_WORKFLOW;
- break 2;
- }
- }
- }
- $htmlModal = '';
- }
+ // Already in V2
}
if (!empty($htmlModal['error'])) {
@@ -146,43 +120,7 @@ function check_form($form_id, $values)
}
}
if ($config['id'] == 'maarchParapheur') {
- $hasAttachmentError = hasAttachmentError();
- if (!empty($_SESSION['stockCheckbox'])) {
- $aResources = $_SESSION['stockCheckbox'];
- } else {
- $aResources = [$_SESSION['doc_id']];
- }
-
- if ($hasAttachmentError['error']) {
- if (!empty($_SESSION['stockCheckbox'])) {
- $_SESSION['action_error'] = _MAIL_HAS_NO_RESPONSE_PROJECT . ' : ' . implode(",", $hasAttachmentError['resList']);
- } else {
- $_SESSION['action_error'] = _NO_RESPONSE_PROJECT_VISA;
- }
- return false;
- } else {
- foreach ($aResources as $resId) {
- $attachments = \Attachment\models\AttachmentModel::get([
- 'select' => [
- 'res_id', 'title', 'identifier', 'attachment_type',
- 'status', 'typist', 'docserver_id', 'path', 'filename', 'creation_date',
- 'validation_date', 'relation'
- ],
- 'where' => ["res_id_master = ?", "attachment_type not in (?)", "status not in ('DEL', 'OBS', 'FRZ', 'TMP')", "in_signature_book = 'true'"],
- 'data' => [$resId, ['converted_pdf', 'print_folder', 'signed_response']]
- ]);
-
- foreach ($attachments as $value) {
- $adrInfo = \Convert\controllers\ConvertPdfController::getConvertedPdfById(['resId' => $value['res_id'], 'collId' => 'attachments_coll']);
- $docserverInfo = \Docserver\models\DocserverModel::getByDocserverId(['docserverId' => $adrInfo['docserver_id']]);
- $filePath = $docserverInfo['path_template'] . str_replace('#', '/', $adrInfo['path']) . $adrInfo['filename'];
- if (!is_file($filePath)) {
- $_SESSION['action_error'] = _FILE_MISSING . ' : ' . $filePath;
- return false;
- }
- }
- }
- }
+ // Already in V2
}
}
@@ -233,35 +171,7 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$attachmentToFreeze = $sendedInfo['sended'];
}
} elseif ($config['id'] == 'maarchParapheur') {
- $listinstances = \Entity\models\ListInstanceModel::getVisaCircuitByResId(['select' => ['external_id', 'users.user_id', 'requested_signature'], 'id' => $res_id]);
- if (empty($listinstances)) {
- var_dump('No visa workflow');
- }
-
- $workflow = [];
- foreach ($listinstances as $user) {
- $externalId = json_decode($user['external_id'], true);
- if (empty($externalId['maarchParapheur'])) {
- return ['error' => 'Some users do not exist in Maarch Parapheur'];
- }
- $workflow[] = ['externalId' => $externalId['maarchParapheur'], 'action' => ($user['requested_signature'] ? 'sign' : 'visa')];
- }
-
- $sendedInfo = \ExternalSignatoryBook\controllers\MaarchParapheurController::sendDatas([
- 'config' => $config,
- 'resIdMaster' => $res_id,
- 'objectSent' => 'attachment',
- 'userId' => $_SESSION['user']['UserId'],
- 'steps' => $workflow,
- ]);
- if (!empty($sendedInfo['error'])) {
- var_dump($sendedInfo['error']);
- exit;
- } else {
- $attachmentToFreeze = $sendedInfo['sended'];
- }
-
- $message = $sendedInfo['historyInfos'];
+ // Already In V2
}
}
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index d9b7b161355..acdfef9c984 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv.php
@@ -35,7 +35,6 @@ require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_secur
require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_manage_status.php';
require_once 'core'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'usergroups_controler.php';
require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_indexing_searching_app.php';
-require_once 'apps'.DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_types.php';
$core_tools = new core_tools();
$core_tools->test_user();
$core_tools->load_lang();
@@ -49,7 +48,6 @@ if (isset($_REQUEST['fromValidateMail'])) {
$_SESSION['fromValidateMail'] = '';
}
-$type = new types();
$func = new functions();
$conn = new Database();
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv_result.php b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
index 8dbbd850d0c..81815fb2281 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv_result.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv_result.php
@@ -32,21 +32,17 @@
require_once('core/class/class_request.php');
require_once('core/class/class_security.php');
require_once('apps/' . $_SESSION['config']['app_id'] . '/class/class_indexing_searching_app.php');
-require_once('apps/' . $_SESSION['config']['app_id'] . '/class/class_types.php');
$core_tools = new core_tools();
$core_tools->test_user();
$core_tools->load_lang();
$is = new indexing_searching_app();
$func = new functions();
$req = new request();
-$type = new types();
$fields = "";
$orderby = "";
$baskets_clause = '';
$coll_id = 'letterbox_coll';
-$indexes = $type->get_all_indexes($coll_id);
-//$func->show_array($indexes);
$_SESSION['error_search'] = '';
$_SESSION['searching']['comp_query'] = '';
$_SESSION['save_list']['fromDetail'] = "false";
@@ -424,10 +420,7 @@ where lower(translate(folders.label , 'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓ
."or (lower(translate(alt_identifier,'/','')) like lower(:multifieldWelcome) OR lower(alt_identifier) like lower(:multifieldWelcome)) "
."or lower(barcode) LIKE lower(:multifieldWelcome) "
."or res_id in (select identifier from notes where lower(translate(note_text,'ÀÃÂÃÄÅÆÇÈÉÊËÌÃÃŽÃÃÑÒÓÔÕÖØÙÚÛÜÃÞßà áâãäåæçèéêëìÃîïðñòóôõöøùúûýýþÿŔŕ','aaaaaaaceeeeiiiidnoooooouuuuybsaaaaaaaceeeeiiiidnoooooouuuyybyRr')) like lower(:multifieldWelcome)) "
- ."or res_id in (select res_id_master from res_attachments where (lower(translate(identifier,'/','')) like lower(:multifieldWelcome) OR lower(identifier) like lower(:multifieldWelcome)) AND status NOT IN ('DEL','OBS','TMP')) "
- ."or contact_id in (select contact_id from view_contacts where society ilike :multifieldWelcome or contact_firstname ilike :multifieldWelcome or contact_lastname ilike :multifieldWelcome) or (exp_user_id in (select user_id from users where firstname ilike :multifieldWelcome or lastname ilike :multifieldWelcome )))";
-
- $arrayPDO = array_merge($arrayPDO, array(":multifieldWelcomeReference" => "%".$welcome."%"));
+ ."or res_id in (select res_id_master from res_attachments where (lower(translate(identifier,'/','')) like lower(:multifieldWelcome) OR lower(identifier) like lower(:multifieldWelcome)) AND status NOT IN ('DEL','OBS','TMP')))";
$multifieldWelcome = \SrcCore\models\TextFormatModel::normalize(['string' => $welcome]);
$multifieldWelcome = preg_replace('/\s+/', ' ', $multifieldWelcome);
--
GitLab