请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); + ShowMsg('密码或或会员名不合法，
只能用[0-9a-zA-Z_@!.-]以内范围的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); @@ -37,7 +37,6 @@ if ($dopost == 'add') { $mpwd = md5($pwd); $pwd = substr(md5($pwd), 5, 20); } - $typeid = join(',', $typeids); if ($typeid == '0') $typeid = ''; //关连前台会员帐号 diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index 218d081f..c2dbf4f6 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -17,7 +17,7 @@ if ($dopost == 'saveedit') { CheckCSRF(); $pwd = trim($pwd); if ($pwd != '' && preg_match("#[^0-9a-zA-Z_@!\.-]#", $pwd)) { - ShowMsg('密码不合法，请使用[0-9a-zA-Z_@!.-]内的字符', '-1', 0, 3000); + ShowMsg('密码不合法，只能用[0-9a-zA-Z_@!.-]以内范围的字符', '-1', 0, 3000); exit(); } $safecodeok = substr(md5($cfg_cookie_encode.$randcode), 0, 24); diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 5ff5bf83..27048e4f 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -3,7 +3,7 @@ -
| 附件数据管理 | +附件管理 | ||||||||||||
| 选择 | diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index b795ddd1..bd344002 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -102,7 +102,7 @@ input[type=file] { .ddcard > .card-header { padding:0; background:#fff; - border-bottom:solid 4px #1eb867 + border-bottom:solid 3px #1eb867 } .ddcard-normal > .card-header { padding:10px; @@ -135,9 +135,6 @@ input[type=file] { background:#1eb867; border-radius:.2rem .2rem 0 0 } -.ddcard-normal > .list-group > li i { - color:#1eb867 -} .ddcard-normal { padding:0; box-shadow:0 .125rem .25rem rgba(0,0,0,.075) @@ -181,12 +178,12 @@ input[type=file] { line-height:30px } .items > li .title,.items > li .caption a { - display:inline; - line-height:18px; - color:#212529 + display:inline +} +.items > li .source span,.items > li .source a { + color:#c0c0c0 } .items > li .description,.items > li .description a,.items > li .addinfo { - color:#868686; display:-webkit-box; -webkit-line-clamp:3; -webkit-box-orient:vertical; @@ -329,24 +326,24 @@ input[type=file] { line-height:40px; text-align:right } -.user-admin img { +.user-admin-img { + max-width:60px; + min-height:60px; + border-radius:50%; + border:1px solid #eee +} +.user-admin-img-xs { margin-right:10px; width:30px; height:30px; border-radius:50%; - border-bottom:1px solid #eee -} -.user-logo { - max-width:60px; - min-height:60px; - border-radius:50%; - border-bottom:1px solid #eee + border:1px solid #eee } -.user-img { +.user-edit-img { width:36px; height:36px; border-radius:50%; - border:1px solid #dee2e6 + border:1px solid #eee } .user-meter i { font-size:24px!important; @@ -358,17 +355,14 @@ input[type=file] { .list-group-flush>.list-group-item { cursor:pointer } -.nav-link.active { - color:#ec982c -} .dropdown { display:inline-block; margin-left:.25rem; content:""; - border-top:.3em solid; - border-right:.3em solid transparent; + border-top:.3rem solid; + border-right:.3rem solid transparent; border-bottom:0; - border-left:.3em solid transparent; + border-left:.3rem solid transparent; vertical-align:.25rem } .pannel-main-container { diff --git a/src/system/common.func.php b/src/system/common.func.php index 319c003b..0956c1fa 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -508,6 +508,21 @@ function GetUpdateSQL() fclose($fp); return $result; } +//会员头像标签{dede:field.mid function='face(@me)'/}和[field:mid function='face(@me)'/] +function face($mid) +{ + global $dsql; + if ($mid <> 0) { + $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$mid'"); + if ($row['face'] == "") { + $face = "/static/web/img/admin.png"; + } else { + $face = $row['face']; + $face = "$face"; + } + } + return $face; +} //会员昵称标签{dede:field.mid function="GetMemberInfos('uname',@me)"/}和[field:mid function="GetMemberInfos('uname',@me)"/] function GetMemberInfos($fields, $mid) { @@ -524,21 +539,6 @@ function GetMemberInfos($fields, $mid) } return $revalue; } -//会员头像标签{dede:field.mid function='face(@me)'/}和[field:mid function='face(@me)'/] -function face($mid) -{ - global $dsql; - if ($mid <> 0) { - $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$mid'"); - if ($row['face'] == "") { - $face = "/static/web/img/admin.png"; - } else { - $face = $row['face']; - $face = "$face"; - } - } - return $face; -} //标签调用标签[field:id function='GetMyTags(@me,2)'/]2表示输出2个文档 if (!function_exists('GetMyTags')) { function GetMyTags($aid, $num=3) diff --git a/src/theme/dedebiz/foot.htm b/src/theme/dedebiz/foot.htm index d397e677..573aedcb 100644 --- a/src/theme/dedebiz/foot.htm +++ b/src/theme/dedebiz/foot.htm @@ -15,7 +15,7 @@ function CheckLogin() { $.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json",function(result) { if (result.code === 200) { - $("#_login").html(`|||||||||||||
? $cfg_staticurl.'/web/img/admin.png' : $row['face'];?>)
+