AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove global

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-16 22:03:59 -05:00
parent 47e4274579
commit 5a6cd48df1
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Core/Http/Request.php
View File

@@ -156,6 +156,18 @@ class Request extends Base
return isset($this->files[$name]['tmp_name']) ? $this->files[$name]['tmp_name'] : ''; return isset($this->files[$name]['tmp_name']) ? $this->files[$name]['tmp_name'] : '';
} }
/**
* Get info of an uploaded file
*
* @access public
* @param string $name Form file name
* @return array
*/
public function getFileInfo($name)
{
return isset($this->files[$name]) ? $this->files[$name] : array();
}
/** /**
* Return HTTP method * Return HTTP method
* *

14
app/Model/File.php
View File

@@ -263,14 +263,16 @@ class File extends Base
public function uploadFiles($project_id, $task_id, $form_name) public function uploadFiles($project_id, $task_id, $form_name)
{ {
try { try {
if (empty($_FILES[$form_name])) { $file = $this->request->getFileInfo($form_name);
if (empty($file)) {
return false; return false;
} }
foreach ($_FILES[$form_name]['error'] as $key => $error) { foreach ($file['error'] as $key => $error) {
if ($error == UPLOAD_ERR_OK && $_FILES[$form_name]['size'][$key] > 0) { if ($error == UPLOAD_ERR_OK && $file['size'][$key] > 0) {
$original_filename = $_FILES[$form_name]['name'][$key]; $original_filename = $file['name'][$key];
$uploaded_filename = $_FILES[$form_name]['tmp_name'][$key]; $uploaded_filename = $file['tmp_name'][$key];
$destination_filename = $this->generatePath($project_id, $task_id, $original_filename); $destination_filename = $this->generatePath($project_id, $task_id, $original_filename);
if ($this->isImage($original_filename)) { if ($this->isImage($original_filename)) {
@@ -283,7 +285,7 @@ class File extends Base
$task_id, $task_id,
$original_filename, $original_filename,
$destination_filename, $destination_filename,
$_FILES[$form_name]['size'][$key] $file['size'][$key]
); );
} }
} }