diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 473f5e4e7..788700463 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -228,12 +228,9 @@ class ModuleHandler extends Handler
{
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($this->document_srl);
- if($oDocument->isSecret() || $oDocument->get('status') === $oDocumentModel->getConfigStatus('temp'))
+ if(!$oDocument->isAccessible())
{
- if(!$oDocument->isGranted() && !$oDocument->isAccessible())
- {
- $this->httpStatusCode = '403';
- }
+ $this->httpStatusCode = '403';
}
}
}
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index fc143777b..2ff089812 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -328,13 +328,12 @@ class boardView extends board
));
// update the document view count (if the document is not secret)
- if(!$oDocument->isSecret() || $oDocument->isGranted())
+ if($oDocument->isAccessible())
{
$oDocument->updateReadedCount();
}
-
// disappear the document if it is secret
- if($oDocument->isSecret() && !$oDocument->isGranted())
+ else
{
$oDocument->add('content',lang('thisissecret'));
}
diff --git a/modules/board/m.skins/default/read.html b/modules/board/m.skins/default/read.html
index 8edf5975e..00cb61c47 100644
--- a/modules/board/m.skins/default/read.html
+++ b/modules/board/m.skins/default/read.html
@@ -8,7 +8,7 @@
{$lang->cmd_write}
-
+
-
+
-
+
| {$val->name} |
@@ -31,7 +31,7 @@
-
+
-
+
| {$val->name} |
@@ -35,7 +35,7 @@