Skip to content

Commit 6084999

Browse files
kalcaddlekalcaddle
committed
ver 4.31 release
1 parent 35e647c commit 6084999

File tree

42 files changed

+102
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+102
-85
lines changed

‎ChangeLog.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
### ver4.31 `2018/07/09`
2+
-----
3+
#### update:
4+
- 修复vi语言多语言问题；
5+
- 分享对话框加入二维码；分享页面加入二维码;
6+
- loading图片缓存处理
7+
- 服务器兼容处理: 子目录绑定的服务器兼容问题处理;兼容前端、后端通用处理;
8+
- IE兼容问题优化: 预览CAD报错问题处理,分享带密码的文件夹视频播放问题；
9+
10+
11+
112
### ver4.30 `2018/07/05`
213
-----
314
#### update:

‎app/controller/editor.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class editor extends Controller{
1010
function __construct() {
1111
parent::__construct();
1212
}
13-
13+
1414
// 多文件编辑器
1515
public function index(){
1616
$this->themeSet();

‎app/controller/util.php‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎app/function/common.function.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ function show_tips($message,$url= '', $time = 3,$title = ''){
410410

411411
if(is_array($message) || is_object($message)){
412412
$message = json_encode_force($message);
413-
$message = nl2br(htmlspecialchars($message));
413+
$message = htmlspecialchars($message);
414414
$message = "<pre>".$message.'</pre>';
415415
}else{
416416
$message = filter_html(nl2br($message));

‎app/function/web.function.php‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ function get_url_domain($url){
5252
$res = parse_url($url);
5353
return $res["host"];
5454
}
55+
function get_url_scheme($url){
56+
if(!$url) return "";
57+
$res = parse_url($url);
58+
return $res['scheme'];
59+
}
5560

5661
function get_host() {
5762
//兼容子目录反向代理:只能是前端js通过cookie传入到后端进行处理
@@ -77,23 +82,7 @@ function this_url(){
7782
$url = get_host().$_SERVER['REQUEST_URI'];
7883
return $url;
7984
}
80-
function reset_path($str){
81-
return str_replace('\\','/',$str);
82-
}
83-
function get_webroot($app_path=''){
84-
$index='index.php';
85-
$self_file = reset_path($_SERVER['SCRIPT_NAME']);
86-
if($app_path == ''){
87-
$index_path = reset_path($_SERVER['SCRIPT_FILENAME']);
88-
$app_path = substr($index_path,0,strrpos($index_path,'/'));
89-
$index = substr($index_path,1+strrpos($index_path,'/'));
90-
}
91-
$webRoot = str_replace($self_file,'',$app_path.$index).'/';
92-
if (substr($webRoot,-(strlen($index)+1)) == $index.'/') {//解决部分主机不兼容问题
93-
$webRoot = reset_path($_SERVER['DOCUMENT_ROOT']).'/';
94-
}
95-
return $webRoot;
96-
}
85+
9786
function ua_has($str){
9887
if(!isset($_SERVER['HTTP_USER_AGENT'])){
9988
return false;

‎app/template/api/view.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<body>
5151
<div class="full-background"></div>
52-
<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div></div>
52+
<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div></div>
5353
<div class="frame-main">
5454
<div class="bindary-box hidden">
5555
<div class="title"><div class="ico"></div></div>

‎app/template/common/navbarShare.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
<?php if(!isset($config['settings']['language'])){ ?>
3737
<div class="menu-group">
3838
<a id='topbar-language' data-toggle="dropdown" href="#" class="topbar-menu">
39-
<i class='font-icon icon-flag'></i>&nbsp;<b class="caret"></b>
39+
<i class='font-icon icon-flag'></i>&nbsp;<b class="caret"></b>
40+
</a>
41+
<a href="#" onclick="core.qrcode(window.location.href);" title="<?php echo LNG('qrcode');?>" class="topbar-menu" style="padding: 0 15px;margin-left: -2px;">
42+
<i class="font-icon icon-qrcode"></i>
4043
</a>
4144
<ul class="dropdown-menu topbar-language pull-right animated menuShow" role="menu" aria-labelledby="topbar-language">
4245
<?php
@@ -54,7 +57,6 @@
5457
<div class="menu-group">
5558
<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>
5659
<ul class="dropdown-menu menu-topbar-user pull-right animated menuShow" role="menu" aria-labelledby="topbar-user">
57-
<li><a href="#" onclick="core.qrcode(window.location.href);"><i class="font-icon icon-qrcode"></i><?php echo LNG('qrcode');?></a></li>
5860
<li><a href="#" onclick="core.fullScreen();"><i class="font-icon icon-fullscreen"></i><?php echo LNG('full_screen');?></a></li>
5961
<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>
6062
</ul>

‎app/template/common/showTips.html‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<title><?php echo $title;?></title>
33
<script type="text/javascript" src="<?php echo STATIC_PATH;?>js/lib/jquery-1.8.0.min.js?ver=<?php echo KOD_VERSION;?>"></script>
44
<style type="text/css">
5-
body{background-color:#f0f2f5;}
5+
body{
6+
background-color:#f0f2f5;
7+
font-family: Verdana,"Lantinghei SC","Hiragino Sans GB","Microsoft Yahei",Helvetica,arial,sans-serif;
8+
line-height: 1.5em;
9+
}
610
body a,body a:hover{color: #1890ff;}
711
.body-panel{
812
width:70%;margin:10% auto 5% auto;
@@ -26,7 +30,13 @@
2630
padding: 24px 40px;
2731
text-align: left;
2832
}
29-
.error-info{border-left: 5px solid #1890ff;padding-left: 10px;}
33+
.error-info{
34+
border-left: 5px solid #1890ff;
35+
display: block;
36+
padding: 5px 10px;
37+
background: #fcfcfc;
38+
color: #666;
39+
}
3040
.location-to{padding: 10px 0;color: #888;font-size: 13px;font-style: italic;}
3141
.icon{
3242
font-family: FontAwesome;

‎app/template/editor/edit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</head>
77
<body <?php echo $codeThemeBlack;?>>
88
<div class="init-loading">
9-
<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div>
9+
<div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div>
1010
</div>
1111
<div class="edit-main" style="height: 100%;" oncontextmenu="return core.contextmenu();">
1212
<div class="tools">

‎app/template/explorer/explorerWap.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<link href="<?php echo STATIC_PATH;?>style/wap/app_explorer.css?ver=<?php echo KOD_VERSION;?>" rel="stylesheet"/>
44
</head>
55
<body>
6-
<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif"/></div></div>
6+
<div class="init-loading"><div><img src="<?php echo STATIC_PATH;?>images/common/loading_simple.gif?v=<?php echo KOD_VERSION;?>"/></div></div>
77
<div class="panel-menu">
88
<div class="panel-hd">
99
<span class="my-avator">

0 commit comments

Comments
 (0)