From e627f1aadc2ecac8ee1e205769471080086f6e17 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 12 Apr 2023 15:07:24 +0800
Subject: [PATCH] * Code for bug #34068.

---
 module/doc/lang/de.php    | 4 ++--
 module/doc/lang/en.php    | 4 ++--
 module/doc/lang/fr.php    | 4 ++--
 module/doc/lang/zh-cn.php | 4 ++--
 module/doc/model.php      | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 6946d41980..0dfd8ae17c 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -258,8 +258,8 @@ $lang->doc->createList['word']     = 'Word';
 $lang->doc->createList['ppt']      = 'PPT';
 $lang->doc->createList['excel']    = 'Excel';
 
-$lang->doc->types['doc'] = 'WIKI';
-$lang->doc->types['api'] = 'API';
+$lang->doc->types['text'] = 'WIKI';
+$lang->doc->types['api']  = 'API';
 
 $lang->doc->contentTypeList['html']     = 'HTML';
 $lang->doc->contentTypeList['markdown'] = 'MarkDown';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 7dbcaaf756..4aafcdd03c 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -258,8 +258,8 @@ $lang->doc->createList['word']     = 'Word';
 $lang->doc->createList['ppt']      = 'PPT';
 $lang->doc->createList['excel']    = 'Excel';
 
-$lang->doc->types['doc'] = 'WIKI';
-$lang->doc->types['api'] = 'API';
+$lang->doc->types['text'] = 'WIKI';
+$lang->doc->types['api']  = 'API';
 
 $lang->doc->contentTypeList['html']     = 'HTML';
 $lang->doc->contentTypeList['markdown'] = 'MarkDown';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 631df9e298..0307b81daf 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -258,8 +258,8 @@ $lang->doc->createList['word']     = 'Word';
 $lang->doc->createList['ppt']      = 'PPT';
 $lang->doc->createList['excel']    = 'Excel';
 
-$lang->doc->types['doc'] = 'WIKI';
-$lang->doc->types['api'] = 'API';
+$lang->doc->types['text'] = 'WIKI';
+$lang->doc->types['api']  = 'API';
 
 $lang->doc->contentTypeList['html']     = 'HTML';
 $lang->doc->contentTypeList['markdown'] = 'MarkDown';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index b4d576f400..ac8c31b8b1 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -258,8 +258,8 @@ $lang->doc->createList['word']     = 'Word';
 $lang->doc->createList['ppt']      = 'PPT';
 $lang->doc->createList['excel']    = 'Excel';
 
-$lang->doc->types['doc'] = 'WIKI文档';
-$lang->doc->types['api'] = '接口文档';
+$lang->doc->types['text'] = 'WIKI文档';
+$lang->doc->types['api']  = '接口文档';
 
 $lang->doc->contentTypeList['html']     = 'HTML';
 $lang->doc->contentTypeList['markdown'] = 'MarkDown';
diff --git a/module/doc/model.php b/module/doc/model.php
index dcb5c0cd2d..935b668431 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -767,6 +767,7 @@ class docModel extends model
             $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
             if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(inlink('index')));
             helper::end(print(js::locate('back')));
+            die;
         }
 
         $docs = $this->processCollector(array($doc->id => $doc));
@@ -1321,6 +1322,7 @@ class docModel extends model
     public function checkPrivDoc($object)
     {
         if(!isset($object->lib)) return false;
+        if(isset($object->assetLibType) and $object->assetLibType) return true;
 
         $libType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($object->lib)->fetch('type');
         if($this->app->user->admin and $libType != 'mine') return true;