fix to elFinder regarding 'sessions'

exponentcms · Dec 12, 2016 · 04c994f · 04c994f
1 parent 9df16e8
commit 04c994f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/external/elFinder/js/elFinder.js b/external/elFinder/js/elFinder.js
@@ -6509,7 +6509,7 @@ elFinder.prototype = {
 	 * 
 	 * @param  Array    urls      to load JavaScript file URLs
 	 * @param  Function callback  call back function on script loaded
-	 * @param  Object   opts      Additional options to $.ajax
+	 * @param  Object   opts      Additional options to $.ajax OR {loadType: 'tag'} to load by script tag
 	 * @param  Object   check     { obj: (Object)ParentObject, name: (String)"Attribute name", timeout: (Integer)milliseconds }
 	 * @return elFinder
 	 */
@@ -6538,13 +6538,20 @@ elFinder.prototype = {
 				}
 			}
 		}
-		opts = $.isPlainObject(opts)? $.extend(defOpts, opts) : defOpts;
-		(function appendScript() {
-			$.ajax($.extend(opts, {
-				url: urls.shift(),
-				success: urls.length? appendScript : success
-			}));
-		})();
+		if (opts && opts.loadType === 'tag') {
+			$.each(urls, function(i, url) {
+				$('head').append($('<script defer="defer">').attr('src', url));
+			});
+			success();
+		} else {
+			opts = $.isPlainObject(opts)? $.extend(defOpts, opts) : defOpts;
+			(function appendScript() {
+				$.ajax($.extend(opts, {
+					url: urls.shift(),
+					success: urls.length? appendScript : success
+				}));
+			})();
+		}
 		return this;
 	},
 

diff --git a/external/elFinder/php/elFinder.class.php b/external/elFinder/php/elFinder.class.php
@@ -854,8 +854,8 @@ public function exec($cmd, $args) {
 		}
 
 		foreach ($this->volumes as $volume) {
+			$volume->saveSessionCache();
 			$volume->umount();
-			$volume->__destruct();
 		}
 
 		if (!empty($result['callback'])) {

diff --git a/external/elFinder/php/elFinderSession.php b/external/elFinder/php/elFinderSession.php
@@ -14,6 +14,8 @@ class elFinderSession implements elFinderSessionInterface
 
 	protected $keys = array();
 
+	protected $prevVal = null;
+
 	protected $base64encode = false;
 
 	protected $opts = array(
@@ -49,6 +51,10 @@ public function start()
 		}
 		$this->started = session_id()? true : false;
 
+		if ($this->started && is_null($this->prevVal)) {
+			$this->prevVal = $_SESSION;
+		}
+
 		return $this;
 	}
 
@@ -57,8 +63,9 @@ public function start()
      */
 	public function close()
 	{
-		if ($this->started) {
+		if ($this->started && $this->prevVal !== $_SESSION) {
 			session_write_close();
+			$this->prevVal = $_SESSION;
 		}
 		$this->started = false;
 

diff --git a/external/elFinder/php/elFinderVolumeDriver.class.php b/external/elFinder/php/elFinderVolumeDriver.class.php
@@ -668,13 +668,6 @@ abstract class elFinderVolumeDriver {
 	 */
 	protected $rootModified = false;
 
-	/**
-	 * Destracter
-	 */
-	public function __destruct() {
-		$this->session->set($this->id, $this->sessionCache);
-	}
-
 	/*********************************************************************/
 	/*                            INITIALIZATION                         */
 	/*********************************************************************/
@@ -831,6 +824,16 @@ public function setSession($session) {
 		$this->session = $session;
 	}
 
+	/**
+	 * Save session cache data
+	 * Calls this function before umount this volume on elFinder::exec()
+	 * 
+	 * @return void
+	 */
+	public function saveSessionCache() {
+		$this->session->set($this->id, $this->sessionCache);
+	}
+
 	/**
 	 * Return debug info for client
 	 *