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

fixed merge conflicts

Browse Source
This commit is contained in:
Marco Dickert
2017-07-18 13:34:29 +02:00
parent 1171346cbe
commit fcc9108beb
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitattributes vendored
View File

@@ -1,2 +1,3 @@
ifm.php -diff
build/* -diff
ifm.php -diff
ifm.min.php -diff
build/* -diff

17
compiler.php
View File

@@ -13,6 +13,7 @@ $IFM_SRC_PHPFILES = array( "src/ifmzip.php" );
$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";
/**
@@ -40,14 +41,18 @@ 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,
'
file_put_contents( $IFM_BUILD_STANDALONE, '
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();
', FILE_APPEND );
/**
* start IFM
* Build compressed standalone script
*/
$ifm = new IFM();
$ifm->run();'
, FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE_COMPRESSED, '<?php eval( gzdecode( file_get_contents( __FILE__, false, null, 85 ) ) ); exit(0); ?>' . gzencode( file_get_contents( "ifm.php", false, null, 5 ) ) );
/**
* Build library

10
ifm.php
View File

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