From d8252d6e748a80fd449fb9558a453345d011f0b1 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Fri, 25 Feb 2022 15:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/archives_do.php | 20 +++--- src/admin/article_template_rand.php | 2 +- src/admin/css/base.css | 2 +- src/admin/dialog/select_mimages.php | 2 +- src/admin/dialog/select_soft.php | 8 +-- src/admin/index_body.php | 2 +- src/admin/mda_main.php | 6 +- src/admin/member_pm.php | 2 +- src/admin/module_main.php | 58 ++++++++-------- src/admin/module_upload.php | 4 +- src/admin/sys_admin_user_tj.php | 4 +- src/admin/sys_repair.php | 2 +- src/admin/sys_safetest.php | 4 +- src/admin/templets/ad_add.htm | 1 - src/admin/templets/ad_edit.htm | 1 - src/admin/templets/ad_main.htm | 1 - src/admin/templets/article_coonepage_rule.htm | 1 - .../templets/article_description_main.htm | 1 - src/admin/templets/article_keywords_main.htm | 1 - src/admin/templets/article_test_same.htm | 1 - src/admin/templets/baidunews.htm | 1 - src/admin/templets/cards_make.htm | 1 - src/admin/templets/cards_manmage.htm | 1 - src/admin/templets/cards_type.htm | 1 - src/admin/templets/catalog_add_quick.htm | 1 - src/admin/templets/content_att.htm | 1 - src/admin/templets/content_batch_up.htm | 1 - src/admin/templets/content_i_list.htm | 3 +- src/admin/templets/content_s_list.htm | 1 - src/admin/templets/content_select_list.htm | 1 - src/admin/templets/content_sg_list.htm | 1 - src/admin/templets/diy_add.htm | 1 - src/admin/templets/diy_edit.htm | 1 - src/admin/templets/erradd.htm | 1 - src/admin/templets/feedback_main.htm | 1 - src/admin/templets/file_edit.htm | 2 +- src/admin/templets/file_manage_main.htm | 30 ++++---- src/admin/templets/freelist_add.htm | 1 - src/admin/templets/freelist_edit.htm | 1 - src/admin/templets/freelist_main.htm | 1 - src/admin/templets/friendlink_edit.htm | 1 - src/admin/templets/friendlink_main.htm | 1 - src/admin/templets/log_list.htm | 1 - src/admin/templets/makehtml_archives.htm | 1 - src/admin/templets/makehtml_freelist.htm | 1 - src/admin/templets/makehtml_js.htm | 1 - src/admin/templets/makehtml_list.htm | 1 - src/admin/templets/makehtml_map_guide.htm | 1 - src/admin/templets/makehtml_rss.htm | 1 - src/admin/templets/makehtml_spec.htm | 1 - src/admin/templets/makehtml_taglist.htm | 1 - src/admin/templets/media_add.htm | 1 - src/admin/templets/media_edit.htm | 1 - src/admin/templets/media_main.htm | 1 - src/admin/templets/member_main.htm | 5 +- src/admin/templets/member_operations.htm | 1 - src/admin/templets/member_pm.htm | 1 - src/admin/templets/member_rank.htm | 3 +- src/admin/templets/member_toadmin.htm | 5 +- src/admin/templets/member_type.htm | 1 - src/admin/templets/module_make.htm | 1 - src/admin/templets/mychannel_add.htm | 1 - src/admin/templets/mychannel_edit.htm | 1 - src/admin/templets/mychannel_field_edit.htm | 1 - src/admin/templets/mychannel_main.htm | 1 - src/admin/templets/mychannel_modifysearch.htm | 1 - src/admin/templets/mytag_add.htm | 1 - src/admin/templets/mytag_main.htm | 1 - src/admin/templets/mytag_tag_guide.htm | 1 - src/admin/templets/plus_main.htm | 1 - src/admin/templets/recycling.htm | 1 - src/admin/templets/shops_operations.htm | 1 - src/admin/templets/soft_config.htm | 1 - src/admin/templets/spec_add.htm | 1 - src/admin/templets/spec_edit.htm | 1 - src/admin/templets/stepselect_main.htm | 1 - src/admin/templets/sys_admin_user.htm | 1 - src/admin/templets/sys_admin_user_add.htm | 3 +- src/admin/templets/sys_admin_user_edit.htm | 3 +- src/admin/templets/sys_cache_up.htm | 1 - src/admin/templets/sys_data.htm | 1 - src/admin/templets/sys_data_revert.htm | 1 - src/admin/templets/sys_group.htm | 1 - src/admin/templets/sys_group_add.htm | 3 +- src/admin/templets/sys_group_edit.htm | 1 - src/admin/templets/sys_info_mark.htm | 1 - src/admin/templets/sys_safetest.htm | 1 - src/admin/templets/sys_sql_query.htm | 1 - src/admin/templets/tag_test.htm | 1 - src/admin/templets/templets_one.htm | 1 - src/admin/templets/templets_one_add.htm | 1 - src/admin/templets/templets_tagsource.htm | 1 - src/admin/templets/tpl_edit.htm | 2 +- src/admin/templets/tpl_edit_tag.htm | 2 +- src/admin/templets/vote_add.htm | 1 - src/admin/templets/vote_edit.htm | 1 - src/admin/templets/vote_getcode.htm | 1 - src/admin/templets/vote_main.htm | 3 +- src/admin/templets/winmode.htm | 1 - src/admin/testenv.php | 21 +++--- src/include/arc.freelist.class.php | 1 - src/include/arc.listview.class.php | 2 - src/include/arc.searchview.class.php | 2 +- src/include/arc.sglistview.class.php | 1 - src/include/arc.specview.class.php | 1 - src/include/arc.taglist.class.php | 1 - src/include/autoload.inc.php | 1 - src/include/autoload7.inc.php | 1 - src/include/channelunit.func.php | 1 - src/include/charset.func.php | 7 +- src/include/cli.class.php | 13 ++-- src/include/common.func.php | 1 - src/include/common.inc.php | 3 - src/include/datalistcp.class.php | 1 - src/include/dedebiz.class.php | 16 ++--- src/include/dedecollection.func.php | 1 - src/include/dedesqli.class.php | 6 +- src/include/dedesqlite.class.php | 69 ++++++++----------- src/include/dedetag.class.php | 5 +- src/include/dedetemplate.class.php | 1 - src/include/diyform.cls.php | 1 - src/include/downmix.inc.php | 4 +- src/include/enums.func.php | 3 +- src/include/filter.inc.php | 1 - src/include/helpers/archive.helper.php | 1 - src/include/helpers/channelunit.helper.php | 1 - src/include/helpers/charset.helper.php | 1 - src/include/helpers/cookie.helper.php | 1 - src/include/helpers/debug.helper.php | 1 - src/include/helpers/extend.helper.php | 1 - src/include/helpers/file.helper.php | 1 - src/include/helpers/filter.helper.php | 1 - src/include/helpers/image.helper.php | 2 +- src/include/helpers/test.helper.php | 1 - src/include/helpers/time.helper.php | 1 - src/include/helpers/upload.helper.php | 1 - src/include/helpers/util.helper.php | 1 - src/include/helpers/validate.helper.php | 1 - src/include/image.func.php | 1 - src/include/mail.class.php | 3 +- src/include/memberlogin.class.php | 7 +- src/include/payment/alipay.php | 20 +++--- src/include/payment/yeepay.php | 12 ++-- src/include/qrcode.class.php | 1 - src/include/request.class.php | 3 +- src/include/shopcar.class.php | 4 +- src/include/sitemap.class.php | 1 - src/include/splitword.class.php | 2 - src/include/taglib/arclistsg.lib.php | 1 - src/include/taglib/channel.lib.php | 1 - src/include/taglib/channel/img.lib.php | 5 +- src/include/taglib/channel/softlinks.lib.php | 1 - .../taglib/channel/specialtopic.lib.php | 1 - src/include/taglib/comment.lib.php | 1 - src/include/taglib/hotwords.lib.php | 1 - src/include/taglib/likepage.lib.php | 1 - src/include/taglib/mynews.lib.php | 1 - src/include/taglib/productimagelist.lib.php | 2 +- src/include/taglib/sonchannel.lib.php | 1 - src/include/taglib/sql.lib.php | 1 - src/include/taglib/tag.lib.php | 1 - src/include/taglib/vote.lib.php | 1 - src/include/tpllib/plus_channel.php | 1 - src/include/typeunit.class.admin.php | 1 - src/include/zip.class.php | 1 - src/member/album_add.php | 2 +- src/member/archives_add.php | 2 +- src/member/archives_sg_add.php | 4 +- src/member/article_add.php | 2 +- src/member/buy_action.php | 2 +- src/member/config.php | 11 ++- src/member/inc/archives_check.php | 2 +- src/member/inc/config_pay_alipay.php | 2 +- src/member/inc/config_pay_cbpayment.php | 2 +- src/member/inc/config_pay_nps.php | 2 +- src/member/inc/config_pay_tenpay.php | 2 +- src/member/inc/config_pay_yeepay.php | 2 +- src/member/inc/inc_batchup.php | 3 +- src/member/inc/inc_catalog_options.php | 2 +- src/member/inc/inc_list_functions.php | 3 +- src/member/inc/inc_pwd_functions.php | 3 +- src/member/index_do.php | 12 ++-- src/member/reg_new.php | 2 +- src/member/soft_add.php | 2 +- src/member/templets/pm-main.htm | 2 +- src/member/templets/top_login.htm | 2 +- src/plus/carbuyaction.php | 4 +- src/static/ckeditor/config.js | 2 - src/static/img/base.css | 2 +- src/templets/plus/car.htm | 1 - src/templets/plus/carbuyaction.htm | 1 - src/templets/plus/heightsearch.htm | 1 - src/templets/plus/recommend.htm | 1 - src/templets/plus/view_msg.htm | 1 - src/templets/plus/vote.htm | 1 - src/templets/system/custom_fields_admin.htm | 2 +- 196 files changed, 217 insertions(+), 374 deletions(-) diff --git a/src/admin/archives_do.php b/src/admin/archives_do.php index e86b30d7..a11540fd 100644 --- a/src/admin/archives_do.php +++ b/src/admin/archives_do.php @@ -316,11 +316,11 @@ else if ($dopost == 'moveArchives') { echo ""; echo ""; ?> - + - +
 目标栏目：
 文档ID： @@ -521,7 +521,7 @@ else if ($dopost == 'quickEdit') { echo ""; echo ""; ?> - + - + - + - + - + - + @@ -838,7 +838,7 @@ else if ($dopost == 'attsDlg') { echo ""; echo "
 所属栏目：
 属性： '> @@ -550,15 +550,15 @@ else if ($dopost == 'quickEdit') { ?>
 标题：
 简略标题：
 阅读权限： " style="width:100px">
 关键字：
"; ?> - + - + diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php index 6a14646d..b82681ba 100644 --- a/src/admin/article_template_rand.php +++ b/src/admin/article_template_rand.php @@ -95,7 +95,7 @@ function DoRand(jobname)
 属性： '> @@ -852,7 +852,7 @@ else if ($dopost == 'attsDlg') { ?>
 文档ID：
- + $line = "\r\n"; @@ -128,7 +128,7 @@ table{background:#fff} } else if (is_dir("$inpath/$file")) { if (preg_match("#^_(.*)$#i", $file)) continue; if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " + $line = " @@ -140,7 +140,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " @@ -152,7 +152,7 @@ table{background:#fff} $reurl = "$activeurl/$file"; $reurl = preg_replace("#^\.\.#", "", $reurl); $reurl = $reurl; - $line = " + $line = " diff --git a/src/admin/index_body.php b/src/admin/index_body.php index cfb4b4cc..a47d122f 100644 --- a/src/admin/index_body.php +++ b/src/admin/index_body.php @@ -92,7 +92,7 @@ else if ($dopost == 'editshow') {
+ 如果您想对旧的文章应用随机模板设置，请点击此对旧文章进行处理(必须设置好模板项)   设置全部   取消全部 diff --git a/src/admin/css/base.css b/src/admin/css/base.css index f0db35d6..08b419b1 100644 --- a/src/admin/css/base.css +++ b/src/admin/css/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#dc3545color:#dc3545;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:color:#dc3545;box-shadow:0 0 2px color:#dc3545;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#dc3545color:#dc3545}a.btn{color:white!important}.btn-success{background:#dc3545color:#dc3545;border-color:color:#dc3545}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.np{border:0}.linerow{border-bottom:1px solid #ACACAC}.coolbg{padding:.25rem .5rem;background:#f2f2f2;border-bottom:1px solid #ccc;border-radius:.2rem;border:0;cursor:pointer}.coolbg2{height:18px;background:#DFDDD2;border:1px solid #000}.ll{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background:#E6E6E6}.bline{height:36px;background:#fff;border-bottom:1px solid #eee}#uploadfield{float:left}.bline2{border-bottom:1px solid #eee}.coolbt{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#E4F7D7;cursor:pointer}.coolbt2{border-left:1px solid #EFEFEF;border-top:1px solid #EFEFEF;border-bottom:1px solid #ACACAC;background:#F7FCDA}.coolbg3{width:140px;height:20px;border:1px solid #BDC5B4;background:#DFDDD2;text-align:right}.coolbg61{width:380px;height:26px;line-height:26px;border-top:1px solid #BDC5B4;border-left:1px solid #BDC5B4;border-right:1px solid #BDC5B4;background:#E7F3B1;text-align:right}.coolbg62{padding:6px;width:380px;height:300px;border:1px solid #BDC5B4;background:#F8FDF0}.coolbg4{width:190px;height:24px;line-height:24px;border-bottom:1px solid #C9CFC1;background:#F9FCDC url(../images/dlgtitle.gif)repeat-x;text-align:right}.coolbg5{width:190px;height:6px;border-top:1px solid #BDC5B4;background:#F9FCDC}.wsselect{height:60px;line-height:24px;background:#FCFEF1;overflow:auto}.dlg{padding:.25rem .5rem;border:2px solid #008E38;background:#F0FAEB;width:360px;line-height:160%}.pubdlg{background:#fff;border:4px solid #008E38;border-radius:.2rem;z-index:8888}.pubdlg .title{height:29px;line-height:29px;border-bottom:1px solid #C9CFC1;background:url(../images/dlgtitle.gif)repeat-x;text-align:left;cursor:move}.pubdlg .titLeft{float:left;padding-left:10px;line-height:29px;font-weight:600;color:#424b51}.pubdlg .titRight{float:right;padding:0}.fullpagediv{position:absolute;top:0;left:0;width:100%;height:120%;background:#cdcdcd;opacity:.5;z-index:1999}.quicksel{margin-left:10px;margin-top:10px;width:680px;height:420px;overflow:auto;z-index:10005}.quickselfoot{padding-top:8px;border-top:1px dashed #C0CC9D}.quickselItem{margin-bottom:8px}.quickselItem .topcat{padding-left:6px;line-height:24px;border-bottom:1px dashed #ccc;background:#FBFEEF;clear:both}.quickselItem .soncat{padding-left:10px}.quickselItem .item{float:left;margin-right:8px}.mysource,.mywriter{padding:.25rem .5rem;width:280px;line-height:160%;border:4px solid #008E38;background:#F0FAEB;z-index:10001}.dlgws div{width:100%}.dlgTesttitle{padding:.25rem .5rem;width:300px;line-height:150%;border:2px solid #008E38;background:#F0FAEB}#_mysource{z-index:10003}#_mywriter{z-index:10004}#uploadwait{z-index:19999}.option1{background:#DCECA6}.option2{background:#F7FBD2}.option3{background:#fff}.ininput{width:96%;height:20px;border:1px solid #fff}.nbt{padding:2px;background:#fff url(../images/allbtbg.gif);border:1px solid #A5AF83}.tdt{padding-left:6px}.waitpage{position:absolute;top:0;left:0;opacity:.7;background:#ababab url(../../images/loading1.gif)center no-repeat;z-index:10000}.divpre img{max-width:150px;max-height:100px}.divpre{overflow:hidden}.autoinput{padding-left:6px;width:90%}.bodytitle{margin:auto;width:98%;height:30px;border:1px dotted #BFD67C;background:url(../images/wbg.gif)}.bodytitle div{float:left}.bodytitletxt{padding-left:6px;line-height:28px}.tbtitle td{padding:6px}.tblist td{padding:6px;background:#fff}.tblist td.tbsname{padding:6px;background:#F9FFE6}.colordlg{padding:.25rem .5rem;width:100px;line-height:160%;border:2px dashed #008E38;background:#F0FAEB;z-index:10005}option.alltype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.btype{padding-left:16px;height:18px;line-height:18px;background:url(../images/arr4.gif)3px 4px no-repeat}option.stype{padding-left:26px;height:18px;line-height:18px;background:url(../images/arrr.gif)10px 4px no-repeat}.ilist{border-top:1px dashed #eee;border-bottom:1px dashed #eee;border-left:1px dashed #eee}.ilist td{border-right:1px dashed #eee}#typeid2{padding:0;float:left;height:18px;font-size:12px;background:url(../images/typeid2bg.gif)no-repeat;border:0}#litpic{margin-left:-20px;width:85px;height:20px;opacity:0;cursor:pointer}.litpic_span{margin-left:-60px;width:76px;height:22px;overflow:hidden;cursor:pointer}#starttime,#endtime,#pubdate,#uptime{padding-left:30px;background:url(../images/calendar.gif)10px no-repeat}#title{background:url(../images/ruler.gif)repeat-x 0px 10px}.spec{width:60px}.gtab a{display:block;float:left;width:80px;height:26px;line-height:26px;text-align:center}.albCt img{cursor:pointer}.maintable{width:98%!important;border:1px solid #dee2e6}span.page-link{color:#fff;background:#28a745}a.btn{color:white!important}.btn-success{background:#28a745;border-color:#28a745}.table{color:#424b51}.table td,.table th{padding:.6rem;vertical-align:middle}.table th img,.table td img{vertical-align:text-bottom} \ No newline at end of file diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 81de57d9..6ddbf59e 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -18,7 +18,7 @@ ul{margin:0;padding:0;list-style:none} button+button{margin-left:10px} #wrap{padding:10px} #topbar{padding:10px 0;border-bottom:1px solid #ccc;text-align:right} -#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#dc3545color:#dc3545;border-color:color:#dc3545;border-radius:.25rem;transition:all .6s;text-align:center} +#topbar button{display:inline-block;border:0;padding:.25rem .5rem;line-height:1.5;font-size:12px;color:#fff;background:#28a745;border-color:#28a745;border-radius:.25rem;transition:all .6s;text-align:center} .topbar button+.topbar button{margin-left:10px} #topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none} #file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px} diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 07c7e866..355a31f9 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -120,7 +120,7 @@ table{background:#fff} else if ($file == "..") { if ($activepath == "") continue; $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); - $line = "
上级目录 当前目录：$activepath
$file
$file $filesize KB $filetime
$file $filesize KB $filetime
-
+
修改快捷操作项
diff --git a/src/admin/mda_main.php b/src/admin/mda_main.php index 9abf7897..19f104e5 100644 --- a/src/admin/mda_main.php +++ b/src/admin/mda_main.php @@ -120,7 +120,7 @@ if ($dopost == 'place' or $dopost == 'report' or $dopost == 'account' or $dopost
- + {$addstr} @@ -367,7 +367,7 @@ function __index(){ }
{$ptitle}{$ptitle}
- +
德得广告德得广告
@@ -412,7 +412,7 @@ function __index(){ }
- + diff --git a/src/admin/member_pm.php b/src/admin/member_pm.php index e106187d..4c3c7aba 100644 --- a/src/admin/member_pm.php +++ b/src/admin/member_pm.php @@ -55,6 +55,6 @@ function GetFolders($me) function IsReader($me) { $me = preg_replace("#[^0-1]#", "", $me); - if ($me) return "√"; + if ($me) return "√"; else return "×"; } diff --git a/src/admin/module_main.php b/src/admin/module_main.php index ee442660..b8769004 100644 --- a/src/admin/module_main.php +++ b/src/admin/module_main.php @@ -155,27 +155,27 @@ else if ($action == 'setup') { $msg = "
- + - + - + - + - + - + @@ -197,7 +197,7 @@ else if ($action == 'setup') { - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$infos['dev_id']} 未认证
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
对于已存在文件处理方法：对于已存在文件处理方法： @@ -290,31 +290,31 @@ else if ($action == 'del') { $msg = " - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除。删除模块仅删除这个模块的安装包文件，如果您已经安装，请执行卸载程序来删除。
"; $win->AddMsgItem("
$msg
"); @@ -355,31 +355,31 @@ else if ($action == 'uninstall') { $msg = " - + - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
模块包含的文件：
（文件路径相对于当前目录）		 模块包含的文件：
（文件路径相对于当前目录）		 
@@ -387,7 +387,7 @@ else if ($action == 'uninstall') {
对于模块的文件处理方法：对于模块的文件处理方法： @@ -485,31 +485,31 @@ else if ($action == 'view') { $msg = " - + - + - + - + - + - + - +
模块名称：模块名称： {$infos['name']}
语言：语言： {$infos['lang']} {$alertMsg}
文件大小：文件大小： {$infos['filesize']}
开发者ID：开发者ID： {$dev_id}
发布时间：发布时间： {$infos['time']}
使用协议：使用协议： 浏览
模块包含的文件：
（文件路径相对于当前目录）		 模块包含的文件：
（文件路径相对于当前目录）		 
diff --git a/src/admin/module_upload.php b/src/admin/module_upload.php index d3e7520f..36a0f230 100644 --- a/src/admin/module_upload.php +++ b/src/admin/module_upload.php @@ -81,13 +81,13 @@ if ($action == 'upload') { $win->AddHidden("action", 'upload'); $msg = " - + - + diff --git a/src/admin/sys_admin_user_tj.php b/src/admin/sys_admin_user_tj.php index 526a875b..5412fd98 100644 --- a/src/admin/sys_admin_user_tj.php +++ b/src/admin/sys_admin_user_tj.php @@ -102,7 +102,7 @@ if (isset($dopost) && $dopost == 'getone') { $msg = "
文件格式：文件格式：
已有模块：已有模块：
- + @@ -110,7 +110,7 @@ if (isset($dopost) && $dopost == 'getone') { - + diff --git a/src/admin/sys_repair.php b/src/admin/sys_repair.php index b9e5b3ce..966d38bf 100644 --- a/src/admin/sys_repair.php +++ b/src/admin/sys_repair.php @@ -56,7 +56,7 @@ function 1_test_db() { }
管理员↓|统计信息→管理员↓|统计信息→ 全部(文档|点击) 季度 当月当天
{$userid}{$userid} {$dd} | {$cc} {$dds} | {$ccs} {$ddm} | {$ccm}
- 已完成数据结构完整性检测 + 已完成数据结构完整性检测

如果您系统有下面几种问题之一，请检测微表正确性：
diff --git a/src/admin/sys_safetest.php b/src/admin/sys_safetest.php index 11f72219..3ade9fa5 100644 --- a/src/admin/sys_safetest.php +++ b/src/admin/sys_safetest.php @@ -90,7 +90,7 @@ if ($action == 'test') { AjaxHead(); TestSafe(DEDEROOT); - if ($message == '') $message = "没发现可疑文件"; + if ($message == '') $message = "没发现可疑文件"; echo $message; exit(); } else if ($action == 'viewdiff') { @@ -131,7 +131,7 @@ else if ($action == 'clear') { @unlink($d.'/'.$filename); } } - $message = "成功清空模板缓存"; + $message = "成功清空模板缓存"; echo $message; exit(); } diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index ed80f164..7b99d932 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -79,7 +79,6 @@ } -
diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 1886ede1..f9fdbaff 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -43,7 +43,6 @@ }) -
diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index d4aeeb44..3014f9ad 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -8,7 +8,6 @@ -
diff --git a/src/admin/templets/article_coonepage_rule.htm b/src/admin/templets/article_coonepage_rule.htm index 4494d4a5..6103380b 100644 --- a/src/admin/templets/article_coonepage_rule.htm +++ b/src/admin/templets/article_coonepage_rule.htm @@ -92,7 +92,6 @@ } -
diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index c5447ffc..e046b3ec 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index a26c5cac..765d192f 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -25,7 +25,6 @@ } -
-
diff --git a/src/admin/templets/baidunews.htm b/src/admin/templets/baidunews.htm index a8bc4a3c..2269815f 100644 --- a/src/admin/templets/baidunews.htm +++ b/src/admin/templets/baidunews.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/cards_make.htm b/src/admin/templets/cards_make.htm index 7a5c233c..18bd80c5 100644 --- a/src/admin/templets/cards_make.htm +++ b/src/admin/templets/cards_make.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/cards_manmage.htm b/src/admin/templets/cards_manmage.htm index 9400448f..f88a3a81 100644 --- a/src/admin/templets/cards_manmage.htm +++ b/src/admin/templets/cards_manmage.htm @@ -37,7 +37,6 @@ } -
diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index c362c083..0df8f1c0 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 751af187..d882b223 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -82,7 +82,6 @@ } - diff --git a/src/admin/templets/content_att.htm b/src/admin/templets/content_att.htm index d6e39a53..30c4d0e2 100644 --- a/src/admin/templets/content_att.htm +++ b/src/admin/templets/content_att.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/content_batch_up.htm b/src/admin/templets/content_batch_up.htm index a5b57ff3..d7300876 100644 --- a/src/admin/templets/content_batch_up.htm +++ b/src/admin/templets/content_batch_up.htm @@ -57,7 +57,6 @@ }) -
diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index c0687266..245cd3c6 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -15,7 +15,6 @@ -
@@ -45,7 +44,7 @@
- + diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index 3ceee5f2..21a240f8 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -107,7 +107,6 @@ } -
{dede:global.positionname/}文档列表  (使用鼠标右键进行常用操作)
diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index 71ed6992..05882043 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -46,7 +46,6 @@ } -
diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index c5ddabff..d8462d43 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -157,7 +157,6 @@ } -
diff --git a/src/admin/templets/diy_add.htm b/src/admin/templets/diy_add.htm index 61ef90ef..86b207ae 100644 --- a/src/admin/templets/diy_add.htm +++ b/src/admin/templets/diy_add.htm @@ -36,7 +36,6 @@ } -
diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 7d99acbd..21ac7dc2 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -41,7 +41,6 @@ } -
diff --git a/src/admin/templets/erradd.htm b/src/admin/templets/erradd.htm index 38e226da..60cfc8e5 100644 --- a/src/admin/templets/erradd.htm +++ b/src/admin/templets/erradd.htm @@ -8,7 +8,6 @@ - -
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index b8badfeb..53129a9b 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -54,7 +54,6 @@ -
diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm index 53f623f7..4851b176 100644 --- a/src/admin/templets/freelist_main.htm +++ b/src/admin/templets/freelist_main.htm @@ -90,7 +90,6 @@ } -
diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index 44757e1e..d43700f3 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 8a6ac1a2..5916cb31 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -35,7 +35,6 @@ } -
diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index 5eb06116..ed8c0a49 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -45,7 +45,6 @@ -
diff --git a/src/admin/templets/makehtml_archives.htm b/src/admin/templets/makehtml_archives.htm index 0a9d0604..56269616 100644 --- a/src/admin/templets/makehtml_archives.htm +++ b/src/admin/templets/makehtml_archives.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_freelist.htm b/src/admin/templets/makehtml_freelist.htm index 935d25a8..6dd4a0a6 100644 --- a/src/admin/templets/makehtml_freelist.htm +++ b/src/admin/templets/makehtml_freelist.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_js.htm b/src/admin/templets/makehtml_js.htm index 73f0f724..5b9f28e7 100644 --- a/src/admin/templets/makehtml_js.htm +++ b/src/admin/templets/makehtml_js.htm @@ -20,7 +20,6 @@ } -
diff --git a/src/admin/templets/makehtml_list.htm b/src/admin/templets/makehtml_list.htm index 76bcd749..faa26908 100644 --- a/src/admin/templets/makehtml_list.htm +++ b/src/admin/templets/makehtml_list.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_map_guide.htm b/src/admin/templets/makehtml_map_guide.htm index 750389de..cd4f62c6 100644 --- a/src/admin/templets/makehtml_map_guide.htm +++ b/src/admin/templets/makehtml_map_guide.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_rss.htm b/src/admin/templets/makehtml_rss.htm index 90d1b745..2629905c 100644 --- a/src/admin/templets/makehtml_rss.htm +++ b/src/admin/templets/makehtml_rss.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_spec.htm b/src/admin/templets/makehtml_spec.htm index 3c8cd5c1..93af837b 100644 --- a/src/admin/templets/makehtml_spec.htm +++ b/src/admin/templets/makehtml_spec.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/makehtml_taglist.htm b/src/admin/templets/makehtml_taglist.htm index 9e74f859..19182b03 100644 --- a/src/admin/templets/makehtml_taglist.htm +++ b/src/admin/templets/makehtml_taglist.htm @@ -6,7 +6,6 @@ -
diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm index fd850d12..047782b8 100644 --- a/src/admin/templets/media_add.htm +++ b/src/admin/templets/media_add.htm @@ -45,7 +45,6 @@ } -
diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm index c46cb797..ab743228 100644 --- a/src/admin/templets/media_edit.htm +++ b/src/admin/templets/media_edit.htm @@ -26,7 +26,6 @@ } -
diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index 417cf9d2..207b3fb3 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -55,7 +55,6 @@ } -
@@ -106,8 +105,8 @@
(禁言)"; - if($fields['spacesta']==-1) echo "(未审核)"; + if($fields['spacesta']==-2) echo "(禁言)"; + if($fields['spacesta']==-1) echo "(未审核)"; if(!empty($fields['face'])) { echo "
浏览会员空间"; } diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index b3d96f03..111f83cb 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -53,7 +53,6 @@ } - diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm index c5a9f80e..4bc37405 100644 --- a/src/admin/templets/member_pm.htm +++ b/src/admin/templets/member_pm.htm @@ -24,7 +24,6 @@ } -
diff --git a/src/admin/templets/member_rank.htm b/src/admin/templets/member_rank.htm index fb53eb22..8a69c326 100644 --- a/src/admin/templets/member_rank.htm +++ b/src/admin/templets/member_rank.htm @@ -7,7 +7,6 @@ - @@ -57,7 +56,7 @@ ?>
- diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index d5707c73..c51b7d6d 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -25,7 +25,6 @@ } -
新增一个级别：(由于会员升级是以级别值由低向高升级的，因此增加组别时需注意此值的设置， + 新增一个级别：(由于会员升级是以级别值由低向高升级的，因此增加组别时需注意此值的设置， 如果您增加新的会员组的级别值低于10，将自动被视为普通的注册会员。)
@@ -36,7 +35,7 @@
已经是管理员了，不要再提升了"; + echo "已经是管理员了，不要再提升了"; }else{ ?> @@ -106,7 +105,7 @@ + (复制本代码： ) diff --git a/src/admin/templets/member_type.htm b/src/admin/templets/member_type.htm index 7b3d03ca..d1f84965 100644 --- a/src/admin/templets/member_type.htm +++ b/src/admin/templets/member_type.htm @@ -7,7 +7,6 @@ -
  - (复制本代码： )
 
diff --git a/src/admin/templets/module_make.htm b/src/admin/templets/module_make.htm index 86e7ce7d..c64d8801 100644 --- a/src/admin/templets/module_make.htm +++ b/src/admin/templets/module_make.htm @@ -35,7 +35,6 @@ } -
diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index 8896f1b4..ed02f7a0 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -44,7 +44,6 @@ -
diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 00954a35..e7c9d790 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -51,7 +51,6 @@ - diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index 2b1589fd..f0273d60 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -87,7 +87,6 @@ } -
diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 3833c3c2..2e6f26f6 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -8,7 +8,6 @@ -
diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm index f0dec88e..c3eea14f 100644 --- a/src/admin/templets/mychannel_modifysearch.htm +++ b/src/admin/templets/mychannel_modifysearch.htm @@ -24,7 +24,6 @@ } -
diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index 35357b37..971bbb05 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -53,7 +53,6 @@ }) -
diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index 99ea593f..02b01238 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -8,7 +8,6 @@ -
diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm index 18840070..a4c63b5b 100644 --- a/src/admin/templets/mytag_tag_guide.htm +++ b/src/admin/templets/mytag_tag_guide.htm @@ -13,7 +13,6 @@ -
diff --git a/src/admin/templets/recycling.htm b/src/admin/templets/recycling.htm index 1180d96c..e738a3b2 100644 --- a/src/admin/templets/recycling.htm +++ b/src/admin/templets/recycling.htm @@ -65,7 +65,6 @@ } -
diff --git a/src/admin/templets/shops_operations.htm b/src/admin/templets/shops_operations.htm index 43c69210..ebc0df92 100644 --- a/src/admin/templets/shops_operations.htm +++ b/src/admin/templets/shops_operations.htm @@ -64,7 +64,6 @@ } -
diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index d75f9344..930a224b 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -18,7 +18,6 @@ } -
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 0d102ac6..480dd260 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -75,7 +75,6 @@ } - diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index a6f89af3..35a2f8bf 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -80,7 +80,6 @@ } - diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index e086f694..9aea36ec 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -142,7 +142,6 @@ } -
diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index 4faec844..c167e568 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -8,7 +8,6 @@ -
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 942442cb..546a1f4c 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -30,7 +30,6 @@ } -
@@ -109,7 +108,7 @@   - (复制本代码： ) + (复制本代码： ) diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index aeab9543..bf331941 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -7,7 +7,6 @@ -
@@ -86,7 +85,7 @@   - (复制本代码： ) + (复制本代码： ) diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm index 7b0c8c5f..9f5bb0fb 100644 --- a/src/admin/templets/sys_cache_up.htm +++ b/src/admin/templets/sys_cache_up.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm index 61434cb6..e0251643 100644 --- a/src/admin/templets/sys_data.htm +++ b/src/admin/templets/sys_data.htm @@ -83,7 +83,6 @@ -
diff --git a/src/admin/templets/sys_data_revert.htm b/src/admin/templets/sys_data_revert.htm index 7e53a0cd..cf80d62a 100644 --- a/src/admin/templets/sys_data_revert.htm +++ b/src/admin/templets/sys_data_revert.htm @@ -53,7 +53,6 @@ -
diff --git a/src/admin/templets/sys_group.htm b/src/admin/templets/sys_group.htm index 3cb22368..278ef2e5 100644 --- a/src/admin/templets/sys_group.htm +++ b/src/admin/templets/sys_group.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/sys_group_add.htm b/src/admin/templets/sys_group_add.htm index 4acc2d1f..a7856616 100644 --- a/src/admin/templets/sys_group_add.htm +++ b/src/admin/templets/sys_group_add.htm @@ -7,7 +7,6 @@ -
@@ -32,7 +31,7 @@ $dsql->SetQuery("Select `rank` From `#@__admintype`"); $dsql->Execute(); - while($row = $dsql->GetObject()) echo ''.$row->rank.'、'; + while($row = $dsql->GetObject()) echo ''.$row->rank.'、'; ?> ，级别值必须小于10，超过或等于10所有权限设置将无效(超级管理员)，如果10个组不能完全满足您的要求，允许使用小数） diff --git a/src/admin/templets/sys_group_edit.htm b/src/admin/templets/sys_group_edit.htm index a8bc9c8b..67d34585 100644 --- a/src/admin/templets/sys_group_edit.htm +++ b/src/admin/templets/sys_group_edit.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/sys_info_mark.htm b/src/admin/templets/sys_info_mark.htm index 25a76380..7544f845 100644 --- a/src/admin/templets/sys_info_mark.htm +++ b/src/admin/templets/sys_info_mark.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm index 3123ecc7..0202e8a3 100644 --- a/src/admin/templets/sys_safetest.htm +++ b/src/admin/templets/sys_safetest.htm @@ -35,7 +35,6 @@ -
diff --git a/src/admin/templets/tag_test.htm b/src/admin/templets/tag_test.htm index 33c60231..20e60b4f 100644 --- a/src/admin/templets/tag_test.htm +++ b/src/admin/templets/tag_test.htm @@ -30,7 +30,6 @@ -
diff --git a/src/admin/templets/templets_one.htm b/src/admin/templets/templets_one.htm index e0c3d319..a1763daa 100644 --- a/src/admin/templets/templets_one.htm +++ b/src/admin/templets/templets_one.htm @@ -21,7 +21,6 @@ } -
diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index dd5e2f64..affada39 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -24,7 +24,6 @@ } -
diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm index 2cde2274..2a941357 100644 --- a/src/admin/templets/templets_tagsource.htm +++ b/src/admin/templets/templets_tagsource.htm @@ -17,7 +17,6 @@ -
diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index c50d8803..739fe96a 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -60,7 +60,7 @@
- diff --git a/src/admin/templets/tpl_edit_tag.htm b/src/admin/templets/tpl_edit_tag.htm index e5f21fcd..0ebd0042 100644 --- a/src/admin/templets/tpl_edit_tag.htm +++ b/src/admin/templets/tpl_edit_tag.htm @@ -57,7 +57,7 @@ function Post()
+ 修改/新建模板：
- diff --git a/src/admin/templets/vote_add.htm b/src/admin/templets/vote_add.htm index f531a6cd..1b287a14 100644 --- a/src/admin/templets/vote_add.htm +++ b/src/admin/templets/vote_add.htm @@ -70,7 +70,6 @@ }) -
+ (修改源码如果出现语法错误，可能导致标签无法使用，请修改前先作好数据备份)
diff --git a/src/admin/templets/vote_edit.htm b/src/admin/templets/vote_edit.htm index 084dfbfd..76e5dbe6 100644 --- a/src/admin/templets/vote_edit.htm +++ b/src/admin/templets/vote_edit.htm @@ -45,7 +45,6 @@ }) -
diff --git a/src/admin/templets/vote_getcode.htm b/src/admin/templets/vote_getcode.htm index e11b97b6..fc3a0a4f 100644 --- a/src/admin/templets/vote_getcode.htm +++ b/src/admin/templets/vote_getcode.htm @@ -7,7 +7,6 @@ -
diff --git a/src/admin/templets/vote_main.htm b/src/admin/templets/vote_main.htm index fa503e4d..09a6e117 100644 --- a/src/admin/templets/vote_main.htm +++ b/src/admin/templets/vote_main.htm @@ -8,7 +8,6 @@ -
@@ -38,7 +37,7 @@
{dede:field.endtime function="GetDateMk(@me)" /} {dede:field.totalcount /} - 未启用";}else{echo "启用";} ?> + 未启用";}else{echo "启用";} ?> 代码 diff --git a/src/admin/templets/winmode.htm b/src/admin/templets/winmode.htm index f6c8665d..74bdbc6f 100644 --- a/src/admin/templets/winmode.htm +++ b/src/admin/templets/winmode.htm @@ -5,7 +5,6 @@ {dede:wintitle/} - diff --git a/src/admin/testenv.php b/src/admin/testenv.php index 61079c60..47580283 100644 --- a/src/admin/testenv.php +++ b/src/admin/testenv.php @@ -22,7 +22,6 @@ $action = isset($action) ? $action : ''; - 无法判断"; } else { if ($val['execute'] == true) - echo $rs != $val['execute'] ? "错误(不可执行)" : "正常(可执行)"; + echo $rs != $val['execute'] ? "错误(不可执行)" : "正常(可执行)"; else - echo $rs != $val['execute'] ? "错误(可执行)" : "正常(不可执行)"; + echo $rs != $val['execute'] ? "错误(可执行)" : "正常(不可执行)"; } ?>|错误(不可读)" : "正常(可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(不可读)" : "正常(可读)"; else - echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; ?>|错误(不可写)" : "正常(可写)"; + echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(不可写)" : "正常(可写)"; else - echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; + echo TestWriteable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; ?>|无需判断|错误(不可读)" : "正常(可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(不可读)" : "正常(可读)"; else - echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; + echo is_readable(DEDEROOT.$key) != $val['read'] ? "错误(可读)" : "正常(不可读)"; ?>|错误(不可写)" : "正常(可写)"; + echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(不可写)" : "正常(可写)"; else - echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; + echo is_writable(DEDEROOT.$key) != $val['write'] ? "错误(可写)" : "正常(不可写)"; ?>dsql->Execute('l'); while ($row = $this->dsql->GetArray('l')) { if ($row['count'] > 1000) { - $fstyle = " style='font-size:11pt;color:#dc3545'"; + $fstyle = " style='font-size:11pt;color:red'"; } else if ($row['count'] > 300) { $fstyle = " style='font-size:10pt;color:green'"; } else { diff --git a/src/include/arc.sglistview.class.php b/src/include/arc.sglistview.class.php index fa34df5f..128b49e7 100755 --- a/src/include/arc.sglistview.class.php +++ b/src/include/arc.sglistview.class.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - @set_time_limit(0); require_once(DEDEINC."/arc.partview.class.php"); diff --git a/src/include/arc.specview.class.php b/src/include/arc.specview.class.php index f154539e..7f15484e 100755 --- a/src/include/arc.specview.class.php +++ b/src/include/arc.specview.class.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - require_once(DEDEINC."/typelink.class.php"); require_once(DEDEINC."/channelunit.class.php"); diff --git a/src/include/arc.taglist.class.php b/src/include/arc.taglist.class.php index b27a6d0a..82baaa0d 100755 --- a/src/include/arc.taglist.class.php +++ b/src/include/arc.taglist.class.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - require_once(DEDEINC.'/channelunit.class.php'); require_once(DEDEINC.'/typelink.class.php'); diff --git a/src/include/autoload.inc.php b/src/include/autoload.inc.php index 9d3477ce..dc116a3d 100755 --- a/src/include/autoload.inc.php +++ b/src/include/autoload.inc.php @@ -7,7 +7,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - function __autoload($classname) { $classname = preg_replace("/[^0-9a-z_]/i", '', $classname); diff --git a/src/include/autoload7.inc.php b/src/include/autoload7.inc.php index 639443a4..86ae8089 100755 --- a/src/include/autoload7.inc.php +++ b/src/include/autoload7.inc.php @@ -7,7 +7,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - function dede_autoloader($classname) { $classname = preg_replace("/[^0-9a-z_]/i", '', $classname); diff --git a/src/include/channelunit.func.php b/src/include/channelunit.func.php index 862c24c5..b99bd968 100755 --- a/src/include/channelunit.func.php +++ b/src/include/channelunit.func.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - if (!isset($cfg_mainsite)) extract($GLOBALS, EXTR_SKIP); global $PubFields, $pTypeArrays, $idArrary, $envs, $v1, $v2; diff --git a/src/include/charset.func.php b/src/include/charset.func.php index 178652cb..075dd744 100755 --- a/src/include/charset.func.php +++ b/src/include/charset.func.php @@ -7,8 +7,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - -// ------------------------------------------------------------------------ -// 字符编码转换的小助手 -// 这里仅做一个映射 +//------------------------------------------------------------------------ +//字符编码转换的小助手 +//这里仅做一个映射 helper("charset"); diff --git a/src/include/cli.class.php b/src/include/cli.class.php index 8c80abeb..dd01dae9 100644 --- a/src/include/cli.class.php +++ b/src/include/cli.class.php @@ -1,10 +1,11 @@ -body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#f2f2f2}a{color:#28a745;text-decoration:none}.tips{margin:68px auto 0;padding:0;width:420px;height:auto;background:#fff;border-radius:.2rem}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f6f6f6}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #ff5722}.tips-box{padding:20px;min-height:120px;color:#666}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#28a745;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}\");"; - $rmsg .= "document.write(\"
"; $rmsg .= "

提示信息

\");"; $rmsg .= "document.write(\"
\");"; diff --git a/src/include/common.inc.php b/src/include/common.inc.php index c0ab53bf..e4870544 100755 --- a/src/include/common.inc.php +++ b/src/include/common.inc.php @@ -53,9 +53,6 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')) { } } } -if (version_compare(PHP_VERSION, '8.0.0', '>=')) { - mysqli_report(MYSQLI_REPORT_OFF); -} //是否启用mb_substr替换cn_substr来提高效率 $cfg_is_mb = $cfg_is_iconv = FALSE; if (function_exists('mb_substr')) $cfg_is_mb = TRUE; diff --git a/src/include/datalistcp.class.php b/src/include/datalistcp.class.php index 06b7a90e..552b956f 100755 --- a/src/include/datalistcp.class.php +++ b/src/include/datalistcp.class.php @@ -18,7 +18,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - require_once(DEDEINC.'/dedetemplate.class.php'); $codefile = (isset($needCode) ? $needCode : $cfg_soft_lang); $codefile = preg_replace("#[^\w-]#", '', $codefile); diff --git a/src/include/dedebiz.class.php b/src/include/dedebiz.class.php index 076c165c..54234062 100644 --- a/src/include/dedebiz.class.php +++ b/src/include/dedebiz.class.php @@ -1,18 +1,18 @@ showError) { $emsg = ''; $emsg .= "

DedeBIZ Error Warning!

\r\n"; - $emsg .= ""; + $emsg .= ""; $emsg .= "
\r\n"; $emsg .= "

Error page: ".$this->GetCurUrl()."
\r\n"; $emsg .= "
Error infos: {$msg}
\r\n"; diff --git a/src/include/dedesqlite.class.php b/src/include/dedesqlite.class.php index 185ea572..82f3bbfc 100755 --- a/src/include/dedesqlite.class.php +++ b/src/include/dedesqlite.class.php @@ -17,8 +17,8 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @link https://www.dedebiz.com */ @set_time_limit(0); -// 在工程所有文件中均不需要单独初始化这个类，可直接用 $dsql 或 $db 进行操作 -// 为了防止错误，操作完后不必关闭数据库 +//在工程所有文件中均不需要单独初始化这个类，可直接用 $dsql 或 $db 进行操作 +//为了防止错误，操作完后不必关闭数据库 $dsql = $dsqlitete = $db = new DedeSqlite(FALSE); /** * Dede MySQLi数据库类 @@ -30,9 +30,6 @@ $dsql = $dsqlitete = $db = new DedeSqlite(FALSE); if (!defined('MYSQL_BOTH')) { define('MYSQL_BOTH', MYSQLI_BOTH); } -if (!defined('MYSQL_ASSOC')) { - define('MYSQL_ASSOC', SQLITE3_ASSOC); -} class DedeSqlite { var $linkID; @@ -108,7 +105,7 @@ class DedeSqlite $this->linkID = $dsqlite->linkID; } else { - $this->linkID = new SQLite3(DEDEDATA . '/' . $this->dbName . '.db'); + $this->linkID = new SQLite3(DEDEDATA.'/'.$this->dbName.'.db'); //复制一个对象副本 CopySQLiPoint($this); @@ -126,13 +123,13 @@ class DedeSqlite //为了防止采集等需要较长运行时间的程序超时，在运行这类程序时设置系统等待和交互时间 function SetLongLink() { - // @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID); + @mysqli_query("SET interactive_timeout=3600, wait_timeout=3600 ;", $this->linkID); } //获得错误描述 function GetError() { - $str = $dsqlite->lastErrorMsg(); + $str = mysqli_error($this->linkID); return $str; } @@ -182,7 +179,7 @@ class DedeSqlite } if (is_array($this->parameters)) { foreach ($this->parameters as $key => $value) { - $this->queryString = str_replace("@" . $key, "'$value'", $this->queryString); + $this->queryString = str_replace("@".$key, "'$value'", $this->queryString); } } //SQL语句安全检查 @@ -220,7 +217,7 @@ class DedeSqlite } if (is_array($this->parameters)) { foreach ($this->parameters as $key => $value) { - $this->queryString = str_replace("@" . $key, "'$value'", $this->queryString); + $this->queryString = str_replace("@".$key, "'$value'", $this->queryString); } } $t1 = ExecTime(); @@ -285,7 +282,7 @@ class DedeSqlite } if ($this->result[$id] === FALSE) { - $this->DisplayError($this->linkID->lastErrorMsg() . "
Error sql: " . $this->queryString . ""); + $this->DisplayError($this->linkID->lastErrorMsg()."
Error sql: ".$this->queryString.""); } } @@ -295,7 +292,7 @@ class DedeSqlite } //执行一个SQL语句,返回前一条记录或仅返回一条记录 - function GetOne($sql = '', $acctype = SQLITE3_ASSOC) + function GetOne($sql = '', $acctype = MYSQLI_ASSOC) { global $dsqlite; if (!$dsqlite->isInit) { @@ -306,7 +303,7 @@ class DedeSqlite $dsqlite->isClose = FALSE; } if (!empty($sql)) { - if (!preg_match("/LIMIT/i", $sql)) $this->SetQuery(preg_replace("/[,;]$/i", '', trim($sql)) . " LIMIT 0,1;"); + if (!preg_match("/LIMIT/i", $sql)) $this->SetQuery(preg_replace("/[,;]$/i", '', trim($sql))." LIMIT 0,1;"); else $this->SetQuery($sql); } $this->Execute("one"); @@ -352,16 +349,12 @@ class DedeSqlite if ($this->result[$id] === 0) { return FALSE; } else { - if ($this->result[$id]) { - $rs = $this->result[$id]->fetchArray($acctype); - if (!$rs) { - $this->result[$id] = 0; - return false; - } - return $rs; - } else { + $rs = $this->result[$id]->fetchArray($acctype); + if (!$rs) { + $this->result[$id] = 0; return false; } + return $rs; } } @@ -369,12 +362,10 @@ class DedeSqlite { if (!isset($this->_fixObject[$id])) { $this->_fixObject[$id] = array(); - if ($this->result[$id]) { - while ($row = $this->result[$id]->fetchArray(SQLITE3_ASSOC)) { - $this->_fixObject[$id][] = (object)$row; - } - $this->result[$id]->reset(); + while ($row = $this->result[$id]->fetchArray(SQLITE3_ASSOC)) { + $this->_fixObject[$id][] = (object)$row; } + $this->result[$id]->reset(); } return array_shift($this->_fixObject[$id]); } @@ -412,7 +403,7 @@ class DedeSqlite $sqlite_version = $rs; if ($isformat) { $sqlite_versions = explode(".", trim($sqlite_version)); - $sqlite_version = number_format($sqlite_versions[0] . "." . $sqlite_versions[1], 2); + $sqlite_version = number_format($sqlite_versions[0].".".$sqlite_versions[1], 2); } return $sqlite_version; } @@ -534,7 +525,7 @@ class DedeSqlite function RecordLog($runtime = 0) { - $RecordLogFile = dirname(__FILE__) . '/../data/mysqli_record_log.inc'; + $RecordLogFile = dirname(__FILE__).'/../data/mysqli_record_log.inc'; $url = $this->GetCurUrl(); $savemsg = <<showError) { $emsg = ''; $emsg .= "

DedeBIZ Error Warning!

\r\n"; - $emsg .= ""; + $emsg .= ""; $emsg .= "
\r\n"; - $emsg .= "

Error page: " . $this->GetCurUrl() . "
\r\n"; + $emsg .= "

Error page: ".$this->GetCurUrl()."
\r\n"; $emsg .= "
Error infos: {$msg}
\r\n"; $emsg .= "
\r\n"; echo $emsg; } - $savemsg = 'Page: ' . $this->GetCurUrl() . "\r\nError: " . $msg . "\r\nTime" . date('Y-m-d H:i:s'); + $savemsg = 'Page: '.$this->GetCurUrl()."\r\nError: ".$msg."\r\nTime".date('Y-m-d H:i:s'); //保存MySql错误日志 $fp = @fopen($errorTrackFile, 'a'); - @fwrite($fp, '<' . '?php exit();' . "\r\n/*\r\n{$savemsg}\r\n*/\r\n?" . ">\r\n"); + @fwrite($fp, '<'.'?php exit();'."\r\n/*\r\n{$savemsg}\r\n*/\r\n?".">\r\n"); @fclose($fp); } @@ -585,7 +576,7 @@ EOT; if (empty($_SERVER["QUERY_STRING"])) { $nowurl = $scriptName; } else { - $nowurl = $scriptName . "?" . $_SERVER["QUERY_STRING"]; + $nowurl = $scriptName."?".$_SERVER["QUERY_STRING"]; } } return $nowurl; @@ -607,7 +598,7 @@ if (!function_exists('CheckSql')) { $error = ''; $old_pos = 0; $pos = -1; - $log_file = DEDEINC . '/../data/' . md5($cfg_cookie_encode) . '_safe.txt'; + $log_file = DEDEINC.'/../data/'.md5($cfg_cookie_encode).'_safe.txt'; $userIP = GetIP(); $getUrl = GetCurUrl(); @@ -616,9 +607,9 @@ if (!function_exists('CheckSql')) { $notallow1 = "[^0-9a-z@\._-]{1,}(union|sleep|benchmark|load_file|outfile)[^0-9a-z@\.-]{1,}"; //$notallow2 = "--|/\*"; - if (preg_match("/" . $notallow1 . "/i", $db_string)) { + if (preg_match("/".$notallow1."/i", $db_string)) { fputs(fopen($log_file, 'a+'), "$userIP||$getUrl||$db_string||SelectBreak\r\n"); - exit("Safe Alert: Request Error step 1 !"); + exit("Safe Alert: Request Error step 1 !"); } } diff --git a/src/include/dedetag.class.php b/src/include/dedetag.class.php index 5ad9f370..c89ab6b9 100755 --- a/src/include/dedetag.class.php +++ b/src/include/dedetag.class.php @@ -616,13 +616,13 @@ class DedeTagParse $phpcode = preg_replace("/'@me'|\"@me\"|@me/i", '$DedeMeValue', $phpcode); try { @eval($phpcode); - $this->CTags[$i]->TagValue = $DedeMeValue; $this->CTags[$i]->IsReplace = TRUE; } catch (Exception $e) { //or die("$phpcode"); } - + $this->CTags[$i]->TagValue = $DedeMeValue; + $this->CTags[$i]->IsReplace = TRUE; } /** @@ -886,7 +886,6 @@ class DedeTagParse //or die("$functionname"); return ''; } - } /** diff --git a/src/include/dedetemplate.class.php b/src/include/dedetemplate.class.php index b4235f7a..78897472 100755 --- a/src/include/dedetemplate.class.php +++ b/src/include/dedetemplate.class.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 这个函数用于定义任意名称的块使用的接口 * 返回值应是一个二维数组 diff --git a/src/include/diyform.cls.php b/src/include/diyform.cls.php index 0b3488ed..b91283ed 100755 --- a/src/include/diyform.cls.php +++ b/src/include/diyform.cls.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - require_once DEDEINC.'/dedetag.class.php'; require_once DEDEINC.'/customfields.func.php'; diff --git a/src/include/downmix.inc.php b/src/include/downmix.inc.php index e94d75c9..cff09322 100755 --- a/src/include/downmix.inc.php +++ b/src/include/downmix.inc.php @@ -9,6 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -// 引入小助手 -// 本版本的文件暂时仅作一个映射,今后开发直接采用helper('downmix');进行调用 +//引入小助手 +//本版本的文件暂时仅作一个映射,今后开发直接采用helper('downmix');进行调用 helper('downmix'); diff --git a/src/include/enums.func.php b/src/include/enums.func.php index 7dfb32ec..a05c9c2e 100755 --- a/src/include/enums.func.php +++ b/src/include/enums.func.php @@ -9,8 +9,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - -// 弱不存在缓存文件则写入缓存 +//弱不存在缓存文件则写入缓存 if (!file_exists(DEDEDATA.'/enums/system.php')) WriteEnumsCache(); /** diff --git a/src/include/filter.inc.php b/src/include/filter.inc.php index e39f5218..c4293a6b 100755 --- a/src/include/filter.inc.php +++ b/src/include/filter.inc.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 过滤不相关内容 * diff --git a/src/include/helpers/archive.helper.php b/src/include/helpers/archive.helper.php index 2322604e..9c1b1a8a 100755 --- a/src/include/helpers/archive.helper.php +++ b/src/include/helpers/archive.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 获取单篇文档信息 * diff --git a/src/include/helpers/channelunit.helper.php b/src/include/helpers/channelunit.helper.php index fac1d9f4..9274e6a2 100755 --- a/src/include/helpers/channelunit.helper.php +++ b/src/include/helpers/channelunit.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 用星表示软件或Flash的等级 * diff --git a/src/include/helpers/charset.helper.php b/src/include/helpers/charset.helper.php index d2a37b05..70c31280 100755 --- a/src/include/helpers/charset.helper.php +++ b/src/include/helpers/charset.helper.php @@ -10,7 +10,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @link https://www.dedebiz.com */ - $UC2GBTABLE = $CODETABLE = $BIG5_DATA = $GB_DATA = ''; $GbkUniDic = null; diff --git a/src/include/helpers/cookie.helper.php b/src/include/helpers/cookie.helper.php index 88d13f51..5f38e281 100755 --- a/src/include/helpers/cookie.helper.php +++ b/src/include/helpers/cookie.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 设置Cookie记录 * diff --git a/src/include/helpers/debug.helper.php b/src/include/helpers/debug.helper.php index 62fd6a48..205dfd38 100755 --- a/src/include/helpers/debug.helper.php +++ b/src/include/helpers/debug.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 浏览器友好的变量输出,便于调试时候使用 * diff --git a/src/include/helpers/extend.helper.php b/src/include/helpers/extend.helper.php index 848a506e..37ea3d35 100755 --- a/src/include/helpers/extend.helper.php +++ b/src/include/helpers/extend.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 返回指定的字符 * diff --git a/src/include/helpers/file.helper.php b/src/include/helpers/file.helper.php index edc9f9ed..fa666836 100755 --- a/src/include/helpers/file.helper.php +++ b/src/include/helpers/file.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - $g_ftpLink = false; /** diff --git a/src/include/helpers/filter.helper.php b/src/include/helpers/filter.helper.php index 57e769d1..9f323257 100755 --- a/src/include/helpers/filter.helper.php +++ b/src/include/helpers/filter.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 去除html中不规则内容字符 diff --git a/src/include/helpers/image.helper.php b/src/include/helpers/image.helper.php index e8bd77b1..dbc202b2 100755 --- a/src/include/helpers/image.helper.php +++ b/src/include/helpers/image.helper.php @@ -9,7 +9,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ -// ------------------------------------------------------------------------ +//------------------------------------------------------------------------ /** * 缩图片自动生成函数，来源支持bmp、gif、jpg、png diff --git a/src/include/helpers/test.helper.php b/src/include/helpers/test.helper.php index ed4a8f7e..12adef00 100755 --- a/src/include/helpers/test.helper.php +++ b/src/include/helpers/test.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - //邮箱格式检查 if (!function_exists('HelloDede')) { function HelloDede() diff --git a/src/include/helpers/time.helper.php b/src/include/helpers/time.helper.php index f65e3288..2e064c06 100755 --- a/src/include/helpers/time.helper.php +++ b/src/include/helpers/time.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 返回格林威治标准时间 * diff --git a/src/include/helpers/upload.helper.php b/src/include/helpers/upload.helper.php index f1682cda..0de977f0 100755 --- a/src/include/helpers/upload.helper.php +++ b/src/include/helpers/upload.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - /** * 管理员上传文件的通用函数 * diff --git a/src/include/helpers/util.helper.php b/src/include/helpers/util.helper.php index 3c063bb8..f45b55a5 100755 --- a/src/include/helpers/util.helper.php +++ b/src/include/helpers/util.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - define('T_NEW_LINE', -1); if (!function_exists('token_get_all_nl')) { diff --git a/src/include/helpers/validate.helper.php b/src/include/helpers/validate.helper.php index 693fe0f3..5e891e56 100755 --- a/src/include/helpers/validate.helper.php +++ b/src/include/helpers/validate.helper.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - //邮箱格式检查 if (!function_exists('CheckEmail')) { function CheckEmail($email) diff --git a/src/include/image.func.php b/src/include/image.func.php index b8c7bf57..5a89dad5 100755 --- a/src/include/image.func.php +++ b/src/include/image.func.php @@ -9,7 +9,6 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - include(DEDEDATA.'/mark/inc_photowatermark_config.php'); //检测用户系统支持的图片格式 global $cfg_photo_type, $cfg_photo_typenames, $cfg_photo_support; diff --git a/src/include/mail.class.php b/src/include/mail.class.php index 75df9287..52160a64 100755 --- a/src/include/mail.class.php +++ b/src/include/mail.class.php @@ -1,5 +1,4 @@ M_ExpTime - ceil(($nowtime - $this->M_UpTime) / 3600 / 24) + 1; if ($mhasDay <= 0) { $dsql->ExecuteNoneQuery("UPDATE `#@__member` SET uptime='0',exptime='0', - `rank`='$cfg_mb_rank' WHERE mid='".$this->fields['mid']."';"); + rank='$cfg_mb_rank' WHERE mid='".$this->fields['mid']."';"); } return $mhasDay; } @@ -475,7 +474,7 @@ 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."'"); if (!is_array($rs)) { diff --git a/src/include/payment/alipay.php b/src/include/payment/alipay.php index b5f9060a..a86440d2 100755 --- a/src/include/payment/alipay.php +++ b/src/include/payment/alipay.php @@ -225,21 +225,21 @@ class Alipay /* 改变点卡订单状态_支付成功 */ if($product=="card") { - $row = $this->dsql->GetOne("SELECT cardid FROM `#@__moneycard_record` WHERE ctid='$pid' AND isexp='0' ");; + $row = $this->dsql->GetOne("SELECT cardid FROM #@__moneycard_record WHERE ctid='$pid' AND isexp='0' ");; //如果找不到某种类型的卡，直接为用户增加金币 if(!is_array($row)) { - $nrow = $this->dsql->GetOne("SELECT num FROM `#@__moneycard_type` WHERE pname = '{$pname}'"); + $nrow = $this->dsql->GetOne("SELECT num FROM #@__moneycard_type WHERE pname = '{$pname}'"); $dnum = $nrow['num']; $sql1 = "UPDATE `#@__member` SET `money`=money+'{$nrow['num']}' WHERE `mid`='".$this->mid."'"; $oldinf ="已经充值了".$nrow['num']."金币到您的帐号"; } else { $cardid = $row['cardid']; - $sql1=" UPDATE `#@__moneycard_record` SET uid='".$this->mid."',isexp='1',utime='".time()."' WHERE cardid='$cardid' "; - $oldinf='您的充值密码是：'.$cardid.''; + $sql1=" UPDATE #@__moneycard_record SET uid='".$this->mid."',isexp='1',utime='".time()."' WHERE cardid='$cardid' "; + $oldinf='您的充值密码是：'.$cardid.''; } //更新交易状态为已关闭 - $sql2=" UPDATE `#@__member_operation` SET sta=2,oldinfo='$oldinf' WHERE buyid='$order_sn'"; + $sql2=" UPDATE #@__member_operation SET sta=2,oldinfo='$oldinf' WHERE buyid='$order_sn'"; if($this->dsql->ExecuteNoneQuery($sql1) && $this->dsql->ExecuteNoneQuery($sql2)) { $this->log_result("verify_success,订单号:".$order_sn); //将验证结果存入文件 @@ -250,11 +250,11 @@ class Alipay } /* 改变会员订单状态_支付成功 */ } else if ( $product=="member" ){ - $row = $this->dsql->GetOne("SELECT `rank`,exptime FROM `#@__member_type` WHERE aid='$pid' "); + $row = $this->dsql->GetOne("SELECT rank,exptime FROM #@__member_type WHERE aid='$pid' "); $rank = $row['rank']; $exptime = $row['exptime']; /*计算原来升级剩余的天数*/ - $rs = $this->dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$this->mid."'"); + $rs = $this->dsql->GetOne("SELECT uptime,exptime FROM #@__member WHERE mid='".$this->mid."'"); if($rs['uptime']!=0 && $rs['exptime']!=0 ) { $nowtime = time(); @@ -262,13 +262,13 @@ class Alipay $mhasDay=($mhasDay>0)? $mhasDay : 0; } //获取会员默认级别的金币和积分数 - $memrank = $this->dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); + $memrank = $this->dsql->GetOne("SELECT money,scores FROM #@__arcrank WHERE rank='$rank'"); //更新会员信息 - $sql1 = " UPDATE `#@__member` SET `rank`='$rank',money=money+'{$memrank['money']}', + $sql1 = " UPDATE #@__member SET rank='$rank',money=money+'{$memrank['money']}', scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$this->mid."'"; //更新交易状态为已关闭 - $sql2=" UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功!' WHERE buyid='$order_sn' "; + $sql2=" UPDATE #@__member_operation SET sta='2',oldinfo='会员升级成功!' WHERE buyid='$order_sn' "; if($this->dsql->ExecuteNoneQuery($sql1) && $this->dsql->ExecuteNoneQuery($sql2)) { $this->log_result("verify_success,订单号:".$order_sn); //将验证结果存入文件 diff --git a/src/include/payment/yeepay.php b/src/include/payment/yeepay.php index de00516b..601b89db 100755 --- a/src/include/payment/yeepay.php +++ b/src/include/payment/yeepay.php @@ -368,7 +368,7 @@ class yeepay } else { $cardid = $row['cardid']; $sql1=" UPDATE #@__moneycard_record SET uid='".$this->mid."',isexp='1',utime='".time()."' WHERE cardid='$cardid' "; - $oldinf='您的充值密码是：'.$cardid.''; + $oldinf='您的充值密码是：'.$cardid.''; } //更新交易状态为已关闭 $sql2=" UPDATE #@__member_operation SET sta=2,oldinfo='$oldinf' WHERE buyid='$order_sn'"; @@ -382,11 +382,11 @@ class yeepay } /* 改变会员订单状态_支付成功 */ } else if ( $product=="member" ){ - $row = $this->dsql->GetOne("SELECT `rank`,exptime FROM `#@__member_type` WHERE aid='$pid' "); + $row = $this->dsql->GetOne("SELECT rank,exptime FROM #@__member_type WHERE aid='$pid' "); $rank = $row['rank']; $exptime = $row['exptime']; /*计算原来升级剩余的天数*/ - $rs = $this->dsql->GetOne("SELECT uptime,exptime FROM `#@__member` WHERE mid='".$this->mid."'"); + $rs = $this->dsql->GetOne("SELECT uptime,exptime FROM #@__member WHERE mid='".$this->mid."'"); if($rs['uptime']!=0 && $rs['exptime']!=0 ) { $nowtime = time(); @@ -394,13 +394,13 @@ class yeepay $mhasDay=($mhasDay>0)? $mhasDay : 0; } //获取会员默认级别的金币和积分数 - $memrank = $this->dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='$rank'"); + $memrank = $this->dsql->GetOne("SELECT money,scores FROM #@__arcrank WHERE rank='$rank'"); //更新会员信息 - $sql1 = " UPDATE `#@__member` SET `rank`='$rank',money=money+'{$memrank['money']}', + $sql1 = " UPDATE #@__member SET rank='$rank',money=money+'{$memrank['money']}', scores=scores+'{$memrank['scores']}',exptime='$exptime'+'$mhasDay',uptime='".time()."' WHERE mid='".$this->mid."'"; //更新交易状态为已关闭 - $sql2=" UPDATE `#@__member_operation` SET sta='2',oldinfo='会员升级成功!' WHERE buyid='$order_sn' "; + $sql2=" UPDATE #@__member_operation SET sta='2',oldinfo='会员升级成功!' WHERE buyid='$order_sn' "; if($this->dsql->ExecuteNoneQuery($sql1) && $this->dsql->ExecuteNoneQuery($sql2)) { $this->log_result("verify_success,订单号:".$order_sn); //将验证结果存入文件 diff --git a/src/include/qrcode.class.php b/src/include/qrcode.class.php index 2c8da510..1bc45174 100755 --- a/src/include/qrcode.class.php +++ b/src/include/qrcode.class.php @@ -1,5 +1,4 @@ $cfg_ml->M_Rank) { - $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("Select membername From `#@__arcrank` where rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/archives_add.php b/src/member/archives_add.php index 332cc728..881e652c 100755 --- a/src/member/archives_add.php +++ b/src/member/archives_add.php @@ -36,7 +36,7 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("Select membername From `#@__arcrank` where rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/archives_sg_add.php b/src/member/archives_sg_add.php index 5970698e..c1c7cc24 100755 --- a/src/member/archives_sg_add.php +++ b/src/member/archives_sg_add.php @@ -36,7 +36,7 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } @@ -85,7 +85,7 @@ function _SaveArticle(){ } //检查频道设定的投稿许可权限 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("Select membername From #@__arcrank where `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("Select membername From #@__arcrank where rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/article_add.php b/src/member/article_add.php index 6221f5da..dadb8873 100755 --- a/src/member/article_add.php +++ b/src/member/article_add.php @@ -31,7 +31,7 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/buy_action.php b/src/member/buy_action.php index 5b962be6..17b9e7a1 100755 --- a/src/member/buy_action.php +++ b/src/member/buy_action.php @@ -86,7 +86,7 @@ if (!isset($paytype)) { //获取支付接口列表 $payment_list = array(); - $dsql->SetQuery("SELECT * FROM `#@__payment` WHERE enabled='1' ORDER BY `rank` ASC"); + $dsql->SetQuery("SELECT * FROM `#@__payment` WHERE enabled='1' ORDER BY rank ASC"); $dsql->Execute(); $i = 0; while ($row = $dsql->GetArray()) { diff --git a/src/member/config.php b/src/member/config.php index 3c7b6353..8c46256d 100755 --- a/src/member/config.php +++ b/src/member/config.php @@ -6,14 +6,13 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - //针对会员中心操作进行XSS过滤 function XSSClean($val) { global $cfg_soft_lang; if ($cfg_soft_lang == 'gb2312') gb2utf8($val); if (is_array($val)) { - // while (list($key) = each($val)) + //while (list($key) = each($val)) foreach ($val as $key => $value) { if (in_array($key, array('tags', 'body', 'dede_fields', 'dede_addonfields', 'dopost', 'introduce'))) continue; $val[$key] = XSSClean($val[$key]); @@ -184,11 +183,11 @@ function CheckRank($rank = 0, $money = 0) if ($cfg_ml->M_Rank < $rank) { $needname = ""; if ($cfg_ml->M_Rank == 0) { - $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE `rank`='$rank'"); + $row = $dsql->GetOne("SELECT membername FROM `#@__arcrank` WHERE rank='$rank'"); $myname = "普通会员"; $needname = $row['membername']; } else { - $dsql->SetQuery("SELECT membername From `#@__arcrank` WHERE `rank`='$rank' OR `rank`='".$cfg_ml->M_Rank."' ORDER BY `rank` DESC"); + $dsql->SetQuery("SELECT membername From `#@__arcrank` WHERE rank='$rank' OR rank='".$cfg_ml->M_Rank."' ORDER BY rank DESC"); $dsql->Execute(); $row = $dsql->GetObject(); $needname = $row->membername; @@ -198,10 +197,10 @@ function CheckRank($rank = 0, $money = 0) $myname = "普通会员"; } } - ShowMsg("对不起，需要：$needname 才能访问本页面。
您目前的等级是：$myname 。", "-1", 0, 5000); + ShowMsg("对不起，需要：$needname 才能访问本页面。
您目前的等级是：$myname 。", "-1", 0, 5000); exit(); } else if ($cfg_ml->M_Money < $money) { - ShowMsg("对不起，需要花费金币：$money 才能访问本页面。
您目前拥有的金币是：".$cfg_ml->M_Money." 。", "-1", 0, 5000); + ShowMsg("对不起，需要花费金币：$money 才能访问本页面。
您目前拥有的金币是：".$cfg_ml->M_Money." 。", "-1", 0, 5000); exit(); } } diff --git a/src/member/inc/archives_check.php b/src/member/inc/archives_check.php index 716f5779..fb052c08 100755 --- a/src/member/inc/archives_check.php +++ b/src/member/inc/archives_check.php @@ -44,7 +44,7 @@ if ($cInfos['issend'] != 1 || $cInfos['ispart'] != 0 || $cInfos['channeltype'] //检查频道设定的投稿许可权限 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("Select membername From #@__arcrank where `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("Select membername From #@__arcrank where rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/inc/config_pay_alipay.php b/src/member/inc/config_pay_alipay.php index 177e9f11..f8530998 100755 --- a/src/member/inc/config_pay_alipay.php +++ b/src/member/inc/config_pay_alipay.php @@ -1,5 +1,5 @@ √{$msgtitle}可以使用"; + $msg = "√{$msgtitle}可以使用"; } else { $msg = "×{$msg}"; } @@ -112,14 +112,14 @@ else if ($fmdo == 'user') { AjaxHead(); if ($cfg_md_mailtest == 'N') { - $msg = "√可以使用"; + $msg = "√可以使用"; } else { if (!CheckEmail($email)) { - $msg = "×Email格式有误"; + $msg = "×Email格式有误"; } else { $row = $dsql->GetOne("SELECT mid FROM `#@__member` WHERE email LIKE '$email' LIMIT 1"); if (!is_array($row)) { - $msg = "√可以使用"; + $msg = "√可以使用"; } else { $msg = "×Email已经被另一个帐号占用"; } diff --git a/src/member/reg_new.php b/src/member/reg_new.php index 0966127a..cbcee788 100755 --- a/src/member/reg_new.php +++ b/src/member/reg_new.php @@ -75,7 +75,7 @@ if ($step == 1) { //会员的默认金币 $dfscores = 0; $dfmoney = 0; - $dfrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE `rank`='10' "); + $dfrank = $dsql->GetOne("SELECT money,scores FROM `#@__arcrank` WHERE rank='10' "); if (is_array($dfrank)) { $dfmoney = $dfrank['money']; $dfscores = $dfrank['scores']; diff --git a/src/member/soft_add.php b/src/member/soft_add.php index 2b86b797..31447e9a 100755 --- a/src/member/soft_add.php +++ b/src/member/soft_add.php @@ -41,7 +41,7 @@ if (empty($dopost)) { //检查会员等级和类型限制 if ($cInfos['sendrank'] > $cfg_ml->M_Rank) { - $row = $dsql->GetOne("Select membername From `#@__arcrank` where `rank`='".$cInfos['sendrank']."' "); + $row = $dsql->GetOne("Select membername From `#@__arcrank` where rank='".$cInfos['sendrank']."' "); ShowMsg("对不起，需要[".$row['membername']."]才能在这个频道发布文档", "-1", "0", 5000); exit(); } diff --git a/src/member/templets/pm-main.htm b/src/member/templets/pm-main.htm index d611b2e7..d23599da 100755 --- a/src/member/templets/pm-main.htm +++ b/src/member/templets/pm-main.htm @@ -96,7 +96,7 @@
未阅读" : '已阅读'); + $readmsg = ($fields['hasview']==0 ? "未阅读" : '已阅读'); echo $readmsg; ?>
diff --git a/src/member/templets/top_login.htm b/src/member/templets/top_login.htm index a9cce50b..191360c9 100644 --- a/src/member/templets/top_login.htm +++ b/src/member/templets/top_login.htm @@ -1,7 +1,7 @@
-
diff --git a/src/plus/carbuyaction.php b/src/plus/carbuyaction.php index 1ef2a6d7..eb2c2180 100755 --- a/src/plus/carbuyaction.php +++ b/src/plus/carbuyaction.php @@ -44,7 +44,7 @@ if (!isset($dopost) || empty($dopost)) { if (!isset($do) || empty($do)) { $shops_deliveryarr = array(); - $dsql->SetQuery("SELECT pid,dname,price,des FROM `#@__shops_delivery` ORDER BY orders ASC"); + $dsql->SetQuery("SELECT pid,dname,price,des FROM #@__shops_delivery ORDER BY orders ASC"); $dsql->Execute(); while ($row = $dsql->GetArray()) { $shops_deliveryarr[] = $row; @@ -52,7 +52,7 @@ if (!isset($dopost) || empty($dopost)) { //获取支付接口列表 $shops_paymentarr = array(); - $dsql->SetQuery("SELECT * FROM `#@__payment` WHERE enabled='1' ORDER BY `rank` ASC"); + $dsql->SetQuery("SELECT * FROM #@__payment WHERE enabled='1' ORDER BY rank ASC"); $dsql->Execute(); $i = 0; while ($row = $dsql->GetArray()) { diff --git a/src/static/ckeditor/config.js b/src/static/ckeditor/config.js index d5ccc9b1..8e0fd12c 100644 --- a/src/static/ckeditor/config.js +++ b/src/static/ckeditor/config.js @@ -20,8 +20,6 @@ CKEDITOR.editorConfig = function (config) { { name: 'tools', groups: ['tools'] } ]; - config.height = 500; - config.extraPlugins = 'html5video,dedepagebreak,textindent'; config.removeButtons = 'About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField'; diff --git a/src/static/img/base.css b/src/static/img/base.css index 584e497b..6cf54d58 100755 --- a/src/static/img/base.css +++ b/src/static/img/base.css @@ -1 +1 @@ -*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#dc3545color:#dc3545;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:color:#dc3545;box-shadow:0 0 2px color:#dc3545;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.coolbg{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}.ctfield{padding:2px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.maintable{width:98%!important}a.btn{color:white!important} \ No newline at end of file +*{font-size:12px;letter-spacing:.4px}body{font:12px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;line-height:1.5}form,h1,h2,h3,ul,ol,div{margin:0;padding:0}td{line-height:1.5}td,th,div{word-break:break-all;word-wrap:break-word}b,strong{font-weight:400}li,dd{margin:0;padding:0;list-style-type:none}label{display:inline-block;margin:10px 0}input{padding:.25rem .5rem;height:calc(1.5em + .75rem + 2px);line-height:18px;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}input[type=radio],input[type=checkbox]{height:auto;box-shadow:none;outline:none}input[type=button],input[type=submit],input[type=reset]{padding:.25rem .5rem;height:auto;line-height:1.5;color:#fff;background:#28a745;border-radius:.2rem;transition:all .6s;border:0}input[type=button]:focus,input[type=submit]:focus,input[type=reset]:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}input:focus,textarea:focus{border-color:#28a745;box-shadow:0 0 2px #28a745;outline:none}textarea{padding:.25rem .5rem;line-height:18px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s;vertical-align:middle}select{height:calc(1.5em + .75rem + 2px);padding:.25rem .5rem;color:#424b51;background:#fff;border:1px solid #eee;border-radius:.2rem;transition:all .6s}img{margin-right:6px;border-radius:.2rem;vertical-align:baseline}h1,h2,h3{font-size:18px;color:#424b51}a:link{color:#424b51;text-decoration:none}a:hover{opacity:.8}a:visited{color:#666}.m1{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-bottom:1px solid #808080}.m2{border-left:1px solid #DFDFDB;border-bottom:1px solid #808080;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.m3{border-left:1px solid #DFDFDB;border-top:1px solid #DFDFDB;border-right:1px solid #DFDFDB}.article{line-height:160%;table-layout:fixed;word-break:break-all}.bn{color:#fff;line-height:50%}.contents{color:#F7F6F8}.nb{border:1px solid #ccc}.coolbg{border-right:2px solid #ACACAC;border-bottom:2px solid #ACACAC;background-color:#E6E6E6}.ctfield{padding:2px;line-height:150%}.nndiv{width:170px;height:20px;margin:0;padding:0;word-break:break-all;overflow:hidden}.maintable{width:98%!important}a.btn{color:white!important} \ No newline at end of file diff --git a/src/templets/plus/car.htm b/src/templets/plus/car.htm index 5d72c56d..c8f43fe0 100755 --- a/src/templets/plus/car.htm +++ b/src/templets/plus/car.htm @@ -10,7 +10,6 @@ -
diff --git a/src/templets/plus/carbuyaction.htm b/src/templets/plus/carbuyaction.htm index 3da61085..98bd7750 100755 --- a/src/templets/plus/carbuyaction.htm +++ b/src/templets/plus/carbuyaction.htm @@ -10,7 +10,6 @@ -
diff --git a/src/templets/plus/heightsearch.htm b/src/templets/plus/heightsearch.htm index 66f9f6de..f3aeca3b 100755 --- a/src/templets/plus/heightsearch.htm +++ b/src/templets/plus/heightsearch.htm @@ -8,7 +8,6 @@ - diff --git a/src/templets/plus/recommend.htm b/src/templets/plus/recommend.htm index 76b37684..2ccedf21 100755 --- a/src/templets/plus/recommend.htm +++ b/src/templets/plus/recommend.htm @@ -8,7 +8,6 @@ - diff --git a/src/templets/plus/view_msg.htm b/src/templets/plus/view_msg.htm index 174dd97c..bbdedabc 100755 --- a/src/templets/plus/view_msg.htm +++ b/src/templets/plus/view_msg.htm @@ -12,7 +12,6 @@ - diff --git a/src/templets/plus/vote.htm b/src/templets/plus/vote.htm index af77d3da..6b98e1bb 100755 --- a/src/templets/plus/vote.htm +++ b/src/templets/plus/vote.htm @@ -10,7 +10,6 @@ - diff --git a/src/templets/system/custom_fields_admin.htm b/src/templets/system/custom_fields_admin.htm index 29b26136..25f1a2dc 100755 --- a/src/templets/system/custom_fields_admin.htm +++ b/src/templets/system/custom_fields_admin.htm @@ -1,6 +1,6 @@ - +
 ~name~： ~name~： ~form~
\ No newline at end of file