manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed validation error with empty dates

Browse source
This commit is contained in:
Manuel Cillero 2017-09-14 20:02:42 +02:00
parent 765af99d20
commit 0ea7ec6acf
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/storm/storm.module
View file

@ -2410,15 +2410,20 @@ function storm_dateext_validate($element, &$form_state) {
$format_match = str_replace('/', '\/', $format_match);
preg_match("/$format_match/", $element['#value']['popup']['date'], $matches);
$format = str_replace(array('/', '-'), '', $format);
$pos_d = max(strpos($format, 'd'), strpos($format, 'j')) + 1;
$pos_m = max(strpos($format, 'm'), strpos($format, 'M')) + 1;
$pos_y = strpos($format, 'Y') + 1;
if (empty($matches)) {
$element['#value'] = array('day' => -1, 'month' => -1, 'year' => -1);
}
else {
$format = str_replace(array('/', '-'), '', $format);
$pos_d = max(strpos($format, 'd'), strpos($format, 'j')) + 1;
$pos_m = max(strpos($format, 'm'), strpos($format, 'M')) + 1;
$pos_y = strpos($format, 'Y') + 1;
$element['#value'] = array();
$element['#value']['day'] = (int) $matches[$pos_d];
$element['#value']['month'] = (int) $matches[$pos_m];
$element['#value']['year'] = (int) $matches[$pos_y];
$element['#value'] = array();
$element['#value']['day'] = (int) $matches[$pos_d];
$element['#value']['month'] = (int) $matches[$pos_m];
$element['#value']['year'] = (int) $matches[$pos_y];
}
}
else {
if (!$element['#withnull'] && !empty($element['#value']['popup']['date'])) {