优化管理员权限数据

src/admin/article_string_mix.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 防采集串混淆
+ * 防采集小工具
  *
  * @version        $id:article_string_mix.php 14:31 2010年7月12日 tianya $
  * @package        DedeBIZ.Administrator
@@ -31,8 +31,8 @@ if (empty($allsource) && filesize($m_file) > 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');

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'
         ),

src/admin/inc/inc_menu.php

@@ -61,10 +61,10 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='系统配置变量' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统日志管理' link='log_list.php' rank='sys_Log' target='main' />
     <m:item name='系统会员管理' link='sys_admin_user.php' rank='sys_User' target='main' />
-    <m:item name='会员组设置' link='sys_group.php' rank='sys_Group' target='main' />
+    <m:item name='系统会员组管理' link='sys_group.php' rank='sys_Group' target='main' />
     <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
     <m:item name='软件下载设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
-    <m:item name='防采集串混淆' link='article_string_mix.php' rank='sys_StringMix' target='main' />
+    <m:item name='防采集小工具' link='article_string_mix.php' rank='sys_StringMix' target='main' />
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='SQL命令工具' link='sys_sql_query.php' rank='sys_Data' target='main' />")."
     <m:item name='文件扫描工具' link='sys_safetest.php' rank='sys_verify' target='main' />

src/admin/inc/inc_menu_func.php

@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/../config.php");
 require_once(DEDEINC."/dedetag.class.php");
-$headTemplet = '<li id="~name~"><div class="link"><i class="fa ~icon~"></i>~channelname~<i class="fa fa-angle-down"></i></div><ul class="submenu">';
+$headTemplet = '<li><div class="link"><i class="fa ~icon~"></i>~channelname~<i class="fa fa-angle-down"></i></div><ul class="submenu">';
 $footTemplet = "</ul></li>";
 $itemTemplet = "<li>~link~</li>";
 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 = "<a href='".$ctag2->GetAtt('link')."' target='".$ctag2->GetAtt('target')."'>".$ctag2->GetAtt('name')."</a>";
                     if ($ischannel == '1') {
                         if ($ctag2->GetAtt('addico') != '') {
@@ -62,9 +58,6 @@ function GetMenus($userrank, $topos = 'main')
                     echo $itemtmp;
                 }
             }
-            if (!$hasItem) {
-                echo "<script>if(document.querySelector('#{$id}') !== null) document.querySelector('#{$id}').style.display='none'</script>";
-            }
             echo $footTemplet;
         }
     }

src/admin/templets/sys_admin_user.htm

@@ -18,7 +18,7 @@
 							<td width="30%">系统会员管理</td>
 							<td width="70%" align="right">
 								<a href="sys_admin_user_add.php" class="btn btn-success btn-sm">增加管理员</a>
-								<a href="sys_group.php" class="btn btn-success btn-sm">会员组管理</a>
+								<a href="sys_group.php" class="btn btn-success btn-sm">系统会员组管理</a>
 								<a href="sys_admin_user_tj.php" class="btn btn-success btn-sm">绩效统计</a>
 							</td>
 						</tr>

src/admin/templets/sys_admin_user_add.htm

@@ -71,7 +71,7 @@
 							}
 							?>
 						</select>
-						<a href="sys_group.php" class="btn btn-success btn-sm">会员组设置</a>
+						<a href="sys_group.php" class="btn btn-success btn-sm">系统会员组管理</a>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/sys_group.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>会员组设置</title>
+		<title>系统会员组管理</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -16,10 +16,10 @@
 					<td bgcolor="#f5f5f5" colspan="3">
 						<table cellspacing="1" cellpadding="1" class="table table-borderless w-100">
 							<tr>
-								<td width="30%">会员组设置</td>
+								<td width="30%">系统会员组管理</td>
 								<td width="70%" align="right">
 									<a href="sys_group_add.php" class="btn btn-success btn-sm">增加会员组</a>
-									<a href="sys_admin_user.php" class="btn btn-success btn-sm">管理系统会员</a>
+									<a href="sys_admin_user.php" class="btn btn-success btn-sm">系统会员管理</a>
 								</td>
 							</tr>
 						</table>

src/admin/templets/sys_group_add.htm

@@ -13,7 +13,7 @@
 			<form name="form1" action="sys_group_add.php" method="post">
 				<input type="hidden" name="dopost" value="save">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="sys_group.php">会员组设置</a> &gt; 增加会员组</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="sys_group.php">系统会员组管理</a> &gt; 增加会员组</td>
 				</tr>
 				<tr>
 					<td width="90">组名称：</td>

src/admin/templets/sys_group_edit.htm

@@ -13,7 +13,7 @@
 			<form name="form1" action="sys_group_edit.php" method="post">
 				<input type="hidden" name="dopost" value="save">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="sys_group.php">会员组设置</a> &gt; 修改会员组</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="sys_group.php">系统会员组管理</a> &gt; 修改会员组</td>
 				</tr>
 				<tr>
 					<td width="90">组名称：</td>

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','推荐'),

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 '',