Merge https://github.com/friendica/red into pending_merge

3 files changed, 22 insertions, 3 deletions

diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php
index b77c9dad1..bee072ea7 100644
--- a/mod/sharedwithme.php
+++ b/mod/sharedwithme.php
@@ -42,7 +42,7 @@ function sharedwithme_content(&$a) {
 	}
 
 	//list files
-	$r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
+	$r = q("SELECT id, uid, object, item_unseen 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_channel()),
@@ -50,8 +50,10 @@ function sharedwithme_content(&$a) {
 	);
 
 	$items =array();
+	$ids = '';
 
 	if($r) {
+
 		foreach($r as $rr) {
 			$object = json_decode($rr['object'],true);
 
@@ -63,10 +65,27 @@ function sharedwithme_content(&$a) {
 			$item['objfilename'] = $object['filename'];
 			$item['objfilesize'] = userReadableSize($object['filesize']);
 			$item['objedited'] = $object['edited'];
+			$item['unseen'] = $rr['item_unseen'];
 
 			$items[] = $item;
 
+			if($item['unseen'] > 0) {
+				$ids .= " '" . $rr['id'] . "',";
+			}
+
 		}
+
+	}
+
+	if($ids) {
+
+		//remove trailing ,
+		$ids = rtrim($ids, ",");
+
+		q("UPDATE item SET item_unseen = 0 WHERE id IN ( $ids ) AND uid = %d",
+			intval(local_channel())
+		);
+
 	}
 
 	$o = profile_tabs($a, $is_owner, $channel['channel_address']);
@@ -74,6 +93,7 @@ function sharedwithme_content(&$a) {
 	$o .= replace_macros(get_markup_template('sharedwithme.tpl'), array(
 		'$header' => t('Files: shared with me'),
 		'$name' => t('Name'),
+		'$label_new' => t('NEW'),
 		'$size' => t('Size'),
 		'$lastmod' => t('Last Modified'),
 		'$dropall' => t('Remove all files'),
diff --git a/view/css/mod_sharedwithme.css b/view/css/mod_sharedwithme.css
index 79fe0d7a9..8bf626deb 100644
--- a/view/css/mod_sharedwithme.css
+++ b/view/css/mod_sharedwithme.css
@@ -21,4 +21,3 @@
 .cloud-index-tool {
 	padding: 7px 10px;
 }
-
diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
index 1aeb9d4d7..4502df276 100644
--- a/view/tpl/sharedwithme.tpl
+++ b/view/tpl/sharedwithme.tpl
@@ -14,7 +14,7 @@
 	{{foreach $items as $item}}
 		<tr id="cloud-index-{{$item.id}}">
 			<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
-			<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a></td>
+			<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
 			<td class="cloud-index-tool"><a href="/sharedwithme/{{$item.id}}/drop" title="{{$drop}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td>
 			<td class="hidden-xs">{{$item.objfilesize}}</td>
 			<td class="hidden-xs">{{$item.objedited}}</td>