synchronise an attach_move operation to clones

2 files changed, 12 insertions, 3 deletions

diff --git a/include/attach.php b/include/attach.php
index 86c792ed9..b1199507d 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -276,6 +276,8 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) {
 		return $ret;
 	}
 
+	$r[0]['content'] = dbunescbin($r[0]['content']);
+
 	if($r[0]['folder']) {
 		$x = attach_can_view_folder($r[0]['uid'],$observer_hash,$r[0]['folder']);
 		if(! $x) {
@@ -2037,6 +2039,7 @@ function attach_export_data($channel, $resource_id, $deleted = false) {
 		if($hash_ptr === $resource_id) {
 			$attach_ptr = $r[0];
 		}
+		$r[0]['content'] = dbunescbin($r[0]['content']);
 
 		$hash_ptr = $r[0]['folder'];
 		$paths[] = $r[0];
@@ -2222,7 +2225,6 @@ function copy_folder_to_cloudfiles($channel, $observer_hash, $srcpath, $cloudpat
  * the attach.hash of the new parent folder, which must already exist. If $new_folder_hash is blank or empty,
  * the file is relocated to the root of the channel's storage area.
  *
- * @fixme: this operation is currently not synced to clones !!
  *
  * @param int $channel_id
  * @param int $resource_id
@@ -2245,7 +2247,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
 	$oldstorepath = dbunescbin($r[0]['content']);
 
 	if($new_folder_hash) {
-		$n = q("select * from attach where hash = '%s' and uid = %d limit 1",
+		$n = q("select * from attach where hash = '%s' and uid = %d and is_dir = 1 limit 1",
 			dbesc($new_folder_hash),
 			intval($channel_id)
 		);
diff --git a/include/import.php b/include/import.php
index 8cab16342..cd7056497 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1081,6 +1081,7 @@ function sync_files($channel, $files) {
 					logger('sync_files duplicate check: attach_by_hash() returned ' . print_r($x,true), LOGGER_DEBUG);
 
 					if($x['success']) {
+						$orig_attach = $x[0];
 						$attach_exists = true;
 						$attach_id = $x[0]['id'];
 					}
@@ -1145,12 +1146,18 @@ function sync_files($channel, $files) {
 					// If the hash ever contains any escapable chars this could cause
 					// problems. Currently it does not.
 
-					/// @TODO implement os_path
 					if(!isset($att['os_path']))
 						$att['os_path'] = '';
 
 					if($attach_exists) {
 						logger('sync_files attach exists: ' . print_r($att,true), LOGGER_DEBUG);
+
+						// process/sync a remote rename/move operation
+
+						if($orig_attach['content'] !== $newfname) {
+							rename($orig_attach['content'],$newfname);
+						}
+
 						if(! dbesc_array($att))
 							continue;