mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-09 09:36:29 +02:00
Code Issues Releases Wiki Activity

Fix diagnostics issues

Browse Source
This commit is contained in:
Marco Dickert
2024-01-24 01:05:29 +01:00
parent 4109d867fa
commit 82f0e787c4
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main.php
View File

@@ -522,24 +522,17 @@ f00bar;
if (!in_array($d['action'], ['copy', 'move'])) if (!in_array($d['action'], ['copy', 'move']))
throw new IFMException($this->l('invalid_action')); throw new IFMException($this->l('invalid_action'));
$err = []; $errFlag = -1; // -1 -> all errors; 0 -> at least some errors; 1 -> no errors $err = [];
foreach ($d['filenames'] as $file) { foreach ($d['filenames'] as $file) {
if (!file_exists($file) || $file == ".." || !$this->isFilenameValid($file)) { if (!file_exists($file) || $file == ".." || !$this->isFilenameValid($file)) {
array_push($err, $file); array_push($err, $file);
} }
if ($d['action'] == "copy") { if ($d['action'] == "copy") {
if ($this->xcopy($file, $d['destination'])) $this->xcopy($file, $d['destination']) or array_push($err, $file);
$errFlag = 0;
else
array_push($err, $file);
} elseif ($d['action'] == "move") { } elseif ($d['action'] == "move") {
if (rename($file, $this->pathCombine($d['destination'], basename($file)))) rename($file, $this->pathCombine($d['destination'], basename($file))) or array_push($err, $file);
$errFlag = 0;
else
array_push($err, $file);
} }
} }
$action = ($d['action'] == "copy") ? "copied" : "moved";
if (empty($err)) { if (empty($err)) {
return [ return [
"status" => "OK", "status" => "OK",
@@ -605,8 +598,7 @@ f00bar;
if (isset($d['filename']) && $this->isFilenameAllowed($d['filename']) && file_exists($d['filename']) && is_readable($d['filename'])) { if (isset($d['filename']) && $this->isFilenameAllowed($d['filename']) && file_exists($d['filename']) && is_readable($d['filename'])) {
$content = @file_get_contents($d['filename']); $content = @file_get_contents($d['filename']);
if (function_exists("mb_check_encoding") && !mb_check_encoding($content, "UTF-8")) $this->convertToUTF8($content);
$content = utf8_encode($content);
return ["status" => "OK", "data" => ["filename" => $d['filename'], "content" => $content]]; return ["status" => "OK", "data" => ["filename" => $d['filename'], "content" => $content]];
} else } else
throw new IFMException($this->l('file_not_found')); throw new IFMException($this->l('file_not_found'));
@@ -617,20 +609,16 @@ f00bar;
if ($this->config['delete'] != 1) if ($this->config['delete'] != 1)
throw new IFMException($this->l('nopermissions')); throw new IFMException($this->l('nopermissions'));
$err = []; $errFLAG = -1; // -1 -> no files deleted; 0 -> at least some files deleted; 1 -> all files deleted $err = [];
foreach ($d['filenames'] as $file) { foreach ($d['filenames'] as $file) {
if ($this->isFilenameAllowed($file)) { if ($this->isFilenameAllowed($file)) {
if (is_dir($file)) { if (is_dir($file)) {
$res = $this->rec_rmdir($file); $res = $this->rec_rmdir($file);
if ($res != 0) if ($res != 0) {
array_push($err, $file); array_push($err, $file);
else }
$errFLAG = 0;
} else { } else {
if (@unlink($file)) @unlink($file) or array_push($err, $file);
$errFLAG = 0;
else
array_push($err, $file);
} }
} else { } else {
array_push($err, $file); array_push($err, $file);
@@ -790,7 +778,7 @@ f00bar;
try { try {
chmod($d["filename"], (int)octdec($chmod)); chmod($d["filename"], (int)octdec($chmod));
return ["status" => "OK", "message" => $this->l('permission_change_success')]; return ["status" => "OK", "message" => $this->l('permission_change_success')];
} catch (Exception $e) { } catch (Exception) {
throw new IFMException($this->l('permission_change_error')); throw new IFMException($this->l('permission_change_error'));
} }
} else } else
@@ -953,28 +941,29 @@ f00bar;
private function jsonResponse($array) { private function jsonResponse($array) {
$this->convertToUTF8($array); $this->convertToUTF8($array);
$json = json_encode($array); $json = json_encode($array);
$err = "";
if ($json === false) { if ($json === false) {
switch (json_last_error()) { switch (json_last_error()) {
case JSON_ERROR_NONE: case JSON_ERROR_NONE:
echo ' - No errors'; $err = ' - No errors';
break; break;
case JSON_ERROR_DEPTH: case JSON_ERROR_DEPTH:
echo ' - Maximum stack depth exceeded'; $err = ' - Maximum stack depth exceeded';
break; break;
case JSON_ERROR_STATE_MISMATCH: case JSON_ERROR_STATE_MISMATCH:
echo ' - Underflow or the modes mismatch'; $err = ' - Underflow or the modes mismatch';
break; break;
case JSON_ERROR_CTRL_CHAR: case JSON_ERROR_CTRL_CHAR:
echo ' - Unexpected control character found'; $err = ' - Unexpected control character found';
break; break;
case JSON_ERROR_SYNTAX: case JSON_ERROR_SYNTAX:
echo ' - Syntax error, malformed JSON'; $err = ' - Syntax error, malformed JSON';
break; break;
case JSON_ERROR_UTF8: case JSON_ERROR_UTF8:
echo ' - Malformed UTF-8 characters, possibly incorrectly encoded'; $err = ' - Malformed UTF-8 characters, possibly incorrectly encoded';
break; break;
default: default:
echo ' - Unknown error'; $err = ' - Unknown error';
break; break;
} }
@@ -984,11 +973,13 @@ f00bar;
} }
private function convertToUTF8(&$item) { private function convertToUTF8(&$item) {
if (is_array($item)) if (is_array($item)) {
array_walk($item, [$this, 'convertToUTF8']); array_walk($item, [$this, 'convertToUTF8']);
else } else {
if (function_exists("mb_check_encoding") && !mb_check_encoding($item, "UTF-8")) if (function_exists("mb_check_encoding") && !mb_check_encoding($item, "UTF-8")) {
$item = utf8_encode($item); $item = mb_convert_encoding($item, "UTF-8", mb_detect_encoding($item));
}
}
} }
private function checkAuth() { private function checkAuth() {