mirror_php/ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-01-17 04:38:25 +01:00
Code Issues Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Marco Dickert 2017-07-18 13:32:38 +02:00
parent ede3ec86b8
commit 1171346cbe
5 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/ifmlib.php
View File

@ -333,7 +333,8 @@ function IFM( params ) {
* @param string content - content of the modal
* @param object options - options for the modal
*/
this.showModal = function( content, options = {} ) {
this.showModal = function( content, options ) {
options = options || {};
var modal = $( document.createElement( 'div' ) )
.addClass( "modal fade" )
.attr( 'id', 'ifmmodal' )
@ -522,7 +523,8 @@ function IFM( params ) {
* @param string newdir - target directory
* @param object options - options for changing the directory
*/
this.changeDirectory = function( newdir, options={} ) {
this.changeDirectory = function( newdir, options ) {
options = options || {};
config = { absolute: false, pushState: true };
jQuery.extend( config, options );
if( ! config.absolute ) newdir = self.pathCombine( self.currentDir, newdir );
@ -1559,7 +1561,7 @@ function IFM( params ) {
*/
private function handleRequest() {
if($_REQUEST["api"] == "getRealpath") {
if( $_REQUEST["api"] == "getRealpath" ) {
if( isset( $_REQUEST["dir"] ) && $_REQUEST["dir"] != "" )
echo json_encode( array( "realpath" => $this->getValidDir( $_REQUEST["dir"] ) ) );
else
@ -1599,7 +1601,7 @@ function IFM( params ) {
break;
}
} else {
print json_encode(array("status"=>"ERROR", "message"=>"No valid working directory"));
print json_encode( array( "status" => "ERROR", "message" => "No valid working directory" ) );
}
}
exit( 0 );
@ -1613,7 +1615,7 @@ function IFM( params ) {
else
chdir( realpath( $this->config['root_dir'] ) );
$this->mode = $mode;
if ( isset( $_REQUEST['api'] ) || $mode == "api" ) {
if( isset( $_REQUEST['api'] ) || $mode == "api" ) {
$this->handleRequest();
} elseif( $mode == "standalone" ) {
$this->getApplication();
@ -1642,7 +1644,7 @@ function IFM( params ) {
else {
$item = array();
$item["name"] = $result;
if( is_dir($result) ) {
if( is_dir( $result ) ) {
$item["type"] = "dir";
if( $result == ".." )
$item["icon"] = "icon icon-up-open";

16
compiler.php
View File

@ -40,14 +40,14 @@ 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, array(
'',
'/**',
' * start IFM',
' */',
'$ifm = new IFM();',
'$ifm->run();'
), FILE_APPEND );
file_put_contents( $IFM_BUILD_STANDALONE,
'
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();'
, FILE_APPEND );
/**
* Build library

21
ifm.php
View File

@ -333,7 +333,8 @@ function IFM( params ) {
* @param string content - content of the modal
* @param object options - options for the modal
*/
this.showModal = function( content, options = {} ) {
this.showModal = function( content, options ) {
options = options || {};
var modal = $( document.createElement( 'div' ) )
.addClass( "modal fade" )
.attr( 'id', 'ifmmodal' )
@ -522,7 +523,8 @@ function IFM( params ) {
* @param string newdir - target directory
* @param object options - options for changing the directory
*/
this.changeDirectory = function( newdir, options={} ) {
this.changeDirectory = function( newdir, options ) {
options = options || {};
config = { absolute: false, pushState: true };
jQuery.extend( config, options );
if( ! config.absolute ) newdir = self.pathCombine( self.currentDir, newdir );
@ -1559,7 +1561,7 @@ function IFM( params ) {
*/
private function handleRequest() {
if($_REQUEST["api"] == "getRealpath") {
if( $_REQUEST["api"] == "getRealpath" ) {
if( isset( $_REQUEST["dir"] ) && $_REQUEST["dir"] != "" )
echo json_encode( array( "realpath" => $this->getValidDir( $_REQUEST["dir"] ) ) );
else
@ -1599,7 +1601,7 @@ function IFM( params ) {
break;
}
} else {
print json_encode(array("status"=>"ERROR", "message"=>"No valid working directory"));
print json_encode( array( "status" => "ERROR", "message" => "No valid working directory" ) );
}
}
exit( 0 );
@ -1613,7 +1615,7 @@ function IFM( params ) {
else
chdir( realpath( $this->config['root_dir'] ) );
$this->mode = $mode;
if ( isset( $_REQUEST['api'] ) || $mode == "api" ) {
if( isset( $_REQUEST['api'] ) || $mode == "api" ) {
$this->handleRequest();
} elseif( $mode == "standalone" ) {
$this->getApplication();
@ -1642,7 +1644,7 @@ function IFM( params ) {
else {
$item = array();
$item["name"] = $result;
if( is_dir($result) ) {
if( is_dir( $result ) ) {
$item["type"] = "dir";
if( $result == ".." )
$item["icon"] = "icon icon-up-open";
@ -2834,4 +2836,9 @@ class IFMZip {
}
}
}
/** * start IFM */$ifm = new IFM();$ifm->run();
/**
* start IFM
*/
$ifm = new IFM();
$ifm->run();

6
src/ifm.js
View File

@ -21,7 +21,8 @@ function IFM( params ) {
* @param string content - content of the modal
* @param object options - options for the modal
*/
this.showModal = function( content, options = {} ) {
this.showModal = function( content, options ) {
options = options || {};
var modal = $( document.createElement( 'div' ) )
.addClass( "modal fade" )
.attr( 'id', 'ifmmodal' )
@ -210,7 +211,8 @@ function IFM( params ) {
* @param string newdir - target directory
* @param object options - options for changing the directory
*/
this.changeDirectory = function( newdir, options={} ) {
this.changeDirectory = function( newdir, options ) {
options = options || {};
config = { absolute: false, pushState: true };
jQuery.extend( config, options );
if( ! config.absolute ) newdir = self.pathCombine( self.currentDir, newdir );

8
src/main.php
View File

@ -115,7 +115,7 @@ class IFM {
*/
private function handleRequest() {
if($_REQUEST["api"] == "getRealpath") {
if( $_REQUEST["api"] == "getRealpath" ) {
if( isset( $_REQUEST["dir"] ) && $_REQUEST["dir"] != "" )
echo json_encode( array( "realpath" => $this->getValidDir( $_REQUEST["dir"] ) ) );
else
@ -155,7 +155,7 @@ class IFM {
break;
}
} else {
print json_encode(array("status"=>"ERROR", "message"=>"No valid working directory"));
print json_encode( array( "status" => "ERROR", "message" => "No valid working directory" ) );
}
}
exit( 0 );
@ -169,7 +169,7 @@ class IFM {
else
chdir( realpath( $this->config['root_dir'] ) );
$this->mode = $mode;
if ( isset( $_REQUEST['api'] ) || $mode == "api" ) {
if( isset( $_REQUEST['api'] ) || $mode == "api" ) {
$this->handleRequest();
} elseif( $mode == "standalone" ) {
$this->getApplication();
@ -198,7 +198,7 @@ class IFM {
else {
$item = array();
$item["name"] = $result;
if( is_dir($result) ) {
if( is_dir( $result ) ) {
$item["type"] = "dir";
if( $result == ".." )
$item["icon"] = "icon icon-up-open";