Version 4.5.0

applications/core/tasks/sitemapgenerator.php

@@ -11,7 +11,7 @@
 namespace IPS\core\tasks;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -29,18 +29,24 @@ class _sitemapgenerator extends \IPS\Task
 	 */
 	public function execute()
 	{
-		try
-		{
-			$generator	= new \IPS\Sitemap;
-			$generator->buildNextSitemap();
-		}
-		catch( \Exception $e )
-		{
-			\IPS\Log::log( $e, 'sitemap_generator' );
-			return $e->getMessage();
-		}
+		$generator	= new \IPS\Sitemap;
 
-		if( count( $generator->log ) )
+		$this->runUntilTimeout( function() use( $generator )
+		{
+			try
+			{
+				/* If it returns false, we're done for now */
+				return $generator->buildNextSitemap();
+			}
+			catch( \Exception $e )
+			{
+				\IPS\Log::log( $e, 'sitemap_generator' );
+				$generator->log[] = $e->getMessage();
+				return FALSE;
+			}
+		} );
+
+		if( \count( $generator->log ) )
 		{
 			return $generator->log;
 		}