From 577d0f1eb5855f697601e3a41206cdefd14ff9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 17 Feb 2021 15:21:38 +0100 Subject: [PATCH] Fixed Filename --- application/libraries/DmsLib.php | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php index 64d58f987..da0dd84b6 100644 --- a/application/libraries/DmsLib.php +++ b/application/libraries/DmsLib.php @@ -5,10 +5,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); class DmsLib { const FILE_CONTENT_PROPERTY = 'file_content'; - + const FILE_INPUT_NAME = 'uploadfile'; // name of the HTML input tag containing the uploaded file private $UPLOAD_PATH = DMS_PATH; // temporary directory to store the upload file - + /** * Object initialization */ @@ -95,7 +95,7 @@ class DmsLib return $result; } - + /** * Uploads a document and saves it to DMS * @param $dms DMS assoc array @@ -106,33 +106,33 @@ class DmsLib { // Init upload configs $this->_loadUploadLibrary($allowed_types); - + if (!$this->ci->upload->do_upload(DmsLib::FILE_INPUT_NAME)) { return error($this->ci->upload->display_errors()); } - + $upload_data = $this->ci->upload->data(); // data about the uploaded file $filename = $upload_data['file_name']; - + // Insert to DMS table if (!$result = $this->ci->DmsModel->insert($this->ci->DmsModel->filterFields($dms))) { return error('Failed inserting to DMS'); } $upload_data['dms_id'] = $result->retval; - + // Insert DMS version if (!$result = $this->ci->DmsVersionModel->insert( $this->ci->DmsVersionModel->filterFields($dms, $result->retval, $filename))) { return error('Failed inserting DMS version'); } - + // return result of uploaded data return success($upload_data); // data about the uploaded file } - + /** * Download a document * @param $dms_id @@ -143,22 +143,22 @@ class DmsLib { show_error('Wrong parameter'); } - + $this->ci->DmsVersionModel->addSelect('filename'); $result = $this->ci->DmsVersionModel->loadWhere(array('dms_id' => $dms_id)); - + if (isError($result)) { show_error(getError($result)); } - + $filename = $result->retval[0]->filename; $file = DMS_PATH. $filename; - + if (file_exists($file)) { $finfo = new finfo(FILEINFO_MIME); - + header('Content-Description: File Transfer'); header('Content-Type: '.$finfo->file($file)); header('Expires: 0'); @@ -383,7 +383,7 @@ class DmsLib return $result; } - + /** * Loads the upload library of CI */ @@ -392,7 +392,8 @@ class DmsLib $config['upload_path'] = $this->UPLOAD_PATH; $config['allowed_types'] = implode('|', $allowed_types); $config['overwrite'] = true; - + $config['file_name'] = uniqid().'.pdf'; + $this->ci->load->library('upload', $config); $this->ci->upload->initialize($config); }