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

CC-2956: Undefined variable: endDateTime in 

/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule

- fixed
This commit is contained in:
James 2011-10-11 16:36:01 -04:00
parent 42d2393bdd
commit 20e9002310
4 changed files with 14 additions and 6 deletions
Show Stats 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); $channel->exchange_declare($EXCHANGE, 'direct', false, true);
$now = new DateTime("@".time()); $now = new DateTime("@".time());
$end_timestamp = new DateTime("@".time() + 3600*2); $end_timestamp = new DateTime("@".(time() + 3600*2));
$temp['event_type'] = $event_type; $temp['event_type'] = $event_type;
$temp['server_timezone'] = Application_Model_Preference::GetTimezone(); $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")); $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 = new CcShowDays();
$showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d")); $showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d"));
$showDay->setDbLastShow($endDate); $showDay->setDbLastShow($endDate);

3
airtime_mvc/application/models/StreamSetting.php
View File

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

13
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -48,6 +48,17 @@ function removeAddShowButton(){
span.remove(); span.remove();
} }
function pad(number, length) {
var str = '' + number;
while (str.length < length) {
str = '0' + str;
}
return str;
}
function makeTimeStamp(date){ function makeTimeStamp(date){
var sy, sm, sd, h, m, s, timestamp; var sy, sm, sd, h, m, s, timestamp;
sy = date.getFullYear(); sy = date.getFullYear();
@ -57,7 +68,7 @@ function makeTimeStamp(date){
m = date.getMinutes(); m = date.getMinutes();
s = date.getSeconds(); s = date.getSeconds();
timestamp = sy+"-"+ sm +"-"+ sd +" "+ h +":"+ m +":"+ s; timestamp = sy+"-"+ pad(sm, 2) +"-"+ pad(sd, 2) +" "+ pad(h, 2) +":"+ pad(m, 2) +":"+ pad(s, 2);
return timestamp; return timestamp;
} }