Merge branch 'master' of git://github.com/friendica/red into dev_redswede

3 files changed, 136 insertions, 12 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 0a25617f0..67abc2eab 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -22,6 +22,8 @@ function filestorage_post(&$a) {
 	$recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0);
 	$resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : '');
 
+	$no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0);
+
 	if(! $resource) {
 		notice(t('Item not found.') . EOL);
 		return;
@@ -37,6 +39,12 @@ function filestorage_post(&$a) {
 	//Build directory tree and redirect
 	$channel = $a->get_channel();
 	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
+
+	$filename = find_filename_by_hash($channel_id, $resource);
+	$url = $cloudPath . $filename;
+
+	file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity);
+
 	goaway($cloudPath);
 }
 
@@ -150,6 +158,7 @@ function filestorage_content(&$a) {
 			'$submit' => t('Submit'),
 			'$attach_btn_title' => t('Attach this file to a new post'),
 			'$link_btn_title' => t('Show URL to this file'),
+			'$activity_btn_title' => t('Do not show in shared with me folder of your connections')
 		));
 
 		echo $o;
diff --git a/mod/help.php b/mod/help.php
index a3dafcc9b..5cdeda58f 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -39,18 +39,19 @@ function help_content(&$a) {
 	if(argc() > 1) {
 		$text = load_doc_file('doc/' . $a->argv[1] . '.md');
 		$a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1))));
-	}
-	if(! $text) {
-		$text = load_doc_file('doc/' . $a->argv[1] . '.bb');
-		if($text)
-			$doctype = 'bbcode';
-		$a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('_',' ',notags(argv(1))));
-	}
-	if(! $text) {
-		$text = load_doc_file('doc/' . $a->argv[1] . '.html');
-		if($text)
-			$doctype = 'html';
-		$a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1))));
+
+		if(! $text) {
+			$text = load_doc_file('doc/' . $a->argv[1] . '.bb');
+			if($text)
+				$doctype = 'bbcode';
+			$a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('_',' ',notags(argv(1))));
+		}
+		if(! $text) {
+			$text = load_doc_file('doc/' . $a->argv[1] . '.html');
+			if($text)
+				$doctype = 'html';
+			$a->page['title'] = t('Help:') . ' ' . ucwords(str_replace('-',' ',notags(argv(1))));
+		}
 	}
 
 	if(! $text) {
diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php
new file mode 100644
index 000000000..d4aa129ac
--- /dev/null
+++ b/mod/sharedwithme.php
@@ -0,0 +1,114 @@
+<?php
+require_once('include/text.php');
+require_once('include/conversation.php');
+
+function sharedwithme_content(&$a) {
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+	
+	$channel = $a->get_channel();
+
+	$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 . '%'),
+		intval(local_user())
+	);
+	
+	if($x) {
+		
+		foreach($x as $xx) {
+
+			$hash = substr($xx['verb'], 39);
+
+			$update = strpos($hash, '#');
+
+			if($update === false) {
+				q("DELETE FROM item WHERE verb = '%s' OR verb = '%s'",
+					dbesc($postverb . $hash),
+					dbesc($dropverb . $hash)
+				);
+			}
+
+			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)
+				);
+
+			}
+
+		}
+
+	}
+
+	//drop single file - localuser
+	if((argc() > 2) && (argv(2) === 'drop')) {
+	
+		$id = intval(argv(1));
+
+		q("DELETE FROM item WHERE id = %d AND uid = %d",
+			intval($id),
+			intval(local_user())
+		);
+
+		goaway(z_root() . '/sharedwithme');
+	}
+
+	//drop all files - localuser
+	if((argc() > 1) && (argv(1) === 'dropall')) {
+
+		q("DELETE FROM item WHERE verb LIKE '%s' AND uid = %d",
+			dbesc($postverb . '%'),
+			intval(local_user())
+		);
+
+		goaway(z_root() . '/sharedwithme');
+	}
+
+	//list files
+	$r = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d",
+		dbesc($postverb . '%'),
+		intval(local_user())
+	);
+	
+	$o = profile_tabs($a, $is_owner, $channel['channel_address']);
+
+	$o .= '<div class="section-title-wrapper">';
+
+	$o .= '<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;' . t('Remove all entries') . '</a>';
+	
+	$o .= '<h2>' . t('Files shared with me') . '</h2>';
+
+	$o .= '</div>';
+
+	$o .= '<div class="section-content-wrapper">';
+
+	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>';
+			}
+		}
+	}
+
+	$o .= '</div>';
+
+	return $o;
+	
+
+}
+