From 3d264f5a55f340e3c20c1181c8b4578abecf3f1c Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 3 Mar 2021 12:39:41 +0000
Subject: php8: fix warnings during install procedure

(cherry picked from commit 48bae9d4219735bc44f4ee72228d19d3e6b9efc9)
---
 Zotlabs/Module/Setup.php | 82 +++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 40 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 541e4fa21..ca8c19600 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -63,15 +63,15 @@ class Setup extends \Zotlabs\Web\Controller {
 				return;
 				// implied break;
 			case 3:
-				$dbhost = trim($_POST['dbhost']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$adminmail = trim($_POST['adminmail']);
-				$siteurl = trim($_POST['siteurl']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				// $siteurl should not have a trailing slash
 
@@ -88,16 +88,16 @@ class Setup extends \Zotlabs\Web\Controller {
 				return;
 				// implied break;
 			case 4:
-				$dbhost = trim($_POST['dbhost']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$timezone = trim($_POST['timezone']);
-				$adminmail = trim($_POST['adminmail']);
-				$siteurl = trim($_POST['siteurl']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$timezone = ((isset($_POST['timezone'])) ? trim($_POST['timezone']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				if($siteurl != z_root()) {
 					$test = z_fetch_url($siteurl."/setup/testrewrite");
@@ -108,12 +108,14 @@ class Setup extends \Zotlabs\Web\Controller {
 					}
 				}
 
-				if(! \DBA::$dba->connected) {
+				$db = null;
+
+				if(! isset(\DBA::$dba->connected)) {
 					// connect to db
 					$db = \DBA::dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);
 				}
 
-				if(! \DBA::$dba->connected) {
+				if(! isset(\DBA::$dba->connected)) {
 					echo 'CRITICAL: DB not connected.';
 					killme();
 				}
@@ -126,7 +128,7 @@ class Setup extends \Zotlabs\Web\Controller {
 					'$dbpass'      => $dbpass,
 					'$dbdata'      => $dbdata,
 					'$dbtype'      => $dbtype,
-					'$server_role' => 'pro',
+					'$server_role' => '',
 					'$timezone'    => $timezone,
 					'$siteurl'     => $siteurl,
 					'$site_id'     => random_string(),
@@ -267,14 +269,14 @@ class Setup extends \Zotlabs\Web\Controller {
 
 			case 2: { // Database config
 
-				$dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-				$dbuser = trim($_POST['dbuser']);
-				$dbport = intval(trim($_POST['dbport']));
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-				$adminmail = trim($_POST['adminmail']);
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '127.0.0.1');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
 
 				$tpl = get_markup_template('install_db.tpl');
 				$o .= replace_macros($tpl, array(
@@ -307,17 +309,17 @@ class Setup extends \Zotlabs\Web\Controller {
 			}; break;
 			case 3: { // Site settings
 				require_once('include/datetime.php');
-				$dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
-				$dbport = intval(trim($_POST['dbuser']));
-				$dbuser = trim($_POST['dbuser']);
-				$dbpass = trim($_POST['dbpass']);
-				$dbdata = trim($_POST['dbdata']);
-				$dbtype = intval(trim($_POST['dbtype']));
-				$phpath = trim($_POST['phpath']);
-
-				$adminmail = trim($_POST['adminmail']);
-				$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 
+				$dbhost = ((isset($_POST['dbhost'])) ? trim($_POST['dbhost']) : '127.0.0.1');
+				$dbuser = ((isset($_POST['dbuser'])) ? trim($_POST['dbuser']) : '');
+				$dbport = ((isset($_POST['dbport'])) ? intval(trim($_POST['dbport'])) : 0);
+				$dbpass = ((isset($_POST['dbpass'])) ? trim($_POST['dbpass']) : '');
+				$dbdata = ((isset($_POST['dbdata'])) ? trim($_POST['dbdata']) : '');
+				$dbtype = ((isset($_POST['dbtype'])) ? intval(trim($_POST['dbtype'])) : 0);
+				$phpath = ((isset($_POST['phpath'])) ? trim($_POST['phpath']) : '');
+				$timezone = ((isset($_POST['timezone'])) ? trim($_POST['timezone']) : 'America/Los_Angeles');
+				$adminmail = ((isset($_POST['adminmail'])) ? trim($_POST['adminmail']) : '');
+				$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
 
 				$tpl = get_markup_template('install_settings.tpl');
 				$o .= replace_macros($tpl, array(
-- 
cgit v1.2.3


From 1da494a2a5108eaf07821d30cea23564ceaa9506 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 5 Mar 2021 08:15:41 +0000
Subject: sse_bs: if Enotify::format() returns an empty array do not add it to
 notifications (the item has probably been blocked)

---
 Zotlabs/Module/Sse_bs.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 396e07001..3b39d5b49 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -181,7 +181,10 @@ class Sse_bs extends Controller {
 				$result['network']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['network']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['network']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -250,7 +253,10 @@ class Sse_bs extends Controller {
 				$result['dm']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['dm']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['dm']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -319,7 +325,10 @@ class Sse_bs extends Controller {
 				$result['home']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['home']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['home']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -400,7 +409,10 @@ class Sse_bs extends Controller {
 				$result['pubs']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
 				xchan_query($items);
 				foreach($items as $item) {
-					$result['pubs']['notifications'][] = Enotify::format($item);
+					$parsed = Enotify::format($item);
+					if($parsed) {
+						$result['pubs']['notifications'][] = $parsed;
+					}
 				}
 			}
 			else {
@@ -592,7 +604,10 @@ class Sse_bs extends Controller {
 		if($r) {
 			xchan_query($r);
 			foreach($r as $rr) {
-				$result['files']['notifications'][] = Enotify::format($rr);
+					$parsed = Enotify::format($rr);
+					if($parsed) {
+						$result['files']['notifications'][] = $parsed;
+					}
 			}
 			$result['files']['count'] = count($r);
 		}
-- 
cgit v1.2.3


From 7e0416ac97ad90bd34c7e9a60a8370d23f3891b9 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Mon, 8 Mar 2021 19:05:03 +0000
Subject: Remove unusable variable $sql_query

---
 Zotlabs/Module/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index ee360dac5..87697f5a7 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -180,7 +180,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
-				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);
-- 
cgit v1.2.3


From 03bfb8a46f734f618ea80d14ab6f50eafeec2a66 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Mon, 8 Mar 2021 19:21:38 +0000
Subject: Define $sql_extra2 variable before extending

---
 Zotlabs/Module/Channel.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index a513523a7..5b8dbaac4 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -328,6 +328,7 @@ class Channel extends Controller {
 		}
 		else {
 
+			$sql_extra2 = '';
 			if (x($category)) {
 				$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
 			}
-- 
cgit v1.2.3


From 92ada6eb98300ad7d730ffb7ad05aa9aa11aa350 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Tue, 9 Mar 2021 09:07:47 +0000
Subject: Change set_linkified_perms() arguments order

---
 Zotlabs/Module/Item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index bc35ac452..f3e8e4e57 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -832,7 +832,7 @@ class Item extends Controller {
 			if($results) {
 
 				// Set permissions based on tag replacements
-				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
+				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $private, $parent_item);
 
 				foreach($results as $result) {
 					$success = $result['success'];
-- 
cgit v1.2.3


From 723d757091d55a09633d09119a7214ff64d6eff0 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Tue, 9 Mar 2021 09:08:33 +0000
Subject: Change set_linkified_perms() arguments order

---
 Zotlabs/Module/Channel_calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index ac1545644..26c6aaf40 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -116,7 +116,7 @@ class Channel_calendar extends Controller {
 
 		if ($results) {
 			// Set permissions based on tag replacements
-			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, false, $private);
+			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, $private);
 
 			foreach ($results as $result) {
 				$success = $result['success'];
-- 
cgit v1.2.3


From ed981ec8e818892ee15f0971e387cd269ec59689 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 9 Mar 2021 10:47:13 +0000
Subject: fix profile not found if not logged in

---
 Zotlabs/Module/Profile.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
index 118f11f64..bcc7ad930 100644
--- a/Zotlabs/Module/Profile.php
+++ b/Zotlabs/Module/Profile.php
@@ -29,26 +29,28 @@ class Profile extends Controller {
 			return;
 		}
 
-		$profile = '';
-		$channel = App::get_channel();
-
-		if (!$channel)
-			http_status_exit(404, 'Not found');
-
 		if (ActivityStreams::is_as_request()) {
+			$channel = channelx_by_nick($which);
+			if (!$channel) {
+				http_status_exit(404, 'Not found');
+			}
+
 			$p = Activity::encode_person($channel, true);
 			as_return_and_die(['type' => 'Profile', 'describes' => $p], $channel);
 		}
 
-		nav_set_selected('Profile');
+		$profile = '';
 
 		if ((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+			$channel = App::get_channel();
 			$which   = $channel['channel_address'];
 			$profile = argv(1);
-			$r       = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+
+			$r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
 				intval($profile),
 				intval(local_channel())
 			);
+
 			if (!$r)
 				$profile = '';
 			$profile = $r[0]['profile_guid'];
@@ -80,7 +82,6 @@ class Profile extends Controller {
 
 		profile_load($which, $profile);
 
-
 	}
 
 	function get() {
@@ -89,11 +90,10 @@ class Profile extends Controller {
 			return login();
 		}
 
-		$groups = [];
-
+		nav_set_selected('Profile');
 
-		$tab = 'profile';
-		$o   = '';
+		$groups = [];
+		$o      = '';
 
 		if (!(perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_profile'))) {
 			notice(t('Permission denied.') . EOL);
-- 
cgit v1.2.3


From 7ee495624e71125074a4eb9f5533a7af2db2f6b6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 9 Mar 2021 21:36:28 +0100
Subject: a possible fix for issue #1529

---
 Zotlabs/Module/Channel.php | 2 +-
 Zotlabs/Module/Network.php | 4 ++--
 Zotlabs/Module/Search.php  | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 5b8dbaac4..233e5ac86 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -28,7 +28,7 @@ class Channel extends Controller {
 	function init() {
 
 		if (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
-			goaway('search' . '?f=&search=' . $_GET['search']);
+			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
 
 		$which = null;
 		if (argc() > 1)
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 84c2463d6..8a1b51a18 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -21,12 +21,12 @@ class Network extends \Zotlabs\Web\Controller {
 		}
 
 		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
-			goaway('search' . '?f=&search=' . $_GET['search']);
+			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
 
 		if(count($_GET) < 2) {
 			$network_options = get_pconfig(local_channel(),'system','network_page_default');
 			if($network_options)
-				goaway('network' . '?f=&' . $network_options);
+				goaway(z_root() . '/network?f=&' . $network_options);
 		}
 
 		$channel = App::get_channel();
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index eeeff9613..8a87d98f7 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -14,7 +14,6 @@ class Search extends Controller {
 			App::$data['search'] = escape_tags($_REQUEST['search']);
 	}
 
-
 	function get($update = 0, $load = false) {
 
 		if ((get_config('system', 'block_public')) || (get_config('system', 'block_public_search'))) {
@@ -194,7 +193,7 @@ class Search extends Controller {
 
 				if (local_channel()) {
 					$r = q("SELECT mid, MAX(id) as item_id from item
-						WHERE ((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item_private = 0 ) 
+						WHERE ((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item_private = 0 )
 						OR ( item.uid = %d )) OR item.owner_xchan = '%s' )
 						$item_normal
 						$sql_extra
@@ -210,7 +209,7 @@ class Search extends Controller {
 						and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK | PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 							$pub_sql ) OR owner_xchan = '%s')
 						$item_normal
-						$sql_extra 
+						$sql_extra
 						group by mid, created order by created desc $pager_sql",
 						dbesc($sys['xchan_hash'])
 					);
-- 
cgit v1.2.3


From 15faf01ec960fff88a1f9c83fb6d251319cecea7 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 10 Mar 2021 11:09:49 +0000
Subject: do not parse bbcode in summary - issue #1532

---
 Zotlabs/Module/Item.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index f3e8e4e57..32c146bce 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -821,12 +821,10 @@ class Item extends Controller {
 			// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.)
 			// we may need virtual or template classes to implement the possible alternatives
 
-			$summary = cleanup_bbcode($summary);
 			$body = cleanup_bbcode($body);
 
 			// Look for tags and linkify them
 
-			$results = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
 			$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
 
 			if($results) {
-- 
cgit v1.2.3


From 11d831e4d7bd4163ea518892f541252ce1acea2e Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 10 Mar 2021 11:14:02 +0000
Subject: More PHP 8 fixes

---
 Zotlabs/Module/Channel.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 233e5ac86..ab5000b9a 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -27,7 +27,7 @@ class Channel extends Controller {
 
 	function init() {
 
-		if (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
+		if (array_key_exists('search', $_GET) && (in_array(substr($_GET['search'], 0, 1), ['@', '!', '?']) || strpos($_GET['search'], 'https://') === 0))
 			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
 
 		$which = null;
@@ -155,7 +155,7 @@ class Channel extends Controller {
 				intval($channel['channel_id'])
 			);
 
-		opengraph_add_meta($r ? $r[0] : [], $channel);
+		opengraph_add_meta((isset($r) && count($r) ? $r[0] : []), $channel);
 	}
 
 	function get($update = 0, $load = false) {
@@ -168,7 +168,7 @@ class Channel extends Controller {
 
 		if (strpos($mid, 'b64.') === 0)
 			$decoded = @base64url_decode(substr($mid, 4));
-		if ($decoded)
+		if (isset($decoded))
 			$mid = $decoded;
 
 		$datequery  = ((x($_GET, 'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
@@ -420,7 +420,7 @@ class Channel extends Controller {
 
 		if ((!$update) && (!$load)) {
 
-			if ($decoded)
+			if (isset($decoded))
 				$mid = 'b64.' . base64url_encode($mid);
 
 			// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
@@ -486,7 +486,7 @@ class Channel extends Controller {
 
 			$o .= conversation($items, $mode, $update, $page_mode);
 
-			if ($mid && $items[0]['title'])
+			if ($mid && count($items) > 0 && isset($items[0]['title']))
 				App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
 
 		}
-- 
cgit v1.2.3


From f8447521a84c0eb30c08da212e8156256558617b Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 10 Mar 2021 13:16:08 +0000
Subject: php8: random fixes deriving from mod network

---
 Zotlabs/Module/Network.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 8a1b51a18..4f9450f2f 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -20,8 +20,10 @@ class Network extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		if(in_array(substr($_GET['search'],0,1),[ '@', '!', '?']) || strpos($_GET['search'], 'https://') === 0)
-			goaway(z_root() . '/search?f=&search=' . $_GET['search']);
+		$search = $_GET['search'] ?? '';
+
+		if(in_array(substr($search, 0, 1),[ '@', '!', '?']) || strpos($search, 'https://') === 0)
+			goaway(z_root() . '/search?f=&search=' . $search);
 
 		if(count($_GET) < 2) {
 			$network_options = get_pconfig(local_channel(),'system','network_page_default');
@@ -80,7 +82,7 @@ class Network extends \Zotlabs\Web\Controller {
 				break;
 		}
 
-		$search = (($_GET['search']) ? $_GET['search'] : '');
+		$search = $_GET['search'] ?? '';
 		if($search) {
 			if(strpos($search,'#') === 0) {
 				$hashtags = substr($search,1);
-- 
cgit v1.2.3


From b51049227f28bc1badf9387ea5bff16bfd7debcd Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 10 Mar 2021 20:34:47 +0000
Subject: fix mod display query

---
 Zotlabs/Module/Display.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 2aa4f6548..15dfb0dc9 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -243,7 +243,7 @@ class Display extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
 
-		$sql_extra = public_permissions_sql($observer_hash);
+		$sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
 
 		if($noscript_content || $load) {
 
@@ -260,8 +260,7 @@ class Display extends \Zotlabs\Web\Controller {
 				);
 			}
 
-			if(! $r) {
-
+			if($r === null) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner uid can't match
 
@@ -269,20 +268,18 @@ class Display extends \Zotlabs\Web\Controller {
 					$sysid = 0;
 
 				$r = q("SELECT item.id as item_id from item
-					WHERE ( (mid = '%s'
+					WHERE ((mid = '%s'
 					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d ) ) ) OR
-					(mid = '%s' $sql_extra ) )
+					OR uid = %d ))) OR
+					(mid = '%s' $sql_extra ))
 					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
 					intval($sysid),
 					dbesc($target_item['parent_mid'])
 				);
-
-
 			}
 		}
 
@@ -306,20 +303,22 @@ class Display extends \Zotlabs\Web\Controller {
 			if($r === null) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner_xchan can't match
+
 				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
 					$sysid = 0;
-				$r = q("SELECT item.parent AS item_id from item
-					WHERE parent_mid = '%s'
+
+				$r = q("SELECT item.id as item_id from item
+					WHERE ((parent_mid = '%s'
 					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-					OR uid = %d )
-					$sql_extra )
-					$item_normal_update
-					$simple_update
+					OR uid = %d ))) OR
+					(parent_mid = '%s' $sql_extra ))
+					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
-					intval($sysid)
+					intval($sysid),
+					dbesc($target_item['parent_mid'])
 				);
 			}
 		}
-- 
cgit v1.2.3


From f980c2e3de0339536d58c9ba91799106074b239e Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 11 Mar 2021 13:03:54 +0000
Subject: php8: daily warning fixes (deriving from mod network)

---
 Zotlabs/Module/Network.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 4f9450f2f..ee6ff3619 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -130,17 +130,19 @@ class Network extends \Zotlabs\Web\Controller {
 		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
 		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
 
-                if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
+		if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
 			$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
 			if ($affinity_locked) {
-                        	set_pconfig(local_channel(),'affinity','cmin',$cmin);
-                        	set_pconfig(local_channel(),'affinity','cmax',$cmax);
+				set_pconfig(local_channel(),'affinity','cmin',$cmin);
+				set_pconfig(local_channel(),'affinity','cmax',$cmax);
 			}
-                }
+		}
 
 		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
 			$nouveau = true;
 
+		$cid_r = [];
+
 		if($cid) {
 			$cid_r = q("SELECT abook.abook_xchan, xchan.xchan_addr, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s, xchan.xchan_pubforum from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and abook_blocked = 0 limit 1",
 				intval($cid),
-- 
cgit v1.2.3


From d2b03f6a9bcb8f0b13bf45f9165f5f2efdfe35cb Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 11 Mar 2021 20:11:05 +0000
Subject: more add interactive flag

---
 Zotlabs/Module/Connect.php   | 58 ++++++++++++++++++++++----------------------
 Zotlabs/Module/Directory.php |  2 +-
 Zotlabs/Module/Suggest.php   | 34 +++++++++++++-------------
 3 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php
index 31da42035..b934cb963 100644
--- a/Zotlabs/Module/Connect.php
+++ b/Zotlabs/Module/Connect.php
@@ -18,11 +18,11 @@ class Connect extends Controller {
 			App::$error = 404;
 			return;
 		}
-	
+
 		$r = q("select * from channel where channel_address = '%s' limit 1",
 			dbesc($which)
 		);
-	
+
 		if($r)
 			App::$data['channel'] = $r[0];
 
@@ -30,36 +30,36 @@ class Connect extends Controller {
 
 		profile_load($which,'');
 	}
-	
+
 	function post() {
-	
+
 		if(! array_key_exists('channel', App::$data))
 			return;
 
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		if($edit) {
 			$has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0);
 			$premium = (($_POST['premium']) ? intval($_POST['premium']) : 0);
 			$text = escape_tags($_POST['text']);
-			
+
 			if($has_premium != $premium) {
 				$r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d",
 					db_getfunc('^'),
 					intval(PAGE_PREMIUM),
-					intval(local_channel()) 
+					intval(local_channel())
 				);
-				
+
 				\Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',$channel_id));
 			}
 			set_pconfig($channel_id,'system','selltext',$text);
 			// reload the page completely to get fresh data
 			goaway(z_root() . '/' . App::$query_string);
-	
+
 		}
-	
+
 		$url = '';
 		$observer = App::get_observer();
 		if(($observer) && ($_POST['submit'] === t('Continue'))) {
@@ -70,18 +70,18 @@ class Connect extends Controller {
 					dbesc($observer['xchan_hash'])
 				);
 				if($r)
-					$url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel']));
+					$url = $r[0]['hubloc_url'] . '/follow?f=&interactive=1&url=' . urlencode(channel_reddress(App::$data['channel']));
 			}
 		}
 		if($url)
 			goaway($url . '&confirm=1');
 		else
 			notice('Unable to connect to your home hub location.');
-	
+
 	}
-	
-	
-	
+
+
+
 	function get() {
 
 		if(! array_key_exists('channel', App::$data))
@@ -90,11 +90,11 @@ class Connect extends Controller {
 		$channel_id = App::$data['channel']['channel_id'];
 
 		$edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false);
-	
+
 		$text = get_pconfig($channel_id,'system','selltext');
-	
+
 		if($edit) {
-	
+
 			$o = replace_macros(get_markup_template('sellpage_edit.tpl'),array(
 				'$header' => t('Premium Channel Setup'),
 				'$address' => App::$data['channel']['channel_address'],
@@ -105,36 +105,36 @@ class Connect extends Controller {
 				'$lbl2' => t('Potential connections will then see the following text before proceeding:'),
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => t('Submit'),
-	
-	
+
+
 			));
 			return $o;
 		}
 		else {
 			if(! $text)
 				$text = t('(No specific instructions have been provided by the channel owner.)');
-	
+
 			$submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array(
-				'$continue' => t('Continue'),			
+				'$continue' => t('Continue'),
 				'$address' => App::$data['channel']['channel_address']
 			));
-	
+
 			$o = replace_macros(get_markup_template('sellpage_view.tpl'),array(
 				'$header' => t('Restricted or Premium Channel'),
 				'$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'),
-				'$text' => prepare_text($text), 
-	
+				'$text' => prepare_text($text),
+
 				'$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'),
 				'$submit' => $submit,
-	
+
 			));
-	
+
 			$arr = array('channel' => App::$data['channel'],'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit);
 			call_hooks('connect_premium', $arr);
 			$o = $arr['sellpage'];
-	
+
 		}
-	
+
 		return $o;
 	}
 }
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 7295f3099..e1555fc2d 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -245,7 +245,7 @@ class Directory extends Controller {
 							$profile_link = chanlink_url($rr['url']);
 
 							$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
-							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : '');
+							$connect_link = ((local_channel()) ? z_root() . '/follow?f=&interactive=1&url=' . urlencode($rr['address']) : '');
 
 							// Checking status is disabled ATM until someone checks the performance impact more carefully
 							//$online = remote_online_status($rr['address']);
diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php
index 18961214e..0ed6ea8d7 100644
--- a/Zotlabs/Module/Suggest.php
+++ b/Zotlabs/Module/Suggest.php
@@ -15,17 +15,17 @@ class Suggest extends \Zotlabs\Web\Controller {
 
 		if(! Apps::system_app_installed(local_channel(), 'Suggest Channels'))
 			return;
-	
+
 		if(x($_GET,'ignore')) {
 			q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ",
 				intval(local_channel()),
 				dbesc($_GET['ignore'])
 			);
 		}
-	
+
 	}
-			
-	
+
+
 	function get() {
 
 		if(! local_channel()) {
@@ -45,22 +45,22 @@ class Suggest extends \Zotlabs\Web\Controller {
 		$o = '';
 
 		nav_set_selected('Suggest Channels');
-	
+
 		$_SESSION['return_url'] = z_root() . '/' . \App::$cmd;
-	
+
 		$r = suggestion_query(local_channel(),get_observer_hash());
-	
+
 		if(! $r) {
 			info( t('No suggestions available. If this is a new site, please try again in 24 hours.'));
 			return;
 		}
-	
+
 		$arr = array();
-	
+
 		foreach($r as $rr) {
-	
-			$connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
-	
+
+			$connlnk = z_root() . '/follow?f=&url=' . $rr['xchan_addr'];
+
 			$arr[] = array(
 				'url' => chanlink_url($rr['xchan_url']),
 				'common' => $rr['total'],
@@ -73,15 +73,15 @@ class Suggest extends \Zotlabs\Web\Controller {
 				'ignore' => t('Ignore/Hide')
 			);
 		}
-	
-	
+
+
 		$o = replace_macros(get_markup_template('suggest_page.tpl'),array(
 			'$title' => t('Channel Suggestions'),
 			'$entries' => $arr
 		));
-	
+
 		return $o;
-	
+
 	}
-	
+
 }
-- 
cgit v1.2.3


From 31e237729c3cd1b0ccbef67db5b7f36e1027c6dc Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 11 Mar 2021 21:58:45 +0000
Subject: introduce the follow_failover hook

---
 Zotlabs/Module/Follow.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index 11febd8fc..d4e8d1a0c 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -14,7 +14,7 @@ use Zotlabs\Daemon\Master;
 class Follow extends Controller {
 
 	function init() {
-	
+
 		if (ActivityStreams::is_as_request() && argc() == 2) {
 
 			$abook_id = intval(argv(1));
@@ -73,12 +73,20 @@ class Follow extends Controller {
 		$url = notags(trim(punify($_REQUEST['url'])));
 		$return_url = $_SESSION['return_url'];
 		$confirm = intval($_REQUEST['confirm']);
-		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);	
+		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);
 		$channel = App::get_channel();
 
 		$result = Connect::connect($channel,$url);
-		
+
 		if ($result['success'] == false) {
+
+			// this hook is currently used for mastodons remote reply functionality
+			$hookdata = [
+				'channel' => $channel,
+				'data' => $url
+			];
+			call_hooks('follow_failover', $hookdata);
+
 			if ($result['message']) {
 				notice($result['message']);
 			}
@@ -89,9 +97,9 @@ class Follow extends Controller {
 				json_return_and_die($result);
 			}
 		}
-	
+
 		info( t('Connection added.') . EOL);
-	
+
 		$clone = array();
 		foreach ($result['abook'] as $k => $v) {
 			if (strpos($k,'abook_') === 0) {
@@ -101,30 +109,30 @@ class Follow extends Controller {
 		unset($clone['abook_id']);
 		unset($clone['abook_account']);
 		unset($clone['abook_channel']);
-	
+
 		$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 		if ($abconfig) {
 			$clone['abconfig'] = $abconfig;
 		}
 		Libsync::build_sync_packet(0, [ 'abook' => [ $clone ] ], true);
-	
+
 		$can_view_stream = their_perms_contains($channel['channel_id'],$clone['abook_xchan'],'view_stream');
-	
+
 		// If we can view their stream, pull in some posts
-	
+
 		if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
 			Master::Summon([ 'Onepoll', $result['abook']['abook_id'] ]);
 		}
-	
+
 		if ($interactive) {
 			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
 		}
 		else {
 			json_return_and_die([ 'success' => true ]);
 		}
-	
+
 	}
-	
+
 	function get() {
 		if (! local_channel()) {
 			return login();
-- 
cgit v1.2.3


From 432e7e9714a98d9438a135451fa09c9486cb160f Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 12 Mar 2021 09:06:20 +0000
Subject: revert follow_failover hook - there is a cleaner solution

---
 Zotlabs/Module/Follow.php | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index d4e8d1a0c..4fe20f56b 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -79,14 +79,6 @@ class Follow extends Controller {
 		$result = Connect::connect($channel,$url);
 
 		if ($result['success'] == false) {
-
-			// this hook is currently used for mastodons remote reply functionality
-			$hookdata = [
-				'channel' => $channel,
-				'data' => $url
-			];
-			call_hooks('follow_failover', $hookdata);
-
 			if ($result['message']) {
 				notice($result['message']);
 			}
-- 
cgit v1.2.3


From b9e1c38773d761a85132e6656995431b3e5980dd Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 13 Mar 2021 22:13:17 +0000
Subject: fix mod subthread for zot6

(cherry picked from commit 22d769ecae17c9d5d36232c543b48b0a155ca502)
---
 Zotlabs/Module/Subthread.php | 115 +++++++++++++++++++------------------------
 Zotlabs/Module/Zotfeed.php   |   2 +-
 2 files changed, 51 insertions(+), 66 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
index 30e57197d..a796d85cb 100644
--- a/Zotlabs/Module/Subthread.php
+++ b/Zotlabs/Module/Subthread.php
@@ -1,6 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Lib\Activity;
+
+
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
@@ -10,22 +13,22 @@ require_once('include/items.php');
 class Subthread extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		if(! local_channel()) {
 			return;
 		}
-	
+
 		$sys = get_sys_channel();
 		$channel = \App::get_channel();
 
 		$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
-	
+
 		if(argv(1) === 'sub')
 			$activity = ACTIVITY_FOLLOW;
 		elseif(argv(1) === 'unsub')
 			$activity = ACTIVITY_UNFOLLOW;
-	
-	
+
+
 		$i = q("select * from item where id = %d and uid = %d",
 			intval($item_id),
 			intval(local_channel())
@@ -42,7 +45,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 				$item_id = (($i) ? $i[0]['id'] : 0);
 			}
 		}
-		
+
 		if(! $i) {
 			return;
 		}
@@ -56,37 +59,37 @@ class Subthread extends \Zotlabs\Web\Controller {
 				dbesc($r[0]['parent'])
 			);
 		}
-	
+
 		if((! $item_id) || (! $r)) {
 			logger('subthread: no item ' . $item_id);
 			return;
 		}
-	
+
 		$item = $r[0];
-	
+
 		$owner_uid = $item['uid'];
 		$observer = \App::get_observer();
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		if(! perm_is_allowed($owner_uid,$ob_hash,'post_comments'))
 			return;
-	
+
 		$sys = get_sys_channel();
-	
+
 		$owner_uid = $item['uid'];
 		$owner_aid = $item['aid'];
-	
+
 		// if this is a "discover" item, (item['uid'] is the sys channel),
 		// fallback to the item comment policy, which should've been
 		// respected when generating the conversation thread.
 		// Even if the activity is rejected by the item owner, it should still get attached
-		// to the local discover conversation on this site. 
-	
+		// to the local discover conversation on this site.
+
 		if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) {
 				notice( t('Permission denied') . EOL);
 				killme();
 		}
-	
+
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($item['owner_xchan'])
 		);
@@ -94,7 +97,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$thread_owner = $r[0];
 		else
 			killme();
-	
+
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($item['author_xchan'])
 		);
@@ -102,50 +105,32 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$item_author = $r[0];
 		else
 			killme();
-	
-	
-	
-	
+
+
+
+
 		$uuid = item_message_id();
 		$mid = z_root() . '/item/' . $uuid;
 
 		$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
-	
+
 		$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink']));
-		$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
-	
+		$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+
 		$body = $item['body'];
-	
-		$obj = json_encode(array(
-			'type'    => $objtype,
-			'id'      => $item['mid'],
-			'parent'  => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']),
-			'link'    => $links,
-			'title'   => $item['title'],
-			'content' => $item['body'],
-			'created' => $item['created'],
-			'edited'  => $item['edited'],
-			'author'  => array(
-				'name'     => $item_author['xchan_name'],
-				'address'  => $item_author['xchan_addr'],
-				'guid'     => $item_author['xchan_guid'],
-				'guid_sig' => $item_author['xchan_guid_sig'],
-				'link'     => array(
-					array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']),
-					array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])),
-				),
-		));
-	
+
+		$obj = Activity::fetch_item( [ 'id' => $item['mid'] ] );
+
 		if(! intval($item['item_thread_top']))
-			$post_type = 'comment';		
-	
+			$post_type = 'comment';
+
 		if($activity === ACTIVITY_FOLLOW)
 			$bodyverb = t('%1$s is following %2$s\'s %3$s');
 		if($activity === ACTIVITY_UNFOLLOW)
 			$bodyverb = t('%1$s stopped following %2$s\'s %3$s');
-	
+
 		$arr = array();
-	
+
 		$arr['uuid']          = $uuid;
 		$arr['mid']           = $mid;
 		$arr['aid']           = $owner_aid;
@@ -161,35 +146,35 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$arr['item_wall'] = 1;
 		else
 			$arr['item_wall'] = 0;
-	
+
 		$ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
 		$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
 		$plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
-		
+
 		$arr['body']          =  sprintf( $bodyverb, $alink, $ulink, $plink );
-	
+
 		$arr['verb']          = $activity;
 		$arr['obj_type']      = $objtype;
-		$arr['obj']           = $obj;
-	
+		$arr['obj']           = json_encode($obj);
+
 		$arr['allow_cid']     = $item['allow_cid'];
 		$arr['allow_gid']     = $item['allow_gid'];
 		$arr['deny_cid']      = $item['deny_cid'];
 		$arr['deny_gid']      = $item['deny_gid'];
-	
-		$post = item_store($arr);	
+
+		$post = item_store($arr);
 		$post_id = $post['item_id'];
-	
+
 		$arr['id'] = $post_id;
-	
+
 		call_hooks('post_local_end', $arr);
-	
+
 		killme();
-	
-	
+
+
 	}
-	
-	
-	
-	
+
+
+
+
 }
diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 2566924aa..6f29daec5 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -19,7 +19,7 @@ class Zotfeed extends Controller {
 				killme();
 			}
 
-			$channel = ((argv(1)) ? channelx_by_nick(argv(1)) : get_sys_channel());
+			$channel = channelx_by_nick(argv(1));
 			if (!$channel) {
 				killme();
 			}
-- 
cgit v1.2.3


From 97c7b010edd30087a98ee61183934dccfdc357a2 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 14 Mar 2021 09:01:12 +0000
Subject: mod subthread issue continued

(cherry picked from commit b6d30f67345f37dae8dfffd96b065e6139364bcd)
---
 Zotlabs/Module/Activity.php | 17 +++++++++++++----
 Zotlabs/Module/Item.php     | 14 ++++++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php
index 48f2663cf..2fbc35274 100644
--- a/Zotlabs/Module/Activity.php
+++ b/Zotlabs/Module/Activity.php
@@ -26,7 +26,12 @@ class Activity extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
@@ -86,7 +91,7 @@ class Activity extends Controller {
 			}
 
 			$parents_str = ids_to_querystr($i,'item_id');
-	
+
 			$items = q("SELECT item.*, item.id AS item_id FROM item WHERE item.parent IN ( %s ) $item_normal ",
 				dbesc($parents_str)
 			);
@@ -197,8 +202,12 @@ class Activity extends Controller {
 				}
 			}
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 
-				and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$sigdata = HTTPSig::verify(EMPTY_STR);
 			if ($sigdata['portable_id'] && $sigdata['header_valid']) {
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 32c146bce..ff52babf5 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -55,7 +55,12 @@ class Item extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
@@ -167,7 +172,12 @@ class Item extends Controller {
 
 			$portable_id = EMPTY_STR;
 
-			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 ";
+			$item_normal_extra = sprintf(" and not verb in ('%s', '%s') ",
+				dbesc(ACTIVITY_FOLLOW),
+				dbesc(ACTIVITY_UNFOLLOW)
+			);
+
+			$item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 $item_normal_extra ";
 
 			$i = null;
 
-- 
cgit v1.2.3


From 1e87fe6b4901aef213822abfbd1374cc09748850 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 14 Mar 2021 19:23:02 +0000
Subject: cleanup

(cherry picked from commit 0fbd0ca416333ee5f675651be7bce5e82aad27fe)
---
 Zotlabs/Module/Zotfeed.php | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 6f29daec5..e47367036 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -120,45 +120,5 @@ class Zotfeed extends Controller {
 
 			as_return_and_die($ret, $channel);
 		}
-
-		/*
-		$result = array('success' => false);
-
-		$mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : '');
-		if(! $mindate)
-			$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
-
-		if(observer_prohibited()) {
-			$result['message'] = 'Public access denied';
-			json_return_and_die($result);
-		}
-
-		$observer = App::get_observer();
-
-		logger('observer: ' . get_observer_hash(), LOGGER_DEBUG);
-
-		$channel_address = ((argc() > 1) ? argv(1) : '');
-		if($channel_address) {
-			$r = q("select channel_id, channel_name from channel where channel_address = '%s' and channel_removed = 0 limit 1",
-				dbesc(argv(1))
-			);
-		}
-		else {
-			$x = get_sys_channel();
-			if($x)
-				$r = array($x);
-			$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
-		}
-		if(! $r) {
-			$result['message'] = 'Channel not found.';
-			json_return_and_die($result);
-		}
-
-		logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG);
-		$result['project'] = 'Hubzilla';
-		$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate));
-		$result['success'] = true;
-		json_return_and_die($result);
-		*/
 	}
 }
-- 
cgit v1.2.3


From a9a112e06358eec9040cdc03e1f7bf93ef21378d Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 14 Mar 2021 20:23:33 +0000
Subject: php8: fix some undefined variables

(cherry picked from commit ed64eba13adf55e564d127e1640409fccca00fd3)
---
 Zotlabs/Module/Network.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index ee6ff3619..a21095940 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -457,6 +457,8 @@ class Network extends \Zotlabs\Web\Controller {
 		if($update && $_SESSION['loadtime'])
 			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
 
+		$items = [];
+
 		if($nouveau && $load) {
 			// "New Item View" - show all items unthreaded in reverse created date order
 			$items = q("SELECT item.*, item.id AS item_id, created FROM item
-- 
cgit v1.2.3


From 81b4d919e5e040a79cdab1a85a23d0166ed53687 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 22 Mar 2021 10:01:32 +0000
Subject: do not treat an URL including an @ like a webbie

(cherry picked from commit 35ce7dbeaba84ce1c93b7714f0beb5c472033bd7)
---
 Zotlabs/Module/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 8a87d98f7..73dfa0816 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -101,7 +101,7 @@ class Search extends Controller {
 		}
 
 		// look for a naked webbie
-		if (strpos($search, '@') !== false) {
+		if (strpos($search,'@') !== false && strpos($search,'http') !== 0) {
 			goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
 		}
 
-- 
cgit v1.2.3


From 8c1617185579ed2aacbc5083dcd9c6119cc119ed Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 22 Mar 2021 12:37:01 +0000
Subject: sse: make sure to also bootstrap info and notice

(cherry picked from commit 598c3aa336ac12a867be2f1ec38a3ce00f937a94)
---
 Zotlabs/Module/Sse.php    |  1 -
 Zotlabs/Module/Sse_bs.php | 32 ++++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php
index 46b4a8d87..8bea65207 100644
--- a/Zotlabs/Module/Sse.php
+++ b/Zotlabs/Module/Sse.php
@@ -47,7 +47,6 @@ class Sse extends Controller {
 
 		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
 
-		$sys = get_sys_channel();
 		$sleep_seconds = 3;
 
 		self::$sse_enabled = get_config('system', 'sse_enabled', 0);
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 3b39d5b49..3384810e1 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -6,6 +6,7 @@ use App;
 use Zotlabs\Lib\Apps;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Enotify;
+use Zotlabs\Lib\XConfig;
 
 class Sse_bs extends Controller {
 
@@ -101,12 +102,13 @@ class Sse_bs extends Controller {
 			self::bs_files(),
 			self::bs_mail(),
 			self::bs_all_events(),
-			self::bs_register()
+			self::bs_register(),
+			self::bs_info_notice()
 		);
 
-		set_xconfig(self::$ob_hash, 'sse', 'timestamp', datetime_convert());
-		set_xconfig(self::$ob_hash, 'sse', 'notifications', []); // reset the cache
-		set_xconfig(self::$ob_hash, 'sse', 'language', App::$language);
+		XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
+		XConfig::Set(self::$ob_hash, 'sse', 'timestamp', datetime_convert());
+		XConfig::Set(self::$ob_hash, 'sse', 'language', App::$language);
 
 		json_return_and_die($result);
 	}
@@ -703,4 +705,26 @@ class Sse_bs extends Controller {
 
 	}
 
+	function bs_info_notice() {
+
+		$result['notice']['notifications'] = [];
+		$result['notice']['count'] = 0;
+		$result['notice']['offset'] = -1;
+		$result['info']['notifications'] = [];
+		$result['info']['count'] = 0;
+		$result['info']['offset'] = -1;
+
+		$r = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
+
+		if(isset($r['notice']))
+			$result['notice']['notifications'] = $r['notice']['notifications'];
+
+		if(isset($r['info']))
+			$result['info']['notifications'] = $r['info']['notifications'];
+
+		return $result;
+
+	}
+
+
 }
-- 
cgit v1.2.3


From b8913335b1202a670915db244f32b8933ddab1ad Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 22 Mar 2021 12:51:11 +0000
Subject: those are not actually needed by the handler

(cherry picked from commit 872ac8846ef40cd91d8ebb8a9cf7279a64e87942)
---
 Zotlabs/Module/Sse_bs.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 3384810e1..c7580971e 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -708,11 +708,7 @@ class Sse_bs extends Controller {
 	function bs_info_notice() {
 
 		$result['notice']['notifications'] = [];
-		$result['notice']['count'] = 0;
-		$result['notice']['offset'] = -1;
 		$result['info']['notifications'] = [];
-		$result['info']['count'] = 0;
-		$result['info']['offset'] = -1;
 
 		$r = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
 
-- 
cgit v1.2.3


From dbc5e54a92058ebafc92f7137a6869a101cffaa8 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Mon, 22 Mar 2021 14:16:54 +0000
Subject: Fix DAV calendars and addressbooks sync on remote access

---
 Zotlabs/Module/Cdav.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index fe697a526..a6cab8639 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -135,7 +135,7 @@ class Cdav extends Controller {
 			$auth = new \Zotlabs\Storage\BasicAuth();
 			$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'CalDAV/CardDAV');
 
-			if (local_channel()) {
+			if(local_channel()) {
 
 				logger('loggedin');
 
@@ -151,15 +151,15 @@ class Cdav extends Controller {
 				if($channel['channel_timezone'])
 					$auth->setTimezone($channel['channel_timezone']);
 				$auth->observer = $channel['channel_hash'];
+			}
+			else
+				$channel = channelx_by_nick(argv(2));
 
-				$principalUri = 'principals/' . $channel['channel_address'];
-				if(!cdav_principal($principalUri)) {
-					$this->activate($pdo, $channel);
-					if(!cdav_principal($principalUri)) {
-						return;
-					}
-				}
-
+			$principalUri = 'principals/' . $channel['channel_address'];
+			if(! cdav_principal($principalUri)) {
+				$this->activate($pdo, $channel);
+				if(! cdav_principal($principalUri))
+					return;
 			}
 
 			// Track CDAV updates from remote clients
@@ -173,11 +173,11 @@ class Cdav extends Controller {
 				logger("debug: method: " . $httpmethod, LOGGER_DEBUG);
 				logger("debug: uri: " . $httpuri, LOGGER_DEBUG);
 
-				if(strpos($httpuri, 'cdav/addressbooks')) {
+				if(strpos($httpuri, 'cdav/addressbooks') !== false) {
 					$sync = 'addressbook';
 					$cdavtable = 'addressbooks';
 				}
-				elseif(strpos($httpuri, 'cdav/calendars')) {
+				elseif(strpos($httpuri, 'cdav/calendars') !== false) {
 					$sync = 'calendar';
 					$cdavtable = 'calendarinstances';
 				}
@@ -191,7 +191,7 @@ class Cdav extends Controller {
 
 					logger("debug: body: " . $httpbody, LOGGER_DEBUG);
 
-					if($x = get_cdav_id($principalUri, explode("/", $httpuri)[4], $cdavtable)) {
+					if($x = get_cdav_id($principalUri, argv(3), $cdavtable)) {
 
 						$cdavdata = $this->get_cdav_data($x['id'], $cdavtable);
 
-- 
cgit v1.2.3


From cc9fd4f4a47cdcfec022690fa657813a282ff7d5 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 23 Mar 2021 10:54:27 +0000
Subject: fix regression in mod display

(cherry picked from commit 43c5b723175fded3996d5bca02902a3da7eb40e8)
---
 Zotlabs/Module/Display.php | 55 ++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 15dfb0dc9..1aac7e328 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -245,71 +245,68 @@ class Display extends \Zotlabs\Web\Controller {
 
 		$sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash));
 
-		if($noscript_content || $load) {
 
-			$r = null;
+
+		if($noscript_content || $load) {
 
 			require_once('include/channel.php');
 			$sys = get_sys_channel();
-			$sysid = $sys['channel_id'];
+			// in case somebody turned off public access to sys channel content using permissions
+			// make that content unsearchable by ensuring the owner uid can't match
+			$sys_id = perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream') ? $sys['channel_id'] : 0;
+
+			$r = null;
 
 			if(local_channel()) {
-				$r = q("SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1",
+				$r = q("SELECT item.id AS item_id FROM item WHERE uid IN (%d, %d) AND mid = '%s' $item_normal LIMIT 1",
 					intval(local_channel()),
+					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 
 			if($r === null) {
-				// in case somebody turned off public access to sys channel content using permissions
-				// make that content unsearchable by ensuring the owner uid can't match
-
-				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
-					$sysid = 0;
-
-				$r = q("SELECT item.id as item_id from item
+				$r = q("SELECT item.id AS item_id FROM item
 					WHERE ((mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
-					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
+					AND uid IN ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 					OR uid = %d ))) OR
 					(mid = '%s' $sql_extra ))
 					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
-					intval($sysid),
+					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 		}
 
 		elseif($update && !$load) {
-			$r = null;
-
 			require_once('include/channel.php');
 			$sys = get_sys_channel();
-			$sysid = $sys['channel_id'];
+			// in case somebody turned off public access to sys channel content using permissions
+			// make that content unsearchable by ensuring the owner uid can't match
+			$sys_id = perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream') ? $sys['channel_id'] : 0;
+
+			$r = null;
 			if(local_channel()) {
 				$r = q("SELECT item.parent AS item_id from item
-					WHERE uid = %d
-					and parent_mid = '%s'
+					WHERE uid IN (%d, %d)
+					AND parent_mid = '%s'
 					$item_normal_update
 					$simple_update
-					limit 1",
+					LIMIT 1",
 					intval(local_channel()),
+					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
-			if($r === null) {
-				// in case somebody turned off public access to sys channel content using permissions
-				// make that content unsearchable by ensuring the owner_xchan can't match
-
-				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))
-					$sysid = 0;
 
+			if($r === null) {
 				$r = q("SELECT item.id as item_id from item
 					WHERE ((parent_mid = '%s'
-					AND (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
+					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
 					AND item.deny_gid  = '' AND item_private = 0 )
 					and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
 					OR uid = %d ))) OR
@@ -317,14 +314,14 @@ class Display extends \Zotlabs\Web\Controller {
 					$item_normal
 					limit 1",
 					dbesc($target_item['parent_mid']),
-					intval($sysid),
+					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 		}
 
 		else {
-			$r = array();
+			$r = [];
 		}
 
 		if($r) {
-- 
cgit v1.2.3


From 14186f5c1811765133f0d1c04568f87e56aab9c4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 24 Mar 2021 19:27:44 +0000
Subject: cdav: fix regression - sync code was messing with caldav/carddav
 discovery

---
 Zotlabs/Module/Cdav.php | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index a6cab8639..a7d2b1169 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -151,15 +151,15 @@ class Cdav extends Controller {
 				if($channel['channel_timezone'])
 					$auth->setTimezone($channel['channel_timezone']);
 				$auth->observer = $channel['channel_hash'];
-			}
-			else
-				$channel = channelx_by_nick(argv(2));
 
-			$principalUri = 'principals/' . $channel['channel_address'];
-			if(! cdav_principal($principalUri)) {
-				$this->activate($pdo, $channel);
-				if(! cdav_principal($principalUri))
-					return;
+				$principalUri = 'principals/' . $channel['channel_address'];
+				if(! cdav_principal($principalUri)) {
+					$this->activate($pdo, $channel);
+					if(! cdav_principal($principalUri)) {
+						return;
+					}
+				}
+
 			}
 
 			// Track CDAV updates from remote clients
@@ -168,6 +168,8 @@ class Cdav extends Controller {
 
 			if($httpmethod === 'PUT' || $httpmethod === 'DELETE') {
 
+				$channel = channelx_by_nick(argv(2));
+				$principalUri = 'principals/' . $channel['channel_address'];
 				$httpuri = $_SERVER['REQUEST_URI'];
 
 				logger("debug: method: " . $httpmethod, LOGGER_DEBUG);
@@ -181,8 +183,9 @@ class Cdav extends Controller {
 					$sync = 'calendar';
 					$cdavtable = 'calendarinstances';
 				}
-				else
+				else {
 					$sync = false;
+				}
 
 				if($sync) {
 
@@ -194,11 +197,10 @@ class Cdav extends Controller {
 					if($x = get_cdav_id($principalUri, argv(3), $cdavtable)) {
 
 						$cdavdata = $this->get_cdav_data($x['id'], $cdavtable);
-
 						$etag = (isset($_SERVER['HTTP_IF_MATCH']) ? $_SERVER['HTTP_IF_MATCH'] : false);
 
 						// delete
-						if($httpmethod === 'DELETE' && $cdavdata['etag'] == $etag)
+						if($httpmethod === 'DELETE' && $cdavdata['etag'] == $etag) {
 							Libsync::build_sync_packet($channel['channel_id'], [
 								$sync => [
 									'action' => 'delete_card',
@@ -206,18 +208,18 @@ class Cdav extends Controller {
 									'carduri' => $uri
 								]
 							]);
+						}
 						else {
-							if($etag) {
+							if($etag && $cdavdata['etag'] !== $etag) {
 								// update
-								if($cdavdata['etag'] !== $etag)
-								    Libsync::build_sync_packet($channel['channel_id'], [
-									    $sync => [
-										    'action' => 'update_card',
-										    'uri' => $cdavdata['uri'],
-										    'carduri' => $uri,
-										    'card' => $httpbody
-									    ]
-								    ]);
+								Libsync::build_sync_packet($channel['channel_id'], [
+									$sync => [
+										'action' => 'update_card',
+										'uri' => $cdavdata['uri'],
+										'carduri' => $uri,
+										'card' => $httpbody
+									]
+								]);
 							}
 							else {
 								// new
@@ -235,7 +237,6 @@ class Cdav extends Controller {
 				}
 			}
 
-
 			$principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
 			$carddavBackend   = new \Sabre\CardDAV\Backend\PDO($pdo);
 			$caldavBackend    = new \Sabre\CalDAV\Backend\PDO($pdo);
-- 
cgit v1.2.3


From eba69f85c778cd1217e0a6265f55d8cce2b0edc7 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 23 Mar 2021 11:38:42 +0000
Subject: more work on mod display

(cherry picked from commit 2d716b74b9a879cbeaa8a3208dd6be2516b21fe7)
---
 Zotlabs/Module/Display.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 1aac7e328..62e7dbf8a 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -258,14 +258,13 @@ class Display extends \Zotlabs\Web\Controller {
 			$r = null;
 
 			if(local_channel()) {
-				$r = q("SELECT item.id AS item_id FROM item WHERE uid IN (%d, %d) AND mid = '%s' $item_normal LIMIT 1",
+				$r = q("SELECT item.id AS item_id FROM item WHERE uid = %d AND mid = '%s' $item_normal LIMIT 1",
 					intval(local_channel()),
-					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 
-			if($r === null) {
+			if(!$r) {
 				$r = q("SELECT item.id AS item_id FROM item
 					WHERE ((mid = '%s'
 					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
@@ -292,18 +291,17 @@ class Display extends \Zotlabs\Web\Controller {
 			$r = null;
 			if(local_channel()) {
 				$r = q("SELECT item.parent AS item_id from item
-					WHERE uid IN (%d, %d)
+					WHERE uid = %d
 					AND parent_mid = '%s'
 					$item_normal_update
 					$simple_update
 					LIMIT 1",
 					intval(local_channel()),
-					intval($sys_id),
 					dbesc($target_item['parent_mid'])
 				);
 			}
 
-			if($r === null) {
+			if(! $r) {
 				$r = q("SELECT item.id as item_id from item
 					WHERE ((parent_mid = '%s'
 					AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''
-- 
cgit v1.2.3


From 9aab47de07f7e2b189174662c6b70e75f0fa1fbc Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 26 Mar 2021 19:20:38 +0000
Subject: fix timezone issue in mod cal

(cherry picked from commit 6e7c7771bd7aa3e2507acd06b74cd92bdb57f44b)
---
 Zotlabs/Module/Cal.php | 68 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 65dba927b..329150424 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -19,45 +19,45 @@ class Cal extends Controller {
 		if(observer_prohibited()) {
 			return;
 		}
-	
+
 		if(argc() > 1) {
 			$nick = argv(1);
-	
+
 			profile_load($nick);
-	
+
 			$channelx = channelx_by_nick($nick);
-	
+
 			if(! $channelx) {
 				notice( t('Channel not found.') . EOL);
 				return;
 			}
-	
+
 			App::$data['channel'] = $channelx;
-	
+
 			$observer = App::get_observer();
 			App::$data['observer'] = $observer;
-	
+
 			head_set_icon(App::$data['channel']['xchan_photo_s']);
-	
+
 			App::$page['htmlhead'] .= "<script> var profile_uid = " . ((App::$data['channel']) ? App::$data['channel']['channel_id'] : 0) . "; </script>" ;
-	
+
 		}
-	
+
 		return;
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		if(observer_prohibited()) {
 			return;
 		}
-		
+
 		$channel = App::$data['channel'];
 
 		// since we don't currently have an event permission - use the stream permission
-	
+
 		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_stream')) {
 			notice( t('Permissions denied.') . EOL);
 			return;
@@ -76,10 +76,10 @@ class Cal extends Controller {
 
 		if(! perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts') || App::$profile['hide_friends'])
 			$sql_extra .= " and etype != 'birthday' ";
-	
+
 		$first_day = feature_enabled($channel['channel_id'], 'cal_first_day');
 		$first_day = (($first_day) ? $first_day : 0);
-	
+
 		$start = '';
 		$finish = '';
 
@@ -87,7 +87,7 @@ class Cal extends Controller {
 			if (x($_GET,'start'))	$start = $_GET['start'];
 			if (x($_GET,'end'))	$finish = $_GET['end'];
 		}
-	
+
 		$start  = datetime_convert('UTC','UTC',$start);
 		$finish = datetime_convert('UTC','UTC',$finish);
 		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
@@ -107,10 +107,10 @@ class Cal extends Controller {
 			// Noting this for now - it will need to be fixed here and in Friendica.
 			// Ultimately the finish date shouldn't be involved in the query.
 			$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
-				from event left join item on event.event_hash = item.resource_id 
-				where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid 
-				AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
-				OR (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) 
+				from event left join item on event.event_hash = item.resource_id
+				where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid
+				AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )
+				OR (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ))
 				$sql_extra",
 				intval($channel['channel_id']),
 				dbesc($start),
@@ -119,7 +119,7 @@ class Cal extends Controller {
 				dbesc($adjust_finish)
 			);
 		}
-	
+
 		if($r) {
 			xchan_query($r);
 			$r = fetch_post_tags($r,true);
@@ -127,20 +127,16 @@ class Cal extends Controller {
 		}
 
 		$events = [];
-	
+
 		if($r) {
 
 			foreach($r as $rr) {
 
-				$tz = get_iconfig($rr, 'event', 'timezone');
-				if(! $tz)
-					$tz = 'UTC';
-
-				$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
+				$start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
 				if ($rr['nofinish']){
 					$end = null;
 				} else {
-					$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
+					$end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
 				}
 
 				$html = '';
@@ -149,6 +145,10 @@ class Cal extends Controller {
 					$html = format_event_html($rr);
 				}
 
+				$tz = get_iconfig($rr, 'event', 'timezone');
+				if(! $tz)
+					$tz = 'UTC';
+
 				$events[] = array(
 					'calendar_id' => 'channel_calendar',
 					'rw' => true,
@@ -178,7 +178,7 @@ class Cal extends Controller {
 			echo json_encode($events);
 			killme();
 		}
-			
+
 		if (x($_GET,'id')) {
 			$o = replace_macros(get_markup_template("cal_event.tpl"), [
 				'$events' => $events
@@ -210,7 +210,7 @@ class Cal extends Controller {
 		]);
 
 		return $o;
-	
+
 	}
-	
+
 }
-- 
cgit v1.2.3