Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5323: User's Timezone Can Improperly Edit Show 

- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
This commit is contained in:
denise 2013-09-25 14:44:08 -04:00
parent 3439611ef3
commit 7fa3fe9a49
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/services/ShowService.php
View File

@ -740,10 +740,10 @@ SQL;
//CcShowDay object //CcShowDay object
$currentShowDay = $this->ccShow->getFirstCcShowDay(); $currentShowDay = $this->ccShow->getFirstCcShowDay();
//DateTime in user's local time //DateTime in show's local time
$newStartDateTime = new DateTime($showData["add_show_start_date"]." ". $newStartDateTime = new DateTime($showData["add_show_start_date"]." ".
$showData["add_show_start_time"], $showData["add_show_start_time"],
new DateTimeZone(Application_Model_Preference::GetTimezone())); new DateTimeZone($showData["add_show_timezone"]));
$diff = $this->calculateShowStartDiff($newStartDateTime, $diff = $this->calculateShowStartDiff($newStartDateTime,
$currentShowDay->getLocalStartDateAndTime()); $currentShowDay->getLocalStartDateAndTime());
@ -1152,6 +1152,7 @@ SQL;
do { do {
$nextDT = date_create($weekNumberOfMonth." ".$dayOfWeek. $nextDT = date_create($weekNumberOfMonth." ".$dayOfWeek.
" of ".$tempDT->format("F")." ".$tempDT->format("Y")); " of ".$tempDT->format("F")." ".$tempDT->format("Y"));
$nextDT->setTimezone(new DateTimeZone($timezone));
/* We have to check if the next date is in the same month in case /* We have to check if the next date is in the same month in case
* the repeat day is in the fifth week of the month. * the repeat day is in the fifth week of the month.
@ -1356,7 +1357,7 @@ SQL;
$showDay->setDbFirstShow($startDateTimeClone->format("Y-m-d")); $showDay->setDbFirstShow($startDateTimeClone->format("Y-m-d"));
$showDay->setDbLastShow($endDate); $showDay->setDbLastShow($endDate);
$showDay->setDbStartTime($startDateTimeClone->format("H:i")); $showDay->setDbStartTime($startDateTimeClone->format("H:i"));
$showDay->setDbTimezone(Application_Model_Preference::GetTimezone()); $showDay->setDbTimezone($showData['add_show_timezone']);
$showDay->setDbDuration($showData['add_show_duration']); $showDay->setDbDuration($showData['add_show_duration']);
$showDay->setDbDay($day); $showDay->setDbDay($day);
$showDay->setDbRepeatType($this->repeatType); $showDay->setDbRepeatType($this->repeatType);
@ -1481,12 +1482,13 @@ SQL;
private function createUTCStartEndDateTime($showStart, $duration, $offset=null) private function createUTCStartEndDateTime($showStart, $duration, $offset=null)
{ {
$startDateTime = clone $showStart; $startDateTime = clone $showStart;
$timezone = $startDateTime->getTimezone();
if (isset($offset)) { if (isset($offset)) {
//$offset["hours"] and $offset["mins"] represents the start time //$offset["hours"] and $offset["mins"] represents the start time
//of a rebroadcast show //of a rebroadcast show
$startDateTime = new DateTime($startDateTime->format("Y-m-d")." ". $startDateTime = new DateTime($startDateTime->format("Y-m-d")." ".
$offset["hours"].":".$offset["mins"]); $offset["hours"].":".$offset["mins"], $timezone);
$startDateTime->add(new DateInterval("P{$offset["days"]}D")); $startDateTime->add(new DateInterval("P{$offset["days"]}D"));
} }
//convert time to UTC //convert time to UTC