Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge"

This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing
changes made to 58cf5f310d89026fb526e201c301075725044e48.

1 files changed, 101 insertions, 91 deletions

diff --git a/include/zot.php b/include/zot.php
index 73d9ef950..45347ef22 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -12,7 +12,6 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/hubloc.php');
 require_once('include/queue_fn.php');
-require_once('include/perm_upgrade.php');
 
 
 /**
@@ -389,7 +388,10 @@ function zot_refresh($them, $channel = null, $force = false) {
 		if(! $x['success'])
 			return false;
 
+		$their_perms = 0;
+
 		if($channel) {
+			$global_perms = get_perms();
 			if($j['permissions']['data']) {
 				$permissions = crypto_unencapsulate(array(
 					'data' => $j['permissions']['data'],
@@ -406,10 +408,15 @@ function zot_refresh($them, $channel = null, $force = false) {
 			$connected_set = false;
 
 			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);
+					// The connected permission means you are in their address book
+					if($k === 'connected') {
+						$connected_set = intval($v);
+						continue;
+					}
+					if(($v) && (array_key_exists($k,$global_perms))) {
+						$their_perms = $their_perms | intval($global_perms[$k][1]);
+					}
 				}
 			}
 
@@ -436,19 +443,36 @@ function zot_refresh($them, $channel = null, $force = false) {
 				if(substr($r[0]['abook_dob'],5) == substr($next_birthday,5))
 					$next_birthday = $r[0]['abook_dob'];
 
-				$y = q("update abook set abook_dob = '%s'
+				$current_abook_connected = (intval($r[0]['abook_unconnected']) ? 0 : 1);
+
+				$y = q("update abook set abook_their_perms = %d, abook_dob = '%s'
 					where abook_xchan = '%s' and abook_channel = %d
 					and abook_self = 0 ",
+					intval($their_perms),
 					dbescdate($next_birthday),
 					dbesc($x['hash']),
 					intval($channel['channel_id'])
 				);
 
+//				if(($connected_set === 0 || $connected_set === 1) && ($connected_set !== $current_abook_unconnected)) {
+
+					// if they are in your address book but you aren't in theirs, and/or this does not
+					// match your current connected state setting, toggle it.
+					/** @FIXME uncoverted to postgres */
+					/** @FIXME when this was enabled, all contacts became unconnected. Currently disabled intentionally */
+//					$y1 = q("update abook set abook_unconnected = 1
+//						where abook_xchan = '%s' and abook_channel = %d
+//						and abook_self = 0 limit 1",
+//						dbesc($x['hash']),
+//						intval($channel['channel_id'])
+//					);
+//				}
+
 				if(! $y)
 					logger('abook update failed');
 				else {
 					// if we were just granted read stream permission and didn't have it before, try to pull in some posts
-					if((! $old_read_stream_perm) && (intval($permissions['view_stream'])))
+					if((! ($r[0]['abook_their_perms'] & PERMS_R_STREAM)) && ($their_perms & PERMS_R_STREAM))
 						Zotlabs\Daemon\Master::Summon(array('Onepoll',$r[0]['abook_id']));
 				}
 			}
@@ -456,29 +480,15 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 				// new connection
 
-				$my_perms = null;
-
 				$role = get_pconfig($channel['channel_id'],'system','permissions_role');
 				if($role) {
-					$xx = \Zotlabs\Access\PermissionRoles::role_perms($role);
-					if($xx['perms_auto']) {
-						$default_perms = $xx['perms_connect'];
-						$my_perms = \Zotlabs\Access\Permissions::FilledPerms($default_perms);
-					}
-				}
-
-				if(! $my_perms) {
-					$m = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']);
-					if($m) {
-						$my_perms = $m;
-					}
+					$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'));
 
-				if($my_perms) {
-					foreach($my_perms as $k => $v) {
-						set_abconfig($channel['channel_id'],$x['hash'],'my_perms',$k,$v);
-					}
-				}
 
 				// Keep original perms to check if we need to notify them
 				$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
@@ -488,11 +498,13 @@ function zot_refresh($them, $channel = null, $force = false) {
 				if($closeness === false)
 					$closeness = 80;
 
-				$y = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_created, abook_updated, abook_dob, abook_pending ) values ( %d, %d, %d, '%s', '%s', '%s', '%s', %d )",
+				$y = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_pending ) values ( %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )",
 					intval($channel['channel_account_id']),
 					intval($channel['channel_id']),
 					intval($closeness),
 					dbesc($x['hash']),
