diff --git a/src/admin/api.php b/src/admin/api.php index 6515db4d..baf02004 100644 --- a/src/admin/api.php +++ b/src/admin/api.php @@ -4,9 +4,7 @@ define('DEDEADMIN', str_replace("\\", '/', dirname(__FILE__))); require_once(DEDEADMIN.'/../system/common.inc.php'); require_once(DEDEINC.'/userlogin.class.php'); AjaxHead(); - $action = isset($action) && in_array($action, array('is_need_check_code'))? $action : ''; - if ($action === 'is_need_check_code') { $cuserLogin = new userLogin(); $isNeed = $cuserLogin->isNeedCheckCode($userid); @@ -18,4 +16,5 @@ if ($action === 'is_need_check_code') { ), )); exit; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 1e2ae7aa..6ea961b3 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -118,15 +118,15 @@ function LoadServer() { 文件1： - /system/database/dedesqlite.class.php + .../system/database/1.php 文件2： - /system/database/dedesqlite.class.php + .../system/database/2.php 文件3： - /system/database/dedesqlite.class.php + .../system/database/3.php diff --git a/src/admin/js/login.js b/src/admin/js/login.js deleted file mode 100644 index 8f4b92aa..00000000 --- a/src/admin/js/login.js +++ /dev/null @@ -1,17 +0,0 @@ -$(document).ready(function () { - $("#iptUserid").focusout(function () { - let userid = $(this).val(); - if (userid !== '') { - $.get("api.php?action=is_need_check_code&userid=" + userid, function (data) { - let rs = JSON.parse(data); - if (rs.code === 0) { - if (rs.data.isNeed) { - $("#vdimgck").show(); - } else { - $("#vdimgck").hide(); - } - } - }); - } - }) -}) \ No newline at end of file diff --git a/src/admin/login.php b/src/admin/login.php index 0a7e499a..728d1f7f 100644 --- a/src/admin/login.php +++ b/src/admin/login.php @@ -29,8 +29,8 @@ if (is_dir(dirname(__FILE__).'/../install')) { } //检测后台目录是否更名 $cururl = GetCurUrl(); -if (preg_match('/admin\/login/i', $cururl)) { - $redmsg = '
您的管理目录的名称中包含默认名称admin，建议把它修改为其它名称，那样会更安全
'; +if (preg_match('/admin/', $cururl)) { + $redmsg = '
安全提示：后台管理目录名称中包含默认名称admin，建议把它修改为其它名称
'; } else { $redmsg = ''; } @@ -50,29 +50,28 @@ if ($dopost == 'login') { exit; } } - $res = $cuserLogin->checkUser($userid, $pwd); if ($res == 1) { $cuserLogin->keepUser(); if (!empty($gotopage)) { - ShowMsg('成功登录，正在转向管理管理主页', $gotopage); + ShowMsg('成功登录，正在跳转管理管理主页', $gotopage); exit(); } else { - ShowMsg('成功登录，正在转向管理管理主页', 'index.php'); + ShowMsg('成功登录，正在跳转管理管理主页', 'index.php'); exit(); } } else if ($res == -1) { ResetVdValue(); - ShowMsg('您的账号不存在', 'login.php', 0, 1000); + ShowMsg('管理员账号不存在', 'login.php', 0, 1000); exit; } else { ResetVdValue(); - ShowMsg('您的密码错误', 'login.php', 0, 1000); + ShowMsg('管理员密码错误', 'login.php', 0, 1000); exit; } } else { ResetVdValue(); - ShowMsg('用户和密码没填写完整', 'login.php', 0, 1000); + ShowMsg('管理员账号和密码没填完整', 'login.php', 0, 1000); exit; } } diff --git a/src/admin/spec_edit.php b/src/admin/spec_edit.php index 9c73ebf9..77ab80ff 100644 --- a/src/admin/spec_edit.php +++ b/src/admin/spec_edit.php @@ -167,7 +167,7 @@ else if ($dopost == 'save') { } $notelist .= "{dede:specnote imgheight=\\'$imgheight\\' imgwidth=\\'$imgwidth\\' infolen=\\'$infolen\\' titlelen=\\'$titlelen\\' col=\\'$col\\' idlist=\\'$okids\\' - name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' + name=\\'$notename\\' noteid=\\'$noteid\\' isauto=\'$isauto\' rownum=\\'$rownum\\' keywords=\\'$keywords\\' typeid=\\'$ttypeid\\'} $listtmp {/dede:specnote}\r\n"; diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index c3c87369..a2481f3a 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -43,7 +43,7 @@ {dede:datalist empty=''} - + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index a0f299ac..2ca73ef0 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -185,7 +185,7 @@ } ?> - +
管理
暂无文档
{dede:field.aid/} {dede:field.clsname function='TestType(@me,1)'/} {dede:field.adname/}消费金币：需要金币：
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 5e50101f..d0580a4d 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -178,7 +178,7 @@ ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index f9fa4150..8419c7c4 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -170,7 +170,7 @@ } ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 44ddb173..77d3bbc5 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -164,7 +164,7 @@ ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 2045ffbb..8b2fb38c 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -164,7 +164,7 @@ } ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 48164d56..cb023091 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -161,7 +161,7 @@ ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index 1b9f47b1..7a2e882e 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -17,7 +17,7 @@ 产品名称 - 点数（金币数） + 金币点数 价格 状态 diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index e2b233c7..6f02ce47 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -76,7 +76,7 @@
{dede:datalist empty='
暂无文档
'} - + @@ -105,7 +105,7 @@ 更新审核推荐 - 移动 + 移动删除增加属性删除属性 diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index c71d85e6..8136687d 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -91,7 +91,7 @@ diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index fb513564..24f92959 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -81,7 +81,7 @@ {dede:datalist empty=''} - + diff --git a/src/admin/templets/erradd.htm b/src/admin/templets/erradd.htm index 51cd7733..db66241d 100644 --- a/src/admin/templets/erradd.htm +++ b/src/admin/templets/erradd.htm @@ -70,7 +70,7 @@ {dede:datalist empty=''} - + diff --git a/src/admin/templets/file_manage_main.htm b/src/admin/templets/file_manage_main.htm index 3f81aee2..f5d908bb 100644 --- a/src/admin/templets/file_manage_main.htm +++ b/src/admin/templets/file_manage_main.htm @@ -138,7 +138,7 @@ } else if (preg_match("#\.(mp3|wma)#i",$file)) { - $line = "\n + $line = "\n diff --git a/src/admin/templets/login.htm b/src/admin/templets/login.htm index b832fb37..2ac9b012 100644 --- a/src/admin/templets/login.htm +++ b/src/admin/templets/login.htm @@ -10,7 +10,7 @@ - + @@ -33,23 +33,23 @@
{dede:field.id/} @@ -90,7 +90,7 @@ {dede:field.arcrank function='GetRankName(@me)'/} {dede:field.mid function=GetMemberName(@me)/} - +
{dede:field.arcrank function="GetRankName(@me)"/} {dede:field.mid function=GetMemberName(@me)/} - + 属性
暂无文档
{dede:field.id/} {dede:field.title/}修改建议
暂无文档
{dede:field.id/} {dede:field.mid function='username(@me)'/}
$file $filesize KB $filetime
- + {dede:datalist empty=''} - + diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 3dcd11f9..61e29fe8 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -126,7 +126,7 @@ 0)? $mhasDay : '该会员已经到期';?> - + diff --git a/src/admin/templets/recycling.htm b/src/admin/templets/recycling.htm index 8eebff98..25750875 100644 --- a/src/admin/templets/recycling.htm +++ b/src/admin/templets/recycling.htm @@ -82,7 +82,7 @@ {dede:datalist empty=''} - + diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 54cecf21..cf0b485f 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -180,7 +180,7 @@ } ?> - +
暂无文档
{dede:field.title/}
会员剩余天数：剩余天数：
操作
暂无文档
{dede:field.id/} {dede:field.title/}消费金币：需要金币：
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index fbd20be3..caa195bd 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -169,7 +169,7 @@ ?> - 消费金币： + 需要金币： diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm index 5849704d..5bb8a157 100644 --- a/src/admin/templets/sys_data.htm +++ b/src/admin/templets/sys_data.htm @@ -191,8 +191,8 @@ - - + + diff --git a/src/apps/diy.php b/src/apps/diy.php index 0edf24c5..f92e2faa 100755 --- a/src/apps/diy.php +++ b/src/apps/diy.php @@ -74,7 +74,7 @@ if ($action == 'post') { if ($diy->public == 2) { $goto = "diy.php?action=list&diyid={$diy->diyid}"; - $bkmsg = '发布成功，现在转向表单列表页'; + $bkmsg = '发布成功，现在跳转表单列表页'; } else { $goto = !empty($cfg_cmspath) ? $cfg_cmspath : '/'; $bkmsg = '发布成功，请等待管理员处理'; diff --git a/src/apps/download.php b/src/apps/download.php index bf4592c0..7a28a61e 100755 --- a/src/apps/download.php +++ b/src/apps/download.php @@ -152,7 +152,7 @@ else if ($open == 2) { //读取文档信息，判断权限 $arcRow = GetOneArchive($id); if ($arcRow['aid'] == '') { - ShowMsg('无法获取未知文档的信息!', '-1'); + ShowMsg('无法获取未知文档的信息', '-1'); exit(); } extract($arcRow, EXTR_SKIP); @@ -172,7 +172,7 @@ else if ($open == 2) { } $memberTypes[0] = "游客"; $msgtitle = "您没有权限下载软件：{$arctitle}"; - $moremsg = "这个软件需要".$memberTypes[$needRank]." 才能下载，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; + $moremsg = "这个软件需要".$memberTypes[$needRank]."才能下载，您目前等级是".$memberTypes[$cfg_ml->M_Rank].""; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(); } @@ -186,7 +186,7 @@ else if ($open == 2) { //没有足够的金币 if ($needMoney > $cfg_ml->M_Money || $cfg_ml->M_Money == '') { $msgtitle = "您没有权限下载软件：{$arctitle}"; - $moremsg = "这个软件需要".$needMoney." 金币 才能下载，您目前拥有金币：".$cfg_ml->M_Money." 个 "; + $moremsg = "这个软件需要".$needMoney."金币才能下载，您目前金币".$cfg_ml->M_Money."个"; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(0); } diff --git a/src/apps/list.php b/src/apps/list.php index b7629f61..5d6534fc 100755 --- a/src/apps/list.php +++ b/src/apps/list.php @@ -46,7 +46,7 @@ if ($tinfos['issystem'] == -1) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限浏览栏目：{$lv->Fields['typename']} "; - $moremsg = "这个栏目需要".$memberTypes[$lv->Fields['corank']]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank]." "; + $moremsg = "这个栏目需要".$memberTypes[$lv->Fields['corank']]."才能浏览，您目前等级是".$memberTypes[$cfg_ml->M_Rank].""; include_once(DEDETEMPLATE.'/plus/view_msg_catalog.htm'); exit(); } diff --git a/src/apps/view.php b/src/apps/view.php index 6caf375f..48b8fedc 100755 --- a/src/apps/view.php +++ b/src/apps/view.php @@ -44,7 +44,7 @@ if ($needMoney > 0 || $needRank > 1) { } $memberTypes[0] = "游客或没权限会员"; $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要".$memberTypes[$needRank]." 才能访问，您目前是：".$memberTypes[$cfg_ml->M_Rank].""; + $moremsg = "文档需要".$memberTypes[$needRank]."才能浏览，您目前等级是".$memberTypes[$cfg_ml->M_Rank].""; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); exit(); } @@ -56,7 +56,7 @@ if ($needMoney > 0 || $needRank > 1) { if (!is_array($row)) { if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) { $msgtitle = "您没有权限浏览文档：{$arctitle} "; - $moremsg = "这篇文档需要".$needMoney." 金币 才能访问，您目前拥有金币：".$cfg_ml->M_Money." 个"; + $moremsg = "文档需要".$needMoney."金币才能浏览，您目前金币".$cfg_ml->M_Money."个"; include_once(DEDETEMPLATE.'/plus/view_msg.htm'); $arc->Close(); exit(); @@ -69,7 +69,7 @@ if ($needMoney > 0 || $needRank > 1) { showmsg('购买失败, 请返回', -1); exit; } - showmsg('购买成功，购买扣点不会重扣金币，谢谢', '/plus/view.php?aid='.$aid); + showmsg('购买成功，购买扣点不会重扣金币', '/plus/view.php?aid='.$aid); exit; } else { showmsg('购买失败，请返回', -1); @@ -77,7 +77,7 @@ if ($needMoney > 0 || $needRank > 1) { } } $msgtitle = "扣金币购买阅读"; - $moremsg = "阅读该文档需要付费
这篇文档需要".$needMoney." 金币 才能访问，您目前拥有金币".$cfg_ml->M_Money." 个
确认阅读请点 [确认付点阅读]"; + $moremsg = "浏览该文档需要付费
文档需要".$needMoney."金币才能浏览，您目前金币".$cfg_ml->M_Money."个
确认付点阅读"; include_once($cfg_basedir.$cfg_templets_dir."/plus/view_msg.htm"); $arc->Close(); exit(); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index a7948264..1f1ab026 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -559,7 +559,7 @@ INSERT INTO `#@__member_stowtype` VALUES ('sys','系统收藏','archives_do.php' INSERT INTO `#@__payment` VALUES ('2','bank','银行汇款/转帐','0','银行名称\t\n收款人信息：全称 ××× ；帐号或地址 ××× ；开户行 ×××\t\n注意事项：办理电汇时，请在电汇单“汇款用途”一栏处注明您的订单号','4','a:0:{}','1','1','0'), ('1','cod','货到付款','0','开通城市：×××\t\n货到付款区域：×××','3','a:0:{}','1','1','0'); -INSERT INTO `#@__softconfig` VALUES ('0','1','1','1','http://www.aaa.com | 下载地址一\t\nhttp://www.bbb.com | 下载地址二\t\nhttp://www.ccc.com | 下载地址三\t\n','

如果这个软件总是不能下载的请点击报告错误，谢谢合作
\t\n下载本站资源，如果服务器暂不能下载请过一段时间重试
\t\n如果遇到什么问题，请联系我们，我们将在那里提供更多，更好的资源

','0','0','0','0'); +INSERT INTO `#@__softconfig` VALUES ('0','1','1','1','http://www.aaa.com | 下载地址一\t\nhttp://www.bbb.com | 下载地址二\t\nhttp://www.ccc.com | 下载地址三\t\n','

如果这个软件总是不能下载的请点击报告错误合作
\t\n下载本站资源，如果服务器暂不能下载请过一段时间重试
\t\n如果遇到什么问题，请联系我们，我们将在那里提供更多，更好的资源

','0','0','0','0'); INSERT INTO `#@__stepselect` VALUES ('1','血型','blood','1','1'), ('2','体型','bodytype','1','1'), diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 0b68bf9c..10581632 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -64,25 +64,86 @@ form.search { .spec .card-body { padding:.25rem } -ul.spec > li > a > img,.article-spec > a > img { - width:120px -} -ul.spec .border-bottom-dashed { +.spec .border-bottom-dashed { border-bottom:dashed 1px #929292 } -ul.spec > li .title a { +.spec > li .title h4 { + display:inline +} +.spec > li .title a { color:#212529 } -ul.spec > li .title h4 { - display:inline +.spec > li > a > img,.article-spec > a > img { + width:120px } -ul.spec > li .title .label { - padding:0 5px; +.spec > li .title .label { + padding:0 10px; color:#1eb867; background:#b7e9b4; border-radius:.25rem } -ul.spec > li .description,ul.spec > li .description a { +.ddcard,.ddcard-normal { + border:none +} +.ddcard > .card-header { + padding:0; + background:#fff; + border-bottom:solid 4px #1eb867 +} +.ddcard-normal > .card-header { + padding:10px; + background:#fff; + border-bottom:0 +} +.ddcard-normal > .card-header .caption,.ddcard > .card-header .caption { + font-size:18px; + font-weight:600 +} +.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a { + font-size:14px; + color:#1eb867 +} +.ddcard > ul > li,.ddcard > ol > li,.ddcard-normal > ul > li,.ddcard-normal > ol > li { + padding-bottom:10px; + color:#c0c0c0; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap +} +.ddcard > ul > li:nth-child(1),.ddcard > ol > li:nth-child(1) { + margin-top:10px +} +.ddcard > ul > li:last-child,.ddcard > ol > li:last-child,.ddcard-normal > ul > li:last-child,.ddcard-normal > ol > li:last-child { + padding-bottom:0 +} +.ddcard > .card-header .caption span { + display:inline-block; + padding:6px 12px; + color:#fff; + 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) +} +.ddcard-normal ul { + padding:10px +} +.title::before { + margin-right:10px; + padding:2px; + content:" "; + background:#1eb867; + border-radius:.2rem +} +.breadcrumb { + margin-bottom:0 +} +.spec > li .description,.spec > li .description a { line-height:30px; font-size:16px; color:#868686; @@ -91,7 +152,7 @@ ul.spec > li .description,ul.spec > li .description a { -webkit-box-orient:vertical; overflow:hidden } -ul.items > li .type { +.items > li .type { position:relative; padding:0 5px; margin-right:10px; @@ -102,7 +163,7 @@ ul.items > li .type { color:#fff; background:#1eb867 } -ul.items > li .pane { +.items > li .pane { display:inline-block; margin-right:10px; margin-bottom:10px; @@ -111,15 +172,15 @@ ul.items > li .pane { background:#1eb867; vertical-align:middle } -ul.items > li .caption { +.items > li .caption { line-height:30px } -ul.items > li .title,ul.items > li .caption a { +.items > li .title,.items > li .caption a { display:inline; line-height:18px; color:#212529 } -ul.items > li .description,ul.items > li .description a,ul.items > li .addinfo { +.items > li .description,.items > li .description a,.items > li .addinfo { color:#868686; display:-webkit-box; -webkit-line-clamp:3; @@ -128,13 +189,13 @@ ul.items > li .description,ul.items > li .description a,ul.items > li .addinfo { line-height:30px; word-break:break-all } -ul.items .border-bottom-dashed { +.items .border-bottom-dashed { border-bottom:dashed 1px #929292 } -ul.items img { +.items img { max-width:100px } -ul.items > li .label { +.items > li .label { margin-left:10px; padding:0 5px; color:#fff840; @@ -146,70 +207,9 @@ ul.items > li .label { border-radius:.25rem; text-decoration-line:none } -ul.items > li .label:hover { +.items > li .label:hover { color:#fff } -.ddcard,.ddcard-normal { - border:none -} -.ddcard-normal { - padding:0; - box-shadow:1px 0px 5px 5px #f5f5f5 -} -.ddcard-normal ul { - padding:10px -} -.ddcard > .card-header { - padding:0; - background:#fff; - border-bottom:solid 5px #1eb867 -} -.ddcard-normal > .card-header { - padding:10px; - background:#fff; - border-bottom:0 -} -.ddcard-normal > .card-header .caption,.ddcard > .card-header .caption { - font-size:18px; - font-weight:600 -} -.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a { - font-size:14px; - color:#1eb867 -} -.ddcard-normal > .list-group > li i { - color:#1eb867 -} -.ddcard > ul > li,.ddcard > ol > li,.ddcard-normal > ul > li,.ddcard-normal > ol > li { - padding-bottom:10px; - color:#c0c0c0; - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap -} -.ddcard > ul > li:nth-child(1),.ddcard > ol > li:nth-child(1) { - margin-top:10px -} -.ddcard > ul > li:last-child,.ddcard > ol > li:last-child,.ddcard-normal > ul > li:last-child,.ddcard-normal > ol > li:last-child { - padding-bottom:0 -} -.ddcard > .card-header .caption span { - padding:6px 12px; - display:inline-block; - color:#fff; - background:#1eb867; - border-radius:.2rem .2rem 0 0 -} -.title::before { - content:" "; - background:#1eb867; - padding:3px; - margin-right:10px; - border-radius:.2rem -} -.breadcrumb { - margin-bottom:0 -} .article-main h1,.article-main h2,.article-main h3,.article-main h4,.article-main h5,.article-main h6 { margin-bottom:1rem; font-size:24px @@ -318,10 +318,9 @@ ul.items > li .label:hover { font-size:16px; color:#fff; cursor:pointer; - border:none; background:#ec982c; border-radius:.25rem; - outline:0 + border:0 } #btnScrollTop:hover { background:#e77817 diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css index 7feaccdc..c622eadb 100644 --- a/src/static/web/css/user.css +++ b/src/static/web/css/user.css @@ -1,17 +1,11 @@ .login-area { - margin:8rem 0 + margin:6rem 0 } .login-box { - padding:1rem; + padding:1.25rem; width:500px; background:#fff } -.login-box small.des { - color:#b5b5b5 -} -.login-box .licence a { - color:#1eb867 -} #validateimg { border-radius:0 .2rem .2rem 0 } diff --git a/src/system/archive/archives.class.php b/src/system/archive/archives.class.php index be0db62f..ffd018f4 100755 --- a/src/system/archive/archives.class.php +++ b/src/system/archive/archives.class.php @@ -490,7 +490,7 @@ class Archives if ($GLOBALS['cfg_jump_once'] == 'N') { $pageHtml = "\r\n\r\n\r\n".$this->Fields['title']."\r\n"; $pageHtml .= "Fields['redirecturl']."\">\r\n\r\n\r\n"; - $pageHtml .= "现在正在转向：".$this->Fields['title']."，请稍候

\r\n转向文档简介：".$this->Fields['description']."\r\n\r\n\r\n"; + $pageHtml .= "现在正在跳转：".$this->Fields['title']."，请稍候

\r\n跳转文档简介：".$this->Fields['description']."\r\n\r\n\r\n"; echo $pageHtml; } else { header("location:{$this->Fields['redirecturl']}"); @@ -666,8 +666,7 @@ class Archives * 获取上一篇，下一篇链接 * * @access public - * @param string $gtype 获取类型 - * pre:上一篇 preimg:上一篇图片 next:下一篇 nextimg:下一篇图片 + * @param string $gtype pre为上一篇 preimg为上一篇图片 next为下一篇 nextimg为下一篇图片 * @return string */ function GetPreNext($gtype = '') @@ -675,10 +674,10 @@ class Archives $rs = ''; if (count($this->PreNext) < 2) { $aid = $this->ArcID; - $preR = $this->dsql->GetOne("Select id From `#@__arctiny` where id<$aid And arcrank>-1 And typeid='{$this->Fields['typeid']}' order by id desc"); - $nextR = $this->dsql->GetOne("Select id From `#@__arctiny` where id>$aid And arcrank>-1 And typeid='{$this->Fields['typeid']}' order by id asc"); - $next = (is_array($nextR) ? " where arc.id={$nextR['id']} " : ' where 1>2 '); - $pre = (is_array($preR) ? " where arc.id={$preR['id']} " : ' where 1>2 '); + $preR = $this->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id<$aid And arcrank>-1 And typeid='{$this->Fields['typeid']}' ORDER BY id DESC"); + $nextR = $this->dsql->GetOne("SELECT id FROM `#@__arctiny` WHERE id>$aid And arcrank>-1 And typeid='{$this->Fields['typeid']}' ORDER BY id ASC"); + $next = (is_array($nextR) ? " WHERE arc.id={$nextR['id']} " : ' WHERE 1>2 '); + $pre = (is_array($preR) ? " WHERE arc.id={$preR['id']} " : ' WHERE 1>2 '); $query = "SELECT arc.id,arc.title,arc.shorttitle,arc.typeid,arc.ismake,arc.senddate,arc.arcrank,arc.money,arc.filename,arc.litpic,t.typedir,t.typename,t.namerule,t.namerule2,t.ispart,t.moresite,t.siteurl,t.sitepath FROM `#@__archives` arc LEFT JOIN `#@__arctype` t on arc.typeid=t.id "; $nextRow = $this->dsql->GetOne($query.$next); $preRow = $this->dsql->GetOne($query.$pre); @@ -899,12 +898,12 @@ class Archives $revalue = ""; foreach ($this->SplitTitles as $k => $v) { if ($i == 1) { - $revalue .= "$v \r\n"; + $revalue .= "$v\r\n"; } else { if ($pageNo == $i) { $revalue .= " $v \r\n"; } else { - $revalue .= "$v \r\n"; + $revalue .= "$v\r\n"; } } $i++; @@ -948,12 +947,12 @@ class Archives $revalue = ""; foreach ($this->SplitTitles as $k => $v) { if ($i == 1) { - $revalue .= "$v \r\n"; + $revalue .= "$v\r\n"; } else { if ($pageNo == $i) { $revalue .= " $v \r\n"; } else { - $revalue .= "$v \r\n"; + $revalue .= "$v\r\n"; } } $i++; diff --git a/src/system/archive/sglistview.class.php b/src/system/archive/sglistview.class.php index 9ae0ad92..5b0bb68b 100755 --- a/src/system/archive/sglistview.class.php +++ b/src/system/archive/sglistview.class.php @@ -553,7 +553,7 @@ class SgListView $t1 = ExecTime(); $ids = array(); $nordersql = str_replace('.aid', '.id', $ordersql); - $query = "SELECT id From `#@__arctiny` arc WHERE {$this->addSql} $nordersql LIMIT $limitstart,$row"; + $query = "SELECT id FROM `#@__arctiny` arc WHERE {$this->addSql} $nordersql LIMIT $limitstart,$row"; $this->dsql->SetQuery($query); $this->dsql->Execute(); while ($arr = $this->dsql->GetArray()) { diff --git a/src/system/dedevote.class.php b/src/system/dedevote.class.php index 67e64fe8..44cfaf6a 100755 --- a/src/system/dedevote.class.php +++ b/src/system/dedevote.class.php @@ -86,7 +86,6 @@ class DedeVote * 获得项目的投票表单 * * @access public - * @param int $lineheight 行高 * @param string $tablewidth 表格宽度 * @param string $titlebgcolor 标题颜色 * @param string $titlebackgroup 标题背景 @@ -94,12 +93,9 @@ class DedeVote * @param string $itembgcolor 项目背景 * @return string */ - function GetVoteForm($lineheight = 30, $tablewidth = "100%", $titlebgcolor = "#edede2", $titlebackgroup = "", $tablebg = "#ffffff", $itembgcolor = "#ffffff") + function GetVoteForm($tablewidth = "100%", $titlebgcolor = "#edede2", $titlebackgroup = "", $tablebg = "#ffffff", $itembgcolor = "#ffffff") { //省略参数 - if ($lineheight == "") { - $lineheight = 26; - } if ($tablewidth == "") { $tablewidth = "100%"; } @@ -115,23 +111,23 @@ class DedeVote if ($itembgcolor == "") { $itembgcolor = "#ffffff"; } - $items = "\r\n"; + $items = "
\r\n"; $items .= "\r\n"; $items .= "\r\n"; $items .= "\r\n"; $items .= "\r\n"; - $items .= "\r\n"; + $items .= "\r\n"; if ($this->VoteCount > 0) { foreach ($this->VoteNotes as $k => $arr) { if ($this->VoteInfos['ismore'] == 0) { - $items .= "\r\n"; + $items .= "\r\n"; } else { - $items .= "\r\n"; + $items .= "\r\n"; } } - $items .= "\r\n"; } $items .= "\r\n
".$this->VoteInfos['votename']."
".$this->VoteInfos['votename']."
\r\n"; - $items .= "\r\n"; - $items .= "VoteID."');>"; + $items .= "
\r\n"; + $items .= "\r\n"; + $items .= "VoteID."');>"; $items .= "
\r\n"; @@ -227,23 +223,21 @@ class DedeVote * * @access public * @param string $tablewidth 表格宽度 - * @param string $lineheight 行高 * @param string $tablesplit 表格分隔 * @return string */ - function GetVoteResult($tablewidth = "600", $lineheight = "24", $tablesplit = "40%") + function GetVoteResult($tablewidth = "600", $tablesplit = "40%") { $totalcount = $this->VoteInfos['totalcount']; if ($totalcount == 0) { $totalcount = 1; } - $res = "\r\n"; - $res .= "\r\n"; + $res = "
\r\n"; $i = 1; foreach ($this->VoteNotes as $k => $arr) { - $res .= ""; + $res .= ""; $c = $arr['count']; - $res .= "\r\n"; + $res .= "\r\n"; $i++; } $res .= "\r\n"; diff --git a/src/system/helpers/downmix.helper.php b/src/system/helpers/downmix.helper.php index f10ad6ab..0bfcf2f1 100755 --- a/src/system/helpers/downmix.helper.php +++ b/src/system/helpers/downmix.helper.php @@ -80,7 +80,7 @@ if (!function_exists('RndString')) { if ($emname != 'font') { $rnstr = " <$emname class='$rndstyleName'>$rnstr "; } else { - $rnstr = " $rnstr "; + $rnstr = " $rnstr"; } $reString .= $rnstr.$body[$i]; $prepos = $i; diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php index 3514dd41..fb859fe3 100755 --- a/src/system/memberlogin.class.php +++ b/src/system/memberlogin.class.php @@ -46,7 +46,7 @@ function CheckUserID($uid, $msgtitle = '用户名', $ckhas = TRUE) } } else { if (preg_match("/[^0-9a-z@\.-]/i", $ck_uid[$i])) { - return $msgtitle.'不能含有 [@]、[.]、[-]以外的特殊符号'; + return $msgtitle.'不能含有[@]、[.]、[-]以外的特殊符号'; } } } @@ -415,7 +415,6 @@ class MemberLogin return 0; } } - /** * 是否需要验证码 * @@ -427,7 +426,6 @@ class MemberLogin $num = $this->getLoginError($loginuser); return $num >= 3 ? true : false; } - /** * 1分钟以内登录错误的次数 * @@ -464,7 +462,7 @@ class MemberLogin return; } $loginip = GetIP(); - $inquery = "UPDATE `#@__member` SET loginip='$loginip',logintime='" . time() . "',loginerr=loginerr+1 WHERE userid='" . $loginuser . "'"; + $inquery = "UPDATE `#@__member` SET loginip='$loginip',logintime='".time()."',loginerr=loginerr+1 WHERE userid='".$loginuser."'"; $dsql->ExecuteNoneQuery($inquery); } /** @@ -508,15 +506,15 @@ class MemberLogin if ($this->M_Rank == 0) { $sta .= "您目前的身份是：普通会员"; } else { - $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$this->M_Rank."'"); + $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$this->M_Rank."'"); $sta .= "您目前的身份是：".$row['membername']; - $rs = $dsql->GetOne("Select id From `#@__admin` where userid='".$this->M_LoginID."'"); + $rs = $dsql->GetOne("SELECT id FROM `#@__admin` WHERE userid='".$this->M_LoginID."'"); if (!is_array($rs)) { - if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余天数：".$this->M_HasDay."天"; - elseif ($this->M_Rank > 10) $sta .= "会员升级已经到期 "; + if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余".$this->M_HasDay."天"; + elseif ($this->M_Rank > 10) $sta .= "会员已到期"; } } - $sta .= " 拥有金币：{$this->M_Money} 个，积分：{$this->M_Scores}分"; + $sta .= " 积分{$this->M_Scores}分，金币{$this->M_Money}个"; return $sta; } //获取能够发布文档的栏目 diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index d6b1ad6d..2a74873d 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -106,10 +106,10 @@ function CheckCatalog($cid, $msg) */ function AddMyAddon($fid, $filename) { - $cacheFile = DEDEDATA . '/cache/addon-' . session_id() . '.inc'; + $cacheFile = DEDEDATA.'/cache/addon-'.session_id().'.inc'; if (!file_exists($cacheFile)) { $fp = fopen($cacheFile, 'w'); - fwrite($fp, '<' . '?php' . "\r\n"); + fwrite($fp, '<'.'?php'."\r\n"); fwrite($fp, "\$myaddons = array();\r\n"); fwrite($fp, "\$maNum = 0;\r\n"); fclose($fp); @@ -133,7 +133,7 @@ function AddMyAddon($fid, $filename) function ClearMyAddon($aid = 0, $title = '') { global $dsql; - $cacheFile = DEDEDATA . '/cache/addon-' . session_id() . '.inc'; + $cacheFile = DEDEDATA.'/cache/addon-'.session_id().'.inc'; $_SESSION['bigfile_info'] = array(); $_SESSION['file_info'] = array(); if (!file_exists($cacheFile)) { @@ -212,7 +212,7 @@ class userLogin $this->userName = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $username); $this->userPwd = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $userpwd); $pwd = substr(md5($this->userPwd), 5, 20); - $dsql->SetQuery("SELECT admin.*,atype.purviews FROM `#@__admin` admin LEFT JOIN `#@__admintype` atype ON atype.`rank`=admin.usertype WHERE admin.userid LIKE '" . $this->userName . "' LIMIT 0,1"); + $dsql->SetQuery("SELECT admin.*,atype.purviews FROM `#@__admin` admin LEFT JOIN `#@__admintype` atype ON atype.`rank`=admin.usertype WHERE admin.userid LIKE '".$this->userName."' LIMIT 0,1"); $dsql->Execute(); $row = $dsql->GetObject(); if (!isset($row->pwd)) { @@ -236,9 +236,9 @@ class userLogin $this->userChannel = $row->typeid; $this->userName = $row->uname; $this->userPurview = $row->purviews; - $inquery = "UPDATE `#@__admin` SET loginip='$loginip',logintime='" . time() . "'{$upsql},loginerr=0 WHERE id='" . $row->id . "'"; + $inquery = "UPDATE `#@__admin` SET loginip='$loginip',logintime='".time()."'{$upsql},loginerr=0 WHERE id='".$row->id."'"; $dsql->ExecuteNoneQuery($inquery); - $sql = "UPDATE `#@__member` SET logintime=" . time() . ", loginip='$loginip' WHERE mid=" . $row->id; + $sql = "UPDATE `#@__member` SET logintime=".time().", loginip='$loginip' WHERE mid=".$row->id; $dsql->ExecuteNoneQuery($sql); return 1; } @@ -285,7 +285,7 @@ class userLogin { global $dsql; $loginip = GetIP(); - $inquery = "UPDATE `#@__admin` SET loginip='$loginip',logintime='" . time() . "',loginerr=loginerr+1 WHERE id='" . $adminid . "'"; + $inquery = "UPDATE `#@__admin` SET loginip='$loginip',logintime='".time()."',loginerr=loginerr+1 WHERE id='".$adminid."'"; $dsql->ExecuteNoneQuery($inquery); } /** @@ -328,7 +328,7 @@ class userLogin function ReWriteAdminChannel() { //$this->userChannel - $cacheFile = DEDEDATA . '/cache/admincat_' . $this->userID . '.inc'; + $cacheFile = DEDEDATA.'/cache/admincat_'.$this->userID.'.inc'; //管理员管理的栏目列表 $typeid = trim($this->userChannel); if (empty($typeid) || $this->getUserType() >= 10) { @@ -343,7 +343,7 @@ class userLogin $typeids = explode(',', $typeid); $typeid = ''; foreach ($typeids as $tid) { - $typeid .= ($typeid == '' ? GetSonIdsUL($tid) : ',' . GetSonIdsUL($tid)); + $typeid .= ($typeid == '' ? GetSonIdsUL($tid) : ','.GetSonIdsUL($tid)); } $typeids = explode(',', $typeid); $typeidsnew = array_unique($typeids); diff --git a/src/theme/dedebiz/advancedsearch.htm b/src/theme/dedebiz/advancedsearch.htm index 1396544f..3c4bed13 100644 --- a/src/theme/dedebiz/advancedsearch.htm +++ b/src/theme/dedebiz/advancedsearch.htm @@ -32,8 +32,7 @@
{dede:pagelist listsize='6'/}
-
{dede:global.cfg_powerby/} {dede:global.cfg_beian/} Powered by DedeBIZ开发团队 -
+
{dede:global.cfg_powerby/} {dede:global.cfg_beian/} Powered by DedeBIZ开发团队
\ No newline at end of file diff --git a/src/theme/dedebiz/article_article.htm b/src/theme/dedebiz/article_article.htm index 06dab109..346a6de6 100644 --- a/src/theme/dedebiz/article_article.htm +++ b/src/theme/dedebiz/article_article.htm @@ -57,10 +57,10 @@
@@ -69,9 +69,17 @@ {dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
+
+
+ +
+ + +
+ +
{dede:include comment='推荐文档' filename='widget_recommend.htm'/} {dede:include comment='热点文档' filename='widget_hot.htm'/} - {dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
diff --git a/src/theme/dedebiz/article_default.htm b/src/theme/dedebiz/article_default.htm index 48369def..1206e750 100644 --- a/src/theme/dedebiz/article_default.htm +++ b/src/theme/dedebiz/article_default.htm @@ -51,7 +51,7 @@
".$i."、".$arr['name']."
".$i."、".$arr['name']."
- [field:name/] 文档：
+ [field:name/]文档：
模板调用标记：