From 62de3da0341ba5bf2bcfadbbcaaebbd30a6ba75b Mon Sep 17 00:00:00 2001
From: Luong Cuong M <luongcuong1991@gmail.com>
Date: Wed, 12 Nov 2014 13:55:59 +0700
Subject: [PATCH 1/2] session_auth

---
 .buildpath                                    |  5 +++++
 .project                                      | 22 +++++++++++++++++++
 .settings/org.eclipse.php.core.prefs          |  3 +++
 tinymce/plugins/filemanager/config.php        |  2 +-
 tinymce/plugins/filemanager/create_folder.php |  4 +---
 tinymce/plugins/filemanager/delete_file.php   |  4 +---
 tinymce/plugins/filemanager/delete_folder.php |  4 +---
 tinymce/plugins/filemanager/dialog.php        |  4 +---
 .../plugins/filemanager/force_download.php    |  4 +---
 tinymce/plugins/filemanager/plugin.min.js     |  0
 tinymce/plugins/filemanager/session_auth.php  |  4 ++++
 tinymce/plugins/filemanager/upload.php        |  4 +---
 tinymce/plugins/filemanager/utils.php         |  3 +--
 13 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 .buildpath
 create mode 100644 .project
 create mode 100644 .settings/org.eclipse.php.core.prefs
 mode change 100644 => 100755 tinymce/plugins/filemanager/force_download.php
 mode change 100644 => 100755 tinymce/plugins/filemanager/plugin.min.js
 create mode 100644 tinymce/plugins/filemanager/session_auth.php
 mode change 100644 => 100755 tinymce/plugins/filemanager/upload.php

diff --git a/.buildpath b/.buildpath
new file mode 100644
index 0000000..8bcb4b5
--- /dev/null
+++ b/.buildpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+	<buildpathentry kind="src" path=""/>
+	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000..9204fee
--- /dev/null
+++ b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Tinymce4Filemanager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
new file mode 100644
index 0000000..b2ce103
--- /dev/null
+++ b/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+include_path=0;/Tinymce4Filemanager
+use_asp_tags_as_php=false
diff --git a/tinymce/plugins/filemanager/config.php b/tinymce/plugins/filemanager/config.php
index 4a6bead..ae213f2 100755
--- a/tinymce/plugins/filemanager/config.php
+++ b/tinymce/plugins/filemanager/config.php
@@ -1,5 +1,5 @@
 <?php 
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbidden');
+include_once 'session_auth.php';
 
 $root = rtrim($_SERVER['DOCUMENT_ROOT'],'/'); // don't touch this configuration
 
diff --git a/tinymce/plugins/filemanager/create_folder.php b/tinymce/plugins/filemanager/create_folder.php
index f09affc..cf7cb8c 100755
--- a/tinymce/plugins/filemanager/create_folder.php
+++ b/tinymce/plugins/filemanager/create_folder.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 include 'config.php';
 include('utils.php');
 
diff --git a/tinymce/plugins/filemanager/delete_file.php b/tinymce/plugins/filemanager/delete_file.php
index a2a4c33..df0a477 100755
--- a/tinymce/plugins/filemanager/delete_file.php
+++ b/tinymce/plugins/filemanager/delete_file.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 include 'config.php';
 include('utils.php');
 
diff --git a/tinymce/plugins/filemanager/delete_folder.php b/tinymce/plugins/filemanager/delete_folder.php
index 36f0d29..a787a05 100755
--- a/tinymce/plugins/filemanager/delete_folder.php
+++ b/tinymce/plugins/filemanager/delete_folder.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 include 'config.php';
 include('utils.php');
 
