get dev

1 files changed, 263 insertions, 266 deletions

diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index 7b968532a..e16b68cf8 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -2,9 +2,9 @@
 
 namespace Zotlabs\Lib;
 
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\Queue;
 
+use App;
+use Zotlabs\Daemon\Master;
 
 class Libsync {
 
@@ -23,21 +23,21 @@ class Libsync {
 
 		logger('build_sync_packet');
 
-		$keychange = (($packet && array_key_exists('keychange',$packet)) ? true : false);
-		if($keychange) {
+		$keychange = (($packet && array_key_exists('keychange', $packet)) ? true : false);
+		if ($keychange) {
 			logger('keychange sync');
 		}
 
-		if(! $uid)
+		if (!$uid)
 			$uid = local_channel();
 
-		if(! $uid)
+		if (!$uid)
 			return;
 
 		$r = q("select * from channel where channel_id = %d limit 1",
 			intval($uid)
 		);
-		if(! $r)
+		if (!$r)
 			return;
 
 		$channel = $r[0];
@@ -49,103 +49,103 @@ class Libsync {
 		unset($channel['channel_salt']);
 
 
-		if(intval($channel['channel_removed']))
+		if (intval($channel['channel_removed']))
 			return;
 
 		$h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash = '%s' and hubloc_deleted = 0",
 			dbesc(($keychange) ? $packet['keychange']['old_hash'] : $channel['channel_hash'])
 		);
 
-		if(! $h)
+		if (!$h)
 			return;
 
-		$synchubs = array();
+		$synchubs = [];
 
-		foreach($h as $x) {
-			if($x['hubloc_host'] == \App::get_hostname())
+		foreach ($h as $x) {
+			if ($x['hubloc_host'] == App::get_hostname())
 				continue;
 
 			$y = q("select site_dead from site where site_url = '%s' limit 1",
 				dbesc($x['hubloc_url'])
 			);
 
-			if((! $y) || ($y[0]['site_dead'] == 0))
+			if ((!$y) || ($y[0]['site_dead'] == 0))
 				$synchubs[] = $x;
 		}
 
-		if(! $synchubs)
+		if (!$synchubs)
 			return;
 
-		$env_recips = [ $channel['channel_hash'] ];
+		$env_recips = [$channel['channel_hash']];
 
-		if($packet)
-			logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG);
+		if ($packet)
+			logger('packet: ' . print_r($packet, true), LOGGER_DATA, LOG_DEBUG);
 
-		$info = (($packet) ? $packet : array());
-		$info['type'] = 'sync';
+		$info             = (($packet) ? $packet : []);
+		$info['type']     = 'sync';
 		$info['encoding'] = 'hz'; // note: not zot, this packet is very platform specific
-		$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ];
+		$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root()];
 
-		if(array_key_exists($uid,\App::$config) && array_key_exists('transient',\App::$config[$uid])) {
-			$settings = \App::$config[$uid]['transient'];
-			if($settings) {
+		if (array_key_exists($uid, App::$config) && array_key_exists('transient', App::$config[$uid])) {
+			$settings = App::$config[$uid]['transient'];
+			if ($settings) {
 				$info['config'] = $settings;
 			}
 		}
 
-		if($channel) {
-			$info['channel'] = array();
-			foreach($channel as $k => $v) {
+		if ($channel) {
+			$info['channel'] = [];
+			foreach ($channel as $k => $v) {
 
 				// filter out any joined tables like xchan
 
-				if(strpos($k,'channel_') !== 0)
+				if (strpos($k, 'channel_') !== 0)
 					continue;
 
 				// don't pass these elements, they should not be synchronised
 
 
 				$disallowed = [
-					'channel_id','channel_account_id','channel_primary','channel_address',
-					'channel_deleted','channel_removed','channel_system'
+					'channel_id', 'channel_account_id', 'channel_primary', 'channel_address',
+					'channel_deleted', 'channel_removed', 'channel_system'
 				];
 
-				if(! $keychange) {
+				if (!$keychange) {
 					$disallowed[] = 'channel_prvkey';
 				}
 
-				if(in_array($k,$disallowed))
+				if (in_array($k, $disallowed))
 					continue;
 
 				$info['channel'][$k] = $v;
 			}
 		}
 
-		if($groups_changed) {
+		if ($groups_changed) {
 			$r = q("select hash as collection, visible, deleted, gname as name from pgrp where uid = %d",
 				intval($uid)
 			);
-			if($r)
+			if ($r)
 				$info['collections'] = $r;
 
 			$r = q("select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid where pgrp_member.uid = %d",
 				intval($uid)
 			);
-			if($r)
+			if ($r)
 				$info['collection_members'] = $r;
 		}
 
-		$interval = ((get_config('system','delivery_interval') !== false)
-			? intval(get_config('system','delivery_interval')) : 2 );
+		$interval = ((get_config('system', 'delivery_interval') !== false)
+			? intval(get_config('system', 'delivery_interval')) : 2);
 
-		logger('Packet: ' . print_r($info,true), LOGGER_DATA, LOG_DEBUG);
+		logger('Packet: ' . print_r($info, true), LOGGER_DATA, LOG_DEBUG);
 
 		$total = count($synchubs);
 
-		foreach($synchubs as $hub) {
+		foreach ($synchubs as $hub) {
 			$hash = random_string();
-			$n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'hz',$hub['hubloc_sitekey'],$hub['site_crypto']);
-			Queue::insert(array(
+			$n    = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'hz', $hub['hubloc_sitekey'], $hub['site_crypto']);
+			Queue::insert([
 				'hash'       => $hash,
 				'account_id' => $channel['channel_account_id'],
 				'channel_id' => $channel['channel_id'],
@@ -153,29 +153,29 @@ class Libsync {
 				'driver'     => $hub['hubloc_network'],
 				'notify'     => $n,
 				'msg'        => EMPTY_STR
-			));
+			]);
 
 
 			$x = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-			if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000))) {
+			if (intval($x[0]['total']) > intval(get_config('system', 'force_queue_threshold', 3000))) {
 				logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
 				Queue::update($hash);
 				continue;
 			}
 
 
-			\Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
+			Master::Summon(['Deliver', $hash]);
 			$total = $total - 1;
 
-			if($interval && $total)
-				@time_sleep_until(microtime(true) + (float) $interval);
+			if ($interval && $total)
+				@time_sleep_until(microtime(true) + (float)$interval);
 		}
 	}
 
 	/**
 	 * @brief
 	 *
-	 * @param array $sender
+	 * @param string $sender
 	 * @param array $arr
 	 * @param array $deliveries
 	 * @return array
@@ -187,16 +187,16 @@ class Libsync {
 
 		$result = [];
 
-		$keychange = ((array_key_exists('keychange',$arr)) ? true : false);
+		$keychange = ((array_key_exists('keychange', $arr)) ? true : false);
 
 		foreach ($deliveries as $d) {
 			$r = q("select * from channel where channel_hash = '%s' limit 1",
 				dbesc($sender)
 			);
 
-			$DR = new \Zotlabs\Lib\DReport(z_root(),$sender,$d,'sync');
+			$DR = new DReport(z_root(), $sender, $d, 'sync');
 
-			if (! $r) {
+			if (!$r) {
 				$DR->update('recipient not found');
 				$result[] = $DR->get();
 				continue;
@@ -206,153 +206,152 @@ class Libsync {
 
 			$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
 
-			$max_friends = service_class_fetch($channel['channel_id'],'total_channels');
-			$max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds');
+			$max_friends = service_class_fetch($channel['channel_id'], 'total_channels');
+			$max_feeds   = account_service_class_fetch($channel['channel_account_id'], 'total_feeds');
 
-			if($channel['channel_hash'] != $sender) {
+			if ($channel['channel_hash'] != $sender) {
 				logger('Possible forgery. Sender ' . $sender . ' is not ' . $channel['channel_hash']);
 				$DR->update('channel mismatch');
 				$result[] = $DR->get();
 				continue;
 			}
 
-			if($keychange) {
-				self::keychange($channel,$arr);
+			if ($keychange) {
+				self::keychange($channel, $arr);
 				continue;
 			}
 
 			// if the clone is active, so are we
 
-			if(substr($channel['channel_active'],0,10) !== substr(datetime_convert(),0,10)) {
+			if (substr($channel['channel_active'], 0, 10) !== substr(datetime_convert(), 0, 10)) {
 				q("UPDATE channel set channel_active = '%s' where channel_id = %d",
 					dbesc(datetime_convert()),
 					intval($channel['channel_id'])
 				);
 			}
 
-			if(array_key_exists('config',$arr) && is_array($arr['config']) && count($arr['config'])) {
-				foreach($arr['config'] as $cat => $k) {
-					foreach($arr['config'][$cat] as $k => $v)
-						set_pconfig($channel['channel_id'],$cat,$k,$v);
+			if (array_key_exists('config', $arr) && is_array($arr['config']) && count($arr['config'])) {
+				foreach ($arr['config'] as $cat => $k) {
+					foreach ($arr['config'][$cat] as $k => $v)
+						set_pconfig($channel['channel_id'], $cat, $k, $v);
 				}
 			}
 
-			if(array_key_exists('obj',$arr) && $arr['obj'])
-				sync_objs($channel,$arr['obj']);
+			if (array_key_exists('obj', $arr) && $arr['obj'])
+				sync_objs($channel, $arr['obj']);
 
-			if(array_key_exists('likes',$arr) && $arr['likes'])
-				import_likes($channel,$arr['likes']);
+			if (array_key_exists('likes', $arr) && $arr['likes'])
+				import_likes($channel, $arr['likes']);
 
-			if(array_key_exists('app',$arr) && $arr['app'])
-				sync_apps($channel,$arr['app']);
+			if (array_key_exists('app', $arr) && $arr['app'])
+				sync_apps($channel, $arr['app']);
 
-			if(array_key_exists('addressbook',$arr) && $arr['addressbook'])
-				sync_addressbook($channel,$arr['addressbook']);
+			if (array_key_exists('addressbook', $arr) && $arr['addressbook'])
+				sync_addressbook($channel, $arr['addressbook']);
 
-			if(array_key_exists('calendar',$arr) && $arr['calendar'])
-				sync_calendar($channel,$arr['calendar']);
+			if (array_key_exists('calendar', $arr) && $arr['calendar'])
+				sync_calendar($channel, $arr['calendar']);
 
-			if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
-				sync_chatrooms($channel,$arr['chatroom']);
+			if (array_key_exists('chatroom', $arr) && $arr['chatroom'])
+				sync_chatrooms($channel, $arr['chatroom']);
 
-			if(array_key_exists('conv',$arr) && $arr['conv'])
-				import_conv($channel,$arr['conv']);
+			if (array_key_exists('conv', $arr) && $arr['conv'])
+				import_conv($channel, $arr['conv']);
 
-			if(array_key_exists('mail',$arr) && $arr['mail'])
-				sync_mail($channel,$arr['mail']);
+			if (array_key_exists('mail', $arr) && $arr['mail'])
+				sync_mail($channel, $arr['mail']);
 
-			if(array_key_exists('event',$arr) && $arr['event'])
-				sync_events($channel,$arr['event']);
+			if (array_key_exists('event', $arr) && $arr['event'])
+				sync_events($channel, $arr['event']);
 
-			if(array_key_exists('event_item',$arr) && $arr['event_item'])
-				sync_items($channel,$arr['event_item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
+			if (array_key_exists('event_item', $arr) && $arr['event_item'])
+				sync_items($channel, $arr['event_item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
 
-			if(array_key_exists('item',$arr) && $arr['item'])
-				sync_items($channel,$arr['item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
+			if (array_key_exists('item', $arr) && $arr['item'])
+				sync_items($channel, $arr['item'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
 
 			// deprecated, maintaining for a few months for upward compatibility
 			// this should sync webpages, but the logic is a bit subtle
 
-			if(array_key_exists('item_id',$arr) && $arr['item_id'])
-				sync_items($channel,$arr['item_id']);
+			if (array_key_exists('item_id', $arr) && $arr['item_id'])
+				sync_items($channel, $arr['item_id']);
 
-			if(array_key_exists('menu',$arr) && $arr['menu'])
-				sync_menus($channel,$arr['menu']);
+			if (array_key_exists('menu', $arr) && $arr['menu'])
+				sync_menus($channel, $arr['menu']);
 
-			if(array_key_exists('file',$arr) && $arr['file'])
-				sync_files($channel,$arr['file']);
+			if (array_key_exists('file', $arr) && $arr['file'])
+				sync_files($channel, $arr['file']);
 
-			if(array_key_exists('wiki',$arr) && $arr['wiki'])
-				sync_items($channel,$arr['wiki'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
+			if (array_key_exists('wiki', $arr) && $arr['wiki'])
+				sync_items($channel, $arr['wiki'], ((array_key_exists('relocate', $arr)) ? $arr['relocate'] : null));
 
-			if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
+			if (array_key_exists('channel', $arr) && is_array($arr['channel']) && count($arr['channel'])) {
 
-				$remote_channel = $arr['channel'];
+				$remote_channel               = $arr['channel'];
 				$remote_channel['channel_id'] = $channel['channel_id'];
 
-				if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
+				if (array_key_exists('channel_pageflags', $arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
 
 					// Several pageflags are site-specific and cannot be sync'd.
 					// Only allow those bits which are shareable from the remote and then
 					// logically OR with the local flags
 
-					$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN|PAGE_AUTOCONNECT|PAGE_APPLICATION|PAGE_PREMIUM|PAGE_ADULT);
+					$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN | PAGE_AUTOCONNECT | PAGE_APPLICATION | PAGE_PREMIUM | PAGE_ADULT);
 					$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags'];
 
 				}
 
 				$disallowed = [
-					'channel_id',        'channel_account_id',  'channel_primary',   'channel_prvkey',
-					'channel_address',   'channel_notifyflags', 'channel_removed',   'channel_deleted',
-					'channel_system',    'channel_r_stream',    'channel_r_profile', 'channel_r_abook',
-					'channel_r_storage', 'channel_r_pages',     'channel_w_stream',  'channel_w_wall',
-					'channel_w_comment', 'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
-					'channel_w_chat',    'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
+					'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey',
+					'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted',
+					'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook',
+					'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall',
+					'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall',
+					'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish',
 					'channel_a_delegate'
 				];
 
-				$clean = array();
-				foreach($arr['channel'] as $k => $v) {
-					if(in_array($k,$disallowed))
+				$clean = [];
+				foreach ($arr['channel'] as $k => $v) {
+					if (in_array($k, $disallowed))
 						continue;
 					$clean[$k] = $v;
 				}
-				if(count($clean)) {
-					foreach($clean as $k => $v) {
-						$r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v)
-							. "' where channel_id = " . intval($channel['channel_id']) );
+				if (count($clean)) {
+					foreach ($clean as $k => $v) {
+						dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v) . "' where channel_id = " . intval($channel['channel_id']));
 					}
 				}
 			}
 
-			if(array_key_exists('abook',$arr) && is_array($arr['abook']) && count($arr['abook'])) {
+			if (array_key_exists('abook', $arr) && is_array($arr['abook']) && count($arr['abook'])) {
 				$total_friends = 0;
-				$total_feeds = 0;
+				$total_feeds   = 0;
 
 				$r = q("select abook_id, abook_feed from abook where abook_channel = %d",
 					intval($channel['channel_id'])
 				);
-				if($r) {
+				if ($r) {
 					// don't count yourself
 					$total_friends = ((count($r) > 0) ? count($r) - 1 : 0);
-					foreach($r as $rr)
-						if(intval($rr['abook_feed']))
-							$total_feeds ++;
+					foreach ($r as $rr)
+						if (intval($rr['abook_feed']))
+							$total_feeds++;
 				}
 
 
-				$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text','abook_not_here');
+				$disallowed = ['abook_id', 'abook_account', 'abook_channel', 'abook_rating', 'abook_rating_text', 'abook_not_here'];
 
 				$fields = db_columns('abook');
 
-				foreach($arr['abook'] as $abook) {
+				foreach ($arr['abook'] as $abook) {
 
 					$abconfig = null;
 
-					if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig']))
+					if (array_key_exists('abconfig', $abook) && is_array($abook['abconfig']) && count($abook['abconfig']))
 						$abconfig = $abook['abconfig'];
 
-					if(! array_key_exists('abook_blocked',$abook)) {
+					if (!array_key_exists('abook_blocked', $abook)) {
 						// convert from redmatrix
 						$abook['abook_blocked']     = (($abook['abook_flags'] & 0x0001) ? 1 : 0);
 						$abook['abook_ignored']     = (($abook['abook_flags'] & 0x0002) ? 1 : 0);
@@ -364,20 +363,20 @@ class Libsync {
 						$abook['abook_feed']        = (($abook['abook_flags'] & 0x0100) ? 1 : 0);
 					}
 
-					$clean = array();
-					if($abook['abook_xchan'] && $abook['entry_deleted']) {
+					$clean = [];
+					if ($abook['abook_xchan'] && $abook['entry_deleted']) {
 						logger('Removing abook entry for ' . $abook['abook_xchan']);
 
 						$r = q("select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
 							dbesc($abook['abook_xchan']),
 							intval($channel['channel_id'])
 						);
-						if($r) {
-							contact_remove($channel['channel_id'],$r[0]['abook_id']);
-							if($total_friends)
-								$total_friends --;
-							if(intval($r[0]['abook_feed']))
-								$total_feeds --;
+						if ($r) {
+							contact_remove($channel['channel_id'], $r[0]['abook_id']);
+							if ($total_friends)
+								$total_friends--;
+							if (intval($r[0]['abook_feed']))
+								$total_feeds--;
 						}
 						continue;
 					}
@@ -386,31 +385,31 @@ class Libsync {
 					// This relies on the undocumented behaviour that red sites send xchan info with the abook
 					// and import_author_xchan will look them up on all federated networks
 
-					if($abook['abook_xchan'] && $abook['xchan_addr']) {
+					if ($abook['abook_xchan'] && $abook['xchan_addr']) {
 						$h = Libzot::get_hublocs($abook['abook_xchan']);
-						if(! $h) {
+						if (!$h) {
 							$xhash = import_author_xchan(encode_item_xchan($abook));
-							if(! $xhash) {
+							if (!$xhash) {
 								logger('Import of ' . $abook['xchan_addr'] . ' failed.');
 								continue;
 							}
 						}
 					}
 
-					foreach($abook as $k => $v) {
-						if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0)) {
+					foreach ($abook as $k => $v) {
+						if (in_array($k, $disallowed) || (strpos($k, 'abook') !== 0)) {
 							continue;
 						}
-						if(! in_array($k,$fields)) {
+						if (!in_array($k, $fields)) {
 							continue;
 						}
 						$clean[$k] = $v;
 					}
 
-					if(! array_key_exists('abook_xchan',$clean))
+					if (!array_key_exists('abook_xchan', $clean))
 						continue;
 
-					if(array_key_exists('abook_instance',$clean) && $clean['abook_instance'] && strpos($clean['abook_instance'],z_root()) === false) {
+					if (array_key_exists('abook_instance', $clean) && $clean['abook_instance'] && strpos($clean['abook_instance'], z_root()) === false) {
 						$clean['abook_not_here'] = 1;
 					}
 
@@ -422,12 +421,12 @@ class Libsync {
 
 					// make sure we have an abook entry for this xchan on this system
 
-					if(! $r) {
-						if($max_friends !== false && $total_friends > $max_friends) {
+					if (!$r) {
+						if ($max_friends !== false && $total_friends > $max_friends) {
 							logger('total_channels service class limit exceeded');
 							continue;
 						}
-						if($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) {
+						if ($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) {
 							logger('total_feeds service class limit exceeded');
 							continue;
 						}
@@ -438,18 +437,16 @@ class Libsync {
 								'abook_channel' => $channel['channel_id']
 							]
 						);
-						$total_friends ++;
-						if(intval($clean['abook_feed']))
-							$total_feeds ++;
+						$total_friends++;
+						if (intval($clean['abook_feed']))
+							$total_feeds++;
 					}
 
-					if(count($clean)) {
-						foreach($clean as $k => $v) {
-							if($k == 'abook_dob')
+					if (count($clean)) {
+						foreach ($clean as $k => $v) {
+							if ($k == 'abook_dob')
 								$v = dbescdate($v);
-
-							$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
-							. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
+							dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) . "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
 						}
 					}
 
@@ -459,10 +456,10 @@ class Libsync {
 
 					// translate_abook_perms_inbound($channel,$abook);
 
-					if($abconfig) {
+					if ($abconfig) {
 						/// @fixme does not handle sync of del_abconfig
-						foreach($abconfig as $abc) {
-							set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
+						foreach ($abconfig as $abc) {
+							set_abconfig($channel['channel_id'], $abc['xchan'], $abc['cat'], $abc['k'], $abc['v']);
 						}
 					}
 				}
@@ -470,21 +467,21 @@ class Libsync {
 
 			// sync collections (privacy groups) oh joy...
 
-			if(array_key_exists('collections',$arr) && is_array($arr['collections']) && count($arr['collections'])) {
+			if (array_key_exists('collections', $arr) && is_array($arr['collections']) && count($arr['collections'])) {
 				$x = q("select * from pgrp where uid = %d",
 					intval($channel['channel_id'])
 				);
-				foreach($arr['collections'] as $cl) {
+				foreach ($arr['collections'] as $cl) {
 					$found = false;
-					if($x) {
-						foreach($x as $y) {
-							if($cl['collection'] == $y['hash']) {
+					if ($x) {
+						foreach ($x as $y) {
+							if ($cl['collection'] == $y['hash']) {
 								$found = true;
 								break;
 							}
 						}
-						if($found) {
-							if(($y['gname'] != $cl['name'])
+						if ($found) {
+							if (($y['gname'] != $cl['name'])
 								|| ($y['visible'] != $cl['visible'])
 								|| ($y['deleted'] != $cl['deleted'])) {
 								q("update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d",
@@ -495,15 +492,15 @@ class Libsync {
 									intval($channel['channel_id'])
 								);
 							}
-							if(intval($cl['deleted']) && (! intval($y['deleted']))) {
+							if (intval($cl['deleted']) && (!intval($y['deleted']))) {
 								q("delete from pgrp_member where gid = %d",
 									intval($y['id'])
 								);
 							}
 						}
 					}
-					if(! $found) {
-						$r = q("INSERT INTO pgrp ( hash, uid, visible, deleted, gname )
+					if (!$found) {
+						q("INSERT INTO pgrp ( hash, uid, visible, deleted, gname )
 							VALUES( '%s', %d, %d, %d, '%s' ) ",
 							dbesc($cl['collection']),
 							intval($channel['channel_id']),
@@ -517,16 +514,16 @@ class Libsync {
 					// They need to be removed by marking deleted and removing the members.
 					// This shouldn't happen except for clones created before this function was written.
 
-					if($x) {
+					if ($x) {
 						$found_local = false;
-						foreach($x as $y) {
-							foreach($arr['collections'] as $cl) {
-								if($cl['collection'] == $y['hash']) {
+						foreach ($x as $y) {
+							foreach ($arr['collections'] as $cl) {
+								if ($cl['collection'] == $y['hash']) {
 									$found_local = true;
 									break;
 								}
 							}
-							if(! $found_local) {
+							if (!$found_local) {
 								q("delete from pgrp_member where gid = %d",
 									intval($y['id'])
 								);
@@ -546,38 +543,38 @@ class Libsync {
 
 				// now sync the members
 
-				if(array_key_exists('collection_members', $arr)
+				if (array_key_exists('collection_members', $arr)
 					&& is_array($arr['collection_members'])
 					&& count($arr['collection_members'])) {
 
 					// first sort into groups keyed by the group hash
-					$members = array();
-					foreach($arr['collection_members'] as $cm) {
-						if(! array_key_exists($cm['collection'],$members))
-							$members[$cm['collection']] = array();
+					$members = [];
+					foreach ($arr['collection_members'] as $cm) {
+						if (!array_key_exists($cm['collection'], $members))
+							$members[$cm['collection']] = [];
 
 						$members[$cm['collection']][] = $cm['member'];
 					}
 
 					// our group list is already synchronised
-					if($x) {
-						foreach($x as $y) {
+					if ($x) {
+						foreach ($x as $y) {
 
 							// for each group, loop on members list we just received
-							if(isset($y['hash']) && isset($members[$y['hash']])) {
-								foreach($members[$y['hash']] as $member) {
+							if (isset($y['hash']) && isset($members[$y['hash']])) {
+								foreach ($members[$y['hash']] as $member) {
 									$found = false;
-									$z = q("select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1",
+									$z     = q("select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1",
 										intval($y['id']),
 										intval($channel['channel_id']),
 										dbesc($member)
 									);
-									if($z)
+									if ($z)
 										$found = true;
 
 									// if somebody is in the group that wasn't before - add them
 
-									if(! $found) {
+									if (!$found) {
 										q("INSERT INTO pgrp_member (uid, gid, xchan)
 											VALUES( %d, %d, '%s' ) ",
 											intval($channel['channel_id']),
@@ -593,10 +590,10 @@ class Libsync {
 								intval($y['id']),
 								intval($channel['channel_id'])
 							);
-							if($m) {
-								foreach($m as $mm) {
+							if ($m) {
+								foreach ($m as $mm) {
 									// if the local existing member isn't in the list we just received - remove them
-									if(! in_array($mm['xchan'],$members[$y['hash']])) {
+									if (!in_array($mm['xchan'], $members[$y['hash']])) {
 										q("delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d",
 											dbesc($mm['xchan']),
 											intval($y['id']),
@@ -610,17 +607,17 @@ class Libsync {
 				}
 			}
 
-			if(array_key_exists('profile',$arr) && is_array($arr['profile']) && count($arr['profile'])) {
+			if (array_key_exists('profile', $arr) && is_array($arr['profile']) && count($arr['profile'])) {
 
-				$disallowed = array('id','aid','uid','guid');
+				$disallowed = ['id', 'aid', 'uid', 'guid'];
 
-				foreach($arr['profile'] as $profile) {
+				foreach ($arr['profile'] as $profile) {
 
 					$x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1",
 						dbesc($profile['profile_guid']),
 						intval($channel['channel_id'])
 					);
-					if(! $x) {
+					if (!$x) {
 						profile_store_lowlevel(
 							[
 								'aid'          => $channel['channel_account_id'],
@@ -633,24 +630,24 @@ class Libsync {
 							dbesc($profile['profile_guid']),
 							intval($channel['channel_id'])
 						);
-						if(! $x)
+						if (!$x)
 							continue;
 					}
-					$clean = array();
-					foreach($profile as $k => $v) {
-						if(in_array($k,$disallowed))
+					$clean = [];
+					foreach ($profile as $k => $v) {
+						if (in_array($k, $disallowed))
 							continue;
 
-						if($profile['is_default'] && in_array($k,['photo','thumb']))
+						if ($profile['is_default'] && in_array($k, ['photo', 'thumb']))
 							continue;
 
-						if($k === 'name')
+						if ($k === 'name')
 							$clean['fullname'] = $v;
-						elseif($k === 'with')
+						elseif ($k === 'with')
 							$clean['partner'] = $v;
-						elseif($k === 'work')
+						elseif ($k === 'work')
 							$clean['employment'] = $v;
-						elseif(array_key_exists($k,$x[0]))
+						elseif (array_key_exists($k, $x[0]))
 							$clean[$k] = $v;
 
 						/**
@@ -658,7 +655,7 @@ class Libsync {
 						 * We also need to import local photos if a custom photo is selected
 						 */
 
-						if((strpos($profile['thumb'],'/photo/profile/l/') !== false) || intval($profile['is_default'])) {
+						if ((strpos($profile['thumb'], '/photo/profile/l/') !== false) || intval($profile['is_default'])) {
 							$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
 							$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
 						}
@@ -668,11 +665,11 @@ class Libsync {
 						}
 					}
 
-					if(count($clean)) {
-						foreach($clean as $k => $v) {
-							$r = dbq("UPDATE profile set " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v)
-							. "' where profile_guid = '" . dbesc($profile['profile_guid'])
-							. "' and uid = " . intval($channel['channel_id']));
+					if (count($clean)) {
+						foreach ($clean as $k => $v) {
+							dbq("UPDATE profile set " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v)
+								. "' where profile_guid = '" . dbesc($profile['profile_guid'])
+								. "' and uid = " . intval($channel['channel_id']));
 						}
 					}
 				}
@@ -687,7 +684,7 @@ class Libsync {
 			 */
 			call_hooks('process_channel_sync_delivery', $addon);
 
-			$DR = new \Zotlabs\Lib\DReport(z_root(),$d,$d,'sync','channel sync delivered');
+			$DR = new DReport(z_root(), $d, $d, 'sync', 'channel sync delivered');
 
 			$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
 
@@ -708,12 +705,12 @@ class Libsync {
 
 	static function sync_locations($sender, $arr, $absolute = false) {
 
-		$ret = array();
+		$ret = [];
 
-		if($arr['locations']) {
+		if ($arr['locations']) {
 
-			if($absolute)
-				Libzot::check_location_move($sender['hash'],$arr['locations']);
+			if ($absolute)
+				Libzot::check_location_move($sender['hash'], $arr['locations']);
 
 			$xisting = q("select * from hubloc where hubloc_hash = '%s'",
 				dbesc($sender['hash'])
@@ -722,8 +719,8 @@ class Libsync {
 			// See if a primary is specified
 
 			$has_primary = false;
-			foreach($arr['locations'] as $location) {
-				if($location['primary']) {
+			foreach ($arr['locations'] as $location) {
+				if ($location['primary']) {
 					$has_primary = true;
 					break;
 				}
@@ -731,32 +728,32 @@ class Libsync {
 
 			// Ensure that they have one primary hub
 
-			if(! $has_primary)
+			if (!$has_primary)
 				$arr['locations'][0]['primary'] = true;
 
-			foreach($arr['locations'] as $location) {
-				if(! Libzot::verify($location['url'],$location['url_sig'],$sender['public_key'])) {
+			foreach ($arr['locations'] as $location) {
+				if (!Libzot::verify($location['url'], $location['url_sig'], $sender['public_key'])) {
 					logger('Unable to verify site signature for ' . $location['url']);
-					$ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL;
+					$ret['message'] .= sprintf(t('Unable to verify site signature for %s'), $location['url']) . EOL;
 					continue;
 				}
 
-				for($x = 0; $x < count($xisting); $x ++) {
-					if(($xisting[$x]['hubloc_url'] === $location['url'])
+				for ($x = 0; $x < count($xisting); $x++) {
+					if (($xisting[$x]['hubloc_url'] === $location['url'])
 						&& ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) {
 						$xisting[$x]['updated'] = true;
 					}
 				}
 
-				if(! $location['sitekey']) {
-					logger('Empty hubloc sitekey. ' . print_r($location,true));
+				if (!$location['sitekey']) {
+					logger('Empty hubloc sitekey. ' . print_r($location, true));
 					continue;
 				}
 
 				// Catch some malformed entries from the past which still exist
 
-				if(strpos($location['address'],'/') !== false)
-					$location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
+				if (strpos($location['address'], '/') !== false)
+					$location['address'] = substr($location['address'], 0, strpos($location['address'], '/'));
 
 				// match as many fields as possible in case anything at all changed.
 
@@ -773,7 +770,7 @@ class Libsync {
 					dbesc($location['callback']),
 					dbesc($location['sitekey'])
 				);
-				if($r) {
+				if ($r) {
 					logger('Hub exists: ' . $location['url'], LOGGER_DEBUG);
 
 					// update connection timestamp if this is the site we're talking to
@@ -781,9 +778,9 @@ class Libsync {
 
 					$current_site = false;
 
-					$t = datetime_convert('UTC','UTC','now - 15 minutes');
+					$t = datetime_convert('UTC', 'UTC', 'now - 15 minutes');
 
-					if(array_key_exists('site',$arr) && $location['url'] == $arr['site']['url']) {
+					if (array_key_exists('site', $arr) && $location['url'] == $arr['site']['url']) {
 						q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_connected < '%s'",
 							dbesc(datetime_convert()),
 							dbesc(datetime_convert()),
@@ -793,11 +790,11 @@ class Libsync {
 						$current_site = true;
 					}
 
-					if($current_site && intval($r[0]['hubloc_error'])) {
+					if ($current_site && intval($r[0]['hubloc_error'])) {
 						q("update hubloc set hubloc_error = 0 where hubloc_id = %d",
 							intval($r[0]['hubloc_id'])
 						);
-						if(intval($r[0]['hubloc_orphancheck'])) {
+						if (intval($r[0]['hubloc_orphancheck'])) {
 							q("update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d",
 								intval($r[0]['hubloc_id'])
 							);
@@ -808,60 +805,60 @@ class Libsync {
 					}
 
 					// Remove pure duplicates
-					if(count($r) > 1) {
-						for($h = 1; $h < count($r); $h ++) {
+					if (count($r) > 1) {
+						for ($h = 1; $h < count($r); $h++) {
 							q("delete from hubloc where hubloc_id = %d",
 								intval($r[$h]['hubloc_id'])
 							);
-							$what .= 'duplicate_hubloc_removed ';
+							$what    .= 'duplicate_hubloc_removed ';
 							$changed = true;
 						}
 					}
 
-					if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) {
-						$m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
+					if (intval($r[0]['hubloc_primary']) && (!$location['primary'])) {
+						q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
 							dbesc($r[0]['hubloc_id_url'])
 						);
 						$r[0]['hubloc_primary'] = intval($location['primary']);
 						hubloc_change_primary($r[0]);
-						$what .= 'primary_hub ';
+						$what    .= 'primary_hub ';
 						$changed = true;
 					}
-					elseif((! intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
-						$m = q("update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
+					elseif ((!intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
+						q("update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
 							dbesc(datetime_convert()),
 							intval($r[0]['hubloc_id'])
 						);
 						// make sure hubloc_change_primary() has current data
 						$r[0]['hubloc_primary'] = intval($location['primary']);
 						hubloc_change_primary($r[0]);
-						$what .= 'primary_hub ';
+						$what    .= 'primary_hub ';
 						$changed = true;
 					}
-					elseif($absolute) {
+					elseif ($absolute) {
 						// Absolute sync - make sure the current primary is correctly reflected in the xchan
 						$pr = hubloc_change_primary($r[0]);
-						if($pr) {
-							$what .= 'xchan_primary ';
+						if ($pr) {
+							$what    .= 'xchan_primary ';
 							$changed = true;
 						}
 					}
-					if(intval($r[0]['hubloc_deleted']) && (! intval($location['deleted']))) {
-						$n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
+					if (intval($r[0]['hubloc_deleted']) && (!intval($location['deleted']))) {
+						q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
 							dbesc($r[0]['hubloc_id_url'])
 						);
-						$what .= 'undelete_hub ';
+						$what    .= 'undelete_hub ';
 						$changed = true;
 					}
-					elseif((! intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) {
+					elseif ((!intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) {
 						logger('deleting hubloc: ' . $r[0]['hubloc_addr']);
-						$n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
+						q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
 							dbesc($r[0]['hubloc_id_url'])
 						);
-						$what .= 'delete_hub ';
+						$what    .= 'delete_hub ';
 						$changed = true;
 					}
 					continue;
@@ -870,8 +867,8 @@ class Libsync {
 				// Existing hubs are dealt with. Now let's process any new ones.
 				// New hub claiming to be primary. Make it so by removing any existing primaries.
 
-				if(intval($location['primary'])) {
-					$r = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
+				if (intval($location['primary'])) {
+					q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
 						dbesc(datetime_convert()),
 						dbesc($sender['hash'])
 					);
@@ -879,7 +876,7 @@ class Libsync {
 
 				logger('New hub: ' . $location['url']);
 
-				$r = hubloc_store_lowlevel(
+				hubloc_store_lowlevel(
 					[
 						'hubloc_guid'      => $sender['id'],
 						'hubloc_guid_sig'  => $sender['id_sig'],
@@ -890,7 +887,7 @@ class Libsync {
 						'hubloc_primary'   => intval($location['primary']),
 						'hubloc_url'       => $location['url'],
 						'hubloc_url_sig'   => $location['url_sig'],
-						'hubloc_site_id'   => Libzot::make_xchan_hash($location['url'],$location['sitekey']),
+						'hubloc_site_id'   => Libzot::make_xchan_hash($location['url'], $location['sitekey']),
 						'hubloc_host'      => $location['host'],
 						'hubloc_callback'  => $location['callback'],
 						'hubloc_sitekey'   => $location['sitekey'],
@@ -899,15 +896,15 @@ class Libsync {
 					]
 				);
 
-				$what .= 'newhub ';
+				$what    .= 'newhub ';
 				$changed = true;
 
-				if($location['primary']) {
+				if ($location['primary']) {
 					$r = q("select * from hubloc where hubloc_addr = '%s' and hubloc_sitekey = '%s'",
 						dbesc($location['address']),
 						dbesc($location['sitekey'])
 					);
-					if($r) {
+					if ($r) {
 						$r = Libzot::zot_record_preferred($r);
 						hubloc_change_primary($r);
 					}
@@ -916,15 +913,15 @@ class Libsync {
 
 			// get rid of any hubs we have for this channel which weren't reported.
 
-			if($absolute && $xisting) {
-				foreach($xisting as $x) {
-					if(! array_key_exists('updated',$x)) {
+			if ($absolute && $xisting) {
+				foreach ($xisting as $x) {
+					if (!array_key_exists('updated', $x)) {
 						logger('Deleting unreferenced hub location ' . $x['hubloc_addr']);
-						$r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
+						q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
 							dbesc($x['hubloc_id_url'])
 						);
-						$what .= 'removed_hub ';
+						$what    .= 'removed_hub ';
 						$changed = true;
 					}
 				}
@@ -935,22 +932,22 @@ class Libsync {
 		}
 
 		$ret['change_message'] = $what;
-		$ret['changed'] = $changed;
+		$ret['changed']        = $changed;
 
 		return $ret;
 	}
 
 
-	static function keychange($channel,$arr) {
+	static function keychange($channel, $arr) {
 
 		// verify the keychange operation
-		if(! Libzot::verify($arr['channel']['channel_pubkey'],$arr['keychange']['new_sig'],$channel['channel_prvkey'])) {
+		if (!Libzot::verify($arr['channel']['channel_pubkey'], $arr['keychange']['new_sig'], $channel['channel_prvkey'])) {
 			logger('sync keychange: verification failed');
 			return;
 		}
 
-		$sig = Libzot::sign($channel['channel_guid'],$arr['channel']['channel_prvkey']);
-		$hash = Libzot::make_xchan_hash($channel['channel_guid'],$arr['channel']['channel_pubkey']);
+		$sig  = Libzot::sign($channel['channel_guid'], $arr['channel']['channel_prvkey']);
+		$hash = Libzot::make_xchan_hash($channel['channel_guid'], $arr['channel']['channel_pubkey']);
 
 
 		$r = q("update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s',
@@ -961,16 +958,16 @@ class Libsync {
 			dbesc($hash),
 			intval($channel['channel_id'])
 		);
-		if(! $r) {
+		if (!$r) {
 			logger('keychange sync: channel update failed');
 			return;
- 		}
+		}
 
 		$r = q("select * from channel where channel_id = %d",
 			intval($channel['channel_id'])
 		);
 
-		if(! $r) {
+		if (!$r) {
 			logger('keychange sync: channel retrieve failed');
 			return;
 		}
@@ -982,11 +979,11 @@ class Libsync {
 			dbesc(z_root())
 		);
 
-		if($h) {
-			foreach($h as $hv) {
+		if ($h) {
+			foreach ($h as $hv) {
 				$hv['hubloc_guid_sig'] = $sig;
 				$hv['hubloc_hash']     = $hash;
-				$hv['hubloc_url_sig']  = Libzot::sign(z_root(),$channel['channel_prvkey']);
+				$hv['hubloc_url_sig']  = Libzot::sign(z_root(), $channel['channel_prvkey']);
 				hubloc_store_lowlevel($hv);
 			}
 		}
@@ -999,12 +996,12 @@ class Libsync {
 			dbesc($hash)
 		);
 
-		if(($x) && (! $check)) {
+		if (($x) && (!$check)) {
 			$oldxchan = $x[0];
-			foreach($x as $xv) {
-				$xv['xchan_guid_sig']  = $sig;
-				$xv['xchan_hash']      = $hash;
-				$xv['xchan_pubkey']    = $channel['channel_pubkey'];
+			foreach ($x as $xv) {
+				$xv['xchan_guid_sig'] = $sig;
+				$xv['xchan_hash']     = $hash;
+				$xv['xchan_pubkey']   = $channel['channel_pubkey'];
 				xchan_store_lowlevel($xv);
 				$newxchan = $xv;
 			}
@@ -1014,14 +1011,14 @@ class Libsync {
 			dbesc($arr['keychange']['old_hash'])
 		);
 
-		if($a) {
+		if ($a) {
 			q("update abook set abook_xchan = '%s' where abook_id = %d",
 				dbesc($hash),
 				intval($a[0]['abook_id'])
 			);
 		}
 
-		xchan_change_key($oldxchan,$newxchan,$arr['keychange']);
+		xchan_change_key($oldxchan, $newxchan, $arr['keychange']);
 
 	}