3.20-test2

* jQuery adapter added
* Session handling improvements. Now `_sessionVar` option could get
arrays by reference
* Session related ini options in `conf/config.php` are removed and no
more supported
* Removed redundant closing tags in PHP files

browse.php

@@ -16,5 +16,3 @@
 $browser = "kcfinder\\browser"; // To execute core/bootstrap.php on older
 $browser = new $browser();      // PHP versions (even PHP 4)
 $browser->action();
-
-?>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "sunhater/kcfinder",
     "description": "KCFinder web file manager",
-    "version": "3.20-test1",
+    "version": "3.20-test2",
     "type": "library",
     "keywords": [
         "kcfinder",

conf/config.php

@@ -16,7 +16,7 @@
    even if you are using session configuration.
    See http://kcfinder.sunhater.com/install for setting descriptions */
 
-$_CONFIG = array(
+return array(
 
 
 // GENERAL SETTINGS
@@ -108,20 +108,11 @@
 
 // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION SETTINGS
 
-    '_normalizeFilenames' => false,
+    '_sessionVar' => "KCFINDER",
     '_check4htaccess' => true,
+    '_normalizeFilenames' => false,
     '_dropUploadMaxFilesize' => 10485760,
     //'_tinyMCEPath' => "/tiny_mce",
-
-    '_sessionVar' => "KCFINDER",
-    //'_sessionLifetime' => 30,
-    //'_sessionDir' => "/full/directory/path",
-    //'_sessionDomain' => ".mysite.com",
-    //'_sessionPath' => "/my/path",
-
     //'_cssMinCmd' => "java -jar /path/to/yuicompressor.jar --type css {file}",
     //'_jsMinCmd' => "java -jar /path/to/yuicompressor.jar --type js {file}",
-
 );
-
-?>

core/autoload.php

@@ -21,14 +21,8 @@
     list($ns, $class) = $path;
 
     if ($ns == "kcfinder") {
-
-        if ($class == "uploader")
-            require "core/class/uploader.php";
-        elseif ($class == "browser")
-            require "core/class/browser.php";
-        elseif ($class == "minifier")
-            require "core/class/minifier.php";
-
+        if (in_array($class, array("uploader", "browser", "minifier", "session")))
+            require "core/class/$class.php";
         elseif (file_exists("core/types/$class.php"))
             require "core/types/$class.php";
         elseif (file_exists("lib/class_$class.php"))
@@ -37,5 +31,3 @@
             require "lib/helper_$class.php";
     }
 });
-
-?>

core/bootstrap.php

@@ -177,5 +177,3 @@ public function gc($maxlifetime) {
 
 
 // PUT YOUR ADDITIONAL CODE HERE
-
-?>

core/class/browser.php

@@ -936,5 +936,3 @@ protected function getLangs() {
         return $langs;
     }
 }
-
-?>

core/class/minifier.php

@@ -25,13 +25,12 @@ class minifier {
     );
 
     public function __construct($type=null) {
-        require "conf/config.php";
-        $this->config = $_CONFIG;
+        $this->config = require("conf/config.php");
         $type = strtolower($type);
         if (isset($this->mime[$type]))
             $this->type = $type;
-        if (isset($_CONFIG["_{$this->type}MinCmd"]))
-            $this->minCmd = $_CONFIG["_{$this->type}MinCmd"];
+        if (isset($this->config["_{$this->type}MinCmd"]))
+            $this->minCmd = $this->config["_{$this->type}MinCmd"];
     }
 
     public function minify($cacheFile=null, $dir=null) {
@@ -110,5 +109,3 @@ public function minify($cacheFile=null, $dir=null) {
 
     }
 }
-
-?>

core/class/session.php

