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

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

Browse source
This commit is contained in:
Yuchen Wang 2011-10-11 16:48:56 -04:00
commit 45aa38111c
8 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/RabbitMq.php
View file

@ -75,7 +75,7 @@ class Application_Model_RabbitMq
$channel->exchange_declare($EXCHANGE, 'direct', false, true);
$now = new DateTime("@".time());
$end_timestamp = new DateTime("@".time() + 3600*2);
$end_timestamp = new DateTime("@".(time() + 3600*2));
$temp['event_type'] = $event_type;
$temp['server_timezone'] = Application_Model_Preference::GetTimezone();

2
airtime_mvc/application/models/Show.php
View file

@ -804,7 +804,7 @@ class Application_Model_Show {
$utcStartDateTime->add(new DateInterval("P".$daysAdd."D"));
}
if (is_null($endDateTime) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
if (is_null($endDate) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
$showDay = new CcShowDays();
$showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d"));
$showDay->setDbLastShow($endDate);

6
airtime_mvc/application/models/StreamSetting.php
View file

@ -83,15 +83,15 @@ class Application_Model_StreamSetting {
$sql = "SELECT COUNT(*) FROM cc_stream_setting"
." WHERE keyname = '$keyname'";
$result = $CC_DBC->GetOne($sql);
if ($result == 1){
$sql = "UPDATE cc_stream_setting"
." SET value = '$value'"
." SET value = '$msg'"
." WHERE keyname = '$keyname'";
}else{
$sql = "INSERT INTO cc_stream_setting (keyname, value, type)"
." VALUES ($keyname, '$msg', 'string')";
." VALUES ('$keyname', '$msg', 'string')";
}
$res = $CC_DBC->query($sql);
}
public static function getLiquidsoapError($stream_id){