fixes #253

1 files changed, 28 insertions, 0 deletions

diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php
index a2698e1..0637bd7 100755
--- a/lib/models/Courseware/StructuralElement.php
+++ b/lib/models/Courseware/StructuralElement.php
@@ -238,6 +238,10 @@ class StructuralElement extends \SimpleORMap
             return true;
         }
 
+        if (!$this->releasedForReaders($this)) {
+            return false;
+        }
+
         if (!count($this->read_approval)) {
             return $this->canReadSequential($user);
         }
@@ -283,6 +287,30 @@ class StructuralElement extends \SimpleORMap
     }
 
     /**
+     * @return bool true if the user may read this instance in time interval
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    private function releasedForReaders(StructuralElement $element): bool
+    {
+        $released = false;
+        if (!$element->release_date || $element->release_date <= time()) {
+            $released = true;
+        }
+
+        if ($element->withdraw_date && $element->withdraw_date <= time()) {
+            $released = false;
+        }
+
+        $parent_released = true;
+        if (!$element->isRootNode()) {
+            $parent_released = $this->releasedForReaders($element->parent);
+        }
+
+        return $released && $parent_released;
+    }
+
+    /**
      * @param mixed $user the user to validate
      *
      * @return bool true if the user has achieved previous elements