pass notifier to constructor of SeedDMS_SchedulerTaskBase

This commit is contained in:
Uwe Steinmann 2021-08-19 13:52:51 +02:00
parent bbcf7cb979
commit f19ed34d25
2 changed files with 6 additions and 3 deletions

View File

@ -39,6 +39,8 @@ class SeedDMS_SchedulerTaskBase {
var $fulltextservice; var $fulltextservice;
var $notifier;
/** /**
* Call a hook with a given name * Call a hook with a given name
* *
@ -101,12 +103,13 @@ class SeedDMS_SchedulerTaskBase {
return $ret; return $ret;
} /* }}} */ } /* }}} */
public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */ public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null, $notifier=null) { /* {{{ */
$this->dms = $dms; $this->dms = $dms;
$this->user = $user; $this->user = $user;
$this->settings = $settings; $this->settings = $settings;
$this->logger = $logger; $this->logger = $logger;
$this->fulltextservice = $fulltextservice; $this->fulltextservice = $fulltextservice;
$this->notifier = $notifier;
} /* }}} */ } /* }}} */
public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */ public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */

View File

@ -780,13 +780,13 @@ function seed_pass_verify($password, $hash) { /* {{{ */
} /* }}} */ } /* }}} */
function resolveTask($task) { function resolveTask($task) {
global $dms, $user, $settings, $logger, $fulltextservice; global $dms, $user, $settings, $logger, $fulltextservice, $notifier;
if(is_object($task)) if(is_object($task))
return $task; return $task;
if(is_string($task)) { if(is_string($task)) {
if(class_exists($task)) { if(class_exists($task)) {
$task = new $task($dms, $user, $settings, $logger, $fulltextservice); $task = new $task($dms, $user, $settings, $logger, $fulltextservice, $notifier);
} }
} }
return $task; return $task;