From 322d85931b27f24b53f1e8a9213303f9b97b75f1 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 26 Jan 2015 17:41:10 -0500 Subject: [PATCH 1/2] CC-5988 - Better error message & regex for Transition Fade field on stream settings page --- airtime_mvc/application/forms/LiveStreamingPreferences.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index 35b6909a9..a52a74222 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -29,8 +29,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $transition_fade = new Zend_Form_Element_Text("transition_fade"); $transition_fade->setLabel(_("Switch Transition Fade (s)")) ->setFilters(array('StringTrim')) - ->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,3})?$/', - 'messages' => _('enter a time in seconds 0{.000}'))) + ->addValidator('regex', false, array('/^\d+(\.\d+)?$/', + 'messages' => _('Please enter a time in seconds (eg. 0.5)'))) ->setValue($defaultFade) ->setDecorators(array('ViewHelper')); $this->addElement($transition_fade); From e3165a12c33d3017fb0dad88fc5ea86ab78aab9e Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Mon, 26 Jan 2015 17:49:58 -0500 Subject: [PATCH 2/2] Regex tweak --- airtime_mvc/application/forms/LiveStreamingPreferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index a52a74222..46194472e 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -29,7 +29,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $transition_fade = new Zend_Form_Element_Text("transition_fade"); $transition_fade->setLabel(_("Switch Transition Fade (s)")) ->setFilters(array('StringTrim')) - ->addValidator('regex', false, array('/^\d+(\.\d+)?$/', + ->addValidator('regex', false, array('/^\d*(\.\d+)?$/', 'messages' => _('Please enter a time in seconds (eg. 0.5)'))) ->setValue($defaultFade) ->setDecorators(array('ViewHelper'));