diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 4c3706f5b..e6f8c8705 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -52,7 +52,8 @@ class Application_Model_Schedule "currentShow"=>$shows['currentShow'], "nextShow"=>$shows['nextShow'], "timezone"=> date("T"), - "timezoneOffset"=> date("Z")); + "timezoneOffset"=> date("Z") + ); return $range; } @@ -71,7 +72,6 @@ class Application_Model_Schedule return; } - global $CC_CONFIG; $con = Propel::getConnection(); $sql = "SELECT %%columns%% st.starts as starts, st.ends as ends, st.media_item_played as media_item_played, si.ends as show_ends diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 821179e21..02158a0ca 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1838,7 +1838,7 @@ SELECT si.starts AS start_timestamp, ends FROM cc_show_instances si LEFT JOIN cc_show s - ON si.instance_id = s.id + ON si.show_id = s.id WHERE si.show_id = s.id AND si.starts <= :timeNow1::timestamp AND si.ends > :timeNow2::timestamp @@ -1881,7 +1881,7 @@ SELECT si.starts AS start_timestamp, ends FROM cc_show_instances si LEFT JOIN cc_show s - ON si.instance_id = s.id + ON si.show_id = s.id WHERE si.show_id = s.id AND si.starts > :timeNow1::timestamp - INTERVAL '2 days' AND si.ends < :timeNow2::timestamp + INTERVAL '2 days' @@ -1895,7 +1895,7 @@ SQL; $stmt->bindValue(':timeNow2', $p_timeNow); if ($stmt->execute()) { - $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); + $rows = $stmt->fetchAll(); } else { $msg = implode(',', $stmt->errorInfo()); throw new Exception("Error: $msg"); @@ -2020,7 +2020,7 @@ SELECT si.starts AS start_timestamp, ends FROM cc_show_instances si LEFT JOIN cc_show s - ON si.instance_id = s.id + ON si.show_id = s.id WHERE si.show_id = s.id AND si.starts >= :timeStart::timestamp AND si.starts < :timeEnd::timestamp