Merge remote-tracking branch 'upstream/dev' into dev

Zotlabs/Daemon/Checksites.php

@@ -0,0 +1,55 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/hubloc.php');
+
+
+class Checksites {
+
+	static public function run($argc,$argv) {
+
+		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;
+	}
+}

Zotlabs/Daemon/Cli_suggest.php

@@ -0,0 +1,14 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/socgraph.php');
+
+class Cli_suggest {
+
+	static public function run($argc,$argv) {
+
+		update_suggestions();
+
+	}
+}

Zotlabs/Daemon/Cron.php

@@ -0,0 +1,181 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+class Cron {
+
+	static public function run($argc,$argv) {
+
+		$maxsysload = intval(get_config('system','maxloadavg'));
+		if($maxsysload < 1)
+			$maxsysload = 50;
+		if(function_exists('sys_getloadavg')) {
+			$load = sys_getloadavg();
+			if(intval($load[0]) > $maxsysload) {
+				logger('system: load ' . $load . ' too high. Cron deferred to next scheduled run.');
+				return;
+			}
+		}
+
+		// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
+		$lockfile = 'store/[data]/cron';
+		if((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) 
+			&& (! get_config('system','override_cron_lockfile'))) {
+			logger("cron: Already running");
+			return;
+		}
+	
+		// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
+		file_put_contents($lockfile, $x);
+
+		logger('cron: start');
+	
+		// run queue delivery process in the background
+
+		Master::Summon(array('Queue'));
+
+		Master::Summon(array('Poller'));
+
+		// maintenance for mod sharedwithme - check for updated items and remove them
+
+		require_once('include/sharedwithme.php');
+		apply_updates();
+	
+
+		// expire any expired mail
+
+		q("delete from mail where expires != '%s' and expires < %s ",
+			dbesc(NULL_DATE),
+			db_utcnow()
+		);
+
+		// expire any expired items
+
+		$r = q("select id from item where expires != '%s' and expires < %s 
+			and item_deleted = 0 ",
+			dbesc(NULL_DATE),
+			db_utcnow()
+		);
+		if($r) {
+			require_once('include/items.php');
+			foreach($r as $rr)
+				drop_item($rr['id'],false);
+		}
+
+
+		// Ensure that every channel pings a directory server once a month. This way we can discover
+		// channels and sites that quietly vanished and prevent the directory from accumulating stale
+		// or dead entries.
+
+		$r = q("select channel_id from channel where channel_dirdate < %s - INTERVAL %s",
+			db_utcnow(), 
+			db_quoteinterval('30 DAY')
+		);
+		if($r) {
+			foreach($r as $rr) {
+				Master::Summon(array('Directory',$rr['channel_id'],'force'));
+				if($interval)
+					@time_sleep_until(microtime(true) + (float) $interval);
+			}
+		}
+
+		// publish any applicable items that were set to be published in the future
+		// (time travel posts). Restrict to items that have come of age in the last
+		// couple of days to limit the query to something reasonable. 
+
+		$r = q("select id from item where item_delayed = 1 and created <= %s  and created > '%s' ",
+			db_utcnow(),
+			dbesc(datetime_convert('UTC','UTC','now - 2 days'))
+		);
+		if($r) {
+			foreach($r as $rr) {
+				$x = q("update item set item_delayed = 0 where id = %d",
+					intval($rr['id'])
+				);
+				if($x) {
+					Master::Summon(array('Notifier','wall-new',$rr['id']));
+				}
+			}
+		}
+
+		$abandon_days = intval(get_config('system','account_abandon_days'));
+		if($abandon_days < 1)
+			$abandon_days = 0;
+
+	
+		// once daily run birthday_updates and then expire in background
+
+		// FIXME: add birthday updates, both locally and for xprof for use
+		// by directory servers
+
+		$d1 = intval(get_config('system','last_expire_day'));
+		$d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+		// Allow somebody to staggger daily activities if they have more than one site on their server,
+		// or if it happens at an inconvenient (busy) hour.
+
+		$h1 = intval(get_config('system','cron_hour'));
+		$h2 = intval(datetime_convert('UTC','UTC','now','G'));
+
+
+		if(($d2 != $d1) && ($h1 == $h2)) {
+			Master::Summon(array('Cron_daily'));
+		}
+
+		// update any photos which didn't get imported properly
+		// This should be rare
+
+		$r = q("select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = '' 
+			and xchan_photo_date < %s - INTERVAL %s",
+			db_utcnow(), 
+			db_quoteinterval('1 DAY')
+		);
+		if($r) {
+			require_once('include/photo/photo_driver.php');
+			foreach($r as $rr) {
+				$photos = import_xchan_photo($rr['xchan_photo_l'],$rr['xchan_hash']);
+				$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]),
+					dbesc($photos[1]),
+					dbesc($photos[2]),
+					dbesc($photos[3]),
+					dbesc($rr['xchan_hash'])
+				);
+			}
+		}
+
+
+		// pull in some public posts
+
+		if(! get_config('system','disable_discover_tab'))
+			Master::Summon(array('Externals'));
+
+		$generation = 0;
+
+		$restart    = false;
+
+		if(($argc > 1) && ($argv[1] == 'restart')) {
+			$restart = true;
+			$generation = intval($argv[2]);
+			if(! $generation)
+				killme();		
+		}
+
+		reload_plugins();
+
+		$d = datetime_convert();
+
+		// TODO check to see if there are any cronhooks before wasting a process
+
+		if(! $restart)
+			Master::Summon(array('Cronhooks'));
+
+		set_config('system','lastcron',datetime_convert());
+
+		//All done - clear the lockfile	
+		@unlink($lockfile);
+
+		return;
+	}
+}

Zotlabs/Daemon/Cron_daily.php

@@ -0,0 +1,90 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+class Cron_daily {
+
+	static public function run($argc,$argv) {
+
+		logger('cron_daily: start');
+
+		/**
+		 * Cron Daily
+		 *
+		 */
+
+
+		require_once('include/dir_fns.php');
+		check_upstream_directory();
+
+
+		// Fire off the Cron_weekly process if it's the correct day.
+ 
+		$d3 = intval(datetime_convert('UTC','UTC','now','N'));
+		if($d3 == 7) {
+			Master::Summon(array('Cron_weekly'));
+		}
+
+		// once daily run birthday_updates and then expire in background
+
+		// FIXME: add birthday updates, both locally and for xprof for use
+		// by directory servers
+
+		update_birthdays();
+
+		// expire any read notifications over a month old
+
+		q("delete from notify where seen = 1 and date < %s - INTERVAL %s",
+			db_utcnow(), db_quoteinterval('30 DAY')
+		);
+
+		//update statistics in config
+		require_once('include/statistics_fns.php');
+		update_channels_total_stat();
+		update_channels_active_halfyear_stat();
+		update_channels_active_monthly_stat();
+		update_local_posts_stat();
+
+
+		// expire old delivery reports
+
+		$keep_reports = intval(get_config('system','expire_delivery_reports'));
+		if($keep_reports === 0)
+			$keep_reports = 10;
+
+		q("delete from dreport where dreport_time < %s - INTERVAL %s",
+			db_utcnow(),
+			db_quoteinterval($keep_reports . ' DAY')
+		);
+
+		// expire any expired accounts
+		downgrade_accounts();
+
+		// If this is a directory server, request a sync with an upstream
+		// directory at least once a day, up to once every poll interval. 
+		// Pull remote changes and push local changes.
+		// potential issue: how do we keep from creating an endless update loop? 
+
+		$dirmode = get_config('system','directory_mode');
+
+		if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
+			require_once('include/dir_fns.php');
+			sync_directories($dirmode);
+		}
+
+
+		Master::Summon(array('Expire'));
+		Master::Summon(array('Cli_suggest'));
+
+		require_once('include/hubloc.php');
+		remove_obsolete_hublocs();
+
+		call_hooks('cron_daily',datetime_convert());
+
+		set_config('system','last_expire_day',$d2);
+
+		/**
+		 * End Cron Daily
+		 */
+	}
+}

Zotlabs/Daemon/Cron_weekly.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+class Cron_weekly {
+
+	static public function run($argc,$argv) {		
+
+		/**
+		 * Cron Weekly
+		 * 
+		 * Actions in the following block are executed once per day only on Sunday (once per week).
+		 *
+		 */
+
+		call_hooks('cron_weekly',datetime_convert());
+
+
+		z_check_cert();
+
+		require_once('include/hubloc.php');
+		prune_hub_reinstalls();
+	
+		mark_orphan_hubsxchans();
+
+
+		// get rid of really old poco records
+
+		q("delete from xlink where xlink_updated < %s - INTERVAL %s and xlink_static = 0 ",
+			db_utcnow(), db_quoteinterval('14 DAY')
+		);
+
+		$dirmode = intval(get_config('system','directory_mode'));
+		if($dirmode === DIRECTORY_MODE_SECONDARY || $dirmode === DIRECTORY_MODE_PRIMARY) {
+			logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . urlencode(z_root()) . '&realm=' . urlencode(get_directory_realm())),true));
+		}
+
+		// Check for dead sites
+		Master::Summon(array('Checksites'));
+			
+		// update searchable doc indexes
+		Master::Summon(array('Importdoc'));
+
+		/**
+		 * End Cron Weekly
+		 */
+
+	}
+}

Zotlabs/Daemon/Cronhooks.php

@@ -0,0 +1,17 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+class Cronhooks {
+
+	static public function run($argc,$argv){
+
+		logger('cronhooks: start');
+	
+		$d = datetime_convert();
+
+		call_hooks('cron', $d);
+
+		return;
+	}
+}

Zotlabs/Daemon/Deliver.php

@@ -0,0 +1,85 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/queue_fn.php');
+
+
+class Deliver {
+	
+	static public function run($argc,$argv) {
+
+		if($argc < 2)
+			return;
+
+		logger('deliver: invoked: ' . print_r($argv,true), LOGGER_DATA);
+
+		for($x = 1; $x < $argc; $x ++) {
+
+			if(! $argv[$x])
+				continue;
+
+			$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);
+
+			}
+		}
+	}
+}

Zotlabs/Daemon/Deliver_hooks.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+
+class Deliver_hooks {
+
+	static public function run($argc,$argv) {
+
+		if($argc < 2)
+			return;
+
+
+		$r = q("select * from item where id = '%d'",
+			intval($argv[1])
+		);
+		if($r)
+			call_hooks('notifier_normal',$r[0]);
+
+	}
+}
+
+

Zotlabs/Daemon/Directory.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/dir_fns.php');
+require_once('include/queue_fn.php');
+
+
+class Directory {
+
+	static public function run($argc,$argv){
+
+		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) 
+				Master::Summon(array('Notifier','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)
+			Master::Summon(array('Notifier','refresh_all',$channel['channel_id']));
+
+	}
+}

Zotlabs/Daemon/Expire.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+
+class Expire {
+
+	static public function 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);
+		}
+	}
+}

Zotlabs/Daemon/Externals.php

@@ -0,0 +1,98 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/channel.php');
+
+
+class Externals {
+
+	static public function run($argc,$argv){
+
+		$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);
+					}
+				}
+			}
+		}
+	}
+}

Zotlabs/Daemon/Gprobe.php

@@ -0,0 +1,33 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+
+// performs zot_finger on $argv[1], which is a hex_encoded webbie/reddress
+
+class Gprobe {
+	static public function run($argc,$argv) {
+
+		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) {
+			$j = \Zotlabs\Zot\Finger::run($url,null);
+			if($j['success']) {
+				$y = import_xchan($j);
+			}
+		}
+
+		return;
+	}
+}

Zotlabs/Daemon/Importdoc.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+
+class Importdoc {
+
+	static public function run($argc,$argv) {
+
+		require_once('include/help.php');
+
+		self::update_docs_dir('doc/*');
+
+	}
+
+	static public 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))
+					self::update_docs_dir("$fi/*");
+				else
+					store_doc_file($fi);
+			}
+		}
+	}
+}
+
+

Zotlabs/Daemon/Master.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+if(array_search( __file__ , get_included_files()) === 0) {
+
+	require_once('include/cli_startup.php');
+	array_shift($argv);
+	$argc = count($argv);
+
+	if($argc)
+		Master::Release($argc,$argv);
+	killme();
+}
+
+
+
+class Master {
+
+	static public function Summon($arr) {
+		proc_run('php','Zotlabs/Daemon/Master.php',$arr);
+	}
+
+	static public function Release($argc,$argv) {
+		cli_startup();
+		logger('Master: release: ' . print_r($argv,true), LOGGER_ALL,LOG_DEBUG);
+		require_once('Zotlabs/Daemon/' . $argv[0] . '.php');
+		$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
+		$cls::run($argc,$argv);
+	}	
+}

Zotlabs/Daemon/Notifier.php

