daemon conversion continued...

49 files changed, 66 insertions, 1804 deletions

diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 63078edd7..f23cb14dc 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -119,7 +119,7 @@ class Cron {
 
 
 		if(($d2 != $d1) && ($h1 == $h2)) {
-			Master::Summon('Cron_daily');
+			Master::Summon(array('Cron_daily'));
 		}
 
 		// update any photos which didn't get imported properly
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php
index fe667a139..fbc255d2f 100644
--- a/Zotlabs/Daemon/Cron_daily.php
+++ b/Zotlabs/Daemon/Cron_daily.php
@@ -22,7 +22,7 @@ class Cron_daily {
  
 		$d3 = intval(datetime_convert('UTC','UTC','now','N'));
 		if($d3 == 7) {
-			Master::Summon('Cron_weekly');
+			Master::Summon(array('Cron_weekly'));
 		}
 
 		// once daily run birthday_updates and then expire in background
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 4d052cdf8..0a167b273 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1082,7 +1082,7 @@ class Admin extends \Zotlabs\Web\Controller {
 					intval(PAGE_CENSORED),
 					intval( $uid )
 				);
-				proc_run('php','include/directory.php',$uid,'nopush');
+				\Zotlabs\Daemon\Master::Summon(array('Directory',$uid,'nopush'));
 			}
 			notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) );
 		}
@@ -1141,7 +1141,7 @@ class Admin extends \Zotlabs\Web\Controller {
 						intval($pflags),
 						intval( $uid )
 					);
-					proc_run('php','include/directory.php',$uid,'nopush');
+					\Zotlabs\Daemon\Master::Summon(array('Directory',$uid,'nopush'));
 	
 					notice( sprintf( (($pflags & PAGE_CENSORED) ? t("Channel '%s' censored"): t("Channel '%s' uncensored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL);
 				}; break;
diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php
index 6ef3577d7..382abf370 100644
--- a/Zotlabs/Module/Connect.php
+++ b/Zotlabs/Module/Connect.php
@@ -47,7 +47,8 @@ class Connect extends \Zotlabs\Web\Controller {
 					intval(PAGE_PREMIUM),
 					intval(local_channel()) 
 				);
-				proc_run('php','include/notifier.php','refresh_all',\App::$data['channel']['channel_id']);
+				
+				\Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',\App::$data['channel']['channel_id']));
 			}
 			set_pconfig(\App::$data['channel']['channel_id'],'system','selltext',$text);
 			// reload the page completely to get fresh data
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index a1268510d..0820c76bf 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -176,7 +176,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 					$record = $z[0]['xlink_id'];
 			}
 			if($record) {
-				proc_run('php','include/ratenotif.php','rating',$record);
+				\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
 			}
 		}
 	
@@ -230,7 +230,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 		if(\App::$poi && \App::$poi['abook_my_perms'] != $abook_my_perms
 			&& (! intval(\App::$poi['abook_self']))) {
-			proc_run('php', 'include/notifier.php', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id);
+			\Zotlabs\Daemon\Master(array('Notifier', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id));
 		}
 	
 		if($new_friend) {
@@ -283,7 +283,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 	
 			// pull in a bit of content if there is any to pull in
-			proc_run('php','include/onepoll.php',$contact_id);
+			\Zotlabs\Daemon\Master::Summon(array('Onepoll',$contact_id));
 	
 		}
 	
@@ -414,7 +414,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 			if($cmd === 'update') {
 				// pull feed and consume it, which should subscribe to the hub.
-				proc_run('php',"include/poller.php","$contact_id");
+				\Zotlabs\Daemon\Master::Summon(array('Poller',$contact_id));
 				goaway(z_root() . '/connedit/' . $contact_id);
 	
 			}
@@ -427,7 +427,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				else {
 	
 					// if you are on a different network we'll force a refresh of the connection basic info
-					proc_run('php','include/notifier.php','permission_update',$contact_id);
+					Zotlabs\Daemon\Master::Summon(array('Notifier','permission_update',$contact_id));
 				}
 				goaway(z_root() . '/connedit/' . $contact_id);
 			}
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 9519ca11b..3440e0727 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -232,7 +232,7 @@ class Events extends \Zotlabs\Web\Controller {
 		}
 	
 		if($share)
-			proc_run('php',"include/notifier.php","event","$item_id");
+			\Zotlabs\Daemon\Master(array('Notifier','event',$item_id));
 	
 	}
 	
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index 1701328bf..1df382a89 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -53,14 +53,13 @@ class Follow extends \Zotlabs\Web\Controller {
 		// If we can view their stream, pull in some posts
 	
 		if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss'))
-			proc_run('php','include/onepoll.php',$result['abook']['abook_id']);
+			\Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
 	
 		goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
 	
 	}
 	
-		function get() {
-	
+	function get() {
 		if(! local_channel()) {
 			return login();
 		}
diff --git a/Zotlabs/Module/Fsuggest.php b/Zotlabs/Module/Fsuggest.php
index 143fd34e1..a371f9d21 100644
--- a/Zotlabs/Module/Fsuggest.php
+++ b/Zotlabs/Module/Fsuggest.php
@@ -61,7 +61,7 @@ class Fsuggest extends \Zotlabs\Web\Controller {
 						intval($fsuggest_id),
 						intval(local_channel())
 					);
-					proc_run('php', 'include/notifier.php', 'suggest' , $fsuggest_id);
+					\Zotlabs\Daemon\Master::Summon(array('Notifier', 'suggest' , $fsuggest_id));
 				}
 	
 				info( t('Friend suggestion sent.') . EOL);
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index dadbf8ff1..4e99155fb 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -496,11 +496,11 @@ class Import extends \Zotlabs\Web\Controller {
 		// send out refresh requests
 		// notify old server that it may no longer be primary.
 	
-		proc_run('php','include/notifier.php','location',$channel['channel_id']);
+		\Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id']));
 	
 		// This will indirectly perform a refresh_all *and* update the directory
 	
-		proc_run('php', 'include/directory.php', $channel['channel_id']);
+		\Zotlabs\Daemon\Master::Summon(array('Directory', $channel['channel_id']));
 	
 	
 		notice( t('Import completed.') . EOL);
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 93570fdec..ff8510ade 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -901,7 +901,7 @@ class Item extends \Zotlabs\Web\Controller {
 				}
 			}
 			if(! $nopush)
-				proc_run('php', "include/notifier.php", 'edit_post', $post_id);
+				\Zotlabs\Daemon\Master::Summon(array('Notifier', 'edit_post', $post_id));
 	
 			if((x($_REQUEST,'return')) && strlen($return_path)) {
 				logger('return: ' . $return_path);
@@ -1008,7 +1008,7 @@ class Item extends \Zotlabs\Web\Controller {
 		call_hooks('post_local_end', $datarray);
 	
 		if(! $nopush)
-			proc_run('php', 'include/notifier.php', $notify_type, $post_id);
+			\Zotlabs\Daemon\Master::Summon(array('Notifier', $notify_type, $post_id));
 	
 		logger('post_complete');
 	
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index ac8791950..3ef67ddcc 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -346,7 +346,7 @@ class Like extends \Zotlabs\Web\Controller {
 					// drop_item was not done interactively, so we need to invoke the notifier
 					// in order to push the changes to connections
 	
-					proc_run('php','include/notifier.php','drop',$rr['id']);
+					\Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$rr['id']));
 	
 				}
 	
@@ -531,7 +531,7 @@ class Like extends \Zotlabs\Web\Controller {
 		}
 	
 	
-		proc_run('php',"include/notifier.php","like","$post_id");
+		\Zotlabs\Daemon\Master::Summon(array('Notifier','like',$post_id));
 	
 		if($interactive) {
 			notice( t('Action completed.') . EOL);
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
index 4b5d58df5..4b1e3ffe2 100644
--- a/Zotlabs/Module/Locs.php
+++ b/Zotlabs/Module/Locs.php
@@ -34,7 +34,7 @@ class Locs extends \Zotlabs\Web\Controller {
 					dbesc($channel['channel_hash'])
 				);
 	
-				proc_run('php','include/notifier.php','location',$channel['channel_id']);
+				\Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id']));
 				return;
 			}			
 		}
@@ -72,7 +72,7 @@ class Locs extends \Zotlabs\Web\Controller {
 					intval($hubloc_id),
 					dbesc($channel['channel_hash'])
 				);
-				proc_run('php','include/notifier.php','location',$channel['channel_id']);
+				\Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id']));
 				return;
 			}			
 		}
