More checking on view access date formatting (bug 3072)

htdocs/lang/en.utf8/view.php

@@ -41,6 +41,7 @@ $string['description']            = 'View Description';
 $string['startdate']              = 'Access Start Date/Time';
 $string['stopdate']               = 'Access End Date/Time';
 $string['startdatemustbebeforestopdate'] = 'The start date must be before the stop date';
+$string['unrecogniseddateformat'] = 'Unrecognised date format';
 $string['ownerformat']            = 'Name display format';
 $string['ownerformatdescription'] = 'How do you want people who look at your View to see your name?';
 $string['profileviewtitle']       = 'Profile view';

htdocs/view/access.php

@@ -241,13 +241,21 @@ function editaccess_validate(Pieform $form, $values) {
     }
     $loggedinaccess = false;
     if ($values['accesslist']) {
-        foreach ($values['accesslist'] as $item) {
+        foreach ($values['accesslist'] as &$item) {
             if (!isset($item['startdate'])) {
                 $item['startdate'] = null;
             }
+            else if (!$item['startdate'] = strtotime($item['startdate'])) {
+                $form->set_error('accesslist', get_string('unrecogniseddateformat', 'view'));
+                break;
+            }
             if (!isset($item['stopdate'])) {
                 $item['stopdate'] = null;
             }
+            else if (!$item['stopdate'] = strtotime($item['stopdate'])) {
+                $form->set_error('accesslist', get_string('invaliddate', 'view'));
+                break;
+            }
             if ($item['type'] == 'loggedin' && !$item['startdate'] && !$item['stopdate']) {
                 $loggedinaccess = true;
             }
@@ -285,6 +293,16 @@ function editaccess_submit(Pieform $form, $values) {
         redirect('/view/blocks.php?id=' . $view->get('id') . '&new=' . $new);
     }
 
+    if ($values['accesslist']) {
+        foreach ($values['accesslist'] as &$item) {
+            if (isset($item['startdate'])) {
+                $item['startdate'] = strtotime($item['startdate']);
+            }
+            if (isset($item['stopdate'])) {
+                $item['stopdate'] = strtotime($item['stopdate']);
+            }
+        }
+    }
     $view->set_access($values['accesslist']);
 
     $view->set('startdate', $values['startdate']);