Merge branch '3.0RC'3.0

1 files changed, 31 insertions, 2 deletions

diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 0ed7a3c68..510d463c1 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -16,7 +16,7 @@ use Sabre\DAV;
  * @link http://github.com/friendica/red
  * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
  */
-class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
+class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTarget {
 
 	/**
 	 * @brief The path inside /cloud
@@ -299,6 +299,17 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			$is_photo = 1;
 		}
 
+		// If we know it's a photo, over-ride the type in case the source system could not determine what it was
+
+		if($is_photo) {
+			q("update attach set filetype = '%s' where hash = '%s' and uid = %d",
+				dbesc($gis['mime']),
+				dbesc($hash),
+				intval($c[0]['channel_id'])
+			);
+		}
+
+
 		// updates entry with filesize and timestamp
 		$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),
@@ -351,6 +362,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			$args = array( 'resource_id' => $hash, 'album' => $album, 'os_syspath' => $f, 'os_path' => $xpath['os_path'], 'display_path' => $xpath['path'], 'filename' => $name, 'getimagesize' => $gis, 'directory' => $direct);
 			$p = photo_upload($c[0], \App::get_observer(), $args);
 		}
+		
+		\Zotlabs\Daemon\Master::Summon([ 'Thumbnail' , $this->folder_hash ]);
 
 		$sync = attach_export_data($c[0], $hash);
 
@@ -444,6 +457,22 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 		return false;
 	}
 
+
+	public function moveInto($targetName,$sourcePath, DAV\INode $sourceNode) {
+
+		if(! $this->auth->owner_id) {
+			return false;
+		}
+
+		if(! ($sourceNode->data && $sourceNode->data->hash)) {
+			return false;
+		}
+
+		return attach_move($this->auth->owner_id, $sourceNode->data->hash, $this->folder_hash);
+
+	}
+
+
 	/**
 	 * @todo add description of what this function does.
 	 *
@@ -662,7 +691,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 		}
 
 		$prefix = '';
-		$suffix = '';
+		$suffix = ' order by is_dir desc, filename asc ';
 
 		$r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
 			dbesc($folder),