1 files changed, 61 insertions, 169 deletions
diff --git a/phpBB/cron.php b/phpBB/cron.php
index 8000066c92..787183f689 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -20,196 +19,89 @@ include($phpbb_root_path . 'common.' . $phpEx);
 $user->session_begin(false);
 $auth->acl($user->data);
 
-$cron_type = request_var('cron_type', '');
-
-// Output transparent gif
-header('Cache-Control: no-cache');
-header('Content-type: image/gif');
-header('Content-length: 43');
-
-echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
+function output_image()
+{
+	// Output transparent gif
+	header('Cache-Control: no-cache');
+	header('Content-type: image/gif');
+	header('Content-length: 43');
 
-// Flush here to prevent browser from showing the page as loading while running cron.
-flush();
+	echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
 
-if (!isset($config['cron_lock']))
-{
-	set_config('cron_lock', '0', true);
+	// Flush here to prevent browser from showing the page as loading while
+	// running cron.
+	flush();
 }
 
-// make sure cron doesn't run multiple times in parallel
-if ($config['cron_lock'])
+function do_cron($cron_lock, $run_tasks)
 {
-	// if the other process is running more than an hour already we have to assume it
-	// aborted without cleaning the lock
-	$time = explode(' ', $config['cron_lock']);
-	$time = $time[0];
+	global $config;
 
-	if ($time + 3600 >= time())
+	foreach ($run_tasks as $task)
 	{
-		exit;
+		if (defined('DEBUG') && $config['use_system_cron'])
+		{
+			echo "[phpBB cron] Running task '{$task->get_name()}'\n";
+		}
+
+		$task->run();
 	}
-}
 
-define('CRON_ID', time() . ' ' . unique_id());
+	// Unloading cache and closing db after having done the dirty work.
+	$cron_lock->release();
+	garbage_collection();
+}
 
-$sql = 'UPDATE ' . CONFIG_TABLE . "
-	SET config_value = '" . $db->sql_escape(CRON_ID) . "'
-	WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'";
-$db->sql_query($sql);
+// Thanks to various fatal errors and lack of try/finally, it is quite easy to leave
+// the cron lock locked, especially when working on cron-related code.
+//
+// Attempt to alleviate the problem by doing setup outside of the lock as much as possible.
+//
+// If DEBUG is defined and cron lock cannot be obtained, a message will be printed.
 
-// another cron process altered the table between script start and UPDATE query so exit
-if ($db->sql_affectedrows() != 1)
+if ($config['use_system_cron'])
 {
-	exit;
+	$cron = $phpbb_container->get('cron.manager');
 }
-
-/**
-* Run cron-like action
-* Real cron-based layer will be introduced in 3.2
-*/
-switch ($cron_type)
+else
 {
-	case 'queue':
-
-		if (time() - $config['queue_interval'] <= $config['last_queue_run'] || !file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
-		{
-			break;
-		}
-
-		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		$queue = new queue();
-
-		$queue->process();
-
-	break;
-
-	case 'tidy_cache':
-
-		if (time() - $config['cache_gc'] <= $config['cache_last_gc'] || !method_exists($cache, 'tidy'))
-		{
-			break;
-		}
-
-		$cache->tidy();
-
-	break;
-
-	case 'tidy_search':
-		
-		// Select the search method
-		$search_type = basename($config['search_type']);
-
-		if (time() - $config['search_gc'] <= $config['search_last_gc'] || !file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx))
-		{
-			break;
-		}
-
-		include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
-
-		// We do some additional checks in the module to ensure it can actually be utilised
-		$error = false;
-		$search = new $search_type($error);
-
-		if ($error)
-		{
-			break;
-		}
-
-		$search->tidy();
-
-	break;
-
-	case 'tidy_warnings':
-
-		if (time() - $config['warnings_gc'] <= $config['warnings_last_gc'])
-		{
-			break;
-		}
+	$cron_type = request_var('cron_type', '');
 
-		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-
-		tidy_warnings();
-
-	break;
-
-	case 'tidy_database':
-
-		if (time() - $config['database_gc'] <= $config['database_last_gc'])
-		{
-			break;
-		}
-
-		include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-
-		tidy_database();
-
-	break;
-
-	case 'tidy_sessions':
-
-		if (time() - $config['session_gc'] <= $config['session_last_gc'])
-		{
-			break;
-		}
-
-		$user->session_gc();
-
-	break;
-
-	case 'prune_forum':
-
-		$forum_id = request_var('f', 0);
-
-		$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
-			FROM ' . FORUMS_TABLE . "
-			WHERE forum_id = $forum_id";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			break;
-		}
+	// Comment this line out for debugging so the page does not return an image.
+	output_image();
+}
 
-		// Do the forum Prune thang
-		if ($row['prune_next'] < time() && $row['enable_prune'])
+$cron_lock = $phpbb_container->get('cron.lock_db');
+if ($cron_lock->acquire())
+{
+	if ($config['use_system_cron'])
+	{
+		$run_tasks = $cron->find_all_ready_tasks();
+	}
+	else
+	{
+		// If invalid task is specified, empty $run_tasks is passed to do_cron which then does nothing
+		$run_tasks = array();
+		$task = $cron->find_task($cron_type);
+		if ($task)
 		{
-			include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-
-			if ($row['prune_days'])
+			if ($task->is_parametrized())
 			{
-				auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
+				$task->parse_parameters($request);
 			}
-
-			if ($row['prune_viewed'])
+			if ($task->is_ready())
 			{
-				auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
+				$run_tasks = array($task);
 			}
 		}
+	}
 
-	break;
+	do_cron($cron_lock, $run_tasks);
 }
-
-// Unloading cache and closing db after having done the dirty work.
-unlock_cron();
-garbage_collection();
-
-exit;
-
-
-/**
-* Unlock cron script
-*/
-function unlock_cron()
+else
 {
-	global $db;
-
-	$sql = 'UPDATE ' . CONFIG_TABLE . "
-		SET config_value = '0'
-		WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'";
-	$db->sql_query($sql);
+	if (defined('DEBUG'))
+	{
+		echo "Could not obtain cron lock.\n";
+	}
 }
-
-?>
-\ No newline at end of file