From 28a35261dbc8c21e27ca4a449ff5cd6cb0501c8a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 30 Oct 2014 19:15:03 -0700
Subject: What this checkin does is catch the case where a comment arrived and
 there's a missing top-level post to match it with. So we'll send a request
 back to the sender that you've never seen this thread and please send a fresh
 copy of the entire conversation to date. We could soon have posts in the
 matrix from different platforms from days gone by, which have been migrated
 into the modern world. We'll be polite and not deliver these to everybody.
 However, if someone comments on one of these antique threads we wouldn't be
 able to see it in our own matrix because we won't have a copy of the parent
 post. So this rectifies that situation. Be aware that item deletion may need
 to change to keep "hard deleted" items indefinitely so that they don't keep
 coming back. We'll have to null out the important data of the former item to
 accomplish the deletion aspect.

---
 include/zot.php | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index e96eae10d..3a5139755 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -104,7 +104,7 @@ function zot_get_hublocs($hash) {
  * @returns string json encoded zot packet
  */
 
-function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) {
+function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null, $extra = null) {
 
 	$data = array(
 		'type' => $type,
@@ -129,6 +129,12 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_
 		$data['secret_sig'] = base64url_encode(rsa_sign($secret,$channel['channel_prvkey']));
 	}
 
+	if($extra) {
+		foreach($extra as $k => $v)
+			$data[$k] = $v;
+	}
+
+
 	logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA);
 
 	// Hush-hush ultra top-secret mode
@@ -1436,6 +1442,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
 			);
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
+
+				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
+				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
+
+				if(! $relay)
+					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
+
 				continue;
 			}
 			if($relay) {
@@ -2793,3 +2806,71 @@ function import_author_zot($x) {
 	return false;
 }
 
+function zot_process_message_request($data) {
+	$ret = array('success' => false);
+	if(! $data['message_id']) {
+		$ret['message'] = 'no message_id';
+		logger('no message_id');
+		return $ret;
+	}
+
+	$sender = $data['sender'];
+	$sender_hash = make_xchan_hash($sender['guid'],$sender['guid_sig']);
+
+	$arr = $data['recipients'][0];
+	$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
+	$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
+		dbesc($recip_hash)
+	);
+	if(! $c) {
+		logger('recipient channel not found.');
+		$ret['message'] .= 'recipient not found.' . EOL;
+		return $ret;
+	}
+	$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
+	if($messages) {
+		$env_recips = null;
+
+		$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host 
+			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)
+			and not (hubloc_status & %d) group by hubloc_sitekey",
+            intval(HUBLOC_FLAGS_DELETED),
+            intval(HUBLOC_OFFLINE)
+        );
+	    if(! $r) {
+	        logger('no hubs');
+    	    return $ret;
+    	}
+		$hubs = $r;
+		$hublist = array();
+		$keys = array();
+
+		$private = ((array_key_exists('flags',$messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
+		if($private)
+			$env_recips = array('guid' => $sender['guid'],'guid_sig' => $sender['guid_sig'],'hash' => $sender_hash);
+		$data_packet = json_encode(array('message_list' => $messages));
+		
+		foreach($hubs as $hub) {
+			$hash = random_string();
+			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
+			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
+				outq_created, outq_updated, outq_notify, outq_msg ) 
+				values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+				dbesc($hash),
+				intval($c[0]['channel_account_id']),
+				intval($c[0]['channel_id']),
+				dbesc('zot'),
+				dbesc($hub['hubloc_callback']),
+				intval(1),
+				dbesc(datetime_convert()),
+				dbesc(datetime_convert()),
+				dbesc($n),
+				dbesc($data_packet)
+			);
+			proc_run('php','include/deliver.php',$hash);
+		}
+
+	}
+	$ret['success'] = true;
+	return $ret;
+}
-- 
cgit v1.2.3


From 5637d0713865a179ad997a75825d623f13155358 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 31 Oct 2014 04:59:30 -0700
Subject: flag notify packets that are sent in response to a message_id request
 and prevent them from recursing

---
 include/zot.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 3a5139755..0cbef1ad3 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1081,6 +1081,7 @@ function zot_import($arr, $sender_url) {
 				continue;
 			}
 
+			$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
 
 			$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
 			$deliveries = null;
@@ -1182,7 +1183,7 @@ function zot_import($arr, $sender_url) {
 					logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA);
 
 					$relay = ((array_key_exists('flags',$i['message']) && in_array('relay',$i['message']['flags'])) ? true : false);
