From 20e900231032c4418549cea3ece4c8e461e8a445 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 11 Oct 2011 16:36:01 -0400
Subject: [PATCH] CC-2956: Undefined variable: endDateTime in
 /usr/share/airtime/application/models/Show.php on line 807, referer:
 http://localhost/Schedule

- fixed
---
 airtime_mvc/application/models/RabbitMq.php         |  2 +-
 airtime_mvc/application/models/Show.php             |  2 +-
 airtime_mvc/application/models/StreamSetting.php    |  3 ---
 .../js/airtime/schedule/full-calendar-functions.js  | 13 ++++++++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php
index 83e188ba4..bc5eaa1f7 100644
--- a/airtime_mvc/application/models/RabbitMq.php
+++ b/airtime_mvc/application/models/RabbitMq.php
@@ -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();
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 0c7afa4a5..3c004b2d1 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -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);
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index 77efc6f6e..7d5c20cdd 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -83,7 +83,6 @@ class Application_Model_StreamSetting {
         $sql = "SELECT COUNT(*) FROM cc_stream_setting"
             ." WHERE keyname = '$keyname'";
         $result = $CC_DBC->GetOne($sql);
-        Logging::log("setError");
         if ($result == 1){
             $sql = "UPDATE cc_stream_setting"
                 ." SET value = '$msg'"
@@ -92,9 +91,7 @@ class Application_Model_StreamSetting {
             $sql = "INSERT INTO cc_stream_setting (keyname, value, type)"
                 ." VALUES ('$keyname', '$msg', 'string')";
         }
-        Logging::log($sql);
         $res = $CC_DBC->query($sql);
-        Logging::log($res);
     }
     
     public static function getLiquidsoapError($stream_id){
diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index aad7c7b18..c77f435bc 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -48,6 +48,17 @@ function removeAddShowButton(){
     span.remove();
 }
 
+function pad(number, length) {
+    
+    var str = '' + number;
+    while (str.length < length) {
+        str = '0' + str;
+    }
+   
+    return str;
+
+}
+
 function makeTimeStamp(date){
 	var sy, sm, sd, h, m, s, timestamp;
 	sy = date.getFullYear();
@@ -57,7 +68,7 @@ function makeTimeStamp(date){
 	m = date.getMinutes();
 	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;
 }