aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-23 01:05:31 +0100
committerSem <sembrestels@riseup.net>2012-11-23 01:05:31 +0100
commit39bca929f875ca6e9bd422b112d1e48b717fa126 (patch)
treedb17973fedc2bb72ba25dbfde6513e5194c69be2 /views/default
parent58eebf19ad92aa1c3247aaec4f61e1440a81523a (diff)
parent75bd3af84a76345928a831eecbc5d0f99f9fead4 (diff)
downloadelgg-39bca929f875ca6e9bd422b112d1e48b717fa126.tar.gz
elgg-39bca929f875ca6e9bd422b112d1e48b717fa126.tar.bz2
Merge branch 'full' of git://github.com/kevinjardine/Elgg-Event-Calendar
Diffstat (limited to 'views/default')
-rw-r--r--views/default/event_calendar/conference_button.php9
-rw-r--r--views/default/forms/event_calendar/edit.php2
2 files changed, 6 insertions, 5 deletions
diff --git a/views/default/event_calendar/conference_button.php b/views/default/event_calendar/conference_button.php
index f6fedf4f6..79fa9c5a2 100644
--- a/views/default/event_calendar/conference_button.php
+++ b/views/default/event_calendar/conference_button.php
@@ -2,29 +2,30 @@
// A non-admin / non-event-creator only sees the button if they have the event on his/her personal calendar
// and it is at most 15 minutes before the conference starts.
-// The button is removed for everyone (even admins) one day after the conference ends.
+// The button is removed for everyone (even admins) one day after the event end time.
$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;
}
if ( $in_time_window ) {
$button = elgg_view('output/url', array(
- 'href' => event_calendar_get_join_bbb_url($event),
+ 'href' => 'action/event_calendar/join_conference?event_guid='.$event->guid,
'text' => elgg_echo('event_calendar:join_conf_button'),
'class' => 'elgg-button elgg-button-action',
'target' => '_blank',
+ 'is_action' => TRUE,
));
echo '<div class="event-calendar-conf-join-button">'.$button.'</div>';
diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php
index d45fb387b..747dae0f0 100644
--- a/views/default/forms/event_calendar/edit.php
+++ b/views/default/forms/event_calendar/edit.php
@@ -7,7 +7,7 @@ $schedule_options = array(
elgg_echo('event_calendar:schedule_type:fixed')=>'fixed',
);
-if (elgg_plugin_exists('event_poll')) {
+if (elgg_is_active_plugin('event_poll')) {
$schedule_options = array_merge(array(elgg_echo('event_calendar:schedule_type:poll')=>'poll'),$schedule_options);
}