Version 4.2.0

system/Helpers/Form/Poll.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Poll input class for Form Builder
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		10 Jan 2014
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Helpers\Form;
@@ -180,7 +179,24 @@ EOF;
 				throw new \InvalidArgumentException( \IPS\Member::loggedIn()->language()->addToStack('form_poll_too_many_answers', FALSE, array( 'sprintf' => array( \IPS\Settings::i()->max_poll_choices ) ) ) );
 			}
 		}
-		
+
+		/* Only validate if the timestamp is greater than zero */
+		if( $this->value->poll_close_date instanceof \IPS\DateTime )
+		{
+			/* Check maximum date */
+			$maximum = \IPS\DateTime::ts( 2147483647 );
+			if ( $this->value->poll_close_date > $maximum )
+			{
+				throw new \LengthException( \IPS\Member::loggedIn()->language()->addToStack('form_date_max', FALSE, array( 'sprintf' => array( $maximum->localeDate() ) ) ) );
+			}
+
+			/* Check minimum date and time */
+			$minimum = \IPS\DateTime::ts( time() );
+			if ( $this->value->poll_close_date < $minimum )
+			{
+				throw new \LengthException( \IPS\Member::loggedIn()->language()->addToStack('form_date_min', FALSE, array( 'sprintf' => array( $minimum->localeDate() . ' ' . $minimum->localeTime( FALSE ) ) ) ) );
+			}
+		}
 		
 		return TRUE;
 	}
@@ -189,7 +205,7 @@ EOF;
 	 * String Value
 	 *
 	 * @param	mixed	$value	The value
-	 * @return	string
+	 * @return	string|null
 	 */
 	public static function stringValue( $value )
 	{