@@ -0,0 +1,76 @@
+<?php
+
+/** This file is part of KCFinder project
+  *
+  *      @desc Session class
+  *   @package KCFinder
+  *   @version 3.12
+  *    @author Pavel Tzonkov <sunhater@sunhater.com>
+  * @copyright 2010-2014 KCFinder Project
+  *   @license http://opensource.org/licenses/GPL-3.0 GPLv3
+  *   @license http://opensource.org/licenses/LGPL-3.0 LGPLv3
+  *      @link http://kcfinder.sunhater.com
+  */
+
+namespace kcfinder;
+
+class session {
+
+    const SESSION_VAR = "_sessionVar";
+    public $values;
+    protected $config;
+
+    public function __construct($configFile) {
+
+        // Start session if it is not already started
+        if (!session_id())
+            session_start();
+
+        $config = require($configFile);
+
+        // _sessionVar option is set
+        if (isset($config[self::SESSION_VAR])) {
+            $session = &$config[self::SESSION_VAR];
+
+            // _sessionVar option is string
+            if (is_string($session))
+                $session = &$_SESSION[$session];
+
+            if (!is_array($session))
+                $session = array();
+
+        // Use global _SESSION array if _sessionVar option is not set
+        } else
+            $session = &$_SESSION;
+
+        // Securing the session
+        $stamp = array(
+            'ip' => $_SERVER['REMOTE_ADDR'],
+            'agent' => md5($_SERVER['HTTP_USER_AGENT'])
+        );
+        if (!isset($session['stamp']))
+            $session['stamp'] = $stamp;
+        elseif (!is_array($session['stamp']) || ($session['stamp'] !== $stamp)) {
+            // Destroy session if user agent is different (e.g. after browser update)
+            if ($session['stamp']['ip'] === $stamp['ip'])
+                session_destroy();
+            die;
+        }
+
+        // Load session configuration
+        foreach ($config as $key => $val)
+            $this->config[$key] = ((substr($key, 0, 1) != "_") && isset($session[$key]))
+                ? $session[$key]
+                : $val;
+
+        // Session data goes to 'self' element
+        if (!isset($session['self']))
+            $session['self'] = array();
+        $this->values = &$session['self'];
+    }
+
+    public function getConfig() {
+        return $this->config;
+    }
+
+}

core/class/uploader.php

@@ -17,7 +17,7 @@
 class uploader {
 
 /** Release version */
-    const VERSION = "3.20-test1";
+    const VERSION = "3.20-test2";
 
 /** Config session-overrided settings
   * @var array */
@@ -107,59 +107,10 @@ public function __construct() {
         if (count($_FILES))
             $this->file = &$_FILES[key($_FILES)];
 
-        // LOAD DEFAULT CONFIGURATION
-        require "conf/config.php";
-
-        // SETTING UP SESSION
-        if (!session_id()) {
-            if (isset($_CONFIG['_sessionLifetime']))
-                ini_set('session.gc_maxlifetime', $_CONFIG['_sessionLifetime'] * 60);
-            if (isset($_CONFIG['_sessionDir']))
-                ini_set('session.save_path', $_CONFIG['_sessionDir']);
-            if (isset($_CONFIG['_sessionDomain']))
-                ini_set('session.cookie_domain', $_CONFIG['_sessionDomain']);
-            session_start();
-        }
-
-        // LOAD SESSION CONFIGURATION IF EXISTS
-        $this->config = $_CONFIG;
-        $sessVar = "_sessionVar";
-        if (isset($_CONFIG[$sessVar])) {
-
-            $sessVar = $_CONFIG[$sessVar];
-
-            if (!isset($_SESSION[$sessVar]))
-                $_SESSION[$sessVar] = array();
-
-            $sessVar = &$_SESSION[$sessVar];
-
-            if (!is_array($sessVar))
-                $sessVar = array();
-
-            foreach ($sessVar as $key => $val)
-                if ((substr($key, 0, 1) != "_") && isset($_CONFIG[$key]))
-                    $this->config[$key] = $val;
-
-            if (!isset($sessVar['self']))
-                $sessVar['self'] = array();
-
-            $this->session = &$sessVar['self'];
-
-        } else
-            $this->session = &$_SESSION;
-
-        // SECURING THE SESSION
-        $stamp = array(
-            'ip' => $_SERVER['REMOTE_ADDR'],
-            'agent' => md5($_SERVER['HTTP_USER_AGENT'])
-        );
-        if (!isset($this->session['stamp']))
-            $this->session['stamp'] = $stamp;
-        elseif (!is_array($this->session['stamp']) || ($this->session['stamp'] !== $stamp)) {
-            if ($this->session['stamp']['ip'] === $stamp['ip'])
-                session_destroy();
-            die;
-        }
+        // CONFIG & SESSION SETUP
+        $session = new session("conf/config.php");
+        $this->config = $session->getConfig();
+        $this->session = &$session->values;
 
         // IMAGE DRIVER INIT
         if (isset($this->config['imageDriversPriority'])) {
@@ -813,5 +764,3 @@ protected function get_htaccess() {
         return file_get_contents("conf/upload.htaccess");
     }
 }
-
-?>

core/types/type_img.php

@@ -29,5 +29,3 @@ public function checkFile($file, array $config) {
         return true;
     }
 }
-
-?>

core/types/type_mime.php

@@ -45,5 +45,3 @@ public function checkFile($file, array $config) {
             : true;
     }
 }
