Merge remote-tracking branch 'upstream/master'

14 files changed, 494 insertions, 39 deletions

diff --git a/include/AccessList.php b/include/AccessList.php
index 46e66d33d..43f1de111 100644
--- a/include/AccessList.php
+++ b/include/AccessList.php
@@ -34,6 +34,11 @@ class AccessList {
 		return $this->explicit;
 	}
 
+	/**
+	 * Set AccessList from strings such as those in already
+	 * existing stored data items
+	 */
+
 	function set($arr,$explicit = true) {
 		$this->allow_cid = $arr['allow_cid'];
 		$this->allow_gid = $arr['allow_gid'];
@@ -43,6 +48,12 @@ class AccessList {
 		$this->explicit = $explicit;
 	}
 
+	/**
+	 * return an array consisting of the current
+	 * access list components where the elements
+	 * are directly storable. 
+	 */
+
 	function get() {
 		return array(
 			'allow_cid' => $this->allow_cid,
@@ -52,6 +63,12 @@ class AccessList {
 		);
 	}
 
+	/**
+	 * Set AccessList from arrays, such as those provided by
+	 * acl_selector(). For convenience, a string (or non-array) input is 
+	 * assumed to be a comma-separated list and auto-converted into an array. 
+	 */ 
+
 	function set_from_array($arr,$explicit = true) {
 		$this->allow_cid = perms2str((is_array($arr['contact_allow'])) 
 			? $arr['contact_allow'] : explode(',',$arr['contact_allow']));
diff --git a/include/apps.php b/include/apps.php
index 504641102..661fc2163 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -264,18 +264,37 @@ function app_install($uid,$app) {
 	else
 		$x = app_store($app);
 
-	if($x['success'])
-		return $x['app_id'];
+	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)
+			build_sync_packet($uid,array('app' => $r[0]));
 
+		return $x['app_id'];
+	}
 	return false;
 }
 
 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)
+		);
+		$x[0]['app_deleted'] = 1;
+
+
 		$r = q("delete from app where app_id = '%s' and app_channel = %d",
 			dbesc($app['guid']),
 			intval($uid)
 		);
+
+		build_sync_packet($uid,array('app' => $x));
 	}
 }
 
@@ -325,7 +344,7 @@ function app_store($arr) {
 		return $ret;
 
 	if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
-		$x = import_profile_photo($arr['photo'],get_observer_hash(),true);
+		$x = import_xchan_photo($arr['photo'],get_observer_hash(),true);
 		$arr['photo'] = $x[1];
 	}
 
