diff --git a/src/admin/catalog_edit.php b/src/admin/catalog_edit.php index 08152925..d5759932 100644 --- a/src/admin/catalog_edit.php +++ b/src/admin/catalog_edit.php @@ -46,7 +46,7 @@ if ($dopost == "save") { } //修改子栏目属性 if (!empty($upnext)) { - $upquery = "UPDATE `#@__arctype` SETissend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks"; + $upquery = "UPDATE `#@__arctype` SET issend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks"; if (!$dsql->ExecuteNoneQuery($upquery)) { ShowMsg("修改栏目成功，但修改下级栏目属性时失败", "-1"); exit(); diff --git a/src/admin/freelist_main.php b/src/admin/freelist_main.php index b4d1f072..9b1d6d61 100644 --- a/src/admin/freelist_main.php +++ b/src/admin/freelist_main.php @@ -75,7 +75,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') while($row = $dsql->GetArray()) { $listurl = GetFreeListUrl($row['aid'],$row['namerule'],$row['listdir'],$row['defaultpage'],$row['nodefault']); - $line = " + $line = " {$row['aid']} {$row['title']} {$row['templet']} diff --git a/src/admin/inc/inc_catalog_options.php b/src/admin/inc/inc_catalog_options.php index 8f01a77c..f20825b0 100644 --- a/src/admin/inc/inc_catalog_options.php +++ b/src/admin/inc/inc_catalog_options.php @@ -60,16 +60,16 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0) $sonCats = ''; LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats); if ($sonCats != '') { - if ($row->ispart == 1) $OptionArrayList .= ""; - else if ($row->ispart == 2) $OptionArrayList .= ""; - else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; - else $OptionArrayList .= ""; + if ($row->ispart == 1) $OptionArrayList .= ""; + else if ($row->ispart == 2) $OptionArrayList .= ""; + else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= ""; + else $OptionArrayList .= ""; $OptionArrayList .= $sonCats; } else { if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } else if ($row->ispart == 0 && empty($channeltype)) { - $OptionArrayList .= ""; + $OptionArrayList .= ""; } } } @@ -85,9 +85,9 @@ function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats) continue; } if ($row->channeltype == $channeltype && $row->ispart == 1) { - $sonCats .= ""; + $sonCats .= ""; } else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) { - $sonCats .= ""; + $sonCats .= ""; } LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats); } diff --git a/src/admin/login.php b/src/admin/login.php index 6c9b4226..0584b1af 100644 --- a/src/admin/login.php +++ b/src/admin/login.php @@ -16,7 +16,7 @@ $gotopage = RemoveXSS($gotopage); //检测安装目录安全性 if (is_dir(dirname(__FILE__).'/../install')) { if (!file_exists(dirname(__FILE__).'/../install/install_lock.txt')) { - $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限，无法进行写入锁定文件，请安装完毕删除安装目录'); + $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限和写入锁定文件，请安装完成后删除安装目录'); fwrite($fp, 'ok'); fclose($fp); } @@ -30,7 +30,7 @@ if (is_dir(dirname(__FILE__).'/../install')) { //检测后台目录是否更名 $cururl = GetCurUrl(); if (preg_match('/admin/', $cururl)) { - $redmsg = '
安全提示：后台管理目录名称中包含默认名称admin，建议把它修改为其它名称
'; + $redmsg = '
安全提示：后台管理目录名称中包含名称admin，建议把后台管理目录修改为其它名称
'; } else { $redmsg = ''; } diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php index 660629f2..0adef55a 100644 --- a/src/admin/member_toadmin.php +++ b/src/admin/member_toadmin.php @@ -92,11 +92,11 @@ $typeids = explode(',', $typeid); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id'"); diff --git a/src/admin/search_keywords_main.php b/src/admin/search_keywords_main.php index 2b1b8d0b..774aaad1 100644 --- a/src/admin/search_keywords_main.php +++ b/src/admin/search_keywords_main.php @@ -80,7 +80,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid') $dsql->SetQuery("SELECT * FROM `#@__search_keywords` ORDER BY $orderby LIMIT $start,$pagesize "); $dsql->Execute(); while ($row = $dsql->GetArray()) { - $line = " + $line = " {$row['aid']} diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 25be0508..05a4bee7 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -70,11 +70,11 @@ $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart= $dsql->Execute('op'); while ($row = $dsql->GetObject('op')) { $topc = $row->id; - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1) "); $dsql->Execute('s'); while ($row = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } make_hash(); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index f0593949..2415a221 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -98,11 +98,11 @@ $typeids = explode(',', $row['typeid']); $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)"); $dsql->Execute('op'); while ($nrow = $dsql->GetObject('op')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)"); $dsql->Execute('s'); while ($nrow = $dsql->GetObject('s')) { - $typeOptions .= "\r\n"; + $typeOptions .= "\r\n"; } } make_hash(); diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 71144f7c..6700e036 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -43,7 +43,7 @@ 管理 {dede:datalist empty='暂无文档'} - + {dede:field.aid/} {dede:field.clsname function='TestType(@me,1)'/} {dede:field.adname/} diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index fef00138..1056001c 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -43,7 +43,7 @@
{dede:datalist empty='暂无文档'} - + {dede:field.keyword/} diff --git a/src/admin/templets/article_result_same.htm b/src/admin/templets/article_result_same.htm index 2e5608a1..7e5f2a0f 100644 --- a/src/admin/templets/article_result_same.htm +++ b/src/admin/templets/article_result_same.htm @@ -65,7 +65,7 @@ { if ($row['dd']==1 ) break; ?> - + {dede:datalist empty='暂无文档'} - + {dede:field.cardid/} diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 58342552..9e6be021 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -8,7 +8,6 @@ - - - +
@@ -36,12 +36,12 @@
请先阅读《站点授权协议》
-

欢迎使用DedeV

+

欢迎使用DedeV

- - + + 数据库设置
@@ -49,12 +49,12 @@ -
数据库类型一般为MySQL，SQLite仅用于开发调试，不建议生产中使用
+
数据库类型一般为MySQL，类型SQLite用于开发调试，不建议生产中使用
- +
@@ -68,13 +68,13 @@
-
请注意数据库名称默认为biz_
+
请注意DedeV6数据表前缀默认为biz_
-
+
@@ -82,25 +82,25 @@
- +
- + -
只能用[0-9a-zA-Z_@!.-]以内范围的字符
+
请使用[0-9a-zA-Z_@!.-]以内范围字符
- +
- -
在根目录安装时不必理会
+ +
根目录安装时不必理会
@@ -112,29 +112,29 @@
\ No newline at end of file diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index dfa1ca69..f16e0abb 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -114,6 +114,159 @@ body.hidemenu .body-right { left:0; transition:all .3s } +.coolbg { + padding:.25rem .65rem; + background:#f5f5f5; + border-bottom:1px solid #dee2e6; + border-radius:.2rem; + border:0; + cursor:pointer +} +.coolbg2 { + height:28px; + background:#dfddd2; + border:1px solid #dee2e6 +} +.coolbt { + background:#e4f7d7; + border-left:1px solid #efefef; + border-top:1px solid #efefef; + border-bottom:1px solid #acacac; + cursor:pointer +} +.coolbt2 { + background:#f7fcda; + border-left:1px solid #efefef; + border-top:1px solid #efefef; + border-bottom:1px solid #acacac +} +.coolbg3 { + width:140px; + height:28px; + background:#dfddd2; + border:1px solid #bdc5b4; + text-align:right +} +.coolbg61 { + width:390px; + height:28px; + line-height:28px; + background:#e7f3b1; + border-top:1px solid #bdc5b4; + border-left:1px solid #bdc5b4; + border-right:1px solid #bdc5b4; + text-align:right +} +.coolbg62 { + padding:.6rem; + width:390px; + height:300px; + background:#F8FDF0; + border:1px solid #bdc5b4 +} +.coolbg4 { + width:160px; + background:#fff; + border-bottom:1px solid #dee2e6; + text-align:right +} +.wsselect { + padding:.65rem 0; + background:#fff; + overflow:auto +} +.pubdlg { + background:#fff; + border:2px solid #1eb867; + border-radius:.2rem; + z-index:8888 +} +.pubdlg .title { + padding-left:.65rem; + line-height:30px; + font-weight:600; + color:#545b62; + background:#f5f5f5; + border-bottom:1px solid #dee2e6; + cursor:move +} +.fullpagediv { + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + background:#cdcdcd; + opacity:.6; + z-index:1999 +} +.quicksel { + margin-left:10px; + margin-top:10px; + width:680px; + height:420px; + overflow:auto; + z-index:10005 +} +.quickselfoot { + padding:.65rem 0; + border-top:1px solid #dee2e6 +} +.quickselItem { + display:block; + line-height:28px +} +.quickselItem .topcat { + padding:0 10px; + background:#e9ecef; + clear:both +} +.quickselItem .soncat { + padding:0 10px +} +.quickselItem .item { + display:inline-block; + padding-left:10px +} +.mysource,.mywriter { + width:300px; + background:#fff; + border:2px solid #1eb867; + z-index:10001 +} +.dlgws div { + padding:.65rem; + width:100% +} +#uploadfield { + float:left +} +#uploadwait { + z-index:19999 +} +.option1 { + background:#e9ecef +} +.option2 { + background:#adb5bd +} +.option3 { + background:#fff +} +.divpre img { + max-width:150px; + max-height:100px +} +.divpre { + overflow:hidden +} +.colordlg { + padding:.6rem; + width:120px; + background:#fff; + border:2px solid #1eb867; + z-index:10005 +} .body-left { position:absolute; top:60px; @@ -437,159 +590,6 @@ span.page-link { .btn+.btn,.btn-text+.btn-text { margin-left:1rem } -.coolbg { - padding:.25rem .65rem; - background:#f5f5f5; - border-bottom:1px solid #dee2e6; - border-radius:.2rem; - border:0; - cursor:pointer -} -.coolbg2 { - height:28px; - background:#dfddd2; - border:1px solid #dee2e6 -} -.coolbt { - background:#e4f7d7; - border-left:1px solid #efefef; - border-top:1px solid #efefef; - border-bottom:1px solid #acacac; - cursor:pointer -} -.coolbt2 { - background:#f7fcda; - border-left:1px solid #efefef; - border-top:1px solid #efefef; - border-bottom:1px solid #acacac -} -.coolbg3 { - width:140px; - height:28px; - background:#dfddd2; - border:1px solid #bdc5b4; - text-align:right -} -.coolbg61 { - width:390px; - height:28px; - line-height:28px; - background:#e7f3b1; - border-top:1px solid #bdc5b4; - border-left:1px solid #bdc5b4; - border-right:1px solid #bdc5b4; - text-align:right -} -.coolbg62 { - padding:.6rem; - width:390px; - height:300px; - background:#F8FDF0; - border:1px solid #bdc5b4 -} -.coolbg4 { - width:160px; - background:#fff; - border-bottom:1px solid #dee2e6; - text-align:right -} -.wsselect { - padding:.65rem 0; - background:#fff; - overflow:auto -} -.pubdlg { - background:#fff; - border:2px solid #1eb867; - border-radius:.2rem; - z-index:8888 -} -.pubdlg .title { - padding-left:.65rem; - line-height:30px; - font-weight:600; - color:#545b62; - background:#f5f5f5; - border-bottom:1px solid #dee2e6; - cursor:move -} -.fullpagediv { - position:absolute; - top:0; - left:0; - width:100%; - height:100%; - background:#cdcdcd; - opacity:.6; - z-index:1999 -} -.quicksel { - margin-left:10px; - margin-top:10px; - width:680px; - height:420px; - overflow:auto; - z-index:10005 -} -.quickselfoot { - padding:.65rem 0; - border-top:1px solid #dee2e6 -} -.quickselItem { - display:block; - line-height:28px -} -.quickselItem .topcat { - padding:0 10px; - background:#e9ecef; - clear:both -} -.quickselItem .soncat { - padding:0 10px -} -.quickselItem .item { - display:inline-block; - padding-left:10px -} -.mysource,.mywriter { - width:300px; - background:#fff; - border:2px solid #1eb867; - z-index:10001 -} -.dlgws div { - padding:.65rem; - width:100% -} -#uploadfield { - float:left -} -#uploadwait { - z-index:19999 -} -.option1 { - background:#e9ecef -} -.option2 { - background:#adb5bd -} -.option3 { - background:#fff -} -.divpre img { - max-width:150px; - max-height:100px -} -.divpre { - overflow:hidden -} -.colordlg { - padding:.6rem; - width:120px; - background:#fff; - border:2px solid #1eb867; - z-index:10005 -} #browsehappy { padding:20px 30px; font-size:14px; diff --git a/src/system/enums.func.php b/src/system/enums.func.php index 042d1a3f..d9e9ace1 100755 --- a/src/system/enums.func.php +++ b/src/system/enums.func.php @@ -124,7 +124,7 @@ function getTopData($egroup) return $data; } /** - * 获取数据的JS代码(二级联动) + * 获取数据的js二级联动代码 * * @access public * @param string $egroup 联动组 diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index c776e5c5..7f1ca9a8 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -171,9 +171,9 @@ class TypeLink $row = $this->dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$hid'"); $channeltype = $row['channeltype']; if ($row['ispart'] == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } } if ($channeltype == 0) $ctsql = ''; @@ -205,9 +205,9 @@ class TypeLink while ($row = $this->dsql->GetObject()) { if ($row->id != $hid) { if ($row->ispart == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } } $this->LogicGetOptionArray($row->id, "─", $oper); @@ -234,9 +234,9 @@ class TypeLink if (!in_array($row->id, $oper)) continue; } if ($row->ispart == 1) { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } else { - $this->OptionArrayList .= "\r\n"; + $this->OptionArrayList .= "\r\n"; } $this->LogicGetOptionArray($row->id, $step."─", $oper); } diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 27178831..3e7accfe 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -109,7 +109,7 @@ class TypeUnit echo ""; //普通列表 if ($ispart == 0) { - echo ""; + echo ""; echo "
"; + echo ""; echo "
列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; echo ""; @@ -122,7 +122,7 @@ class TypeUnit } //带封面的栏目 else if ($ispart == 1) { - echo "
"; + echo ""; echo "
封面{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; @@ -135,7 +135,7 @@ class TypeUnit } //独立页面 else if ($ispart == 2) { - echo "
"; + echo ""; echo "
外部{$nss}".$typeName."[id：".$id."]"; echo ""; echo ""; @@ -191,7 +191,7 @@ class TypeUnit } //普通列表 if ($ispart == 0) { - echo "
"; + echo ""; echo "
"; echo "$step列表{$nss}".$typeName."[id：".$id."]（文档数：".$this->GetTotalArc($id)."）"; echo ""; @@ -205,7 +205,7 @@ class TypeUnit } //封面栏目 else if ($ispart == 1) { - echo "
"; + echo ""; echo "
"; echo "$step封面{$nss}".$typeName."[id：".$id."]"; echo ""; @@ -219,7 +219,7 @@ class TypeUnit } //独立页面 else if ($ispart == 2) { - echo "
"; echo "$step外部{$nss}".$typeName."[id：".$id."]"; echo ""; diff --git a/src/user/inc/inc_catalog_options.php b/src/user/inc/inc_catalog_options.php index c98343fa..747edd7d 100755 --- a/src/user/inc/inc_catalog_options.php +++ b/src/user/inc/inc_catalog_options.php @@ -36,9 +36,9 @@ function GetOptionList($selid = 0, $channeltype = 0) } if ($row->channeltype == $channeltype && $row->issend == 1) { if ($row->ispart == 0) { - $OptionArrayList .= "\r\n"; + $OptionArrayList .= "\r\n"; } else if ($row->ispart == 1) { - $OptionArrayList .= "\r\n"; + $OptionArrayList .= "\r\n"; } } $selected = ''; @@ -68,9 +68,9 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0) } if ($row->channeltype == $channeltype && $row->issend == 1) { if ($row->ispart == 0) { - $OptionArrayList .= "\r\n"; + $OptionArrayList .= "\r\n"; } else if ($row->ispart == 1) { - $OptionArrayList .= "\r\n"; + $OptionArrayList .= "\r\n"; } } $selected = ''; @@ -98,7 +98,7 @@ function classification($mid, $mtypeid = 0, $channelid = 1) $selected = " selected"; } } - $list .= "\r\n"; + $list .= "\r\n"; $selected = ''; } return $list; diff --git a/src/user/templets/buy_action_payment.htm b/src/user/templets/buy_action_payment.htm index 65821ed0..07b65eb3 100755 --- a/src/user/templets/buy_action_payment.htm +++ b/src/user/templets/buy_action_payment.htm @@ -54,7 +54,7 @@ {dede:array.payment_list} - +
{dede:if value.code=="cod" || value.code=="bank"}