From a0ad9a91ea53d8724a51b3276b987dacd15ceab7 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 28 Aug 2012 17:22:48 -0400
Subject: [PATCH] CC-1665: Scheduled stream rebroadcasting and recording

-Better error logging
-convert minutes > 59 into hours
---
 .../application/controllers/WebstreamController.php       | 1 +
 airtime_mvc/application/models/Webstream.php              | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index 894171c17..18ecd3924 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -152,6 +152,7 @@ class WebstreamController extends Zend_Controller_Action
                 throw new Exception("isValid returned false");
             }
         } catch (Exception $e) {
+            Logging::debug($e->getMessage());
             $this->view->statusMessage = "<div class='errors'>Invalid form values.</div>"; 
             $this->view->streamId = -1;
             $this->view->analysis = $analysis;
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 863080cef..8b4d886d7 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -128,6 +128,8 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
 
         if (!$invalid_date_interval) { 
 
+            //Due to the way our Regular Expression is set up, we could have $minutes or $hours
+            //not set. Do simple test here
             if (!is_numeric($hours)) {
                 $hours = 0;
             }
@@ -135,8 +137,14 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
                 $minutes = 0;
             }
 
+
+            //minutes cannot be over 59. Need to convert anything > 59 minutes into hours.
+            $hours += intval($minutes/60);
+            $minutes = $minutes%60;
+
             $di = new DateInterval("PT{$hours}H{$minutes}M");
 
+
             $totalMinutes = $di->h * 60 + $di->i;
 
             if ($totalMinutes == 0) {