From 77d7238eef84f498fc024fa8b9e06f187dd0f2a6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 14 Apr 2010 16:14:32 -0400
Subject: [feature/system-cron] WIP on making cron tasks runnable via system
 cron

PHPBB3-9596
---
 phpBB/viewforum.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/viewforum.php')

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 47d71849cb..8a06e28394 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -193,9 +193,9 @@ if ($forum_data['forum_topics_per_page'])
 }
 
 // Do the forum Prune thang - cron type job ...
-if ($forum_data['prune_next'] < time() && $forum_data['enable_prune'])
+if (!$config['use_system_cron'] && $cron->is_task_runnable('prune_forum', array($forum_data)))
 {
-	$template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=prune_forum&amp;f=' . $forum_id) . '" alt="cron" width="1" height="1" />');
+	$template->assign_var('RUN_CRON_TASK', $cron->generate_task_code('prune_forum', array($forum_id)));
 }
 
 // Forum rules and subscription info
-- 
cgit v1.2.1


From 0f9b3bcc27e7daf7d605a7a38310a8f62b9a76e8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 17 Apr 2010 03:13:30 -0400
Subject: [feature/system-cron] Refactored cron task naming, loading and
 running.

PHPBB3-9596
---
 phpBB/viewforum.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/viewforum.php')

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 8a06e28394..a3fd9fa6fb 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -193,9 +193,13 @@ if ($forum_data['forum_topics_per_page'])
 }
 
 // Do the forum Prune thang - cron type job ...
-if (!$config['use_system_cron'] && $cron->is_task_runnable('prune_forum', array($forum_data)))
+if (!$config['use_system_cron'])
 {
-	$template->assign_var('RUN_CRON_TASK', $cron->generate_task_code('prune_forum', array($forum_id)));
+	$task = $cron->instantiate_task('core_prune_forum', $forum_data);
+	if ($task && $task->is_ready()) {
+		$url = $task->get_url();
+		$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
+	}
 }
 
 // Forum rules and subscription info
-- 
cgit v1.2.1


From 72699b72fba7b4fb67874353c01c37b7ae4dfea5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 9 May 2010 16:03:18 -0400
Subject: [feature/system-cron] Updated prune forum task name in viewforum.

PHPBB3-9596
---
 phpBB/viewforum.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/viewforum.php')

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index a3fd9fa6fb..c60721e3f1 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -195,7 +195,7 @@ if ($forum_data['forum_topics_per_page'])
 // Do the forum Prune thang - cron type job ...
 if (!$config['use_system_cron'])
 {
-	$task = $cron->instantiate_task('core_prune_forum', $forum_data);
+	$task = $cron->instantiate_task('cron_task_core_prune_forum', $forum_data);
 	if ($task && $task->is_ready()) {
 		$url = $task->get_url();
 		$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
-- 
cgit v1.2.1


From 4302dab5fa964039d53d14d4a80e7bcd8f5e2db5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 29 Oct 2010 13:36:11 +0200
Subject: [feature/system-cron] coding guidelines adjustments

PHPBB3-9596
---
 phpBB/viewforum.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/viewforum.php')

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index c60721e3f1..2672703042 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -196,7 +196,8 @@ if ($forum_data['forum_topics_per_page'])
 if (!$config['use_system_cron'])
 {
 	$task = $cron->instantiate_task('cron_task_core_prune_forum', $forum_data);
-	if ($task && $task->is_ready()) {
+	if ($task && $task->is_ready())
+	{
 		$url = $task->get_url();
 		$template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="cron" />');
 	}
-- 
cgit v1.2.1