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

reintroduce getScriptRoot() because dirname(__FILE__) does not work when using libifm.php

Browse Source
This commit is contained in:
Marco Dickert
2017-07-26 15:36:31 +02:00
parent cddec16abf
commit c8e3d31e9b
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/libifm.php
View File

@@ -2198,7 +2198,7 @@ function IFM( params ) {
if( $handle = opendir( "." ) ) {
while( false !== ( $result = readdir( $handle ) ) ) {
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && dirname( __FILE__ ) == getcwd() ) { }
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && $this->getScriptRoot() == getcwd() ) { }
elseif( ( $result == ".htaccess" || $result==".htpasswd" ) && $this->config['showhtdocs'] != 1 ) {}
elseif( $result == "." ) {}
elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {}
@@ -2262,7 +2262,7 @@ function IFM( params ) {
private function getConfig() {
$ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == dirname( __FILE__ ) ) ? "true" : "false";
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false";
echo json_encode( $ret );
}
@@ -2598,7 +2598,7 @@ function IFM( params ) {
try {
IFMArchive::createZip( realpath( $d['filename'] ), $dfile, ( $d['filename'] == "." ) );
if( $d['filename'] == "." ) {
if( getcwd() == dirname( __FILE__ ) )
if( getcwd() == $this->getScriptRoot() )
$d['filename'] = "root";
else
$d['filename'] = basename( getcwd() );
@@ -2774,11 +2774,15 @@ function IFM( params ) {
private function getRootDir() {
if( $this->config['root_dir'] == "" )
return realpath( dirname( __FILE__ ) );
return realpath( $this->getScriptRoot() );
elseif( $this->isAbsolutePath( $this->config['root_dir'] ) )
return realpath( $this->config['root_dir'] );
else
return realpath( $this->pathCombine( dirname( __FILE__ ), $this->config['root_dir'] ) );
return realpath( $this->pathCombine( $this->getScriptRoot(), $this->config['root_dir'] ) );
}
private function getScriptRoot() {
return ( defined( 'IFM_FILENAME' ) ? dirname( realpath( IFM_FILENAME ) ) : dirname( __FILE__ ) );
}
private function getValidDir( $dir ) {
@@ -2825,7 +2829,7 @@ function IFM( params ) {
}
private function chDirIfNecessary($d) {
if( substr( getcwd(), strlen( dirname( __FILE__ ) ) ) != $this->getValidDir($d) ) {
if( substr( getcwd(), strlen( $this->getScriptRoot() ) ) != $this->getValidDir($d) ) {
chdir( $d );
}
}

16
ifm.php
View File

@@ -2198,7 +2198,7 @@ function IFM( params ) {
if( $handle = opendir( "." ) ) {
while( false !== ( $result = readdir( $handle ) ) ) {
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && dirname( __FILE__ ) == getcwd() ) { }
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && $this->getScriptRoot() == getcwd() ) { }
elseif( ( $result == ".htaccess" || $result==".htpasswd" ) && $this->config['showhtdocs'] != 1 ) {}
elseif( $result == "." ) {}
elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {}
@@ -2262,7 +2262,7 @@ function IFM( params ) {
private function getConfig() {
$ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == dirname( __FILE__ ) ) ? "true" : "false";
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false";
echo json_encode( $ret );
}
@@ -2598,7 +2598,7 @@ function IFM( params ) {
try {
IFMArchive::createZip( realpath( $d['filename'] ), $dfile, ( $d['filename'] == "." ) );
if( $d['filename'] == "." ) {
if( getcwd() == dirname( __FILE__ ) )
if( getcwd() == $this->getScriptRoot() )
$d['filename'] = "root";
else
$d['filename'] = basename( getcwd() );
@@ -2774,11 +2774,15 @@ function IFM( params ) {
private function getRootDir() {
if( $this->config['root_dir'] == "" )
return realpath( dirname( __FILE__ ) );
return realpath( $this->getScriptRoot() );
elseif( $this->isAbsolutePath( $this->config['root_dir'] ) )
return realpath( $this->config['root_dir'] );
else
return realpath( $this->pathCombine( dirname( __FILE__ ), $this->config['root_dir'] ) );
return realpath( $this->pathCombine( $this->getScriptRoot(), $this->config['root_dir'] ) );
}
private function getScriptRoot() {
return ( defined( 'IFM_FILENAME' ) ? dirname( realpath( IFM_FILENAME ) ) : dirname( __FILE__ ) );
}
private function getValidDir( $dir ) {
@@ -2825,7 +2829,7 @@ function IFM( params ) {
}
private function chDirIfNecessary($d) {
if( substr( getcwd(), strlen( dirname( __FILE__ ) ) ) != $this->getValidDir($d) ) {
if( substr( getcwd(), strlen( $this->getScriptRoot() ) ) != $this->getValidDir($d) ) {
chdir( $d );
}
}

16
src/main.php
View File

@@ -250,7 +250,7 @@ f00bar;
if( $handle = opendir( "." ) ) {
while( false !== ( $result = readdir( $handle ) ) ) {
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && dirname( __FILE__ ) == getcwd() ) { }
if( $result == basename( $_SERVER['SCRIPT_NAME'] ) && $this->getScriptRoot() == getcwd() ) { }
elseif( ( $result == ".htaccess" || $result==".htpasswd" ) && $this->config['showhtdocs'] != 1 ) {}
elseif( $result == "." ) {}
elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {}
@@ -314,7 +314,7 @@ f00bar;
private function getConfig() {
$ret = $this->config;
$ret['inline'] = ( $this->mode == "inline" ) ? true : false;
$ret['isDocroot'] = ( $this->getRootDir() == dirname( __FILE__ ) ) ? "true" : "false";
$ret['isDocroot'] = ( $this->getRootDir() == $this->getScriptRoot() ) ? "true" : "false";
echo json_encode( $ret );
}
@@ -650,7 +650,7 @@ f00bar;
try {
IFMArchive::createZip( realpath( $d['filename'] ), $dfile, ( $d['filename'] == "." ) );
if( $d['filename'] == "." ) {
if( getcwd() == dirname( __FILE__ ) )
if( getcwd() == $this->getScriptRoot() )
$d['filename'] = "root";
else
$d['filename'] = basename( getcwd() );
@@ -826,11 +826,15 @@ f00bar;
private function getRootDir() {
if( $this->config['root_dir'] == "" )
return realpath( dirname( __FILE__ ) );
return realpath( $this->getScriptRoot() );
elseif( $this->isAbsolutePath( $this->config['root_dir'] ) )
return realpath( $this->config['root_dir'] );
else
return realpath( $this->pathCombine( dirname( __FILE__ ), $this->config['root_dir'] ) );
return realpath( $this->pathCombine( $this->getScriptRoot(), $this->config['root_dir'] ) );
}
private function getScriptRoot() {
return ( defined( 'IFM_FILENAME' ) ? dirname( realpath( IFM_FILENAME ) ) : dirname( __FILE__ ) );
}
private function getValidDir( $dir ) {
@@ -877,7 +881,7 @@ f00bar;
}
private function chDirIfNecessary($d) {
if( substr( getcwd(), strlen( dirname( __FILE__ ) ) ) != $this->getValidDir($d) ) {
if( substr( getcwd(), strlen( $this->getScriptRoot() ) ) != $this->getValidDir($d) ) {
chdir( $d );
}
}