Merge branch 'release/v20170303.1'

.gitignore

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

kcfinder/cache/base.css

@@ -1 +1,207 @@
-html,body{overflow:hidden}body,form,th,td{margin:0;padding:0}a{cursor:pointer}*{font-family:Tahoma,Verdana,Arial,sans-serif;font-size:11px}table{border-collapse:collapse}#left{float:left;display:block;width:25%}#right{float:left;display:block;width:75%}#settings{display:none;padding:0;float:left;width:100%}#settings>div{float:left}#folders{padding:5px;overflow:auto}#toolbar{padding:5px}#files{padding:5px;overflow:auto}#status{padding:5px;float:left;overflow:hidden}#fileinfo{float:left}#clipboard div{width:16px;height:16px}.folders{margin-left:16px}div.file{overflow-x:hidden;float:left;text-align:center;cursor:default;white-space:nowrap}div.file .thumb{background:no-repeat center center}#files table{width:100%}tr.file{cursor:default}tr.file>td{white-space:nowrap}tr.file>td.name{background-repeat:no-repeat;background-position:left center;padding-left:20px;width:100%}tr.file>td.time,tr.file>td.size{text-align:right}#toolbar{cursor:default;white-space:nowrap}#toolbar a{padding-left:20px;text-decoration:none;background:no-repeat left center}#toolbar a:hover,a[href="#upload"].uploadHover{color:#000}#upload{position:absolute;overflow:hidden;opacity:0;filter:alpha(opacity=0)}#upload input,#upload input::-webkit-file-upload-button{cursor:pointer}span.brace{padding-left:11px;cursor:default}span.brace.opened,span.brace.closed{cursor:pointer}#menu,#clipboard{position:absolute;display:none;z-index:101;cursor:default}#menu .box,#alert{max-width:350px}#clipboard{z-index:99}#loading{display:none;float:right}.menu{background:#888;white-space:nowrap}.menu a{display:block}.menu .list{max-height:0;overflow-y:auto;overflow-x:hidden;white-space:nowrap}#uploadResponse,.file .access,.file .hasThumb{display:none}#resizer{position:absolute;z-index:98;top:0;background:#000;opacity:0;filter:alpha(opacity=0)}body.mobile{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none}body.firefox #files>div{overflow:auto;margin-bottom:5px}
+html, body {
+    overflow: hidden;
+}
+
+body, form, th, td {
+    margin: 0;
+    padding: 0;
+}
+
+a {
+    cursor: pointer;
+}
+
+* {
+    font-family: Tahoma, Verdana, Arial, sans-serif;
+    font-size: 11px;
+}
+
+table {
+    border-collapse: collapse;
+}
+
+#left {
+    float: left;
+    display: block;
+    width: 25%;
+}
+
+#right {
+    float: left;
+    display: block;
+    width: 75%;
+}
+
+#settings {
+    display: none;
+    padding: 0;
+    float: left;
+    width: 100%;
+}
+
+#settings > div {
+    float: left;
+}
+
+#folders {
+    padding: 5px;
+    overflow: auto;
+}
+
+#toolbar {
+    padding: 5px;
+}
+
+#files {
+    padding: 5px;
+    overflow: auto;
+}
+
+#status {
+    padding: 5px;
+    float: left;
+    overflow: hidden;
+}
+
+#fileinfo {
+    float: left;
+}
+
+#clipboard div {
+    width: 16px;
+    height: 16px;
+}
+
+.folders {
+    margin-left: 16px;
+}
+
+div.file {
+    overflow-x: hidden;
+    float: left;
+    text-align: center;
+    cursor: default;
+    white-space: nowrap;
+}
+
+div.file .thumb {
+    background: no-repeat center center;
+}
+
+#files table {
+    width: 100%;
+}
+
+tr.file {
+    cursor: default;
+}
+
+tr.file > td {
+    white-space: nowrap;
+}
+
+tr.file > td.name {
+    background-repeat: no-repeat;
+    background-position: left center;
+    padding-left: 20px;
+    width: 100%;
+}
+
+tr.file > td.time,
+tr.file > td.size {
+    text-align: right;
+}
+
+#toolbar {
+    cursor: default;
+    white-space: nowrap;
+}
+
+#toolbar a {
+    padding-left: 20px;
+    text-decoration: none;
+    background: no-repeat left center;
+}
+
+#toolbar a:hover, a[href="#upload"].uploadHover {
+    color: #000;
+}
+
+#upload {
+    position: absolute;
+    overflow: hidden;
+    opacity: 0;
+    filter: alpha(opacity=0);
+}
+#upload input, #upload input::-webkit-file-upload-button {
+    cursor: pointer;
+}
+
+span.brace {
+    padding-left: 11px;
+    cursor: default;
+}
+
+span.brace.opened, span.brace.closed {
+    cursor: pointer;
+}
+
+#menu, #clipboard {
+    position: absolute;
+    display: none;
+    z-index: 101;
+    cursor: default;
+}
+
+#menu .box, #alert {
+    max-width: 350px;
+}
+
+#clipboard {
+    z-index: 99;
+}
+
+#loading {
+    display: none;
+    float: right;
+}
+
+.menu {
+    background: #888;
+    white-space: nowrap;
+}
+
+.menu a {
+    display: block;
+}
+
+.menu .list {
+    max-height: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
+    white-space: nowrap;
+}
+
+#uploadResponse,
+.file .access,
+.file .hasThumb {
+    display: none;
+}
+
+#resizer {
+    position: absolute;
+    z-index: 98;
+    top: 0;
+    background: #000;
+    opacity: 0;
+    filter: alpha(opacity=0);
+}body.mobile {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+}
+
+body.firefox #files > div {
+    overflow: auto;
+    margin-bottom: 5px;
+}

kcfinder/cache/theme_default.js

@@ -1 +1 @@
-new Image().src="themes/default/img/loading.gif";
+new Image().src = 'themes/default/img/loading.gif'; // preload animated gif

kcfinder/conf/config.php

@@ -1,5 +1,4 @@
 <?php
-
 /** This file is part of KCFinder project
   *
   *      @desc Base configuration file
@@ -27,10 +26,10 @@ $_CONFIG = array(
     'theme' => "default",//主题
 
     'types' => array(
-		'ah'=>array(
-			'types'=>'*mime image/gif image/png image/jpeg'
-		)
-
+		'default'=>'4sj4837Rjk37L',//默认站点，设置一个怎么也猜不到的后缀
+		'ah'=>'*mime image/gif image/png image/jpeg', //这个名称就是目录名，每个站点不同
+		
+		
     // (F)CKEditor types
        // 'files'   =>  "",
       //  'flash'   =>  "swf",
@@ -46,7 +45,7 @@ $_CONFIG = array(
 // IMAGE SETTINGS
 
     'imageDriversPriority' => "gmagick gd imagick",
-    'jpegQuality' => 90,
+    'jpegQuality' => 80,
     'thumbsDir' => ".thumbs",
 
     'maxImageWidth' => 0,