@@ -342,7 +361,9 @@ function app_store($arr) {
 	$darray['app_page']     = ((x($arr,'page'))     ? escape_tags($arr['page']) : '');
 	$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
 
-	$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 ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+	$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 ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
 		dbesc($darray['app_id']),
 		dbesc($darray['app_sig']),
 		dbesc($darray['app_author']),
@@ -355,7 +376,9 @@ function app_store($arr) {
 		dbesc($darray['app_addr']),
 		dbesc($darray['app_price']),
 		dbesc($darray['app_page']),
-		dbesc($darray['app_requires'])
+		dbesc($darray['app_requires']),
+		dbesc($created),
+		dbesc($created)
 	);
 	if($r) {
 		$ret['success'] = true;
@@ -378,7 +401,7 @@ function app_update($arr) {
 		return $ret;
 
 	if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
-		$x = import_profile_photo($arr['photo'],get_observer_hash(),true);
+		$x = import_xchan_photo($arr['photo'],get_observer_hash(),true);
 		$arr['photo'] = $x[1];
 	}
 
@@ -393,7 +416,9 @@ function app_update($arr) {
 	$darray['app_page']     = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
 	$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
 
-	$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' where app_id = '%s' and app_channel = %d",
+	$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' where app_id = '%s' and app_channel = %d",
 		dbesc($darray['app_sig']),
 		dbesc($darray['app_author']),
 		dbesc($darray['app_name']),
@@ -405,6 +430,7 @@ function app_update($arr) {
 		dbesc($darray['app_price']),
 		dbesc($darray['app_page']),
 		dbesc($darray['app_requires']),
+		dbesc($edited),
 		dbesc($darray['app_id']),
 		intval($darray['app_channel'])
 	);
diff --git a/include/hubloc.php b/include/hubloc.php
index 515223f53..396f4ddfa 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -230,7 +230,7 @@ function xchan_store($arr) {
 	if(! $r)
 		return $r;
 
-	$photos = import_profile_photo($arr['photo'],$arr['hash']);
+	$photos = import_xchan_photo($arr['photo'],$arr['hash']);
 	$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
 		dbesc(datetime_convert()),
 		dbesc($photos[0]),
diff --git a/include/identity.php b/include/identity.php
index 8d6a65cad..115baddc1 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -555,17 +555,27 @@ function identity_basic_export($channel_id, $items = false) {
 	if($r)
 		$ret['term'] = $r;
 
-	$r = q("select * from obj where obj_channel = %d",
+
+	// add psuedo-column obj_baseurl to aid in relocations
+
+	$r = q("select obj.*, '%s' as obj_baseurl from obj where obj_channel = %d",
+		dbesc(z_root()),
 		intval($channel_id)
 	);
 
 	if($r)
 		$ret['obj'] = $r;
 
+
+	$r = q("select * from app where app_channel = %d",
+		intval($channel_id)
+	);
+	if($r)
+		$ret['app'] = $r;
+
 	if(! $items)
 		return $ret;
 
-
 	$r = q("select * from likes where channel_id = %d",
 		intval($channel_id)
 	);
diff --git a/include/import.php b/include/import.php
new file mode 100644
index 000000000..6ce572ea2
--- /dev/null
+++ b/include/import.php
@@ -0,0 +1,380 @@
+<?php
+
+
+function import_channel($channel) {
+
+	if(! array_key_exists('channel_system',$channel)) {
+		$channel['channel_system']  = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0);
+		$channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0);
+	}
+
+	$r = q("select * from channel where (channel_guid = '%s' or channel_hash = '%s' or channel_address = '%s' ) limit 1",
+		dbesc($channel['channel_guid']),
+		dbesc($channel['channel_hash']),
+		dbesc($channel['channel_address'])
+	);
+
+	// We should probably also verify the hash 
+	
+	if($r) {
+		if($r[0]['channel_guid'] === $channel['channel_guid'] || $r[0]['channel_hash'] === $channel['channel_hash']) {
+			logger('mod_import: duplicate channel. ', print_r($channel,true));
+			notice( t('Cannot create a duplicate channel identifier on this system. Import failed.') . EOL);
+			return false;
+		}
+		else {
+			// try at most ten times to generate a unique address.
+			$x = 0;
+			$found_unique = false;
+			do {
+				$tmp = $channel['channel_address'] . mt_rand(1000,9999);
+				$r = q("select * from channel where channel_address = '%s' limit 1",
+					dbesc($tmp)
+				);
+				if(! $r) {
+					$channel['channel_address'] = $tmp;
+					$found_unique = true;
+					break;
+				}
+				$x ++;
+			} while ($x < 10);
+			if(! $found_unique) {
+				logger('mod_import: duplicate channel. randomisation failed.', print_r($channel,true));
+				notice( t('Unable to create a unique channel address. Import failed.') . EOL);
+				return false;
+			}
+		}		
+	}
+
+	unset($channel['channel_id']);
+	$channel['channel_account_id'] = get_account_id();
+	$channel['channel_primary'] = (($seize) ? 1 : 0);
+	
+	dbesc_array($channel);
+
+	$r = dbq("INSERT INTO channel (`" 
+		. implode("`, `", array_keys($channel)) 
+		. "`) VALUES ('" 
+		. implode("', '", array_values($channel)) 
+		. "')" 
+	);
+
+	if(! $r) {
+		logger('mod_import: channel clone failed. ', print_r($channel,true));
+		notice( t('Channel clone failed. Import failed.') . EOL);
+		return false;
+	}
+
+	$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
+		intval(get_account_id()),
+		$channel['channel_guid']   // Already dbesc'd
+	);
+	if(! $r) {
+		logger('mod_import: channel not found. ', print_r($channel,true));
+		notice( t('Cloned channel not found. Import failed.') . EOL);
+		return false;
+	}
+	// reset
+	$channel = $r[0];
+
+	set_default_login_identity(get_account_id(),$channel['channel_id'],false);
+	logger('import step 1');
+	$_SESSION['import_step'] = 1;
+	ref_session_write(session_id(), serialize($_SESSION));
+	return $channel;	
+
+}
+
+function import_config($channel,$configs) {
+
+	if($channel && $configs) {
+		foreach($configs as $config) {
+			unset($config['id']);
+			$config['uid'] = $channel['channel_id'];
+			dbesc_array($config);
+			$r = dbq("INSERT INTO pconfig (`" 
+				. implode("`, `", array_keys($config)) 
+				. "`) VALUES ('" 
+				. implode("', '", array_values($config)) 
+				. "')" );
+		}
+		load_pconfig($channel['channel_id']);
+	}	
+}
+
+
+function import_profiles($channel,$profiles) {
+
+	if($channel && $profiles) {
+		foreach($profiles as $profile) {
+			unset($profile['id']);
+			$profile['aid'] = get_account_id();
+			$profile['uid'] = $channel['channel_id'];
+
+			// we are going to reset all profile photos to the original
+			// somebody will have to fix this later and put all the applicable photos into the export
+	
+			$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
+			$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
+
+			dbesc_array($profile);
+			$r = dbq("INSERT INTO profile (`" 
+				. implode("`, `", array_keys($profile)) 
+				. "`) VALUES ('" 
+				. implode("', '", array_values($profile)) 
+				. "')" 
+			);
+		}
+	}
+}
+
+
+function import_hublocs($channel,$hublocs,$seize) {
+
+	if($channel && $hublocs) {
+		foreach($hublocs as $hubloc) {
+
+			$hash = make_xchan_hash($hubloc['hubloc_guid'],$hubloc['hubloc_guid_sig']);
+			if($hubloc['hubloc_network'] === 'zot' && $hash !== $hubloc['hubloc_hash']) {
+				logger('forged hubloc: ' . print_r($hubloc,true));
+				continue;
+			}
+
+			if(! array_key_exists('hubloc_primary',$hubloc)) {
+				$hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0);
+				$hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags'] & 0x0004) ? 1 : 0);
+				$hubloc['hubloc_error'] = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0);
+				$hubloc['hubloc_deleted'] = (($hubloc['hubloc_flags'] & 0x1000) ? 1 : 0);
+			}
+
+			$arr = array(
+				'guid' => $hubloc['hubloc_guid'],
+				'guid_sig' => $hubloc['hubloc_guid_sig'],
+				'url' => $hubloc['hubloc_url'],
+				'url_sig' => $hubloc['hubloc_url_sig']
+			);
+			if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize))
+				$hubloc['hubloc_primary'] = 0;
+
+			if(! zot_gethub($arr)) {				
+				unset($hubloc['hubloc_id']);
+				dbesc_array($hubloc);
+		
+				$r = dbq("INSERT INTO hubloc (`" 
+					. implode("`, `", array_keys($hubloc)) 
+					. "`) VALUES ('" 
+					. implode("', '", array_values($hubloc)) 
+					. "')" 
+				);
+			}
+		}
+	}
+}
+
+
+
+function import_objs($channel,$objs) {
+
+	if($channel && $objs) {
+		foreach($objs as $obj) {
+
+			// if it's the old term format - too hard to support
+			if(! $obj['obj_created'])
+				continue;
+
+			$baseurl = $obj['obj_baseurl'];
+			unset($obj['obj_id']);
+			unset($obj['obj_baseurl']);
+
+			$obj['obj_channel'] = $channel['channel_id'];
+
+			if($baseurl && (strpos($obj['obj_url'],$baseurl . '/thing/') !== false)) {
+				$obj['obj_url'] = str_replace($baseurl,z_root(),$obj['obj_url']);
+			}
+
+			if($obj['obj_imgurl']) {
+	            $x = import_xchan_photo($obj['obj_imgurl'],$channel['channel_hash'],true);
+				$obj['obj_imgurl'] = $x[0];
+			}
+
+			dbesc_array($obj);
+
+			$r = dbq("INSERT INTO obj (`" 
+				. implode("`, `", array_keys($obj)) 
+				. "`) VALUES ('" 
+				. implode("', '", array_values($obj)) 
+				. "')" 
+			);
+		}
+	}
+}
+
+function sync_objs($channel,$objs) {
+
+	if($channel && $objs) {
+		foreach($objs as $obj) {
+
+			if(array_key_exists('obj_deleted',$obj) && $obj['obj_deleted'] && $obj['obj_obj']) {
+				q("delete from obj where obj_obj = '%s' and obj_channel = %d limit 1",
+					dbesc($obj['obj_obj']),
+					intval($channel['channel_id'])
+				);
+				continue;
+			}
+
+			// if it's the old term format - too hard to support
+			if(! $obj['obj_created'])
+				continue;
+
+			$baseurl = $obj['obj_baseurl'];
+			unset($obj['obj_id']);
+			unset($obj['obj_baseurl']);
+
+			$obj['obj_channel'] = $channel['channel_id'];
+
+			if($baseurl && (strpos($obj['obj_url'],$baseurl . '/thing/') !== false)) {
+				$obj['obj_url'] = str_replace($baseurl,z_root(),$obj['obj_url']);
+			}
+
+			$exists = false;
+
+			$x = q("select * from obj where obj_obj = '%s' and obj_channel = %d limit 1",
+				dbesc($obj['obj_obj']),
+				intval($channel['channel_id'])
+			);
+			if($x) {
+				if($x[0]['obj_edited'] >= $obj['obj_edited'])
+					continue;
+
+				$exists = true;
+			}
+
+			if($obj['obj_imgurl']) {
+	            $x = import_xchan_photo($obj['obj_imgurl'],$channel['channel_hash'],true);
+				$obj['obj_imgurl'] = $x[0];
+			}
+
+			$hash = $obj['obj_obj'];
+			
+			if($exists) {
+				unset($obj['obj_obj']);
+				foreach($obj as $k => $v) {
+					$r = q("UPDATE obj SET `%s` = '%s' WHERE obj_obj = '%s' AND obj_channel = %d",
+						dbesc($k),
+						dbesc($v),
+						dbesc($hash),
+						intval($channel['channel_id'])
+					);
+				}
+			}
+			else {						
+
+				dbesc_array($obj);
+
+				$r = dbq("INSERT INTO obj (`" 
+					. implode("`, `", array_keys($obj)) 
+					. "`) VALUES ('" 
+					. implode("', '", array_values($obj)) 
+					. "')" 
+				);
+			}
+		}
+	}
+}
+
+
+
+
+
+function import_apps($channel,$apps) {
+
+	if($channel && $apps) {
+		foreach($apps as $app) {
+
+			unset($app['id']);
+			unset($app['app_channel']);
+
+			$app['app_channel'] = $channel['channel_id'];
+
+			if($app['app_photo']) {
+	            $x = import_xchan_photo($app['app_photo'],$channel['channel_hash'],true);
+				$app['app_photo'] = $x[0];
+			}
+
+			dbesc_array($app);
+			$r = dbq("INSERT INTO app (`" 
+				. implode("`, `", array_keys($app)) 
+				. "`) VALUES ('" 
+				. implode("', '", array_values($app)) 
+				. "')" 
+			);
+		}
+	}
+}
+
+
+
+function sync_apps($channel,$apps) {
+
+	if($channel && $apps) {
+		foreach($apps as $app) {
+
+           if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
+                q("delete from app where app_id = '%s' and app_channel = %d limit 1",
+                    dbesc($app['app_id']),
+                    intval($channel['channel_id'])
+                );
+                continue;
+            }
+
+			unset($app['id']);
+			unset($app['app_channel']);
+
+			if(! $app['app_created'] || $app['app_created'] === NULL_DATE)
+				$app['app_created'] = datetime_convert();
+			if(! $app['app_edited'] || $app['app_edited'] === NULL_DATE)
+				$app['app_edited'] = datetime_convert();
+
+			$app['app_channel'] = $channel['channel_id'];
+
+			if($app['app_photo']) {
+				$x = import_xchan_photo($app['app_photo'],$channel['channel_hash'],true);
+				$app['app_photo'] = $x[0];
+			}
+
+			$exists = false;
+
+			$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+				dbesc($app['app_id']),
+				intval($channel['channel_id'])
+			);
+			if($x) {
+				if($x[0]['app_edited'] >= $obj['app_edited'])
+					continue;
+				$exists = true;
+			}
+			$hash = $app['app_id'];
+
+			if($exists) {
+				unset($app['app_id']);
+				foreach($app as $k => $v) {
+					$r = q("UPDATE app SET `%s` = '%s' WHERE app_id = '%s' AND app_channel = %d",
+						dbesc($k),
+						dbesc($v),
+						dbesc($hash),
+						intval($channel['channel_id'])
+					);
+				}
+			}
+			else {
+				dbesc_array($app);
+				$r = dbq("INSERT INTO app (`" 
+					. implode("`, `", array_keys($app)) 
+					. "`) VALUES ('" 
+					. implode("', '", array_values($app)) 
+					. "')" 
+				);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/include/importdoc.php b/include/importdoc.php
index 9cce35c50..10f868697 100755
--- a/include/importdoc.php
+++ b/include/importdoc.php
@@ -1,17 +1,30 @@
 <?php
 
+
+
 require_once('include/cli_startup.php');
 
-cli_startup();
 
-require_once('mod/help.php');
+function importdoc_run($argv, $argc){
+
+	cli_startup();
+
+	require_once('mod/help.php');
+
+
+	update_docs_dir('doc/*');
+
+}
+if (array_search(__file__,get_included_files())===0){
+  importdoc_run($argv,$argc);
+  killme();
+}
 
 function update_docs_dir($s) {
 	$f = basename($s);
 	$d = dirname($s);
 	if($s === 'doc/html')
 		return;
-
 	$files = glob("$d/$f");
 	if($files) {
 		foreach($files as $fi) {
@@ -25,7 +38,4 @@ function update_docs_dir($s) {
 	}
 }
 
-update_docs_dir('doc/*');
-
-
 
diff --git a/include/items.php b/include/items.php
index 2701c3fa2..9807831e3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1127,7 +1127,7 @@ function import_author_rss($x) {
 
 	if($r && $x['photo']) {
 
-		$photos = import_profile_photo($x['photo']['src'],$x['url']);
+		$photos = import_xchan_photo($x['photo']['src'],$x['url']);
 
 		if($photos) {
 			/** @bug $arr is undefined in this SQL query */
@@ -1172,7 +1172,7 @@ function import_author_unknown($x) {
 	);
 	if($r && $x['photo']) {
 
-		$photos = import_profile_photo($x['photo']['src'],$x['url']);
+		$photos = import_xchan_photo($x['photo']['src'],$x['url']);
 
 		if($photos) {
 			/** @bug $arr is undefined in this SQL query */
diff --git a/include/message.php b/include/message.php
index 5720d2da4..396e3162c 100644
--- a/include/message.php
+++ b/include/message.php
@@ -75,13 +75,16 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 
 		$handles = $recip_handle . ';' . $sender_handle;
 
+		if($subject)
+			$nsubject = str_rot47(base64url_encode($subject));
+
 		$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
 			intval(local_channel()),
 			dbesc($conv_guid),
 			dbesc($sender_handle),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
-			dbesc($subject),
+			dbesc($nsubject),
 			dbesc($handles)
 		);
 
@@ -212,6 +215,12 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 				intval($channel['channel_id']),
 				dbesc('<' . $channel['channel_hash'] . '>')
 			); 
+			$r = q("UPDATE attach SET allow_cid = '%s' WHERE hash = '%s' AND is_photo = 1 and uid = %d and allow_cid = '%s'",
+				dbesc('<' . $recipient . '>'),
+				dbesc($image_uri),
+				intval($channel['channel_id']),
+				dbesc('<' . $channel['channel_hash'] . '>')
+			); 
 		}
 	}
 	
diff --git a/include/network.php b/include/network.php
index ef92e0132..75729d6e4 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1035,7 +1035,7 @@ function discover_by_url($url,$arr = null) {
 		dbesc(datetime_convert())
 	);
 
-	$photos = import_profile_photo($photo,$guid);
+	$photos = import_xchan_photo($photo,$guid);
 	$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
 		dbesc(datetime_convert()),
 		dbesc($photos[0]),
@@ -1192,7 +1192,7 @@ function discover_by_webbie($webbie) {
 					dbescdate(datetime_convert())
 				);
 			}
-			$photos = import_profile_photo($vcard['photo'],$addr);
+			$photos = import_xchan_photo($vcard['photo'],$addr);
 			$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
 				dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])),
 				dbesc($photos[0]),
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 553e77ed1..2a7d1ae01 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -557,14 +557,14 @@ function guess_image_type($filename, $headers = '') {
 
 }
 
-function import_profile_photo($photo,$xchan,$thing = false) {
+function import_xchan_photo($photo,$xchan,$thing = false) {
 
 	$a = get_app();
 
 	$flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN);
 	$album = (($thing) ? 'Things' : 'Contact Photos');
 
-	logger('import_profile_photo: updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG);
+	logger('import_xchan_photo: updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG);
 
 	if($thing)
 		$hash = photo_new_resource();
@@ -650,7 +650,7 @@ function import_profile_photo($photo,$xchan,$thing = false) {
 		$micro = $a->get_baseurl() . '/photo/' . $hash . '-6';
 	}
 	else {
-		logger('import_profile_photo: invalid image from ' . $photo);	
+		logger('import_xchan_photo: invalid image from ' . $photo);	
 		$photo_failure = true;
 	}
 	if($photo_failure) {
diff --git a/include/poller.php b/include/poller.php
index 030394486..a1b25bf41 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -235,7 +235,7 @@ function poller_run($argv, $argc){
 	if($r) {
 		require_once('include/photo/photo_driver.php');
 		foreach($r as $rr) {
-			$photos = import_profile_photo($rr['xchan_photo_l'],$rr['xchan_hash']);
+			$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]),
diff --git a/include/taxonomy.php b/include/taxonomy.php
index b57cfc5c4..a82cf94f7 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -341,7 +341,7 @@ function get_things($profile_hash,$uid) {
 
 	$sql_extra = (($profile_hash) ? " and obj_page = '" . $profile_hash . "' " : '');
 
-	$r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and uid = %d and obj_type = %d $sql_extra order by obj_verb, term",
+	$r = q("select * from obj where obj_channel = %d and obj_type = %d $sql_extra order by obj_verb, obj_term",
 		intval($uid),
 		intval(TERM_OBJ_THING)
 	);
@@ -357,8 +357,8 @@ function get_things($profile_hash,$uid) {
 
 		foreach($r as $rr) {
 			$rr['profile_name'] = '';
-			if(! in_array($rr['term_hash'],$profile_hashes))
-				$profile_hashes[] = $rr['term_hash'];
+			if(! in_array($rr['obj_obj'],$profile_hashes))
+				$profile_hashes[] = $rr['obj_obj'];
 		}
 		stringify_array_elms($profile_hashes);
 		if(! $profile_hash) {
@@ -390,7 +390,7 @@ function get_things($profile_hash,$uid) {
 			$l = q("select xchan_name, xchan_url from likes left join xchan on likee = xchan_hash where
 				target_type = '%s' and target_id = '%s' and channel_id = %d",
 				dbesc(ACTIVITY_OBJ_THING),
-				dbesc($rr['term_hash']),
+				dbesc($rr['obj_obj']),
 				intval($uid)
 			);
 
@@ -400,7 +400,7 @@ function get_things($profile_hash,$uid) {
 			if(! $things[$rr['obj_verb']])
 				$things[$rr['obj_verb']] = array();
 
-			$things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl'], 'profile' => $rr['profile_name'],'term_hash' => $rr['term_hash'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun'));
+			$things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun'));
 		} 
 		$sorted_things = array();
 		if($things) {
diff --git a/include/text.php b/include/text.php
index e4735ac48..4d9670806 100644
--- a/include/text.php
+++ b/include/text.php
@@ -72,10 +72,6 @@ function notags($string) {
 //	return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string));
 }
 
-// use this on "body" or "content" input where angle chars shouldn't be removed,
-// and allow them to be safely displayed.
-
-
 
 /**
  * use this on "body" or "content" input where angle chars shouldn't be removed,
diff --git a/include/zot.php b/include/zot.php
index 4cc22ac12..fecaa7ad2 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -801,7 +801,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 				);
 			}
 		} else {
-			$photos = import_profile_photo($arr['photo'], $xchan_hash);
+			$photos = import_xchan_photo($arr['photo'], $xchan_hash);
 		}
 		if ($photos) {
 			if ($photos[4]) {
@@ -1637,10 +1637,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
 			}
 		}
 
-
-		$ab = q("select abook.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d 
-			and abook_self = 0",
-			intval($channel['channel_id'])
+		$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
+			intval($channel['channel_id']),
+			dbesc($arr['owner_xchan'])
 		);
 		$abook = (($ab) ? $ab[0] : null); 
 
@@ -2842,6 +2841,8 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
  */
 function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
+	require_once('include/import.php');
+
 	/** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */
 
 	$result = array();
@@ -2874,6 +2875,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 			}
 		}
 
+		if(array_key_exists('obj',$arr) && $arr['obj'])
+			sync_objs($channel,$arr['obj']);
+
+		if(array_key_exists('app',$arr) && $arr['app'])
+			sync_apps($channel,$arr['app']);
+
 		if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
 			if(array_key_exists('channel_page_flags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
 				$arr['channel']['channel_removed'] = (($arr['channel']['channel_pageflags'] & 0x8000) ? 1 : 0);