-					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay);
+					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay,false,$message_request);
 
 				}
 				elseif($i['message']['type'] === 'mail') {
@@ -1379,7 +1380,7 @@ function allowed_public_recips($msg) {
 }
 
 
-function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
+function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$request = false) {
 
 	$result = array();
 
@@ -1446,7 +1447,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
 				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
 
-				if(! $relay)
+				if((! $relay) && (! $request))
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
 
 				continue;
@@ -2852,7 +2853,7 @@ function zot_process_message_request($data) {
 		
 		foreach($hubs as $hub) {
 			$hash = random_string();
-			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash);
+			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
 			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
 				outq_created, outq_updated, outq_notify, outq_msg ) 
 				values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-- 
cgit v1.2.3


From 1cb45c30e9032794b7827738cc28f7728ac28677 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 31 Oct 2014 06:24:14 -0700
Subject: document request packets a bit more

---
 include/zot.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 0cbef1ad3..c9a17562e 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1444,8 +1444,11 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
 
-				// we don't seem to have a copy of this conversation or at least the parent - request a copy of the entire conversation to date.
+				// We don't seem to have a copy of this conversation or at least the parent - so request a copy of the entire conversation to date.
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
+				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
+				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
+				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). 
 
 				if((! $relay) && (! $request))
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
-- 
cgit v1.2.3


From a659ac8952306b5a78a468051d3c318f50294bcf Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 1 Nov 2014 00:36:21 -0700
Subject: disable request message response until we work through this

