From d14512b62d62f1f9ca9e5f811a77764a0c5236cb Mon Sep 17 00:00:00 2001
From: Marco Dickert <marco@misterunknown.de>
Date: Thu, 16 Feb 2017 14:04:55 +0100
Subject: [PATCH] added folder links functionality

---
 ifm.php      | 27 +++++++++++++++++++++------
 src/ifm.js   | 25 ++++++++++++++++++++-----
 src/main.php |  2 +-
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/ifm.php b/ifm.php
index 67020ac..c92eac3 100644
--- a/ifm.php
+++ b/ifm.php
@@ -130,7 +130,7 @@ class IFMZip {
 */
 
 class IFM {
-	const VERSION = '2.3.0';
+	const VERSION = '2.3.1';
 
 	public function __construct() {
 		session_start();
@@ -561,19 +561,21 @@ function IFM() {
 		// todo: bootstrap-fancybox for images
 	};
 
-	this.changeDirectory = function( newdir ) {
+	this.changeDirectory = function( newdir, options={ absolute: false, pushState: true } ) {
+		if( ! options.absolute ) newdir = self.pathCombine( self.currentDir, newdir );
 		$.ajax({
 			url: self.IFM_SCFN,
 			type: "POST",
 			data: ({
 				api: "getRealpath",
-				dir: self.pathCombine( ifm.currentDir, newdir )
+				dir: newdir
 			}),
 			dataType: "json",
-			success: function( data ){
+			success: function( data ) {
 				self.currentDir = data.realpath;
 				self.refreshFileTable();
 				$( "#currentDir" ).val( self.currentDir );
+				if( options.pushState ) history.pushState( { dir: self.currentDir }, self.currentDir, "#"+self.currentDir );
 			},
 			error: function() { self.showMessage( "General error occured: No or broken response", "e" ); }
 		});
@@ -1058,10 +1060,13 @@ function IFM() {
 	this.JSEncode = function(s) {
 		return s.replace(/'/g, '\\x27').replace(/"/g, '\\x22');
 	};
+	this.historyPopstateHandler = function(event) {
+		var dir = "";
+		if( event.state && event.state.dir ) dir = event.state.dir;
+		self.changeDirectory( dir, { pushState: false, absolute: true } );
+	};
 	// static button bindings and filetable initial filling
 	this.init = function() {
-		// fill file table
-		this.refreshFileTable();
 		// bind static buttons
 		$("#refresh").click(function(){
 			self.refreshFileTable();
@@ -1075,6 +1080,16 @@ function IFM() {
 		$("#upload").click(function(){
 			self.uploadFileDialog();
 		});
+
+		// handle history manipulation
+		window.onpopstate = self.historyPopstateHandler;
+
+		// load initial file table
+		if( window.location.hash ) {
+			self.changeDirectory( window.location.hash.substring( 1 ) );
+		} else {
+			this.refreshFileTable();
+		}
 	};
 }
 
diff --git a/src/ifm.js b/src/ifm.js
index 9b15676..708be90 100644
--- a/src/ifm.js
+++ b/src/ifm.js
@@ -136,19 +136,21 @@ function IFM() {
 		// todo: bootstrap-fancybox for images
 	};
 
-	this.changeDirectory = function( newdir ) {
+	this.changeDirectory = function( newdir, options={ absolute: false, pushState: true } ) {
+		if( ! options.absolute ) newdir = self.pathCombine( self.currentDir, newdir );
 		$.ajax({
 			url: self.IFM_SCFN,
 			type: "POST",
 			data: ({
 				api: "getRealpath",
-				dir: self.pathCombine( ifm.currentDir, newdir )
+				dir: newdir
 			}),
 			dataType: "json",
-			success: function( data ){
+			success: function( data ) {
 				self.currentDir = data.realpath;
 				self.refreshFileTable();
 				$( "#currentDir" ).val( self.currentDir );
+				if( options.pushState ) history.pushState( { dir: self.currentDir }, self.currentDir, "#"+self.currentDir );
 			},
 			error: function() { self.showMessage( "General error occured: No or broken response", "e" ); }
 		});
@@ -633,10 +635,13 @@ function IFM() {
 	this.JSEncode = function(s) {
 		return s.replace(/'/g, '\\x27').replace(/"/g, '\\x22');
 	};
+	this.historyPopstateHandler = function(event) {
+		var dir = "";
+		if( event.state && event.state.dir ) dir = event.state.dir;
+		self.changeDirectory( dir, { pushState: false, absolute: true } );
+	};
 	// static button bindings and filetable initial filling
 	this.init = function() {
-		// fill file table
-		this.refreshFileTable();
 		// bind static buttons
 		$("#refresh").click(function(){
 			self.refreshFileTable();
@@ -650,6 +655,16 @@ function IFM() {
 		$("#upload").click(function(){
 			self.uploadFileDialog();
 		});
+
+		// handle history manipulation
+		window.onpopstate = self.historyPopstateHandler;
+
+		// load initial file table
+		if( window.location.hash ) {
+			self.changeDirectory( window.location.hash.substring( 1 ) );
+		} else {
+			this.refreshFileTable();
+		}
 	};
 }
 
diff --git a/src/main.php b/src/main.php
index 8b4d0be..957bfad 100644
--- a/src/main.php
+++ b/src/main.php
@@ -11,7 +11,7 @@
 */
 
 class IFM {
-	const VERSION = '2.3.0';
+	const VERSION = '2.3.1';
 
 	public function __construct() {
 		session_start();