@@ -91,7 +91,7 @@ class Locs extends \Zotlabs\Web\Controller {
 		$channel = \App::get_channel();
 	
 		if($_REQUEST['sync']) {
-			proc_run('php','include/notifier.php','location',$channel['channel_id']);
+			\Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id']));
 			info( t('Syncing locations') . EOL);
 			goaway(z_root() . '/locs');
 		}
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index 35cb3b9bf..e6487d681 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -173,7 +173,7 @@ class Mail extends \Zotlabs\Web\Controller {
 				build_sync_packet(local_channel(),array('mail' => encode_mail($x[0],true)));
 			}
 	
-			proc_run('php','include/notifier.php','mail',intval(argv(3)));
+			\Zotlabs\Daemon\Master::Summon(array('Notifier','mail',intval(argv(3))));
 	
 			if($r) {
 					info( t('Message recalled.') . EOL );
diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php
index b1007fd06..d1bd44526 100644
--- a/Zotlabs/Module/Mood.php
+++ b/Zotlabs/Module/Mood.php
@@ -97,7 +97,7 @@ class Mood extends \Zotlabs\Web\Controller {
 		$item_id = $post['item_id'];
 	
 		if($item_id) {
-			proc_run('php',"include/notifier.php","activity", $item_id);
+			\Zotlabs\Daemon\Master::Summon(array('Notifier','activity', $item_id));
 		}
 	
 		call_hooks('post_local_end', $arr);
diff --git a/Zotlabs/Module/Prate.php b/Zotlabs/Module/Prate.php
index 65bbcca9a..2a8539ed0 100644
--- a/Zotlabs/Module/Prate.php
+++ b/Zotlabs/Module/Prate.php
@@ -85,7 +85,7 @@ class Prate extends \Zotlabs\Web\Controller {
 				$record = $z[0]['xlink_id'];
 		}
 		if($record) {
-			proc_run('php','include/ratenotif.php','rating',$record);
+			\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
 		}
 	
 		json_return_and_die(array('result' => true));;
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 8f879503c..efcc7bece 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -179,7 +179,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 	
 					// Update directory in background
-					proc_run('php',"include/directory.php",$channel['channel_id']);
+					\Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id']));
 	
 					// Now copy profile-permissions to pictures, to prevent privacyleaks by automatically created folder 'Profile Pictures'
 	
@@ -311,7 +311,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				);
 	
 				profile_photo_set_profile_perms(); //Reset default photo permissions to public
-				proc_run('php','include/directory.php',local_channel());
+				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
 				goaway(z_root() . '/profiles');
 			}
 	
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 72edf396f..3db089e53 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -584,7 +584,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 			if($is_default) {
 				// reload the info for the sidebar widget - why does this not work?
 				profile_load($a,$channel['channel_address']);
-				proc_run('php','include/directory.php',local_channel());
+				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
 			}
 		}
 	}
diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php
index e2c05b6d4..da23b840e 100644
--- a/Zotlabs/Module/Rate.php
+++ b/Zotlabs/Module/Rate.php
@@ -102,14 +102,12 @@ class Rate extends \Zotlabs\Web\Controller {
 		}
 	
 		if($record) {
-			proc_run('php','include/ratenotif.php','rating',$record);
+			\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
 		}
 	
 	}
 	
-	
-	
-		function get() {
+	function get() {
 	
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index f588e2824..3d37faab6 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -543,7 +543,7 @@ class Settings extends \Zotlabs\Web\Controller {
 			);
 		}
 	
-		proc_run('php','include/directory.php',local_channel());
+		\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
 	
 		build_sync_packet();
 	
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php
index 879cf3dbb..26d1c58ea 100644
--- a/Zotlabs/Module/Tagger.php
+++ b/Zotlabs/Module/Tagger.php
@@ -131,7 +131,7 @@ class Tagger extends \Zotlabs\Web\Controller {
 		$ret = post_activity_item($arr);
 	
 		if($ret['success'])
-			proc_run('php','include/notifier.php','tag',$ret['activity']['id']);
+			\Zotlabs\Daemon\Master::Summon(array('Notifier','tag',$ret['activity']['id']));
 	
 		killme();
 	
diff --git a/boot.php b/boot.php
index ca3673361..9b4a7df13 100755
--- a/boot.php
+++ b/boot.php
@@ -1570,7 +1570,7 @@ function fix_system_urls($oldurl, $newurl) {
 				}
 			}
 
-			proc_run('php', 'include/notifier.php', 'refresh_all', $c[0]['channel_id']);
+			Zotlabs\Daemon\Master::Summon(array('Notifier', 'refresh_all', $c[0]['channel_id']));
 		}
 	}
 
diff --git a/include/Contact.php b/include/Contact.php
index 8ad67c28e..e50670a89 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -303,8 +303,7 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
 			dbesc($channel['channel_hash'])
 		);
 
-		proc_run('php','include/notifier.php','purge_all',$channel_id);
-
+		Zotlabs\Daemon\Master::Summon(array('Notifier','purge_all',$channel_id));
 	}
 
 	q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id));
@@ -386,7 +385,7 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
 				@rrmdir($f);
 	}
 
