Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-14 04:17:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Uploaded files data in array, string type cast octal for octdec

Browse Source
This commit is contained in:
mattpass
2021-07-24 16:05:43 +01:00
parent a5678eba26
commit 623ee10a81
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
classes/File.php
View File

@@ -372,7 +372,7 @@ class File
fclose($fh);
if ($setPerms) {
chmod($file, octdec($ICEcoder['newFilePerms']));
chmod($file, octdec((string) $ICEcoder['newFilePerms']));
}
clearstatcache();
$filemtime = "Windows" !== $serverType ? filemtime($file) : "1000000";
@@ -479,12 +479,12 @@ class File
if (is_dir($source)) {
$fileOrFolder = "folder";
if (!is_dir($dest)) {
mkdir($dest, octdec($ICEcoder['newDirPerms']));
mkdir($dest, octdec((string) $ICEcoder['newDirPerms']));
} else {
for ($i = 2; $i < 1000000000; $i++) {
if (!is_dir($dest . " (" . $i . ")")) {
$dest = $dest." (" . $i . ")";
mkdir($dest, octdec($ICEcoder['newDirPerms']));
mkdir($dest, octdec((string) $ICEcoder['newDirPerms']));
$i = 1000000000;
}
}
@@ -494,7 +494,7 @@ class File
RecursiveIteratorIterator::SELF_FIRST) as $item
) {
if ($item->isDir()) {
mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), octdec($ICEcoder['newDirPerms']));
mkdir($dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName(), octdec((string) $ICEcoder['newDirPerms']));
} else {
copy($item->getPathName(), $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
}
@@ -550,8 +550,8 @@ class File
$uploadDir = $docRoot . $iceRoot . str_replace("..", "", str_replace("|", "/", $_POST['folder'] . "/"));
foreach($uploads as $current) {
$uploadedFile = $uploadDir . $current->name;
$fileName = $current->name;
$uploadedFile = $uploadDir . $current['name'];
$fileName = $current['name'];
// Get & set existing perms for existing files, or set to newFilePerms setting for new files
if (file_exists($uploadedFile)) {
$chmodInfo = substr(sprintf('%o', fileperms($uploadedFile)), -4);
@@ -572,8 +572,8 @@ class File
}
private function uploadThisFile($current, $uploadFile, $setPerms){
if (move_uploaded_file($current->tmp_name, $uploadFile)){
chmod($uploadFile, octdec($setPerms));
if (move_uploaded_file($current['tmp_name'], $uploadFile)){
chmod($uploadFile, octdec((string) $setPerms));
return true;
}
}
@@ -582,10 +582,11 @@ class File
public function getUploadedDetails($fileArr) {
$uploads = [];
foreach($fileArr['name'] as $keyee => $info) {
$uploads[$keyee]->name = xssClean($fileArr['name'][$keyee], "html");
$uploads[$keyee]->type = $fileArr['type'][$keyee];
$uploads[$keyee]->tmp_name = $fileArr['tmp_name'][$keyee];
$uploads[$keyee]->error = $fileArr['error'][$keyee];
$uploads[$keyee] = [];
$uploads[$keyee]['name'] = xssClean($fileArr['name'][$keyee], "html");
$uploads[$keyee]['type'] = $fileArr['type'][$keyee];
$uploads[$keyee]['tmp_name'] = $fileArr['tmp_name'][$keyee];
$uploads[$keyee]['error'] = $fileArr['error'][$keyee];
}
return $uploads;
}

4
lib/file-control.php
View File

@@ -177,7 +177,7 @@ if (!$error && "save" === $_GET['action']) {
if (!$error && "newFolder" === $_GET['action']) {
if (!$demoMode && is_writable($docRoot . $fileLoc)) {
mkdir($file, octdec($ICEcoder['newDirPerms']));
mkdir($file, octdec((string) $ICEcoder['newDirPerms']));
$fileClass->updateFileManager('add', $fileLoc, $fileName, '', '', '', 'folder');
$finalAction = "newFolder";
// Run any extra processes
@@ -364,7 +364,7 @@ if (!$error && "getRemoteFile" === $_GET['action']) {
if (!$error && "perms" === $_GET['action']) {
if (!$demoMode && is_writable($file)) {
chmod($file, octdec(numClean($_GET['perms'])));
chmod($file, octdec((string) numClean($_GET['perms'])));
$fileClass->updateFileManager('chmod', $fileLoc, $fileName, numClean($_GET['perms']), '', '', '');
$finalAction = "perms";
// Run any custom processes