@@ -0,0 +1,659 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+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:
+ *
+ *		Zotlabs\Daemon\Master::Summon(array('Notifier', 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/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/channel.php');
+
+
+class Notifier {
+
+	static public function run($argc,$argv){
+
+		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');
+						Master::Summon(array('Notifier','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)
+				Master::Summon(array('Deliver_hooks',$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;
+
+	}
+}
+

Zotlabs/Daemon/Onedirsync.php

@@ -0,0 +1,76 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/dir_fns.php');
+
+
+class Onedirsync {
+
+	static public function run($argc,$argv) {
+
+		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;
+	}
+}

Zotlabs/Daemon/Onepoll.php

@@ -0,0 +1,152 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/socgraph.php');
+
+
+class Onepoll {
+
+	static public function run($argc,$argv) {
+
+		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;
+	}
+}

Zotlabs/Daemon/Poller.php

@@ -0,0 +1,207 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+class Poller {
+
+	static public function run($argc,$argv) {
+
+		$maxsysload = intval(get_config('system','maxloadavg'));
+		if($maxsysload < 1)
+			$maxsysload = 50;
+		if(function_exists('sys_getloadavg')) {
+			$load = sys_getloadavg();
+			if(intval($load[0]) > $maxsysload) {
+				logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
+				return;
+			}
+		}
+
+		$interval = intval(get_config('system','poll_interval'));
+		if(! $interval) 
+			$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+
+		// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
+		$lockfile = 'store/[data]/poller';
+		if((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600)) 
+			&& (! get_config('system','override_poll_lockfile'))) {
+			logger("poller: Already running");
+			return;
+		}
+	
+		// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
+		file_put_contents($lockfile, $x);
+
+		logger('poller: start');
+	
+		$manual_id  = 0;
+		$generation = 0;
+
+		$force      = false;
+		$restart    = false;
+
+		if(($argc > 1) && ($argv[1] == 'force'))
+			$force = true;
+
+		if(($argc > 1) && ($argv[1] == 'restart')) {
+			$restart = true;
+			$generation = intval($argv[2]);
+			if(! $generation)
+				killme();		
+		}
+
+		if(($argc > 1) && intval($argv[1])) {
+			$manual_id = intval($argv[1]);
+			$force     = true;
+		}
+
+
+		$sql_extra = (($manual_id) ? " AND abook_id = " . intval($manual_id) . " " : "");
+
+		reload_plugins();
+
+		$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) 
+			? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days).' DAY')) 
+			: '' 
+		);
+
+		$randfunc = db_getfunc('RAND');
+	
+		$contacts = q("SELECT * FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash 
+			LEFT JOIN account on abook_account = account_id
+			where abook_self = 0
+			$sql_extra 
+			AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc",
+			intval(ACCOUNT_OK),
+			intval(ACCOUNT_UNVERIFIED)     // FIXME
+
+		);
+
+		if($contacts) {
+
+			foreach($contacts as $contact) {
+
+				$update  = false;
+
+				$t = $contact['abook_updated'];
+				$c = $contact['abook_connected'];
+
+				if(intval($contact['abook_feed'])) {
+					$min = service_class_fetch($contact['abook_channel'],'minimum_feedcheck_minutes');
+					if(! $min)
+						$min = intval(get_config('system','minimum_feedcheck_minutes'));
+					if(! $min)
+						$min = 60;
+					$x = datetime_convert('UTC','UTC',"now - $min minutes");
+					if($c < $x) {
+						Master::Summon(array('Onepoll',$contact['abook_id']));
+						if($interval)
+							@time_sleep_until(microtime(true) + (float) $interval);
+					}
+					continue;
+				}
+
+
+				if($contact['xchan_network'] !== 'zot')
+					continue;
+
+				if($c == $t) {
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+						$update = true;
+				}
+				else {
+	
+					// if we've never connected with them, start the mark for death countdown from now
+	
+					if($c == NULL_DATE) {
+						$r = q("update abook set abook_connected = '%s'  where abook_id = %d",
+							dbesc(datetime_convert()),
+							intval($contact['abook_id'])
+						);
+						$c = datetime_convert();
+						$update = true;
+					}
+
+					// He's dead, Jim
+
+					if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {	
+						$r = q("update abook set abook_archived = 1 where abook_id = %d",
+							intval($contact['abook_id'])
+						);
+						$update = false;
+						continue;
+					}
+
+					if(intval($contact['abook_archived'])) {
+						$update = false;
+						continue;
+					}
+
+					// might be dead, so maybe don't poll quite so often
+	
+					// recently deceased, so keep up the regular schedule for 3 days
+ 
+					if((strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 3 day")) > 0)
+					 && (strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 1 day")) > 0))
+						$update = true;
+
+					// After that back off and put them on a morphine drip
+
+					if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 2 day")) > 0) {	
+						$update = true;
+					}
+
+				}
+
+				if(intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked']))
+					continue;
+
+				if((! $update) && (! $force))
+						continue;
+
+				Master::Summon(array('Onepoll',$contact['abook_id']));
+				if($interval)
+					@time_sleep_until(microtime(true) + (float) $interval);
+
+			}
+		}
+
+		if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
+			$r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ",
+				intval(UPDATE_FLAGS_UPDATED),
+				dbesc(NULL_DATE),
+				db_utcnow(), db_quoteinterval('7 DAY')
+			);
+			if($r) {
+				foreach($r as $rr) {
+
+					// If they didn't respond when we attempted before, back off to once a day
+					// After 7 days we won't bother anymore
+
+					if($rr['ud_last'] != NULL_DATE)
+						if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day'))
+							continue;
+					Master::Summon(array('Onedirsync',$rr['ud_id']));
+					if($interval)
+						@time_sleep_until(microtime(true) + (float) $interval);
+				}
+			}
+		}	
+
+		set_config('system','lastpoll',datetime_convert());
+
+		//All done - clear the lockfile	
+		@unlink($lockfile);
+
+		return;
+	}
+}

Zotlabs/Daemon/Queue.php

@@ -0,0 +1,89 @@
+<?php /** @file */
+
+namespace Zotlabs\Daemon;
+
+require_once('include/queue_fn.php');
+require_once('include/zot.php');
+
+class Queue {
+	static public function run($argc,$argv) {
+
+		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);
+		}
+	}
+}

Zotlabs/Daemon/Ratenotif.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+require_once('include/zot.php');
+require_once('include/queue_fn.php');
+
+
+class Ratenotif {
+
+	static public function run($argc,$argv) {
+
+		require_once("datetime.php");
+		require_once('include/items.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) {
+						Master::Summon(array('Deliver',$deliver));
+						$deliver = array();
+						if($interval)
+							@time_sleep_until(microtime(true) + (float) $interval);
+					}
+				}
+	
+				// catch any stragglers
+	
+				if(count($deliver)) {
+					Master::Summon(array('Deliver',$deliver));
+				}
+			}
+		}
+		
+		logger('ratenotif: complete.');
+		return;
+
+	}
+}

Zotlabs/Lib/Apps.php

