Merge branch '5.0RC'5.0

1 files changed, 19 insertions, 12 deletions

diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index d93270bc5..cff320e11 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -83,7 +83,7 @@ class Libsync {
 
 		$info = (($packet) ? $packet : array());
 		$info['type'] = 'sync';
-		$info['encoding'] = 'red'; // note: not zot, this packet is very platform specific
+		$info['encoding'] = 'hz'; // note: not zot, this packet is very platform specific
 		$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ];
 
 		if(array_key_exists($uid,\App::$config) && array_key_exists('transient',\App::$config[$uid])) {
@@ -144,12 +144,13 @@ class Libsync {
 
 		foreach($synchubs as $hub) {
 			$hash = random_string();
-			$n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'red',$hub['hubloc_sitekey'],$hub['site_crypto']);
+			$n = Libzot::build_packet($channel,'sync',$env_recips,json_encode($info),'hz',$hub['hubloc_sitekey'],$hub['site_crypto']);
 			Queue::insert(array(
 				'hash'       => $hash,
 				'account_id' => $channel['channel_account_id'],
 				'channel_id' => $channel['channel_id'],
 				'posturl'    => $hub['hubloc_callback'],
+				'driver'     => $hub['hubloc_network'],
 				'notify'     => $n,
 				'msg'        => EMPTY_STR
 			));
@@ -244,7 +245,13 @@ class Libsync {
 
 			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('calendar',$arr) && $arr['calendar'])
+				sync_calendar($channel,$arr['calendar']);
+
 			if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
 				sync_chatrooms($channel,$arr['chatroom']);
 
@@ -812,9 +819,9 @@ class Libsync {
 					}
 
 					if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) {
-						$m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d",
+						$m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
-							intval($r[0]['hubloc_id'])
+							dbesc($r[0]['hubloc_id_url'])
 						);
 						$r[0]['hubloc_primary'] = intval($location['primary']);
 						hubloc_change_primary($r[0]);
@@ -841,18 +848,18 @@ class Libsync {
 						}
 					}
 					if(intval($r[0]['hubloc_deleted']) && (! intval($location['deleted']))) {
-						$n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d",
+						$n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
-							intval($r[0]['hubloc_id'])
+							dbesc($r[0]['hubloc_id_url'])
 						);
 						$what .= 'undelete_hub ';
 						$changed = true;
 					}
 					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 = %d",
+						$n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
-							intval($r[0]['hubloc_id'])
+							dbesc($r[0]['hubloc_id_url'])
 						);
 						$what .= 'delete_hub ';
 						$changed = true;
@@ -911,9 +918,9 @@ class Libsync {
 				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 = %d",
+						$r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
 							dbesc(datetime_convert()),
-							intval($x['hubloc_id'])
+							dbesc($x['hubloc_id_url'])
 						);
 						$what .= 'removed_hub ';
 						$changed = true;
@@ -1016,4 +1023,4 @@ class Libsync {
 
 	}
 
-}
\ No newline at end of file
+}