Browse Source

修正富文本404图标缺失,调整细节,优化会员资料修改体验

tags/6.3.0
叙述、别离 7 months ago
parent
commit
91c46336c6
21 changed files with 35 additions and 87 deletions
  1. +1
    -1
      src/admin/css/albumupload.min.css
  2. +1
    -1
      src/admin/css/login.min.css
  3. +1
    -1
      src/admin/dialog/select_mimages.php
  4. +1
    -1
      src/admin/templets/ad_add.htm
  5. +1
    -1
      src/install/install.html
  6. +2
    -2
      src/static/ckeditor/contents.css
  7. +0
    -10
      src/static/ckeditor/plugins/codesnippetgeshi/plugin.js
  8. BIN
      src/static/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
  9. BIN
      src/static/ckeditor/plugins/magicline/images/hidpi/icon.png
  10. BIN
      src/static/ckeditor/plugins/magicline/images/icon-rtl.png
  11. BIN
      src/static/ckeditor/plugins/magicline/images/icon.png
  12. BIN
      src/static/ckeditor/plugins/widget/images/handle.png
  13. +1
    -1
      src/system/common.func.php
  14. +1
    -1
      src/system/helpers/code.helper.php
  15. +1
    -1
      src/system/inc/inc_fun_funAdmin.php
  16. +0
    -11
      src/user/edit_baseinfo.php
  17. +18
    -48
      src/user/templets/edit_baseinfo.htm
  18. +1
    -1
      src/user/templets/pm-main.htm
  19. +1
    -1
      src/user/templets/resetpassword.htm
  20. +4
    -4
      src/user/templets/widget_litpic.htm
  21. +1
    -2
      tools/resetpwd.php

+ 1
- 1
src/admin/css/albumupload.min.css View File

@@ -1 +1 @@
#btnsubmit{margin:0px 0px 0px 150px}.swfupload{vertical-align:top}.message{margin:10px 0;padding:10px 20px;background:rgb(255,255,204);border:1px solid rgb(255,221,153);overflow:hidden}.picinfo{margin:10px 0;height:30px;line-height:30px}.atlas{float:left;margin-right:10px;margin-bottom:10px;width:220px;height:auto;background:#f5f5f5;text-align:center;border-radius:.5rem}.atlas-head{height:120px}.atlas-head img{margin:0;max-width:220px;max-height:120px;border-radius:.5rem .5rem 0 0!important}.atlas-input{width:220px}.atlas-box{margin:.5rem 0}.atlas-foot input[type=text]{border-radius:0 0 .5rem .5rem!important}
#btnsubmit{margin:0px 0px 0px 150px}.swfupload{vertical-align:top}.message{margin:10px 0;padding:10px 20px;background:rgb(255,255,204);border:1px solid rgb(255,221,153);overflow:hidden}.picinfo{margin:10px 0;height:30px;line-height:30px}.atlas{float:left;margin-right:10px;margin-bottom:10px;width:220px;height:auto;background:#f5f5f5;text-align:center;border-radius:0.5rem}.atlas-head{height:120px}.atlas-head img{margin:0;max-width:220px;max-height:120px;border-radius:0.5rem 0.5rem 0 0!important}.atlas-input{width:220px}.atlas-box{margin:.5rem 0}.atlas-foot input[type=text]{border-radius:0 0 0.5rem 0.5rem!important}

+ 1
- 1
src/admin/css/login.min.css View File

@@ -1 +1 @@
body{line-height:1.6;letter-spacing:0.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}
body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:0.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 0.5rem 0.5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}

+ 1
- 1
src/admin/dialog/select_mimages.php View File

