Browse Source

require presence for ContactForm fields.

Mark Scherer 9 years ago
parent
commit
2efc8cdd1a
2 changed files with 9 additions and 3 deletions
  1. 4 0
      src/Form/ContactForm.php
  2. 5 3
      src/Utility/Time.php

+ 4 - 0
src/Form/ContactForm.php

@@ -24,12 +24,16 @@ class ContactForm extends Form {
 
 	protected function _buildValidator(Validator $validator) {
 		return $validator
+			->requirePresence('name')
 			->notEmpty('name', __('This field cannot be left empty'))
+			->requirePresence('email')
 			->add('email', 'format', [
 					'rule' => 'email',
 					'message' => __('A valid email address is required'),
 			])
+			->requirePresence('subject')
 			->notEmpty('subject', __('This field cannot be left empty'))
+			->requirePresence('message')
 			->notEmpty('message', __('This field cannot be left empty'));
 	}
 

+ 5 - 3
src/Utility/Time.php

@@ -928,9 +928,11 @@ class Time extends CakeTime {
 	 * - verbose/past/future: string with %s or boolean true/false
 	 * @return string
 	 */
-	public static function relLengthOfTime($dateString, $format = null, $options = []) {
-		if ($dateString !== null) {
-			$date = new \DateTime($dateString);
+	public static function relLengthOfTime($date, $format = null, $options = []) {
+		if ($date !== null && !is_object($date)) {
+			$date = new \DateTime($date);
+		}
+		if ($date !== null) {
 			$date = $date->format('U');
 			$sec = time() - $date;
 			$type = ($sec > 0) ? -1 : (($sec < 0) ? 1 : 0);