diff --git a/src/admin/article_string_mix.php b/src/admin/article_string_mix.php index 75f036e8..defbde8a 100644 --- a/src/admin/article_string_mix.php +++ b/src/admin/article_string_mix.php @@ -1,6 +1,6 @@ 0) { fclose($fp); } make_hash(); -$wintitle = "防采集串混淆"; -$wecome_info = "防采集串混淆"; +$wintitle = "防采集小工具"; +$wecome_info = "防采集小工具"; $win = new OxWindow(); $win->Init('article_string_mix.php', 'js/blank.js', 'POST'); $win->AddHidden('dopost', 'save'); diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index 8935f1f3..4133f899 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -328,7 +328,7 @@ $actionSearch[9] = array( 'linkurl' => 'sys_admin_user.php' ), 2 => array( - 'title' => '会员组设置', + 'title' => '系统会员组管理', 'description' => '网站管理员组别的划分', 'purview' => 'sys_Group', 'linkurl' => 'sys_group.php' @@ -358,8 +358,8 @@ $actionSearch[9] = array( 'linkurl' => 'soft_config.php' ), 7 => array( - 'title' => '防采集串混淆', - 'description' => '网站防采集串混淆', + 'title' => '防采集小工具', + 'description' => '网站防采集小工具', 'purview' => 'sys_StringMix', 'linkurl' => 'article_string_mix.php' ), diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index fb099ef1..389c64d8 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -61,10 +61,10 @@ if ($cuserLogin->getUserType() >= 10) { - + - + ".(DEDEBIZ_SAFE_MODE? "" : "")." ".(DEDEBIZ_SAFE_MODE? "" : "")." diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php index b8ab4be7..6a279d79 100644 --- a/src/admin/inc/inc_menu_func.php +++ b/src/admin/inc/inc_menu_func.php @@ -10,7 +10,7 @@ */ require_once(dirname(__FILE__)."/../config.php"); require_once(DEDEINC."/dedetag.class.php"); -$headTemplet = '
  • ~channelname~
      '; +$headTemplet = '
    • ~channelname~
        '; $footTemplet = "
      • "; $itemTemplet = "
    • ~link~
      • "; function GetMenus($userrank, $topos = 'main') @@ -29,11 +29,9 @@ function GetMenus($userrank, $topos = 'main') $dtp2 = new DedeTagParse(); $dtp2->SetNameSpace('m', '<', '>'); foreach ($dtp->CTags as $i => $ctag) { - $id = "id".md5($ctag->GetAtt("name")); if ($ctag->GetName() == 'top' && ($ctag->GetAtt('rank') == '' || TestPurview($ctag->GetAtt('rank')))) { if ($openitem != 999 && !preg_match("#".$openitem.'_'."#", $ctag->GetAtt('item')) && $openitem != 100) continue; $htmp = str_replace("~channelname~", $ctag->GetAtt("name"), $headTemplet); - $htmp = str_replace("~name~", $id, $htmp); $icon = 'fa-plug'; if ($ctag->GetAtt('icon') != '') { $icon = $ctag->GetAtt('icon'); @@ -41,11 +39,9 @@ function GetMenus($userrank, $topos = 'main') $htmp = str_replace('~icon~', $icon, $htmp); echo $htmp; $dtp2->LoadSource($ctag->InnerText); - $hasItem = false; foreach ($dtp2->CTags as $j => $ctag2) { $ischannel = trim($ctag2->GetAtt('ischannel')); if ($ctag2->GetName() == 'item' && ($ctag2->GetAtt('rank') == '' || TestPurview($ctag2->GetAtt('rank')))) { - $hasItem = true; $link = "".$ctag2->GetAtt('name').""; if ($ischannel == '1') { if ($ctag2->GetAtt('addico') != '') { @@ -62,9 +58,6 @@ function GetMenus($userrank, $topos = 'main') echo $itemtmp; } } - if (!$hasItem) { - echo ""; - } echo $footTemplet; } } diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index 918a01bd..b74d8428 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -18,7 +18,7 @@ 系统会员管理 增加管理员 - 会员组管理 + 系统会员组管理 绩效统计 diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index da3d7f71..69ee3f9e 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -71,7 +71,7 @@ } ?> - 会员组设置 + 系统会员组管理 diff --git a/src/admin/templets/sys_group.htm b/src/admin/templets/sys_group.htm index 5795a83e..a3a181dd 100644 --- a/src/admin/templets/sys_group.htm +++ b/src/admin/templets/sys_group.htm @@ -3,7 +3,7 @@ - 会员组设置 + 系统会员组管理 @@ -16,10 +16,10 @@ - +
      会员组设置系统会员组管理 增加会员组 - 管理系统会员 + 系统会员管理
      diff --git a/src/admin/templets/sys_group_add.htm b/src/admin/templets/sys_group_add.htm index ff795519..3bdf9767 100644 --- a/src/admin/templets/sys_group_add.htm +++ b/src/admin/templets/sys_group_add.htm @@ -13,7 +13,7 @@
      - 会员组设置 > 增加会员组 + 系统会员组管理 > 增加会员组 组名称： diff --git a/src/admin/templets/sys_group_edit.htm b/src/admin/templets/sys_group_edit.htm index 6d548071..96eeeb3a 100644 --- a/src/admin/templets/sys_group_edit.htm +++ b/src/admin/templets/sys_group_edit.htm @@ -13,7 +13,7 @@ - 会员组设置 > 修改会员组 + 系统会员组管理 > 修改会员组 组名称： diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index 72104a1f..4f969faf 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -1,6 +1,6 @@ -INSERT INTO `#@__admintype` VALUES ('1','信息发布员','1','t_AccList a_AccNew a_AccList a_MyList a_MyEdit a_MyDel sys_MdPwd sys_Feedback sys_MyUpload plus_留言簿模块 '), -('5','栏目管理员','1','t_AccList t_AccNew t_AccEdit t_AccDel a_AccNew a_AccList a_AccEdit a_AccDel a_AccCheck a_MyList a_MyEdit a_MyDel a_MyCheck spec_New spec_List spec_Edit sys_MdPwd sys_Log sys_ArcTj sys_Source sys_Writer sys_Keyword sys_MakeHtml sys_Feedback sys_Upload sys_MyUpload member_List member_Edit plus_站内新闻发布 plus_友情链接模块 plus_留言簿模块 plus_投票模块 plus_广告管理 '), -('10','超级管理员','1','admin_AllowAll '); +INSERT INTO `#@__admintype` VALUES ('1','文档员','1','t_AccList a_AccNew a_AccList a_MyList a_MyEdit a_MyDel sys_MdPwd sys_ArcBatch sys_Feedback sys_MyUpload'), +('5','栏目员','1','t_AccList t_AccNew t_AccEdit t_AccDel a_AccNew a_AccList a_AccEdit a_AccDel a_AccCheck a_MyList a_MyEdit a_MyDel a_MyCheck spec_New spec_List spec_Edit sys_MdPwd sys_ArcBatch sys_Log sys_ArcTj sys_Source sys_Writer sys_Keyword sys_MakeHtml sys_Feedback sys_Upload sys_MyUpload member_List member_Edit plus_友情链接模块 plus_投票模块 plus_广告管理'), +('10','管理员','1','admin_AllowAll'); INSERT INTO `#@__arcatt` VALUES ('1','h','头条'), ('2','c','推荐'), diff --git a/src/install/update.txt b/src/install/update.txt index 0a07f43f..3cbe41ad 100644 --- a/src/install/update.txt +++ b/src/install/update.txt @@ -30,16 +30,14 @@ CREATE TABLE `#@__search_limits` ( ) TYPE=MyISAM; -- 6.1.0 -ALTER TABLE `#@__arctype` - ADD COLUMN `namegk` varchar(255) NULL AFTER `typename`, +ALTER TABLE `#@__arctype` ADD COLUMN `namegk` varchar(255) NULL AFTER `typename`, ADD COLUMN `enname` varchar(255) NULL AFTER `namegk`, ADD COLUMN `ennamegk` varchar(255) NULL AFTER `enname`, ADD COLUMN `litpic` varchar(255) NULL AFTER `ennamegk`, ADD COLUMN `litimg` varchar(255) NULL AFTER `litpic`; -- 6.1.7 -CREATE TABLE `#@__statistics` ( - `id` int NOT NULL AUTO_INCREMENT, +CREATE TABLE `#@__statistics` (`id` int NOT NULL AUTO_INCREMENT, `sdate` int DEFAULT NULL COMMENT '记录日期', `pv` int DEFAULT NULL COMMENT 'PV', `uv` int DEFAULT NULL COMMENT 'UV', @@ -47,8 +45,7 @@ CREATE TABLE `#@__statistics` ( `vv` int DEFAULT NULL COMMENT 'vv', PRIMARY KEY (`id`) ) TYPE=MyISAM; -CREATE TABLE `#@__statistics_detail` ( - `id` int NOT NULL AUTO_INCREMENT, +CREATE TABLE `#@__statistics_detail` (`id` int NOT NULL AUTO_INCREMENT, `t` int DEFAULT NULL COMMENT 'unixtime', `created_date` int DEFAULT NULL COMMENT '日期，20220326', `created_hour` int DEFAULT NULL COMMENT '时间，12', @@ -110,8 +107,7 @@ ALTER TABLE `#@__member` ADD COLUMN `send_max` int NULL DEFAULT 1 AFTER `loginer INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ('cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); -- 6.2.4 -CREATE TABLE `#@__sys_payment` ( - `id` int(11) unsigned NOT NULL auto_increment, +CREATE TABLE `#@__sys_payment` (`id` int(11) unsigned NOT NULL auto_increment, `code` varchar(20) NOT NULL DEFAULT '', `name` varchar(32) NOT NULL DEFAULT '', `short_name` varchar(32) DEFAULT '',