diff options
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Cron_weekly.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Externals.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Gprobe.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Queue.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Ratenotif.php | 1 |
8 files changed, 6 insertions, 14 deletions
diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php index dc781ad73..1d8420947 100644 --- a/Zotlabs/Daemon/Cron_weekly.php +++ b/Zotlabs/Daemon/Cron_weekly.php @@ -21,7 +21,6 @@ class Cron_weekly { require_once('include/hubloc.php'); prune_hub_reinstalls(); - require_once('include/Contact.php'); mark_orphan_hubsxchans(); diff --git a/Zotlabs/Daemon/Externals.php b/Zotlabs/Daemon/Externals.php index 167b0524f..24cfe64ec 100644 --- a/Zotlabs/Daemon/Externals.php +++ b/Zotlabs/Daemon/Externals.php @@ -3,7 +3,7 @@ namespace Zotlabs\Daemon; require_once('include/zot.php'); -require_once('include/identity.php'); +require_once('include/channel.php'); class Externals { diff --git a/Zotlabs/Daemon/Gprobe.php b/Zotlabs/Daemon/Gprobe.php index 8141739be..43cce93c3 100644 --- a/Zotlabs/Daemon/Gprobe.php +++ b/Zotlabs/Daemon/Gprobe.php @@ -22,9 +22,8 @@ class Gprobe { ); if(! $r) { - $x = zot_finger($url,null); - if($x['success']) { - $j = json_decode($x['body'],true); + $j = \Zotlabs\Zot\Finger::run($url,null); + if($j['success']) { $y = import_xchan($j); } } diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 65690f8ce..590be31ee 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -72,8 +72,7 @@ require_once('include/queue_fn.php'); require_once('include/datetime.php'); require_once('include/items.php'); require_once('include/bbcode.php'); -require_once('include/identity.php'); -require_once('include/Contact.php'); +require_once('include/channel.php'); class Notifier { diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 2610ad151..036a4991b 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -4,7 +4,7 @@ namespace Zotlabs\Daemon; require_once('include/zot.php'); require_once('include/socgraph.php'); -require_once('include/Contact.php'); + class Onepoll { diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index 278faf3ee..75efbf8f7 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -62,11 +62,6 @@ class Poller { $d = datetime_convert(); - // TODO check to see if there are any cronhooks before wasting a process - - if(! $restart) - Master::Summon(array('Cronhooks')); - // Only poll from those with suitable relationships $abandon_sql = (($abandon_days) diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php index c247be8e4..27306589d 100644 --- a/Zotlabs/Daemon/Queue.php +++ b/Zotlabs/Daemon/Queue.php @@ -6,6 +6,7 @@ require_once('include/queue_fn.php'); require_once('include/zot.php'); class Queue { + static public function run($argc,$argv) { require_once('include/items.php'); diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php index a404273e2..1cba5e26d 100644 --- a/Zotlabs/Daemon/Ratenotif.php +++ b/Zotlabs/Daemon/Ratenotif.php @@ -12,7 +12,6 @@ class Ratenotif { require_once("datetime.php"); require_once('include/items.php'); - require_once('include/Contact.php'); if($argc < 3) return; |