-	proc_run('php','include/directory.php',$channel_id);
+	Zotlabs\Daemon\Master::Summon(array('Directory',$channel_id));
 
 	if($channel_id == local_channel() && $unset_session) {
 		App::$session->nuke();
diff --git a/include/activities.php b/include/activities.php
index 9ba191391..5c1e68720 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -89,7 +89,7 @@ function profile_activity($changed, $value) {
 
 	if($i) {
 		// FIXME - limit delivery in notifier.php to those specificed in the perms argument
-	   	proc_run('php',"include/notifier.php","activity","$i", 'PERMS_R_PROFILE');
+	   	Zotlabs\Daemon\Master::Summon(array('Notifier','activity', $i, 'PERMS_R_PROFILE');
 	}
 
 }
diff --git a/include/attach.php b/include/attach.php
index ae4681994..d9cd30f6d 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1591,7 +1591,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 		$post = item_store($arr);
 		$item_id = $post['item_id'];
 		if($item_id) {
-			proc_run('php',"include/notifier.php","activity",$item_id);
+			Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
 		}
 
 		call_hooks('post_local_end', $arr);
@@ -1627,7 +1627,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 	$item_id = $post['item_id'];
 
 	if($item_id) {
-		proc_run('php',"include/notifier.php","activity",$item_id);
+		Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
 	}
 
 	call_hooks('post_local_end', $arr);
diff --git a/include/checksites.php b/include/checksites.php
deleted file mode 100644
index 9d3ca1797..000000000
--- a/include/checksites.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/hubloc.php');
-
-
-
-function checksites_run($argc,$argv){
-
-
-	cli_startup();
-	$a = get_app();
-
-	logger('checksites: start');
-	
-	if(($argc > 1) && ($argv[1]))
-		$site_id = $argv[1];
-
-	if($site_id)
-		$sql_options = " and site_url = '" . dbesc($argv[1]) . "' ";
-
-	$days = intval(get_config('system','sitecheckdays'));
-	if($days < 1)
-		$days = 30;
-
-	$r = q("select * from site where site_dead = 0 and site_update < %s - INTERVAL %s and site_type = %d $sql_options ",
-		db_utcnow(), db_quoteinterval($days . ' DAY'),
-		intval(SITE_TYPE_ZOT)
-	);
-
-	if(! $r)
-		return;
-
-	foreach($r as $rr) {
-		if(! strcasecmp($rr['site_url'],z_root()))
-			continue;
-
-		$x = ping_site($rr['site_url']);
-		if($x['success']) {
-			logger('checksites: ' . $rr['site_url']);
-			q("update site set site_update = '%s' where site_url = '%s' ",
-				dbesc(datetime_convert()),
-				dbesc($rr['site_url'])
-			);
-		}
-		else {
-			logger('marking dead site: ' . $x['message']);
-			q("update site set site_dead = 1 where site_url = '%s' ",
-				dbesc($rr['site_url'])
-			);
-		}
-	}
-
-	return;
-}
-
-if (array_search(__file__,get_included_files())===0){
-  checksites_run($argc,$argv);
-  killme();
-}
diff --git a/include/cli_suggest.php b/include/cli_suggest.php
deleted file mode 100644
index 94b65f8ee..000000000
--- a/include/cli_suggest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-require_once('include/socgraph.php');
-
-
-function cli_suggest_run($argc,$argv){
-
-	cli_startup();
-	update_suggestions();
-
-}
-
-if (array_search(__file__,get_included_files())===0){
-  cli_suggest_run($argc,$argv);
-  killme();
-}
-
diff --git a/include/cronhooks.php b/include/cronhooks.php
deleted file mode 100644
index ae3806984..000000000
--- a/include/cronhooks.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-
-
-function cronhooks_run($argc,$argv){
-
-	cli_startup();
-
-	logger('cronhooks: start');
-	
-	$d = datetime_convert();
-
-	call_hooks('cron', $d);
-
-	return;
-}
-
-if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($argc,$argv);
-  killme();
-}
diff --git a/include/deliver.php b/include/deliver.php
deleted file mode 100644
index 12f28d6a9..000000000
--- a/include/deliver.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php /** @file */
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/queue_fn.php');
-
-
-function deliver_run($argc,$argv) {
-
-	cli_startup();
-
-	$a = get_app();
-
-	if($argc < 2)
-		return;
-
-	logger('deliver: invoked: ' . print_r($argv,true), LOGGER_DATA);
-
-	for($x = 1; $x < $argc; $x ++) {
-
-		$dresult = null;
-		$r = q("select * from outq where outq_hash = '%s' limit 1",
-			dbesc($argv[$x])
-		);
-		if($r) {
-
-			$notify = json_decode($r[0]['outq_notify'],true);
-
-			// Messages without an outq_msg will need to go via the web, even if it's a
-			// local delivery. This includes conversation requests and refresh packets.
-
-			if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) {
-				logger('deliver: local delivery', LOGGER_DEBUG);
-
-				// local delivery
-				// we should probably batch these and save a few delivery processes
-
-				if($r[0]['outq_msg']) {
-					$m = json_decode($r[0]['outq_msg'],true);
-					if(array_key_exists('message_list',$m)) {
-						foreach($m['message_list'] as $mm) {
-							$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm)))));
-							zot_import($msg,z_root());
-						}
-					}	
-					else {	
-						$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
-						$dresult = zot_import($msg,z_root());
-					}
-
-					remove_queue_item($r[0]['outq_hash']);
-
-					if($dresult && is_array($dresult)) {
-						foreach($dresult as $xx) {
-							if(is_array($xx) && array_key_exists('message_id',$xx)) {
-								if(delivery_report_is_storable($xx)) {
-									q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
-										dbesc($xx['message_id']),
-										dbesc($xx['location']),
-										dbesc($xx['recipient']),
-										dbesc($xx['status']),
-										dbesc(datetime_convert($xx['date'])),
-										dbesc($xx['sender'])
-									);
-								}
-							}
-						}
-					}
-
-					q("delete from dreport where dreport_queue = '%s'",
-						dbesc($argv[$x])
-					);
-				}
-			}
-
-			// otherwise it's a remote delivery - call queue_deliver() with the $immediate flag
-
-			queue_deliver($r[0],true);
-
-		}
-	}
-}
-
-if (array_search(__file__,get_included_files())===0){
-  deliver_run($argc,$argv);
-  killme();
-}
diff --git a/include/deliver_hooks.php b/include/deliver_hooks.php
deleted file mode 100644
index f8f3bb19b..000000000
--- a/include/deliver_hooks.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-
-
-function deliver_hooks_run($argc,$argv) {
-
-	cli_startup();
-
-	$a = get_app();
-
-	if($argc < 2)
-		return;
-
-
-	$r = q("select * from item where id = '%d'",
-		intval($argv[1])
-	);
-	if($r)
-		call_hooks('notifier_normal',$r[0]);
-
-}
-
-if (array_search(__file__,get_included_files())===0){
-  deliver_hooks_run($argc,$argv);
-  killme();
-}
diff --git a/include/directory.php b/include/directory.php
deleted file mode 100644
index 5120474a6..000000000
--- a/include/directory.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * @file include/directory.php
- * @brief executes directory_run()
- */
-
-require_once('boot.php');
-require_once('include/zot.php');
-require_once('include/cli_startup.php');
-require_once('include/dir_fns.php');
-require_once('include/queue_fn.php');
-
-/**
- * @brief
- *
- * @param array $argv
- * @param array $argc
- */
-function directory_run($argc,$argv){
-
-	cli_startup();
-
-	if($argc < 2)
-		return;
-
-	$force = false;
-	$pushall = true;
-
-	if($argc > 2) {
-		if($argv[2] === 'force')
-			$force = true;
-		if($argv[2] === 'nopush')
-			$pushall = false;
-	}
-
-	logger('directory update', LOGGER_DEBUG);
-
-	$dirmode = get_config('system','directory_mode');
-	if($dirmode === false)
-		$dirmode = DIRECTORY_MODE_NORMAL;
-
-	$x = q("select * from channel where channel_id = %d limit 1",
-		intval($argv[1])
-	);
-	if(! $x)
-		return;
-
-	$channel = $x[0];
-
-	if($dirmode != DIRECTORY_MODE_NORMAL) {
-
-		// this is an in-memory update and we don't need to send a network packet.
-
-		local_dir_update($argv[1],$force);
-
-		q("update channel set channel_dirdate = '%s' where channel_id = %d",
-			dbesc(datetime_convert()),
-			intval($channel['channel_id'])
-		);
-
-		// Now update all the connections
-		if($pushall) 
-			proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
-
-		return;
-	}
-
-	// otherwise send the changes upstream
-
-	$directory = find_upstream_directory($dirmode);
-	$url = $directory['url'] . '/post';
-
-	// ensure the upstream directory is updated
-
-	$packet = zot_build_packet($channel,(($force) ? 'force_refresh' : 'refresh'));
-	$z = zot_zot($url,$packet);
-
-	// re-queue if unsuccessful
-
-	if(! $z['success']) {
-
-		/** @FIXME we aren't updating channel_dirdate if we have to queue
-		 * the directory packet. That means we'll try again on the next poll run.
-		 */
-
-		$hash = random_string();
-
-		queue_insert(array(
-			'hash'       => $hash,
-			'account_id' => $channel['channel_account_id'],
-			'channel_id' => $channel['channel_id'],
-			'posturl'    => $url,
-			'notify'     => $packet,
-		));
-
-	}
-	else {
-		q("update channel set channel_dirdate = '%s' where channel_id = %d",
-			dbesc(datetime_convert()),
-			intval($channel['channel_id'])
-		);
-	}
-
-	// Now update all the connections
-	if($pushall)
-		proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
-
-}
-
-if (array_search(__file__, get_included_files()) === 0) {
-	directory_run($argc,$argv);
-	killme();
-}
diff --git a/include/expire.php b/include/expire.php
deleted file mode 100644
index a2468e0f2..000000000
--- a/include/expire.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * @file include/expire.php
- */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-
-function expire_run($argc,$argv){
-
-	cli_startup();
-
-	// perform final cleanup on previously delete items
-
-	$r = q("select id from item where item_deleted = 1 and item_pending_remove = 0 and changed < %s - INTERVAL %s",
-		db_utcnow(), db_quoteinterval('10 DAY')
-	);
-	if ($r) {
-		foreach ($r as $rr) {
-			drop_item($rr['id'], false, DROPITEM_PHASE2);
-		}
-	}
-
-	// physically remove anything that has been deleted for more than two months
-	/** @FIXME - this is a wretchedly inefficient query */
-
-	$r = q("delete from item where item_pending_remove = 1 and changed < %s - INTERVAL %s",
-		db_utcnow(), db_quoteinterval('36 DAY')
-	);
-
-	/** @FIXME make this optional as it could have a performance impact on large sites */
-
-	if (intval(get_config('system', 'optimize_items')))
-		q("optimize table item");
-
-	logger('expire: start', LOGGER_DEBUG);
-
-	$site_expire = get_config('system', 'default_expire_days');
-
-	logger('site_expire: ' . $site_expire);
-
-	$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
-
-	if ($r) {
-		foreach ($r as $rr) {
-
-			// expire the sys channel separately
-			if (intval($rr['channel_system']))
-				continue;
-
-			// service class default (if non-zero) over-rides the site default
-
-			$service_class_expire = service_class_fetch($rr['channel_id'], 'expire_days');
-			if (intval($service_class_expire))
-				$channel_expire = $service_class_expire;
-			else
-				$channel_expire = $site_expire;
-
-			if (intval($channel_expire) && (intval($channel_expire) < intval($rr['channel_expire_days'])) ||
-				intval($rr['channel_expire_days'] == 0)) {
-				$expire_days = $channel_expire;
-			} else {
-				$expire_days = $rr['channel_expire_days'];
-			}
-
-			// if the site or service class expiration is non-zero and less than person expiration, use that
-			logger('Expire: ' . $rr['channel_address'] . ' interval: ' . $expire_days, LOGGER_DEBUG);
-			item_expire($rr['channel_id'], $expire_days);
-		}
-	}
-
-	$x = get_sys_channel();
-	if ($x) {
-
-		// this should probably just fetch the channel_expire_days from the sys channel,
-		// but there's no convenient way to set it.
-
-		$expire_days = get_config('system', 'sys_expire_days');
-		if ($expire_days === false)
-			$expire_days = 30;
-
-		if (intval($site_expire) && (intval($site_expire) < intval($expire_days))) {
-			$expire_days = $site_expire;
-		}
-
-		logger('Expire: sys interval: ' . $expire_days, LOGGER_DEBUG);
-
-		if ($expire_days)
-			item_expire($x['channel_id'], $expire_days);
-
-		logger('Expire: sys: done', LOGGER_DEBUG);
-	}
-}
-
-if (array_search(__file__, get_included_files()) === 0){
-	expire_run($argc,$argv);
-	killme();
-}
diff --git a/include/externals.php b/include/externals.php
deleted file mode 100644
index ddf44dc52..000000000
--- a/include/externals.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/identity.php');
-
-function externals_run($argc,$argv){
-
-	cli_startup();
-	$a = get_app();
-	
-
-	$total = 0;
-	$attempts = 0;
-
-	logger('externals: startup', LOGGER_DEBUG);
-
-	// pull in some public posts
-
-
-	while($total == 0 && $attempts < 3) {
-		$arr = array('url' => '');
-		call_hooks('externals_url_select',$arr);
-
-		if($arr['url']) {
-			$url = $arr['url'];
-		} 
-		else {
-			$randfunc = db_getfunc('RAND');
-
-			// fixme this query does not deal with directory realms. 
-
-			$r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d and site_type = %d and site_dead = 0 order by $randfunc limit 1",
-				dbesc(z_root()),
-				intval(DIRECTORY_MODE_STANDALONE),
-				intval(SITE_TYPE_ZOT)
-			);
-			if($r)
-				$url = $r[0]['site_url'];
-		}
-
-		$blacklisted = false;
-
-		if(! check_siteallowed($url)) {
-			logger('blacklisted site: ' . $url);
-			$blacklisted = true;
-		}
-
-		$attempts ++;
-
-		// make sure we can eventually break out if somebody blacklists all known sites
-
-		if($blacklisted) {
-			if($attempts > 20)
-				break;
-			$attempts --;
-			continue;
-		}
-
-		if($url) {
-			if($r[0]['site_pull'] !== NULL_DATE)
-				$mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day'));
-			else {
-				$days = get_config('externals','since_days');
-				if($days === false)
-					$days = 15;
-				$mindate = urlencode(datetime_convert('','','now - ' . intval($days) . ' days'));
-			}
-
-			$feedurl = $url . '/zotfeed?f=&mindate=' . $mindate;
-
-			logger('externals: pulling public content from ' . $feedurl, LOGGER_DEBUG);
-
-			$x = z_fetch_url($feedurl);
-			if(($x) && ($x['success'])) {
-
-				q("update site set site_pull = '%s' where site_url = '%s'",
-					dbesc(datetime_convert()),
-					dbesc($url)
-				);
-
-				$j = json_decode($x['body'],true);
-				if($j['success'] && $j['messages']) {
-					$sys = get_sys_channel();
-					foreach($j['messages'] as $message) {
-						// on these posts, clear any route info. 
-						$message['route'] = '';
-						$results = process_delivery(array('hash' => 'undefined'), get_item_elements($message),
-							array(array('hash' => $sys['xchan_hash'])), false, true);
-						$total ++;
-					}
-					logger('externals: import_public_posts: ' . $total . ' messages imported', LOGGER_DEBUG);
-				}
-			}
-		}
-	}
-}
-
-if (array_search(__file__,get_included_files())===0){
-  externals_run($argc,$argv);
-  killme();
-}
diff --git a/include/follow.php b/include/follow.php
index 70e717cfc..e4f7e8557 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -269,7 +269,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 
 	if($r) {
 		$result['abook'] = $r[0];
-		proc_run('php', 'include/notifier.php', 'permission_create', $result['abook']['abook_id']);
+		Zotlabs\Daemon\Master::Summon(array('Notifier', 'permission_create', $result['abook']['abook_id']));
 	}
 
 	$arr = array('channel_id' => $uid, 'channel' => $channel, 'abook' => $result['abook']);
