mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-14 03:53:59 +02:00
Code Issues Releases Wiki Activity

return a boolean value for isDocroot

Browse Source
This commit is contained in:
Marco Dickert
2017-08-06 23:12:21 +02:00
parent 7dda92b34f
commit 107d4deeef
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/libifm.php
View File

@@ -2812,7 +2812,7 @@ function IFM( params ) {
private function getConfig() { private function getConfig() {
$ret = $this->config; $ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false; $ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false"; $ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? true : false;
echo $this->jsonResponse( $ret ); echo $this->jsonResponse( $ret );
} }
@@ -3550,9 +3550,8 @@ function IFM( params ) {
return copy( $source, $this->pathCombine( $dest, basename( $source ) ) ); return copy( $source, $this->pathCombine( $dest, basename( $source ) ) );
chdir( $source ); chdir( $source );
foreach( glob( '*' ) as $item ) { foreach( glob( '*' ) as $item )
$this->xcopy( $item, $dest ); $this->xcopy( $item, $dest );
}
chdir( '..' ); chdir( '..' );
return true; return true;
} }

5
ifm.php
View File

@@ -2812,7 +2812,7 @@ function IFM( params ) {
private function getConfig() { private function getConfig() {
$ret = $this->config; $ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false; $ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false"; $ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? true : false;
echo $this->jsonResponse( $ret ); echo $this->jsonResponse( $ret );
} }
@@ -3550,9 +3550,8 @@ function IFM( params ) {
return copy( $source, $this->pathCombine( $dest, basename( $source ) ) ); return copy( $source, $this->pathCombine( $dest, basename( $source ) ) );
chdir( $source ); chdir( $source );
foreach( glob( '*' ) as $item ) { foreach( glob( '*' ) as $item )
$this->xcopy( $item, $dest ); $this->xcopy( $item, $dest );
}
chdir( '..' ); chdir( '..' );
return true; return true;
} }

5
src/main.php
View File

@@ -380,7 +380,7 @@ f00bar;
private function getConfig() { private function getConfig() {
$ret = $this->config; $ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false; $ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false"; $ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? true : false;
echo $this->jsonResponse( $ret ); echo $this->jsonResponse( $ret );
} }
@@ -1118,9 +1118,8 @@ f00bar;
return copy( $source, $this->pathCombine( $dest, basename( $source ) ) ); return copy( $source, $this->pathCombine( $dest, basename( $source ) ) );
chdir( $source ); chdir( $source );
foreach( glob( '*' ) as $item ) { foreach( glob( '*' ) as $item )
$this->xcopy( $item, $dest ); $this->xcopy( $item, $dest );
}
chdir( '..' ); chdir( '..' );
return true; return true;
} }