diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index e79a1d526..5ee581c9d 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -33,8 +33,8 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm 'required' => false, 'filters' => array('StringTrim'), 'validators' => array(array('regex', false, - array('/^[0-5][0-9](\.\d{1,6})?$/', - 'messages' => 'enter a time in seconds 00{.000000}'))), + array('/^[0-9]{1,2}(\.\d{1,6})?$/', + 'messages' => 'enter a time in seconds 0{.000000}'))), 'value' => $defaultFade, 'decorators' => array( 'ViewHelper' diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 8e096aad3..fa7cf76fd 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -609,7 +609,10 @@ class Application_Model_ShowInstance { $end = $this->getShowInstanceEnd(null); $interval = $start->diff($end); - return $interval->format("%h:%I:%S"); + $days = $interval->format("%d"); + + if ($days > 0) return "24:" . $interval->format("%I:%S"); + else return $interval->format("%h:%I:%S"); } public function getShowListContent() diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index b31757141..042531b68 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -73,8 +73,6 @@ $(document).ready(function(){