From 226ef262ba330a07651512589c1ec3fc81d30584 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 6 Jun 2012 10:31:49 -0400 Subject: [PATCH] CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. -retreived hours and minutes via preg_match() --- airtime_mvc/application/forms/AddShowWhen.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php index e05e7a1a5..50a7ec5a0 100644 --- a/airtime_mvc/application/forms/AddShowWhen.php +++ b/airtime_mvc/application/forms/AddShowWhen.php @@ -99,8 +99,10 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm } } - $hours = intval(substr($formData["add_show_duration"], 0, strpos($formData["add_show_duration"], 'h'))); - $minutes = intval(substr($formData["add_show_duration"], -3, -1)); + $pattern = '/([0-9][0-9])h ([0-9][0-9])m/'; + preg_match($pattern, $formData['add_show_duration'], $matches); + $hours = $matches[1]; + $minutes = $matches[2]; if( $formData["add_show_duration"] == "00h 00m" ) { $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00h 00m')); $valid = false;