diff --git a/src/static/ckeditor/contents.css b/src/static/ckeditor/contents.css
index 4c45dee8..b8f5e825 100644
--- a/src/static/ckeditor/contents.css
+++ b/src/static/ckeditor/contents.css
@@ -21,7 +21,7 @@ ol,ul,dl {
}
h1,h2,h3,h4,h5,h6 {
font-weight:600;
- line-height:1.6
+ line-height:1.2
}
hr {
border:0px;
@@ -49,7 +49,7 @@ figure > figcaption {
display:block
}
img {
- border-radius:.5rem
+ border-radius:0.5rem
}
a > img {
padding:1px;
diff --git a/src/static/ckeditor/plugins/codesnippetgeshi/plugin.js b/src/static/ckeditor/plugins/codesnippetgeshi/plugin.js
deleted file mode 100755
index 1e7aa557..00000000
--- a/src/static/ckeditor/plugins/codesnippetgeshi/plugin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-(function(){CKEDITOR.plugins.add("codesnippetgeshi",{requires:"ajax,codesnippet",init:function(c){var d=new CKEDITOR.htmlParser.basicWriter,f=new CKEDITOR.plugins.codesnippet.highlighter({languages:a,highlighter:function(b,a,e){b=JSON.stringify({lang:a,html:b});CKEDITOR.ajax.post(CKEDITOR.getUrl(c.config.codeSnippetGeshi_url||""),b,"application/json",function(a){a?(CKEDITOR.htmlParser.fragment.fromHtml(a||"").children[0].writeChildrenHtml(d),e(d.getHtml(!0))):e("")})}});c.plugins.codesnippet.setHighlighter(f)}});
-var a={abap:"ABAP",actionscript:"ActionScript",ada:"Ada",apache:"Apache Configuration",applescript:"AppleScript",asm:"Assembly",asp:"Active Server Pages (ASP)",autoit:"AutoIt",bash:"Bash",basic4gl:"Basic4GL",bf:"Brainfuck",blitzbasic:"Blitz BASIC",bnf:"Backus-Naur Form",c:"C",c_mac:"C (Mac)",caddcl:"AutoCAD DCL",cadlisp:"AutoLISP",cfdg:"CFDG",cfm:"ColdFusion Markup Language",cil:"Common Intermediate Language (CIL)",cobol:"COBOL","cpp-qt":"C++ (Qt toolkit)",cpp:"C++",csharp:"C#",css:"Cascading Style Sheets (CSS)",
-d:"D",delphi:"Delphi",diff:"Diff",div:"DIV",dos:"DOS batch file",dot:"DOT",eiffel:"Eiffel",fortran:"Fortran",freebasic:"FreeBASIC",gambas:"Gambas",genero:"Genero",gettext:"GNU internationalization (i18n) library",glsl:"OpenGL Shading Language (GLSL)",gml:"Game Maker Language (GML)",gnuplot:"gnuplot",groovy:"Groovy",haskell:"Haskell",hq9plus:"HQ9+",html4strict:"HTML",html5:"HTML5",idl:"Uno IDL",ini:"INI",inno:"Inno",intercal:"INTERCAL",io:"Io",java:"Java",java5:"Java(TM) 2 Platform Standard Edition 5.0",
-javascript:"JavaScript",kixtart:"KiXtart",klonec:"Klone C",klonecpp:"Klone C++",latex:"LaTeX",lisp:"Lisp",lolcode:"LOLCODE",lotusscript:"LotusScript",lua:"Lua",Code:"Language",m68k:"Motorola 68000 Assembler",make:"make",matlab:"MATLAB M",mirc:"mIRC scripting language",mxml:"MXML",mpasm:"Microchip Assembler",mysql:"MySQL",nsis:"Nullsoft Scriptable Install System (NSIS)",objc:"Objective-C","ocaml-brief":"OCaml",ocaml:"OCaml",oobas:"OpenOffice.org Basic",oracle8:"Oracle 8 SQL",oracle11:"Oracle 11 SQL",
-pascal:"Pascal",per:"per",perl:"Perl","php-brief":"PHP",php:"PHP",pixelbender:"Pixel Bender",plsql:"PL/SQL",povray:"Persistence of Vision Raytracer",powershell:"Windows PowerShell",progress:"OpenEdge Advanced Business Language",prolog:"Prolog",providex:"ProvideX",python:"Python",qbasic:"QBasic/QuickBASIC",rails:"Rails",reg:"Windows Registry",robots:"robots.txt",rsplus:"R",ruby:"Ruby",sas:"SAS",scala:"Scala",scheme:"Scheme",scilab:"Scilab",sdlbasic:"SdlBasic",smalltalk:"Smalltalk",smarty:"Smarty",
-sql:"SQL",tcl:"Tcl",teraterm:"Tera Term",text:"Plain text",thinbasic:"thinBasic",tsql:"Transact-SQL",typoscript:"TypoScript",vala:"Vala",vb:"Visual Basic",vbnet:"Visual Basic .NET",verilog:"Verilog",vhdl:"VHDL",vim:"Vimscript",visualfoxpro:"Visual FoxPro",visualprolog:"Visual Prolog",whitespace:"Whitespace",winbatch:"Winbatch",xml:"XML",xorg_conf:"Xorg.conf",xpp:"X++",z80:"ZiLOG Z80 Assembler"}})();
\ No newline at end of file
diff --git a/src/static/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png b/src/static/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a8d2bfdabcc7271dde74ba441d11deb5adc5663
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9S!VDyfb{13uDbWC*5LY1m9|L%t&t(Bhu$2V)
z1v7m9_51I?Q~B(yKoJ*D7sn8e>&XFui49F#OeC~TM2>NBAD(jbywmmB4AXs^Hw!g3
zrKK6vW(G_+FkzM$n~Q^*56=n#HEv_kCE{7?J&c=}8RCPb`s%g^=>g4S@O1TaS?83{
F1OV9DKgIw6
literal 0
HcmV?d00001
diff --git a/src/static/ckeditor/plugins/magicline/images/hidpi/icon.png b/src/static/ckeditor/plugins/magicline/images/hidpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b981bb5c6c40ef143fbd1dbd92e17c3471a6e635
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9S!VDyfb{13uDTx4|5LY1m9~)4vn;Q?5V=oEv
z3ua*W{OkAMe;?PrIs+66_jGX#;kaJgvr+JX0T0vtsZoZl?5FrnGTCjc
QM%Pf)^OZeA
b(rxbAsq!4pRQ+B7tzhtU^>bP0l+XkKZctCS
literal 0
HcmV?d00001
diff --git a/src/static/ckeditor/plugins/magicline/images/icon-rtl.png b/src/static/ckeditor/plugins/magicline/images/icon-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b5b5f949a60c8fabc63867fd7827fe33d0ab71
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRQ!3HGLSWET+sX$K`#}En0)_zAW1_cfl(^voJ
zzZIFXGf`1QjpGte_M{Gzw|n-
mC^o0`vu%>-E46n=xrM(kReto&cQ&R(y%F4>B
zs;Uq!kbwq_7Top+>f$X4@(X6LuyOG4sc+bE;L!1t|K@(+14@K=x;Tb#Tu;8Rb9cks
z#J94nZHsw$wz2W7VVBS|FgP>!0K<|7o;WsvWX2Z8B?>%jY}0rZj)}3g-PxTm;lP0#
v3__VH4l5d8H_c`?|H*MfZyGa?!EHvRt#Zd+?pApQG@rrK)z4*}Q$iB}(WFB8
literal 0
HcmV?d00001
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 6983c969..e90b3636 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -18,7 +18,7 @@ define('ALERT_WARNING', 5);
define('ALERT_INFO', 6);
define('ALERT_LIGHT', 7);
define('ALERT_DARK', 8);
-define("ALERT_TPL", '~content~
');
+define("ALERT_TPL", '~content~
');
//$content:文档，$type:alert类型
function DedeAlert($content, $type = ALERT_PRIMARY, $isHTML = false)
{
diff --git a/src/system/helpers/code.helper.php b/src/system/helpers/code.helper.php
index 87c63ff2..61f77f9b 100644
--- a/src/system/helpers/code.helper.php
+++ b/src/system/helpers/code.helper.php
@@ -437,7 +437,7 @@ function checkCode($code)
function htmlErrors($errors = null)
{
if ($errors) {
- $errorsHTML = "";
+ $errorsHTML = "
";
$errorsHTML .= '内嵌脚本缺失，请添加该函数：';
$errorsHTML .= '
';
foreach ($errors as $error) {
diff --git a/src/system/inc/inc_fun_funAdmin.php b/src/system/inc/inc_fun_funAdmin.php
index 9589bfec..ceea8e77 100755
--- a/src/system/inc/inc_fun_funAdmin.php
+++ b/src/system/inc/inc_fun_funAdmin.php
@@ -152,8 +152,8 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
$addConfig = ",{filebrowserImageUploadUrl:'api.php?action=upload&type=litpic&ck=1',filebrowserUploadUrl:'api.php?action=upload&type=media&ck=1',extraPlugins:'html5video,html5audio,textindent',filebrowserImageBrowseDisabled:true}";
}
$code = <<
+
EOT;
if ($gtype == "print") {
diff --git a/src/user/edit_baseinfo.php b/src/user/edit_baseinfo.php
index 10cf30d6..d4c3629d 100755
--- a/src/user/edit_baseinfo.php
+++ b/src/user/edit_baseinfo.php
@@ -19,17 +19,6 @@ $newface = isset($newface)? $newface : '';
if ($dopost == 'save') {
//校验CSRF
CheckCSRF();
- if (function_exists('password_hash') && !empty($row['pwd_new'])) {
- if (!is_array($row) || !password_verify($oldpwd, $row['pwd_new'])) {
- ShowMsg('您输入的旧密码错误或没填写，修改资料失败', 'edit_baseinfo.php');
- exit();
- }
- } else {
- if (!is_array($row) || $row['pwd'] != md5($oldpwd)) {
- ShowMsg('您输入的旧密码错误或没填写，修改资料失败', 'edit_baseinfo.php');
- exit();
- }
- }
if ($userpwd != $userpwdok) {
ShowMsg('您两次输入的新密码不一致', 'edit_baseinfo.php');
exit();
diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm
index 0822b6ca..7002e8c0 100755
--- a/src/user/templets/edit_baseinfo.htm
+++ b/src/user/templets/edit_baseinfo.htm
@@ -24,18 +24,13 @@
-
@@ -45,42 +40,34 @@
修改
-