2 files changed, 212 insertions, 7 deletions
diff --git a/phpBB/phpbb/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php
index ce16b3f988..eb3970254f 100644
--- a/phpBB/phpbb/cron/task/core/tidy_search.php
+++ b/phpBB/phpbb/cron/task/core/tidy_search.php
@@ -20,24 +20,60 @@ namespace phpbb\cron\task\core;
 */
 class tidy_search extends \phpbb\cron\task\base
 {
+	/**
+	* phpBB root path
+	* @var string
+	*/
 	protected $phpbb_root_path;
+
+	/**
+	* PHP file extension
+	* @var string
+	*/
 	protected $php_ext;
+
+	/**
+	* Auth object
+	* @var \phpbb\auth\auth
+	*/
 	protected $auth;
+
+	/**
+	* Config object
+	* @var \phpbb\config\config
+	*/
 	protected $config;
+
+	/**
+	* Database object
+	* @var \phpbb\db\driver\driver_interface
+	*/
 	protected $db;
+
+	/**
+	* User object
+	* @var \phpbb\user
+	*/
 	protected $user;
 
 	/**
+	* Event dispatcher object
+	* @var \phpbb\event\dispatcher_interface
+	*/
+	protected $phpbb_dispatcher;
+
+	/**
 	* Constructor.
 	*
-	* @param string $phpbb_root_path The root path
+	* @param string $phpbb_root_path The phpBB root path
 	* @param string $php_ext The PHP file extension
-	* @param \phpbb\auth\auth $auth The auth
-	* @param \phpbb\config\config $config The config
-	* @param \phpbb\db\driver\driver_interface $db The db connection
-	* @param \phpbb\user $user The user
+	* @param \phpbb\auth\auth $auth The auth object
+	* @param \phpbb\config\config $config The config object
+	* @param \phpbb\db\driver\driver_interface $db The database object
+	* @param \phpbb\user $user The user object
+	* @param \phpbb\event\dispatcher_interface $phpbb_dispatcher The event dispatcher object
 	*/
-	public function __construct($phpbb_root_path, $php_ext, \phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user)
+	public function __construct($phpbb_root_path, $php_ext, \phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $phpbb_dispatcher)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
@@ -45,6 +81,7 @@ class tidy_search extends \phpbb\cron\task\base
 		$this->config = $config;
 		$this->db = $db;
 		$this->user = $user;
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
 	}
 
 	/**
@@ -58,7 +95,7 @@ class tidy_search extends \phpbb\cron\task\base
 
 		// We do some additional checks in the module to ensure it can actually be utilised
 		$error = false;
-		$search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user);
+		$search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user, $this->phpbb_dispatcher);
 
 		if (!$error)
 		{
diff --git a/phpBB/phpbb/cron/task/text_reparser/reparser.php b/phpBB/phpbb/cron/task/text_reparser/reparser.php
new file mode 100644
index 0000000000..aa644de827
--- /dev/null
+++ b/phpBB/phpbb/cron/task/text_reparser/reparser.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\cron\task\text_reparser;
+
+/**
+ * Reparse text cron task
+ */
+class reparser extends \phpbb\cron\task\base
+{
+	const MIN = 1;
+	const SIZE = 100;
+
+	/**
+	 * @var \phpbb\config\config
+	 */
+	protected $config;
+
+	/**
+	 * @var \phpbb\config\db_text
+	 */
+	protected $config_text;
+
+	/**
+	 * @var \phpbb\lock\db
+	 */
+	protected $reparse_lock;
+
+	/**
+	 * @var \phpbb\textreparser\manager
+	 */
+	protected $reparser_manager;
+
+	/**
+	 * @var string
+	 */
+	protected $reparser_name;
+
+	/**
+	 * @var \phpbb\di\service_collection
+	 */
+	protected $reparsers;
+
+	/**
+	 * @var array
+	 */
+	protected $resume_data;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config			$config
+	 * @param \phpbb\config\db_text			$config_text
+	 * @param \phpbb\lock\db				$reparse_lock
+	 * @param \phpbb\textreparser\manager	$reparser_manager
+	 * @param \phpbb\di\service_collection	$reparsers
+	 */
+	public function __construct(\phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\lock\db $reparse_lock, \phpbb\textreparser\manager $reparser_manager, \phpbb\di\service_collection $reparsers)
+	{
+		$this->config = $config;
+		$this->config_text = $config_text;
+		$this->reparse_lock = $reparse_lock;
+		$this->reparser_manager = $reparser_manager;
+		$this->reparsers = $reparsers;
+	}
+
+	/**
+	 * Sets the reparser for this cron task
+	 *
+	 * @param string	$reparser
+	 */
+	public function set_reparser($reparser)
+	{
+		$this->reparser_name = (!isset($this->reparsers[$reparser]) ? 'text_reparser.' : '') . $reparser;
+
+		if ($this->resume_data === null)
+		{
+			$this->reparser_manager->get_resume_data($this->reparser_name);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function is_runnable()
+	{
+		if ($this->resume_data === null)
+		{
+			$this->reparser_manager->get_resume_data($this->reparser_name);
+		}
+
+		if (empty($this->resume_data['range-max']) || $this->resume_data['range-max'] >= $this->resume_data['range-min'])
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function should_run()
+	{
+		if (!empty($this->config['reparse_lock']))
+		{
+			$last_run = explode(' ', $this->config['reparse_lock']);
+
+			if ($last_run[0] + 3600 >= time())
+			{
+				return false;
+			}
+		}
+
+		if ($this->config[$this->reparser_name . '_cron_interval'])
+		{
+			return $this->config[$this->reparser_name . '_last_cron'] < time() - $this->config[$this->reparser_name . '_cron_interval'];
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function run()
+	{
+		if ($this->reparse_lock->acquire())
+		{
+			if ($this->resume_data === null)
+			{
+				$this->resume_data = $this->reparser_manager->get_resume_data($this->reparser_name);
+			}
+
+			/**
+			 * @var \phpbb\textreparser\reparser_interface $reparser
+			 */
+			$reparser = $this->reparsers[$this->reparser_name];
+
+			$min = !empty($this->resume_data['range-min']) ? $this->resume_data['range-min'] : self::MIN;
+			$current = !empty($this->resume_data['range-max']) ? $this->resume_data['range-max'] : $reparser->get_max_id();
+			$size = !empty($this->resume_data['range-size']) ? $this->resume_data['range-size'] : self::SIZE;
+
+			if ($current >= $min)
+			{
+				$start = max($min, $current + 1 - $size);
+				$end = max($min, $current);
+
+				$reparser->reparse_range($start, $end);
+
+				$this->reparser_manager->update_resume_data($this->reparser_name, $min, $start - 1, $size);
+			}
+
+			$this->config->set($this->reparser_name . '_last_cron', time());
+			$this->reparse_lock->release();
+		}
+	}
+}