diff --git a/modules/attachments/Controllers/AttachmentsController.php b/modules/attachments/Controllers/AttachmentsController.php index c555870a2f98dcf059c56b2a2b8b338b85944164..5c89a15c20772241e559e37fab3a02522545eef3 100755 --- a/modules/attachments/Controllers/AttachmentsController.php +++ b/modules/attachments/Controllers/AttachmentsController.php @@ -412,6 +412,11 @@ class AttachmentsController 'value' => $_SESSION['doc_id'], 'type' => 'integer' ]; + $transmissionDataPdf[] = [ + 'column' => 'in_signature_book', + 'value' => 1, + 'type' => 'bool' + ]; return $transmissionDataPdf; } diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php index 16ebd9e3f8dbcc463cc9b4c9424d236c684b360b..f4b4ba4f05e3fdb54a2ac72989741674a9f68e92 100755 --- a/modules/attachments/attachments_content.php +++ b/modules/attachments/attachments_content.php @@ -254,6 +254,11 @@ function setTransmissionDataPdf($nb, $storeResult) { 'value' => 1, 'type' => 'int' ]; + $transmissionDataPdf[] = [ + 'column' => 'in_signature_book', + 'value' => 1, + 'type' => 'bool' + ]; return $transmissionDataPdf; } @@ -341,10 +346,11 @@ if (isset($_POST['add']) && $_POST['add']) { <?php exit(); } else { + $path_parts = pathinfo($_SESSION['upfile']['fileNameOnTmp']); $fileInfos = array( "tmpDir" => $_SESSION['config']['tmppath'], "size" => $_SESSION['upfile']['size'], - "format" => $_SESSION['upfile']['format'], + "format" => $path_parts['extension'], "tmpFileName" => $_SESSION['upfile']['fileNameOnTmp'], ); @@ -370,7 +376,7 @@ if (isset($_POST['add']) && $_POST['add']) { $_SESSION['data'], array( 'column' => "format", - 'value' => $_SESSION['upfile']['format'], + 'value' => $fileInfos['format'], 'type' => "string", ) ); @@ -698,6 +704,15 @@ if (isset($_POST['add']) && $_POST['add']) { ) ); + array_push( + $_SESSION['data_pdf'], + array( + 'column' => "in_signature_book", + 'value' => 1, + 'type' => "bool", + ) + ); + $id_up = $resAttach->load_into_db( RES_ATTACHMENTS_TABLE, $storeResult['destination_dir'], @@ -812,10 +827,11 @@ if (isset($_POST['add']) && $_POST['add']) { ORDER BY relation desc", array($_REQUEST['res_id'],$_SESSION['doc_id'])); $previous_attachment = $stmt->fetchObject(); + $path_parts = pathinfo($_SESSION['upfile']['fileNameOnTmp']); $fileInfos = array( "tmpDir" => $_SESSION['config']['tmppath'], "size" => $_SESSION['upfile']['size'], - "format" => $_SESSION['upfile']['format'], + "format" => $path_parts['extension'], "tmpFileName" => $_SESSION['upfile']['fileNameOnTmp'], ); @@ -842,7 +858,7 @@ if (isset($_POST['add']) && $_POST['add']) { $_SESSION['data'], array( 'column' => "format", - 'value' => $_SESSION['upfile']['format'], + 'value' => $fileInfos['format'], 'type' => "string", ) ); @@ -1160,6 +1176,15 @@ if (isset($_POST['add']) && $_POST['add']) { ) ); + array_push( + $_SESSION['data_pdf'], + array( + 'column' => "in_signature_book", + 'value' => 1, + 'type' => "bool", + ) + ); + $id_up = $resAttach->load_into_db( RES_ATTACHMENTS_TABLE, $storeResult['destination_dir'], @@ -1230,10 +1255,11 @@ if (isset($_POST['add']) && $_POST['add']) { if ($_SESSION['upfile']['upAttachment'] && $OriginalHash <> $NewHash) { $_SESSION['upfile']['upAttachment'] = false; + $path_parts = pathinfo($_SESSION['upfile']['fileNameOnTmp']); $fileInfos = array( "tmpDir" => $_SESSION['config']['tmppath'], "size" => $_SESSION['upfile']['size'], - "format" => $_SESSION['upfile']['format'], + "format" => $path_parts['extension'], "tmpFileName" => $_SESSION['upfile']['fileNameOnTmp'], );