Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added missing logging instance in mfUpload_TmpFile.php

Browse Source
This commit is contained in:
Frank Schubert
2024-12-22 14:27:25 +01:00
parent ee50aae1d8
commit 4abc2ed783
1 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
lib/mvcfronk/mfUpload/mfUpload_TmpFile.php
View File

@@ -2,132 +2,131 @@
class mfUpload_TmpFile {
private $log;
private $_file;
public $filename;
public $error;
public $tmp_name;
public $errormessage;
private $log;
private $_file;
public $filename;
public $error;
public $tmp_name;
public $errormessage;
public function __construct($_file) {
$this->log = mfLoghandler::singleton();
if(is_array($_file) && count($_file) == 2) {
$upload_name = $_file[0];
$index = $_file[1];
$upload = [
'name' => $_FILES[$upload_name]['name'][$index],
'full_path' => $_FILES[$upload_name]['full_path'][$index],
'type' => $_FILES[$upload_name]['type'][$index],
'tmp_name' => $_FILES[$upload_name]['tmp_name'][$index],
'error' => $_FILES[$upload_name]['error'][$index],
'size' => $_FILES[$upload_name]['size'][$index],
];
} else {
$upload = $_FILES[$_file];
}
public function __construct($_file) {
if(is_array($_file) && count($_file) == 2) {
$upload_name = $_file[0];
$index = $_file[1];
$upload = [
'name' => $_FILES[$upload_name]['name'][$index],
'full_path' => $_FILES[$upload_name]['full_path'][$index],
'type' => $_FILES[$upload_name]['type'][$index],
'tmp_name' => $_FILES[$upload_name]['tmp_name'][$index],
'error' => $_FILES[$upload_name]['error'][$index],
'size' => $_FILES[$upload_name]['size'][$index],
];
} else {
$upload = $_FILES[$_file];
if(count($upload)) {
$this->_file = $upload;
} else {
$this->errormessage = "Upload not found";
return false;
}
$this->filename = $this->_file['name'];
$this->error = $this->_file['error'];
$this->tmp_name = $this->_file['tmp_name'];
if(!file_exists($this->tmp_name)) {
$this->errormessage = "An error occured during file upload. Please try again.";
return false;
}
return true;
}
if(count($upload)) {
$this->_file = $upload;
} else {
$this->errormessage = "Upload not found";
return false;
}
$this->filename = $this->_file['name'];
$this->error = $this->_file['error'];
$this->tmp_name = $this->_file['tmp_name'];
if(!file_exists($this->tmp_name)) {
$this->errormessage = "An error occured during file upload. Please try again.";
return false;
}
return true;
}
public function move_upload($path) {
if($path && $this->tmp_name) {
if(move_uploaded_file($this->tmp_name, $path)) {
return true;
} else {
$this->errormessage = "Cannot move uploaded file to $path.";
}
}
return false;
}
public function move_upload($path) {
if($path && $this->tmp_name) {
if(move_uploaded_file($this->tmp_name, $path)) {
return true;
} else {
$this->errormessage = "Cannot move uploaded file to $path.";
}
}
return false;
}
public function getFileSize() {
$stat = stat($this->tmp_name);
if(is_array($stat) && count($stat)) {
return $stat[7];
}
return 0;
}
public function getFileSize() {
$stat = stat($this->tmp_name);
if(is_array($stat) && count($stat)) {
return $stat[7];
}
return 0;
}
public function getFilename() {
$filename = $this->filename;
public function getFilename() {
$filename = $this->filename;
// assume filename contains whole path on users machine and cut it.
if(preg_match('#([^/\\\]+$)#',$filename,$match)) {
$filename = $match[1];
} else {
$this->errormessage = "No file selected.";
return false; // if there is no filename
}
// remove potentially dangerous characters
while(strstr($filename,'..')) {
$filename = str_replace('..',".",$filename);
}
if(!strlen($filename)) {
$this->errormessage = "No file selected.";
return false;
}
$filename = preg_replace('/[^a-z0-9$()+%äöüÄÖÜß._-]/i', '_', $filename);
// assume filename contains whole path on users machine and cut it.
if(preg_match('#([^/\\\]+$)#', $filename, $match)) {
$filename = $match[1];
} else {
$this->errormessage = "No file selected.";
return false; // if there is no filename
}
// remove potentially dangerous characters
while(strstr($filename, '..')) {
$filename = str_replace('..', ".", $filename);
}
if(!strlen($filename)) {
$this->errormessage = "No file selected.";
return false;
}
$filename = preg_replace('/[^a-z0-9$()+%äöüÄÖÜß._-]/i', '_', $filename);
$filename = preg_replace('/[^a-z0-9$()+%äöüÄÖÜß\[\]&#;,._-]/i', '_', $filename);
$parts = explode(".",$filename);
$ext = strtolower(array_pop($parts));
$parts = explode(".", $filename);
$ext = strtolower(array_pop($parts));
if(!preg_match('/^'.MFUPLOAD_ALLOWED_EXTENSIONS.'$/i',$ext)) {
$this->errormessage = "File type not allowed. Supported file types are ".MFUPLOAD_ALLOWED_EXTENSIONS_STR;
return false;
}
return $filename;
}
public function getMimetype() {
$finfo = new finfo(FILEINFO_MIME_TYPE);
$mime = $finfo->file($this->tmp_name);
return $mime;
}
public function pdftotext() {
$cmd .= PDFTOTEXT_BIN_PATH." ".$this->tmp_name." -";
$lines = [];
$retval = 0;
if(exec($cmd, $lines, $retval) === false) {
$this->log->error("Error running pdftotext, return code: $retval");
return false;
if(!preg_match('/^' . MFUPLOAD_ALLOWED_EXTENSIONS . '$/i', $ext)) {
$this->errormessage = "File type not allowed. Supported file types are " . MFUPLOAD_ALLOWED_EXTENSIONS_STR;
return false;
}
return $filename;
}
$text = implode("\n", $lines);
if($retval !== 0) {
$this->log->error("pdftotext returned $retval");
return false;
public function getMimetype() {
$finfo = new finfo(FILEINFO_MIME_TYPE);
$mime = $finfo->file($this->tmp_name);
return $mime;
}
public function pdftotext() {
$cmd .= PDFTOTEXT_BIN_PATH . " " . $this->tmp_name . " -";
$lines = [];
$retval = 0;
if(exec($cmd, $lines, $retval) === false) {
$this->log->error("Error running pdftotext, return code: $retval");
return false;
}
$text = implode("\n", $lines);
if($retval !== 0) {
$this->log->error("pdftotext returned $retval");
return false;
}
return $text;
}
return $text;
}
}