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

Merge branch 'master' into sane-coding-style

Browse Source
This commit is contained in:
Marco Dickert 2020-10-15 14:41:55 +02:00
commit 5ee3e4a8dc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler.php
View File

@ -9,11 +9,11 @@
chdir(realpath(dirname(__FILE__))); chdir(realpath(dirname(__FILE__)));
// output files and common attrs // output files and common attrs
define("IFM_VERSION", "v2.6.2"); define( "IFM_VERSION", "v2.6.3" );
define("IFM_RELEASE_DIR", "dist/"); define( "IFM_RELEASE_DIR", "dist/");
define("IFM_STANDALONE", "ifm.php"); define( "IFM_STANDALONE", "ifm.php" );
define("IFM_STANDALONE_GZ", "ifm.min.php"); define( "IFM_STANDALONE_GZ", "ifm.min.php" );
define("IFM_LIB", "libifm.php"); define( "IFM_LIB", "libifm.php" );
// php source files // php source files
$IFM_SRC_PHP = [ $IFM_SRC_PHP = [

4
src/ifm.js
View File

@ -171,9 +171,9 @@ function IFM(params) {
else if (self.config.download && self.config.zipnload) { else if (self.config.download && self.config.zipnload) {
if (self.config.root_public_url) { if (self.config.root_public_url) {
if (self.config.root_public_url.charAt(0) == "/") if (self.config.root_public_url.charAt(0) == "/")
item.link = self.pathCombine(window.location.origin, self.config.root_public_url, self.currentDir, item.name); item.link = self.pathCombine(window.location.origin, self.config.root_public_url, self.hrefEncode(self.currentDir), self.hrefEncode(item.name) );
else else
item.link = self.pathCombine(self.config.root_public_url, self.currentDir, item.name); item.link = self.pathCombine(self.config.root_public_url, self.hrefEncode(self.currentDir), self.hrefEncode(item.name) );
} else } else
item.link = self.api+"?api="+(item.download.action=="zipnload"?"zipnload":"proxy")+"&dir="+self.hrefEncode(self.currentDir)+"&filename="+self.hrefEncode(item.download.name); item.link = self.api+"?api="+(item.download.action=="zipnload"?"zipnload":"proxy")+"&dir="+self.hrefEncode(self.currentDir)+"&filename="+self.hrefEncode(item.download.name);
} else } else