From edfb24ac8f65185a12b0f0a281d21f9c46415002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 2 Mar 2017 14:54:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8D=E7=BC=93=E5=AD=98=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 437ba29a..d14801e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .svn/*
 */logs/log*
-/web.config
\ No newline at end of file
+/web.config
+/kcfinder/upload/
\ No newline at end of file

From ebe58f23db613969165b3d8db6879ad8e6476733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 2 Mar 2017 15:10:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=A8=E5=A4=B4=E9=83=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                              |  3 ++-
 application/views/bootstrap/header.php  | 20 +++++++++++++++++++-
 application/views/bootstrap3/header.php | 21 ++++++++++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 437ba29a..f33db12c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .svn/*
 */logs/log*
-/web.config
\ No newline at end of file
+/web.config
+/kcfinder/upload\
\ No newline at end of file
diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index 32c1fc6f..c462b0a5 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -10,6 +10,24 @@
         <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 
         <script language="javascript">
+		
+		//资源文件上传管理
+			function openKCFinder_singleFile_res() {
+				window.KCFinder = {};
+				window.KCFinder.callBack = function(url) {
+					<?php 
+					switch ($this->config->item('site_code')) {
+						case 'ah':
+							echo "alert(url.replace('/kcfinder/upload/ah/','https://data.asiahighlights.com/'));";
+							break;
+						default:echo 'alert(url);';
+					}
+					?>
+					window.KCFinder = null;
+				};
+				window.open('/kcfinder/browse.php?type=<?php echo $this->config->item('site_code'); ?>', 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600' );
+			}
+		
             //快速图片上传
             function openKCFinder_fast() {
                 window.CallBack = oopenKCFinder_fast_callback;
@@ -72,7 +90,7 @@
                                 </span>
                                 <input type="text" class="input-xlarge" name="keywords" id="keywords"  value="<?php echo isset($keywords) ? $keywords : false; ?>">
                                 <button class="btn">搜索</button>
-                                <a href="#" onclick="openKCFinder_fast();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
+                                <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
                                 <a href="#" title="静态化更新" class="btn"  data-toggle="modal" data-target="#cache_refresh_modal" ><i class="icon-refresh"></i></a>
                             </div>
                         </form>
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 8967f675..8d164b96 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -10,6 +10,25 @@
         <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 
         <script language="javascript">
+		
+		//资源文件上传管理
+			function openKCFinder_singleFile_res() {
+				window.KCFinder = {};
+				window.KCFinder.callBack = function(url) {
+					<?php 
+					switch ($this->config->item('site_code')) {
+						case 'ah':
+							echo "alert(url.replace('/kcfinder/upload/ah/','https://data.asiahighlights.com/'));";
+							break;
+						default:echo 'alert(url);';
+					}
+					?>
+					window.KCFinder = null;
+				};
+				window.open('/kcfinder/browse.php?type=<?php echo $this->config->item('site_code'); ?>', 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600' );
+			}
+
+		
             //快速图片上传
             function openKCFinder_fast() {
                 window.CallBack = oopenKCFinder_fast_callback;
@@ -75,7 +94,7 @@
 
                             <span class="input-group-btn">
                                 <button class="btn btn-default btn-sm" type="submit">搜索</button>
-                                <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
                                 <a href="#" title="静态化更新" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cache_refresh_modal" ><span class="glyphicon glyphicon-repeat"></span></a>
                             </span>
                         </div>

From 3d55fa630b90fe6fa41e474fd2c624f2cdf7d6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 2 Mar 2017 15:14:22 +0800
Subject: [PATCH 3/4] no message

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e6e494d9..d14801e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .svn/*
 */logs/log*
-/web.config/kcfinder/upload/
\ No newline at end of file
+/web.config
+/kcfinder/upload/
\ No newline at end of file

From 19e131f220e08af85f46f11c8c661b7d01b6c762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 2 Mar 2017 15:16:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kcfinder/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcfinder/browse.php b/kcfinder/browse.php
index da995522..407b9e02 100644
--- a/kcfinder/browse.php
+++ b/kcfinder/browse.php
@@ -1,5 +1,5 @@
 <?php
-
+header("Cache-Control: no-cache");
 /** This file is part of KCFinder project
   *
   *      @desc Browser calling script