---
 include/zot.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index c9a17562e..4c47d60b8 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2812,6 +2812,9 @@ function import_author_zot($x) {
 
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
+
+	return $ret;
+
 	if(! $data['message_id']) {
 		$ret['message'] = 'no message_id';
 		logger('no message_id');
-- 
cgit v1.2.3


From 50c16c394fe2d966c62d30930600212a4e33303e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 1 Nov 2014 01:52:27 -0700
Subject: check that we have valid data

---
 include/zot.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 4c47d60b8..24ace9cbb 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2813,6 +2813,7 @@ function import_author_zot($x) {
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
 
+// note: disabled until the loops stop.
 	return $ret;
 
 	if(! $data['message_id']) {
-- 
cgit v1.2.3


From 4274a2d06c9ee2c28acba0dac3d5353e13776581 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 00:06:52 -0700
Subject: add some more safety checks before turning the conversation request
 messages back on

---
 include/zot.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 24ace9cbb..153fa28bf 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1448,11 +1448,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
 				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
 				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
-				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). 
+				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
+				// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
+				// this is just an exercise in futility.   
 
-				if((! $relay) && (! $request))
+				if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
-
+				}
 				continue;
 			}
 			if($relay) {
-- 
cgit v1.2.3


From 285d6f61e4bf8aeaa3294ac4b7af43366a1448e9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 15:28:20 -0800
Subject: I'm going to try again with the conversation request packets. I've
 looked this over and tested a lot of edge cases, and thought about from every
 angle I can think of to prevent looping. I don't *think* this can loop. I
 also doubt that this is the problem at friendicared.de, but I don't know for
 sure what that problem might be.

---
 include/zot.php | 66 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 11 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 153fa28bf..f18830e78 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1082,6 +1082,8 @@ function zot_import($arr, $sender_url) {
 			}
 
 			$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
+			if($message_request)
+				logger('processing message request');
 
 			$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
 			$deliveries = null;
@@ -1444,15 +1446,22 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
 			if(! $r) {
 				$result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
 
-				// We don't seem to have a copy of this conversation or at least the parent - so request a copy of the entire conversation to date.
-				// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
-				// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
-				// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type 
-				// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
-				// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
+				// We don't seem to have a copy of this conversation or at least the parent 
+				// - so request a copy of the entire conversation to date.
+				// Don't do this if it's a relay post as we're the ones who are supposed to 
+				// have the copy and we don't want the request to loop.
+				// Also don't do this if this comment came from a conversation request packet.
+				// It's possible that comments are allowed but posting isn't and that could
+				// cause a conversation fetch loop. We can detect these packets since they are 
+				// delivered via a 'notify' packet type that has a message_id element in the 
+				// initial zot packet (just like the corresponding 'request' packet type which 
+				// makes the request).
+				// We'll also check the send_stream permission - because if it isn't allowed,
+				// the top level post is unlikely to be imported and
 				// this is just an exercise in futility.   
 
-				if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
+				if((! $relay) && (! $request) && (! $public) 
+					&& perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
 					proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
 				}
 				continue;
@@ -2812,12 +2821,25 @@ function import_author_zot($x) {
 	return false;
 }
 
+
+/**
+ * @function zot_process_message_request($data)
+ *    If a site receives a comment to a post but finds they have no parent to attach it with, they
+ * may send a 'request' packet containing the message_id of the missing parent. This is the handler
+ * for that packet. We will create a message_list array of the entire conversation starting with
+ * the missing parent and invoke delivery to the sender of the packet.
+ *
+ * include/deliver.php (for local delivery) and mod/post.php (for web delivery) detect the existence of 
+ * this 'message_list' at the destination and split it into individual messages which are 
+ * processed/delivered in order.  
+ *  
+ * Called from mod/post.php
+ */  
+
+
 function zot_process_message_request($data) {
 	$ret = array('success' => false);
 
-// note: disabled until the loops stop.
-	return $ret;
-
 	if(! $data['message_id']) {
 		$ret['message'] = 'no message_id';
 		logger('no message_id');
@@ -2827,6 +2849,10 @@ function zot_process_message_request($data) {
 	$sender = $data['sender'];
 	$sender_hash = make_xchan_hash($sender['guid'],$sender['guid_sig']);
 
+	/*
+	 * Find the local channel in charge of this post (the first and only recipient of the request packet)
+	 */
+
 	$arr = $data['recipients'][0];
 	$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
 	$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
@@ -2837,13 +2863,20 @@ function zot_process_message_request($data) {
 		$ret['message'] .= 'recipient not found.' . EOL;
 		return $ret;
 	}
+
+	/*
+	 * fetch the requested conversation
+	 */
+
 	$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
+
 	if($messages) {
 		$env_recips = null;
 
 		$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host 
-			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)
+			from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)
 			and not (hubloc_status & %d) group by hubloc_sitekey",
+			dbesc($sender_hash),
             intval(HUBLOC_FLAGS_DELETED),
             intval(HUBLOC_OFFLINE)
         );
@@ -2858,10 +2891,16 @@ function zot_process_message_request($data) {
 		$private = ((array_key_exists('flags',$messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
 		if($private)
 			$env_recips = array('guid' => $sender['guid'],'guid_sig' => $sender['guid_sig'],'hash' => $sender_hash);
+
 		$data_packet = json_encode(array('message_list' => $messages));
 		
 		foreach($hubs as $hub) {
 			$hash = random_string();
+
+			/*
+			 * create a notify packet and drop the actual message packet in the queue for pickup
+			 */
+
 			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
 			q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, 
 				outq_created, outq_updated, outq_notify, outq_msg ) 
@@ -2877,6 +2916,11 @@ function zot_process_message_request($data) {
 				dbesc($n),
 				dbesc($data_packet)
 			);
+
+			/*
+			 * invoke delivery to send out the notify packet
+			 */
+
 			proc_run('php','include/deliver.php',$hash);
 		}
 
-- 
cgit v1.2.3


From 0e4f318b71fc454c3a0ce6f0e073d9808ff00269 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Nov 2014 19:22:18 -0800
Subject: php warnings

---
 include/zot.php | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index f18830e78..f1ff084ac 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -5,7 +5,7 @@ require_once('include/items.php');
 require_once('include/hubloc.php');
 
 /**
- * Red implementation of zot protocol. 
+ * Red implementation of zot protocol.
  *
  * https://github.com/friendica/red/wiki/zot
  * https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview
@@ -20,8 +20,8 @@ require_once('include/hubloc.php');
  *    Generates a unique string for use as a zot guid using our DNS-based url, the channel nickname and some entropy.
  *    The entropy ensures uniqueness against re-installs where the same URL and nickname are chosen.
  *    NOTE: zot doesn't require this to be unique. Internally we use a whirlpool hash of this guid and the signature
- *    of this guid signed with the channel private key. This can be verified and should make the probability of 
- *    collision of the verified result negligible within the constraints of our immediate universe.  
+ *    of this guid signed with the channel private key. This can be verified and should make the probability of
+ *    collision of the verified result negligible within the constraints of our immediate universe.
  *
  * @param string channel_nickname = unique nickname of controlling entity
  *
@@ -51,7 +51,7 @@ function make_xchan_hash($guid,$guid_sig) {
 
 /**
  * @function zot_get_hublocs($hash)
- *     Given a zot hash, return all distinct hubs. 
+ *     Given a zot hash, return all distinct hubs.
  *     This function is used in building the zot discovery packet
  *     and therefore should only be used by channels which are defined
  *     on this hub
@@ -71,7 +71,7 @@ function make_xchan_hash($guid,$guid_sig) {
  *    hubloc_connect     char(255)
  *    hubloc_sitekey     text
  *    hubloc_updated     datetime
- *    hubloc_connected   datetime 	
+ *    hubloc_connected   datetime
  *
  */
 
@@ -85,21 +85,21 @@ function zot_get_hublocs($hash) {
 	);
 	return $ret;
 }
-	 
+
 /**
  *
  * @function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null)
  *    builds a zot notification packet that you can either
- *    store in the queue with a message array or call zot_zot to immediately 
+ *    store in the queue with a message array or call zot_zot to immediately
  *    zot it to the other side
  *
  * @param array $channel     => sender channel structure
  * @param string $type       => packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check'
  * @param array $recipients  => envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
  * @param string $remote_key => optional public site key of target hub used to encrypt entire packet
- *    NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others 
+ *    NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others
  * @param string $secret     => random string, required for packets which require verification/callback
- *    e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification 
+ *    e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
  *
  * @returns string json encoded zot packet
  */
@@ -1071,7 +1071,7 @@ function zot_import($arr, $sender_url) {
 
 			if(array_key_exists('iv',$i['notify'])) {
 				$i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true);
-	  		}
+			}
 
 			logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA);
 
@@ -1107,7 +1107,7 @@ function zot_import($arr, $sender_url) {
 				// It's a specifically targetted post. If we were sent a public_scope hint (likely), 
 				// get rid of it so that it doesn't get stored and cause trouble. 
 
-				if(array_key_exists('message',$i) && array_key_exists('public_scope',$i['message']))
+				if(($i) && is_array($i) && array_key_exists('message',$i) && is_array($i['message']) && array_key_exists('public_scope',$i['message']))
 					unset($i['message']['public_scope']);
 
 				$deliveries = $r;
@@ -2460,8 +2460,8 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 
 		$channel = $r[0];
 
-	    $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['hash']) {
@@ -2547,7 +2547,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 							continue;
 						}
 						$j = json_decode($f['body'],true);
-				        if(! ($j['success'] && $j['guid'])) {
+						if(! ($j['success'] && $j['guid'])) {
 							logger('process_channel_sync_delivery: probe failed.');
 							continue;
 						}
@@ -2646,8 +2646,8 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 						intval($channel['channel_id']),
 						intval($cl['visible']),
 						intval($cl['deleted']),
-           				dbesc($cl['name'])
-       				);
+						dbesc($cl['name'])
+					);
 				}
 
 				// now look for any collections locally which weren't in the list we just received.
@@ -2877,13 +2877,13 @@ function zot_process_message_request($data) {
 			from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)
 			and not (hubloc_status & %d) group by hubloc_sitekey",
 			dbesc($sender_hash),
-            intval(HUBLOC_FLAGS_DELETED),
-            intval(HUBLOC_OFFLINE)
-        );
-	    if(! $r) {
-	        logger('no hubs');
-    	    return $ret;
-    	}
+			intval(HUBLOC_FLAGS_DELETED),
+			intval(HUBLOC_OFFLINE)
+		);
+		if(! $r) {
+			logger('no hubs');
+			return $ret;
+		}
 		$hubs = $r;
 		$hublist = array();
 		$keys = array();