diff --git a/include/gprobe.php b/include/gprobe.php
deleted file mode 100644
index f3daae9d6..000000000
--- a/include/gprobe.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php /** @file */
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-
-// CLI utility
-// performs zot_finger on $argv[1], which is a hex_encoded webbie/reddress
-
-function gprobe_run($argc,$argv){
-
-	cli_startup();
-
-	$a = get_app();
-
-	if($argc != 2)
-		return;
-
-	$url = hex2bin($argv[1]);
-
-	if(! strpos($url,'@'))
-		return;
-
-	$r = q("select * from xchan where xchan_addr = '%s' limit 1",
-		dbesc($url)
-	);
-
-	if(! $r) {
-		$x = zot_finger($url,null);
-		if($x['success']) {
-			$j = json_decode($x['body'],true);
-			$y = import_xchan($j);
-		}
-	}
-
-	return;
-}
-
-if (array_search(__file__,get_included_files())===0){
-  gprobe_run($argc,$argv);
-  killme();
-}
diff --git a/include/hubloc.php b/include/hubloc.php
index 695cada3c..397646449 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -106,7 +106,7 @@ function remove_obsolete_hublocs() {
 			dbesc($rr['hubloc_hash']) 
 		);
 		if($x) {
-			proc_run('php','include/notifier.php','location',$x[0]['channel_id']);
+			Zotlabs\Daemon\Master::Summon(array('Notifier','location',$x[0]['channel_id']));
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
 		}
diff --git a/include/identity.php b/include/identity.php
index 807f850db..206dad084 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -436,7 +436,7 @@ function create_identity($arr) {
 
 		call_hooks('create_identity', $newuid);
 
-		proc_run('php','include/directory.php', $ret['channel']['channel_id']);
+		Zotlabs\Daemon\Master::Summon(array('Directory', $ret['channel']['channel_id']));
 	}
 
 	$ret['success'] = true;
@@ -1439,7 +1439,7 @@ function get_my_address() {
 function zid_init(&$a) {
 	$tmp_str = get_my_address();
 	if(validate_email($tmp_str)) {
-		proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+		Zotlabs\Daemon\Master::Summon(array('Gprobe',bin2hex($tmp_str)));
 		$arr = array('zid' => $tmp_str, 'url' => App::$cmd);
 		call_hooks('zid_init',$arr);
 		if(! local_channel()) {
diff --git a/include/import.php b/include/import.php
index a62ec4ed5..a94c6c1ac 100644
--- a/include/import.php
+++ b/include/import.php
@@ -574,7 +574,7 @@ function import_items($channel,$items,$sync = false) {
 					if($sync && $item['item_wall']) {
 						// deliver singletons if we have any
 						if($item_result && $item_result['success']) {
-							proc_run('php','include/notifier.php','single_activity',$item_result['item_id']);
+							Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id']));
 						}
 					}
 					continue;
@@ -588,7 +588,7 @@ function import_items($channel,$items,$sync = false) {
 			if($sync && $item['item_wall']) {
 				// deliver singletons if we have any
 				if($item_result && $item_result['success']) {
-					proc_run('php','include/notifier.php','single_activity',$item_result['item_id']);
+					Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id']));
 				}
 			}
 		}
@@ -936,7 +936,7 @@ function import_mail($channel,$mails,$sync = false) {
 			$m['uid'] = $channel['channel_id'];
 			$mail_id = mail_store($m);
 			if($sync && $mail_id) {
-				proc_run('php','include/notifier.php','single_mail',$mail_id);
+				Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));
 			}
  		}
 	}	
diff --git a/include/importdoc.php b/include/importdoc.php
deleted file mode 100755
index 7c65037d3..000000000
--- a/include/importdoc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-
-
-require_once('include/cli_startup.php');
-
-
-function importdoc_run($argc,$argv){
-
-	cli_startup();
-
-	require_once('include/help.php');
-
-
-	update_docs_dir('doc/*');
-
-}
-if (array_search(__file__,get_included_files())===0){
-  importdoc_run($argc,$argv);
-  killme();
-}
-
-function update_docs_dir($s) {
-	$f = basename($s);
-	$d = dirname($s);
-	if($s === 'doc/html')
-		return;
-	$files = glob("$d/$f");
-	if($files) {
-		foreach($files as $fi) {
-			if($fi === 'doc/html')
-				continue;
-			if(is_dir($fi))
-				update_docs_dir("$fi/*");
-			else
-				store_doc_file($fi);
-		}
-	}
-}
-
-
diff --git a/include/items.php b/include/items.php
index adc06898d..a25be72b3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -445,7 +445,7 @@ function post_activity_item($arr) {
 	if($post_id) {
 		$arr['id'] = $post_id;
 		call_hooks('post_local_end', $arr);
-		proc_run('php','include/notifier.php','activity',$post_id);
+		Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$post_id));
 		$ret['success'] = true;
 		$r = q("select * from item where id = %d limit 1",
 			intval($post_id)
@@ -2427,7 +2427,7 @@ function tag_deliver($uid, $item_id) {
 							dbesc($j_tgt['id']),
 							intval($u[0]['channel_id'])
 						);
-						proc_run('php','include/notifier.php','edit_post',$p[0]['id']);
+						Zotlabs\Daemon\Master::Summon(array('Notifier','edit_post',$p[0]['id']));
 					}
 				}
 			}
@@ -2799,7 +2799,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 
 
 	if($r)
-		proc_run('php','include/notifier.php','tgroup',$item_id);
+		Zotlabs\Daemon\Master::Summon(array('Notifier','tgroup',$item_id));
 	else {
 		logger('start_delivery_chain: failed to update item');
 		// reset the source xchan to prevent loops
@@ -3307,7 +3307,7 @@ function item_expire($uid,$days) {
 		drop_item($item['id'],false);
 	}
 
-//	proc_run('php',"include/notifier.php","expire","$uid");
+//	Zotlabs\Daemon\Master::Summon(array('Notifier','expire',$uid));
 }
 
 function retain_item($id) {
@@ -3333,7 +3333,7 @@ function drop_items($items) {
 	// multiple threads may have been deleted, send an expire notification
 
 	if($uid)
-		proc_run('php',"include/notifier.php","expire","$uid");
+		Zotlabs\Daemon\Master::Summon(array('Notifier','expire',$uid));
 }
 
 
@@ -3429,7 +3429,7 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
 		// set if we know we're going to send delete notifications out to others.
 
 		if((intval($item['item_wall']) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1))
-			proc_run('php','include/notifier.php','drop',$notify_id);
+			Zotlabs\Daemon\Master::Summon(array('Notifier','drop',$notify_id));
 
 		goaway(z_root() . '/' . $_SESSION['return_url']);
 	}
