From 7b485053d94646d865fc6a3ef2bd761a95a8e5c9 Mon Sep 17 00:00:00 2001 From: Cris Date: Wed, 21 Apr 2021 18:46:51 +0200 Subject: [PATCH] Adapted DMSLib upload method to be accept field name from Controller The fieldname represents the HTML uploadfile input name attribute, which is given by the developer in the VIEW. Signed-off-by: cris-technikum --- .../lehre/anrechnung/CreateAnrechnung.php | 2 +- .../lehre/anrechnung/RequestAnrechnung.php | 2 +- application/libraries/DmsLib.php | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/controllers/lehre/anrechnung/CreateAnrechnung.php b/application/controllers/lehre/anrechnung/CreateAnrechnung.php index 1102b7670..89e0dba83 100644 --- a/application/controllers/lehre/anrechnung/CreateAnrechnung.php +++ b/application/controllers/lehre/anrechnung/CreateAnrechnung.php @@ -223,7 +223,7 @@ class CreateAnrechnung extends Auth_Controller ); // Upload document - return $this->dmslib->upload($dms, array('pdf')); + return $this->dmslib->upload($dms, 'uploadfile', array('pdf')); } } \ No newline at end of file diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php index 99d5f7161..ea3ca535a 100644 --- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php +++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php @@ -316,6 +316,6 @@ class requestAnrechnung extends Auth_Controller ); // Upload document - return $this->dmslib->upload($dms, array('pdf')); + return $this->dmslib->upload($dms, 'uploadfile', array('pdf')); } } \ No newline at end of file diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php index 141dee71e..eae1a9ac4 100644 --- a/application/libraries/DmsLib.php +++ b/application/libraries/DmsLib.php @@ -5,8 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); class DmsLib extends FHC_Controller { 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 /** @@ -123,19 +122,20 @@ class DmsLib extends FHC_Controller return $result; } - + /** * Uploads a document and saves it to DMS * @param $dms DMS assoc array - * @param array $allowed_types Default: all. Param example: array(jpg, pdf) + * @param $field_name Name of the HTML uploadfile input name attribute + * @param array $allowed_types Default: all. Param example: array(jpg, pdf) * @return array */ - public function upload($dms, $allowed_types = array('*')) + public function upload($dms, $field_name, $allowed_types = array('*')) { // Init upload configs $this->_loadUploadLibrary($allowed_types); - if (!$this->ci->upload->do_upload(DmsLib::FILE_INPUT_NAME)) + if (!$this->ci->upload->do_upload($field_name)) { return error($this->ci->upload->display_errors()); }