From 6c5086a933451969b72890c9b703d6ee141f9d9f Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 17 Jul 2016 11:52:21 -0400
Subject: Added functions to check cloud files path and return path with hashed
 names

---
 include/attach.php | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

(limited to 'include/attach.php')

diff --git a/include/attach.php b/include/attach.php
index b3ddfee88..0ca87624f 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1910,3 +1910,70 @@ function get_attach_binname($s) {
 	}
 	return $p;
 }
+
+
+function get_dirpath_by_cloudpath($channel, $path) {
+	
+	// Warning: Do not edit the following line. The first symbol is UTF-8 &#65312; 
+	$path = str_replace('@','@',notags(trim($path)));		
+
+	$h = @parse_url($path);
+
+	if(! $h || !x($h, 'path')) {
+		return null;
+	}
+	if(substr($h['path'],-1,1) === '/') {
+		$h['path'] = substr($h['path'],0,-1);
+	}
+	if(substr($h['path'],0,1) === '/') {
+		$h['path'] = substr($h['path'],1);
+	}
+	$folders = explode('/', $h['path']);
+	$f = array_shift($folders);
+	
+	$nick = $channel['channel_address'];
+	//check to see if the absolute path was provided (/cloud/channelname/path/to/folder)
+	if($f === 'cloud' ) { 
+		$g = array_shift($folders);
+		if( $g !== $nick) {
+			// if nick does not follow "cloud", then the top level folder must be called  "cloud"
+			// and the given path must be relative to "/cloud/channelname/". 
+			$folders = array_unshift(array_unshift($folders, $g), $f);
+		} 
+	} else {
+		array_unshift($folders, $f);
+	}
+	$clouddir = 'store/' . $nick . '/' ;
+	$subdir = '/';
+	$valid = true;
+	while($folders && $valid && is_dir($clouddir . $subdir) && is_readable($clouddir . $subdir)) {
+		$valid = false;
+		$f = array_shift($folders);
+		$items = array_diff(scandir($clouddir . $subdir), array('.', '..')); // hashed names
+		foreach($items as $item) {
+			$filename = find_filename_by_hash($channel['channel_id'], $item);
+			if($filename === $f) {
+				$subdir .= $item . '/';
+				$valid = true;
+			}
+		}
+	}
+	if(!$valid) {
+		return null;
+	} else {
+		return $clouddir . $subdir;
+	}
+	
+	
+}
+
+function get_filename_by_cloudname($cloudname, $channel, $storepath) {
+	$items = array_diff(scandir($storepath), array('.', '..')); // hashed names
+	foreach($items as $item) {
+		$filename = find_filename_by_hash($channel['channel_id'], $item);
+		if($filename === $cloudname) {
+			return $filename;
+		}
+	}
+	return null;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From d6b28cdc575aba40c6a7861d4c2031d844a848d9 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 17 Jul 2016 16:05:26 -0400
Subject: Importing webpage elements from manually entered cloud file path
 work. All detected elements are automatically imported.

---
 include/attach.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/attach.php')

diff --git a/include/attach.php b/include/attach.php
index 0ca87624f..40410d41e 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1972,7 +1972,7 @@ function get_filename_by_cloudname($cloudname, $channel, $storepath) {
 	foreach($items as $item) {
 		$filename = find_filename_by_hash($channel['channel_id'], $item);
 		if($filename === $cloudname) {
-			return $filename;
+			return $item;
 		}
 	}
 	return null;
-- 
cgit v1.2.3