@@ -0,0 +1,659 @@
+<?php /** @file */
+
+namespace Zotlabs\Lib;
+
+/**
+ * Apps
+ *
+ */
+
+require_once('include/plugin.php');
+require_once('include/channel.php');
+
+
+class Apps {
+
+	static public function get_system_apps($translate = true) {
+
+		$ret = array();
+		if(is_dir('apps'))
+			$files = glob('apps/*.apd');
+		else
+			$files = glob('app/*.apd');
+		if($files) {
+			foreach($files as $f) {
+				$x = self::parse_app_description($f,$translate);
+				if($x) {
+					$ret[] = $x;
+				}
+			}
+		}
+		$files = glob('addon/*/*.apd');
+		if($files) {
+			foreach($files as $f) {
+				$n = basename($f,'.apd');
+				if(plugin_is_installed($n)) {
+					$x = self::parse_app_description($f,$translate);
+					if($x) {
+						$ret[] = $x;
+					}
+				}
+			}
+		}
+
+		return $ret;
+
+	}
+
+
+	static public function import_system_apps() {
+		if(! local_channel())
+			return;
+
+		// Eventually we want to look at modification dates and update system apps.
+
+		$installed = get_pconfig(local_channel(),'system','apps_installed');
+		if($installed)
+			return;
+		$apps = self::get_system_apps(false);
+		if($apps) {
+			foreach($apps as $app) {
+				$app['uid'] = local_channel();
+				$app['guid'] = hash('whirlpool',$app['name']);
+				$app['system'] = 1;
+				self::app_install(local_channel(),$app);			
+			}
+		}					
+		set_pconfig(local_channel(),'system','apps_installed',1);
+	}
+
+
+	static public function app_name_compare($a,$b) {
+		return strcmp($a['name'],$b['name']);
+	}
+
+
+	static public function parse_app_description($f,$translate = true) {
+		$ret = array();
+
+		$baseurl = z_root();
+		$channel = \App::get_channel();
+		$address = (($channel) ? $channel['channel_address'] : '');
+		
+		//future expansion
+
+		$observer = \App::get_observer();
+	
+
+		$lines = @file($f);
+		if($lines) {
+			foreach($lines as $x) {
+				if(preg_match('/^([a-zA-Z].*?):(.*?)$/ism',$x,$matches)) {
+					$ret[$matches[1]] = trim(str_replace(array('$baseurl','$nick'),array($baseurl,$address),$matches[2]));
+				}
+			}
+		}	
+
+
+		if(! $ret['photo'])
+			$ret['photo'] = $baseurl . '/' . get_default_profile_photo(80);
+
+		$ret['type'] = 'system';
+
+		foreach($ret as $k => $v) {
+			if(strpos($v,'http') === 0)
+				$ret[$k] = zid($v);
+		}
+
+		if(array_key_exists('desc',$ret))
+			$ret['desc'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$ret['desc']);
+
+		if(array_key_exists('target',$ret))
+			$ret['target'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$ret['target']);
+
+		if(array_key_exists('requires',$ret)) {
+			$requires = explode(',',$ret['requires']);
+			foreach($requires as $require) {
+				$require = trim(strtolower($require));
+				switch($require) {
+					case 'nologin':
+						if(local_channel())
+							unset($ret);
+						break;
+					case 'admin':
+						if(! is_site_admin())
+							unset($ret);
+						break;
+					case 'local_channel':
+						if(! local_channel())
+							unset($ret);
+						break;
+					case 'public_profile':
+						if(! is_public_profile())
+							unset($ret);
+						break;
+					case 'observer':
+						if(! $observer)
+							unset($ret);
+						break;
+					default:
+						if(! (local_channel() && feature_enabled(local_channel(),$require)))
+							unset($ret);
+						break;
+
+				}
+			}
+		}
+		if($ret) {
+			if($translate)
+				self::translate_system_apps($ret);
+			return $ret;
+		}
+		return false;
+	}	
+
+
+	static public function translate_system_apps(&$arr) {
+		$apps = array(
+			'Site Admin' => t('Site Admin'),
+			'Bug Report' => t('Bug Report'),
+			'View Bookmarks' => t('View Bookmarks'),
+			'My Chatrooms' => t('My Chatrooms'),
+			'Connections' => t('Connections'),
+			'Firefox Share' => t('Firefox Share'),
+			'Remote Diagnostics' => t('Remote Diagnostics'),
+			'Suggest Channels' => t('Suggest Channels'),
+			'Login' => t('Login'),
+			'Channel Manager' => t('Channel Manager'), 
+			'Grid' => t('Grid'), 
+			'Settings' => t('Settings'),
+			'Files' => t('Files'),
+			'Webpages' => t('Webpages'),
+			'Channel Home' => t('Channel Home'), 
+			'View Profile' => t('View Profile'),
+			'Photos' => t('Photos'), 
+			'Events' => t('Events'), 
+			'Directory' => t('Directory'), 
+			'Help' => t('Help'),
+			'Mail' => t('Mail'),
+			'Mood' => t('Mood'),
+			'Poke' => t('Poke'),
+			'Chat' => t('Chat'),
+			'Search' => t('Search'),
+			'Probe' => t('Probe'),
+			'Suggest' => t('Suggest'),
+			'Random Channel' => t('Random Channel'),
+			'Invite' => t('Invite'),
+			'Features' => t('Features'),
+			'Language' => t('Language'),
+			'Post' => t('Post'),
+			'Profile Photo' => t('Profile Photo')
+		);
+
+		if(array_key_exists($arr['name'],$apps))
+			$arr['name'] = $apps[$arr['name']];
+
+	}
+
+
+	// papp is a portable app
+
+	static public function app_render($papp,$mode = 'view') {
+
+		/**
+		 * modes:
+		 *    view: normal mode for viewing an app via bbcode from a conversation or page
+		 *       provides install/update button if you're logged in locally
+		 *    list: normal mode for viewing an app on the app page
+		 *       no buttons are shown
+		 *    edit: viewing the app page in editing mode provides a delete button
+		 */
+
+		$installed = false;
+
+		if(! $papp)
+			return;
+
+		if(! $papp['photo'])
+			$papp['photo'] = z_root() . '/' . get_default_profile_photo(80);
+
+		$papp['papp'] = self::papp_encode($papp);
+
+		if(! strstr($papp['url'],'://'))
+			$papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url'];
+
+		foreach($papp as $k => $v) {
+			if(strpos($v,'http') === 0 && $k != 'papp')
+				$papp[$k] = zid($v);
+			if($k === 'desc')
+				$papp['desc'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$papp['desc']);
+
+			if($k === 'requires') {
+				$requires = explode(',',$v);
+				foreach($requires as $require) {
+					$require = trim(strtolower($require));
+					switch($require) {
+						case 'nologin':
+							if(local_channel())
+								return '';
+							break;
+						case 'admin':
+							if(! is_site_admin())
+								return '';
+							break;
+						case 'local_channel':
+							if(! local_channel())
+								return '';
+							break;
+						case 'public_profile':
+							if(! is_public_profile())
+								return '';
+							break;
+						case 'observer':
+							$observer = \App::get_observer();
+							if(! $observer)
+								return '';
+							break;
+						default:
+							if(! (local_channel() && feature_enabled(local_channel(),$require)))
+								return '';
+							break;
+
+					}
+				}
+			}
+		}
+
+		$hosturl = '';
+
+		if(local_channel()) {
+			$installed = self::app_installed(local_channel(),$papp);
+			$hosturl = z_root() . '/';
+		}
+		elseif(remote_channel()) {
+			$observer = \App::get_observer();
+			if($observer && $observer['xchan_network'] === 'zot') {
+				// some folks might have xchan_url redirected offsite, use the connurl
+				$x = parse_url($observer['xchan_connurl']);
+				if($x) {
+					$hosturl = $x['scheme'] . '://' . $x['host'] . '/';
+				}
+			} 
+		}
+
+		$install_action = (($installed) ? t('Update') : t('Install'));
+
+		return replace_macros(get_markup_template('app.tpl'),array(
+			'$app' => $papp,
+			'$hosturl' => $hosturl,
+			'$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''),
+			'$install' => (($hosturl && $mode == 'view') ? $install_action : ''),
+			'$edit' => ((local_channel() && $installed && $mode == 'edit') ? t('Edit') : ''),
+			'$delete' => ((local_channel() && $installed && $mode == 'edit') ? t('Delete') : '')
+		));
+	}
+
+	static public function app_install($uid,$app) {
+		$app['uid'] = $uid;
+
+		if(self::app_installed($uid,$app))
+			$x = self::app_update($app);
+		else
+			$x = self::app_store($app);
+
+		if($x['success']) {
+			$r = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+				dbesc($x['app_id']),
+				intval($uid)
+			);
+			if($r) {
+				if(! $r[0]['app_system']) {
+					if($app['categories'] && (! $app['term'])) {
+						$r[0]['term'] = q("select * from term where otype = %d and oid = d",
+							intval(TERM_OBJ_APP),
+							intval($r[0]['id'])
+						);
+						build_sync_packet($uid,array('app' => $r[0]));
+					}
+				}
+			}
+			return $x['app_id'];
+		}
+		return false;
+	}
+
+	static public function app_destroy($uid,$app) {
+
+
+		if($uid && $app['guid']) {
+
+			$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+				dbesc($app['guid']),
+				intval($uid)
+			);
+			if($x) {
+				$x[0]['app_deleted'] = 1;
+				q("delete from term where otype = %d and oid = %d",
+					intval(TERM_OBJ_APP),
+					intval($x[0]['id'])
+				);
+				if($x[0]['app_system']) {
+					$r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
+						dbesc($app['guid']),
+						intval($uid)
+					);
+				}
+				else {
+					$r = q("delete from app where app_id = '%s' and app_channel = %d",
+						dbesc($app['guid']),
+						intval($uid)
+					);
+
+					// we don't sync system apps - they may be completely different on the other system
+					build_sync_packet($uid,array('app' => $x));
+				}
+			}
+		}
+	}
+
+
+	static public function app_installed($uid,$app) {
+
+		$r = q("select id from app where app_id = '%s' and app_version = '%s' and app_channel = %d limit 1",
+			dbesc((array_key_exists('guid',$app)) ? $app['guid'] : ''), 
+			dbesc((array_key_exists('version',$app)) ? $app['version'] : ''), 
+			intval($uid)
+		);
+		return(($r) ? true : false);
+
+	}
+
+
+	static public function app_list($uid, $deleted = false, $cat = '') {
+		if($deleted) 
+			$sql_extra = " and app_deleted = 1 ";
+		else
+			$sql_extra = " and app_deleted = 0 ";
+
+		if($cat) {
+			$r = q("select oid from term where otype = %d and term = '%s'",
+				intval(TERM_OBJ_APP),
+				dbesc($cat)
+			);
+			if(! $r)
+				return $r;
+			$sql_extra .= " and app.id in ( ";
+			$s = '';
+			foreach($r as $rr) {
+				if($s)
+					$s .= ',';
+				$s .= intval($rr['oid']);
+			}
+			$sql_extra .= $s . ') ';
+		}
+
+		$r = q("select * from app where app_channel = %d $sql_extra order by app_name asc",
+			intval($uid)
+		);
+		if($r) {
+			for($x = 0; $x < count($r); $x ++) {
+				if(! $r[$x]['app_system'])
+					$r[$x]['type'] = 'personal';
+				$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",
+					intval(TERM_OBJ_APP),
+					intval($r[$x]['id'])
+				);
+			}
+		}
+		return($r);
+	}
+
+
+	static public function app_decode($s) {
+		$x = base64_decode(str_replace(array('<br />',"\r","\n",' '),array('','','',''),$s));
+		return json_decode($x,true);
+	}
+
+
+	static public function app_store($arr) {
+
+		// logger('app_store: ' . print_r($arr,true));
+
+		$darray = array();
+		$ret = array('success' => false);
+
+		$darray['app_url']     = ((x($arr,'url')) ? $arr['url'] : '');
+		$darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0);
+
+		if((! $darray['app_url']) || (! $darray['app_channel']))
+			return $ret;
+
+		if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
+			$x = import_xchan_photo($arr['photo'],get_observer_hash(),true);
+			$arr['photo'] = $x[1];
+		}
+
+
+		$darray['app_id']       = ((x($arr,'guid'))     ? $arr['guid'] : random_string(). '.' . \App::get_hostname());
+		$darray['app_sig']      = ((x($arr,'sig'))      ? $arr['sig'] : '');
+		$darray['app_author']   = ((x($arr,'author'))   ? $arr['author'] : get_observer_hash());
+		$darray['app_name']     = ((x($arr,'name'))     ? escape_tags($arr['name']) : t('Unknown'));
+		$darray['app_desc']     = ((x($arr,'desc'))     ? escape_tags($arr['desc']) : '');
+		$darray['app_photo']    = ((x($arr,'photo'))    ? $arr['photo'] : z_root() . '/' . get_default_profile_photo(80));
+		$darray['app_version']  = ((x($arr,'version'))  ? escape_tags($arr['version']) : '');
+		$darray['app_addr']     = ((x($arr,'addr'))     ? escape_tags($arr['addr']) : '');
+		$darray['app_price']    = ((x($arr,'price'))    ? escape_tags($arr['price']) : '');
+		$darray['app_page']     = ((x($arr,'page'))     ? escape_tags($arr['page']) : '');
+		$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
+		$darray['app_system']   = ((x($arr,'system'))   ? intval($arr['system']) : 0);
+		$darray['app_deleted']  = ((x($arr,'deleted'))  ? intval($arr['deleted']) : 0);
+
+		$created = datetime_convert();
+
+		$r = q("insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page, app_requires, app_created, app_edited, app_system, app_deleted ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+			dbesc($darray['app_id']),
+			dbesc($darray['app_sig']),
+			dbesc($darray['app_author']),
+			dbesc($darray['app_name']),
+			dbesc($darray['app_desc']),
+			dbesc($darray['app_url']),
+			dbesc($darray['app_photo']),
+			dbesc($darray['app_version']),
+			intval($darray['app_channel']),
+			dbesc($darray['app_addr']),
+			dbesc($darray['app_price']),
+			dbesc($darray['app_page']),
+			dbesc($darray['app_requires']),
+			dbesc($created),
+			dbesc($created),
+			intval($darray['app_system']),
+			intval($darray['app_deleted'])
+		);
+		if($r) {
+			$ret['success'] = true;
+			$ret['app_id'] = $darray['app_id'];
+		}
+		if($arr['categories']) {
+			$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
+				dbesc($darray['app_id']),
+				intval($darray['app_channel'])
+			);
+			$y = explode(',',$arr['categories']);
+			if($y) {
+				foreach($y as $t) {
+					$t = trim($t);
+					if($t) {
+						store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
+					}
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+
+	static public function app_update($arr) {
+
+		$darray = array();
+		$ret = array('success' => false);
+
+		$darray['app_url']     = ((x($arr,'url')) ? $arr['url'] : '');
+		$darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0);
+		$darray['app_id']      = ((x($arr,'guid')) ? $arr['guid'] : 0);
+
+		if((! $darray['app_url']) || (! $darray['app_channel']) || (! $darray['app_id']))
+			return $ret;
+
+		if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
+			$x = import_xchan_photo($arr['photo'],get_observer_hash(),true);
+			$arr['photo'] = $x[1];
+		}
+
+		$darray['app_sig']      = ((x($arr,'sig')) ? $arr['sig'] : '');
+		$darray['app_author']   = ((x($arr,'author')) ? $arr['author'] : get_observer_hash());
+		$darray['app_name']     = ((x($arr,'name')) ? escape_tags($arr['name']) : t('Unknown'));
+		$darray['app_desc']     = ((x($arr,'desc')) ? escape_tags($arr['desc']) : '');
+		$darray['app_photo']    = ((x($arr,'photo')) ? $arr['photo'] : z_root() . '/' . get_default_profile_photo(80));
+		$darray['app_version']  = ((x($arr,'version')) ? escape_tags($arr['version']) : '');
+		$darray['app_addr']     = ((x($arr,'addr')) ? escape_tags($arr['addr']) : '');
+		$darray['app_price']    = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
+		$darray['app_page']     = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
+		$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
+		$darray['app_system']   = ((x($arr,'system'))   ? intval($arr['system']) : 0);
+		$darray['app_deleted']  = ((x($arr,'deleted'))  ? intval($arr['deleted']) : 0);
+
+		$edited = datetime_convert();
+
+		$r = q("update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s', app_requires = '%s', app_edited = '%s', app_system = %d, app_deleted = %d where app_id = '%s' and app_channel = %d",
+			dbesc($darray['app_sig']),
+			dbesc($darray['app_author']),
+			dbesc($darray['app_name']),
+			dbesc($darray['app_desc']),
+			dbesc($darray['app_url']),
+			dbesc($darray['app_photo']),
+			dbesc($darray['app_version']),
+			dbesc($darray['app_addr']),
+			dbesc($darray['app_price']),
+			dbesc($darray['app_page']),
+			dbesc($darray['app_requires']),
+			dbesc($edited),
+			intval($darray['app_system']),
+			intval($darray['app_deleted']),
+			dbesc($darray['app_id']),
+			intval($darray['app_channel'])
+		);
+		if($r) {
+			$ret['success'] = true;
+			$ret['app_id'] = $darray['app_id'];
+		}
+
+		$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
+			dbesc($darray['app_id']),
+			intval($darray['app_channel'])
+		);
+		if($x) {
+			q("delete from term where otype = %d and oid = %d",
+				intval(TERM_OBJ_APP),
+				intval($x[0]['id'])
+			);
+			if($arr['categories']) {
+				$y = explode(',',$arr['categories']);
+				if($y) {
+					foreach($y as $t) {
+						$t = trim($t);
+						if($t) {
+							store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
+						}
+					}
+				}
+			}
+		}
+
+		return $ret;
+
+	}
+
+
+	static public function app_encode($app,$embed = false) {
+
+		$ret = array();
+
+		$ret['type'] = 'personal';
+	
+		if($app['app_id'])
+			$ret['guid'] = $app['app_id'];
+
+		if($app['app_id'])
+			$ret['guid'] = $app['app_id'];
+
+		if($app['app_sig'])
+			$ret['sig'] = $app['app_sig'];
+
+		if($app['app_author'])
+			$ret['author'] = $app['app_author'];
+
+		if($app['app_name'])
+			$ret['name'] = $app['app_name'];
+
+		if($app['app_desc'])
+			$ret['desc'] = $app['app_desc'];
+
+		if($app['app_url'])
+			$ret['url'] = $app['app_url'];
+
+		if($app['app_photo'])
+			$ret['photo'] = $app['app_photo'];
+
+		if($app['app_version'])
+			$ret['version'] = $app['app_version'];
+
+		if($app['app_addr'])
+			$ret['addr'] = $app['app_addr'];
+
+		if($app['app_price'])
+			$ret['price'] = $app['app_price'];
+	
+		if($app['app_page'])
+			$ret['page'] = $app['app_page'];
+
+		if($app['app_requires'])
+			$ret['requires'] = $app['app_requires'];
+
+		if($app['app_system'])
+			$ret['system'] = $app['app_system'];
+
+		if($app['app_deleted'])
+			$ret['deleted'] = $app['app_deleted'];
+
+		if($app['term']) {
+			$s = '';
+			foreach($app['term'] as $t) {
+				if($s)
+					$s .= ',';
+				$s .= $t['term'];
+			}
+			$ret['categories'] = $s;
+		}
+
+
+		if(! $embed)
+			return $ret;
+
+		if(array_key_exists('categories',$ret))
+			unset($ret['categories']);
+	
+		$j = json_encode($ret);
+		return '[app]' . chunk_split(base64_encode($j),72,"\n") . '[/app]';
+
+	}
+
+
+	static public function papp_encode($papp) {
+		return chunk_split(base64_encode(json_encode($papp)),72,"\n");
+
+	}
+
+}
+
+

Zotlabs/Lib/Chatroom.php

