-
- -
-
用户信息
-| 当前在线数 | -总用户数 | -停用人数 | -
|---|---|---|
| $zaixianrenshu | -$yonghurenshu | -$tingyongrenshu | -
-
-
文件信息
-| 文件个数 | -空间使用 | -
|---|---|
| $wenjiangeshu | -$kongjianshiyong | -
-
-
版本信息
-| 官方版本 | -小胡版本 | -小胡版更新日期 | -
|---|---|---|
| $about[version] | -$about[xhversion] | -$about[XHFIXBUG] | -
-
-
-
-
-
PHP扩展信息PHP详情
-
-
-
- 已加载的扩展:
-
- $extensions
+
+
+
+
+
+
-
+
+
+
+
+
用户信息
+| 当前在线数 | +总用户数 | +停用人数 | +
|---|---|---|
| $zaixianrenshu | +$yonghurenshu | +$tingyongrenshu | +
+
+
+
+
+
+
+
+
+ 文件信息
+| 文件个数 | +空间使用 | +
|---|---|
| $wenjiangeshu | +$kongjianshiyong | +
+
+
+
+
+
+
+
+
+ 版本信息
+| 官方版本 | +小胡版本 | +小胡版更新日期 | +
|---|---|---|
| $about[version] | +$about[xhversion] | +$about[XHFIXBUG] | +
+
+
+
+
+
+
+
+
+
+
+ -
diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php
index cb4bbd3..f070fa3 100644
--- a/core/class/dzz/dzz_app.php
+++ b/core/class/dzz/dzz_app.php
@@ -606,22 +606,25 @@ class dzz_app extends dzz_base{
}
}
}
+
if (!$this->var['member']['adminid'] && $appidxu = C::t('app_market')->fetch_by_identifier(CURMODULE)) {
- $uid = null;
- if ($this->var['member']['uid']) {
- $uid = $this->var['member']['uid'];
- } elseif ($_GET['uidtoken']) {
- $uid=intval(dzzdecode($_GET['uidtoken']));
- }
if (!$appidxu['available']) {
showmessage(lang('该应用已关闭,请联系管理员。'));
} elseif ($appidxu['group'] == 0) {
// 全员使用跳过
- } elseif ($uid) {
- try {
- $config = dzz_userconfig_init();
+ } else {
+ if ($this->var['member']['uid']) {
+ $uid = $this->var['member']['uid'];
+ } elseif ($_GET['uidtoken']) {
+ $uid = intval(dzzdecode($_GET['uidtoken']));
+ }
+ if ($uid) {
+ $config = array();
+ if(!$config=C::t('user_field')->fetch($uid)){
+ $config= dzz_userconfig_init();
+ }
if ($config && isset($config['applist'])) {
- $applist = explode(',', $config['applist'] ?: '');
+ $applist = explode(',', $config['applist']);
if (in_array($appidxu['appid'], $applist, true)) {
// 用户配置中包含该应用,有权限
} else {
@@ -630,16 +633,14 @@ class dzz_app extends dzz_base{
} else {
showmessage(lang('您无权限使用该应用,请联系管理员。'));
}
- } catch (\Exception $e) {
- // 处理数据库操作异常,例如记录日志或显示错误信息
- showmessage(lang('系统错误,请联系管理员。'));
+ } elseif ($appidxu['group'] == -1) {
+ // 游客可以使用,跳过
+ } else {
+ Hook::listen('check_login');
}
- } elseif ($appidxu['group'] == -1) {
- // 游客可以使用,跳过
- } else {
- Hook::listen('check_login');
}
}
+
if(isset($this->var['setting']['nocacheheaders']) && $this->var['setting']['nocacheheaders']) {
@header("Expires: -1");
@header("Cache-Control: no-store, private, post-check=0, pre-check=0, max-age=0", FALSE);
diff --git a/core/class/helper/helper_security.php b/core/class/helper/helper_security.php
index bf772a3..ecbf478 100644
--- a/core/class/helper/helper_security.php
+++ b/core/class/helper/helper_security.php
@@ -54,7 +54,7 @@ class helper_security {
$replaces[] = '>';
if($ms[1]) {
- $allowtags = 'img|a|font|div|table|tbody|caption|tr|td|th|br|p|b|strong|i|u|em|span|ol|ul|li|blockquote|pre|hr|embed|h1|h2|h3|h4|h5|h6|iframe';
+ $allowtags = 'img|a|font|div|table|tbody|caption|tr|td|th|br|p|b|strong|i|u|em|span|ol|ul|li|blockquote|pre|hr|embed|h1|h2|h3|h4|h5|h6|iframe|audio';
$ms[1] = array_unique($ms[1]);
foreach ($ms[1] as $value) {
$searchs[] = "<".$value.">";
diff --git a/core/class/io/io_dzz.php b/core/class/io/io_dzz.php
index 9ab4b49..c02bd80 100644
--- a/core/class/io/io_dzz.php
+++ b/core/class/io/io_dzz.php
@@ -1315,7 +1315,6 @@ class io_dzz extends io_api
'title' => $attach['filename'],
'desc' => '',
'aid' => $attach['aid'],
- 'img' => geticonfromext($icoarr['ext'], $icoarr['type'])
);
if (C::t('resources_attr')->insert_attr($icoarr['rid'], $icoarr['vid'], $sourcedata)) {
@@ -1369,7 +1368,6 @@ class io_dzz extends io_api
'title' => $attach['filename'],
'desc' => '',
'aid' => $attach['aid'],
- 'img' => geticonfromext($icoarr['ext'], $icoarr['type'])
);
C::t('attachment')->update($attach['aid'], array('copys' => $attach['copys'] + 1));
if (C::t('resources_attr')->insert_attr($icoarr['rid'], $icoarr['vid'], $sourcedata)) {
diff --git a/core/class/table/table_resources_version.php b/core/class/table/table_resources_version.php
index 7a6d46d..80fa444 100644
--- a/core/class/table/table_resources_version.php
+++ b/core/class/table/table_resources_version.php
@@ -199,7 +199,6 @@ class table_resources_version extends dzz_table
'postip' => $_G['clientip'],
'title' => $filename,
'aid' => isset($setarr['aid']) ? $setarr['aid'] : '',
- 'img'=>geticonfromext($setarr['ext'],$setarr['type'])
);
//插入属性表
if (C::t('resources_attr')->insert_attr($rid,$vid,$sourceattrdata)) {
diff --git a/core/core_version.php b/core/core_version.php
index 9c4b454..ac82ed6 100644
--- a/core/core_version.php
+++ b/core/core_version.php
@@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) {
define('CORE_VERSION', '2.02');
define('CORE_RELEASE', '20180909');
define('CORE_FIXBUG' , '20000000');
- define('CORE_XHVERSION', '1.87.9');
+ define('CORE_XHVERSION', '1.88');
define('CORE_XHRELEASE', '20240709');
define('CORE_XHFIXBUG' , '20240706');
}
\ No newline at end of file
diff --git a/dzz/system/ueditor/dialogs/link/link.html b/dzz/system/ueditor/dialogs/link/link.html
index 53630a4..608e247 100644
--- a/dzz/system/ueditor/dialogs/link/link.html
+++ b/dzz/system/ueditor/dialogs/link/link.html
@@ -6,9 +6,29 @@
@@ -36,84 +56,91 @@
+
+
+
+
+
diff --git a/dzz/system/ueditor/dialogs/video/video.js b/dzz/system/ueditor/dialogs/video/video.js
index 643bbee..cfe824d 100644
--- a/dzz/system/ueditor/dialogs/video/video.js
+++ b/dzz/system/ueditor/dialogs/video/video.js
@@ -17,7 +17,7 @@
$focus($G("videoUrl"));
initTabs();
initVideo();
- /*initUpload();*/
+ initUpload();
};
/* 初始化tab标签 */
@@ -41,7 +41,7 @@
}
function initVideo(){
- createAlignButton( ["videoFloat"] );
+ createAlignButton( ["videoFloat", "upload_alignment"] );
addUrlChangeListener($G("videoUrl"));
addOkListener();
@@ -119,7 +119,6 @@
url=$G('videoUrl').value,
align = findFocus("videoFloat","name");
if(!url) return false;
-
if ( !checkNum( [width, height] ) ) return false;
editor.execCommand('insertvideo', {
url: convert_url(url),
@@ -168,7 +167,7 @@
function convert_url(url){
if ( !url ) return '';
url = utils.trim(url)
- .replace(/v\.youku\.com\/v_show\/id_([\w\-=]+)\.html(.*?)$/i, 'player.youku.com/player.php/sid/$1/v.swf')
+ .replace(/v\.youku\.com\/v_show\/id_([\w\-=]+)\.html/i, 'player.youku.com/player.php/sid/$1/v.swf')
.replace(/(www\.)?youtube\.com\/watch\?v=([\w\-]+)/i, "www.youtube.com/v/$2")
.replace(/youtu.be\/(\w+)$/i, "www.youtube.com/v/$1")
.replace(/v\.ku6\.com\/.+\/([\w\.]+)\.html.*$/i, "player.ku6.com/refer/$1/v.swf")
@@ -265,11 +264,15 @@
/**
* 根据url生成视频预览
* @param url
- */
+ */
function createPreviewVideo(url){
if ( !url )return;
var conUrl = convert_url(url);
- $G("preview").innerHTML = '';
+ conUrl = utils.unhtml(conUrl);
+ $G("preview").innerHTML = '
' + lang.urlError + '
' +
+ '';
}
@@ -707,7 +710,9 @@
uploader.on('uploadBeforeSend', function (file, data, header) {
//这里可以通过data对象添加POST参数
- header['X_Requested_With'] = 'XMLHttpRequest';
+ if (actionUrl.toLowerCase().indexOf('jsp') != -1) {
+ header['X_Requested_With'] = 'XMLHttpRequest';
+ }
});
uploader.on('uploadProgress', function (file, percentage) {
diff --git a/dzz/system/ueditor/themes/default/css/ueditor.css b/dzz/system/ueditor/themes/default/css/ueditor.css
index db2155a..12af7b3 100644
--- a/dzz/system/ueditor/themes/default/css/ueditor.css
+++ b/dzz/system/ueditor/themes/default/css/ueditor.css
@@ -404,7 +404,7 @@ div.edui-box {
.edui-default .edui-toolbar .edui-combox-body .edui-arrow {
background: url(../images/icons.png) -741px 0;
- _background: url(../images/icons.gif) -741px 0;
+ background: url(../images/icons.gif) -741px 0;
height: 20px;
width: 9px;
}
@@ -932,7 +932,7 @@ div.edui-box {
.edui-default .edui-toolbar .edui-splitbutton-body .edui-arrow,
.edui-default .edui-toolbar .edui-menubutton-body .edui-arrow {
background: url(../images/icons.png) -741px 0;
- _background: url(../images/icons.gif) -741px 0;
+ background: url(../images/icons.gif) -741px 0;
height: 20px;
width: 9px;
}
diff --git a/dzz/system/ueditor/third-party/SyntaxHighlighter/shCoreDefault.css b/dzz/system/ueditor/third-party/SyntaxHighlighter/shCoreDefault.css
index 5d2e51c..e156a6f 100644
--- a/dzz/system/ueditor/third-party/SyntaxHighlighter/shCoreDefault.css
+++ b/dzz/system/ueditor/third-party/SyntaxHighlighter/shCoreDefault.css
@@ -1 +1 @@
-.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter,.syntaxhighlighter td,.syntaxhighlighter tr,.syntaxhighlighter tbody,.syntaxhighlighter thead,.syntaxhighlighter caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0!important;-webkit-border-radius:0 0 0 0!important;background:none!important;border:0!important;bottom:auto!important;float:none!important;left:auto!important;line-height:1.1em!important;margin:0!important;outline:0!important;overflow:visible!important;padding:0!important;position:static!important;right:auto!important;text-align:left!important;top:auto!important;width:auto!important;box-sizing:content-box!important;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-weight:normal!important;font-style:normal!important;min-height:inherit!important;min-height:auto!important;font-size:13px!important}.syntaxhighlighter{margin:.3em 0 .3em 0!important;position:relative!important;overflow:auto!important;background-color:#f5f5f5!important;border:1px solid #ccc!important;border-radius:4px!important;border-collapse:separate!important}.syntaxhighlighter.source{overflow:hidden!important}.syntaxhighlighter .bold{font-weight:bold!important}.syntaxhighlighter .italic{font-style:italic!important}.syntaxhighlighter .gutter div{white-space:pre!important;word-wrap:normal}.syntaxhighlighter caption{text-align:left!important;padding:.5em 0 .5em 1em!important}.syntaxhighlighter td.code{width:100%!important}.syntaxhighlighter td.code .container{position:relative!important}.syntaxhighlighter td.code .container textarea{box-sizing:border-box!important;position:absolute!important;left:0!important;top:0!important;width:100%!important;border:none!important;background:white!important;padding-left:1em!important;overflow:hidden!important;white-space:pre!important}.syntaxhighlighter td.gutter .line{text-align:right!important;padding:0 .5em 0 1em!important}.syntaxhighlighter td.code .line{padding:0 1em!important}.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0!important}.syntaxhighlighter.show{display:block!important}.syntaxhighlighter.collapsed table{display:none!important}.syntaxhighlighter.collapsed .toolbar{padding:.1em .8em 0 .8em!important;font-size:1em!important;position:static!important;width:auto!important}.syntaxhighlighter.collapsed .toolbar span{display:inline!important;margin-right:1em!important}.syntaxhighlighter.collapsed .toolbar span a{padding:0!important;display:none!important}.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline!important}.syntaxhighlighter .toolbar{position:absolute!important;right:1px!important;top:1px!important;width:11px!important;height:11px!important;font-size:10px!important;z-index:10!important}.syntaxhighlighter .toolbar span.title{display:inline!important}.syntaxhighlighter .toolbar a{display:block!important;text-align:center!important;text-decoration:none!important;padding-top:1px!important}.syntaxhighlighter .toolbar a.expandSource{display:none!important}.syntaxhighlighter.ie{font-size:.9em!important;padding:1px 0 1px 0!important}.syntaxhighlighter.ie .toolbar{line-height:8px!important}.syntaxhighlighter.ie .toolbar a{padding-top:0!important}.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none!important}.syntaxhighlighter.printing .line .number{color:#bbb!important}.syntaxhighlighter.printing .line .content{color:black!important}.syntaxhighlighter.printing .toolbar{display:none!important}.syntaxhighlighter.printing a{text-decoration:none!important}.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black!important}.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200!important}.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue!important}.syntaxhighlighter.printing .keyword{color:#ff7800!important;font-weight:bold!important}.syntaxhighlighter.printing .preprocessor{color:gray!important}.syntaxhighlighter.printing .variable{color:#a70!important}.syntaxhighlighter.printing .value{color:#090!important}.syntaxhighlighter.printing .functions{color:#ff1493!important}.syntaxhighlighter.printing .constants{color:#06c!important}.syntaxhighlighter.printing .script{font-weight:bold!important}.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray!important}.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:#ff1493!important}.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red!important}.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black!important}.syntaxhighlighter{background-color:#f5f5f5!important}.syntaxhighlighter .line.highlighted.number{color:black!important}.syntaxhighlighter caption{color:black!important}.syntaxhighlighter .gutter{color:#afafaf!important;background-color:#f7f7f9!important;border-right:1px solid #e1e1e8!important;padding:9.5px 0 9.5px 9.5px!important;border-top-left-radius:4px!important;border-bottom-left-radius:4px!important;user-select:none!important;-moz-user-select:none!important;-webkit-user-select:none!important}.syntaxhighlighter .gutter .line.highlighted{background-color:#6ce26c!important;color:white!important}.syntaxhighlighter.printing .line .content{border:none!important}.syntaxhighlighter.collapsed{overflow:visible!important}.syntaxhighlighter.collapsed .toolbar{color:blue!important;background:white!important;border:1px solid #6ce26c!important}.syntaxhighlighter.collapsed .toolbar a{color:blue!important}.syntaxhighlighter.collapsed .toolbar a:hover{color:red!important}.syntaxhighlighter .toolbar{color:white!important;background:#6ce26c!important;border:none!important}.syntaxhighlighter .toolbar a{color:white!important}.syntaxhighlighter .toolbar a:hover{color:black!important}.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black!important}.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#008200!important}.syntaxhighlighter .string,.syntaxhighlighter .string a{color:blue!important}.syntaxhighlighter .keyword{color:#ff7800!important}.syntaxhighlighter .preprocessor{color:gray!important}.syntaxhighlighter .variable{color:#a70!important}.syntaxhighlighter .value{color:#090!important}.syntaxhighlighter .functions{color:#ff1493!important}.syntaxhighlighter .constants{color:#06c!important}.syntaxhighlighter .script{font-weight:bold!important;color:#ff7800!important;background-color:none!important}.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:gray!important}.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#ff1493!important}.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red!important}.syntaxhighlighter .keyword{font-weight:bold!important}.syntaxhighlighter td.code {padding: 9.5px 0 9.5px 0 !important}
\ No newline at end of file
+.syntaxhighlighter a,.syntaxhighlighter div,.syntaxhighlighter code,.syntaxhighlighter,.syntaxhighlighter td,.syntaxhighlighter tr,.syntaxhighlighter tbody,.syntaxhighlighter thead,.syntaxhighlighter caption,.syntaxhighlighter textarea{-moz-border-radius:0 0 0 0!important;-webkit-border-radius:0 0 0 0!important;background:none!important;border:0!important;bottom:auto!important;float:none!important;left:auto!important;line-height:1.1em!important;margin:0!important;outline:0!important;overflow:visible!important;padding:0!important;position:static!important;right:auto!important;text-align:left!important;top:auto!important;vertical-align:baseline!important;width:auto!important;box-sizing:content-box!important;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-weight:normal!important;font-style:normal!important;min-height:inherit!important;min-height:auto!important;font-size:13px!important}.syntaxhighlighter{width:100%!important;margin:.3em 0 .3em 0!important;position:relative!important;overflow:auto!important;background-color:#f5f5f5!important;border:1px solid #ccc!important;border-radius:4px!important;border-collapse:separate!important}.syntaxhighlighter.source{overflow:hidden!important}.syntaxhighlighter .bold{font-weight:bold!important}.syntaxhighlighter .italic{font-style:italic!important}.syntaxhighlighter .gutter div{white-space:pre!important;word-wrap:normal}.syntaxhighlighter caption{text-align:left!important;padding:.5em 0 .5em 1em!important}.syntaxhighlighter td.code{width:100%!important}.syntaxhighlighter td.code .container{position:relative!important}.syntaxhighlighter td.code .container textarea{box-sizing:border-box!important;position:absolute!important;left:0!important;top:0!important;width:100%!important;border:none!important;background:white!important;padding-left:1em!important;overflow:hidden!important;white-space:pre!important}.syntaxhighlighter td.gutter .line{text-align:right!important;padding:0 .5em 0 1em!important}.syntaxhighlighter td.code .line{padding:0 1em!important}.syntaxhighlighter.nogutter td.code .container textarea,.syntaxhighlighter.nogutter td.code .line{padding-left:0!important}.syntaxhighlighter.show{display:block!important}.syntaxhighlighter.collapsed table{display:none!important}.syntaxhighlighter.collapsed .toolbar{padding:.1em .8em 0 .8em!important;font-size:1em!important;position:static!important;width:auto!important}.syntaxhighlighter.collapsed .toolbar span{display:inline!important;margin-right:1em!important}.syntaxhighlighter.collapsed .toolbar span a{padding:0!important;display:none!important}.syntaxhighlighter.collapsed .toolbar span a.expandSource{display:inline!important}.syntaxhighlighter .toolbar{position:absolute!important;right:1px!important;top:1px!important;width:11px!important;height:11px!important;font-size:10px!important;z-index:10!important}.syntaxhighlighter .toolbar span.title{display:inline!important}.syntaxhighlighter .toolbar a{display:block!important;text-align:center!important;text-decoration:none!important;padding-top:1px!important}.syntaxhighlighter .toolbar a.expandSource{display:none!important}.syntaxhighlighter.ie{font-size:.9em!important;padding:1px 0 1px 0!important}.syntaxhighlighter.ie .toolbar{line-height:8px!important}.syntaxhighlighter.ie .toolbar a{padding-top:0!important}.syntaxhighlighter.printing .line.alt1 .content,.syntaxhighlighter.printing .line.alt2 .content,.syntaxhighlighter.printing .line.highlighted .number,.syntaxhighlighter.printing .line.highlighted.alt1 .content,.syntaxhighlighter.printing .line.highlighted.alt2 .content{background:none!important}.syntaxhighlighter.printing .line .number{color:#bbb!important}.syntaxhighlighter.printing .line .content{color:black!important}.syntaxhighlighter.printing .toolbar{display:none!important}.syntaxhighlighter.printing a{text-decoration:none!important}.syntaxhighlighter.printing .plain,.syntaxhighlighter.printing .plain a{color:black!important}.syntaxhighlighter.printing .comments,.syntaxhighlighter.printing .comments a{color:#008200!important}.syntaxhighlighter.printing .string,.syntaxhighlighter.printing .string a{color:blue!important}.syntaxhighlighter.printing .keyword{color:#ff7800!important;font-weight:bold!important}.syntaxhighlighter.printing .preprocessor{color:gray!important}.syntaxhighlighter.printing .variable{color:#a70!important}.syntaxhighlighter.printing .value{color:#090!important}.syntaxhighlighter.printing .functions{color:#ff1493!important}.syntaxhighlighter.printing .constants{color:#06c!important}.syntaxhighlighter.printing .script{font-weight:bold!important}.syntaxhighlighter.printing .color1,.syntaxhighlighter.printing .color1 a{color:gray!important}.syntaxhighlighter.printing .color2,.syntaxhighlighter.printing .color2 a{color:#ff1493!important}.syntaxhighlighter.printing .color3,.syntaxhighlighter.printing .color3 a{color:red!important}.syntaxhighlighter.printing .break,.syntaxhighlighter.printing .break a{color:black!important}.syntaxhighlighter{background-color:#f5f5f5!important}.syntaxhighlighter .line.highlighted.number{color:black!important}.syntaxhighlighter caption{color:black!important}.syntaxhighlighter .gutter{color:#afafaf!important;background-color:#f7f7f9!important;border-right:1px solid #e1e1e8!important;padding:9.5px 0 9.5px 9.5px!important;border-top-left-radius:4px!important;border-bottom-left-radius:4px!important;user-select:none!important;-moz-user-select:none!important;-webkit-user-select:none!important}.syntaxhighlighter .gutter .line.highlighted{background-color:#6ce26c!important;color:white!important}.syntaxhighlighter.printing .line .content{border:none!important}.syntaxhighlighter.collapsed{overflow:visible!important}.syntaxhighlighter.collapsed .toolbar{color:blue!important;background:white!important;border:1px solid #6ce26c!important}.syntaxhighlighter.collapsed .toolbar a{color:blue!important}.syntaxhighlighter.collapsed .toolbar a:hover{color:red!important}.syntaxhighlighter .toolbar{color:white!important;background:#6ce26c!important;border:none!important}.syntaxhighlighter .toolbar a{color:white!important}.syntaxhighlighter .toolbar a:hover{color:black!important}.syntaxhighlighter .plain,.syntaxhighlighter .plain a{color:black!important}.syntaxhighlighter .comments,.syntaxhighlighter .comments a{color:#008200!important}.syntaxhighlighter .string,.syntaxhighlighter .string a{color:blue!important}.syntaxhighlighter .keyword{color:#ff7800!important}.syntaxhighlighter .preprocessor{color:gray!important}.syntaxhighlighter .variable{color:#a70!important}.syntaxhighlighter .value{color:#090!important}.syntaxhighlighter .functions{color:#ff1493!important}.syntaxhighlighter .constants{color:#06c!important}.syntaxhighlighter .script{font-weight:bold!important;color:#ff7800!important;background-color:none!important}.syntaxhighlighter .color1,.syntaxhighlighter .color1 a{color:gray!important}.syntaxhighlighter .color2,.syntaxhighlighter .color2 a{color:#ff1493!important}.syntaxhighlighter .color3,.syntaxhighlighter .color3 a{color:red!important}.syntaxhighlighter .keyword{font-weight:bold!important}
\ No newline at end of file
diff --git a/dzz/system/ueditor/third-party/video-js/video-js.swf b/dzz/system/ueditor/third-party/video-js/video-js.swf
index 9cf537a..eef460a 100644
Binary files a/dzz/system/ueditor/third-party/video-js/video-js.swf and b/dzz/system/ueditor/third-party/video-js/video-js.swf differ
diff --git a/dzz/system/ueditor/ueditor.config.js b/dzz/system/ueditor/ueditor.config.js
index 108cfb7..37b653c 100644
--- a/dzz/system/ueditor/ueditor.config.js
+++ b/dzz/system/ueditor/ueditor.config.js
@@ -497,18 +497,6 @@ UEDITOR_CONFIG.mode = {
'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify',
'insertorderedlist', 'insertunorderedlist','|','simpleupload','dzzfile'
]
- ],
- mini_exam: [
- ['bold', 'italic', 'underline', 'strikethrough','superscript', 'subscript','removeformat', '|',
- 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify',
- 'insertorderedlist', 'insertunorderedlist','|','spechars','inserttable', 'scrawl','wordimage','kityformula','|','simpleupload','dzzfile'
- ]
- ],
- mini_shou: [
- ['bold', 'italic', 'underline', 'strikethrough','superscript', 'subscript','removeformat', '|',
- 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify',
- 'insertorderedlist', 'insertunorderedlist','|','spechars','inserttable', 'scrawl','wordimage','kityformula','|','simpleupload','attachment'
- ]
],
xiaohuxiugai: [
['fullscreen','source', 'undo', 'redo','drafts','|','bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|','rowspacingtop', 'rowspacingbottom', 'lineheight', '|', 'paragraph', 'fontfamily', 'fontsize', '|','directionalityltr', 'directionalityrtl', 'indent', '|','justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|','link', 'unlink','|','simpleupload', 'emotion', 'scrawl', 'insertvideo', 'attachment','dzzfile', 'map', 'insertframe', 'insertcode', 'template', 'background','|','horizontal', 'date', 'time', 'spechars', 'searchreplace', '|','inserttable','insertcharts', 'charts','|','print', 'preview', 'help', 'kityminder', 'kityformula'
diff --git a/static/bootstrap/css/bootstrap.min.css b/static/bootstrap/css/bootstrap.min.css
index 1fd2094..020c77b 100644
--- a/static/bootstrap/css/bootstrap.min.css
+++ b/static/bootstrap/css/bootstrap.min.css
@@ -7675,6 +7675,7 @@ textarea.form-control.is-invalid {
.btn {
display: inline-block;
font-weight: 400;
+ line-height: 1.5;
color: #212529;
text-align: center;
text-decoration: none;
@@ -7691,7 +7692,6 @@ textarea.form-control.is-invalid {
-webkit-border-radius: var(--radius);
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
margin: 1px;
- opacity: 0.8;
position: relative;
}
diff --git a/static/js/main.min.js b/static/js/main.min.js
index b1349b3..160159a 100644
--- a/static/js/main.min.js
+++ b/static/js/main.min.js
@@ -1,13 +1,15 @@
$(document).ready( function() {
- $("button:submit,input:submit, .nav-link, .btn,.nav-item a").click(function(){
+ $("button:submit,input:submit, .nav-link, .btn,a").click(function(){
$(this).attr('disable', 'true');
var l = $(this).lyearloading({
opacity: 0.2,
spinnerSize: 'nm',
});
+ l.addClass('disabled');
setTimeout(function() {
$(this).prop('disable', 'false');
l.destroy(); // 可以使用hide,页面中如果有多个loading,最好用destroy,避免后面的loading设置不生效
+ l.removeClass('disabled');
}, 1e3);
});
// 停止