diff --git a/tinymce/plugins/filemanager/dialog.php b/tinymce/plugins/filemanager/dialog.php
index 21b08ed..86d2448 100755
--- a/tinymce/plugins/filemanager/dialog.php
+++ b/tinymce/plugins/filemanager/dialog.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-$_SESSION["verify"] = "FileManager4TinyMCE";
+include_once 'session_auth.php';
 
 if(isset($_POST['submit'])){
 
diff --git a/tinymce/plugins/filemanager/force_download.php b/tinymce/plugins/filemanager/force_download.php
old mode 100644
new mode 100755
index 4a19dbe..206598a
--- a/tinymce/plugins/filemanager/force_download.php
+++ b/tinymce/plugins/filemanager/force_download.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 include 'config.php';
 
 $path=$_POST['path'];
diff --git a/tinymce/plugins/filemanager/plugin.min.js b/tinymce/plugins/filemanager/plugin.min.js
old mode 100644
new mode 100755
diff --git a/tinymce/plugins/filemanager/session_auth.php b/tinymce/plugins/filemanager/session_auth.php
new file mode 100644
index 0000000..e16c1e7
--- /dev/null
+++ b/tinymce/plugins/filemanager/session_auth.php
@@ -0,0 +1,4 @@
+<?php
+//auth prepare
+session_start();
+if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbidden');
\ No newline at end of file
diff --git a/tinymce/plugins/filemanager/upload.php b/tinymce/plugins/filemanager/upload.php
old mode 100644
new mode 100755
index 0ce1fdb..a88b6ee
--- a/tinymce/plugins/filemanager/upload.php
+++ b/tinymce/plugins/filemanager/upload.php
@@ -1,7 +1,5 @@
 <?php
-
-session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 
 include('config.php');
 include('utils.php');
diff --git a/tinymce/plugins/filemanager/utils.php b/tinymce/plugins/filemanager/utils.php
index ad83f1d..717ec7e 100755
--- a/tinymce/plugins/filemanager/utils.php
+++ b/tinymce/plugins/filemanager/utils.php
@@ -1,6 +1,5 @@
 <?php 
-
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbiden');
+include_once 'session_auth.php';
 
 function deleteDir($dir) {
     if (!file_exists($dir)) return true;

From 9a5a209692d6c49f8933275b30aa033ac7a0d2ea Mon Sep 17 00:00:00 2001
From: Cuong Luong <lhc772@yahoo.com>
Date: Wed, 29 Jul 2015 13:59:49 +0700
Subject: [PATCH 2/2] fix

---
 .settings/org.eclipse.php.core.prefs         | 2 +-
 tinymce/plugins/filemanager/config.php       | 6 +++---
 tinymce/plugins/filemanager/session_auth.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
index b2ce103..2baf59f 100644
--- a/.settings/org.eclipse.php.core.prefs
+++ b/.settings/org.eclipse.php.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-include_path=0;/Tinymce4Filemanager
+include_path=0;/FileManager4TinyMCE
 use_asp_tags_as_php=false
diff --git a/tinymce/plugins/filemanager/config.php b/tinymce/plugins/filemanager/config.php
index ae213f2..55d2fbe 100755
--- a/tinymce/plugins/filemanager/config.php
+++ b/tinymce/plugins/filemanager/config.php
@@ -8,8 +8,8 @@
 //**********************
 // In this configuration the folder tree is
 // root
+//   |- uploads <- upload folder
 //   |- tinymce
-//   |    |- source <- upload folder
 //   |    |- js
 //   |    |   |- tinymce
 //   |    |   |    |- plugins
@@ -17,8 +17,8 @@
 //   |    |   |    |-   |-      |- thumbs <- folder of thumbs [must have the write permission]
 
 $base_url="http://localhost"; //url base of site if you want only relative url leave empty
-$upload_dir = '/tinymce/source/'; // path from base_url to upload base dir
-$current_path = '../../../../source/'; // relative path from filemanager folder to upload files folder
+$upload_dir = '/uploads/'; // path from base_url to upload base dir
+$current_path = '../../../../../uploads/'; // relative path from filemanager folder to upload files folder
 
 $MaxSizeUpload=100; //Mb
 
diff --git a/tinymce/plugins/filemanager/session_auth.php b/tinymce/plugins/filemanager/session_auth.php
index e16c1e7..25f36a8 100644
--- a/tinymce/plugins/filemanager/session_auth.php
+++ b/tinymce/plugins/filemanager/session_auth.php
@@ -1,4 +1,4 @@
-<?php
-//auth prepare
+<?php 
 session_start();
-if($_SESSION["verify"] != "FileManager4TinyMCE") die('forbidden');
\ No newline at end of file
+if(!isset($_SESSION["FileManager4TinyMCE"]) || !$_SESSION["FileManager4TinyMCE"])
+    die('forbidden');
\ No newline at end of file