diff --git a/include/message.php b/include/message.php
index a7883d50e..d3d8181ae 100644
--- a/include/message.php
+++ b/include/message.php
@@ -257,7 +257,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 		}
 	}
 
-	proc_run('php','include/notifier.php','mail',$post_id);
+	Zotlabs\Daemon\Master::Summon(array('Notifier','mail',$post_id));
 
 	$ret['success'] = true;
 	$ret['message_item'] = intval($post_id);
diff --git a/include/network.php b/include/network.php
index a2e655d92..47b04f007 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1922,7 +1922,7 @@ function do_delivery($deliveries) {
 		$deliver[] = $d;
 
 		if(count($deliver) >= $deliveries_per_process) {
-			proc_run('php','include/deliver.php',$deliver);
+			Zotlabs\Daemon\Master::summon(array('Deliver',$deliver));
 			$deliver = array();
 			if($interval)
 				@time_sleep_until(microtime(true) + (float) $interval);
@@ -1932,7 +1932,7 @@ function do_delivery($deliveries) {
 	// catch any stragglers
 
 	if($deliver)
-		proc_run('php','include/deliver.php',$deliver);
+		Zotlabs\Daemon\Master::summon(array('Deliver',$deliver));
 	
 
 }
diff --git a/include/notifier.php b/include/notifier.php
deleted file mode 100644
index 780a8798c..000000000
--- a/include/notifier.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php /** @file */
-
-require_once("boot.php");
-require_once('include/queue_fn.php');
-require_once('include/html2plain.php');
-
-/*
- * This file was at one time responsible for doing all deliveries, but this caused
- * big problems on shared hosting systems, where the process might get killed by the 
- * hosting provider and nothing would get delivered. 
- * It now only delivers one message under certain cases, and invokes a queued
- * delivery mechanism (include/deliver.php) to deliver individual contacts at 
- * controlled intervals.
- * This has a much better chance of surviving random processes getting killed
- * by the hosting provider. 
- *
- * The basic flow is:
- *   Identify the type of message
- *   Collect any information that needs to be sent
- *   Convert it into a suitable generic format for sending
- *   Figure out who the recipients are and if we need to relay 
- *       through a conversation owner
- *   Once we know what recipients are involved, collect a list of 
- *       destination sites
- *   Build and store a queue item for each unique site and invoke
- *       a delivery process for each site or a small number of sites (1-3)
- *       and add a slight delay between each delivery invocation if desired (usually)
- *   
- */
-
-/*
- * The notifier is typically called with:
- *
- *		proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
- *
- * where COMMAND is one of the following:
- *
- *		activity				(in diaspora.php, dfrn_confirm.php, profiles.php)
- *		comment-import			(in diaspora.php, items.php)
- *		comment-new				(in item.php)
- *		drop					(in diaspora.php, items.php, photos.php)
- *		edit_post				(in item.php)
- *		event					(in events.php)
- *		expire					(in items.php)
- *		like					(in like.php, poke.php)
- *		mail					(in message.php)
- *		tag						(in photos.php, poke.php, tagger.php)
- *		tgroup					(in items.php)
- *		wall-new				(in photos.php, item.php)
- *
- * and ITEM_ID is the id of the item in the database that needs to be sent to others.
- *
- * ZOT 
- *       permission_create      abook_id
- *       permission_update      abook_id
- *       refresh_all            channel_id
- *       purge_all              channel_id
- *       expire                 channel_id
- *       relay					item_id (item was relayed to owner, we will deliver it as owner)
- *       single_activity        item_id (deliver to a singleton network from the appropriate clone)
- *       single_mail            mail_id (deliver to a singleton network from the appropriate clone)
- *       location               channel_id
- *       request                channel_id            xchan_hash             message_id
- *       rating                 xlink_id
- *
- */
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-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');
-
-function notifier_run($argc,$argv){
-
-	cli_startup();
-
-	$a = get_app();
-
-
-	if($argc < 3)
-		return;
-
-	logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
-
-	$cmd = $argv[1];
-
-	$item_id = $argv[2];
-
-	$extra = (($argc > 3) ? $argv[3] : null);
-
-	if(! $item_id)
-		return;
-
-	$sys = get_sys_channel();
-
-	$deliveries = array();
-
-	$dead_hubs = array();
-
-	$dh = q("select site_url from site where site_dead = 1");
-	if($dh) {
-		foreach($dh as $dead) {
-			$dead_hubs[] = $dead['site_url'];
-		}
-	}
-
-
-	$request = false;
-	$mail = false;
-	$top_level = false;
-	$location  = false;
-	$recipients = array();
-	$url_recipients = array();
-	$normal_mode = true;
-	$packet_type = 'undefined';
-
-	if($cmd === 'mail' || $cmd === 'single_mail') {
-		$normal_mode = false;
-		$mail = true;
-		$private = true;
-		$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
-				intval($item_id)
-		);
-		if(! $message) {
-			return;
-		}
-		xchan_mail_query($message[0]);
-		$uid = $message[0]['channel_id'];
-		$recipients[] = $message[0]['from_xchan']; // include clones
-		$recipients[] = $message[0]['to_xchan'];
-		$item = $message[0];
-
-		$encoded_item = encode_mail($item);
-
-		$s = q("select * from channel where channel_id = %d limit 1",
-			intval($item['channel_id'])
-		);
-		if($s)
-			$channel = $s[0];
-
-	}
-	elseif($cmd === 'request') {
-		$channel_id = $item_id;
-		$xchan = $argv[3];
-		$request_message_id = $argv[4];
-
-		$s = q("select * from channel where channel_id = %d limit 1",
-			intval($channel_id)
-		);
-		if($s)
-			$channel = $s[0];
-
-		$private = true;
-		$recipients[] = $xchan;
-		$packet_type = 'request';
-		$normal_mode = false;
-	}
-	elseif($cmd == 'permission_update' || $cmd == 'permission_create') {
-		// Get the (single) recipient	
-		$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0",
-			intval($item_id)
-		);
-		if($r) {
-			$uid = $r[0]['abook_channel'];
-			// Get the sender
-			$channel = channelx_by_n($uid);
-			if($channel) {
-				$perm_update = array('sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
-
-				if($cmd == 'permission_create')
-					call_hooks('permissions_create',$perm_update);
-				else
-					call_hooks('permissions_update',$perm_update);
-
-				if($perm_update['success']) {
-					if($perm_update['deliveries']) {
-						$deliveries[] = $perm_update['deliveries'];
-						do_delivery($deliveries);
-					}
-					return;				
-				}
-				else {
-					$recipients[] = $r[0]['abook_xchan'];
-					$private = false;
-					$packet_type = 'refresh';
-					$packet_recips = array(array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig'],'hash' => $r[0]['xchan_hash']));
-				}
-			}
-		}
-	}
-	elseif($cmd === 'refresh_all') {
-		logger('notifier: refresh_all: ' . $item_id);
-		$uid = $item_id;
-		$channel = channelx_by_n($item_id);
-		$r = q("select abook_xchan from abook where abook_channel = %d",
-			intval($item_id)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$recipients[] = $rr['abook_xchan'];
-			}
-		}
-		$private = false;
-		$packet_type = 'refresh';
-	}
-	elseif($cmd === 'location') {
-		logger('notifier: location: ' . $item_id);
-		$s = q("select * from channel where channel_id = %d limit 1",
-			intval($item_id)
-		);
-		if($s)
-			$channel = $s[0];
-		$uid = $item_id;
-		$recipients = array();
-		$r = q("select abook_xchan from abook where abook_channel = %d",
-			intval($item_id)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$recipients[] = $rr['abook_xchan'];
-			}
-		}
-
-		$encoded_item = array('locations' => zot_encode_locations($channel),'type' => 'location', 'encoding' => 'zot');
-		$target_item = array('aid' => $channel['channel_account_id'],'uid' => $channel['channel_id']);
-		$private = false;
-		$packet_type = 'location';
-		$location = true;
-	}
-	elseif($cmd === 'purge_all') {
-		logger('notifier: purge_all: ' . $item_id);
-		$s = q("select * from channel where channel_id = %d limit 1",
-			intval($item_id)
-		);
-		if($s)
-			$channel = $s[0];
-		$uid = $item_id;
-		$recipients = array();
-		$r = q("select abook_xchan from abook where abook_channel = %d",
-			intval($item_id)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$recipients[] = $rr['abook_xchan'];
-			}
-		}
-		$private = false;
-		$packet_type = 'purge';
-	}
-	else {
-
-		// Normal items
-
-		// Fetch the target item
-
-		$r = q("SELECT * FROM item WHERE id = %d and parent != 0 LIMIT 1",
-			intval($item_id)
-		);
-
-		if(! $r)
-			return;
-
-		xchan_query($r);
-
-		$r = fetch_post_tags($r);
-		
-		$target_item = $r[0];
-		$deleted_item = false;
-
-		if(intval($target_item['item_deleted'])) {
-			logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
-			$deleted_item = true;
-		}
-
-		if(intval($target_item['item_type']) != ITEM_TYPE_POST) {
-			logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
-			return;
-		}
-		if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || intval($target_item['item_hidden'])) {
-			logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
-			return;
-		}
-
-		if(strpos($target_item['postopts'],'nodeliver') !== false) {
-			logger('notifier: target item is undeliverable', LOGGER_DEBUG);
-			return;
-		}
-
-		$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
-			intval($target_item['uid'])
-		);
-		if($s)
-			$channel = $s[0];
-
-		if($channel['channel_hash'] !== $target_item['author_xchan'] && $channel['channel_hash'] !== $target_item['owner_xchan']) {
-			logger("notifier: Sending channel {$channel['channel_hash']} is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
-			return;
-		}
-
-
-		if($target_item['id'] == $target_item['parent']) {
-			$parent_item = $target_item;
-			$top_level_post = true;
-		}
-		else {
-			// fetch the parent item
-			$r = q("SELECT * from item where id = %d order by id asc",
-				intval($target_item['parent'])
-			);
-
-			if(! $r)
-				return;
-
-			if(strpos($r[0]['postopts'],'nodeliver') !== false) {
-				logger('notifier: target item is undeliverable', LOGGER_DEBUG, LOG_NOTICE);
-				return;
-			}
-
-			xchan_query($r);
-			$r = fetch_post_tags($r);
-		
-			$parent_item = $r[0];
-			$top_level_post = false;
-		}
-
-		// avoid looping of discover items 12/4/2014
-
-		if($sys && $parent_item['uid'] == $sys['channel_id'])
-			return;
-
-		$encoded_item = encode_item($target_item);
-		
-		// Send comments to the owner to re-deliver to everybody in the conversation
-		// We only do this if the item in question originated on this site. This prevents looping.
-		// To clarify, a site accepting a new comment is responsible for sending it to the owner for relay.
-		// Relaying should never be initiated on a post that arrived from elsewhere.  
-
-		// We should normally be able to rely on ITEM_ORIGIN, but start_delivery_chain() incorrectly set this
-		// flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
-		// the hostname in the message_id and provides a second (fallback) opinion. 
-
-		$relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
-
-
-
-		$uplink = false;
-
-		// $cmd === 'relay' indicates the owner is sending it to the original recipients
-		// don't allow the item in the relay command to relay to owner under any circumstances, it will loop
-
-		logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
-		logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA, LOG_DEBUG);
-
-		// tag_deliver'd post which needs to be sent back to the original author
-
-		if(($cmd === 'uplink') && intval($parent_item['item_uplink']) && (! $top_level_post)) {
-			logger('notifier: uplink');			
-			$uplink = true;
-		} 
-
-		if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
-			logger('notifier: followup relay', LOGGER_DEBUG);
-			$recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);
-			$private = true;
-			if(! $encoded_item['flags'])
-				$encoded_item['flags'] = array();
-			$encoded_item['flags'][] = 'relay';
-		}
-		else {
-			logger('notifier: normal distribution', LOGGER_DEBUG);
-			if($cmd === 'relay')
-				logger('notifier: owner relay');
-
-			// if our parent is a tag_delivery recipient, uplink to the original author causing
-			// a delivery fork. 
-
-			if(($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
-				// don't uplink a relayed post to the relay owner
-				if($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
-					logger('notifier: uplinking this item');
-					proc_run('php','include/notifier.php','uplink',$item_id);
-				}
-			}
-
-			$private = false;
-			$recipients = collect_recipients($parent_item,$private);
-
-			// FIXME add any additional recipients such as mentions, etc.
-
-			// don't send deletions onward for other people's stuff
-			// TODO verify this is needed - copied logic from same place in old code
-
-			if(intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) {
-				logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE);
-				return;
-			}
-		}
-
-	}
-
-	$walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false); 
-
-	// Generic delivery section, we have an encoded item and recipients
-	// Now start the delivery process
-
-	$x = $encoded_item;
-	$x['title'] = 'private';
-	$x['body'] = 'private';
-	logger('notifier: encoded item: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
-
-	stringify_array_elms($recipients);
-	if(! $recipients)
-		return;
-
-//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
-
-	$env_recips = (($private) ? array() : null);
-
-	$details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")");
-
-
-	$recip_list = array();
-
-	if($details) {
-		foreach($details as $d) {
-
-			$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; 
-			if($private)
-				$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']);
-
-			if($d['xchan_network'] === 'mail' && $normal_mode) {
-				$delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode');
-				if(! $delivery_options)
-					format_and_send_email($channel,$d,$target_item);
-			}
-		}
-	}
-
-
-	$narr = array(
-		'channel' => $channel,
-		'env_recips' => $env_recips,
-		'packet_recips' => $packet_recips,
-		'recipients' => $recipients,
-		'item' => $item,
-		'target_item' => $target_item,
-		'top_level_post' => $top_level_post,
-		'private' => $private,
-		'relay_to_owner' => $relay_to_owner,
-		'uplink' => $uplink,
-		'cmd' => $cmd,
-		'mail' => $mail,
-		'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-		'location' => $location,
-		'request' => $request,
-		'normal_mode' => $normal_mode,
-		'packet_type' => $packet_type,
-		'walltowall' => $walltowall,
-		'queued' => array()
-	);
-
-	call_hooks('notifier_process', $narr);
-	if($narr['queued']) {
-		foreach($narr['queued'] as $pq)
-			$deliveries[] = $pq;
-	}
-
-	// notifier_process can alter the recipient list
-
-	$recipients    = $narr['recipients'];
-	$env_recips    = $narr['env_recips'];
-	$packet_recips = $narr['packet_recips'];
-
-	if(($private) && (! $env_recips)) {
-		// shouldn't happen
-		logger('notifier: private message with no envelope recipients.' . print_r($argv,true), LOGGER_NORMAL, LOG_NOTICE);
-	}
-	
-	logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list,true), LOGGER_DEBUG);
-	
-
-	// Now we have collected recipients (except for external mentions, FIXME)
-	// Let's reduce this to a set of hubs.
-
-	$r = q("select * from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") 
-		and hubloc_error = 0 and hubloc_deleted = 0"
-	);		
- 
-
-	if(! $r) {
-		logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE);
-		return;
-	}
-
-	$hubs = $r;
-
-
-
-	/**
-	 * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, since it may have been 
-	 * a re-install which has not yet been detected and pruned.
-	 * For other networks which don't have or require sitekeys, we'll have to use the URL
-	 */
-
-
-	$hublist = array(); // this provides an easily printable list for the logs
-	$dhubs   = array(); // delivery hubs where we store our resulting unique array
-	$keys    = array(); // array of keys to check uniquness for zot hubs
-	$urls    = array(); // array of urls to check uniqueness of hubs from other networks
-
-
-	foreach($hubs as $hub) {
-		if(in_array($hub['hubloc_url'],$dead_hubs)) {
-			logger('skipping dead hub: ' . $hub['hubloc_url'], LOGGER_DEBUG, LOG_INFO);
-			continue;
-		}
-
-		if($hub['hubloc_network'] == 'zot') {
-			if(! in_array($hub['hubloc_sitekey'],$keys)) {
-				$hublist[] = $hub['hubloc_host'];
-				$dhubs[] = $hub;
-				$keys[] = $hub['hubloc_sitekey'];
-			}
-		}
-		else {
-			if(! in_array($hub['hubloc_url'],$urls)) {
-				$hublist[] = $hub['hubloc_host'];
-				$dhubs[] = $hub;
-				$urls[] = $hub['hubloc_url'];
-			}
-		}
-	}
-
-	logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG);
-
-
-	foreach($dhubs as $hub) {
-
-		if($hub['hubloc_network'] !== 'zot') {
-
-			$narr = array(
-				'channel' => $channel,
-				'env_recips' => $env_recips,
-				'packet_recips' => $packet_recips,
-				'recipients' => $recipients,
-				'item' => $item,
-				'target_item' => $target_item,
-				'hub' => $hub,
-				'top_level_post' => $top_level_post,
-				'private' => $private,
-				'relay_to_owner' => $relay_to_owner,
-				'uplink' => $uplink,
-				'cmd' => $cmd,
-				'mail' => $mail,
-				'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-				'location' => $location,
-				'request' => $request,
-				'normal_mode' => $normal_mode,
-				'packet_type' => $packet_type,
-				'walltowall' => $walltowall,
-				'queued' => array()
-			);
-
-
-			call_hooks('notifier_hub',$narr);
-			if($narr['queued']) {
-				foreach($narr['queued'] as $pq)
-					$deliveries[] = $pq;
-			}
-			continue;
-
-		}
-
-		// singleton deliveries by definition 'not got zot'.
-		// Single deliveries are other federated networks (plugins) and we're essentially 
-		// delivering only to those that have this site url in their abook_instance
-		// and only from within a sync operation. This means if you post from a clone,
-		// and a connection is connected to one of your other clones; assuming that hub
-		// is running it will receive a sync packet. On receipt of this sync packet it
-		// will invoke a delivery to those connections which are connected to just that
-		// hub instance. 
-
-		if($cmd === 'single_mail' || $cmd === 'single_activity') {
-			continue;
-		}
-
-		// default: zot protocol
-
-		$hash = random_string();
-		$packet = null;
-
-		if($packet_type === 'refresh' || $packet_type === 'purge') {
-			$packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
-		}
-		elseif($packet_type === 'request') {
-			$packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hash,
-				array('message_id' => $request_message_id)
-			);
-		}
-
-		if($packet) {
-			queue_insert(array(
-				'hash'       => $hash,
-				'account_id' => $channel['channel_account_id'],
-				'channel_id' => $channel['channel_id'],
-				'posturl'    => $hub['hubloc_callback'],
-				'notify'     => $packet
-			));
-		}
-		else {
-			$packet = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
-			queue_insert(array(
-				'hash'       => $hash,
-				'account_id' => $target_item['aid'],
-				'channel_id' => $target_item['uid'],
-				'posturl'    => $hub['hubloc_callback'],
-				'notify'     => $packet,
-				'msg'        => json_encode($encoded_item)
-			));
-
-			// only create delivery reports for normal undeleted items
-			if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
-				q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
-					dbesc($target_item['mid']),
-					dbesc($hub['hubloc_host']),
-					dbesc($hub['hubloc_host']),
-					dbesc('queued'),
-					dbesc(datetime_convert()),
-					dbesc($channel['channel_hash']),
-					dbesc($hash)
-				);
-			}
-		}
-
-		$deliveries[] = $hash;	
-	}
-	
-	if($normal_mode) {
-		$x = q("select * from hook where hook = 'notifier_normal'");
-		if($x)
-			proc_run('php','include/deliver_hooks.php', $target_item['id']);
-	}
-
-	if($deliveries)
-		do_delivery($deliveries);
-
-	logger('notifier: basic loop complete.', LOGGER_DEBUG);
-
-	call_hooks('notifier_end',$target_item);
-
-	logger('notifer: complete.');
-	return;
-
-}
-
-
-if (array_search(__file__,get_included_files())===0){
-  notifier_run($argc,$argv);
-  killme();
-}
diff --git a/include/onedirsync.php b/include/onedirsync.php
deleted file mode 100644
index d794fe35e..000000000
--- a/include/onedirsync.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/dir_fns.php');
-
-
-function onedirsync_run($argc,$argv){
-
-
-	cli_startup();
-	$a = get_app();
-
-	logger('onedirsync: start ' . intval($argv[1]));
-	
-	if(($argc > 1) && (intval($argv[1])))
-		$update_id = intval($argv[1]);
-
-	if(! $update_id) {
-		logger('onedirsync: no update');
-		return;
-	}
-	
-	$r = q("select * from updates where ud_id = %d limit 1",
-		intval($update_id)
-	);
-
-	if(! $r)
-		return;
-	if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr']))
-		return;
-
-	// Have we probed this channel more recently than the other directory server
-	// (where we received this update from) ?
-	// If we have, we don't need to do anything except mark any older entries updated
-
-	$x = q("select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d )>0 order by ud_date desc limit 1",
-		dbesc($r[0]['ud_addr']),
-		dbesc($r[0]['ud_date']),
-		intval(UPDATE_FLAGS_UPDATED)
-	);
-	if($x) {
-		$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'",
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc($r[0]['ud_addr']),
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc($x[0]['ud_date'])
-		);
-		return;
-	}
-
-	// ignore doing an update if this ud_addr refers to a known dead hubloc
-
-	$h = q("select * from hubloc where hubloc_addr = '%s' limit 1",
-		dbesc($r[0]['ud_addr'])
-	);
-	if(($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) {
-		$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc($r[0]['ud_addr']),
-			intval(UPDATE_FLAGS_UPDATED)
-		);
-
-		return;
-	}
-
-	// we might have to pull this out some day, but for now update_directory_entry() 
-	// runs zot_finger() and is kind of zot specific
-
-	if($h && $h[0]['hubloc_network'] !== 'zot')
-		return;
-
-	update_directory_entry($r[0]);		
-
-	return;
-}
-
-if (array_search(__file__,get_included_files())===0){
-  onedirsync_run($argc,$argv);
-  killme();
-}
diff --git a/include/onepoll.php b/include/onepoll.php
deleted file mode 100644
index bfd79feea..000000000
--- a/include/onepoll.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php /** @file */
-
-require_once('boot.php');
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/socgraph.php');
-require_once('include/Contact.php');
-
-
-function onepoll_run($argc,$argv){
-
-
-	cli_startup();
-	$a = get_app();
-
-	logger('onepoll: start');
-	
-	if(($argc > 1) && (intval($argv[1])))
-		$contact_id = intval($argv[1]);
-
-	if(! $contact_id) {
-		logger('onepoll: no contact');
-		return;
-	}
-
-	$d = datetime_convert();
-
-	$contacts = q("SELECT abook.*, xchan.*, account.*
-		FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan 
-		where abook_id = %d
-		and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0
-		AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1",
-		intval($contact_id),
-		intval(ACCOUNT_OK),
-		intval(ACCOUNT_UNVERIFIED)
-	);
-
-	if(! $contacts) {
-		logger('onepoll: abook_id not found: ' . $contact_id);
-		return;
-	}
-
-	$contact = $contacts[0];
-
-	$t = $contact['abook_updated'];
-
-	$importer_uid = $contact['abook_channel'];
-		
-	$r = q("SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
-		intval($importer_uid)
-	);
-
-	if(! $r)
-		return;
-
-	$importer = $r[0];
-
-	logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}");
-
-	$last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] === NULL_DATE))
-		? datetime_convert('UTC','UTC','now - 7 days')
-		: datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days')
-	);
-
-	if($contact['xchan_network'] === 'rss') {
-		logger('onepoll: processing feed ' . $contact['xchan_name'], LOGGER_DEBUG);
-		handle_feed($importer['channel_id'],$contact_id,$contact['xchan_hash']);
-		q("update abook set abook_connected = '%s' where abook_id = %d",
-			dbesc(datetime_convert()),
-			intval($contact['abook_id'])
-		);
-		return;
-	}
-	
-	if($contact['xchan_network'] !== 'zot')
-		return;
-
-	// update permissions
-
-	$x = zot_refresh($contact,$importer);
-
-	$responded = false;
-	$updated   = datetime_convert();
-	$connected = datetime_convert();
-	if(! $x) {
-		// mark for death by not updating abook_connected, this is caught in include/poller.php
-		q("update abook set abook_updated = '%s' where abook_id = %d",
-			dbesc($updated),
-			intval($contact['abook_id'])
-		);
-	}
-	else {
-		q("update abook set abook_updated = '%s', abook_connected = '%s' where abook_id = %d",
-			dbesc($updated),
-			dbesc($connected),
-			intval($contact['abook_id'])
-		);
-		$responded = true;
-	}
-
-	if(! $responded)
-		return;
-
-	if($contact['xchan_connurl']) {
-		$fetch_feed = true;
-		$x = null;
-
-		if(! ($contact['abook_their_perms'] & PERMS_R_STREAM ))
-			$fetch_feed = false;
-
-		if($fetch_feed) {
-
-			$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
-			$feedurl .= '?f=&mindate=' . urlencode($last_update);
-
-			$x = z_fetch_url($feedurl);
-
-			logger('feed_update: ' . print_r($x,true), LOGGER_DATA);
-
-		}
-
-		if(($x) && ($x['success'])) {
-			$total = 0;
-			logger('onepoll: feed update ' . $contact['xchan_name'] . ' ' . $feedurl);
-
-			$j = json_decode($x['body'],true);
-			if($j['success'] && $j['messages']) {
-				foreach($j['messages'] as $message) {
-					$results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message),
-						array(array('hash' => $importer['xchan_hash'])), false);
-					logger('onepoll: feed_update: process_delivery: ' . print_r($results,true), LOGGER_DATA);
-					$total ++;
-				}
-				logger("onepoll: $total messages processed");
-			}
-		}
-	}
-			
-
-	// update the poco details for this connection
-
-	if($contact['xchan_connurl']) {	
-		$r = q("SELECT xlink_id from xlink 
-			where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
-			intval($contact['xchan_hash']),
-			db_utcnow(), db_quoteinterval('1 DAY')
-		);
-		if(! $r) {
-			poco_load($contact['xchan_hash'],$contact['xchan_connurl']);
-		}
-	}
-
-	return;
-}
-
-if (array_search(__file__,get_included_files())===0){
-  onepoll_run($argc,$argv);
-  killme();
-}
diff --git a/include/photos.php b/include/photos.php
index 73a29d8eb..d8d3d102c 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -420,7 +420,7 @@ function photo_upload($channel, $observer, $args) {
 		$item_id = $result['item_id'];
 
 		if($visible) 
-			proc_run('php', "include/notifier.php", 'wall-new', $item_id);
+			Zotlabs\Daemon\Master::Summon(array('Notifier', 'wall-new', $item_id));
 	}
 
 	$ret['success'] = true;
