mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-12 19:13:57 +02:00
Code Issues Releases Wiki Activity

fixed broken entries in the copy/move dialog due to missing encoding

Browse Source
This commit is contained in:
Marco Dickert
2017-07-26 13:04:29 +02:00
parent cf98fc371d
commit cddec16abf
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/libifm.php
View File

@@ -2272,7 +2272,16 @@ function IFM( params ) {
if( $handle = opendir( $start_dir ) ) { if( $handle = opendir( $start_dir ) ) {
while (false !== ( $result = readdir( $handle ) ) ) { while (false !== ( $result = readdir( $handle ) ) ) {
if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) { if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) {
array_push( $ret, array( "text" => $result, "dataAttributes" => array( "path" => $this->pathCombine( $start_dir, $result ) ), "nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) ) ) ); array_push(
$ret,
array(
"text" => htmlspecialchars( $result ),
"dataAttributes" => array(
"path" => $this->pathCombine( $start_dir, $result )
),
"nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) )
)
);
} }
} }
} }

11
ifm.php
View File

@@ -2272,7 +2272,16 @@ function IFM( params ) {
if( $handle = opendir( $start_dir ) ) { if( $handle = opendir( $start_dir ) ) {
while (false !== ( $result = readdir( $handle ) ) ) { while (false !== ( $result = readdir( $handle ) ) ) {
if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) { if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) {
array_push( $ret, array( "text" => $result, "dataAttributes" => array( "path" => $this->pathCombine( $start_dir, $result ) ), "nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) ) ) ); array_push(
$ret,
array(
"text" => htmlspecialchars( $result ),
"dataAttributes" => array(
"path" => $this->pathCombine( $start_dir, $result )
),
"nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) )
)
);
} }
} }
} }

11
src/main.php
View File

@@ -324,7 +324,16 @@ f00bar;
if( $handle = opendir( $start_dir ) ) { if( $handle = opendir( $start_dir ) ) {
while (false !== ( $result = readdir( $handle ) ) ) { while (false !== ( $result = readdir( $handle ) ) ) {
if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) { if( is_dir( $this->pathCombine( $start_dir, $result ) ) && $result != "." && $result != ".." ) {
array_push( $ret, array( "text" => $result, "dataAttributes" => array( "path" => $this->pathCombine( $start_dir, $result ) ), "nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) ) ) ); array_push(
$ret,
array(
"text" => htmlspecialchars( $result ),
"dataAttributes" => array(
"path" => $this->pathCombine( $start_dir, $result )
),
"nodes" => $this->getFolderTreeRecursive( $this->pathCombine( $start_dir, $result ) )
)
);
} }
} }
} }