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

Added pipework/linework comments to each page

Browse Source
This commit is contained in:
Frank Schubert
2022-05-03 17:09:14 +02:00
parent b5983b27f1
commit ed2dda4443
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mvcfronk/mfUpload/mfUpload.php
View File

@@ -69,23 +69,23 @@ class mfUpload {
return false;
}
$savepath=MFUPLOAD_FILE_SAVE_PATH;
$savepath = MFUPLOAD_FILE_SAVE_PATH;
if(!MFUPLOAD_FILE_SAVE_PATH) {
$savepath="upload/";
$savepath = "upload/";
}
$this->log->debug("dirmode: ".decoct($this->dirmode));
if(!file_exists($savepath)) {
if(!mkdir($savepath,$this->dirmode,true)) {
if(!mkdir($savepath, $this->dirmode,true)) {
throw new Exception("Error creating directory $savepath.");
}
chmod($savepath,$this->dirmode);
chmod($savepath, $this->dirmode);
}
if(!is_dir($savepath)) {
throw new Exception("Upload save path not a directory!");
}
$this->savepath=$savepath;
$this->savepath = $savepath;
return true;
}
@@ -163,7 +163,7 @@ class mfUpload {
}
public function setDirmode($mode) {
$this->dirmode=$mode;
$this->dirmode = $mode;
}
public function getFilemode() {

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

@@ -39,14 +39,14 @@ class mfUpload_TmpFile {
if(move_uploaded_file($this->tmp_name, $path)) {
return true;
} else {
$this->errormessage="Cannot move uploaded file to $path.";
$this->errormessage = "Cannot move uploaded file to $path.";
}
}
return false;
}
public function getFileSize() {
$stat=stat($this->tmp_name);
$stat = stat($this->tmp_name);
if(is_array($stat) && count($stat)) {
return $stat[7];
}
@@ -54,33 +54,33 @@ class mfUpload_TmpFile {
}
public function getFilename() {
$filename=$this->filename;
$filename = $this->filename;
// assume filename contains whole path on users machine and cut it.
if(preg_match('#([^/\\\]+$)#',$filename,$match)) {
$filename=$match[1];
$filename = $match[1];
} else {
$this->errormessage="No file selected.";
$this->errormessage = "No file selected.";
return false; // if there is no filename
}
// remove potentially dangerous characters
while(strstr($filename,'..')) {
$filename=str_replace('..',".",$filename);
$filename = str_replace('..',".",$filename);
}
if(!strlen($filename)) {
$this->errormessage="No file selected.";
$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 ".ALLOWED_EXTENSIONS_STR;
$this->errormessage = "File type not allowed. Supported file types are ".ALLOWED_EXTENSIONS_STR;
return false;
}