Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 

Conflicts:
	airtime_mvc/application/common/Database.php
This commit is contained in:
denise 2012-09-05 17:55:26 -04:00
parent 26c2c2c0d1 8be51d5bf4
commit 78c81aa434
3 changed files with 26 additions and 17 deletions
airtime_mvc/application
common
Database.php
models
Schedule.phpShowInstance.php

4
airtime_mvc/application/common/Database.php
View File

@ -1,8 +1,8 @@
<?php
class Application_Common_Database
{
public static function prepareAndExecute($sql, $paramValueMap, $type='all', $fetchType=PDO::FETCH_ASSOC){
public static function prepareAndExecute($sql, $paramValueMap, $type='all', $fetchType=PDO::FETCH_ASSOC)
{
$con = Propel::getConnection();
$stmt = $con->prepare($sql);
foreach ($paramValueMap as $param => $v) {

2
airtime_mvc/application/models/Schedule.php
View File

@ -1102,7 +1102,7 @@ SQL;
));
}
//$rows = $con->query($sql);
$rows->fetchAll();
$rows = $stmt->fetchAll();
foreach ($rows as $row) {
$start = new DateTime($row["starts"], new DateTimeZone('UTC'));

37
airtime_mvc/application/models/ShowInstance.php
View File

@ -324,24 +324,28 @@ class Application_Model_ShowInstance
{
$con = Propel::getConnection();
$hours = $deltaMin/60;
if($hours > 0)
$hours = floor($hours);
else
$hours = ceil($hours);
$hours = $deltaMin / 60;
$mins = abs($deltaMin%60);
$hours = ($hours > 0) ? floor($hours) : ceil($hours);
$mins = abs($deltaMin % 60);
$today_timestamp = gmdate("Y-m-d H:i:s");
$starts = $this->getShowInstanceStart();
$ends = $this->getShowInstanceEnd();
$starts = $this->getShowInstanceStart();
$ends = $this->getShowInstanceEnd();
if (strtotime($today_timestamp) > strtotime($starts)) {
return "can't resize a past show";
}
$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'";
$new_ends = $con->query($sql)->fetchColumn(0);
//$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'";
$sql = "SELECT timestamp :ends + interval :deltaDays + interval :deltaTime";
$now_ends = Application_Common_Database::prepareAndExecute($sql,
array(':ends' => $ends,
':deltaDays' => "$deltaDay days",
':deltaTime' => "{$hours}:{$mins}"), 'column'
);
//only need to check overlap if show increased in size.
if (strtotime($new_ends) > strtotime($ends)) {
@ -381,7 +385,7 @@ class Application_Model_ShowInstance
$scheduler = new Application_Model_Scheduler();
$scheduler->scheduleAfter(
array(array("id" => 0, "instance" => $id, "timestamp" => $ts)),
array(array("id" => 0, "instance" => $id, "timestamp" => $ts)),
array(array("id" => $pl_id, "type" => "playlist"))
);
}
@ -663,7 +667,7 @@ FROM (
f.filepath AS filepath
FROM cc_schedule AS s
LEFT JOIN cc_files AS f ON f.id = s.file_id
WHERE s.instance_id = '{$this->_instanceId}'
WHERE s.instance_id = :instance_id1
AND s.playout_status >= 0
AND s.file_id IS NOT NULL)
UNION
@ -680,13 +684,18 @@ FROM (
FROM cc_schedule AS s
LEFT JOIN cc_webstream AS ws ON ws.id = s.stream_id
LEFT JOIN cc_subjs AS sub ON ws.creator_id = sub.id
WHERE s.instance_id = '{$this->_instanceId}'
WHERE s.instance_id = :instance_id2
AND s.playout_status >= 0
AND s.stream_id IS NOT NULL)) AS temp
ORDER BY starts;
SQL;
$results = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC);
$stmt = $con->prepare($sql);
$stmt->execute(array(
':instance_id1' => $this->_instanceId,
':instance_id2' => $this->_instanceId
));
$results = $stmt->fetchAll(PDO::FETCH_ASSOC);
foreach ($results as &$row) {