From 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 5 May 2020 19:36:57 -0700
Subject: issue generating photo thumbnails when uploaded via davfs

---
 Zotlabs/Module/Dav.php        |  2 +-
 Zotlabs/Storage/BasicAuth.php | 11 +++++++++++
 Zotlabs/Storage/Directory.php | 19 +++++++++++++++----
 Zotlabs/Storage/File.php      |  5 +++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index e8ce6a703..adab25e45 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -95,7 +95,7 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->observer = get_observer_hash();
+		// $auth->observer = get_observer_hash();
 
 		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV');
 
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index a5c01fbb7..3a48f5004 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Storage;
 
+use App;
 use Sabre\DAV;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -128,6 +129,16 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		$this->channel_name = $r['channel_address'];
 		$this->channel_id = $r['channel_id'];
 		$this->channel_hash = $this->observer = $r['channel_hash'];
+
+		if ($this->observer) {
+			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+				dbesc($this->observer)
+			);
+			if ($r) {
+				App::set_observer(array_shift($r));
+			}
+		}
+
 		$_SESSION['uid'] = $r['channel_id'];
 		$_SESSION['account_id'] = $r['channel_account_id'];
 		$_SESSION['authenticated'] = true;
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 8cda75fd1..1231dfa25 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -281,8 +281,19 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 
 		$xpath = attach_syspaths($this->auth->owner_id, $hash);
 
-		// returns the number of bytes that were written to the file, or FALSE on failure
-		$size = file_put_contents($f, $data);
+
+		if (is_resource($data)) {
+			$fp = fopen($f,'wb');
+			if ($fp) {
+				pipe_streams($data,$fp);
+				fclose($fp);
+			}
+			$size = filesize($f);
+		}
+		else {
+			$size = file_put_contents($f, $data);
+		}
+ 
 		// delete attach entry if file_put_contents() failed
 		if ($size === false) {
 			logger('file_put_contents() failed to ' . $f);
@@ -315,7 +326,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 		$d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
 			dbesc($size),
 			dbesc($xpath['os_path']),
-			dbesc($xpath['display_path']),
+			dbesc($xpath['path']),
 			intval($is_photo),
 			dbesc($edited),
 			dbesc($hash),
@@ -364,7 +375,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 			$p = photo_upload($c[0], \App::get_observer(), $args);
 		}
 		
-		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]);
+		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $hash ]);
 
 		$sync = attach_export_data($c[0], $hash);
 
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 68edde166..ee96363c4 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -121,6 +121,11 @@ class File extends DAV\Node implements DAV\IFile {
 		logger('put file: ' . basename($this->name), LOGGER_DEBUG);
 		$size = 0;
 
+		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+			logger('permission denied for put operation');
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
 		// @todo only 3 values are needed
 		$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
 			intval($this->auth->owner_id)
-- 
cgit v1.2.3


From 8c65e9cb4a30a86208bdda91d7d764a8c6ee6b4c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 5 May 2020 19:59:22 -0700
Subject: Revert "issue generating photo thumbnails when uploaded via davfs"

This reverts commit 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4.
---
 Zotlabs/Module/Dav.php        |  2 +-
 Zotlabs/Storage/BasicAuth.php | 11 -----------
 Zotlabs/Storage/Directory.php | 19 ++++---------------
 Zotlabs/Storage/File.php      |  5 -----
 4 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index adab25e45..e8ce6a703 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -95,7 +95,7 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		// $auth->observer = get_observer_hash();
+		$auth->observer = get_observer_hash();
 
 		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV');
 
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index 3a48f5004..a5c01fbb7 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -2,7 +2,6 @@
 
 namespace Zotlabs\Storage;
 
-use App;
 use Sabre\DAV;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -129,16 +128,6 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		$this->channel_name = $r['channel_address'];
 		$this->channel_id = $r['channel_id'];
 		$this->channel_hash = $this->observer = $r['channel_hash'];
-
-		if ($this->observer) {
-			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-				dbesc($this->observer)
-			);
-			if ($r) {
-				App::set_observer(array_shift($r));
-			}
-		}
-
 		$_SESSION['uid'] = $r['channel_id'];
 		$_SESSION['account_id'] = $r['channel_account_id'];
 		$_SESSION['authenticated'] = true;
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 1231dfa25..8cda75fd1 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -281,19 +281,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 
 		$xpath = attach_syspaths($this->auth->owner_id, $hash);
 
-
-		if (is_resource($data)) {
-			$fp = fopen($f,'wb');
-			if ($fp) {
-				pipe_streams($data,$fp);
-				fclose($fp);
-			}
-			$size = filesize($f);
-		}
-		else {
-			$size = file_put_contents($f, $data);
-		}
- 
+		// returns the number of bytes that were written to the file, or FALSE on failure
+		$size = file_put_contents($f, $data);
 		// delete attach entry if file_put_contents() failed
 		if ($size === false) {
 			logger('file_put_contents() failed to ' . $f);
@@ -326,7 +315,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 		$d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
 			dbesc($size),
 			dbesc($xpath['os_path']),
-			dbesc($xpath['path']),
+			dbesc($xpath['display_path']),
 			intval($is_photo),
 			dbesc($edited),
 			dbesc($hash),
@@ -375,7 +364,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 			$p = photo_upload($c[0], \App::get_observer(), $args);
 		}
 		
