Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/382] Clean up calendar module

Browse Source 
B3P-382
This commit is contained in:
Marc Alexander
2014-10-31 07:31:37 +01:00
parent 361c0d9729
commit 51e94518f4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calendar.php
View File

@@ -51,6 +51,7 @@ class calendar extends module_base
* additional variables
*/
protected $mini_cal_fdow;
protected $mini_cal_month;
/**
* User datetime object
@@ -177,7 +178,6 @@ class calendar extends module_base
$mini_cal_count = $this->mini_cal_fdow;
$mini_cal_this_year = $this->dateYYYY;
$mini_cal_this_month = $this->dateMM;
$mini_cal_this_day = $this->dateDD;
$mini_cal_month_days = $this->daysMonth;
// output our general calendar bits
@@ -264,6 +264,7 @@ class calendar extends module_base
if (!empty($events) && $this->config['board3_display_events_' . $module_id])
{
$time_ary = array();
// we sort the $events array by the start time
foreach ($events as $key => $cur_event)
{
@@ -520,6 +521,7 @@ class calendar extends module_base
$this->log->add('admin', $this->user->data['user_id'], $this->user->data['user_ip'], 'LOG_PORTAL_EVENT_ADDED', false, array($event_title));
}
$time_ary = array();
// we sort the $events array by the start time
foreach ($events as $key => $cur_event)
{
@@ -601,8 +603,6 @@ class calendar extends module_base
$this->db->sql_freeresult($result);
return;
break;
}
for ($i = 0; $i < sizeof($events); $i++)
@@ -618,7 +618,7 @@ class calendar extends module_base
'EVENT_TITLE' => ($action != 'add') ? ((isset($this->user->lang[$events[$i]['title']])) ? $this->user->lang[$events[$i]['title']] : $events[$i]['title']) : '',
'EVENT_DESC' => ($action != 'add') ? $events[$i]['desc'] : '',
'EVENT_START' => ($action != 'add') ? $this->user->format_date($events[$i]['start_time'], $start_time_format) : '',
'EVENT_END' => ($action != 'add' && !$event_all_day) ? $this->user->format_date($events[$i]['end_time'], $end_time_format) : '',
'EVENT_END' => ($action != 'add' && !$event_all_day && !empty($end_time_format)) ? $this->user->format_date($events[$i]['end_time'], $end_time_format) : '',
'EVENT_URL' => ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? $this->validate_url($events[$i]['url']) : '',
'EVENT_URL_RAW' => ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? $events[$i]['url'] : '',
'U_EDIT' => $u_action . '&amp;action=edit&amp;id=' . $i,