-
-?>

css/index.php

@@ -18,5 +18,3 @@
 require "core/autoload.php";
 $min = new minifier("css");
 $min->minify("cache/base.css");
-
-?>

doc/Changelog.md

@@ -1,3 +1,10 @@
+3.20-test2: 2014-08-24
+----------------------
+* jQuery adapter added
+* Session handling improvements. Now `_sessionVar` option could get arrays by reference
+* Session related ini options in `conf/config.php` are removed and no more supported
+* Removed redundant closing tags in PHP files
+
 3.20-test1: 2014-08-19
 ----------------------
 * "`DOCUMENT_ROOT` is symlink" bugfix

index.php

@@ -1,5 +1,2 @@
 <?php
-
 require "browse.php";
-
-?>

integration/drupal.php

@@ -109,5 +109,3 @@ function CheckAuthentication($drupal_path) {
 }
 
 CheckAuthentication(get_drupal_path());
-
-?>

js/index.php

@@ -18,5 +18,3 @@
 require "core/autoload.php";
 $min = new minifier("js");
 $min->minify("cache/base.js");
-
-?>

js_localize.php

@@ -44,5 +44,3 @@
 }
 
 echo "}";
-
-?>

lang/af.php

@@ -244,5 +244,3 @@
     "Select Thumbnails" => "Kies duimnaels",
     "Download files" => "Laai lêers af",
 );
-
-?>

lang/bg.php

@@ -276,5 +276,3 @@
     "Uploaded {uploaded} of {total}" => "Качено {uploaded} от общо {total}",
     "Errors:" => "Грешки:"
 );
-
-?>

lang/ca.php

@@ -126,5 +126,3 @@
     "Uploading file {number} of {count}... {progress}" => "Carregant arxiu {number} de {count}... {progress}",
     "Failed to upload {filename}!" => "Error al carregar {filename}",
 );
-
-?>

lang/cs.php

@@ -130,5 +130,3 @@
     "Confirmation" => "Potvrzení",
     "Warning" => "Varování",
 );
-
-?>

lang/da.php

@@ -125,5 +125,3 @@
     "Uploading file {number} of {count}... {progress}" => "Uploader fil {number} af {count} ... {progress}",
     "Failed to upload {filename}!" => "Kunne ikke uploade {filename}!",
 );
-
-?>

lang/de.php

@@ -130,5 +130,3 @@
     "Confirmation" => "Bestätigung",
     "Warning" => "Warnung"
 );
-
-?>

lang/el.php

@@ -130,5 +130,3 @@
     "Confirmation" => "Επιβεβαίωση",
     "Warning" => "Προειδοποίηση",
 );
-
-?>

lang/en.php

@@ -23,5 +23,3 @@
     '_dateTimeMid' => "%a %b %e %Y %I:%M %p",
     '_dateTimeSmall' => "%m/%d/%Y %I:%M %p",
 );
-
-?>

lang/es.php

@@ -125,5 +125,3 @@
     "Uploading file {number} of {count}... {progress}" => "Cargando archivo {number} de {count}... {progress}",
     "Failed to upload {filename}!" => "¡No se pudo cargar el archivo {filename}!",
 );
-
-?>

lang/et.php

@@ -125,5 +125,3 @@
     "Uploading file {number} of {count}... {progress}" => "Laen üles faili {number} {count}-st... {progress}",
     "Failed to upload {filename}!" => "{filename} üleslaadimine ebaõnnestus!",
 );
-
-?>