From 9cb4bb232712ef8da756872be922ea01b508476f Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 17 Jul 2017 12:33:25 +0200 Subject: [PATCH] recommited change after merge --- build/libifm.php | 1 - compiler.php | 12 ++++++------ ifm.min.php | Bin 218041 -> 218044 bytes ifm.php | 10 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 96906a3..767c396 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -2137,7 +2137,6 @@ function IFM( params ) { break; case "file": if( @file_exists( $srcopt ) && @is_readable( $srcopt ) ) { - $lines = file( $srcopt ); list( $uname, $hash ) = explode( ":", fgets( fopen( $srcopt, 'r' ) ) ); return password_verify( $pass, trim( $hash ) ) ? ( $uname == $user ) : false; } else { diff --git a/compiler.php b/compiler.php index 90e99c2..5fab978 100755 --- a/compiler.php +++ b/compiler.php @@ -14,7 +14,7 @@ $IFM_SRC_JS = "src/ifm.js"; $IFM_BUILD_STANDALONE = "ifm.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 @@ -42,11 +42,11 @@ foreach( $IFM_SRC_PHPFILES as $file ) { file_put_contents( $IFM_BUILD_STANDALONE, $main ); file_put_contents( $IFM_BUILD_STANDALONE, $phpincludes, FILE_APPEND ); file_put_contents( $IFM_BUILD_STANDALONE, ' - /** - * start IFM - */ - $ifm = new IFM(); - $ifm->run(); +/** + * start IFM + */ +$ifm = new IFM(); +$ifm->run(); ', FILE_APPEND ); /** diff --git a/ifm.min.php b/ifm.min.php index d8de2ff9c13a1053ddb67512e7994a92ea9722d0..25801fbf872e903d70ca15de4a1ad2b1c93c0245 100644 GIT binary patch delta 56 zcmV-80LTBirwzQP4S<9JgaWh!lv5~YB!N$Hw<4Dx++H@38e6b$N^js50>?M)L)cgG O$A1G#O3)ST diff --git a/ifm.php b/ifm.php index e1ff26d..0c4c1bd 100644 --- a/ifm.php +++ b/ifm.php @@ -2796,8 +2796,8 @@ class IFMZip { } } - /** - * start IFM - */ - $ifm = new IFM(); - $ifm->run(); +/** + * start IFM + */ +$ifm = new IFM(); +$ifm->run();