1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

[feature/system-cron] Fixes to make cron actually run.

PHPBB3-9596
This commit is contained in:
Oleg Pudeyev
2010-04-18 13:48:32 -04:00
parent ea3b98ab49
commit 763dc86c16
6 changed files with 26 additions and 17 deletions

View File

@@ -61,7 +61,7 @@ class cron_manager
{
// ignore ., .. and dot directories
// todo: change is_dir to account for symlinks
if ($entry[0] == '.' || !is_dir($entry))
if ($entry[0] == '.' || !is_dir("$tasks_root_path/$entry"))
{
continue;
}
@@ -76,10 +76,13 @@ class cron_manager
{
$path = $phpbb_root_path . 'includes/cron/tasks/' . $task_dir;
$dir = opendir($path);
while (($entry = readdir($dir)) !== false && substr($entry, -$ext_length) == $ext)
while (($entry = readdir($dir)) !== false)
{
$task_file = substr($entry, 0, -$ext_length);
$task_files[] = array($task_dir, $task_file);
if (substr($entry, -$ext_length) == $ext)
{
$task_file = substr($entry, 0, -$ext_length);
$task_files[] = array($task_dir, $task_file);
}
}
closedir($dir);
}
@@ -106,7 +109,7 @@ class cron_manager
$class = "cron_task_${mod}_${filename}";
if (!class_exists($class))
{
include($phpbb_root_path . "includes/cron/$mod/$filename.$phpEx");
include($phpbb_root_path . "includes/cron/tasks/$mod/$filename.$phpEx");
}
$object = new $class;
$wrapper = new cron_task_wrapper($object);

View File

@@ -34,11 +34,6 @@ if (!class_exists('cron_task'))
*/
abstract class cron_task_base implements cron_task
{
/**
* Runs this cron task.
*/
abstract public function run();
/**
* Returns whether this cron task can run, given current board configuration.
*

View File

@@ -33,6 +33,7 @@ class cron_task_core_tidy_database extends cron_task_base
*/
public function run()
{
global $phpbb_root_path, $phpEx;
if (!function_exists('tidy_database'))
{
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);

View File

@@ -28,7 +28,7 @@ if (!class_exists('cron_task_base'))
*
* @package phpBB3
*/
class cron_task_core_tidy_sessions extends cron_task_base
class cron_task_core_tidy_search extends cron_task_base
{
/**
* Runs this cron task.