From becaa3b920bfe87c031c01bdf35d35db5c82e31e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Jun 2019 18:30:05 -0700
Subject: minor zot6 compatibility issues uncovered through daily use

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 6bc8c645f..965cbf173 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -96,11 +96,12 @@ class Item extends Controller {
 			}
 
 			// if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access
+			// with a bias towards those items owned by channels on this site (item_wall = 1)
 
 			$sql_extra = item_permissions_sql(0);
 
 			if (! $i) {
-				$i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra limit 1",
+				$i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1",
 					dbesc($r[0]['parent_mid'])
 				);
 			}
-- 
cgit v1.2.3


From db8e46184bc6fae92d05a8992acab8c14e67aef1 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 19 Jun 2019 13:20:32 +0200
Subject: Use html_entity_decode() for cached photo URL

---
 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 0dc6d0194..a53b00282 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -169,7 +169,7 @@ class Photo extends \Zotlabs\Web\Controller {
 							);
 							call_hooks('cache_url_hook', $cache);
 							if(! $cache['status']) {
-								$url = htmlspecialchars_decode($r[0]['display_path']);
+								$url = html_entity_decode($r[0]['display_path'], ENT_QUOTES);
 								// SSLify if needed
 								if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
 									$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
-- 
cgit v1.2.3


From 9d156141b1205e48bbb3008f2a3040caa4c33192 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 19 Jun 2019 17:32:38 -0700
Subject: changes to support direct messages in zot6 (set item.item_private = 2
 when private mentions are used and federate with zot:directMessage attribute
 which aligns with litepub:directMessage)

---
 Zotlabs/Module/Apschema.php |  3 ++-
 Zotlabs/Module/Item.php     | 11 +++++------
 Zotlabs/Module/Lockview.php |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
index d217041f2..ef2264bc0 100644
--- a/Zotlabs/Module/Apschema.php
+++ b/Zotlabs/Module/Apschema.php
@@ -28,7 +28,8 @@ class Apschema extends \Zotlabs\Web\Controller {
 				'nomadicHubs'      => 'zot:nomadicHubs',
 				'emojiReaction'    => 'zot:emojiReaction',
 				'expires'          => 'zot:expires',
-				
+				'directMessage'    => 'zot:directMessage',
+				 
 				'magicEnv' => [
 					'@id'   => 'zot:magicEnv',
 					'@type' => '@id'
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 965cbf173..901f54c72 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -551,10 +551,10 @@ class Item extends Controller {
 				$public_policy     = $orig_post['public_policy'];
 				$private           = $orig_post['item_private'];
 			}
-	
-			if($private || $public_policy || $acl->is_private())
-				$private = 1;
-	
+
+			if($public_policy || $acl->is_private()) {
+				$private = (($private) ? $private : 1);
+			}  
 	
 			$location          = $orig_post['location'];
 			$coord             = $orig_post['coord'];
@@ -631,12 +631,11 @@ class Item extends Controller {
 
 			$allow_empty       = ((array_key_exists('allow_empty',$_REQUEST)) ? intval($_REQUEST['allow_empty']) : 0);	
 
-			$private = intval($acl->is_private() || ($public_policy));
+			$private = (($private) ? $private : intval($acl->is_private() || ($public_policy)));
 	
 			// If this is a comment, set the permissions from the parent.
 	
 			if($parent_item) {
-				$private = 0;
 				$acl->set($parent_item);
 				$private = intval($acl->is_private() || $parent_item['item_private']);
 				$public_policy     = $parent_item['public_policy'];
diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php
index d7ed07a53..8c8519c57 100644
--- a/Zotlabs/Module/Lockview.php
+++ b/Zotlabs/Module/Lockview.php
@@ -76,7 +76,7 @@ class Lockview extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
-		if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
+		if(intval($item['item_private']) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
 			&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
 	
 			// if the post is private, but public_policy is blank ("visible to the internet"), and there aren't any
-- 
cgit v1.2.3


From c1cc76119cf055c50045af24df07040fa32d2bf6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 19 Jun 2019 21:41:46 -0700
Subject: events: don't use htmlentities on local (hz) event titles as they are
 not being used in textareas and umlauts for instance are getting mangled on
 the calendar display

---
 Zotlabs/Module/Channel_calendar.php | 4 ++--
 Zotlabs/Module/Events.php           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 4f08eb27c..9a735ffc5 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -381,7 +381,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'end' => $end,
 						'drop' => $drop,
 						'allDay' => (($rr['adjust']) ? 0 : 1),
-						'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false),
+						'title' => $rr['summary'], 
 						'editable' => $edit ? true : false,
 						'item' => $rr,
 						'plink' => [$rr['plink'], t('Link to source')],
@@ -402,7 +402,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 				echo ical_wrapper($r);
 				killme();
 			}
-	
+
 			if (\App::$argv[1] === 'json'){
 				json_return_and_die($events);
 			}
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index e883db49f..056d0cd5a 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -662,9 +662,10 @@ class Events extends \Zotlabs\Web\Controller {
 						'html'=>$html,
 						'plink' => array($rr['plink'],t('Link to Source'),'',''),
 					);
+
 				}
 			}
-			
+
 			if($export) {
 				header('Content-type: text/calendar');
 				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );
-- 
cgit v1.2.3


From 952e466d9121726f00c94b6527ff01255529b82c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 19 Jun 2019 22:13:03 -0700
Subject: tweak to event title encoding to ensure it works with German,
 Russian, as well as angle chars

---
 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 9a735ffc5..cacee57ef 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -381,7 +381,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'end' => $end,
 						'drop' => $drop,
 						'allDay' => (($rr['adjust']) ? 0 : 1),
-						'title' => $rr['summary'], 
+						'title' => html_entity_decode($rr['summary'],ENT_COMPAT,'UTF-8'), 
 						'editable' => $edit ? true : false,
 						'item' => $rr,
 						'plink' => [$rr['plink'], t('Link to source')],
-- 
cgit v1.2.3


From f37387de8061aab7221dde7697402be564d596d5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 20 Jun 2019 18:34:44 +0200
Subject: fix encoding also for description and location

---
 Zotlabs/Module/Channel_calendar.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index bb0c9f857..109b18f37 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -381,12 +381,12 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'end' => $end,
 						'drop' => $drop,
 						'allDay' => (($rr['adjust']) ? 0 : 1),
-						'title' => html_entity_decode($rr['summary'],ENT_COMPAT,'UTF-8'), 
+						'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
 						'editable' => $edit ? true : false,
 						'item' => $rr,
 						'plink' => [$rr['plink'], t('Link to source')],
-						'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
-						'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),
+						'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
+						'location' => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
 						'allow_cid' => expand_acl($rr['allow_cid']),
 						'allow_gid' => expand_acl($rr['allow_gid']),
 						'deny_cid' => expand_acl($rr['deny_cid']),
-- 
cgit v1.2.3


From 24b0f8e27e2f5e035b9a8f488bae8d79a10398a4 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 20 Jun 2019 18:44:23 +0200
Subject: apply calendar encoding fixes to mod cal

---
 Zotlabs/Module/Cal.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index a84116e76..07bee38bd 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -161,12 +161,12 @@ class Cal extends Controller {
 					'end' => $end,
 					'drop' => $drop,
 					'allDay' => (($rr['adjust']) ? 0 : 1),
-					'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false),
+					'title' => html_entity_decode($rr['summary'], ENT_COMPAT, 'UTF-8'),
 					'editable' => $edit ? true : false,
 					'item' => $rr,
 					'plink' => [$rr['plink'], t('Link to source')],
-					'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
-					'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),
+					'description' => html_entity_decode($rr['description'], ENT_COMPAT, 'UTF-8'),
+					'location' => html_entity_decode($rr['location'], ENT_COMPAT, 'UTF-8'),
 					'allow_cid' => expand_acl($rr['allow_cid']),
 					'allow_gid' => expand_acl($rr['allow_gid']),
 					'deny_cid' => expand_acl($rr['deny_cid']),
-- 
cgit v1.2.3


From 5ee70092712be1604ce1450a8735154fdb7c9485 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 25 Jun 2019 18:37:27 -0700
Subject: provide auto redirect from zot6 /item permalinks

---
 Zotlabs/Module/Item.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 901f54c72..3eac2b6a0 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -193,6 +193,25 @@ class Item extends Controller {
 			killme();
 
 		}
+
+		if(argc() > 1 && argv(1) !== 'drop') {
+			$x = q("select uid, item_wall, llink, mid from item where mid = '%s' ",
+				dbesc(z_root() . '/item/' . argv(1))
+			);
+			if($x) {
+				foreach($x as $xv) {
+					if (intval($xv['item_wall'])) {
+						$c = channelx_by_n($xv['uid']);
+						if ($c) {
+							goaway($c['xchan_url'] . '?mid=' . gen_link_id($xv['mid']));
+						}
+					}
+				}
+				goaway($x[0]['llink']);
+			}
+			http_status_exit(404, 'Not found');
+		}
+
 	}
 
 
-- 
cgit v1.2.3


From cf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 26 Jun 2019 21:45:21 -0700
Subject: http signature consolidation

---
 Zotlabs/Module/Cdav.php      | 5 +++--
 Zotlabs/Module/Channel.php   | 2 +-
 Zotlabs/Module/Dav.php       | 9 +++++----
 Zotlabs/Module/Getfile.php   | 6 ++++--
 Zotlabs/Module/Id.php        | 2 +-
 Zotlabs/Module/Item.php      | 2 +-
 Zotlabs/Module/Magic.php     | 7 ++++---
 Zotlabs/Module/Owa.php       | 6 ++++--
 Zotlabs/Module/Zfinger.php   | 8 ++++----
 Zotlabs/Module/Zot_probe.php | 2 +-
 10 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index de639e281..b199019c1 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -4,6 +4,7 @@ namespace Zotlabs\Module;
 use App;
 use Zotlabs\Lib\Apps;
 use Zotlabs\Web\Controller;
+use Zotlabs\Web\HTTPSig;
 
 require_once('include/event.php');
 
@@ -41,7 +42,7 @@ class Cdav extends Controller {
 						continue;
 					}
 
-					$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
+					$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
 					if($sigblock) {
 						$keyId = str_replace('acct:','',$sigblock['keyId']);
 						if($keyId) {
@@ -64,7 +65,7 @@ class Cdav extends Controller {
 								continue;
 
 							if($record) {
-								$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
+								$verified = HTTPSig::verify('',$record['channel']['channel_pubkey']);
 								if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
 									$record = null;
 								}
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 144c2472a..afd82ed2f 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -6,7 +6,7 @@ namespace Zotlabs\Module;
 use App;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\PermissionDescription;
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 use Zotlabs\Lib\Libzot;
 
 require_once('include/items.php');
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index 9f64e2fea..866520461 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -8,8 +8,9 @@
 
 namespace Zotlabs\Module;
 
-use \Sabre\DAV as SDAV;
-use \Zotlabs\Storage;
+use Sabre\DAV as SDAV;
+use Zotlabs\Storage;
+use Zotlabs\Web\HTTPSig;
 
 require_once('include/attach.php');
 require_once('include/auth.php');
@@ -46,7 +47,7 @@ class Dav extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = str_replace('acct:','',$sigblock['keyId']);
 					if($keyId) {
@@ -69,7 +70,7 @@ class Dav extends \Zotlabs\Web\Controller {
 							continue;
 
 						if($record) {
-							$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
+							$verified = HTTPSig::verify('',$record['channel']['channel_pubkey']);
 							if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
 								$record = null;
 							}
diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
index 583cf38f0..6d31d23fd 100644
--- a/Zotlabs/Module/Getfile.php
+++ b/Zotlabs/Module/Getfile.php
@@ -1,6 +1,8 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Web\HTTPSig;
+
 /**
  * module: getfile
  * 
@@ -46,7 +48,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = $sigblock['keyId'];
 
@@ -57,7 +59,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 						);
 						if($r) {
 							$hubloc = $r[0];
-							$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);	
+							$verified = HTTPSig::verify('',$hubloc['xchan_pubkey']);	
 							if($verified && $verified['header_signed'] && $verified['header_valid'] && $hash == $hubloc['hubloc_hash']) {
 								$header_verified = true;
 							}
diff --git a/Zotlabs/Module/Id.php b/Zotlabs/Module/Id.php
index 15abfa2a3..e08568d00 100644
--- a/Zotlabs/Module/Id.php
+++ b/Zotlabs/Module/Id.php
@@ -12,7 +12,7 @@ namespace Zotlabs\Module;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\ActivityStreams;
 use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 use Zotlabs\Web\Controller;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\ThreadListener;
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 3eac2b6a0..cb78e4047 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -9,7 +9,7 @@ use Zotlabs\Daemon\Master;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\ActivityStreams;
 use Zotlabs\Lib\LDSignatures;
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\ThreadListener;
 use App;
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php
index e8e960574..6ac656a04 100644
--- a/Zotlabs/Module/Magic.php
+++ b/Zotlabs/Module/Magic.php
@@ -1,6 +1,8 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Web\HTTPSig;
+
 @require_once('include/zot.php');
 
 
@@ -152,10 +154,9 @@ class Magic extends \Zotlabs\Web\Controller {
 				$headers['Accept'] = 'application/x-zot+json' ;
 				$headers['X-Open-Web-Auth'] = random_string();
 				$headers['Host'] = $parsed['host'];
-				$headers['Digest'] = 'SHA-256=' . \Zotlabs\Web\HTTPSig::generate_digest($data,false);
+				$headers['Digest'] = HTTPSig::generate_digest_header($data);
 
-				$headers = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'],
-					'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false,true,'sha512');
+				$headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], 'acct:' . channel_reddress($channel),true,'sha512');
 				$x = z_post_url($basepath . '/owa',$data,$redirects,[ 'headers' => $headers ]);
 
 				if($x['success']) {
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
index cf116a96c..89f83bf8f 100644
--- a/Zotlabs/Module/Owa.php
+++ b/Zotlabs/Module/Owa.php
@@ -2,6 +2,8 @@
 
 namespace Zotlabs\Module;
 
+use Zotlabs\Web\HTTPSig;
+
 /**
  * OpenWebAuth verifier and token generator
  * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home
@@ -25,7 +27,7 @@ class Owa extends \Zotlabs\Web\Controller {
 					continue;
 				}
 
-				$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER[$head]);
+				$sigblock = HTTPSig::parse_sigheader($_SERVER[$head]);
 				if($sigblock) {
 					$keyId = $sigblock['keyId'];
 
@@ -65,7 +67,7 @@ class Owa extends \Zotlabs\Web\Controller {
 						
 						if ($r) {
 							foreach($r as $hubloc) {
-								$verified = \Zotlabs\Web\HTTPSig::verify(file_get_contents('php://input'),$hubloc['xchan_pubkey']);	
+								$verified = HTTPSig::verify(file_get_contents('php://input'),$hubloc['xchan_pubkey']);	
 								if($verified && $verified['header_signed'] && $verified['header_valid']) {
 									logger('OWA header: ' . print_r($verified,true),LOGGER_DATA);	
 									logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA);
diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php
index 6ed001df5..3a20144a5 100644
--- a/Zotlabs/Module/Zfinger.php
+++ b/Zotlabs/Module/Zfinger.php
@@ -1,6 +1,7 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Web\HTTPSig;
 
 class Zfinger extends \Zotlabs\Web\Controller {
 
@@ -23,10 +24,9 @@ class Zfinger extends \Zotlabs\Web\Controller {
 		$ret = json_encode($x);
 
 		if($chan) {
-			$hash = \Zotlabs\Web\HTTPSig::generate_digest($ret,false);
-			$headers['Digest'] = 'SHA-256=' . $hash;  
-			\Zotlabs\Web\HTTPSig::create_sig('',$headers,$chan['channel_prvkey'],
-				'acct:' . $chan['channel_address'] . '@' . \App::get_hostname(),true);
+			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
+			$h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],'acct:' . channel_reddress($chan));
+			HTTPSig::set_headers($h);
 		}
 		else {
 			foreach($headers as $k => $v) {
diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php
index d0c7e688f..648ed2175 100644
--- a/Zotlabs/Module/Zot_probe.php
+++ b/Zotlabs/Module/Zot_probe.php
@@ -3,7 +3,7 @@
 namespace Zotlabs\Module;
 
 use Zotlabs\Lib\Zotfinger;
-use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Web\HTTPSig;
 
 class Zot_probe extends \Zotlabs\Web\Controller {
 
-- 
cgit v1.2.3


From ddde4e19659862f6147c304224c390119bdb4d0a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 28 Jun 2019 01:37:36 +0000
Subject: extend definition of direct message to anything with allow_cid but
 *not* allow_gid.

(cherry picked from commit 96a99935ef4f2da899275166b127537287966dac)
---
 Zotlabs/Module/Item.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index cb78e4047..d03b6ee30 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -760,7 +760,12 @@ class Item extends Controller {
 					}
 				}
 			}
-	
+
+			if(($str_contact_allow) && (! $str_group_allow)) {
+				// direct message - private between individual channels but not groups
+				$private = 2;
+			}
+
 	
 			/**
 			 *
-- 
cgit v1.2.3


From 42526fc2dc3a25ab3bb3741bb55733370f630f49 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 28 Jun 2019 13:09:44 +0200
Subject: decode encoded mid

---
 Zotlabs/Module/Ping.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 3dabe0f7b..6e8042eaf 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -282,8 +282,8 @@ class Ping extends \Zotlabs\Web\Controller {
 					if(strpos($message, $tt['xname']) === 0)
 						$message = substr($message, strlen($tt['xname']) + 1);
 
-
 					$mid = basename($tt['link']);
+					$mid = ((strpos($mid, 'b64.') === 0) ? @base64url_decode(substr($mid, 4)) : $mid);
 
 					if(in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 						// we need the thread parent
@@ -291,7 +291,6 @@ class Ping extends \Zotlabs\Web\Controller {
 							dbesc($mid),
 							intval(local_channel())
 						);
-
 						$b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : 'b64.' . base64url_encode($r[0]['thr_parent']));
 					}
 					else {
-- 
cgit v1.2.3


From 5ad6eeccdf7d1d260392031c6d4fc0e5308cc6b9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 29 Jun 2019 16:34:06 -0700
Subject: add opengraph meta info to channel page

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index afd82ed2f..b1639b213 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -111,6 +111,17 @@ class Channel extends Controller {
 		// we start loading content
 
 		profile_load($which,$profile);
+
+		App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars($channel['channel_name']) . '">' . "\r\n";
+		App::$page['htmlhead'] .= '<meta property="og:image" content="' . $channel['xchan_photo_l'] . '">' . "\r\n";
+
+		if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
+			App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(App::$profile['about']) . '">' . "\r\n";
+		}
+		else {
+			App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(sprintf( t('This is the home page of %s.'), $channel['channel_name'])) . '">' . "\r\n";
+		}
+
 	}
 
 	function get($update = 0, $load = false) {
-- 
cgit v1.2.3


From 276ab3eae32458b019af9261b49acf31739ed09e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 Jul 2019 23:28:31 -0700
Subject: I'm pretty sure the LD construct 'diaspora:guid' isn't actually legal
 without a definition of 'diaspora' in the current or parent LD context.

---
 Zotlabs/Module/Apschema.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
index ef2264bc0..12cc0e00a 100644
--- a/Zotlabs/Module/Apschema.php
+++ b/Zotlabs/Module/Apschema.php
@@ -41,8 +41,11 @@ class Apschema extends \Zotlabs\Web\Controller {
 				],
 
 				'ostatus'      => 'http://ostatus.org#',
-				'conversation' => 'ostatus:conversation'
+				'conversation' => 'ostatus:conversation',
 
+				'diaspora'     => 'https://diasporafoundation.org/ns/',
+				'guid'         => 'diaspora:guid'
+				
 			]
 		];
 
-- 
cgit v1.2.3


From 87668f7fa8b22526918463bda7602d138385cc35 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 3 Jul 2019 22:13:14 +0200
Subject: fix typo

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
index 26cb82044..92b33df0c 100644
--- a/Zotlabs/Module/Dirsearch.php
+++ b/Zotlabs/Module/Dirsearch.php
@@ -394,7 +394,7 @@ class Dirsearch extends \Zotlabs\Web\Controller {
 						$quoted_string = false;
 					}
 					else
-						$curr['value'] .= ' ' . trim(q);
+						$curr['value'] .= ' ' . trim($q);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 407b02bde8cc8492eefc9260c8ae6becfee2211a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 11 Jul 2019 11:12:27 +0200
Subject: calendar: revert back to UTC strings for dates due to better
 legibility. Strip timezone info from UTC string and always treat values as
 UTC.

---
 Zotlabs/Module/Cdav.php             | 12 ++++++------
 Zotlabs/Module/Channel_calendar.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index b199019c1..e2855d2b6 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -278,11 +278,11 @@ class Cdav extends Controller {
 				$allday = $_REQUEST['allday'];
 
 				$title = $_REQUEST['title'];
-				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
 
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 				$description = $_REQUEST['description'];
@@ -369,10 +369,10 @@ class Cdav extends Controller {
 
 				$uri = $_REQUEST['uri'];
 				$title = $_REQUEST['title'];
-				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 				$description = $_REQUEST['description'];
@@ -442,10 +442,10 @@ class Cdav extends Controller {
 				$allday = $_REQUEST['allday'];
 
 				$uri = $_REQUEST['uri'];
-				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 109b18f37..7d75a7e41 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -21,7 +21,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 		$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
 	
 		$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
-		$uid      = local_channel();
+		$uid = local_channel();
 
 		// only allow editing your own events. 
 		if(($xchan) && ($xchan !== get_observer_hash()))
@@ -34,8 +34,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 		
 		$adjust = intval($_POST['adjust']);
 
-		$start = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtstart'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart'])));
-		$finish = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtend'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend'])));
+		$start = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart']));
+		$finish = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend']));
 
 		$summary  = escape_tags(trim($_POST['summary']));
 		$desc     = escape_tags(trim($_POST['desc']));
-- 
cgit v1.2.3


From a6f06c2d943cabc4475fa8de67e0cd03725d475e Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Mon, 15 Jul 2019 10:57:04 +0200
Subject: Fix ETag quotes

---
 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 a53b00282..59dc709e1 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -222,7 +222,7 @@ class Photo extends \Zotlabs\Web\Controller {
  		if(! $data)
  			killme();
  			
- 		$etag = md5($data . $modified);
+ 		$etag = '"' . md5($data . $modified) . '"';
  		
  		if($modified == 0)
  		    $modified = time();
-- 
cgit v1.2.3


From 6ca7527ec9043571525187c0d33e75f03c5a8e1b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 18 Jul 2019 14:19:32 +0200
Subject: add hashtag to appschema and bump appschema rev

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
index 12cc0e00a..756057a8a 100644
--- a/Zotlabs/Module/Apschema.php
+++ b/Zotlabs/Module/Apschema.php
@@ -44,7 +44,9 @@ class Apschema extends \Zotlabs\Web\Controller {
 				'conversation' => 'ostatus:conversation',
 
 				'diaspora'     => 'https://diasporafoundation.org/ns/',
-				'guid'         => 'diaspora:guid'
+				'guid'         => 'diaspora:guid',
+
+				'Hashtag'      => 'as:Hashtag'
 				
 			]
 		];
@@ -58,4 +60,4 @@ class Apschema extends \Zotlabs\Web\Controller {
 
 
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 81ecea29c839c8f914be59acbddd4955673ee2f6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 22 Jul 2019 19:11:52 +0200
Subject: reflect repeats in notifications, use force flag for
 import_xchan_photo() in cron

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 53a06b072..a18a81937 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -106,7 +106,7 @@ class Share extends \Zotlabs\Web\Controller {
 		$arr['owner_xchan']  = $item['author_xchan'];
 		$arr['obj'] = Activity::encode_item($item);
 		$arr['obj_type'] = $item['obj_type'];
-		$arr['verb'] = 'Announce';
+		$arr['verb'] = ACTIVITY_SHARE;
 
 		$post = item_store($arr);	
 
-- 
cgit v1.2.3


From feea137dbfb807278a3b922396332b867f123049 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 28 Jul 2019 23:46:38 -0700
Subject: hz core issue #1386 - function name must be a string

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
index 12edf8428..f836978ee 100644
--- a/Zotlabs/Module/Group.php
+++ b/Zotlabs/Module/Group.php
@@ -177,7 +177,7 @@ class Group extends Controller {
 				if($r) 
 					$result = group_rmv(local_channel(),$r[0]['gname']);
 				if($result) {
-					$hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(2) ];
+					$hookinfo = [ 'pgrp_extras' => '', 'group' => argv(2) ];
 					call_hooks ('privacygroup_extras_drop',$hookinfo);
 					info( t('Privacy group removed.') . EOL);
 				}
-- 
cgit v1.2.3


From af690b64d6b0615c0f5f71ece2e2c75326d58092 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Fri, 9 Aug 2019 16:59:14 +0200
Subject: More intelligent quotation shortening while link embedding

---
 Zotlabs/Module/Linkinfo.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index b9f90deec..1551d1f26 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -275,7 +275,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 		// Check codepage in HTTP headers or HTML if not exist
 		$cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
 		if(empty($cp))
-		    $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
+		    $cp = (preg_match('/meta.+content=["\']text\/html; charset=([^"\']+)/i', $body, $o) ? $o[1] : 'AUTO');
 
 		$body   = mb_convert_encoding($body, 'UTF-8', $cp);
 		$body   = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
@@ -444,8 +444,9 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 				while (strpos($text, "  "))
 					$text = trim(str_replace("  ", " ", $text));
-	
-				$siteinfo["text"] = html_entity_decode(substr($text,0,350), ENT_QUOTES, "UTF-8").'...';
+					
+				$text = substr(html_entity_decode($text, ENT_QUOTES, "UTF-8"), 0, 350);
+				$siteinfo["text"] = rtrim(substr($text, 0, strrpos($text, " ")), "?.,:;!-") . '...';
 			}
 		}
 	
-- 
cgit v1.2.3


From 38f7d9ad371380763c129b66b44a227cc7035e1e Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Fri, 9 Aug 2019 19:01:21 +0200
Subject: Replace plink URL with 'share' tag if possible

---
 Zotlabs/Module/Linkinfo.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index 1551d1f26..7d6ff4043 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -2,9 +2,6 @@
 namespace Zotlabs\Module;
 
 
-
-
-
 class Linkinfo extends \Zotlabs\Web\Controller {
 
 	function get() {
@@ -48,7 +45,20 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 		}
 	
 		logger('linkinfo: ' . $url);
-	
+		
+        // Replace plink URL with 'share' tag if possible
+        if (preg_match("/mid=b64\.(\w+)(&.+)?$/", $url, $mid)) {
+            
+            $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+                dbesc(base64url_decode($mid[1])),
+                intval(local_channel())
+            );
+            if ($r) {
+                echo "[share=" . $r[0]['id'] . "][/share]";
+                killme();
+            }
+        }
+
 		$result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true));
 		if($result['success']) {
 			$hdrs=array();
-- 
cgit v1.2.3


From 0ce1a200f70c831aee2d2af3329133ef654f6b77 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Sat, 10 Aug 2019 11:15:48 +0200
Subject: Improve plink to share tag detection

---
 Zotlabs/Module/Linkinfo.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index 7d6ff4043..fcf8a6aa1 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -46,18 +46,20 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 		logger('linkinfo: ' . $url);
 		
-        // Replace plink URL with 'share' tag if possible
-        if (preg_match("/mid=b64\.(\w+)(&.+)?$/", $url, $mid)) {
-            
-            $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-                dbesc(base64url_decode($mid[1])),
-                intval(local_channel())
-            );
-            if ($r) {
-                echo "[share=" . $r[0]['id'] . "][/share]";
-                killme();
-            }
-        }
+                // Replace plink URL with 'share' tag if possible
+                preg_match("/(mid=b64\.|display\/|posts\/)([\w\-]+)(&.+)?$/", $url, $mid);
+
+                if (!empty($mid) && $mid[1] == 'mid=b64.')
+                        $mid[2] = base64_decode($mid[2]);
+
+                $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+                        dbesc((empty($mid) ? $url : $mid[2])),
+                        intval(local_channel())
+                );
+                if ($r) {
+                        echo "[share=" . $r[0]['id'] . "][/share]";
+                        killme();
+                }
 
 		$result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true));
 		if($result['success']) {
-- 
cgit v1.2.3


From f0d7a17b728a28ae1929785f4484a26b71bfb07f Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 11 Aug 2019 10:55:38 +0200
Subject: linkinfo: only allow to embed public items

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

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index fcf8a6aa1..76c679cc5 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -52,7 +52,7 @@ class Linkinfo extends \Zotlabs\Web\Controller {
                 if (!empty($mid) && $mid[1] == 'mid=b64.')
                         $mid[2] = base64_decode($mid[2]);
 
-                $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+                $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1",
                         dbesc((empty($mid) ? $url : $mid[2])),
                         intval(local_channel())
                 );
-- 
cgit v1.2.3