Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

airtime_mvc/application/models/Scheduler.php

@@ -840,6 +840,9 @@ class Application_Model_Scheduler
                         Logging::debug("adjusting all following items.");
                         Logging::debug(floatval($pend) - floatval($pstart));
                     }
+                    if ($moveAction) {
+                        $this->calculateCrossfades($instanceId);
+                    }
                 }//for each instance
             }//for each schedule location
 

airtime_mvc/application/services/SchedulerService.php

@@ -148,6 +148,24 @@ class Application_Service_SchedulerService
         return $dt;
     }
 
+    private static function findTimeDifference($p_startDT, $p_seconds)
+    {
+    	$startEpoch = $p_startDT->format("U.u");
+    	
+    	//add two float numbers to 6 subsecond precision
+    	//DateTime::createFromFormat("U.u") will have a problem if there is no decimal in the resulting number.
+    	$newEpoch = bcsub($startEpoch , (string) $p_seconds, 6);
+    
+    	$dt = DateTime::createFromFormat("U.u", $newEpoch, new DateTimeZone("UTC"));
+    
+    	if ($dt === false) {
+    		//PHP 5.3.2 problem
+    		$dt = DateTime::createFromFormat("U", intval($newEpoch), new DateTimeZone("UTC"));
+    	}
+    
+    	return $dt;
+    }
+
     public static function fillNewLinkedInstances($ccShow)
     {
         /* First check if any linked instances have content
@@ -224,7 +242,8 @@ class Application_Service_SchedulerService
                             "{$id}, ".
                             "{$item["position"]})";
 
-                        $nextStartDT = $endTimeDT;
+                        $nextStartDT = self::findTimeDifference($endTimeDT,
+                            Application_Model_Preference::GetDefaultCrossfadeDuration());
                     } //foreach show item
                 }
             } //foreach linked instance
@@ -281,7 +300,8 @@ class Application_Service_SchedulerService
                         ->setDbPosition($item->getDbPosition())
                         ->save();
 
-                    $nextStartDT = $endTimeDT;
+                    $nextStartDT = self::findTimeDifference($endTimeDT,
+                        Application_Model_Preference::GetDefaultCrossfadeDuration());
                 } //foreach show item
 
                 $ccShowInstance

airtime_mvc/application/services/ShowService.php

@@ -196,19 +196,18 @@ class Application_Service_ShowService
                     $this->createNonRepeatingInstance($day, $populateUntil);
                     break;
                 case REPEAT_WEEKLY:
-                    $this->createRepeatingInstances($day, $populateUntil, REPEAT_WEEKLY,
+                    $this->createWeeklyRepeatInstances($day, $populateUntil, REPEAT_WEEKLY,
                         new DateInterval("P7D"), $daysAdded);
                     break;
                 case REPEAT_BI_WEEKLY:
-                    $this->createRepeatingInstances($day, $populateUntil, REPEAT_BI_WEEKLY,
+                    $this->createWeeklyRepeatInstances($day, $populateUntil, REPEAT_BI_WEEKLY,
                         new DateInterval("P14D"), $daysAdded);
                     break;
                 case REPEAT_MONTHLY_MONTHLY:
-                    $this->createMonthlyMonthlyRepeatInstances($day, $populateUntil);
+                    $this->createMonthlyRepeatInstances($day, $populateUntil);
                     break;
                 case REPEAT_MONTHLY_WEEKLY:
-                    $this->createRepeatingInstances($day, $populateUntil, REPEAT_MONTHLY_WEEKLY,
+                    $this->createMonthlyRepeatInstances($day, $populateUntil);
-                        null, $daysAdded);
                     break;
             }
         }
@@ -322,7 +321,7 @@ SQL;
             $this->deleteAllRepeatInstances($currentShowDay, $showId);
             //if repeat option was checked we need to treat the current show day
             //as a new show day so the repeat instances get created properly
-            //in createRepeatingInstances()
+            //in createWeeklyRepeatInstances()
             if ($showData['add_show_repeats']) {
                 array_push($daysAdded, $currentShowDay->getDbDay());
             }
@@ -846,7 +845,7 @@ SQL;
      * @param unknown_type $repeatInterval
      * @param unknown_type $isRebroadcast
      */
-    private function createRepeatingInstances($showDay, $populateUntil,
+    private function createWeeklyRepeatInstances($showDay, $populateUntil,
         $repeatType, $repeatInterval, $daysAdded=null)
     {
         $show_id       = $showDay->getDbShowId();
@@ -872,7 +871,9 @@ SQL;
             Application_Common_DateHelper::ConvertToUtcDateTime($last_show, $timezone) : null;
 
         $utcStartDateTime = new DateTime("now");
+        $previousDate = clone $start;
         foreach ($datePeriod as $date) {
+
             list($utcStartDateTime, $utcEndDateTime) = $this->createUTCStartEndDateTime(
                 $date, $duration);
             /*
@@ -926,6 +927,7 @@ SQL;
                     $this->createRebroadcastInstances($showDay, $date, $ccShowInstance->getDbId());
                 }
             }
+            $previousDate = clone $date;
         }
 
         /* Set UTC to local time before setting the next repeat date. If we don't
@@ -936,7 +938,7 @@ SQL;
         $this->setNextRepeatingShowDate($nextDate->format("Y-m-d"), $day, $show_id);
     }
 
-    private function createMonthlyMonthlyRepeatInstances($showDay, $populateUntil)
+    private function createMonthlyRepeatInstances($showDay, $populateUntil)
     {
         $show_id       = $showDay->getDbShowId();
         $first_show    = $showDay->getDbFirstShow(); //non-UTC
@@ -954,6 +956,13 @@ SQL;
             $end = $populateUntil;
         }
 
+        // We will only need this if the repeat type is MONTHLY_WEEKLY
+        list($weekNumberOfMonth, $dayOfWeek) =
+            $this->getMonthlyWeeklyRepeatInterval(
+                new DateTime($first_show, new DateTimeZone($timezone)));
+
+        $this->repeatType = $showDay->getDbRepeatType();
+
         $utcLastShowDateTime = $last_show ?
             Application_Common_DateHelper::ConvertToUtcDateTime($last_show, $timezone) : null;
 
@@ -1002,7 +1011,20 @@ SQL;
                     $this->createRebroadcastInstances($showDay, $start, $ccShowInstance->getDbId());
                 }
             }
-            $start = $this->getNextMonthlyMonthlyRepeatDate($start, $timezone, $showDay->getDbStartTime());
+            if ($this->repeatType == REPEAT_MONTHLY_WEEKLY) {
+                $monthlyWeeklyStart = new DateTime($utcStartDateTime->format("Y-m"),
+                    new DateTimeZone("UTC"));
+                $monthlyWeeklyStart->add(new DateInterval("P1M"));
+                $start = $this->getNextMonthlyWeeklyRepeatDate(
+                    $monthlyWeeklyStart,
+                    $timezone,
+                    $showDay->getDbStartTime(),
+                    $weekNumberOfMonth,
+                    $dayOfWeek);
+            } else {
+                $start = $this->getNextMonthlyMonthlyRepeatDate(
+                    $start, $timezone, $showDay->getDbStartTime());
+            }
         }
         $this->setNextRepeatingShowDate($start->format("Y-m-d"), $day, $show_id);
     }
@@ -1018,7 +1040,6 @@ SQL;
     private function getMonthlyWeeklyRepeatInterval($showStart)
     {
         $start = clone $showStart;
-
         $dayOfMonth = $start->format("j");
         $dayOfWeek = $start->format("l");
         $yearAndMonth = $start->format("Y-m");
@@ -1047,22 +1068,24 @@ SQL;
                 $weekNumberOfMonth = "fourth";
                 break;
             case 5:
-                $weekNumberOfMonth = "last";
+                $weekNumberOfMonth = "fifth";
                 break;
         }
 
-        return DateInterval::createFromDateString(
+        /* return DateInterval::createFromDateString(
-            $weekNumberOfMonth." ".$dayOfWeek." of next month");
+            $weekNumberOfMonth." ".$dayOfWeek." of next month"); */
+        return array($weekNumberOfMonth, $dayOfWeek);
     }
 
     /**
      * 
      * Enter description here ...
-     * @param $start
+     * @param $start user's local time
      */
     private function getNextMonthlyMonthlyRepeatDate($start, $timezone, $startTime)
     {
         $dt = new DateTime($start->format("Y-m"), new DateTimeZone($timezone));
+
         do {
             $dt->add(new DateInterval("P1M"));
         } while (!checkdate($dt->format("m"), $start->format("d"), $dt->format("Y")));
@@ -1077,6 +1100,41 @@ SQL;
         return $dt;
     }
 
+    private function getNextMonthlyWeeklyRepeatDate(
+        $start,
+        $timezone,
+        $startTime,
+        $weekNumberOfMonth,
+        $dayOfWeek)
+    {
+        $dt = new DateTime($start->format("Y-m"), new DateTimeZone($timezone));
+        $tempDT = clone $dt;
+        $fifthWeekExists = false;
+        do {
+            $nextDT = date_create($weekNumberOfMonth." ".$dayOfWeek.
+                " of ".$tempDT->format("F")." ".$tempDT->format("Y"));
+
+            /* 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.
+             * If it's not in the same month we know that a fifth week of
+             * the next month does not exist. So let's skip it.
+             */
+            if ($tempDT->format("F") == $nextDT->format("F")) {
+                $fifthWeekExists = true;
+            }
+            $tempDT->add(new DateInterval("P1M"));
+        } while (!$fifthWeekExists);
+
+        $dt = $nextDT;
+
+        $startTime = explode(":", $startTime);
+        $hours = isset($startTime[0]) ? $startTime[0] : "00";
+        $minutes = isset($startTime[1]) ? $startTime[1] : "00";
+        $seconds = isset($startTime[2]) ? $startTime[2] : "00";
+        $dt->setTime($hours, $minutes, $seconds);
+        return $dt;
+    }
+
     private function getNextRepeatingPopulateStartDateTime($showDay)
     {
         $nextPopDate = $showDay->getDbNextPopDate();