1
0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-10 10:04:01 +02:00

recommited change after merge

This commit is contained in:
Marco Dickert
2017-07-17 12:33:25 +02:00
parent c674dce103
commit 9cb4bb2327
4 changed files with 11 additions and 12 deletions

View File

@@ -2137,7 +2137,6 @@ function IFM( params ) {
break; break;
case "file": case "file":
if( @file_exists( $srcopt ) && @is_readable( $srcopt ) ) { if( @file_exists( $srcopt ) && @is_readable( $srcopt ) ) {
$lines = file( $srcopt );
list( $uname, $hash ) = explode( ":", fgets( fopen( $srcopt, 'r' ) ) ); list( $uname, $hash ) = explode( ":", fgets( fopen( $srcopt, 'r' ) ) );
return password_verify( $pass, trim( $hash ) ) ? ( $uname == $user ) : false; return password_verify( $pass, trim( $hash ) ) ? ( $uname == $user ) : false;
} else { } else {

View File

@@ -14,7 +14,7 @@ $IFM_SRC_JS = "src/ifm.js";
$IFM_BUILD_STANDALONE = "ifm.php"; $IFM_BUILD_STANDALONE = "ifm.php";
$IFM_BUILD_STANDALONE_COMPRESSED = "ifm.min.php"; $IFM_BUILD_STANDALONE_COMPRESSED = "ifm.min.php";
$IFM_BUILD_LIB_PHP = "build/ifmlib.php"; $IFM_BUILD_LIB_PHP = "build/libifm.php";
/** /**
* Prepare main script * Prepare main script
@@ -42,11 +42,11 @@ foreach( $IFM_SRC_PHPFILES as $file ) {
file_put_contents( $IFM_BUILD_STANDALONE, $main ); file_put_contents( $IFM_BUILD_STANDALONE, $main );
file_put_contents( $IFM_BUILD_STANDALONE, $phpincludes, FILE_APPEND ); file_put_contents( $IFM_BUILD_STANDALONE, $phpincludes, FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE, ' file_put_contents( $IFM_BUILD_STANDALONE, '
/** /**
* start IFM * start IFM
*/ */
$ifm = new IFM(); $ifm = new IFM();
$ifm->run(); $ifm->run();
', FILE_APPEND ); ', FILE_APPEND );
/** /**

Binary file not shown.

10
ifm.php
View File

@@ -2796,8 +2796,8 @@ class IFMZip {
} }
} }
/** /**
* start IFM * start IFM
*/ */
$ifm = new IFM(); $ifm = new IFM();
$ifm->run(); $ifm->run();