Merge branch 'release/v20170302.2'

.gitignore

@@ -1,3 +1,4 @@
 .svn/*
 */logs/log*
-/web.config
+/web.config
+/kcfinder/upload/

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>

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>

kcfinder/browse.php

@@ -1,5 +1,5 @@
 <?php
-
+header("Cache-Control: no-cache");
 /** This file is part of KCFinder project
   *
   *      @desc Browser calling script