send file sync packets for all known file operations

2 files changed, 49 insertions, 39 deletions

diff --git a/mod/photos.php b/mod/photos.php
index 0adbf752a..bf904db22 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -126,6 +126,34 @@ function photos_post(&$a) {
 
 		if($_REQUEST['dropalbum'] == t('Delete Album')) {
 
+
+			// This is dangerous because we combined file storage and photos into one interface
+			// This function will remove all photos from any directory with the same name since
+			// we have not passed the path value.
+
+			// The correct solution would be to use a full pathname from your storage root for 'album'
+			// We also need to prevent/block removing the storage root folder.
+
+			$folder_hash = '';
+ 
+			$r = q("select * from attach where is_dir = 1 and uid = %d and filename = '%s'",
+				intval($page_owner_uid),
+				dbesc($album)
+			);
+			if(! $r) {
+				notice( t('Album not found.') . EOL);
+				return;
+			}
+			if(count($r) > 1) {
+				notice( t('Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager') . EOL);
+				return;
+			}
+			else {
+				$folder_hash = $r[0]['hash'];
+			}
+
+
+
 			$res = array();
 
 			// get the list of photos we are about to delete
@@ -149,9 +177,6 @@ function photos_post(&$a) {
 			if($r) {
 				foreach($r as $i) {
 					attach_delete($page_owner_uid, $i['resource_id'], 1 );
-		// This is now being done in attach_delete()
-		//			drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */);
-		//			proc_run('php','include/notifier.php','drop',$i['id']);
 				}
 			}
 
@@ -163,6 +188,15 @@ function photos_post(&$a) {
 
 			// @FIXME do the same for the linked attach
 
+			if($folder_hash) {
+				attach_delete($page_owner_uid,$folder_hash, 1);
+
+				$sync = attach_export_data(App::$data['channel'],$folder_hash, true);
+
+				if($sync) 
+					build_sync_packet($page_owner_uid,array('file' => array($sync)));
+			}
+
 		}
 		
 		goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
@@ -183,23 +217,11 @@ function photos_post(&$a) {
 		);
 
 		if($r) {
-/*
-			q("DELETE FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'",
-				intval($page_owner_uid),
-				dbesc($r[0]['resource_id'])
-			);
-*/
 			attach_delete($page_owner_uid, $r[0]['resource_id'], 1 );
-/*
-			$i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1",
-				dbesc($r[0]['resource_id']),
-				intval($page_owner_uid)
-			);
-			if(count($i)) {
-				drop_item($i[0]['id'],true,DROPITEM_PHASE1);
-				$url = z_root();
-			}
-*/
+			$sync = attach_export_data(App::$data['channel'],$r[0]['resource_id'], true);
+
+			if($sync) 
+				build_sync_packet($page_owner_uid,array('file' => array($sync)));
 		}
 
 		goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
@@ -218,7 +240,7 @@ function photos_post(&$a) {
 		$acl->set_from_array($_POST);
 		$perm = $acl->get();
 
-		$resource_id = App::$argv[2];
+		$resource_id = argv(2);
 
 		if(! strlen($albname))
 			$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
@@ -443,6 +465,11 @@ function photos_post(&$a) {
 		goaway(z_root() . '/' . $_SESSION['photo_return']);
 		return; // NOTREACHED
 
+		$sync = attach_export_data(App::$data['channel'],$resource_id);
+
+		if($sync) 
+			build_sync_packet($page_owner_uid,array('file' => array($sync)));
+
 	}
 
 
@@ -555,8 +582,8 @@ function photos_content(&$a) {
 
 	$o = "";
 
-		$o .= "<script> var profile_uid = " . App::$profile['profile_uid'] 
-			. "; var netargs = '?f='; var profile_page = " . App::$pager['page'] . "; </script>\r\n";
+	$o .= "<script> var profile_uid = " . App::$profile['profile_uid'] 
+		. "; var netargs = '?f='; var profile_page = " . App::$pager['page'] . "; </script>\r\n";
 
 	// tabs
 
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 75786b479..7f054705f 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -23,23 +23,6 @@ function wall_attach_post(&$a) {
 	$observer = App::get_observer();
 
 
-//	if($_FILES['userfile']['tmp_name']) {
-//		$x = @getimagesize($_FILES['userfile']['tmp_name']);
-//		logger('getimagesize: ' . print_r($x,true), LOGGER_DATA); 
-//		if(($x) && ($x[2] === IMAGETYPE_GIF || $x[2] === IMAGETYPE_JPEG || $x[2] === IMAGETYPE_PNG)) {
-//			$args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
-//			$ret = photo_upload($channel,$observer,$args);
-//			if($ret['success']) {
-//				echo  "\n\n" . $ret['body'] . "\n\n";
-//				killme();
-//			}
-//			if($using_api)
-//				return;
-//			notice($ret['message']);
-//			killme();
-//		}
-//	}
-
 	$def_album  = get_pconfig($channel['channel_id'],'system','photo_path');
 	$def_attach = get_pconfig($channel['channel_id'],'system','attach_path');