Revert "Merge branch '1.12RC'"

This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing
changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.

1 files changed, 1 insertions, 84 deletions

diff --git a/include/attach.php b/include/attach.php
index 242fc7485..b3ddfee88 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -577,7 +577,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 			$pathname = filepath_macro($album);
 		}
 	}
-	if(! $pathname) {
+	else {
 		$pathname = filepath_macro($upload_path);
 	}
 
@@ -1437,22 +1437,6 @@ logger('attach_hash: ' . $attachHash);
 	return $hash;
 }
 
-function find_folder_hash_by_path($channel_id, $path) {
-
-	$filename = end(explode('/', $path));
-
-	$r = q("SELECT hash FROM attach WHERE uid = %d AND filename = '%s' LIMIT 1",
-		intval($channel_id),
-		dbesc($filename)
-	);
-
-	$hash = '';
-	if($r && $r[0]['hash']) {
-		$hash = $r[0]['hash'];
-	}
-	return $hash;
-}
-
 /**
  * @brief Returns the filename of an attachment in a given channel.
  *
@@ -1926,70 +1910,3 @@ 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 ＠ 
-	$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 $item;
-		}
-	}
-	return null;
-}