diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 2435b4e87..cd0ed19d1 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -511,7 +511,7 @@ class ApiController extends Zend_Controller_Action } } elseif ($mode == "delete") { $filepath = $md['MDATA_KEY_FILEPATH']; - //$filepath = str_replace("\\", "", $filepath); + $filepath = str_replace("\\", "", $filepath); $file = Application_Model_StoredFile::RecallByFilepath($filepath); if (is_null($file)) { diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index f827bbf08..4a55d8576 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -278,7 +278,7 @@ class AudiopreviewController extends Zend_Controller_Action $elementMap = array( 'element_title' => isset($track['track_title']) ? $track['track_title'] : "", - 'element_artist' => isset($track['artist_name']) ? $track['artist_name'] : "", + 'element_artist' => isset($track['creator']) ? $track['creator'] : "", 'element_position' => $position, 'element_id' => ++$position, ); diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 6699946b4..63e594bb8 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -1063,20 +1063,46 @@ SQL; * In both cases (new and edit) we only grab shows that * are scheduled 2 days prior */ + $se = $show_end->format('Y-m-d H:i:s'); if ($update) { $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]." where (ends <= '{$show_end->format('Y-m-d H:i:s')}' or starts <= '{$show_end->format('Y-m-d H:i:s')}') and date(starts) >= (date('{$show_end->format('Y-m-d H:i:s')}') - INTERVAL '2 days') and modified_instance = false and id != ".$instanceId. " order by ends"; + $stmt = $con->prepare("SELECT id, starts, ends FROM :showInstances + where (ends <= :show_end1 + or starts <= :show_end2) + and date(starts) >= (date(:show_end3) - INTERVAL '2 days') + and modified_instance = false and id != :instanceId order by ends"); + $stmt->execute(array( + ':showInstances' => $CC_CONFIG['showInstances'], + ':show_end1' => $se, + ':show_end2' => $se, + ':show_end3' => $se, + ':instanceId' => $instanceId + )); } else { + // TODO : Remove raw sql later $sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]." where (ends <= '{$show_end->format('Y-m-d H:i:s')}' or starts <= '{$show_end->format('Y-m-d H:i:s')}') and date(starts) >= (date('{$show_end->format('Y-m-d H:i:s')}') - INTERVAL '2 days') and modified_instance = false order by ends"; + $stmt = $con->prepare("SELECT id, starts, ends FROM :showInstances + where (ends <= :show_end1 + or starts <= :show_end2) + and date(starts) >= (date(:show_end3) - INTERVAL '2 days') + and modified_instance = false order by ends"); + $stmt->execute(array( + ':showInstances' => $CC_CONFIG['showInstances'], + ':show_end1' => $se, + ':show_end2' => $se, + ':show_end3' => $se, + )); } - $rows = $con->query($sql); + //$rows = $con->query($sql); + $rows->fetchAll(); foreach ($rows as $row) { $start = new DateTime($row["starts"], new DateTimeZone('UTC')); diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 9fcaee13e..dd3a1e520 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1832,7 +1832,7 @@ SELECT si.starts AS start_timestamp, s.url, starts, ends -FROM cc_show_instances si, +FROM cc_show_instances si LEFT JOIN cc_show s ON si.instance_id = s.id WHERE si.show_id = s.id @@ -1875,7 +1875,7 @@ SELECT si.starts AS start_timestamp, s.url, starts, ends -FROM cc_show_instances si, +FROM cc_show_instances si LEFT JOIN cc_show s ON si.instance_id = s.id WHERE si.show_id = s.id diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 2d2b18894..b90051c7f 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -655,6 +655,9 @@ FROM ( 0::INTEGER as type , f.id AS item_id, f.track_title, + f.album_title AS album, + f.genre AS genre, + f.length AS length, f.artist_name AS creator, f.file_exists AS EXISTS, f.filepath AS filepath @@ -668,6 +671,9 @@ FROM ( 1::INTEGER as type, ws.id AS item_id, (ws.name || ': ' || ws.url) AS title, + null AS album, + null AS genre, + ws.length AS length, sub.login AS creator, 't'::boolean AS EXISTS, ws.url AS filepath @@ -688,8 +694,10 @@ SQL; $dt->setTimezone(new DateTimeZone(date_default_timezone_get())); $row["starts"] = $dt->format("Y-m-d H:i:s"); - $formatter = new LengthFormatter($row["clip_length"]); - $row["clip_length"] = $formatter->format(); + if (isset($row['length'])) { + $formatter = new LengthFormatter($row["length"]); + $row["length"] = $formatter->format(); + } } diff --git a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml index 103796adc..a935f3f99 100644 --- a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml +++ b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml @@ -11,12 +11,12 @@ showContent as $row): ?> -