@@ -0,0 +1,267 @@
+<?php
+namespace Zotlabs\Lib;
+
+/**
+ * @brief Chat related functions.
+ */
+
+
+
+class Chatroom {
+	/**
+	 * @brief Creates a chatroom.
+	 *
+	 * @param array $channel
+	 * @param array $arr
+	 * @return An associative array containing:
+	 *  - success: A boolean
+	 *  - message: (optional) A string
+	 */
+
+	static public function create($channel, $arr) {
+
+		$ret = array('success' => false);
+
+		$name = trim($arr['name']);
+		if(! $name) {
+			$ret['message'] = t('Missing room name');
+			return $ret;
+		}
+
+		$r = q("select cr_id from chatroom where cr_uid = %d and cr_name = '%s' limit 1",
+			intval($channel['channel_id']),
+			dbesc($name)
+		);
+		if($r) {
+			$ret['message'] = t('Duplicate room name');
+			return $ret;
+		}
+
+		$r = q("select count(cr_id) as total from chatroom where cr_aid = %d",
+			intval($channel['channel_account_id'])
+		);
+		if($r)
+			$limit = service_class_fetch($channel['channel_id'], 'chatrooms');
+
+		if(($r) && ($limit !== false) && ($r[0]['total'] >= $limit)) {
+			$ret['message'] = upgrade_message();
+			return $ret;
+		}
+
+		if(! array_key_exists('expire', $arr))
+			$arr['expire'] = 120;  // minutes, e.g. 2 hours
+
+		$created = datetime_convert();
+
+		$x = q("insert into chatroom ( cr_aid, cr_uid, cr_name, cr_created, cr_edited, cr_expire, allow_cid, allow_gid, deny_cid, deny_gid )
+			values ( %d, %d , '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' ) ",
+			intval($channel['channel_account_id']),
+			intval($channel['channel_id']),
+			dbesc($name),
+			dbesc($created),
+			dbesc($created),
+			intval($arr['expire']),
+			dbesc($arr['allow_cid']),
+			dbesc($arr['allow_gid']),
+			dbesc($arr['deny_cid']),
+			dbesc($arr['deny_gid'])
+		);
+
+		if($x)
+			$ret['success'] = true;
+
+		return $ret;
+	}
+
+
+	static public function destroy($channel,$arr) {
+
+		$ret = array('success' => false);
+
+		if(intval($arr['cr_id']))
+			$sql_extra = " and cr_id = " . intval($arr['cr_id']) . " ";
+		elseif(trim($arr['cr_name']))
+			$sql_extra = " and cr_name = '" . protect_sprintf(dbesc(trim($arr['cr_name']))) . "' ";
+		else {
+			$ret['message'] = t('Invalid room specifier.');
+			return $ret;
+		}
+
+		$r = q("select * from chatroom where cr_uid = %d $sql_extra limit 1",
+			intval($channel['channel_id'])
+		);
+		if(! $r) {
+			$ret['message'] = t('Invalid room specifier.');
+			return $ret;
+		}
+
+		build_sync_packet($channel['channel_id'],array('chatroom' => $r));
+
+		q("delete from chatroom where cr_id = %d",
+			intval($r[0]['cr_id'])
+		);
+		if($r[0]['cr_id']) {
+			q("delete from chatpresence where cp_room = %d",
+				intval($r[0]['cr_id'])
+			);
+			q("delete from chat where chat_room = %d",
+				intval($r[0]['cr_id'])
+			);
+		}
+
+		$ret['success'] = true;
+		return $ret;
+	}
+
+
+	static public function enter($observer_xchan, $room_id, $status, $client) {
+
+		if(! $room_id || ! $observer_xchan)
+			return;
+
+		$r = q("select * from chatroom where cr_id = %d limit 1",
+			intval($room_id)
+		);
+		if(! $r) {
+			notice( t('Room not found.') . EOL);
+			return false;
+		}
+		require_once('include/security.php');
+		$sql_extra = permissions_sql($r[0]['cr_uid']);
+
+		$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+			intval($room_id),
+			intval($r[0]['cr_uid'])
+		);
+		if(! $x) {
+			notice( t('Permission denied.') . EOL);
+			return false;
+		}
+
+		$limit = service_class_fetch($r[0]['cr_uid'], 'chatters_inroom');
+		if($limit !== false) {
+			$y = q("select count(*) as total from chatpresence where cp_room = %d",
+				intval($room_id)
+			);
+			if($y && $y[0]['total'] > $limit) {
+				notice( t('Room is full') . EOL);
+				return false;
+			}
+		}
+
+		if(intval($x[0]['cr_expire'])) {
+			$r = q("delete from chat where created < %s - INTERVAL %s and chat_room = %d", 
+				db_utcnow(), 
+				db_quoteinterval( intval($x[0]['cr_expire']) . ' MINUTE' ),
+				intval($x[0]['cr_id'])
+			);
+		}
+
+		$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1",
+			dbesc($observer_xchan),
+			intval($room_id)
+		);
+		if($r) {
+			q("update chatpresence set cp_last = '%s' where cp_id = %d and cp_client = '%s'",
+				dbesc(datetime_convert()),
+				intval($r[0]['cp_id']),
+				dbesc($client)
+			);
+			return true;
+		}
+
+		$r = q("insert into chatpresence ( cp_room, cp_xchan, cp_last, cp_status, cp_client )
+			values ( %d, '%s', '%s', '%s', '%s' )",
+			intval($room_id),
+			dbesc($observer_xchan),
+			dbesc(datetime_convert()),
+			dbesc($status),
+			dbesc($client)
+		);
+
+		return $r;
+	}
+
+
+	function leave($observer_xchan, $room_id, $client) {
+		if(! $room_id || ! $observer_xchan)
+			return;
+
+		$r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d and cp_client = '%s' limit 1",
+			dbesc($observer_xchan),
+			intval($room_id),
+			dbesc($client)
+		);
+		if($r) {
+			q("delete from chatpresence where cp_id = %d",
+				intval($r[0]['cp_id'])
+			);
+		}
+
+		return true;
+	}
+
+
+	static public function roomlist($uid) {
+		require_once('include/security.php');
+		$sql_extra = permissions_sql($uid);
+
+		$r = q("select allow_cid, allow_gid, deny_cid, deny_gid, cr_name, cr_expire, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d $sql_extra group by cr_name, cr_id order by cr_name",
+			intval($uid)
+		);
+
+		return $r;
+	}
+
+	static public function list_count($uid) {
+		require_once('include/security.php');
+		$sql_extra = permissions_sql($uid);
+
+		$r = q("select count(*) as total from chatroom where cr_uid = %d $sql_extra",
+			intval($uid)
+		);
+
+		return $r[0]['total'];
+	}
+
+	/**
+	 * create a chat message via API.
+	 * It is the caller's responsibility to enter the room.
+ 	*/
+
+	static public function message($uid, $room_id, $xchan, $text) {
+
+		$ret = array('success' => false);
+
+		if(! $text)
+			return;
+
+		$sql_extra = permissions_sql($uid);
+
+		$r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+			intval($uid),
+			intval($room_id)
+		);
+		if(! $r)
+			return $ret;
+
+		$arr = array(
+			'chat_room' => $room_id,
+			'chat_xchan' => $xchan,
+			'chat_text' => $text
+		);
+
+		call_hooks('chat_message', $arr);
+
+		$x = q("insert into chat ( chat_room, chat_xchan, created, chat_text )
+			values( %d, '%s', '%s', '%s' )",
+			intval($room_id),
+			dbesc($xchan),
+			dbesc(datetime_convert()),
+			dbesc($arr['chat_text'])
+		);
+
+		$ret['success'] = true;
+		return $ret;
+	}
+}

Zotlabs/Lib/ProtoDriver.php

@@ -1,5 +1,7 @@
 <?php /** @file */
 
+namespace Zotlabs\Lib;
+
 /*
  * Abstraction class for dealing with alternate networks (which of course do not exist, hence the abstraction)
  */
@@ -15,29 +17,3 @@ abstract class ProtoDriver {
 	abstract protected function collect_private($channel,$connection);
 
 }
-
-class ZotDriver extends ProtoDriver {
-
-	protected function discover($channel,$location) {
-
-	}
-	protected function deliver($item,$channel,$recipients) {
-
-	}
-	protected function collect($channel,$connection) {
-
-	}
-	protected function change_permissions($permissions,$channel,$recipient) {
-
-	}
-	protected function acknowledge_permissions($permissions,$channel,$recipient) {
-
-	}
-	protected function deliver_private($item,$channel,$recipients) {
-
-	}
-	protected function collect_private($channel,$connection) {
-
-	}
-
-}