+					intval($their_perms),
+					intval($default_perms),
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
 					dbesc($next_birthday),
@@ -511,7 +523,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 					);
 
 					if($new_connection) {
-						if(! \Zotlabs\Access\Permissions::PermsCompare($new_perms,$previous_perms))
+						if($new_perms != $previous_perms)
 							Zotlabs\Daemon\Master::Summon(array('Notifier','permission_create',$new_connection[0]['abook_id']));
 						Zotlabs\Lib\Enotify::submit(array(
 							'type'       => NOTIFY_INTRO,
@@ -520,9 +532,9 @@ function zot_refresh($them, $channel = null, $force = false) {
 							'link'       => z_root() . '/connedit/' . $new_connection[0]['abook_id'],
 						));
 					
-						if(intval($permissions['view_stream'])) {
-							if(intval(get_pconfig($channel['channel_id'],'perm_limits','send_stream') & PERMS_PENDING)
-								|| (! intval($new_connection[0]['abook_pending'])))
+						if($their_perms & PERMS_R_STREAM) {
+							if(($channel['channel_w_stream'] & PERMS_PENDING)
+								|| (! intval($new_connection[0]['abook_pending'])) )
 								Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
 						}
 
@@ -1359,8 +1371,8 @@ function public_recips($msg) {
 	if($msg['message']['type'] === 'activity') {
 		if(! get_config('system','disable_discover_tab'))
 			$include_sys = true;
-		$perm = 'send_stream';
-
+		$col = 'channel_w_stream';
+		$field = PERMS_W_STREAM;
 		if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {
 			// check mention recipient permissions on top level posts only
 			$check_mentions = true;
@@ -1392,30 +1404,65 @@ function public_recips($msg) {
 			// contains the tag. we'll solve that further below.
 
 			if($msg['notify']['sender']['guid_sig'] != $msg['message']['owner']['guid_sig']) {
-				$perm = 'post_comments';
+				$col = 'channel_w_comment';
+				$field = PERMS_W_COMMENT;
 			}
 		}
 	}
-	elseif($msg['message']['type'] === 'mail')
-		$perm = 'post_mail';
+	elseif($msg['message']['type'] === 'mail') {
+		$col = 'channel_w_mail';
+		$field = PERMS_W_MAIL;
+	}
 
-	$r = array();
-	
-	$c = q("select channel_id, channel_hash from channel where channel_removed = 0");
-	if($c) {
-		foreach($c as $cc) {
-			if(perm_is_allowed($cc['channel_id'],$msg['notify']['sender']['hash'],$perm)) {
-				$r[] = [ 'hash' => $cc['channel_hash'] ];
-			}
-		}
+	if(! $col)
+		return NULL;
+
+	$col = dbesc($col);
+
+	// First find those channels who are accepting posts from anybody, or at least
+	// something greater than just their connections.
+
+	if($msg['notify']['sender']['url'] === z_root()) {
+		$sql = " where (( " . $col . " & " . intval(PERMS_NETWORK) . " ) > 0
+					or (  " . $col . " & " . intval(PERMS_SITE) . " ) > 0
+					or (  " . $col . " & " . intval(PERMS_PUBLIC) . ") > 0
+					or (  " . $col . " & " . intval(PERMS_AUTHED)  . ") > 0 ) ";
+	} else {
+		$sql = " where ( " . $col . " = " . intval(PERMS_NETWORK) . " 
+					or " . $col . " = " . intval(PERMS_PUBLIC) . "
+					or " . $col . " = " . intval(PERMS_AUTHED) . " ) ";
 	}
 
-	// logger('message: ' . print_r($msg['message'],true));
+	$r = q("select channel_hash as hash from channel $sql or channel_hash = '%s'
+		and channel_removed = 0 ",
+		dbesc($msg['notify']['sender']['hash'])
+	);
+
+	if(! $r)
+		$r = array();
+
+	// Now we have to get a bit dirty. Find every channel that has the sender in their connections (abook)
+	// and is allowing this sender at least at a high level.
+
+	$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id
+		where abook_xchan = '%s' and channel_removed = 0
+		and (( " . $col . " = " . intval(PERMS_SPECIFIC) . " and ( abook_my_perms & " . intval($field) . " ) > 0 )
+		OR   " . $col . " = " . intval(PERMS_PENDING) . " 
+		OR  ( " . $col . " = " . intval(PERMS_CONTACTS) . " and abook_pending = 0 )) ",
+		dbesc($msg['notify']['sender']['hash'])
+	);
+
+	if(! $x)
+		$x = array();
+
+	$r = array_merge($r,$x);
+
+	//logger('message: ' . print_r($msg['message'],true));
 
 	if($include_sys && array_key_exists('public_scope',$msg['message']) && $msg['message']['public_scope'] === 'public') {
 		$sys = get_sys_channel();
 		if($sys)
-			$r[] = [ 'hash' => $sys['channel_hash'] ];
+			$r[] = array('hash' => $sys['channel_hash']);
 	}
 
 	// look for any public mentions on this site
@@ -1896,9 +1943,9 @@ function remove_community_tag($sender, $arr, $uid) {
 	$i = $r[0];
 
 	if($i['target'])
-		$i['target'] = json_decode($i['target'],true);
+		$i['target'] = json_decode_plus($i['target']);
 	if($i['object'])
-		$i['object'] = json_decode($i['object'],true);
+		$i['object'] = json_decode_plus($i['object']);
 
 	if(! ($i['target'] && $i['object'])) {
 		logger('remove_community_tag: no target/object');
@@ -2951,14 +2998,6 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
 	$channel = $r[0];
 
-	translate_channel_perms_outbound($channel);
-	if($packet && array_key_exists('abook',$packet) && $packet['abook']) {
-		for($x = 0; $x < count($packet['abook']); $x ++) {
-			translate_abook_perms_outbound($packet['abook'][$x]);
-		}
-	}
-
-
 	if(intval($channel['channel_removed']))
 		return;
 
@@ -3082,8 +3121,7 @@ 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. */
+	/** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */
 
 	$result = array();
 
@@ -3156,8 +3194,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 		if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
 
-			translate_channel_perms_inbound($arr['channel']);
-
 			if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
 				// These flags cannot be sync'd.
 				// remove the bits from the incoming flags.
@@ -3171,15 +3207,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 			}
 			
-			$disallowed = [ 
-				'channel_id',        'channel_account_id',  'channel_primary',   'channel_prvkey', 
-				'channel_address',   'channel_notifyflags', 'channel_removed',   'channel_deleted', 
-				'channel_system',    'channel_r_stream',    'channel_r_profile', 'channel_r_abook', 
-				'channel_r_storage', 'channel_r_pages',     'channel_w_stream',  'channel_w_wall', 
-				'channel_w_comment', 'channel_w_mail',      'channel_w_like',    'channel_w_tagwall', 
-				'channel_w_chat',    'channel_w_storage',   'channel_w_pages',   'channel_a_republish', 
-				'channel_a_delegate' 
-			];
+			$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', 'channel_system');
 
 			$clean = array();
 			foreach($arr['channel'] as $k => $v) {
@@ -3215,8 +3243,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 			foreach($arr['abook'] as $abook) {
 
-				
-
 				$abconfig = null;
 
 				if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig']))
@@ -3311,12 +3337,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 					}
 				}
 
-				// This will set abconfig vars if the sender is using old-style fixed permissions
-				// using the raw abook record as passed to us. New-style permissions will fall through
-				// and be set using abconfig
-
-				translate_abook_perms_inbound($channel,$abook);
-
 				if($abconfig) {
 					// @fixme does not handle sync of del_abconfig
 					foreach($abconfig as $abc) {
@@ -3782,21 +3802,11 @@ function zotinfo($arr) {
 	}
 	else {
 		// check if it has characteristics of a public forum based on custom permissions.
-		$t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ",
-			intval($e['channel_id']),
-			intval($e['channel_hash'])
+		$t = q("select abook_my_perms from abook where abook_channel = %d and abook_self = 1 limit 1",
+			intval($e['channel_id'])
 		);
-		$ch = 0;
-		if($t) {
-			foreach($t as $tt) {
-				if($tt['k'] == 'tag_deliver' && $tt['v'] == 1)
-					$ch ++;
-				if($tt['k'] == 'send_stream' && $tt['v'] == 0)
-					$ch ++;
-			}
-			if($ch == 2)
-				$public_forum = true;
-		}
+		if(($t) && (($t[0]['abook_my_perms'] & PERMS_W_TAGWALL) && (! ($t[0]['abook_my_perms'] & PERMS_W_STREAM))))
+			$public_forum = true;
 	}