Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

Browse source
This commit is contained in:
Naomi 2013-12-11 17:35:47 -05:00
commit e6c971387b
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
airtime_mvc/application/forms/AddShowRepeats.php
View file

@ -83,8 +83,8 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
}
public function isValid($formData) {
if (parent::isValid($formData)) {
return $this->checkReliantFields($formData);
if (parent::isValid($formData)) {
return $this->checkReliantFields($formData);
} else {
return false;
}
@ -95,15 +95,18 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
if (!$formData['add_show_no_end']) {
$start_timestamp = $formData['add_show_start_date'];
$end_timestamp = $formData['add_show_end_date'];
$start_epoch = strtotime($start_timestamp);
$end_epoch = strtotime($end_timestamp);
if ($end_epoch < $start_epoch) {
$showTimeZone = new DateTimeZone($formData['add_show_timezone']);
//We're assuming all data is valid at this point (timezone, etc.).
$startDate = new DateTime($start_timestamp, $showTimeZone);
$endDate = new DateTime($end_timestamp, $showTimeZone);
if ($endDate < $startDate) {
$this->getElement('add_show_end_date')->setErrors(array(_('End date must be after start date')));
return false;
}
return true;
}
if (!isset($formData['add_show_day_check'])) {