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

fix merge conflicts

Browse Source
This commit is contained in:
Marco Dickert
2017-07-18 13:51:23 +02:00
parent 9ca393da7c
commit 5c9bd19ed1
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/libifm.php
View File

@@ -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 {

2
compiler.php
View File

@@ -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