@@ -15,7 +15,7 @@ include(DEDEDATA.'/mark/inc_photowatermark_config.php');
<link rel="stylesheet" href="../../static/web/font/css/font-awesome.min.css">
<link rel="stylesheet" href="../../static/web/css/bootstrap.min.css">
<link rel="stylesheet" href="../../static/web/css/admin.css">
<style>#wrap{padding:10px}#topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right}#file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px}#file_list:empty:after{content:'拖拽图片到此处上传'}#file_list li{display:block;position:relative;padding:10px;vertical-align:top;border-radius:.5rem}#file_list li:hover{background:#f5f5f5}#file_list li .picbox{display:flex;flex:0 0 auto;position:relative;padding-top:90%;width:100%;align-items:center;justify-content:center;overflow:hidden}#file_list li .picbox img{display:block;max-width:100%;max-height:100%;position:absolute;top:50%;left:50%;transform:translateX(-50%) translateY(-50%);border-radius:.5rem}#file_list li .namebox{display:flex;padding:10px;justify-content:center;align-items:flex-start}#file_list li.up-over .picbox:after{position:absolute;bottom:10px;right:0;font-family:'FontAwesome';font-size:18px;color:#1eb867;content:'\f058';z-index:9}#file_list li .tools{display:none;position:absolute;bottom:12px;right:10px;z-index:99}#file_list li:hover .tools{display:block}#file_list li .tools .remove{cursor:pointer}#file_list li .tools .remove:after{font-family:'FontAwesome';font-size:18px;color:#dc3545;content:'\f1f8'}</style>
<style>#wrap{padding:10px}#topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right}#file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px}#file_list:empty:after{content:'拖拽图片到此处上传'}#file_list li{display:block;position:relative;padding:10px;vertical-align:top;border-radius:0.5rem}#file_list li:hover{background:#f5f5f5}#file_list li .picbox{display:flex;flex:0 0 auto;position:relative;padding-top:90%;width:100%;align-items:center;justify-content:center;overflow:hidden}#file_list li .picbox img{display:block;max-width:100%;max-height:100%;position:absolute;top:50%;left:50%;transform:translateX(-50%) translateY(-50%);border-radius:0.5rem}#file_list li .namebox{display:flex;padding:10px;justify-content:center;align-items:flex-start}#file_list li.up-over .picbox:after{position:absolute;bottom:10px;right:0;font-family:'FontAwesome';font-size:18px;color:#1eb867;content:'\f058';z-index:9}#file_list li .tools{display:none;position:absolute;bottom:12px;right:10px;z-index:99}#file_list li:hover .tools{display:block}#file_list li .tools .remove{cursor:pointer}#file_list li .tools .remove:after{font-family:'FontAwesome';font-size:18px;color:#dc3545;content:'\f1f8'}</style>
</head>
<body>
<div id="wrap">


+ 1
- 1
src/admin/templets/ad_add.htm View File

