修正栏目授权错误

src/admin/inc/inc_menu.php

@@ -62,6 +62,7 @@ if ($cuserLogin->getUserType() >= 10) {
     <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_info_mark.php' rank='sys_Edit' target='main' />
+    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' 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' />
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
@@ -82,7 +83,6 @@ $menusMain = "<m:top item='1_' name='常用功能' icon='fa fa-desktop'>
 </m:top>
 <m:top item='2_' name='文档管理' icon='fa fa-file-text'>
     $addset
-    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
 </m:top>
 <m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa fa-folder'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />

src/admin/sys_admin_user_add.php

@@ -66,17 +66,19 @@ if ($dopost == 'add') {
 $randcode = mt_rand(10000, 99999);
 $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
 $typeOptions = '';
-$dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)");
-$dsql->Execute('op');
-while ($row = $dsql->GetObject('op')) {
-    $topc = $row->id;
-    $typeOptions .= "<option value='{$row->id}'>{$row->typename}</option>\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 .= "<option value='{$row->id}'>└─ {$row->typename}</option>\r\n";
+//递归获取分类
+function getTypeOptions($id=0,$sep="└")
+{
+    global $dsql,$typeOptions;
+    $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank");
+    $dsql->Execute($id);
+    while ($nrow = $dsql->GetObject($id)) {
+        $isDisabled = $nrow->ispart==2? " disabled" : "";
+        $typeOptions .= "<option value='{$nrow->id}'{$isDisabled}>{$sep}{$nrow->typename}</option>\r\n";
+        getTypeOptions($nrow->id, $sep."─");
     }
 }
+getTypeOptions(0);
 make_hash();
 include DedeInclude('templets/sys_admin_user_add.htm');
 ?>

src/admin/sys_admin_user_edit.php

@@ -107,19 +107,22 @@ if ($dopost == 'saveedit') {
 //显示管理员信息
 $randcode = mt_rand(10000, 99999);
 $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24);
+//递归获取分类
+function getTypeOptions($id=0,$sep="└")
+{
+    global $dsql,$typeOptions,$typeids;
+    $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank");
+    $dsql->Execute($id);
+    while ($nrow = $dsql->GetObject($id)) {
+        $isDisabled = $nrow->ispart==2? " disabled" : "";
+        $typeOptions .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '')."{$isDisabled}>{$sep}{$nrow->typename}</option>\r\n";
+        getTypeOptions($nrow->id, $sep."─");
+    }
+}
 $typeOptions = '';
 $row = $dsql->GetOne("SELECT * FROM `#@__admin` WHERE id='$id'");
 $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 .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">{$nrow->typename}</option>\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 .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">└─ {$nrow->typename}</option>\r\n";
-    }
-}
+getTypeOptions(0);
 make_hash();
 include DedeInclude('templets/sys_admin_user_edit.htm');
 ?>

src/system/typelink/typeunit.class.admin.php

@@ -137,6 +137,7 @@ class TypeUnit
                 echo "<td class='admin-td'><table width='100%'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td>";
                 echo "<td align='right'><a href='{$typeDir}' target='_blank' title='预览' class='btn btn-light btn-sm'><i class='fa fa-eye'></i></a>";
+                echo "<a href='catalog_add.php?id={$id}' title='添加' class='btn btn-light btn-sm'><i class='fa fa-plus-circle'></i></a>";
                 echo "<a href='catalog_edit.php?id={$id}' title='修改' class='btn btn-light btn-sm'><i class='fa fa-pencil-square'></i></a>";
                 echo "<a href='catalog_do.php?dopost=moveCatalog&typeid={$id}' title='移动' class='btn btn-light btn-sm'><i class='fa fa-share-square'></i></a>";
                 echo "<a href='catalog_del.php?id={$id}&typeoldname=".urlencode($typeName)."' title='删除' class='btn btn-danger btn-sm'><i class='fa fa-trash'></i></a>";