ver 4.31 release

2018-07-06 21:42:52 +08:00 · 2018-07-06 21:42:52 +08:00 · 6084999901
parent 35e647c137
commit 6084999901
42 changed files with 102 additions and 85 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -1,3 +1,14 @@
+### ver4.31 `2018/07/09` 
+-----
+#### update:
+- 修复vi语言多语言问题；
+- 分享对话框加入二维码；分享页面加入二维码;
+- loading图片缓存处理
+- 服务器兼容处理: 子目录绑定的服务器兼容问题处理;兼容前端、后端通用处理;
+- IE兼容问题优化: 预览CAD报错问题处理,分享带密码的文件夹视频播放问题；
+
+
+
 ### ver4.30 `2018/07/05` 
 -----
 #### update:
--- a/app/controller/editor.class.php
+++ b/app/controller/editor.class.php
@ -10,7 +10,7 @@ class editor extends Controller{
 	function __construct()    {
 		parent::__construct();
 	}
-
+	
 	// 多文件编辑器
 	public function index(){
 		$this->themeSet();
--- a/app/controller/util.php
+++ b/app/controller/util.php
--- a/app/function/common.function.php
+++ b/app/function/common.function.php
@ -410,7 +410,7 @@ function show_tips($message,$url= '', $time = 3,$title = ''){
 	
 	if(is_array($message) || is_object($message)){
 		$message = json_encode_force($message);
-		$message = nl2br(htmlspecialchars($message));
+		$message = htmlspecialchars($message);
 		$message = "<pre>".$message.'</pre>';
 	}else{
 		$message = filter_html(nl2br($message));
--- a/app/function/web.function.php
+++ b/app/function/web.function.php
@ -52,6 +52,11 @@ function get_url_domain($url){
 	$res = parse_url($url);
 	return $res["host"];
 }
+function get_url_scheme($url){
+	if(!$url) return "";
+	$res = parse_url($url);
+	return $res['scheme'];
+}

 function get_host() {
 	//兼容子目录反向代理:只能是前端js通过cookie传入到后端进行处理
@ -77,23 +82,7 @@ function this_url(){
 	$url = get_host().$_SERVER['REQUEST_URI'];
 	return $url;
 }
-function reset_path($str){
-	return str_replace('\\','/',$str);
-}
-function get_webroot($app_path=''){
-	$index='index.php';
-	$self_file  = reset_path($_SERVER['SCRIPT_NAME']);
-	if($app_path == ''){
-		$index_path = reset_path($_SERVER['SCRIPT_FILENAME']);
-		$app_path = substr($index_path,0,strrpos($index_path,'/'));
-		$index = substr($index_path,1+strrpos($index_path,'/'));
-	}
-	$webRoot = str_replace($self_file,'',$app_path.$index).'/';
-	if (substr($webRoot,-(strlen($index)+1)) == $index.'/') {//解决部分主机不兼容问题
-		$webRoot = reset_path($_SERVER['DOCUMENT_ROOT']).'/';
-	}
-	return $webRoot;
-}
+
 function ua_has($str){
 	if(!isset($_SERVER['HTTP_USER_AGENT'])){
 		return false;
--- a/app/template/api/view.html
+++ b/app/template/api/view.html
@ -49,7 +49,7 @@

 <body>
 	<div class="full-background"></div>
-	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div></div>
+	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div></div>
 	<div class="frame-main">
 		<div class="bindary-box hidden">
 			<div class="title"><div class="ico"></div></div>
--- a/app/template/common/navbarShare.html
+++ b/app/template/common/navbarShare.html
@ -36,7 +36,10 @@
 			<?php if(!isset($config['settings']['language'])){ ?>
 			<div class="menu-group">
 				<a id='topbar-language' data-toggle="dropdown" href="#" class="topbar-menu">
-				<i class='font-icon icon-flag'></i>&nbsp;<b class="caret"></b>
+					<i class='font-icon icon-flag'></i>&nbsp;<b class="caret"></b>
+				</a>
+				<a href="#" onclick="core.qrcode(window.location.href);" title="<?php echo LNG('qrcode');?>" class="topbar-menu" style="padding: 0 15px;margin-left: -2px;">
+					<i class="font-icon icon-qrcode"></i>
 				</a>
 				<ul class="dropdown-menu topbar-language pull-right animated menuShow" role="menu" aria-labelledby="topbar-language">
 				  	<?php 
@ -54,7 +57,6 @@
 			<div class="menu-group">
 				<a href="#" id='topbar-user' class="topbar-menu" data-toggle="dropdown"><i class="font-icon icon-user"></i><?php echo $_SESSION['kodUser']['name'];?>&nbsp;<b class="caret"></b></a>
 				<ul class="dropdown-menu menu-topbar-user pull-right animated menuShow" role="menu" aria-labelledby="topbar-user">
-					<li><a href="#" onclick="core.qrcode(window.location.href);"><i class="font-icon icon-qrcode"></i><?php echo LNG('qrcode');?></a></li>
 					<li><a href="#" onclick="core.fullScreen();"><i class="font-icon icon-fullscreen"></i><?php echo LNG('full_screen');?></a></li>
 					<li class="version_vip_free"><a href="http://kodcloud.com" target="_blank"><i class="font-icon icon-code-fork"></i><?php echo LNG('ui_project_home');?></a></li>
 				</ul>			
--- a/app/template/common/showTips.html
+++ b/app/template/common/showTips.html
@ -2,7 +2,11 @@
 	<title><?php echo $title;?></title>
 	<script type="text/javascript" src="<?php echo STATIC_PATH;?>js/lib/jquery-1.8.0.min.js?ver=<?php echo KOD_VERSION;?>"></script>
 	<style type="text/css">
-		body{background-color:#f0f2f5;}
+		body{
+			background-color:#f0f2f5;
+			font-family: Verdana,"Lantinghei SC","Hiragino Sans GB","Microsoft Yahei",Helvetica,arial,sans-serif;
+    		line-height: 1.5em;
+		}
 		body a,body a:hover{color: #1890ff;}
 		.body-panel{
 			width:70%;margin:10% auto 5% auto;
@ -26,7 +30,13 @@
 			padding: 24px 40px;
 			text-align: left;
 		}
-		.error-info{border-left: 5px solid #1890ff;padding-left: 10px;}
+		.error-info{
+			border-left: 5px solid #1890ff;
+			display: block;
+			padding: 5px 10px;
+			background: #fcfcfc;
+			color: #666;
+		}
 		.location-to{padding: 10px 0;color: #888;font-size: 13px;font-style: italic;}
 		.icon{
 		    font-family: FontAwesome;
--- a/app/template/editor/edit.html
+++ b/app/template/editor/edit.html
@ -6,7 +6,7 @@
  </head>
 <body <?php echo $codeThemeBlack;?>>
 	<div class="init-loading">
-		<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div>
+		<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div>
 	</div>
 	<div class="edit-main" style="height: 100%;" oncontextmenu="return core.contextmenu();">
 		<div class="tools">
--- a/app/template/explorer/explorerWap.html
+++ b/app/template/explorer/explorerWap.html
@ -3,7 +3,7 @@
 	<link href="<?php echo STATIC_PATH;?>style/wap/app_explorer.css?ver=<?php echo KOD_VERSION;?>" rel="stylesheet"/>
 </head>
 <body>
-	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div></div>
+	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div></div>
 	<div class="panel-menu">
 		<div class="panel-hd">
 			<span class="my-avator"> 
--- a/app/template/setting/index.html
+++ b/app/template/setting/index.html
@ -6,7 +6,7 @@
 </head>
 <body class="setting-page"  oncontextmenu="return core.contextmenu();">
 	<div class="init-loading">
-		<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div>
+		<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div>
 	</div>
 	<div id="body">
 		<div class="menu-left">	
--- a/app/template/share/tips.html
+++ b/app/template/share/tips.html
@ -10,7 +10,7 @@
 	<div class="frame-main">
 		<?php if($msg=='password'){?>
 		<div class="share-page-passowrd">
-			<b><?php echo LNG('share_password');?>:</b>
+			<div class="title"><?php echo LNG('share_password');?></div>
 			<input type="password" class="form-control"/>
 			<a href="javascript:void(0);" class="btn btn-primary share-login"><?php echo LNG('button_ok');?></a>
 		</div>
--- a/app/template/user/login.html
+++ b/app/template/user/login.html
@ -7,7 +7,7 @@
 <body>
 	<?php echo pageBackground();?>
 	<div class="background"></div>
-	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div></div>
+	<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div></div>
 	<div class="loginbox animated-500 fadeInDown aero" >
 		<div class="title">
 			<div class="logo"><i class="icon-cloud"></i><?php echo strip_tags(LNG('kod_name'));?></div>
--- a/config/config.php
+++ b/config/config.php
@ -86,13 +86,18 @@ if (strtoupper(substr(PHP_OS, 0,3)) === 'WIN') {

 // 部分反向代理导致获取不到url的问题优化;忽略同域名http和https的情况
 if(isset($_COOKIE['APP_HOST'])){
-	if(get_url_domain($_COOKIE['HOST']) != get_url_domain($_COOKIE['APP_HOST'])){
+	if( get_url_domain($_COOKIE['HOST']) != get_url_domain($_COOKIE['APP_HOST']) ||
+	    get_url_scheme($_COOKIE['HOST']) == get_url_scheme($_COOKIE['APP_HOST']) ){
 		define('HOST',$_COOKIE['HOST']);
 		define('APP_HOST',$_COOKIE['APP_HOST']);
 	}
 }
+function webroot_path(){
+    $file = str_replace('\\','/',__FILE__);
+    return str_replace('config/config.php','',$file);
+}
 if(!defined('HOST')){		define('HOST',rtrim(get_host(),'/').'/');}
-if(!defined('WEB_ROOT')){	define('WEB_ROOT',get_webroot(BASIC_PATH));}
+if(!defined('WEB_ROOT')){	define('WEB_ROOT',webroot_path() );}
 if(!defined('APP_HOST')){	define('APP_HOST',HOST.str_replace(WEB_ROOT,'',BASIC_PATH));} //程序根目录
 define('PLUGIN_HOST',APP_HOST.str_replace(BASIC_PATH,'',PLUGIN_DIR));//插件目录

--- a/config/i18n/vi/main.php
+++ b/config/i18n/vi/main.php
@ -111,7 +111,7 @@ return array(
    "system_role_read"               => "Chỉ đọc",
    "system_role_write"              => "Có thể đọc và viết",
    "system_setting_root_path"       => "truy cập root",
-    "system_setting_root_path_desc"  => "Chỉ có một người quản trị hệ thống có thể truy cập vào tất cả các thư mục, các nhóm nhân quyền khác của người sử dụng chỉ có thể xem thư mục người dùng của mình. Nếu bạn muốn bật hoặc tắt<br/>truy cập quản trị vào thư mục khác, bạn có thể thay đổi các thông số php open_basedir chống cross-site,<a href=\"https://www.google.com.hk/search?&q=php+open_basedir\" target=\"_blank\">thiết</a>",,
+    "system_setting_root_path_desc"  => "Chỉ có một người quản trị hệ thống có thể truy cập vào tất cả các thư mục, các nhóm nhân quyền khác của người sử dụng chỉ có thể xem thư mục người dùng của mình. Nếu bạn muốn bật hoặc tắt<br/>truy cập quản trị vào thư mục khác, bạn có thể thay đổi các thông số php open_basedir chống cross-site,<a href=\"https://www.google.com.hk/search?&q=php+open_basedir\" target=\"_blank\">thiết</a>",
    "system_group_role_title"        => "Quản lý vai trò của cơ quan chức năng",
    "system_group_role_remove"       => "OK để xóa vai trò của bộ phận",
    "system_group_role_style"        => "phong cách",
--- a/config/version.php
+++ b/config/version.php
@ -1,2 +1,2 @@
 <?php
-define('KOD_VERSION','4.30');
+define('KOD_VERSION','4.31');
--- a/plugins/DPlayer/static/page.js
+++ b/plugins/DPlayer/static/page.js
@ -22,9 +22,9 @@ define(function(require, exports) {
 				type:type
 			},
 			// 默认加载同名文件字幕;暂时只支持vtt格式  http://dplayer.js.org/#/home?id=options
-			subtitle:{
-				url:core.path2url(vedioInfo.path+'.vtt')
-			},
+			// subtitle:{
+			// 	url:core.path2url(vedioInfo.path+'.vtt')
+			// },
 			danmaku: {
 				id:md5(vedioInfo.url),
 				api:'https://api.prprpr.me/dplayer/'
--- a/plugins/toolsCommon/static/pie/.pie.tif
+++ b/plugins/toolsCommon/static/pie/.pie.tif
--- a/plugins/zipView/package.json
+++ b/plugins/zipView/package.json
@ -2,7 +2,7 @@
 	"id":"zipView",
 	"name":"{{LNG.Plugin.default.zipView}}",
 	"title":"",
-	"version":"1.3",
+	"version":"1.31",
 	"source":{
 		"icon":"{{pluginHost}}static/images/icon.png",
 		"screenshoot":[
--- a/plugins/zipView/static/main.js
+++ b/plugins/zipView/static/main.js
@ -13,6 +13,11 @@ kodReady.push(function(){
 		sort:"{{config.fileSort}}",
 		icon:"{{pluginHost}}static/images/icon.png",
 		callback:function(path,ext){
+			//分享内容暂不支持查看内容
+			if (typeof(G.sharePage) != 'undefined' && G.sid) {
+				kodApp.openUnknow(path);
+				return;
+			}
 			var appOption = {
 				filePath:path,
 				apiUnzip:G.appHost+"explorer/unzip",
--- a/plugins/zipView/static/page.js
+++ b/plugins/zipView/static/page.js
@ -44,8 +44,7 @@ define(function(require, exports) {
 	}
 	var menuAdd = function(){
 		if (!core.authCheck('explorer.zip')) {
-			$('.context-menu-list .zip').addClass('hidden');
-			//option.zip = false;
+			return;
 		}

 		$.contextMenu.menuAdd({zip:option.zip},'.menu-more',false,'.clone');
--- a/plugins/zipView/static/zipView.js
+++ b/plugins/zipView/static/zipView.js
@ -519,10 +519,6 @@ define(function(require, exports) {
 			}
 			var fileUrl = appOption.apiList+'&path='+urlEncode(path);
 			currentFileUrl = fileUrl;
-			if (typeof(G.sharePage) != 'undefined' && G.sid) {
-				kodApp.openUnknow(path);
-				return;
-			}
 			$.ajax({
 				url:fileUrl,
 				dataType:'json',
--- a/static/js/app/src/api/default/main.js
+++ b/static/js/app/src/api/default/main.js
--- a/static/js/app/src/api/view/main.js
+++ b/static/js/app/src/api/view/main.js
--- a/static/js/app/src/app/main.js
+++ b/static/js/app/src/app/main.js
--- a/static/js/app/src/desktop/main.js
+++ b/static/js/app/src/desktop/main.js
--- a/static/js/app/src/edit/main.js
+++ b/static/js/app/src/edit/main.js
--- a/static/js/app/src/editor/main.js
+++ b/static/js/app/src/editor/main.js
--- a/static/js/app/src/explorer/main.js
+++ b/static/js/app/src/explorer/main.js
--- a/static/js/app/src/explorerWap/main.js
+++ b/static/js/app/src/explorerWap/main.js
--- a/static/js/app/src/plugins/main.js
+++ b/static/js/app/src/plugins/main.js
--- a/static/js/app/src/setting/main.js
+++ b/static/js/app/src/setting/main.js
--- a/static/js/app/src/shareEditor/main.js
+++ b/static/js/app/src/shareEditor/main.js
--- a/static/js/app/src/shareExplorer/main.js
+++ b/static/js/app/src/shareExplorer/main.js
--- a/static/js/app/src/shareIndex/main.js
+++ b/static/js/app/src/shareIndex/main.js
--- a/static/js/app/src/user/main.js
+++ b/static/js/app/src/user/main.js
--- a/static/style/skin/base/app_code_edit.css
+++ b/static/style/skin/base/app_code_edit.css
--- a/static/style/skin/base/app_desktop.css
+++ b/static/style/skin/base/app_desktop.css
--- a/static/style/skin/base/app_editor.css
+++ b/static/style/skin/base/app_editor.css
@ -1,5 +1,5 @@
-/* power by kodexplorer ver 4.30(2018-07-05) [build 1530800039.6323] */
+/* power by kodexplorer ver 4.31(2018-07-06) [build 1530883885.3357] */
@import url('./fileIcon.css');
@import url('./common.css');
 .frame-main{position:absolute;top:40px;width:100%;bottom:0px;}.frame-main .tools-left{background:#f8f8f8 url("../../../images/common/bg.gif") 0 0px;position:fixed;line-height:30px;padding-left:20px;height:28px;border-bottom:1px solid #ddd;left:0;width:100%;}.frame-main .tools-left a{font-size:1.25em;font-weight:800;text-decoration:none;color:#999;text-shadow:0 0 3px;display:inline-block;padding:2px 6px;margin-top:0;height:20px;line-height:20px;}.frame-main .tools-left a:hover{background:url("../../../images/common/buttons_40.png") 0 0px repeat-x;-webkit-box-shadow:0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:0 2px 8px rgba(0,0,0,0.8);box-shadow:0 2px 8px rgba(0,0,0,0.8);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.frame-main .frame-left{position:absolute;left:0;top:30px;bottom:0;width:200px;background:#fff;background-attachment:fixed;overflow:auto;}.frame-main .frame-left .ztree{margin-top:0;}.frame-main .frame-left .ztree li.level0{margin-bottom:5px;}.frame-main .frame-resize{width:10px;cursor:col-resize;z-index:100;position:absolute;left:195px;top:0;bottom:0;overflow:hidden;background:url("../../../images/common/resize.png") 0px 50% no-repeat;}.frame-main .frame-resize.active{background:#000;opacity:0.2;filter:alpha(opacity=20);}.frame-main .frame-right{left:200px;right:0;position:absolute;top:0;bottom:0;overflow:auto;}.frame-main .frame-right .frame-right-main .resize-mask{z-index:999;position:absolute;left:0;top:0;bottom:0;right:0;display:none;}.frame-main .frame-right .frame-right-main .frame{height:100%;border-left:1px solid #ddd;overflow:hidden;}
-/* ver 4.30(2018-07-05) [build 1530800039.6323] */
+/* ver 4.31(2018-07-06) [build 1530883885.3357] */
--- a/static/style/skin/base/app_explorer.css
+++ b/static/style/skin/base/app_explorer.css
--- a/static/style/skin/base/app_setting.css
+++ b/static/style/skin/base/app_setting.css
--- a/static/style/skin/base/common.css
+++ b/static/style/skin/base/common.css