@@ -11,7 +11,7 @@
<script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/moment.min.js"></script>
<script src="../static/web/js/daterangepicker.js"></script>
<style>.typetab{text-align:left}.typetab ul li{float:left;width:60px;height:28px;line-height:28px;border-radius:.5rem .5rem 0 0;text-align:center;cursor:pointer}.typetab ul .act{background:#f5f5f5}</style>
<style>.typetab{text-align:left}.typetab ul li{float:left;width:60px;height:28px;line-height:28px;border-radius:0.5rem 0.5rem 0 0;text-align:center;cursor:pointer}.typetab ul .act{background:#f5f5f5}</style>
</head>
<body>
<form name="form1" action="ad_add.php" method="post" onSubmit="return checkSubmit()">


+ 1
- 1
src/install/install.html View File

@@ -10,7 +10,7 @@
<script src="../static/web/js/jquery.min.js"></script>
<script src="../static/web/js/bootstrap.min.js"></script>
<script src="../static/web/js/style.js"></script>
<style>body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2,legend{line-height:1.6;font-size:18px;font-weight:600;color:#393d49}label{margin-bottom:10px;line-height:18px}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:800px}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}.logo,.form-control{height:36px}.form-control,.btn-md,.card,.alert,.rounded{border-radius:.5rem!important}.card-header:first-child{border-radius:.5rem .5rem 0 0}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
<style>body{line-height:1.6;letter-spacing:0.5px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2,legend{line-height:1.6;font-size:18px;font-weight:600;color:#393d49}label{margin-bottom:10px;line-height:18px}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:800px}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}.fa{font-size:14px!important;color:inherit;cursor:pointer}.logo,.form-control{height:36px}.form-control,.btn-md,.card,.alert,.rounded{border-radius:0.5rem!important}.card-header:first-child{border-radius:0.5rem 0.5rem 0 0}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
</head>
<body>
<div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-3">


+ 2
- 2
src/static/ckeditor/contents.css View File

@@ -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;


+ 0
- 10
src/static/ckeditor/plugins/codesnippetgeshi/plugin.js View File

@@ -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"}})();

BIN
src/static/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png View File

Before After
Width: 18  |  Height: 20  |  Size: 176B

BIN
src/static/ckeditor/plugins/magicline/images/hidpi/icon.png View File

Before After
Width: 18  |  Height: 20  |  Size: 199B

BIN
src/static/ckeditor/plugins/magicline/images/icon-rtl.png View File

Before After
Width: 9  |  Height: 10  |  Size: 138B

BIN
src/static/ckeditor/plugins/magicline/images/icon.png View File

Before After
Width: 9  |  Height: 10  |  Size: 133B

BIN
src/static/ckeditor/plugins/widget/images/handle.png View File

Before After
Width: 15  |  Height: 15  |  Size: 220B

+ 1
- 1
src/system/common.func.php View File

@@ -18,7 +18,7 @@ define('ALERT_WARNING', 5);
define('ALERT_INFO', 6);
define('ALERT_LIGHT', 7);
define('ALERT_DARK', 8);
define("ALERT_TPL", '<div style="position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;width:auto;font-size:14px;color:~color~;background:~background~;border-color:~border~;border:1px solid transparent;border-radius:.5rem">~content~</div>');
define("ALERT_TPL", '<div style="position:relative;padding:0.75rem 1.25rem;margin-bottom:1rem;width:auto;font-size:14px;color:~color~;background:~background~;border-color:~border~;border:1px solid transparent;border-radius:0.5rem">~content~</div>');
//$content:文档,$type:alert类型
function DedeAlert($content, $type = ALERT_PRIMARY, $isHTML = false)
{


+ 1
- 1
src/system/helpers/code.helper.php View File

@@ -437,7 +437,7 @@ function checkCode($code)
function htmlErrors($errors = null)
{
if ($errors) {
$errorsHTML = "<div style='width:98%;margin:1rem auto;color:#842029;background:#f8d7da;border-color:#842029;position:relative;padding:.75rem 1.25rem;border:1px solid transparent;border-radius:.5rem'>";
$errorsHTML = "<div style='width:98%;margin:1rem auto;color:#842029;background:#f8d7da;border-color:#842029;position:relative;padding:0.75rem 1.25rem;border:1px solid transparent;border-radius:0.5rem'>";
$errorsHTML .= '内嵌脚本缺失,请添加该函数:';
$errorsHTML .= '<dl>';
foreach ($errors as $error) {


+ 1
- 1
src/system/inc/inc_fun_funAdmin.php View File

@@ -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
<script src="{$GLOBALS['cfg_static_dir']}/ckeditor/ckeditor.js"></script>
<textarea id="{$fname}" name="{$fname}">{$fvalue}</textarea>
<script src="{$GLOBALS['cfg_static_dir']}/ckeditor/ckeditor.js"></script>
<script>var editor = CKEDITOR.replace('{$fname}'{$addConfig});</script>
EOT;
if ($gtype == "print") {


+ 0
- 11
src/user/edit_baseinfo.php View File

@@ -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();


+ 18
- 48
src/user/templets/edit_baseinfo.htm View File

@@ -24,18 +24,13 @@
<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
<input type="hidden" name="dopost" value="save">
<input type="hidden" id="newface" name="newface" value="">
<div class="form-group row">
<div class="col-sm-12">
<div class="alert alert-info mb-0">会员资料修改需要验证密码才能修改</div>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">账号:</label>
<div class="col-sm-9 input-text"><?php echo $cfg_ml->M_LoginID;?></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">昵称:</label>
<div class="col-sm-9"><input type="text" name="uname" id="iptUname" class="form-control w-75" value="<?php echo $row['uname'];?>" placeholder="企业会员为公司名,个人会员为昵称"></div>
<div class="col-sm-9"><input type="text" name="uname" id="iptUname" class="form-control w-75" value="<?php echo $row['uname'];?>" required="required" placeholder="请输入昵称"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">头像:</label>
@@ -45,42 +40,34 @@
<span class="btn btn-success btn-sm" id="btnChangeFace">修改</span>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">密码:</label>
<div class="col-sm-9"><input type="password" name="oldpwd" id="iptOldpwd" class="form-control w-75" placeholder="请输入密码"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">新密码:</label>
<div class="col-sm-9"><input type="password" name="userpwd" id="iptUserpwd" class="form-control w-75" placeholder="不修改密码请保留此项为空"></div>
<div class="col-sm-9"><input type="password" name="userpwd" id="iptUserpwd" class="form-control w-75" placeholder="修改密码,无需修改忽略"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">确认新密码:</label>
<div class="col-sm-9"><input type="password" name="userpwdok" id="iptUserpwdok" class="form-control w-75" placeholder="不修改密码请保留此项为空"></div>
<div class="col-sm-9"><input type="password" name="userpwdok" id="iptUserpwdok" class="form-control w-75" placeholder="请再次输入修改密码,无需修改忽略"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">安全问题:</label>
<div class="col-sm-9"><?php echo GetSafequestion($row['safequestion'],'safequestion');?></div>
<label class="col-sm-3 col-form-label">安全问题:</label>
<div class="col-sm-9"><?php echo GetSafequestion(0,'newsafequestion');?></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">问题答案:</label>
<div class="col-sm-9"><input type="text" name="safeanswer" id="iptSafeanswer" class="form-control"></div>
<label class="col-sm-3 col-form-label">问题答案:</label>
<div class="col-sm-9"><input type="text" name="newsafeanswer" id="iptNewsafeanswer" class="form-control" placeholder="请设置或回答安全问题,无需修改忽略"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">安全问题:</label>
<div class="col-sm-9"><?php echo GetSafequestion(0,'newsafequestion');?></div>
<label class="col-sm-3 col-form-label">修改安全问题:</label>
<div class="col-sm-9"><?php echo GetSafequestion($row['safequestion'],'safequestion');?></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">问题答案:</label>
<div class="col-sm-9"><input type="text" name="newsafeanswer" id="iptNewsafeanswer" class="form-control"></div>
<label class="col-sm-3 col-form-label">修改问题答案:</label>
<div class="col-sm-9"><input type="text" name="safeanswer" id="iptSafeanswer" class="form-control" placeholder="请选择安全问题后设置新安全问题,无需修改忽略"></div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label">邮箱:</label>
<div class="col-sm-9">
<div id="spEmail">
<span class="input-text"><?php echo HideEmail($row['email']);?></span>
<span class="btn btn-success btn-sm ml-3" id="btnChangeEmail">修改</span>
</div>
<span id="iptEmail"></span>
<input type="email" name="email" id="iptEmail" class="form-control" value="<?php echo $row['email'];?>" required="required" placeholder="请输入邮箱,绑定会员账号">
</div>
</div>
<div class="form-group row">
@@ -121,28 +108,11 @@
return false;
}
}
</script>
<script>
$(document).ready(function () {
$("#btnChangeEmail").click(function () {
if ($("#iptOldpwd").val() === "") {
ShowMsg("请您填写密码");
return false;
}
$.post("<?php echo $cfg_cmsurl;?>/user/api.php?action=get_old_email", { oldpwd: $("#iptOldpwd").val() }, function (result) {
if (result.code === 0) {
$("#spEmail").hide();
$("#iptEmail").html(`<input value="${result.data.email}" type="email" name="email" id="iptEmail" class="form-control">`);
$("#iptEmail").show();
} else {
ShowMsg(result.msg);
}
});
})
$("#btnChangeFace").click(function () {
$(document).ready(function() {
$("#btnChangeFace").click(function() {
$("#iptNewface").click();
})
$("#iptNewface").change(function (val) {
});
$("#iptNewface").change(function(val) {
var formData = new FormData();
var fileData = $('#iptNewface')[0].files[0];
formData.append('file', fileData);
@@ -152,7 +122,7 @@
data: formData,
processData: false,
contentType: false,
success: function (result) {
success: function(result) {
if (result.code === 0) {
$("#face").attr('src', result.data);
$("#newface").val(result.data);
@@ -160,7 +130,7 @@
ShowMsg(result.error.message);
}
},
error: function (xhr, status, error) {
error: function(xhr, status, error) {
alert(error); //处理上传失败后的回调
}
});


+ 1
- 1
src/user/templets/pm-main.htm View File

@@ -122,7 +122,7 @@
return false;
}
DedeConfirm("您确定要删除这些消息吗").then((v)=>{
$.get("pm.php?dopost=remove&ids=" + selid + "&folder=" + myfolder,function (data) {
$.get("pm.php?dopost=remove&ids=" + selid + "&folder=" + myfolder,function(data) {
let result = JSON.parse(data);
if (result.code === 200) {
location.reload();


+ 1
- 1
src/user/templets/resetpassword.htm View File

@@ -50,7 +50,7 @@
</main>
<?php obtaintheme('foot.htm');?>
<script>
$(document).ready(function () {
$(document).ready(function() {
$("#selType").on("change", function() {
if (this.value == 2) {
$("#mail-box").hide();


+ 4
- 4
src/user/templets/widget_litpic.htm View File

@@ -1,9 +1,9 @@
<script>
$(document).ready(function () {
$(document).ready(function() {
$("#btnUploadLitpic").click(function(){
$("#iptLitpic").click();
})
$("#iptLitpic").change(function (val) {
$("#iptLitpic").change(function(val) {
var formData = new FormData();
var fileData = $('#iptLitpic')[0].files[0];
formData.append('file', fileData);
@@ -13,7 +13,7 @@
data: formData,
processData: false,
contentType: false,
success: function (result) {
success: function(result) {
if (result.code === 0) {
$("#imgLitpic").attr('src', result.data);
$("#litpic").val(result.data);
@@ -21,7 +21,7 @@
ShowMsg(result.error.message);
}
},
error: function (xhr, status, error) {
error: function(xhr, status, error) {
ShowMsg("文件上传失败");//处理上传失败后的回调
}
});


+ 1
- 2
tools/resetpwd.php View File

@@ -18,7 +18,7 @@ define('DEDEBIZ_REPWD_VER', '1.0.0');
*/
function ToolAlert($content, $colors = array('#cfe2ff', '#b6d4fe', '#084298'))
{
define('TOOLS_ALERT_TPL', '<div style="position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;width:auto;font-size:14px;color:~color~;background:~background~;border-color:~border~;border:1px solid transparent;border-radius:.5rem">~content~</div>');
define('TOOLS_ALERT_TPL', '<div style="position:relative;padding:0.75rem 1.25rem;margin-bottom:1rem;width:auto;font-size:14px;color:~color~;background:~background~;border-color:~border~;border:1px solid transparent;border-radius:0.5rem">~content~</div>');
list($background, $border, $color) = $colors;
return str_replace(array('~color~', '~background~', '~border~', '~content~'), array($color, $background, $border, $content), TOOLS_ALERT_TPL);
}
@@ -67,7 +67,6 @@ if ($dopost === 'change') {
ShowMsg("管理员密码成功修改为<code>{$newpwd}</code>,请务必删除当前文件!", 'javascript:;');
exit;
}

$wintitle = "DedeBIZ修改密码工具";
$wecome_info = "DedeBIZ修改密码工具 V" . DEDEBIZ_REPWD_VER;
$win = new OxWindow();


Loading…
Cancel
Save