blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed global function uploadFile from application/helpers/hlp_common_helper.php

Browse Source 
- Added new protected method uploadFile to application/core/FHC_Controller.php
- Replaced global function uploadFile with the protected method FHC_Controller->uploadFile
This commit is contained in:
Paolo
2025-09-29 09:32:21 +02:00
parent 517f39dc1f
commit 1657ae8291
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/FHC_Controller.php
+23
View File
@@ -218,6 +218,29 @@ abstract class FHC_Controller extends CI_Controller
return json_decode($this->input->raw_input_stream);
}
/**
* Utility function to upload a file
* - post_field_name: the name of the field in the HTTP POST payload, this is also the index in the super global $_FILES array
* - allowed_types: a list of file extensions that are allowed to be uploaded (ex. array('pdf', 'odt') or array('jpg', 'jpeg', 'gif')
*/
protected function uploadFile($post_field_name, $allowed_types = array('*'))
{
$this->load->library(
'upload',
array(
'upload_path' => sys_get_temp_dir(),
'allowed_types' => $allowed_types,
'overwrite' => true
)
);
// If the upload was a success then return the uploaded file info
if ($this->upload->do_upload($post_field_name)) return success($this->upload->data());
// If an error occurred then return it without tags
return error($this->upload->display_errors('', ''));
}
//------------------------------------------------------------------------------------------------------------------
// Private methods
application/core/Notiz_Controller.php
+2 -2
View File
@@ -206,7 +206,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
//Todo(manu)check name files: nicht gleiches file 2mal hochladen
//Todo define in dms component: readFile, downloadFile
$uploadDataResult = uploadFile($k);
$uploadDataResult = $this->uploadFile($k);
if (isError($uploadDataResult))
{
$this->db->trans_rollback();
@@ -350,7 +350,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
//Todo(manu) check if filetypes weiter eingeschränkt werden sollen
//Todo(manu)check name files: nicht gleiches file 2mal hochladen
//Todo define in dms component: readFile, downloadFile
$uploadDataResult = uploadFile($k);
$uploadDataResult = $this->uploadFile($k);
if (isError($uploadDataResult))
{
$this->db->trans_rollback();
application/helpers/hlp_common_helper.php
-22
View File
@@ -423,28 +423,6 @@ function isValidDate($dateString)
}
}
/**
* Utility function to upload a file
*/
function uploadFile($post_field_name, $allowed_types = array('*'))
{
$ci =& get_instance(); // get CI instance
$ci->load->library(
'upload',
array(
'upload_path' => sys_get_temp_dir(),
'allowed_types' => $allowed_types,
'overwrite' => true
)
);
// If the upload was a success then return the uploaded file info
if ($ci->upload->do_upload($post_field_name)) return success($ci->upload->data());
// If an error occurred then return it
return error($ci->upload->display_errors('', ''));
}
// ------------------------------------------------------------------------
// PHP functions that don't exist in older versions
// ------------------------------------------------------------------------