From bd803ac7e411d85c969f80ee62ed73c5cb3b67ea Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Wed, 21 Jul 2010 10:19:38 +0000
Subject: [PATCH] SCORM MDL-23422 fix logic for displaying closed messages.

---
 mod/scorm/view.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index 5cb79245a86..f7d874c1e61 100755
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -77,14 +77,13 @@
 
     $scormopen = true;
     $timenow = time();
-    if ($scorm->timeclose !=0) {
-        if ($scorm->timeopen > $timenow) {
-            echo $OUTPUT->box(get_string("notopenyet", "scorm", userdate($scorm->timeopen)), "generalbox boxaligncenter");
-            $scormopen = false;
-        } else if ($timenow > $scorm->timeclose) {
-            echo $OUTPUT->box(get_string("expired", "scorm", userdate($scorm->timeclose)), "generalbox boxaligncenter");
-            $scormopen = false;
-        }
+    if (!empty($scorm->timeopen) && $scorm->timeopen > $timenow) {
+        echo $OUTPUT->box(get_string("notopenyet", "scorm", userdate($scorm->timeopen)), "generalbox boxaligncenter");
+        $scormopen = false;
+    }
+    if (!empty($scorm->timeclose) && $timenow > $scorm->timeclose) {
+        echo $OUTPUT->box(get_string("expired", "scorm", userdate($scorm->timeclose)), "generalbox boxaligncenter");
+        $scormopen = false;
     }
     if ($scormopen) {
         scorm_view_display($USER, $scorm, 'view.php?id='.$cm->id, $cm);