-- 
cgit v1.2.3


From d5d6158973ecb83b63d42c57c96dce849842c83b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 4 Nov 2014 17:11:02 -0800
Subject: ok heads up - potentially destabilising change. I've tried to sort
 out all the default connection permissions for those who don't have a
 predefined (or therefore have a "custom") permissions role. Unfortunately
 this includes most people that were using this software more than a month
 ago. The real changes are that the SELF address book entry no longer holds
 "auto-permissions" but instead holds your "default permissions" (if you have
 a pre-defined role, the defaults will be pulled from the role table).

The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.

What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.

With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
---
 include/zot.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index f1ff084ac..9f22bc30b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -439,15 +439,15 @@ function zot_refresh($them,$channel = null, $force = false) {
 				}
 			}
 			else {
-				$default_perms = 0;
-				// look for default permissions to apply in return - e.g. auto-friend
-				$z = q("select * from abook where abook_channel = %d and (abook_flags & %d) limit 1",
-					intval($channel['channel_id']),
-					intval(ABOOK_FLAG_SELF)
-				);
-
-				if($z)
-					$default_perms = intval($z[0]['abook_my_perms']);		
+				$role = get_pconfig($channel['channel_id'],'system','permissions_role');
+				if($role) {
+					$x = get_role_perms($role);
+					if($x['perms_auto'])
+						$default_perms = $x['perms_accept'];
+				}
+				if(! $default_perms)
+					$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
+				
 
 				// Keep original perms to check if we need to notify them
 				$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
-- 
cgit v1.2.3


From 1f35d9432ff6391c183fe9e268cbf3b76ac8dd0d Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Thu, 6 Nov 2014 17:24:05 +0100
Subject: don't overwrite $x (contains import_xchan result) with role
 permissions

---
 include/zot.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 9f22bc30b..bdc1f607f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -441,9 +441,9 @@ function zot_refresh($them,$channel = null, $force = false) {
 			else {
 				$role = get_pconfig($channel['channel_id'],'system','permissions_role');
 				if($role) {
-					$x = get_role_perms($role);
-					if($x['perms_auto'])
-						$default_perms = $x['perms_accept'];
+					$xx = get_role_perms($role);
+					if($xx['perms_auto'])
+						$default_perms = $xx['perms_accept'];
 				}
 				if(! $default_perms)
 					$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
-- 
cgit v1.2.3


From 62094652333514e92f9f00699e14b9f49680bb64 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 10 Nov 2014 15:21:04 -0800
Subject: add public forum identification to libzot. No attempt is made to
 identify other types of forums or weird custom channel permissions. If the
 channel is auto-accept and taggable, it's a public forum.

---
 include/zot.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index bdc1f607f..ac68c0035 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -699,10 +699,14 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 
 		$dirmode = get_config('system','directory_mode'); 
 
-		if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE))
-&& ($arr['site']['url'] != z_root()))
+		if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root()))
 			$arr['searchable'] = false;
 
+		$public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false);
+		$pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false);
+		if($pubforum_changed)
+			$new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM;
+
 		$hidden = (1 - intval($arr['searchable']));
 
 		// Be careful - XCHAN_FLAGS_HIDDEN should evaluate to 1
-- 
cgit v1.2.3


From 56199027768a07d7f1f980df08fb9c5dc7b1278e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 10 Nov 2014 17:44:02 -0800
Subject: indicate public forums in directory results (there will be some
 [possibly considerable] lag time before existing forums are correctly
 tagged).

