From f6d76282549c562120417cbdd111109add4f7672 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 16 Jun 2016 20:16:39 -0700
Subject: core changes to better support media migrations

---
 include/attach.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'include/attach.php')

diff --git a/include/attach.php b/include/attach.php
index 78efde51f..33545b12a 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -423,6 +423,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	$observer = array();
 
+	$dosync = ((array_key_exists('nosync',$arr) && $arr['nosync']) ? 0 : 1);
+
 	if($observer_hash) {
 		$x = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($observer_hash)
@@ -829,6 +831,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		if($arr['description'])
 			$args['description'] = $arr['description'];
 
+		$args['deliver'] = $dosync;
+
 		$p = photo_upload($channel,$observer,$args);
 		if($p['success']) {
 			$ret['body'] = $p['body'];
@@ -865,10 +869,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		call_hooks('photo_upload_end',$ret);
 	}
 
-	$sync = attach_export_data($channel,$hash);
+	if($dosync) {
+		$sync = attach_export_data($channel,$hash);
 
-	if($sync) 
-		build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+		if($sync) 
+			build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+	}
 
 	return $ret;
 }
-- 
cgit v1.2.3


From 9c9d6363af22eeec7f38856302abb3251cb78a10 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 20 Jun 2016 19:39:12 -0700
Subject: update attach on import if exists

---
 include/attach.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/attach.php')

diff --git a/include/attach.php b/include/attach.php
index 33545b12a..4961d7f91 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -618,7 +618,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		);
 		if($r) {
 			$overwrite = get_pconfig($channel_id,'system','overwrite_dup_files');
-			if($overwrite) {
+			if(($overwrite) || ($options === 'import')) {
 				$options = 'replace';
 				$existing_id = $x[0]['id'];
 				$existing_size = intval($x[0]['filesize']);
@@ -802,7 +802,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if($is_photo) {
 
-		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
+		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
 		if($arr['group_allow'])
-- 
cgit v1.2.3