-		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $hash ]);
+		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]);
 
 		$sync = attach_export_data($c[0], $hash);
 
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index ee96363c4..68edde166 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -121,11 +121,6 @@ class File extends DAV\Node implements DAV\IFile {
 		logger('put file: ' . basename($this->name), LOGGER_DEBUG);
 		$size = 0;
 
-		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
-			logger('permission denied for put operation');
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-
 		// @todo only 3 values are needed
 		$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
 			intval($this->auth->owner_id)
-- 
cgit v1.2.3


From 191e01e3ec4930916ea42927629a5e5d74d07a59 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 5 May 2020 20:01:09 -0700
Subject: re-apply after removing from cherry-picked git hash from wrong branch

---
 Zotlabs/Module/Dav.php        |  2 +-
 Zotlabs/Storage/BasicAuth.php | 11 +++++++++++
 Zotlabs/Storage/Directory.php | 19 +++++++++++++++----
 Zotlabs/Storage/File.php      |  5 +++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index e8ce6a703..adab25e45 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -95,7 +95,7 @@ class Dav extends \Zotlabs\Web\Controller {
 
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->observer = get_observer_hash();
+		// $auth->observer = get_observer_hash();
 
 		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV');
 
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index a5c01fbb7..3a48f5004 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Storage;
 
+use App;
 use Sabre\DAV;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -128,6 +129,16 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		$this->channel_name = $r['channel_address'];
 		$this->channel_id = $r['channel_id'];
 		$this->channel_hash = $this->observer = $r['channel_hash'];
+
+		if ($this->observer) {
+			$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+				dbesc($this->observer)
+			);
+			if ($r) {
+				App::set_observer(array_shift($r));
+			}
+		}
+
 		$_SESSION['uid'] = $r['channel_id'];
 		$_SESSION['account_id'] = $r['channel_account_id'];
 		$_SESSION['authenticated'] = true;
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 8cda75fd1..1231dfa25 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -281,8 +281,19 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 
 		$xpath = attach_syspaths($this->auth->owner_id, $hash);
 
-		// returns the number of bytes that were written to the file, or FALSE on failure
-		$size = file_put_contents($f, $data);
+
+		if (is_resource($data)) {
+			$fp = fopen($f,'wb');
+			if ($fp) {
+				pipe_streams($data,$fp);
+				fclose($fp);
+			}
+			$size = filesize($f);
+		}
+		else {
+			$size = file_put_contents($f, $data);
+		}
+ 
 		// delete attach entry if file_put_contents() failed
 		if ($size === false) {
 			logger('file_put_contents() failed to ' . $f);
@@ -315,7 +326,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 		$d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
 			dbesc($size),
 			dbesc($xpath['os_path']),
-			dbesc($xpath['display_path']),
+			dbesc($xpath['path']),
 			intval($is_photo),
 			dbesc($edited),
 			dbesc($hash),
@@ -364,7 +375,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
 			$p = photo_upload($c[0], \App::get_observer(), $args);
 		}
 		
-		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]);
+		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $hash ]);
 
 		$sync = attach_export_data($c[0], $hash);
 
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 68edde166..ee96363c4 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -121,6 +121,11 @@ class File extends DAV\Node implements DAV\IFile {
 		logger('put file: ' . basename($this->name), LOGGER_DEBUG);
 		$size = 0;
 
+		if ((! $this->auth->owner_id) || (! perm_is_allowed($this->auth->owner_id, $this->auth->observer, 'write_storage'))) {
+			logger('permission denied for put operation');
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+
 		// @todo only 3 values are needed
 		$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
 			intval($this->auth->owner_id)
-- 
cgit v1.2.3


From c656478230e0e5a4f3716e8ba227d9359961b00f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 10 May 2020 16:13:01 -0700
Subject: issue with quoted hashtags/mentions

---
 include/text.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/include/text.php b/include/text.php
index a2e5ce37a..6873cc1c3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -864,6 +864,11 @@ function get_tags($s) {
 			$ret[] = $mtch;
 		}
 	}
+	if(preg_match_all('/([@#\!]\".*?\")/',$s,$match)) {
+		foreach($match[1] as $mtch) {
+			$ret[] = $mtch;
+		}
+	}
 
 	// match bracket mentions
 
@@ -2798,6 +2803,10 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 				$basetag = substr($tag,7);
 				$basetag = substr($basetag,0,-6);
 			}
+			elseif((substr($tag,0,2) === '#"') && (substr($tag,-1,1) === '"')) {
+				$basetag = substr($tag,2);
+				$basetag = substr($basetag,0,-1);
+			}
 			else
 				$basetag = substr($tag,1);
 
@@ -2880,6 +2889,10 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 				$newname = substr($name,6);
 				$newname = substr($newname,0,-6);
 			}
+			elseif((substr($name,0,1) === '"') && (substr($name,-1,1) === '"')) {
+				$newname = substr($name,1);
+				$newname = substr($newname,0,-1);
+			}
 
 			// select someone from this user's contacts by name
 
-- 
cgit v1.2.3