From da452decf695ceac249642ec9d12fb724fa547f7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Nov 2018 15:12:01 -0800
Subject: more z6 debugging

---
 Zotlabs/Daemon/Notifier.php |  1 +
 Zotlabs/Lib/Libzot.php      |  5 +++--
 Zotlabs/Module/Connedit.php |  5 +++++
 include/crypto.php          |  9 +++++++--
 include/queue_fn.php        | 11 +++++------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 9a4b14d57..c7360b83c 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -645,6 +645,7 @@ class Notifier {
 					'account_id' => $channel['channel_account_id'],
 					'channel_id' => $channel['channel_id'],
 					'posturl'    => $hub['hubloc_callback'],
+					'driver'     => $hub['hubloc_network'],
 					'notify'     => $packet,
 					'msg'        => (($pmsg) ? json_encode($pmsg) : '')
 				));
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 23703a040..f0248a85b 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -333,8 +333,8 @@ class Libzot {
 			if($permissions && is_array($permissions)) {
 				$old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream');
 
-				foreach($permissions as $k => $v) {
-					set_abconfig($channel['channel_id'],$x['hash'],'their_perms',$k,$v);
+				foreach($permissions as $p) {
+					set_abconfig($channel['channel_id'],$x['hash'],'their_perms',$p,'1');
 				}
 			}
 
@@ -974,6 +974,7 @@ logger('4');
 		}
 
 		$x = crypto_unencapsulate($x, get_config('system','prvkey'));
+
 		if(! is_array($x)) {
 			$x = json_decode($x,true);
 		}
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 3d7ee449a..a9f643306 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -8,6 +8,7 @@ namespace Zotlabs\Module;
  */
 
 use Zotlabs\Lib\Apps;
+use Zotlabs\Lib\Libzot;
 
 require_once('include/socgraph.php');
 require_once('include/selectors.php');
@@ -475,6 +476,10 @@ class Connedit extends \Zotlabs\Web\Controller {
 					if(! zot_refresh($orig_record[0],\App::get_channel()))
 						notice( t('Refresh failed - channel is currently unavailable.') );
 				}
+				elseif($orig_record[0]['xchan_network'] === 'zot6') {
+					if(! Libzot::refresh($orig_record[0],\App::get_channel()))
+						notice( t('Refresh failed - channel is currently unavailable.') );
+				}
 				else {
 	
 					// if you are on a different network we'll force a refresh of the connection basic info
diff --git a/include/crypto.php b/include/crypto.php
index 1040ac29b..fc1029e55 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -225,9 +225,14 @@ function crypto_unencapsulate($data,$prvkey) {
 	if(! $data)
 		return;
 
-	$alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc');
-	if($alg === 'aes256cbc')
+	$alg = ((is_array($data) && array_key_exists('encrypted',$data)) ? $data['alg'] : '');
+    if(! $alg) {
+		return $data;
+    }
+
+	if($alg === 'aes256cbc') {
 		return aes_unencapsulate($data,$prvkey);
+	}
 
 	return other_unencapsulate($data,$prvkey,$alg);
 
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 074e3c407..f7e2922c6 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -237,7 +237,7 @@ function queue_deliver($outq, $immediate = false) {
             $zot = new Receiver(new Zot6Handler(),$outq['outq_notify']);
             $result = $zot->run(true);
             logger('returned_json: ' . json_encode($result,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA);
-            logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
+            logger('deliver: local zot6 delivery succeeded to ' . $outq['outq_posturl']);
             Libzot::process_response($outq['outq_posturl'],[ 'success' => true, 'body' => json_encode($result) ], $outq);
         }
         else {
@@ -250,8 +250,7 @@ function queue_deliver($outq, $immediate = false) {
 
             $host_crypto = null;
            if($channel && $base) {
-                $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and\
- hubloc_network = 'zot6' order by hubloc_id desc limit 1",
+                $h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
                     dbesc($base)
                 );
                 if($h) {
@@ -264,12 +263,12 @@ function queue_deliver($outq, $immediate = false) {
             $result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
 
             if($result['success']) {
-                logger('deliver: remote zot delivery succeeded to ' . $outq['outq_posturl']);
+                logger('deliver: remote zot6 delivery succeeded to ' . $outq['outq_posturl']);
                 Libzot::process_response($outq['outq_posturl'],$result, $outq);
             }
             else {
-                logger('deliver: remote zot delivery failed to ' . $outq['outq_posturl']);
-                logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
+                logger('deliver: remote zot6 delivery failed to ' . $outq['outq_posturl']);
+                logger('deliver: remote zot6 delivery fail data: ' . print_r($result,true), LOGGER_DATA);
                 update_queue_item($outq['outq_hash'],10);
             }
 
-- 
cgit v1.2.3