Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

1 files changed, 29 insertions, 42 deletions

diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php
index d4aa129ac..8b7d2661c 100644
--- a/mod/sharedwithme.php
+++ b/mod/sharedwithme.php
@@ -1,6 +1,6 @@
 <?php
-require_once('include/text.php');
 require_once('include/conversation.php');
+require_once('include/text.php');
 
 function sharedwithme_content(&$a) {
 	if(! local_user()) {
@@ -12,41 +12,29 @@ function sharedwithme_content(&$a) {
 
 	$is_owner = (local_user() && (local_user() == $channel['channel_id']));
 
-	$postverb = ACTIVITY_FILE . '/post/';
-	$dropverb = ACTIVITY_FILE . '/drop/';
-
-	//maintenance - see if a file got dropped and remove it systemwide 
-	$x = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d",
-		dbesc($dropverb . '%'),
+	//maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller
+	$x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
+		dbesc(ACTIVITY_UPDATE),
+		dbesc(ACTIVITY_OBJ_FILE),
 		intval(local_user())
 	);
-	
-	if($x) {
-		
-		foreach($x as $xx) {
 
-			$hash = substr($xx['verb'], 39);
+	if($x) {
 
-			$update = strpos($hash, '#');
+		foreach($x as $xx) {
 
-			if($update === false) {
-				q("DELETE FROM item WHERE verb = '%s' OR verb = '%s'",
-					dbesc($postverb . $hash),
-					dbesc($dropverb . $hash)
-				);
-			}
+			$object = json_decode($xx['object'],true);
 
-			else {
-				
-				$arr = explode('#', $hash);
-				
-				q("DELETE FROM item WHERE mid != '%s' AND verb = '%s' OR verb = '%s'",
-					dbesc($arr[1]),
-					dbesc($postverb . $arr[0]),
-					dbesc($dropverb . $hash)
-				);
+			$d_mid = $object['d_mid'];
+			$u_mid = $xx['mid'];
 
-			}
+			$y = q("DELETE FROM item WHERE obj_type = '%s' AND (verb = '%s' AND mid = '%s') OR (verb = '%s' AND mid = '%s')",
+				dbesc(ACTIVITY_OBJ_FILE),
+				dbesc(ACTIVITY_POST),
+				dbesc($d_mid),
+				dbesc(ACTIVITY_UPDATE),
+				dbesc($u_mid)
+			);
 
 		}
 
@@ -68,8 +56,9 @@ function sharedwithme_content(&$a) {
 	//drop all files - localuser
 	if((argc() > 1) && (argv(1) === 'dropall')) {
 
-		q("DELETE FROM item WHERE verb LIKE '%s' AND uid = %d",
-			dbesc($postverb . '%'),
+		q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
+			dbesc(ACTIVITY_POST),
+			dbesc(ACTIVITY_OBJ_FILE),
 			intval(local_user())
 		);
 
@@ -77,11 +66,13 @@ function sharedwithme_content(&$a) {
 	}
 
 	//list files
-	$r = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d",
-		dbesc($postverb . '%'),
-		intval(local_user())
+	$r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
+		dbesc(ACTIVITY_POST),
+		dbesc(ACTIVITY_OBJ_FILE),
+		intval(local_user()),
+		dbesc($channel['channel_hash'])
 	);
-	
+
 	$o = profile_tabs($a, $is_owner, $channel['channel_address']);
 
 	$o .= '<div class="section-title-wrapper">';
@@ -96,19 +87,15 @@ function sharedwithme_content(&$a) {
 
 	if($r) {
 		foreach($r as $rr) {
-			//don't display the files we shared with others
-			if($rr['owner_xchan'] != $channel['channel_hash']) {
-				unobscure($rr);
-				$url = rawurldecode($rr['body']);
-				$o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a>&nbsp;<a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>';
-			}
+			$object = json_decode($rr['object'],true);
+			$url = rawurldecode(get_rel_link($object['link'],'alternate'));
+			$o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a>&nbsp;<a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>';
 		}
 	}
 
 	$o .= '</div>';
 
 	return $o;
-	
 
 }