Zotlabs/Lib/System.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zotlabs\Project;
+namespace Zotlabs\Lib;
 
 class System {
 

Zotlabs/Lib/ThreadItem.php

@@ -1,17 +1,15 @@
 <?php /** @file */
 
-if(class_exists('Item'))
-	return;
+namespace Zotlabs\Lib;
 
-require_once('include/BaseObject.php');
 require_once('include/text.php');
-require_once('boot.php');
 
 /**
- * An item
+ * A thread item
  */
 
-class Item extends BaseObject {
+class ThreadItem {
+
 	public  $data = array();
 	private $template = 'conv_item.tpl';
 	private $comment_box_template = 'comment_item.tpl';
@@ -32,7 +30,6 @@ class Item extends BaseObject {
 
 
 	public function __construct($data) {
-		$a = $this->get_app();
 				
 		$this->data = $data;
 		$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
@@ -49,7 +46,7 @@ class Item extends BaseObject {
 					continue;
 				}
 
-				$child = new Item($item);
+				$child = new ThreadItem($item);
 				$this->add_child($child);
 			}
 		}
@@ -67,7 +64,6 @@ class Item extends BaseObject {
 	
 		$result = array();
 
-		$a        = $this->get_app();
 		$item     = $this->get_data();
 
 		$commentww = '';
@@ -219,7 +215,8 @@ class Item extends BaseObject {
 				);
 
 			}
-		} else {
+		} 
+		else {
 			$indent = 'comment';
 		}
 
@@ -675,7 +672,6 @@ class Item extends BaseObject {
 
 		$template = get_markup_template($this->get_comment_box_template());
 
-		$a = $this->get_app();
 		$observer = $conv->get_observer();
 
 		$qc = ((local_channel()) ? get_pconfig(local_channel(),'system','qcomment') : null);
@@ -714,7 +710,7 @@ class Item extends BaseObject {
 			'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
 			'$encrypt' => t('Encrypt text'),
 			'$cipher' => $conv->get_cipher(),
-			'$sourceapp' => App::$sourcename
+			'$sourceapp' => \App::$sourcename
 
 		));
 

Zotlabs/Lib/ThreadStream.php

@@ -1,11 +1,8 @@
 <?php /** @file */
 
-if(class_exists('Conversation'))
-	return;
+namespace Zotlabs\Lib;
 
 require_once('boot.php');
-require_once('include/BaseObject.php');
-require_once('include/ItemObject.php');
 require_once('include/text.php');
 require_once('include/items.php');
 
@@ -14,7 +11,7 @@ require_once('include/items.php');
  *
  */
 
-class Conversation extends BaseObject {
+class ThreadStream {
 
 	private $threads = array();
 	private $mode = null;
@@ -46,9 +43,7 @@ class Conversation extends BaseObject {
 		if($this->get_mode() == $mode)
 			return;
 
-		$a = $this->get_app();
-
-		$this->observer = App::get_observer();
+		$this->observer = \App::get_observer();
 		$ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
 
 		switch($mode) {
@@ -57,7 +52,7 @@ class Conversation extends BaseObject {
 				$this->writable = true;
 				break;
 			case 'channel':
-				$this->profile_owner = App::$profile['profile_uid'];
+				$this->profile_owner = \App::$profile['profile_uid'];
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
 				break;
 			case 'display':
@@ -67,7 +62,7 @@ class Conversation extends BaseObject {
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
 				break;
 			case 'page':
-				$this->profile_owner = App::$profile['uid'];
+				$this->profile_owner = \App::$profile['uid'];
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
 				break;
 			default:
@@ -170,7 +165,7 @@ class Conversation extends BaseObject {
 					$item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data));
 			}
 		}
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 
 		$item->set_conversation($this);
 		$this->threads[] = $item;

Zotlabs/Lib/ZotDriver.php

@@ -0,0 +1,30 @@
+<?php /** @file */
+
+namespace Zotlabs\Lib;
+
+
+class ZotDriver extends ProtoDriver {
+
+	protected function discover($channel,$location) {
+
+	}
+	protected function deliver($item,$channel,$recipients) {
+
+	}
+	protected function collect($channel,$connection) {
+
+	}
+	protected function change_permissions($permissions,$channel,$recipient) {
+
+	}
+	protected function acknowledge_permissions($permissions,$channel,$recipient) {
+
+	}
+	protected function deliver_private($item,$channel,$recipients) {
+
+	}
+	protected function collect_private($channel,$connection) {
+
+	}
+
+}

Zotlabs/Module/Acl.php

@@ -260,7 +260,7 @@ class Acl extends \Zotlabs\Web\Controller {
 	
 	//	logger('navbar_complete');
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
 	

Zotlabs/Module/Admin.php

@@ -902,7 +902,6 @@ class Admin extends \Zotlabs\Web\Controller {
 		}
 		// account delete button was submitted
 		if (x($_POST, 'page_users_delete')) {
-			require_once('include/Contact.php');
 			foreach ($users as $uid){
 				account_remove($uid, true, false);
 			}
@@ -951,7 +950,6 @@ class Admin extends \Zotlabs\Web\Controller {
 			switch (argv(2)){
 				case 'delete':
 					// delete user
-					require_once('include/Contact.php');
 					account_remove($uid,true,false);
 	
 					notice( sprintf(t("Account '%s' deleted"), $account[0]['account_email']) . EOL);
@@ -1082,7 +1080,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)) );
 		}
@@ -1096,7 +1094,6 @@ class Admin extends \Zotlabs\Web\Controller {
 			notice( sprintf( tt("%s channel code allowed/disallowed", "%s channels code allowed/disallowed", count($channels)), count($channels)) );
 		}
 		if (x($_POST,'page_channels_delete')){
-			require_once("include/Contact.php");
 			foreach($channels as $uid){
 				channel_remove($uid,true);
 			}
@@ -1128,7 +1125,6 @@ class Admin extends \Zotlabs\Web\Controller {
 				case "delete":{
 					check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't');
 					// delete channel
-					require_once("include/Contact.php");
 					channel_remove($uid,true);
 					
 					notice( sprintf(t("Channel '%s' deleted"), $channel[0]['channel_name']) . EOL);
@@ -1141,7 +1137,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;
@@ -1735,7 +1731,7 @@ class Admin extends \Zotlabs\Web\Controller {
 				} else {
 					json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
 				}
-				$extendDir = __DIR__ . '/../../store/git/sys/extend';
+				$extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
 				$addonDir = $extendDir . '/addon';
 				if (!file_exists($extendDir)) {
 					if (!mkdir($extendDir, 0770, true)) {
@@ -1748,7 +1744,7 @@ class Admin extends \Zotlabs\Web\Controller {
 						}
 					}
 				}
-				$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
+				$repoDir = __DIR__ . '/../../store/[data]/git/sys/extend/addon/' . $repoName;
 				if (!is_dir($repoDir)) {
 					logger('Repo directory does not exist: ' . $repoDir);
 					json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
@@ -1785,7 +1781,7 @@ class Admin extends \Zotlabs\Web\Controller {
 				} else {
 					json_return_and_die(array('message' => 'No repo name provided.', 'success' => false));
 				}
-				$extendDir = __DIR__ . '/../../store/git/sys/extend';
+				$extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
 				$addonDir = $extendDir . '/addon';
 				if (!file_exists($extendDir)) {
 					if (!mkdir($extendDir, 0770, true)) {
@@ -1798,7 +1794,7 @@ class Admin extends \Zotlabs\Web\Controller {
 						}
 					}
 				}
-				$repoDir = __DIR__ . '/../../store/git/sys/extend/addon/' . $repoName;
+				$repoDir = __DIR__ . '/../../store/[data]/git/sys/extend/addon/' . $repoName;
 				if (!is_dir($repoDir)) {
 					logger('Repo directory does not exist: ' . $repoDir);
 					json_return_and_die(array('message' => 'Invalid addon repo.', 'success' => false));
@@ -1818,7 +1814,7 @@ class Admin extends \Zotlabs\Web\Controller {
 				if (array_key_exists('repoURL', $_REQUEST)) {
 					require __DIR__ . '/../../library/PHPGit.autoload.php';			 // Load PHPGit dependencies					
 					$repoURL = $_REQUEST['repoURL'];
-					$extendDir = __DIR__ . '/../../store/git/sys/extend';
+					$extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
 					$addonDir = $extendDir . '/addon';
 					if (!file_exists($extendDir)) {
 						if (!mkdir($extendDir, 0770, true)) {
@@ -1846,7 +1842,7 @@ class Admin extends \Zotlabs\Web\Controller {
 						json_return_and_die(array('message' => 'Invalid git repo', 'success' => false));
 					}
 					$repoDir = $addonDir . '/' . $repoName;
-					$tempRepoBaseDir = __DIR__ . '/../../store/git/sys/temp/';
+					$tempRepoBaseDir = __DIR__ . '/../../store/[data]/git/sys/temp/';
 					$tempAddonDir = $tempRepoBaseDir . $repoName;
 
 					if (!is_writable($addonDir) || !is_writable($tempAddonDir)) {
@@ -1880,9 +1876,9 @@ class Admin extends \Zotlabs\Web\Controller {
 				if (array_key_exists('repoURL', $_REQUEST)) {
 					require __DIR__ . '/../../library/PHPGit.autoload.php';			 // Load PHPGit dependencies					
 					$repoURL = $_REQUEST['repoURL'];
-					$extendDir = __DIR__ . '/../../store/git/sys/extend';
+					$extendDir = __DIR__ . '/../../store/[data]/git/sys/extend';
 					$addonDir = $extendDir . '/addon';
-					$tempAddonDir = __DIR__ . '/../../store/git/sys/temp';
+					$tempAddonDir = __DIR__ . '/../../store/[data]/git/sys/temp';
 					if (!file_exists($extendDir)) {
 						if (!mkdir($extendDir, 0770, true)) {
 							logger('Error creating extend folder: ' . $extendDir);
@@ -1894,6 +1890,12 @@ class Admin extends \Zotlabs\Web\Controller {
 							}
 						}
 					}
+					if (!is_dir($tempAddonDir)) {
+						if (!mkdir($tempAddonDir, 0770, true)) {
+							logger('Error creating temp plugin repo folder: ' . $tempAddonDir);
+							json_return_and_die(array('message' => 'Error creating temp plugin repo folder: ' . $tempAddonDir, 'success' => false));
+						}
+					}
 					$repoName = null;
 					if (array_key_exists('repoName', $_REQUEST) && $_REQUEST['repoName'] !== '') {
 						$repoName = $_REQUEST['repoName'];

Zotlabs/Module/Appman.php

@@ -2,8 +2,9 @@
 
 namespace Zotlabs\Module; 
 
-require_once('include/apps.php');
+//require_once('include/apps.php');
 
+use \Zotlabs\Lib as Zlib;
 
 class Appman extends \Zotlabs\Web\Controller {
 
@@ -30,16 +31,16 @@ class Appman extends \Zotlabs\Web\Controller {
 				'categories' => escape_tags($_REQUEST['categories'])
 			);
 	
-			$_REQUEST['appid'] = app_install(local_channel(),$arr);
+			$_REQUEST['appid'] = Zlib\Apps::app_install(local_channel(),$arr);
 	
-			if(app_installed(local_channel(),$arr))
+			if(Zlib\Apps::app_installed(local_channel(),$arr))
 				info( t('App installed.') . EOL);
 	
 			return;
 		}
 	
 	
-		$papp = app_decode($_POST['papp']);
+		$papp = Zlib\Apps::app_decode($_POST['papp']);
 	
 		if(! is_array($papp)) {
 			notice( t('Malformed app.') . EOL);
@@ -47,13 +48,13 @@ class Appman extends \Zotlabs\Web\Controller {
 		}
 	
 		if($_POST['install']) {
-			app_install(local_channel(),$papp);
-			if(app_installed(local_channel(),$papp))
+			Zlib\Apps::app_install(local_channel(),$papp);
+			if(Zlib\Apps::app_installed(local_channel(),$papp))
 				info( t('App installed.') . EOL);
 		}
 	
 		if($_POST['delete']) {
-			app_destroy(local_channel(),$papp);
+			Zlib\Apps::app_destroy(local_channel(),$papp);
 		}
 	
 		if($_POST['edit']) {
@@ -100,7 +101,7 @@ class Appman extends \Zotlabs\Web\Controller {
 				}
 			}
 
-			$embed = array('embed', t('Embed code'), app_encode($app,true),'', 'onclick="this.select();"');
+			$embed = array('embed', t('Embed code'), Zlib\Apps::app_encode($app,true),'', 'onclick="this.select();"');
 	
 		}
 				

Zotlabs/Module/Apps.php

@@ -1,8 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/apps.php');
+//require_once('include/apps.php');
 
+use \Zotlabs\Lib as Zlib;
 
 class Apps extends \Zotlabs\Web\Controller {
 
@@ -19,25 +20,25 @@ class Apps extends \Zotlabs\Web\Controller {
 	
 	
 		if(local_channel()) {
-			import_system_apps();
+			Zlib\Apps::import_system_apps();
 			$syslist = array();
-			$list = app_list(local_channel(), false, $_GET['cat']);
+			$list = Zlib\Apps::app_list(local_channel(), false, $_GET['cat']);
 			if($list) {
 				foreach($list as $x) {
-					$syslist[] = app_encode($x);
+					$syslist[] = Zlib\Apps::app_encode($x);
 				}
 			}
-			translate_system_apps($syslist);
+			Zlib\Apps::translate_system_apps($syslist);
 		}
 		else
-			$syslist = get_system_apps(true);
+			$syslist = Zlib\Apps::get_system_apps(true);
 
-		usort($syslist,'app_name_compare');
+		usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
 	
 	//	logger('apps: ' . print_r($syslist,true));
 	
 		foreach($syslist as $app) {
-			$apps[] = app_render($app,$mode);
+			$apps[] = Zlib\Apps::app_render($app,$mode);
 		}
 	
 		return replace_macros(get_markup_template('myapps.tpl'), array(

Zotlabs/Module/Blocks.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 

Zotlabs/Module/Cal.php

@@ -6,14 +6,12 @@ require_once('include/bbcode.php');
 require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
-require_once('include/Contact.php');
-
 
 
 class Cal extends \Zotlabs\Web\Controller {
 
 	function init() {
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
 	
@@ -47,13 +45,12 @@ class Cal extends \Zotlabs\Web\Controller {
 	
 	
 	
-		function get() {
+	function get() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
-	
-	
+		
 		$channel = null;
 	
 		if(argc() > 1) {

Zotlabs/Module/Channel.php

@@ -13,353 +13,355 @@ require_once('include/PermissionDescription.php');
 
 class Channel extends \Zotlabs\Web\Controller {
 
-function init() {
+	function init() {
 
-	$which = null;
-	if(argc() > 1)
-		$which = argv(1);
-	if(! $which) {
-		if(local_channel()) {
-			$channel = \App::get_channel();
-			if($channel && $channel['channel_address'])
+		$which = null;
+		if(argc() > 1)
+			$which = argv(1);
+		if(! $which) {
+			if(local_channel()) {
+				$channel = \App::get_channel();
+				if($channel && $channel['channel_address'])
+				$which = $channel['channel_address'];
+			}
+		}
+		if(! $which) {
+			notice( t('You must be logged in to see this page.') . EOL );
+			return;
+		}
+
+		$profile = 0;
+		$channel = \App::get_channel();
+
+		if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
 			$which = $channel['channel_address'];
+			$profile = argv(1);		
 		}
-	}
-	if(! $which) {
-		notice( t('You must be logged in to see this page.') . EOL );
-		return;
+
+		\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n" ;
+		\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
+
+		// Not yet ready for prime time
+		//	\App::$page['htmlhead'] .= '<link rel="openid.server" href="' . z_root() . '/id/' . $which .'?f=" />' . "\r\n" ;
+		//	\App::$page['htmlhead'] .= '<link rel="openid.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ;
+
+		// Run profile_load() here to make sure the theme is set before
+		// we start loading content
+
+		profile_load($a,$which,$profile);
+
 	}
 
-	$profile = 0;
-	$channel = \App::get_channel();
-
-	if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-		$which = $channel['channel_address'];
-		$profile = argv(1);		
-	}
-
-	\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n" ;
-	\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
-
-// Not yet ready for prime time
-//	\App::$page['htmlhead'] .= '<link rel="openid.server" href="' . z_root() . '/id/' . $which .'?f=" />' . "\r\n" ;
-//	\App::$page['htmlhead'] .= '<link rel="openid.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ;
-
-	// Run profile_load() here to make sure the theme is set before
-	// we start loading content
-
-	profile_load($a,$which,$profile);
-
-}
-
-function get($update = 0, $load = false) {
+	function get($update = 0, $load = false) {
 
 
-	if($load)
-		$_SESSION['loadtime'] = datetime_convert();
+		if($load)
+			$_SESSION['loadtime'] = datetime_convert();
 
-	$checkjs = new \Zotlabs\Web\CheckJS(1);
+		$checkjs = new \Zotlabs\Web\CheckJS(1);
 
-	$category = $datequery = $datequery2 = '';
+		$category = $datequery = $datequery2 = '';
 
-	$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
+		$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
 
-	$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-	$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
+		$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
+		if(observer_prohibited(true)) {			
 			return login();
-	}
-
-	$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
-	$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
-
-	$groups = array();
-
-	$o = '';
-
-	if($update) {
-		// Ensure we've got a profile owner if updating.
-		\App::$profile['profile_uid'] = \App::$profile_uid = $update;
-	}
-	else {
-		if(\App::$profile['profile_uid'] == local_channel()) {
-			nav_set_selected('home');
 		}
-	}
 
-	$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
+		$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
+		$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
 
-	$channel = \App::get_channel();
-	$observer = \App::get_observer();
-	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+		$groups = array();
 
-	$perms = get_all_perms(\App::$profile['profile_uid'],$ob_hash);
+		$o = '';
 
-	if(! $perms['view_stream']) {
+		if($update) {
+			// Ensure we've got a profile owner if updating.
+			\App::$profile['profile_uid'] = \App::$profile_uid = $update;
+		}
+		else {
+			if(\App::$profile['profile_uid'] == local_channel()) {
+				nav_set_selected('home');
+			}
+		}
+
+		$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
+
+		$channel = \App::get_channel();
+		$observer = \App::get_observer();
+		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+		$perms = get_all_perms(\App::$profile['profile_uid'],$ob_hash);
+
+		if(! $perms['view_stream']) {
 			// We may want to make the target of this redirect configurable
 			if($perms['view_profile']) {
 				notice( t('Insufficient permissions.  Request redirected to profile page.') . EOL);
 				goaway (z_root() . "/profile/" . \App::$profile['channel_address']);
 			}
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-
-	if(! $update) {
-
-		$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
-
-		$o .= common_friends_visitor_widget(\App::$profile['profile_uid']);
-
-		if($channel && $is_owner) {
-			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid' => $channel['channel_deny_cid'], 
-				'deny_gid' => $channel['channel_deny_gid']
-			);
+			notice( t('Permission denied.') . EOL);
+			return;
 		}
+
+
+		if(! $update) {
+
+			$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+			$o .= common_friends_visitor_widget(\App::$profile['profile_uid']);
+
+			if($channel && $is_owner) {
+				$channel_acl = array(
+					'allow_cid' => $channel['channel_allow_cid'], 
+					'allow_gid' => $channel['channel_allow_gid'], 
+					'deny_cid' => $channel['channel_deny_cid'], 
+					'deny_gid' => $channel['channel_deny_gid']
+				);
+			}
+			else
+				$channel_acl = array(); 
+
+
+			if($perms['post_wall']) {
+
+				$x = array(
+					'is_owner' => $is_owner,
+					'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(\App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
+					'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
+					'nickname' => \App::$profile['channel_address'],
+					'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
+					'acl' => (($is_owner) ? populate_acl($channel_acl,true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+					'showacl' => (($is_owner) ? 'yes' : ''),
+					'bang' => '',
+					'visitor' => (($is_owner || $observer) ? true : false),
+					'profile_uid' => \App::$profile['profile_uid'],
+					'editor_autocomplete' => true,
+					'bbco_autocomplete' => 'bbcode',
+					'bbcode' => true
+        		);
+
+        		$o .= status_editor($a,$x);
+			}
+
+		}
+
+
+		/**
+		 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
+		 */
+
+		$item_normal = item_normal();
+		$sql_extra = item_permissions_sql(\App::$profile['profile_uid']);
+
+		if(get_pconfig(\App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid))
+			$page_mode = 'list';
 		else
-			$channel_acl = array(); 
+			$page_mode = 'client';
 
+		$abook_uids = " and abook.abook_channel = " . intval(\App::$profile['profile_uid']) . " ";
 
-		if($perms['post_wall']) {
+		$simple_update = (($update) ? " AND item_unseen = 1 " : '');
 
-			$x = array(
-				'is_owner' => $is_owner,
-				'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(\App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
-				'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
-				'nickname' => \App::$profile['channel_address'],
-				'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-				'acl' => (($is_owner) ? populate_acl($channel_acl,true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
-				'showacl' => (($is_owner) ? 'yes' : ''),
-				'bang' => '',
-				'visitor' => (($is_owner || $observer) ? true : false),
-				'profile_uid' => \App::$profile['profile_uid'],
-				'editor_autocomplete' => true,
-				'bbco_autocomplete' => 'bbcode',
-				'bbcode' => true
-        	);
-
-        	$o .= status_editor($a,$x);
-		}
-
-	}
-
-
-	/**
-	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-	 */
-
-	$item_normal = item_normal();
-	$sql_extra = item_permissions_sql(\App::$profile['profile_uid']);
-
-	if(get_pconfig(\App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid))
-		$page_mode = 'list';
-	else
-		$page_mode = 'client';
-
-	$abook_uids = " and abook.abook_channel = " . intval(\App::$profile['profile_uid']) . " ";
-
-	$simple_update = (($update) ? " AND item_unseen = 1 " : '');
-
-	\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n";
+		\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n";
 		
-	if($update && $_SESSION['loadtime'])
-		$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
-	if($load)
-		$simple_update = '';
+		if($update && $_SESSION['loadtime'])
+			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
+		if($load)
+			$simple_update = '';
 
-	if(($update) && (! $load)) {
+		if(($update) && (! $load)) {
 
-		if ($mid) {
-			$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
-				AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
-				dbesc($mid . '%'),
-				intval(\App::$profile['profile_uid'])
-			);
-		} else {
-			$r = q("SELECT distinct parent AS `item_id`, created from item
-				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-				WHERE uid = %d $item_normal
-				AND item_wall = 1 $simple_update
-				AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-				$sql_extra
-				ORDER BY created DESC",
-				intval(\App::$profile['profile_uid'])
-			);
-			$_SESSION['loadtime'] = datetime_convert();
-		}
-
-	}
-	else {
-
-		if(x($category)) {
-		        $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
-		}
-		if(x($hashtags)) {
-		        $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
-		}
-
-		if($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-		}
-		if($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-		}
-
-		$itemspage = get_pconfig(local_channel(),'system','itemspage');
-		\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
-
-		if($load || ($checkjs->disabled())) {
-			if ($mid) {
-				$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal
-					AND item_wall = 1 $sql_extra limit 1",
-					dbesc($mid),
+			if($mid) {
+				$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
+					AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
+					dbesc($mid . '%'),
 					intval(\App::$profile['profile_uid'])
 				);
-				if (! $r) {
-					notice( t('Permission denied.') . EOL);
-				}
-
-			} else {
-				$r = q("SELECT distinct id AS item_id, created FROM item 
-					left join abook on item.author_xchan = abook.abook_xchan
+			} 
+			else {
+				$r = q("SELECT distinct parent AS `item_id`, created from item
+					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 					WHERE uid = %d $item_normal
-					AND item_wall = 1 and item_thread_top = 1
-					AND (abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra $sql_extra2
-					ORDER BY created DESC $pager_sql ",
+					AND item_wall = 1 $simple_update
+					AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra
+					ORDER BY created DESC",
 					intval(\App::$profile['profile_uid'])
 				);
+				$_SESSION['loadtime'] = datetime_convert();
+			}
+
+		}
+		else {
+
+			if(x($category)) {
+			        $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
+			}
+			if(x($hashtags)) {
+			        $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+			}
+
+			if($datequery) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+			}
+			if($datequery2) {
+				$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+			}
+
+			$itemspage = get_pconfig(local_channel(),'system','itemspage');
+			\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
+
+			if($load || ($checkjs->disabled())) {
+				if($mid) {
+					$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal
+						AND item_wall = 1 $sql_extra limit 1",
+						dbesc($mid),
+						intval(\App::$profile['profile_uid'])
+					);
+					if (! $r) {
+						notice( t('Permission denied.') . EOL);
+					}
+
+				} 
+				else {
+					$r = q("SELECT distinct id AS item_id, created FROM item 
+						left join abook on item.author_xchan = abook.abook_xchan
+						WHERE uid = %d $item_normal
+						AND item_wall = 1 and item_thread_top = 1
+						AND (abook_blocked = 0 or abook.abook_flags is null)
+						$sql_extra $sql_extra2
+						ORDER BY created DESC $pager_sql ",
+						intval(\App::$profile['profile_uid'])
+					);
+				}
+			}
+			else {
+				$r = array();
+			}
+		}
+
+		if($r) {
+
+			$parents_str = ids_to_querystr($r,'item_id');
+ 
+			$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
+				FROM `item`
+				WHERE `item`.`uid` = %d $item_normal
+				AND `item`.`parent` IN ( %s )
+				$sql_extra ",
+				intval(\App::$profile['profile_uid']),
+				dbesc($parents_str)
+			);
+
+			xchan_query($items);
+			$items = fetch_post_tags($items, true);
+			$items = conv_sort($items,'created');
+
+			if($load && $mid && (! count($items))) {
+				// This will happen if we don't have sufficient permissions
+				// to view the parent item (or the item itself if it is toplevel)
+				notice( t('Permission denied.') . EOL);
+			}
+
+		} 
+		else {
+			$items = array();
+		}
+
+		if((! $update) && (! $load)) {
+
+			// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
+			// because browser prefetching might change it on us. We have to deliver it with the page.
+
+			$maxheight = get_pconfig(\App::$profile['profile_uid'],'system','channel_divmore_height');
+			if(! $maxheight)
+				$maxheight = 400;
+
+			$o .= '<div id="live-channel"></div>' . "\r\n";
+			$o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] 
+				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page']
+				. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
+
+			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
+				'$baseurl' => z_root(),
+				'$pgtype' => 'channel',
+				'$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
+				'$gid' => '0',
+				'$cid' => '0',
+				'$cmin' => '0',
+				'$cmax' => '0',
+				'$star' => '0',
+				'$liked' => '0',
+				'$conv' => '0',
+				'$spam' => '0',
+				'$nouveau' => '0',
+				'$wall' => '1',
+				'$fh' => '0',
+				'$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
+				'$search' => '',
+				'$order' => '',
+				'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
+				'$file' => '',
+				'$cats' => (($category) ? $category : ''),
+				'$tags' => (($hashtags) ? $hashtags : ''),
+				'$mid' => $mid,
+				'$verb' => '',
+				'$dend' => $datequery,
+				'$dbegin' => $datequery2
+			));
+
+
+		}
+
+		$update_unseen = '';
+
+		if($page_mode === 'list') {
+
+			/**
+			 * in "list mode", only mark the parent item and any like activities as "seen". 
+			 * We won't distinguish between comment likes and post likes. The important thing
+			 * is that the number of unseen comments will be accurate. The SQL to separate the
+			 * comment likes could also get somewhat hairy. 
+			 */
+
+			if($parents_str) {
+				$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
+				$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
 			}
 		}
 		else {
-			$r = array();
-		}
-	}
-
-	if($r) {
-
-		$parents_str = ids_to_querystr($r,'item_id');
- 
-		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
-			FROM `item`
-			WHERE `item`.`uid` = %d $item_normal
-			AND `item`.`parent` IN ( %s )
-			$sql_extra ",
-			intval(\App::$profile['profile_uid']),
-			dbesc($parents_str)
-		);
-
-		xchan_query($items);
-		$items = fetch_post_tags($items, true);
-		$items = conv_sort($items,'created');
-
-		if ($load && $mid && (! count($items))) {
-			// This will happen if we don't have sufficient permissions
-			// to view the parent item (or the item itself if it is toplevel)
-			notice( t('Permission denied.') . EOL);
+			if($parents_str) {
+				$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+			}
 		}
 
-	} else {
-		$items = array();
-	}
-
-	if((! $update) && (! $load)) {
-
-		// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
-		// because browser prefetching might change it on us. We have to deliver it with the page.
-
-		$maxheight = get_pconfig(\App::$profile['profile_uid'],'system','channel_divmore_height');
-		if(! $maxheight)
-			$maxheight = 400;
-
-		$o .= '<div id="live-channel"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] 
-			. "; var netargs = '?f='; var profile_page = " . \App::$pager['page']
-			. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
-
-		\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
-			'$baseurl' => z_root(),
-			'$pgtype' => 'channel',
-			'$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
-			'$gid' => '0',
-			'$cid' => '0',
-			'$cmin' => '0',
-			'$cmax' => '0',
-			'$star' => '0',
-			'$liked' => '0',
-			'$conv' => '0',
-			'$spam' => '0',
-			'$nouveau' => '0',
-			'$wall' => '1',
-			'$fh' => '0',
-			'$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
-			'$search' => '',
-			'$order' => '',
-			'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
-			'$file' => '',
-			'$cats' => (($category) ? $category : ''),
-			'$tags' => (($hashtags) ? $hashtags : ''),
-			'$mid' => $mid,
-			'$verb' => '',
-			'$dend' => $datequery,
-			'$dbegin' => $datequery2
-		));
-
-
-	}
-
-	$update_unseen = '';
-
-	if($page_mode === 'list') {
-
-		/**
-		 * in "list mode", only mark the parent item and any like activities as "seen". 
-		 * We won't distinguish between comment likes and post likes. The important thing
-		 * is that the number of unseen comments will be accurate. The SQL to separate the
-		 * comment likes could also get somewhat hairy. 
-		 */
-
-		if($parents_str) {
-			$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
-			$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
+		if($is_owner && $update_unseen) {
+			$r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
+				intval(local_channel())
+			);
 		}
-	}
-	else {
-		if($parents_str) {
-			$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+
+
+		if($checkjs->disabled()) {
+			$o .= conversation($a,$items,'channel',$update,'traditional');
+		} 
+		else {
+			$o .= conversation($a,$items,'channel',$update,$page_mode);
 		}
+
+		if((! $update) || ($checkjs->disabled())) {
+			$o .= alt_pager($a,count($items));
+			if ($mid && $items[0]['title'])
+				\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
+		}
+
+		if($mid) 
+			$o .= '<div id="content-complete"></div>';
+
+		return $o;
 	}
-
-	if($is_owner && $update_unseen) {
-		$r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
-			intval(local_channel())
-		);
-	}
-
-
-	if($checkjs->disabled()) {
-		$o .= conversation($a,$items,'channel',$update,'traditional');
-	} else {
-		$o .= conversation($a,$items,'channel',$update,$page_mode);
-	}
-
-	if((! $update) || ($checkjs->disabled())) {
-		$o .= alt_pager($a,count($items));
-		if ($mid && $items[0]['title'])
-			\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
-	}
-
-	if($mid) 
-		$o .= '<div id="content-complete"></div>';
-
-	return $o;
-}
-
-
 }

Zotlabs/Module/Chanview.php

@@ -1,10 +1,8 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/Contact.php');
 require_once('include/zot.php');
 
-
 class Chanview extends \Zotlabs\Web\Controller {
 
 	function get() {
@@ -62,18 +60,15 @@ class Chanview extends \Zotlabs\Web\Controller {
 			}
 	
 			if($_REQUEST['address']) {
-				$ret = zot_finger($_REQUEST['address'],null);
-				if($ret['success']) {
-					$j = json_decode($ret['body'],true);
-					if($j)
-						import_xchan($j);
+				$j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null);
+				if($j['success']) {
+					import_xchan($j);
 					$r = q("select * from xchan where xchan_addr = '%s' limit 1",
 						dbesc($_REQUEST['address'])
 					);
 					if($r)
 						\App::$poi = $r[0];
 				}
-	
 			}
 		}
 	

Zotlabs/Module/Chat.php

@@ -1,9 +1,11 @@
-<?php
-namespace Zotlabs\Module; /** @file */
+<?php /** @file */
+
+namespace Zotlabs\Module; 
+
 
-require_once('include/chat.php');
 require_once('include/bookmarks.php');
 
+use \Zotlabs\Lib as Zlib;
 
 class Chat extends \Zotlabs\Web\Controller {
 
@@ -41,7 +43,7 @@ class Chat extends \Zotlabs\Web\Controller {
 	
 	}
 	
-		function post() {
+	function post() {
 	
 		if($_POST['room_name'])
 			$room = strip_tags(trim($_POST['room_name']));	
@@ -54,7 +56,7 @@ class Chat extends \Zotlabs\Web\Controller {
 	
 		if($_POST['action'] === 'drop') {
 			logger('delete chatroom');
-			chatroom_destroy($channel,array('cr_name' => $room));
+			Zlib\Chatroom::destroy($channel,array('cr_name' => $room));
 			goaway(z_root() . '/chat/' . $channel['channel_address']);
 		}
 	
@@ -67,7 +69,7 @@ class Chat extends \Zotlabs\Web\Controller {
 		if(intval($arr['expire']) < 0)
 			$arr['expire'] = 0;
 	
-		chatroom_create($channel,$arr);
+		Zlib\Chatroom::create($channel,$arr);
 	
 		$x = q("select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
 			dbesc($room),
@@ -87,7 +89,7 @@ class Chat extends \Zotlabs\Web\Controller {
 	}
 	
 	
-		function get() {
+	function get() {
 	
 		if(local_channel())
 			$channel = \App::get_channel();
@@ -105,7 +107,7 @@ class Chat extends \Zotlabs\Web\Controller {
 		}
 		
 		if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
-			chatroom_leave($observer,argv(2),$_SERVER['REMOTE_ADDR']);
+			Zlib\Chatroom::leave($observer,argv(2),$_SERVER['REMOTE_ADDR']);
 			goaway(z_root() . '/channel/' . argv(1));
 		}
 	
@@ -158,7 +160,7 @@ class Chat extends \Zotlabs\Web\Controller {
 			$room_id = intval(argv(2));
 			$bookmark_link = get_bookmark_link($ob);
 	
-			$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
+			$x = Zlib\Chatroom::enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
 			if(! $x)
 				return;
 			$x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
@@ -238,7 +240,7 @@ class Chat extends \Zotlabs\Web\Controller {
 			));
 		}
 	
-		$rooms = chatroom_list(\App::$profile['profile_uid']);
+		$rooms = Zlib\Chatroom::roomlist(\App::$profile['profile_uid']);
 	
 		$o .= replace_macros(get_markup_template('chatrooms.tpl'), array(
 			'$header' => sprintf( t('%1$s\'s Chatrooms'), \App::$profile['name']),

Zotlabs/Module/Chatsvc.php

@@ -1,14 +1,16 @@
-<?php
-namespace Zotlabs\Module; /** @file */
+<?php /** @file */
+
+namespace Zotlabs\Module; 
 
 require_once('include/security.php');
 
+use \Zotlabs\Lib as Zlib;
 
 class Chatsvc extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-	//logger('chatsvc');
+		//logger('chatsvc');
 	
 		$ret = array('success' => false);
 	
@@ -27,7 +29,7 @@ class Chatsvc extends \Zotlabs\Web\Controller {
 	
 	}
 	
-		function post() {
+	function post() {
 	
 		$ret = array('success' => false);
 	
@@ -65,7 +67,7 @@ class Chatsvc extends \Zotlabs\Web\Controller {
 		json_return_and_die($ret);
 	}
 	
-		function get() {
+	function get() {
 	
 		$status = strip_tags($_REQUEST['status']);
 		$room_id = intval(\App::$data['chat']['room_id']);

Zotlabs/Module/Cloud.php

@@ -102,7 +102,7 @@ class Cloud extends \Zotlabs\Web\Controller {
 	
 		// All we need to do now, is to fire up the server
 		$server->exec();
-	
+
 		killme();
 	}
 	

Zotlabs/Module/Connect.php

@@ -2,7 +2,7 @@
 namespace Zotlabs\Module; /** @file */
 
 
-require_once('include/Contact.php');
+
 require_once('include/contact_widgets.php');
 require_once('include/items.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

Zotlabs/Module/Connections.php

@@ -1,9 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/Contact.php');
+
 require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
+require_once('include/selectors.php');
 require_once('include/group.php');
 require_once('include/contact_widgets.php');
 require_once('include/zot.php');

Zotlabs/Module/Connedit.php

@@ -7,9 +7,9 @@ namespace Zotlabs\Module;
  *
  */
 
-require_once('include/Contact.php');
+
 require_once('include/socgraph.php');
-require_once('include/contact_selectors.php');
+require_once('include/selectors.php');
 require_once('include/group.php');
 require_once('include/contact_widgets.php');
 require_once('include/zot.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);
 			}
@@ -485,7 +485,6 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 			if($cmd === 'drop') {
 	
-				require_once('include/Contact.php');
 	
 	// FIXME
 	// We need to send either a purge or a refresh packet to the other side (the channel being unfriended).
@@ -583,8 +582,6 @@ class Connedit extends \Zotlabs\Web\Controller {
 			if(intval($contact['abook_self']))
 				$self = true;
 	
-			require_once('include/contact_selectors.php');
-	
 			$tpl = get_markup_template("abook_edit.tpl");
 	
 			if(feature_enabled(local_channel(),'affinity')) {

Zotlabs/Module/Cover_photo.php

@@ -8,7 +8,7 @@ namespace Zotlabs\Module;
 */
 
 require_once('include/photo/photo_driver.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 
 

Zotlabs/Module/Dav.php

@@ -64,7 +64,7 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->setRealm(ucfirst(\Zotlabs\Project\System::get_platform_name()) . 'WebDAV');
+		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'WebDAV');
 
 //		$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($userName,$password) {
 //			if(account_verify_password($userName,$password))

Zotlabs/Module/Directory.php

@@ -57,9 +57,9 @@ class Directory extends \Zotlabs\Web\Controller {
 		}
 	}
 	
-		function get() {
+	function get() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}

Zotlabs/Module/Display.php

@@ -7,17 +7,13 @@ class Display extends \Zotlabs\Web\Controller {
 
 	function get($update = 0, $load = false) {
 	
-	//	logger("mod-display: update = $update load = $load");
-	
-	
 		$checkjs = new \Zotlabs\Web\CheckJS(1);
 	
-	
 		if($load)
 			$_SESSION['loadtime'] = datetime_convert();
 	
 	
-		if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}
@@ -185,7 +181,7 @@ class Display extends \Zotlabs\Web\Controller {
 			if($load || ($checkjs->disabled())) {
 				$r = null;
 	
-				require_once('include/identity.php');
+				require_once('include/channel.php');
 				$sys = get_sys_channel();
 				$sysid = $sys['channel_id'];
 	
@@ -233,7 +229,7 @@ class Display extends \Zotlabs\Web\Controller {
 		elseif($update && !$load) {
 			$r = null;
 	
-			require_once('include/identity.php');
+			require_once('include/channel.php');
 			$sys = get_sys_channel();
 			$sysid = $sys['channel_id'];
 	

Zotlabs/Module/Editblock.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/acl_selectors.php');
 require_once('include/conversation.php');
 

Zotlabs/Module/Editlayout.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/acl_selectors.php');
 require_once('include/conversation.php');
 

Zotlabs/Module/Editwebpage.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/acl_selectors.php');
 require_once('include/conversation.php');
 require_once('include/PermissionDescription.php');

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));
 	
 	}
 	

Zotlabs/Module/Feed.php

@@ -31,7 +31,7 @@ class Feed extends \Zotlabs\Web\Controller {
 	
 			$channel = $r[0];
 	
-			if((intval(get_config('system','block_public'))) && (! get_account_id()))
+			if(observer_prohibited(true))
 				killme();
 	 
 			logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);

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();
 		}

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);

Zotlabs/Module/Getfile.php

@@ -21,7 +21,6 @@ namespace Zotlabs\Module;
 
 
 
-require_once('include/Contact.php');
 require_once('include/attach.php');
 
 

Zotlabs/Module/Help.php

@@ -37,7 +37,7 @@ class Help extends \Zotlabs\Web\Controller {
 					$path = trim(substr($dirname,4),'/');
 	
 					$o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' . 
-					str_replace('$Projectname',\Zotlabs\Project\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
+					str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
 	
 				}
 				$o .= '</ul>';

Zotlabs/Module/Import.php

@@ -4,9 +4,9 @@ namespace Zotlabs\Module;
 // Import a channel, either by direct file upload or via
 // connection to original server. 
 
-require_once('include/Contact.php');
+
 require_once('include/zot.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/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);

Zotlabs/Module/Item.php

@@ -56,7 +56,7 @@ class Item extends \Zotlabs\Web\Controller {
 			$remote_xchan = $remote_observer = false;
 	
 		$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid'])    : 0);
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		$sys = get_sys_channel();
 		if($sys && $profile_uid && ($sys['channel_id'] == $profile_uid) && is_site_admin()) {
 			$uid = intval($sys['channel_id']);
@@ -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');
 	

Zotlabs/Module/Layouts.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 

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);

Zotlabs/Module/Linkinfo.php

@@ -115,7 +115,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 		// If this is a Red site, use zrl rather than url so they get zids sent to them by default
 	
-		if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], \Zotlabs\Project\System::get_platform_name() . ' ') === 0))
+		if( x($siteinfo,'generator') && (strpos($siteinfo['generator'], \Zotlabs\Lib\System::get_platform_name() . ' ') === 0))
 			$template = str_replace('url','zrl',$template);
 	
 		if($siteinfo["title"] == "") {

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');
 		}

Zotlabs/Module/Magic.php

@@ -47,11 +47,9 @@ class Magic extends \Zotlabs\Web\Controller {
 			 *
 			 */
 	
-			$ret = zot_finger((($addr) ? $addr : '[system]@' . $parsed['host']),null);
-			if($ret['success']) {
-				$j = json_decode($ret['body'],true);
-				if($j)
-					import_xchan($j);
+			$j = \Zotlabs\Zot\Finger::run((($addr) ? $addr : '[system]@' . $parsed['host']),null);
+			if($j['success']) {
+				import_xchan($j);
 	
 				// Now try again
 	

Zotlabs/Module/Mail.php

@@ -5,7 +5,7 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 require_once('include/zot.php');
 require_once("include/bbcode.php");
-require_once('include/Contact.php');
+
 
 
 
@@ -32,17 +32,16 @@ class Mail extends \Zotlabs\Web\Controller {
 		if(! $recipient) {
 			$channel = \App::get_channel();
 	
-			$ret = zot_finger($rstr,$channel);
+			$j = \Zotlabs\Zot\Finger::run($rstr,$channel);
 	
-			if(! $ret['success']) {
+			if(! $j['success']) {
 				notice( t('Unable to lookup recipient.') . EOL);
 				return;
 			} 
-			$j = json_decode($ret['body'],true);
 	
 			logger('message_post: lookup: ' . $url . ' ' . print_r($j,true));
 	
-			if(! ($j['success'] && $j['guid'])) {
+			if(! $j['guid']) {
 				notice( t('Unable to communicate with requested channel.'));
 				return;
 			}
@@ -173,7 +172,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 );
@@ -306,11 +305,6 @@ class Mail extends \Zotlabs\Web\Controller {
 		else
 			\App::$poi = $messages[0]['to'];
 	
-	//	require_once('include/Contact.php');
-	
-	//	\App::set_widget('mail_conversant',vcard_from_xchan(\App::$poi,$get_observer_hash,'mail'));
-	
-	
 		$tpl = get_markup_template('msg-header.tpl');
 		
 		\App::$page['htmlhead'] .= replace_macros($tpl, array(

Zotlabs/Module/Menu.php

@@ -2,7 +2,7 @@
 namespace Zotlabs\Module;
 
 require_once('include/menu.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 
 class Menu extends \Zotlabs\Web\Controller {

Zotlabs/Module/Message.php

@@ -5,8 +5,6 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 require_once('include/zot.php');
 require_once("include/bbcode.php");
-require_once('include/Contact.php');
-
 
 
 class Message extends \Zotlabs\Web\Controller {

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);

Zotlabs/Module/Network.php

@@ -385,7 +385,7 @@ class Network extends \Zotlabs\Web\Controller {
 		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
 	
 		if($firehose && (! get_config('system','disable_discover_tab'))) {
-			require_once('include/identity.php');
+			require_once('include/channel.php');
 			$sys = get_sys_channel();
 			$uids = " and item.uid  = " . intval($sys['channel_id']) . " ";
 			\App::$data['firehose'] = intval($sys['channel_id']);

Zotlabs/Module/New_channel.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/permissions.php');
 
 

Zotlabs/Module/Oep.php

@@ -181,8 +181,8 @@ class Oep extends \Zotlabs\Web\Controller {
 	function oep_profile_reply($args) {
 	
 		
-		require_once('include/identity.php');
-		require_once('include/Contact.php');
+		require_once('include/channel.php');
+
 		$url = $args['url'];
 	
 		if(preg_match('#//(.*?)/(.*?)/(.*?)(/|\?|&|$)#',$url,$matches)) {

Zotlabs/Module/Photos.php

@@ -1,12 +1,12 @@
 <?php
 namespace Zotlabs\Module;
+
 require_once('include/photo/photo_driver.php');
 require_once('include/photos.php');
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 require_once('include/security.php');
-require_once('include/Contact.php');
 require_once('include/attach.php');
 require_once('include/text.php');
 require_once('include/PermissionDescription.php');
@@ -18,7 +18,7 @@ class Photos extends \Zotlabs\Web\Controller {
 	function init() {
 	
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
 	
@@ -518,7 +518,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		// photos/name/image/xxxxx
 	
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}

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));;

Zotlabs/Module/Probe.php

@@ -20,17 +20,17 @@ class Probe extends \Zotlabs\Web\Controller {
 			$channel = \App::get_channel();
 			$addr = trim($_GET['addr']);
 			$do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false);
-			$res = zot_finger($addr,$channel,false);
+			
+			$j = \Zotlabs\Zot\Finger::run($addr,$channel,false);
+
+			//			$res = zot_finger($addr,$channel,false);
+
 			$o .= '<pre>';
-			if($res['success'])
-				$j = json_decode($res['body'],true);
-			else {
+			if(! $j['success']) {
 				$o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
 				$o .= "<strong>https connection failed. Trying again with auto failover to http.</strong>\r\n\r\n";
-				$res = zot_finger($addr,$channel,true);
-				if($res['success'])
-					$j = json_decode($res['body'],true);
-				else
+				$j = \Zotlabs\Zot\Finger::run($addr,$channel,true);
+				if(! $j['success']) 
 					$o .= sprintf( t('Fetching URL returns error: %1$s'),$res['error'] . "\r\n\r\n");
 	
 			}

Zotlabs/Module/Profile.php

@@ -55,8 +55,8 @@ class Profile extends \Zotlabs\Web\Controller {
 	
 	function get() {
 	
-		if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
-				return login();
+		if(observer_prohibited(true)) {
+			return login();
 		}
 	
 		$groups = array();

Zotlabs/Module/Profile_photo.php

@@ -9,7 +9,7 @@ namespace Zotlabs\Module;
 
 require_once('include/photo/photo_driver.php');
 require_once('include/photos.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 /* @brief Function for sync'ing  permissions of profile-photos and their profile
 *
@@ -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');
 			}
 	

Zotlabs/Module/Profiles.php

@@ -1,7 +1,8 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
+require_once('include/selectors.php');
 
 
 class Profiles extends \Zotlabs\Web\Controller {
@@ -584,7 +585,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()));
 			}
 		}
 	}
@@ -601,7 +602,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 			return;
 		}
 	
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 	
 		$profile_fields_basic    = get_profile_fields_basic();
 		$profile_fields_advanced = get_profile_fields_advanced();
@@ -625,9 +626,6 @@ class Profiles extends \Zotlabs\Web\Controller {
 				return;
 			}
 	
-			require_once('include/profile_selectors.php');
-	
-	
 			$editselect = 'none';
 	//		if(feature_enabled(local_channel(),'richtext'))
 	//			$editselect = 'textareas';

Zotlabs/Module/Profperm.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/Contact.php');
+
 require_once('include/photos.php');
 
 

Zotlabs/Module/Pubsites.php

@@ -31,7 +31,7 @@ class Pubsites extends \Zotlabs\Web\Controller {
 				$o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Software') . '</td><td colspan="2">' . t('Ratings') . '</td></tr>';
 				if($j['sites']) {
 					foreach($j['sites'] as $jj) {
-						if(strpos($jj['project'],\Zotlabs\Project\System::get_platform_name()) === false)
+						if(strpos($jj['project'],\Zotlabs\Lib\System::get_platform_name()) === false)
 							continue;
 						$host = strtolower(substr($jj['url'],strpos($jj['url'],'://')+3));
 						$rate_links = ((local_channel()) ? '<td><a href="rate?f=&target=' . $host . '" class="btn-btn-default"><i class="fa fa-check-square-o"></i> ' . t('Rate') . '</a></td>' : '');

Zotlabs/Module/Pubstream.php

@@ -12,7 +12,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			$_SESSION['loadtime'] = datetime_convert();
 	
 	
-		if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
+		if(observer_prohibited(true)) {
 				return login();
 		}
 	
@@ -71,7 +71,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 		}
 	
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		require_once('include/security.php');
 	
 		if(get_config('system','site_firehose')) {

Zotlabs/Module/Randprof.php

@@ -6,7 +6,6 @@ namespace Zotlabs\Module;
 class Randprof extends \Zotlabs\Web\Controller {
 
 	function init() {
-		require_once('include/Contact.php');
 		$x = random_profile();
 		if($x)
 			goaway(chanlink_url($x));

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);

Zotlabs/Module/Ratings.php

@@ -8,7 +8,7 @@ class Ratings extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
 	
@@ -80,9 +80,9 @@ class Ratings extends \Zotlabs\Web\Controller {
 	
 	
 	
-		function get() {
+	function get() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}

Zotlabs/Module/Regdir.php

@@ -60,14 +60,11 @@ class Regdir extends \Zotlabs\Web\Controller {
 				json_return_and_die($result);
 			}
 	
-			$f = zot_finger('[system]@' . $m['host']);
-			if($f['success']) {
-				$j = json_decode($f['body'],true);
-				if($j['success'] && $j['guid']) {
-					$x = import_xchan($j);
-					if($x['success']) {
-						$result['success'] = true;
-					}
+			$j = \Zotlabs\Zot\Finger::run('[system]@' . $m['host']);
+			if($j['success'] && $j['guid']) {
+				$x = import_xchan($j);
+				if($x['success']) {
+					$result['success'] = true;
 				}
 			}
 	

Zotlabs/Module/Register.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 
 class Register extends \Zotlabs\Web\Controller {

Zotlabs/Module/Removeaccount.php

@@ -36,17 +36,12 @@ class Removeaccount extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		require_once('include/Contact.php');
-	
 		$global_remove = intval($_POST['global']);
 	
-		account_remove($account_id,true);
-		
+		account_remove($account_id, 1 - $global_remove);		
 	}
-	
-	
-	
-		function get() {
+		
+	function get() {
 	
 		if(! local_channel())
 			goaway(z_root());

Zotlabs/Module/Removeme.php

@@ -35,8 +35,6 @@ class Removeme extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		require_once('include/Contact.php');
-	
 		$global_remove = intval($_POST['global']);
 	
 		channel_remove(local_channel(),1 - $global_remove,true);
@@ -44,8 +42,7 @@ class Removeme extends \Zotlabs\Web\Controller {
 	}
 	
 	
-	
-		function get() {
+	function get() {
 	
 		if(! local_channel())
 			goaway(z_root());

Zotlabs/Module/Rsd_xml.php

@@ -6,7 +6,7 @@ class Rsd_xml extends \Zotlabs\Web\Controller {
 	function init() {
 		header ("Content-Type: text/xml");
 		echo replace_macros(get_markup_template('rsd.tpl'),array(
-			'$project' => \Zotlabs\Project\System::get_platform_name(),
+			'$project' => \Zotlabs\Lib\System::get_platform_name(),
 			'$baseurl' => z_root(),
 			'$apipath' => z_root() . '/api/'
 		));

Zotlabs/Module/Search.php

@@ -139,7 +139,7 @@ class Search extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 		$pub_sql = public_permissions_sql($observer_hash);
 	
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 	
 		$sys = get_sys_channel();
 	

Zotlabs/Module/Settings.php

@@ -483,7 +483,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	
 		if($username != $channel['channel_name']) {
 			$name_change = true;
-			require_once('include/identity.php');
+			require_once('include/channel.php');
 			$err = validate_channelname($username);
 			if($err) {
 				notice($err);
@@ -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();
 	
@@ -1047,7 +1047,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	
 				'$h_prv' 	=> t('Security and Privacy Settings'),
 				'$permissions_set' => $permissions_set,
-				'$server_role' => \Zotlabs\Project\System::get_server_role(),
+				'$server_role' => \Zotlabs\Lib\System::get_server_role(),
 				'$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
 	
 				'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),

Zotlabs/Module/Setup.php

@@ -734,7 +734,7 @@ class Setup extends \Zotlabs\Web\Controller {
 			set_config('system','curl_ssl_ciphers','ALL:!eNULL');
 	
 		// Create a system channel
-		require_once ('include/identity.php');
+		require_once ('include/channel.php');
 		create_sys_channel();
 	
 		$baseurl = z_root();

Zotlabs/Module/Siteinfo.php

@@ -16,10 +16,10 @@ class Siteinfo extends \Zotlabs\Web\Controller {
 	function get() {
 	
 		if(! get_config('system','hidden_version_siteinfo')) {
-			$version = sprintf( t('Version %s'), \Zotlabs\Project\System::get_project_version());
+			$version = sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version());
 			if(@is_dir('.git') && function_exists('shell_exec')) {
 				$commit = @shell_exec('git log -1 --format="%h"');
-				$tag = \Zotlabs\Project\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
+				$tag = \Zotlabs\Lib\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
 			}
 			if(! isset($commit) || strlen($commit) > 16)
 				$commit = '';

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();
 	

Zotlabs/Module/Thing.php

@@ -7,7 +7,7 @@ namespace Zotlabs\Module;
 
 require_once('include/items.php');
 require_once('include/security.php');
-require_once('include/contact_selectors.php');
+require_once('include/selectors.php');
 require_once('include/acl_selectors.php');
 
 

Zotlabs/Module/Uexport.php

@@ -11,7 +11,7 @@ class Uexport extends \Zotlabs\Web\Controller {
 		if(argc() > 1) {
 			$channel = \App::get_channel();
 	
-			require_once('include/identity.php');
+			require_once('include/channel.php');
 	
 			if(argc() > 1 && intval(argv(1)) > 1900) {
 				$year = intval(argv(1));

Zotlabs/Module/Viewconnections.php

@@ -1,23 +1,22 @@
 <?php
 namespace Zotlabs\Module;
-require_once('include/contact_selectors.php');
-require_once('include/Contact.php');
 
+require_once('include/selectors.php');
 
 class Viewconnections extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			return;
 		}
 		if(argc() > 1)
 			profile_load($a,argv(1));
 	}
 	
-		function get() {
+	function get() {
 	
-		if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			notice( t('Public access denied.') . EOL);
 			return;
 		}

Zotlabs/Module/Wall_attach.php

@@ -2,7 +2,7 @@
 namespace Zotlabs\Module;
 
 require_once('include/attach.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/photos.php');
 
 

Zotlabs/Module/Wall_upload.php

@@ -2,7 +2,7 @@
 namespace Zotlabs\Module;
 
 require_once('include/photo/photo_driver.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/photos.php');
 
 

Zotlabs/Module/Webpages.php

@@ -1,7 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/identity.php');
+require_once('include/channel.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 require_once('include/PermissionDescription.php');

Zotlabs/Module/Zotfeed.php

@@ -15,7 +15,7 @@ class Zotfeed extends \Zotlabs\Web\Controller {
 		if(! $mindate)
 			$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
 	
-		if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
+		if(observer_prohibited()) {
 			$result['message'] = 'Public access denied';
 			json_return_and_die($result);
 		}
@@ -45,8 +45,6 @@ class Zotfeed extends \Zotlabs\Web\Controller {
 		$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate));
 		$result['success'] = true;
 		json_return_and_die($result);
-	
-	
 	}
 	
 }

Zotlabs/Render/SimpleTemplate.php

@@ -1,9 +1,11 @@
 <?php
-require_once 'include/ITemplateEngine.php';
+
+namespace Zotlabs\Render;
 
 define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
-class Template implements ITemplateEngine {
+class SimpleTemplate implements TemplateEngine {
+
 	static $name ="internal";
 
 	var $r;
@@ -261,6 +263,7 @@ class Template implements ITemplateEngine {
 	}
 
 	// TemplateEngine interface
+
 	public function replace_macros($s, $r) {
 		$this->r = $r;
 

Zotlabs/Render/SmartyInterface.php

@@ -0,0 +1,48 @@
+<?php /** @file */
+
+namespace Zotlabs\Render;
+
+require_once('library/Smarty/libs/Smarty.class.php');
+
+class SmartyInterface extends \Smarty {
+
+	public $filename;
+
+	function __construct() {
+		parent::__construct();
+
+		$theme = Theme::current();
+		$thname = $theme[0];
+
+		// setTemplateDir can be set to an array, which Smarty will parse in order.
+		// The order is thus very important here
+
+		$template_dirs = array('theme' => "view/theme/$thname/tpl/");
+		if( x(\App::$theme_info,"extends") )
+			$template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/");
+		$template_dirs = $template_dirs + array('base' => 'view/tpl/');
+		$this->setTemplateDir($template_dirs);
+
+        $basecompiledir = \App::$config['system']['smarty3_folder'];
+        
+		$this->setCompileDir($basecompiledir.'/compiled/');
+		$this->setConfigDir($basecompiledir.'/config/');
+		$this->setCacheDir($basecompiledir.'/cache/');
+
+		$this->left_delimiter = \App::get_template_ldelim('smarty3');
+		$this->right_delimiter = \App::get_template_rdelim('smarty3');
+
+		// Don't report errors so verbosely
+		$this->error_reporting = E_ALL & (~E_NOTICE);
+	}
+
+	function parsed($template = '') {
+		if($template) {
+			return $this->fetch('string:' . $template);
+		}
+		return $this->fetch('file:' . $this->filename);
+	}
+}
+
+
+

Zotlabs/Render/SmartyTemplate.php

@@ -0,0 +1,75 @@
+<?php /** @file */
+
+namespace Zotlabs\Render;
+
+class SmartyTemplate implements TemplateEngine {
+
+	static $name ="smarty3";
+	
+	public function __construct(){
+
+		// Cannot use get_config() here because it is called during installation when there is no DB.
+		// FIXME: this may leak private information such as system pathnames.
+
+        $basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) 
+			? \App::$config['system']['smarty3_folder'] : '');
+        if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
+        if (!is_dir($basecompiledir)) {
+            echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme();
+        }
+		if(!is_writable($basecompiledir)){
+			echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme();
+		}
+         \App::$config['system']['smarty3_folder'] = $basecompiledir;
+	}
+	
+	// TemplateEngine interface
+
+	public function replace_macros($s, $r) {
+		$template = '';
+		if(gettype($s) === 'string') {
+			$template = $s;
+			$s = new SmartyInterface();
+		}
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);		
+	}
+	
+	public function get_markup_template($file, $root=''){
+		$template_file = theme_include($file, $root);
+		if($template_file) {
+			$template = new SmartyInterface();
+			$template->filename = $template_file;
+
+			return $template;
+		}		
+		return "";
+	}
+
+	public function get_intltext_template($file, $root='') {
+
+		$lang = \App::$language;
+    
+		if(file_exists("view/$lang/$file"))
+        	$template_file = "view/$lang/$file";
+	    elseif(file_exists("view/en/$file"))
+        	$template_file = "view/en/$file";
+    	else
+        	$template_file = theme_include($file,$root);
+		if($template_file) {
+			$template = new SmartyInterface();
+			$template->filename = $template_file;
+
+			return $template;
+		}		
+		return "";
+	}
+
+
+
+}