From 77b8cb76f8efcd48f006cb055cc9564382a89599 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 9 Jan 2017 09:47:06 +0800
Subject: [PATCH]  * finish task #2840.

---
 module/doc/model.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index cb311a0596..7b738e53e2 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -99,7 +99,7 @@ class docModel extends model
      */
     public function getLibByObject($type, $objectID)
     {
-        return $this->dao->select('*')->from(TABLE_DOCLIB)->where($type)->eq($objectID)->fetchAll('id');
+        return $this->dao->select('*')->from(TABLE_DOCLIB)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->fetchAll('id');
     }
 
     /**
@@ -316,6 +316,8 @@ class docModel extends model
         if(!$this->checkPriv($doc))
         {
             echo(js::alert($this->lang->doc->accessDenied));
+            $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) die(js::locate(inlink('index')));
             die(js::locate('back'));
         }
         $version = $version ? $version : $doc->version;
@@ -1173,6 +1175,8 @@ class docModel extends model
         if(!$this->checkPriv($lib)) 
         {
             echo(js::alert($this->lang->doc->accessDenied));
+            $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) die(js::locate(inlink('index')));
             die(js::locate('back'));
         }