Version 3.1.4

upload/admin/sources/classes/class_taskmanager.php

@@ -1,16 +1,19 @@
 <?php
 
 /**
+ * <pre>
  * Invision Power Services
- * IP.Board v3.0.5
+ * IP.Board v3.1.4
  * Task Manager Library
+ * Last Updated: $Date: 2010-08-30 19:21:56 -0400 (Mon, 30 Aug 2010) $
+ * </pre>
  *
- * @author 		$Author: matt $
+ * @author 		$Author: bfarber $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.iinvisionpower.com/community/board/license.html
- * @package		Invision Power Board
- * @link		http://www.iinvisionpower.com
- * @version		$Rev: 5518 $
+ * @license		http://www.invisionpower.com/community/board/license.html
+ * @package		IP.Board
+ * @link		http://www.invisionpower.com
+ * @version		$Rev: 6810 $
  *
  */
 
@@ -164,11 +167,8 @@ class class_taskmanager
 					$this->saveNextRunStamp();
 				}
 				
-				# Cancel and return if not forcing the key
-				if ( ! defined( 'FORCE_TASK_KEY' ) )
-				{
-					return;
-				}
+				# Cancel and return if locked
+				return;
 			}
 				
 			//-----------------------------------------
@@ -345,14 +345,22 @@ class class_taskmanager
 					break;
 			}
 		}
-				
+			
 		//-----------------------------------------
 		// Sort out the hour...
 		//-----------------------------------------
 		
 		if ( $task['task_hour'] == -1)
 		{
-			$this->run_hour = $this->date_now['hour'];
+			/* If week, month are -1 and min =0 then on the hour, otherwise: */
+			if ( ! $day_set AND $task['task_minute'] == 0 )
+			{
+				$this->_addHour( 1 );
+			}
+			else
+			{
+				$this->run_hour = $this->date_now['hour'];
+			}
 		}
 		else
 		{
@@ -458,7 +466,7 @@ class class_taskmanager
 		//-----------------------------------------
 		
 		$next_run = gmmktime( $this->run_hour, $this->run_minute, 0, $this->run_month, $this->run_day, $this->run_year );
-		
+		 
 		return $next_run;
 	
 	}