---
 include/zot.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index ac68c0035..2954408b9 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -702,10 +702,6 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root()))
 			$arr['searchable'] = false;
 
-		$public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false);
-		$pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false);
-		if($pubforum_changed)
-			$new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM;
 
 		$hidden = (1 - intval($arr['searchable']));
 
@@ -725,6 +721,11 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		if($deleted_changed)
 			$new_flags = $new_flags ^ XCHAN_FLAGS_DELETED;
 
+		$public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false);
+		$pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false);
+		if($pubforum_changed)
+			$new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM;
+
 		if(($r[0]['xchan_name_date'] != $arr['name_updated']) 
 			|| ($r[0]['xchan_connurl'] != $arr['connections_url']) 
 			|| ($r[0]['xchan_flags'] != $new_flags)
-- 
cgit v1.2.3


From 1a5a5c7edb8697c93f8bababbafa80245378dd7e Mon Sep 17 00:00:00 2001
From: Habeas Codice <habeascodice@federated.social>
Date: Thu, 13 Nov 2014 12:21:58 -0800
Subject: PostgreSQL support initial commit

There were 11 main types of changes:
- UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but
it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just
copied from Friendica. All of these instances, the LIMIT 1 was simply removed.
- Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit
integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice
to boot). Proper explicit boolean conversions were added. New queries should use proper conventions.
- MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_
func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There
were no true toggles (XOR). New queries should refrain from using XOR when not necessary.
- There are several fields which the schema has marked as NOT NULL, but the inserts don't specify
them. The reason this works is because mysql totally ignores the constraint and adds an empty text
default automatically. Again, non-compliant, obviously. In these cases a default of empty text was
added.
- Several statements rely on a non-standard MySQL feature
(http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten
to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run
a zillion times faster, even on MySQL.
- A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG,
UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_
- INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes
around the value -- assist functions added in the dba_
- NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such
thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are
handled in Zot/item packets automagically by quoting all dates with dbescdate().
- char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the
code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works
better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype
for all text fields in the postgres schema. varchar was used in a couple of places where it actually
seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code
actually validates data, new bugs might come out from under the rug.
- postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted.
bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function
was added to handle this transparently.
- postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax.
Statements were updated to be standard.

These changes require corresponding changes in the coding standards. Please review those before
adding any code going forward.

Still on my TODO list:
- remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting
- Rewrite search queries for better results (both MySQL and Postgres)
---
 include/zot.php | 104 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'include/zot.php')

diff --git a/include/zot.php b/include/zot.php
index 24ace9cbb..643aada58 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -79,7 +79,7 @@ function zot_get_hublocs($hash) {
 
 	/** Only search for active hublocs - e.g. those that haven't been marked deleted */
 
-	$ret = q("select * from hubloc where hubloc_hash = '%s' and not ( hubloc_flags & %d ) group by hubloc_url ",
+	$ret = q("select * from hubloc where hubloc_hash = '%s' and not ( hubloc_flags & %d )>0 order by hubloc_url ",
 		dbesc($hash),
 		intval(HUBLOC_FLAGS_DELETED)
 	);
@@ -194,14 +194,15 @@ function zot_finger($webbie,$channel,$autofallback = true) {
 		logger('zot_finger: no address :' . $webbie);
 		return array('success' => false);
 	}		
-
+	logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA);
+	
 	// potential issue here; the xchan_addr points to the primary hub.
 	// The webbie we were called with may not, so it might not be found
 	// unless we query for hubloc_addr instead of xchan_addr
 
 	$r = q("select xchan.*, hubloc.* from xchan 
 			left join hubloc on xchan_hash = hubloc_hash
-			where xchan_addr = '%s' and (hubloc_flags & %d) limit 1",
+			where xchan_addr = '%s' and (hubloc_flags & %d)>0 limit 1",
 		dbesc($xchan_addr),
 		intval(HUBLOC_FLAGS_PRIMARY)
 	);
@@ -211,6 +212,7 @@ function zot_finger($webbie,$channel,$autofallback = true) {
 
 		if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
 			logger('zot_finger: alternate network: ' . $webbie);
+			logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'],true), LOGGER_DATA);
 			return array('success' => false);
 		}		
 	}
@@ -299,7 +301,7 @@ function zot_refresh($them,$channel = null, $force = false) {
 	if($them['hubloc_url'])
 		$url = $them['hubloc_url'];
 	else {
-		$r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d ) limit 1",
+		$r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d )>0 limit 1",
 			dbesc($them['xchan_hash']),
 			intval(HUBLOC_FLAGS_PRIMARY)
 		);
@@ -381,7 +383,7 @@ function zot_refresh($them,$channel = null, $force = false) {
 				}
 			}
 
-			$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) limit 1",
+			$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d)>0 limit 1",
 				dbesc($x['hash']),
 				intval($channel['channel_id']),
 				intval(ABOOK_FLAG_SELF)