diff --git a/include/poller.php b/include/poller.php
index 67a67de12..e72121a8a 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -5,7 +5,7 @@ require_once('include/cli_startup.php');
 function poller_run($argc,$argv){
 
 	cli_startup();
-	\Zotlabs\Daemon\Master::Summon('Cron');
+	\Zotlabs\Daemon\Master::Summon(array('Cron'));
 
 }
 
diff --git a/include/queue.php b/include/queue.php
deleted file mode 100644
index 1159e01a0..000000000
--- a/include/queue.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php /** @file */
-require_once("boot.php");
-require_once('include/cli_startup.php');
-require_once('include/queue_fn.php');
-require_once('include/zot.php');
-
-function queue_run($argc,$argv){
-
-	cli_startup();
-
-	global $a;
-
-	require_once('include/items.php');
-	require_once('include/bbcode.php');
-
-	if(argc() > 1)
-		$queue_id = argv(1);
-	else
-		$queue_id = 0;
-
-	logger('queue: start');
-
-	// delete all queue items more than 3 days old
-	// but first mark these sites dead if we haven't heard from them in a month
-
-	$r = q("select outq_posturl from outq where outq_created < %s - INTERVAL %s",
-		db_utcnow(), db_quoteinterval('3 DAY')
-	);
-	if($r) {
-		foreach($r as $rr) {
-			$site_url = '';
-			$h = parse_url($rr['outq_posturl']);
-			$desturl = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
-			q("update site set site_dead = 1 where site_dead = 0 and site_url = '%s' and site_update < %s - INTERVAL %s",
-				dbesc($desturl),
-				db_utcnow(), db_quoteinterval('1 MONTH')
-			);
-		}
-	}
-
-	$r = q("DELETE FROM outq WHERE outq_created < %s - INTERVAL %s",
-		db_utcnow(), db_quoteinterval('3 DAY')
-	);
-
-	if($queue_id) {
-		$r = q("SELECT * FROM outq WHERE outq_hash = '%s' LIMIT 1",
-			dbesc($queue_id)
-		);
-	}
-	else {
-
-		// For the first 12 hours we'll try to deliver every 15 minutes
-		// After that, we'll only attempt delivery once per hour. 
-		// This currently only handles the default queue drivers ('zot' or '') which we will group by posturl 
-		// so that we don't start off a thousand deliveries for a couple of dead hubs.
-		// The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made).
-		// Other drivers will have to do something different here and may need their own query.
-
-		// Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the 
-		// "every 15 minutes" category. We probably need to prioritise them when inserted into the queue
-		// or just prior to this query based on recent and long-term delivery history. If we have good reason to believe
-		// the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once 
-		// or twice a day. 
-
-		// FIXME: can we sort postgres on outq_priority and maintain the 'distinct' ?
-		// The order by max(outq_priority) might be a dodgy query because of the group by.
-		// The desired result is to return a sequence in the order most likely to be delivered in this run.
-		// If a hub has already been sitting in the queue for a few days, they should be delivered last;
-		// hence every failure should drop them further down the priority list.
- 
-		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
-			$prefix = 'DISTINCT ON (outq_posturl)';
-			$suffix = 'ORDER BY outq_posturl';
-		} else {
-			$prefix = '';
-			$suffix = 'GROUP BY outq_posturl ORDER BY max(outq_priority)';
-		}
-		$r = q("SELECT $prefix * FROM outq WHERE outq_delivered = 0 and (( outq_created > %s - INTERVAL %s and outq_updated < %s - INTERVAL %s ) OR ( outq_updated < %s - INTERVAL %s )) $suffix",
-			db_utcnow(), db_quoteinterval('12 HOUR'),
-			db_utcnow(), db_quoteinterval('15 MINUTE'),
-			db_utcnow(), db_quoteinterval('1 HOUR')
-		);
-	}
-	if(! $r)
-		return;
-
-	foreach($r as $rr) {
-		queue_deliver($rr);
-	}
-}
-
-if (array_search(__file__,get_included_files())===0){
-  queue_run($argc,$argv);
-  killme();
-}
diff --git a/include/ratenotif.php b/include/ratenotif.php
deleted file mode 100644
index 3a5e515ae..000000000
--- a/include/ratenotif.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/queue_fn.php');
-
-
-function ratenotif_run($argc,$argv){
-
-	cli_startup();
-
-	$a = get_app();
-
-	require_once("datetime.php");
-	require_once('include/items.php');
-	require_once('include/Contact.php');
-
-	if($argc < 3)
-		return;
-
-
-	logger('ratenotif: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
-
-	$cmd = $argv[1];
-
-	$item_id = $argv[2];
-
-
-	if($cmd === 'rating') {
-		$r = q("select * from xlink where xlink_id = %d and xlink_static = 1 limit 1",
-			intval($item_id)
-		);
-		if(! $r) {
-			logger('rating not found');
-			return;
-		}
-
-		$encoded_item = array(
-			'type' => 'rating', 
-			'encoding' => 'zot',
-			'target' => $r[0]['xlink_link'],
-			'rating' => intval($r[0]['xlink_rating']),
-			'rating_text' => $r[0]['xlink_rating_text'],
-			'signature' => $r[0]['xlink_sig'],
-			'edited' => $r[0]['xlink_updated']
-		);
-	}
-
-	$channel = channelx_by_hash($r[0]['xlink_xchan']);
-	if(! $channel) {
-		logger('no channel');
-		return;
-	}
-
-
-	$primary = get_directory_primary();
-
-	if(! $primary)
-		return;
-
-
-	$interval = ((get_config('system','delivery_interval') !== false) 
-		? intval(get_config('system','delivery_interval')) : 2 );
-
-	$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
-
-	if($deliveries_per_process <= 0)
-		$deliveries_per_process = 1;
-
-	$deliver = array();
-
-	$x = z_fetch_url($primary . '/regdir');
-	if($x['success']) {
-		$j = json_decode($x['body'],true);
-		if($j && $j['success'] && is_array($j['directories'])) {
-
-			foreach($j['directories'] as $h) {
-				if($h == z_root())
-					continue;
-
-				$hash = random_string();
-				$n = zot_build_packet($channel,'notify',null,null,$hash);
-
-				queue_insert(array(
-					'hash'       => $hash,
-					'account_id' => $channel['channel_account_id'],
-					'channel_id' => $channel['channel_id'],
-					'posturl'    => $h . '/post',
-					'notify'     => $n,
-					'msg'        => json_encode($encoded_item)
-				));
-
-				$deliver[] = $hash;
-
-				if(count($deliver) >= $deliveries_per_process) {
-					proc_run('php','include/deliver.php',$deliver);
-					$deliver = array();
-					if($interval)
-						@time_sleep_until(microtime(true) + (float) $interval);
-				}
-			}
-
-			// catch any stragglers
-
-			if(count($deliver)) {
-				proc_run('php','include/deliver.php',$deliver);
-			}
-		}
-	}
-		
-	logger('ratenotif: complete.');
-	return;
-
-}
-
-if (array_search(__file__,get_included_files())===0){
-  ratenotif_run($argc,$argv);
-  killme();
-}
diff --git a/include/zot.php b/include/zot.php
index 5400bd96e..5884245e9 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -453,7 +453,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 				else {
 					// if we were just granted read stream permission and didn't have it before, try to pull in some posts
 					if((! ($r[0]['abook_their_perms'] & PERMS_R_STREAM)) && ($their_perms & PERMS_R_STREAM))
-						proc_run('php','include/onepoll.php',$r[0]['abook_id']);
+						Zotlabs\Daemon\Master::Summon(array('Onepoll',$r[0]['abook_id']));
 				}
 			}
 			else {
@@ -504,7 +504,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 					if($new_connection) {
 						if($new_perms != $previous_perms)
-							proc_run('php','include/notifier.php','permission_create',$new_connection[0]['abook_id']);
+							Zotlabs\Daemon\Master::Summon(array('Notifier','permission_create',$new_connection[0]['abook_id']));
 						require_once('include/enotify.php');
 						notification(array(
 							'type'       => NOTIFY_INTRO,
@@ -516,7 +516,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 						if($their_perms & PERMS_R_STREAM) {
 							if(($channel['channel_w_stream'] & PERMS_PENDING)
 								|| (! intval($new_connection[0]['abook_pending'])) )
-								proc_run('php','include/onepoll.php',$new_connection[0]['abook_id']);
+								Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
 						}
 
 						unset($new_connection[0]['abook_id']);
@@ -1703,7 +1703,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 				if((! $relay) && (! $request) && (! $local_public)
 					&& perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
-					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
+					Zotlabs\Daemon\Master::Summon(array('Notifier', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']));
 				}
 				continue;
 			}
@@ -1775,7 +1775,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 			if($relay && $item_id) {
 				logger('process_delivery: invoking relay');
-				proc_run('php','include/notifier.php','relay',intval($item_id));
+				Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
 				$DR->update('relayed');
 				$result[] = $DR->get();
 			}
@@ -1858,7 +1858,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 
 		if($relay && $item_id) {
 			logger('process_delivery: invoking relay');
-			proc_run('php','include/notifier.php','relay',intval($item_id));
+			Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
 			$DR->addto_update('relayed');
 			$result[] = $DR->get();
 		}
@@ -3060,7 +3060,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 			'msg'        => json_encode($info)
 		));
 
-		proc_run('php', 'include/deliver.php', $hash);
+		Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
 		$total = $total - 1;
 
 		if($interval && $total)
@@ -3652,7 +3652,7 @@ function zot_reply_message_request($data) {
 			 * invoke delivery to send out the notify packet
 			 */
 
-			proc_run('php', 'include/deliver.php', $hash);
+			Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
 		}
 	}
 	$ret['success'] = true;