mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 04:32:01 +02:00
Code Issues Releases Wiki Activity

Reflect 1.x bug #5376 - handle servers not in UTC timezone

Browse Source
This commit is contained in:
SteveD 2013-02-17 10:43:21 +00:00
parent a4ce03f454
commit c000634335
3 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
e107_plugins/calendar_menu/calendar.php
View File

@ -33,22 +33,22 @@ if (!$e107->isInstalled('calendar_menu')) header('Location: '.e_BASE.'index.php'
if (isset($_POST['viewallevents']))
{
Header('Location: '.e_PLUGIN.'calendar_menu/event.php?'.intval($_POST['enter_new_val']));
exit;
Header('Location: '.e_PLUGIN_ABS.'calendar_menu/event.php?' . $_POST['enter_new_val']);
exit();
}
if (isset($_POST['doit']))
{
Header('Location: '.e_PLUGIN.'calendar_menu/event.php?ne.'.intval($_POST['enter_new_val']));
exit;
Header('Location: '.e_PLUGIN_ABS.'calendar_menu/event.php?ne.' . $_POST['enter_new_val']);
exit();
}
if (isset($_POST['subs']))
{
Header('Location: '.e_PLUGIN.'calendar_menu/subscribe.php');
exit;
Header('Location: '.e_PLUGIN_ABS.'calendar_menu/subscribe.php');
exit();
}
if (isset($_POST['printlists']))
{
Header('Location: '.e_PLUGIN.'calendar_menu/ec_pf_page.php');
Header('Location: '.e_PLUGIN_ABS.'calendar_menu/ec_pf_page.php');
exit();
}
@ -83,7 +83,7 @@ unset($dateArray);
if (e_QUERY)
{
$qs = explode('.', e_QUERY); // Get date from query
$dateArray = getdate($qs[0]);
$dateArray = $ecal_class->gmgetdate($qs[0]);
}
if (!isset($dateArray))
{ // Show current month
@ -99,8 +99,8 @@ $nowday = $ecal_class->cal_date['mday'];
// Set date window for display
$monthstart = mktime(0, 0, 0, $month, 1, $year); // Start of month to be shown
$monthend = mktime(0, 0, 0, $month + 1, 1, $year) - 1; // End of month to be shown
$monthstart = gmmktime(0, 0, 0, $month, 1, $year); // Start of month to be shown
$monthend = gmmktime(0, 0, 0, $month + 1, 1, $year) - 1; // End of month to be shown
$calSc->ecalClass = &$ecal_class;
@ -128,51 +128,51 @@ $events = array();
foreach ($ev_list as $row)
{
$row['startofevent'] = TRUE; // This sets 'large print' and so on for the first day of an event
// check for recurring events in this month (could also use is_array($row['event_start']) as a test)
if($row['event_recurring'] != '0')
{ // There could be several dates for the same event, if its a daily/weekly event
$t_start = $row['event_start'];
$t_start = $row['event_start'];
foreach ($t_start as $ev_start)
{
// Need to save event, copy marker for date
$row['event_start'] = $ev_start;
$events[date('j',$ev_start)][] = $row;
$row['event_start'] = $ev_start;
$events[gmdate('j',$ev_start)][] = $row;
}
}
else
{ // Its a 'normal' event
$tmp = date('j',$row['event_start']); // Day of month for start
$tmp = gmdate('j',$row['event_start']); // Day of month for start
if ($row['event_allday'])
{
$tmp2 = $tmp; // Same day for start and end
}
else
{
$tmp2 = date('j',$row['event_end']-1); // Day of month for end - knock off a second to allow for BST and suchlike
$tmp2 = gmdate('j',$row['event_end']-1); // Day of month for end - knock off a second to allow for BST and suchlike
}
if(($row['event_start']>=$monthstart) && ($row['event_start']<=$monthend))
{ // Start within month
$events[$tmp][] = $row;
$tmp++;
if ($row['event_end']>$monthend)
{ // End outside month
$tmp2 = date("t", $monthstart); // number of days in this month
}
$events[$tmp][] = $row;
$tmp++;
if ($row['event_end']>$monthend)
{ // End outside month
$tmp2 = gmdate("t", $monthstart); // number of days in this month
}
}
else
{ // Start before month
$tmp = 1;
if ($row['event_end']>$monthend)
{ // End outside month
$tmp2 = date("t", $monthstart); // number of days in this month
}
$tmp = 1;
if ($row['event_end']>$monthend)
{ // End outside month
$tmp2 = gmdate("t", $monthstart); // number of days in this month
}
}
// Now put in markers for all 'non-start' days within current month
$row['startofevent'] = FALSE;
for ($c= $tmp; $c<=$tmp2; $c++)
{
$events[$c][] = $row;
$events[$c][] = $row;
}
}
}
@ -182,7 +182,7 @@ foreach ($ev_list as $row)
// ****** CAUTION - the category dropdown also used $sql object - take care to avoid interference!
$start = $monthstart;
$numberdays = date('t', $start); // number of days in this month
$numberdays = gmdate("t", $start); // number of days in this month
$text = "";
$text .= $e107->tp->parseTemplate($CALENDAR_CALENDAR_START, FALSE, $calSc);
@ -198,7 +198,7 @@ $text .= $e107->tp->parseTemplate($CALENDAR_CALENDAR_HEADER_END, FALSE, $calSc);
// Calculate number of days to skip before 'real' days on first line of calendar
$firstdayoffset = date('w',$start) - $ecal_class->ec_first_day_of_week;
$firstdayoffset = gmdate('w',$start) - $ecal_class->ec_first_day_of_week;
if ($firstdayoffset < 0) $firstdayoffset+= 7;
for ($i=0; $i<$firstdayoffset; $i++)

19
e107_plugins/calendar_menu/calendar_shortcodes.php
View File

@ -229,8 +229,8 @@ class event_calendar_shortcodes
$this->day = varset($curDate['mday'], 0); // Day number being shown - rarely relevant
$this->month = $curDate['mon']; // Number of month being shown
$this->year = $curDate['year']; // Number of year being shown
$this->monthStart = mktime(0, 0, 0, $curDate['mon'], 1, $curDate['year']); // Start of month to be shown
$this->monthEnd = mktime(0, 0, 0, $curDate['mon'] + 1, 1, $curDate['year']) - 1; // End of month to be shown
$this->monthStart = gmmktime(0, 0, 0, $curDate['mon'], 1, $curDate['year']); // Start of month to be shown
$this->monthEnd = gmmktime(0, 0, 0, $curDate['mon'] + 1, 1, $curDate['year']) - 1; // End of month to be shown
// Calculate date code for previous month
@ -241,7 +241,7 @@ class event_calendar_shortcodes
$this->prevMonth = 12;
$prevYear--;
}
$this->previous = mktime(0, 0, 0, $this->prevMonth, 1, $prevYear); // Previous month - Used by nav
$this->previous = gmmktime(0, 0, 0, $this->prevMonth, 1, $prevYear); // Previous month - Used by nav
// Calculate date code for next month
$this->nextMonth = $curDate['mon'] + 1;
@ -251,13 +251,13 @@ class event_calendar_shortcodes
$this->nextMonth = 1;
$nextYear++;
}
$this->next = mktime(0, 0, 0, $this->nextMonth, 1, $nextYear); // Next month - used by nav
$this->next = gmmktime(0, 0, 0, $this->nextMonth, 1, $nextYear); // Next month - used by nav
$this->py = $curDate['year']-1; // Number of previous year for nav
$this->prevLink = mktime(0, 0, 0, $curDate['mon'], 1, $this->py);
$this->prevLink = gmmktime(0, 0, 0, $curDate['mon'], 1, $this->py);
$this->ny = $curDate['year'] + 1; // Number of next year for nav
$this->nextLink = mktime(0, 0, 0, $curDate['mon'], 1, $this->ny);
$this->nextLink = gmmktime(0, 0, 0, $curDate['mon'], 1, $this->ny);
$this->prop = gmmktime(0, 0, 0, $curDate['mon'], $curDate['mday'], $curDate['year']); // Sets start date for new event entry
@ -305,7 +305,7 @@ class event_calendar_shortcodes
$ret = '';
for ($ii = 0; $ii < 12; $ii++)
{
$monthJump = mktime(0, 0, 0, $ii+1, 1, $this->year);
$monthJump = gmmktime(0, 0, 0, $ii+1, 1, $this->year);
$ret .= "<a href='".e_SELF."?".$monthJump."'>".$this->monthabb[$ii]."</a> &nbsp;";
}
return $ret;
@ -360,7 +360,10 @@ class event_calendar_shortcodes
return "<input class='button' type='submit' style='width:140px;' name='printlists' value='".EC_LAN_164."' title='".EC_LAN_183."' />";
}
else
{
return '';
return 'Cant print lists';
}
}
// Categories listing
@ -539,7 +542,7 @@ class event_calendar_shortcodes
public function sc_ec_mail_link($parm = '')
{
$cal_dayarray = getdate($this->event['event_start']);
$cal_linkut = mktime(0 , 0 , 0 , $cal_dayarray['mon'], $cal_dayarray['mday'], $cal_dayarray['year']).".one"; // ALways need "one"
$cal_linkut = gmmktime(0 , 0 , 0 , $cal_dayarray['mon'], $cal_dayarray['mday'], $cal_dayarray['year']).".one"; // ALways need "one"
return ' '.SITEURLBASE.e_PLUGIN_ABS.'calendar_menu/event.php?'.$cal_linkut.' ';
}

2
e107_plugins/calendar_menu/event.php
View File

@ -135,7 +135,7 @@ if ((isset($_POST['ne_insert']) || isset($_POST['ne_update'])) && ($cal_super |
$ev_event = $e107->tp->toDB($_POST['ne_event']);
$ev_email = $e107->tp -> toDB($_POST['ne_email']);
$ev_thread = $e107->tp->toDB($_POST['ne_thread']);
$temp_date = getdate($ecal_class->make_date(0,0,$_POST['start_date']));
$temp_date = $ecal_class->gmgetdate($ecal_class->make_date(0,0,$_POST['start_date']));
$ev_allday = intval($_POST['allday']);
$recurring = intval($_POST['ec_recur_type']);
if ($recurring >= 100) $recurring += intval($_POST['ec_recur_week']) - 100;