@@ -407,7 +409,7 @@ function zot_refresh($them,$channel = null, $force = false) {
 		
 				$y = q("update abook set abook_their_perms = %d, abook_dob = '%s'
 					where abook_xchan = '%s' and abook_channel = %d 
-					and not (abook_flags & %d) limit 1",
+					and not (abook_flags & %d)>0 ",
 					intval($their_perms),
 					dbesc($next_birthday),
 					dbesc($x['hash']),
@@ -441,7 +443,7 @@ function zot_refresh($them,$channel = null, $force = false) {
 			else {
 				$default_perms = 0;
 				// look for default permissions to apply in return - e.g. auto-friend
-				$z = q("select * from abook where abook_channel = %d and (abook_flags & %d) limit 1",
+				$z = q("select * from abook where abook_channel = %d and (abook_flags & %d)>0 limit 1",
 					intval($channel['channel_id']),
 					intval(ABOOK_FLAG_SELF)
 				);
@@ -469,7 +471,7 @@ function zot_refresh($them,$channel = null, $force = false) {
 					$new_perms = get_all_perms($channel['channel_id'],$x['hash']);
 					if($new_perms != $previous_perms) {
 						// Send back a permissions update if permissions have changed
-						$z = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) limit 1",
+						$z = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d)>0 limit 1",
 							dbesc($x['hash']),
 							intval($channel['channel_id']),
 							intval(ABOOK_FLAG_SELF)
@@ -730,7 +732,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 			|| ($r[0]['xchan_url'] != $arr['url'])) {
 			$r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s', 
 				xchan_connpage = '%s', xchan_flags = %d,
-				xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s' limit 1",
+				xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'",
 				dbesc(($arr['name']) ? $arr['name'] : '-'),
 				dbesc($arr['name_updated']),
 				dbesc($arr['connections_url']),
@@ -783,8 +785,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 			dbesc($arr['connect_url']),
 			dbesc(($arr['name']) ? $arr['name'] : '-'),
 			dbesc('zot'),
-			dbesc($arr['photo_updated']),
-			dbesc($arr['name_updated']),
+			dbescdate($arr['photo_updated']),
+			dbescdate($arr['name_updated']),
 			intval($new_flags)
 		);
 
@@ -825,7 +827,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 				// importing the photo failed somehow. Leave the photo_date alone so we can try again at a later date.
 				// This often happens when somebody joins the matrix with a bad cert. 
 				$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-					where xchan_hash = '%s' limit 1",
+					where xchan_hash = '%s'",
 					dbesc($photos[0]),
 					dbesc($photos[1]),
 					dbesc($photos[2]),
@@ -835,8 +837,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 			}
 			else {
 				$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' limit 1",
-					dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
+					where xchan_hash = '%s'",
+					dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])),
 					dbesc($photos[0]),
 					dbesc($photos[1]),
 					dbesc($photos[2]),
@@ -896,10 +898,10 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 		else {
 			logger('import_xchan: profile not available - hiding');
 			// they may have made it private
-			$r = q("delete from xprof where xprof_hash = '%s' limit 1",
+			$r = q("delete from xprof where xprof_hash = '%s'",
 				dbesc($xchan_hash)
 			);
-			$r = q("delete from xtag where xtag_hash = '%s' limit 1",
+			$r = q("delete from xtag where xtag_hash = '%s'",
 				dbesc($xchan_hash)
 			);
 		}
@@ -921,7 +923,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
 	}
 	elseif(! $ud_flags) {
 		// nothing changed but we still need to update the updates record
-		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ",
+		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ",
 			intval(UPDATE_FLAGS_UPDATED),
 			dbesc($address),
 			intval(UPDATE_FLAGS_UPDATED)
@@ -971,14 +973,14 @@ function zot_process_response($hub,$arr,$outq) {
 	// async messages remain in the queue until processed.
 
 	if(intval($outq['outq_async'])) {
-		$r = q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' and outq_channel = %d limit 1",
+		$r = q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' and outq_channel = %d",
 			dbesc(datetime_convert()),
 			dbesc($outq['outq_hash']),
 			intval($outq['outq_channel'])
 		);
 	}
 	else {
-		$r = q("delete from outq where outq_hash = '%s' and outq_channel = %d limit 1",
+		$r = q("delete from outq where outq_hash = '%s' and outq_channel = %d",
 			dbesc($outq['outq_hash']),
 			intval($outq['outq_channel'])
 		);
@@ -1094,7 +1096,7 @@ function zot_import($arr, $sender_url) {
 				}
 				stringify_array_elms($recip_arr);
 				$recips = implode(',',$recip_arr);
-				$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) ",
+				$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d )>0 ",
 					intval(PAGE_REMOVED)
 				);
 				if(! $r) {
@@ -1276,9 +1278,9 @@ function public_recips($msg) {
 
 	
 	if($msg['notify']['sender']['url'] === z_root())
-		$sql = " where (( " . $col . " & " . PERMS_NETWORK . " )  or ( " . $col . " & " . PERMS_SITE . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) ";				
+		$sql = " where (( " . $col . " & " . PERMS_NETWORK . " )>0  or ( " . $col . " & " . PERMS_SITE . " )>0 or ( " . $col . " & " . PERMS_PUBLIC . ")>0) ";				
 	else
-		$sql = " where (( " . $col . " & " . PERMS_NETWORK . " )  or ( "  . $col . " & " . PERMS_PUBLIC . ")) ";
+		$sql = " where (( " . $col . " & " . PERMS_NETWORK . " )>0  or ( "  . $col . " & " . PERMS_PUBLIC . ")>0) ";
 
 
 	$r = q("select channel_hash as hash from channel $sql or channel_hash = '%s' ",
@@ -1288,7 +1290,7 @@ function public_recips($msg) {
 	if(! $r)
 		$r = array();
 
-	$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " )  and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_PENDING . " ) OR (( " . $col . " & " . PERMS_CONTACTS . " ) and not ( abook_flags & " . ABOOK_FLAG_PENDING . " )) ",
+	$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " )>0 and (( " . $col . " & " . PERMS_SPECIFIC . " )>0  and ( abook_my_perms & " . $field . " )>0) OR ( " . $col . " & " . PERMS_PENDING . " )>0 OR (( " . $col . " & " . PERMS_CONTACTS . " )>0 and not ( abook_flags & " . ABOOK_FLAG_PENDING . " )>0) ",
 		dbesc($msg['notify']['sender']['hash'])
 	); 
 
@@ -1364,7 +1366,7 @@ function allowed_public_recips($msg) {
 			$condensed_recips[] = $rr['hash'];
 
 		$results = array();
-		$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d ) ",
+		$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d )>0 ",
 			dbesc($hash),
 			intval(PAGE_REMOVED)
 		);
@@ -1599,7 +1601,7 @@ function remove_community_tag($sender,$arr,$uid) {
 		return;
 	}
 	
-	$x = q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s' limit 1",
+	$x = q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s'",
 		intval($uid),
 		intval($r[0]['id']),
 		intval(TERM_OBJ_POST),
@@ -1693,7 +1695,7 @@ function process_mail_delivery($sender,$arr,$deliveries) {
 		);
 		if($r) {
 			if($arr['mail_flags'] & MAIL_RECALLED) {
-				$x = q("delete from mail where id = %d and channel_id = %d limit 1",
+				$x = q("delete from mail where id = %d and channel_id = %d",
 					intval($r[0]['id']),
 					intval($channel['channel_id'])
 				);
@@ -1819,7 +1821,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 				// This only happens when called from import_xchan
 
 				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 limit 1",
+					q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d",
 						dbesc(datetime_convert()),
 						dbesc(datetime_convert()),
 						intval($r[0]['hubloc_id'])
@@ -1831,17 +1833,17 @@ function sync_locations($sender,$arr,$absolute = false) {
 				// the directory server if the site is alive.
 
 				if($r[0]['hubloc_status'] & HUBLOC_OFFLINE) {
-					q("update hubloc set hubloc_status = (hubloc_status ^ %d) where hubloc_id = %d limit 1",
+					q("update hubloc set hubloc_status = (hubloc_status & ~%d) where hubloc_id = %d",
 						intval(HUBLOC_OFFLINE),
 						intval($r[0]['hubloc_id'])
 					);
 					if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) {
-						q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_id = %d limit 1",
+						q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where hubloc_id = %d",
 							intval(HUBLOC_FLAGS_ORPHANCHECK),
 							intval($r[0]['hubloc_id'])
 						);
 					}
-					q("update xchan set xchan_flags = (xchan_flags ^ %d) where (xchan_flags & %d) and xchan_hash = '%s' limit 1",
+					q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
 						intval(XCHAN_FLAGS_ORPHAN),
 						intval(XCHAN_FLAGS_ORPHAN),
 						dbesc($sender['hash'])
@@ -1851,7 +1853,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 				// Remove pure duplicates
 				if(count($r) > 1) {
 					for($h = 1; $h < count($r); $h ++) {
-						q("delete from hubloc where hubloc_id = %d limit 1",
+						q("delete from hubloc where hubloc_id = %d",
 							intval($r[$h]['hubloc_id'])
 						);
 						$what .= 'duplicate_hubloc_removed ';
@@ -1861,7 +1863,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 
 				if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary']))
 					|| ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) {
-					$m = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1",
+					$m = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
 						intval(HUBLOC_FLAGS_PRIMARY),
 						dbesc(datetime_convert()),
 						intval($r[0]['hubloc_id'])
@@ -1882,7 +1884,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 				}
 				if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted']))
 					|| ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && ($location['deleted']))) {
-					$n = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1",
+					$n = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
 						intval(HUBLOC_FLAGS_DELETED),
 						dbesc(datetime_convert()),
 						intval($r[0]['hubloc_id'])
@@ -1897,7 +1899,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 			// New hub claiming to be primary. Make it so by removing any existing primaries.
 
 			if(intval($location['primary'])) {
-				$r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )",
+				$r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )>0",
 					intval(HUBLOC_FLAGS_PRIMARY),
 					dbesc(datetime_convert()),
 					dbesc($sender['hash']),
@@ -1940,7 +1942,7 @@ function sync_locations($sender,$arr,$absolute = false) {
 			foreach($xisting as $x) {
 				if(! array_key_exists('updated',$x)) {
 					logger('sync_locations: deleting unreferenced hub location ' . $x['hubloc_url']);
-					$r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1",
+					$r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
 						intval(HUBLOC_FLAGS_DELETED),
 						dbesc(datetime_convert()),
 						intval($x['hubloc_id'])
@@ -2034,7 +2036,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
 
 
 	if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) {
-		q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1",
+		q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
 			intval(XCHAN_FLAGS_SELFCENSORED),
 			dbesc($hash)
 		);
@@ -2069,7 +2071,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_
 				xprof_homepage = '%s',
 				xprof_hometown = '%s',
 				xprof_keywords = '%s'
-				where xprof_hash = '%s' limit 1",
+				where xprof_hash = '%s'",
 				dbesc($arr['xprof_desc']),
 				dbesc($arr['xprof_dob']),
 				intval($arr['xprof_age']),
@@ -2139,7 +2141,7 @@ function import_directory_keywords($hash,$keywords) {
 
 	foreach($existing as $x) {
 		if(! in_array($x,$clean))
-			$r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s' limit 1",
+			$r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s'",
 				dbesc($hash),
 				dbesc($x)
 			);
@@ -2171,7 +2173,7 @@ function update_modtime($hash,$guid,$addr,$flags = 0) {
 		);
 	}
 	else {
-		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ",
+		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ",
 			intval(UPDATE_FLAGS_UPDATED),
 			dbesc($addr),
 			intval(UPDATE_FLAGS_UPDATED)
@@ -2262,7 +2264,7 @@ function import_site($arr,$pubkey) {
 //			logger('import_site: stored: ' . print_r($siterecord,true));
 
 			$r = q("update site set site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s'
-				where site_url = '%s' limit 1",
+				where site_url = '%s'",
 				dbesc($site_location),
 				intval($site_directory),
 				intval($access_policy),
@@ -2478,7 +2480,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 			if(count($clean)) {
 				foreach($clean as $k => $v) {
 					$r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v) 
-						. "' where channel_id = " . intval($channel['channel_id']) . " limit 1");
+						. "' where channel_id = " . intval($channel['channel_id']) );
 				}
 			}
 		}
@@ -2509,7 +2511,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 					logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);
 					require_once('include/Contact.php');
 					
-					$r = q("select abook_id, abook_flags from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d ) limit 1",
+					$r = q("select abook_id, abook_flags from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d )>0 limit 1",
 						dbesc($abook['abook_xchan']),
 						intval($channel['channel_id']),
 						intval(ABOOK_FLAG_SELF)
@@ -2587,8 +2589,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 				if(count($clean)) {
 					foreach($clean as $k => $v) {
 						$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) 
-						. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']) 
-						. " limit 1");
+						. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
 					}
 				}
 			}
@@ -2613,7 +2614,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 						if(($y['name'] != $cl['name']) 
 							|| ($y['visible'] != $cl['visible']) 
 							|| ($y['deleted'] != $cl['deleted'])) {
-							q("update groups set name = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d limit 1",
+							q("update groups set name = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d",
 								dbesc($cl['name']),
 								intval($cl['visible']),
 								intval($cl['deleted']),
@@ -2656,7 +2657,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 							q("delete from group_member where gid = %d",
 								intval($y['id'])
 							);  
-							q("update groups set deleted = 1 where id = %d and uid = %d limit 1",
+							q("update groups set deleted = 1 where id = %d and uid = %d",
 								intval($y['id']),
 								intval($channel['channel_id'])
 							);
@@ -2719,7 +2720,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 							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']])) {
-									q("delete from group_member where xchan = '%s' and gid = %d and uid = %d limit 1",
+									q("delete from group_member where xchan = '%s' and gid = %d and uid = %d",
 										dbesc($mm['xchan']),
 										intval($y['id']),
 										intval($channel['channel_id'])
@@ -2765,8 +2766,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {
 				if(count($clean)) {
 					foreach($clean as $k => $v) {
 						$r = dbq("UPDATE profile set " . dbesc($k) . " = '" . dbesc($v) 
-						. "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id']) 
-						. " limit 1");
+						. "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id']));
 					}
 				}
 			}
@@ -2791,7 +2791,7 @@ function get_rpost_path($observer) {
 
 function import_author_zot($x) {
 	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
-	$r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and (hubloc_flags & %d) limit 1",
+	$r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and (hubloc_flags & %d)>0 limit 1",
 		dbesc($x['guid']),
 		dbesc($x['guid_sig']),
 		intval(HUBLOC_FLAGS_PRIMARY)
@@ -2840,8 +2840,8 @@ function zot_process_message_request($data) {
 		$env_recips = null;
 
 		$r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host 
-			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)
-			and not (hubloc_status & %d) group by hubloc_sitekey",
+			from hubloc where hubloc_hash = '" . dbesc($sender_hash) . "' and not (hubloc_flags & %d)>0
+			and not (hubloc_status & %d)>0 group by hubloc_sitekey",
             intval(HUBLOC_FLAGS_DELETED),
             intval(HUBLOC_OFFLINE)
         );
-- 
cgit v1.2.3