Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Zotlabs/Module/Dreport.php

@@ -146,6 +146,7 @@ class Dreport extends \Zotlabs\Web\Controller {
 			'$title' => sprintf( t('Delivery report for %1$s'),substr($mid,0,32)) . '...',
 			'$table' => $table,
 			'$mid' => urlencode($mid),
+			'$options' => t('Options'),
 			'$push' => t('Redeliver'),
 			'$entries' => $entries
 		));

Zotlabs/Module/Item.php

@@ -93,7 +93,7 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		$origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
 	
-		// To represent message-ids on other networks - this will create an item_id record
+		// To represent message-ids on other networks - this will create an iconfig record
 	
 		$namespace = (($api_source && array_key_exists('namespace',$_REQUEST)) ? strip_tags($_REQUEST['namespace']) : '');
 		$remote_id = (($api_source && array_key_exists('remote_id',$_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : '');
@@ -535,7 +535,7 @@ class Item extends \Zotlabs\Web\Controller {
 			}
 	
 			/**
-			 * fix naked links by passing through a callback to see if this is a red site
+			 * fix naked links by passing through a callback to see if this is a hubzilla site
 			 * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both.
 			 * First protect any url inside certain bbcode tags so we don't double link it.
 			 */
@@ -834,23 +834,25 @@ class Item extends \Zotlabs\Web\Controller {
 		if($orig_post)
 			$datarray['edit'] = true;
 	
+		// suppress duplicates, *unless* you're editing an existing post. This could get picked up
+		// as a duplicate if you're editing it very soon after posting it initially and you edited
+		// some attribute besides the content, such as title or categories. 
+
 		if(feature_enabled($profile_uid,'suppress_duplicates') && (! $orig_post)) {
 	
-			$z = q("select created from item where uid = %d and body = '%s'",
+			$z = q("select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1",
 				intval($profile_uid),
+				db_utcnow(),
+				db_quoteinterval('2 MINUTE'),
 				dbesc($body)
 			);
 	
 			if($z) {
-				foreach($z as $zz) {
-					if($zz['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
 				$datarray['cancel'] = 1;
 				notice( t('Duplicate post suppressed.') . EOL);
 				logger('Duplicate post. Faking plugin cancel.');
 			}
 		}
-			}
-		}
 	
 		call_hooks('post_local',$datarray);
 	

include/widgets.php

@@ -1347,7 +1347,7 @@ function widget_forums($arr) {
 
 	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
 
-	$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
+	$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
 		intval(PERMS_W_TAGWALL),
 		intval(PERMS_W_STREAM),
 		intval(local_channel())
@@ -1361,12 +1361,34 @@ function widget_forums($arr) {
 	// There also should be a way to update this via ajax.
 
 	for($x = 0; $x < count($r1); $x ++) {
-		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d $perms_sql ",
+		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
 			dbesc($r1[$x]['xchan_hash']),
 			intval(local_channel())
 		);
 		if($r)
 			$r1[$x]['unseen'] = $r[0]['unseen'];
+
+/**
+ * @FIXME
+ * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
+ * (like personal channels). However the network query for these posts doesn't yet include this 
+ * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise. 
+ * It may make more sense in that query to look for the mention in the body rather than another join,
+ * but that makes it very inefficient.
+ * 
+		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
+			intval(TERM_OBJ_POST),
+			dbesc($r1[$x]['xchan_hash']),
+			intval(local_channel()),
+			dbesc($r1[$x]['xchan_url']),
+			intval(TERM_MENTION)
+		);
+		if($r)
+			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
+ *
+ * end @FIXME
+ */
+		
 	}
 
 	if($r1) {

view/tpl/dreport.tpl

@@ -1,7 +1,14 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		{{if $table == 'item'}}
-		<a href="dreport/push/{{$mid}}"><button class="btn btn-default btn-xs pull-right">{{$push}}</button></a>
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
+				<i class="fa fa-sort-desc"></i>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
+			</ul>
+		</div>
 		{{/if}}
 		<h2>{{$title}}</h2>
 	</div>