fixed conference button appearance time for non-admins

diff --git a/views/default/event_calendar/conference_button.php b/views/default/event_calendar/conference_button.php
index f6fedf4f6decbc5c0d19544deee72dd57ac6597d..baa30cc68889aecde2d7cbe115dc8e21f687fb8b 100644 (file)
--- a/views/default/event_calendar/conference_button.php
+++ b/views/default/event_calendar/conference_button.php
@@ -9,12 +9,12 @@ $event = $vars['event'];
 if ($event) {
        elgg_load_library('elgg:event_calendar');
        $user_guid = elgg_get_logged_in_user_guid();
-       $termination_time = $event->real_end_time + 60*60*24;
+       $termination_time = strtotime("1 day",$event->real_end_time);
        if ($termination_time < time()) {
                $in_time_window = FALSE;
        } else if ($event->canEdit()) {
                $in_time_window = TRUE;
-       } else if (event_calendar_has_personal_event($event->guid, $user_guid) && ($event->start_date - 15*60) >= time()) {
+       } else if (event_calendar_has_personal_event($event->guid, $user_guid) && (strtotime('-15 minutes',$event->start_date) <= time())) {
                $in_time_window = TRUE;
        } else {
                $in_time_window = FALSE;