From dde7144f5acdebf2dfee18ba2848594d33e9d12b Mon Sep 17 00:00:00 2001 From: "DM42.Net (Matt Dent)" Date: Mon, 15 Jul 2019 00:25:19 -0400 Subject: Hookify Zotlabs\Daemon\Master::Summon --- Zotlabs/Daemon/Master.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Daemon') diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 857d47243..67a3acc0a 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -17,7 +17,22 @@ if(array_search( __file__ , get_included_files()) === 0) { class Master { static public function Summon($arr) { - proc_run('php','Zotlabs/Daemon/Master.php',$arr); + $hookinfo = [ + 'argv'=>$arr + ]; + + call_hooks ('daemon_master_summon',$hookinfo); + + $arr = $hookinfo['argv']; + $argc = count($arr); + + if ((!is_array($arr) || (count($arr) < 1))) { + logger("Summon handled by hook.",LOGGER_DEBUG); + return; + } + + $phpbin = get_config('system','phpbin','php'); + proc_run($phpbin,'Zotlabs/Daemon/Master.php',$arr); } static public function Release($argc,$argv) { @@ -33,6 +48,7 @@ class Master { $argc = count($argv); if ((!is_array($argv) || (count($argv) < 1))) { + logger("Release handled by hook.",LOGGER_DEBUG); return; } -- cgit v1.2.3 From 81ecea29c839c8f914be59acbddd4955673ee2f6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 22 Jul 2019 19:11:52 +0200 Subject: reflect repeats in notifications, use force flag for import_xchan_photo() in cron --- Zotlabs/Daemon/Cron.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Daemon') diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index c99892ffb..fe356bcbf 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -188,7 +188,7 @@ class Cron { if($r) { require_once('include/photo/photo_driver.php'); foreach($r as $rr) { - $photos = import_xchan_photo($rr['xchan_photo_l'],$rr['xchan_hash']); + $photos = import_xchan_photo($rr['xchan_photo_l'], $rr['xchan_hash'], false, true); $x = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", dbesc($photos[0]), -- cgit v1.2.3