Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 45 insertions, 9 deletions

diff --git a/include/notifier.php b/include/notifier.php
index 174df7120..4ea1ffe35 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -100,10 +100,14 @@ function notifier_run($argv, $argc){
 		// Get the recipient	
 		$r = q("select abook.*, hubloc.* from abook 
 			left join hubloc on hubloc_hash = abook_xchan
-			where abook_id = %d and not ( abook_flags & %d )>0 limit 1",
+			where abook_id = %d and not ( abook_flags & %d ) > 0 
+			and not (hubloc_flags & %d) > 0  and not (hubloc_status & %d) > 0 limit 1",
 			intval($item_id),
-			intval(ABOOK_FLAG_SELF)
+			intval(ABOOK_FLAG_SELF),
+			intval(HUBLOC_FLAGS_DELETED),
+			intval(HUBLOC_OFFLINE)
 		);
+
 		if($r) {
 			// Get the sender
 			$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
@@ -116,8 +120,11 @@ function notifier_run($argv, $argc){
 				}
 				else {
 					// send a refresh message to each hub they have registered here	
-					$h = q("select * from hubloc where hubloc_hash = '%s'",
-						dbesc($r[0]['hubloc_hash'])
+					$h = q("select * from hubloc where hubloc_hash = '%s' 
+						and not (hubloc_flags & %d) > 0  and not (hubloc_status & %d) > 0",
+						dbesc($r[0]['hubloc_hash']),
+						intval(HUBLOC_FLAGS_DELETED),
+						intval(HUBLOC_OFFLINE)
 					);
 					if($h) {
 						foreach($h as $hh) {
@@ -128,17 +135,31 @@ function notifier_run($argv, $argc){
 							));
 							if($data) {
 								$result = zot_zot($hh['hubloc_callback'],$data);
-// zot_queue_item is not yet written
-//							if(! $result['success'])
-//								zot_queue_item();
 
+								// if immediate delivery failed, stick it in the queue to try again later.
+
+								if(! $result['success']) {
+									$hash = random_string();
+									q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) 
+										values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+                						dbesc($hash),
+										intval($s[0]['channel_account_id']),
+										intval($s[0]['channel_id']),
+										dbesc('zot'),
+										dbesc($hh['hubloc_callback']),
+										intval(1),
+										dbesc(datetime_convert()),
+										dbesc(datetime_convert()),
+										dbesc($data),
+										dbesc('')
+									);
+								}
 							}
 						}	
 					}
 				}
 			}
 		}
-
 		return;
 	}	
 
@@ -313,9 +334,12 @@ function notifier_run($argv, $argc){
 		$r = fetch_post_tags($r);
 		
 		$target_item = $r[0];
+		$deleted_item = false;
 
 		if(intval($target_item['item_deleted']))
 			logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
+			$deleted_item = true;
+		}
 
 		if(intval($target_item['item_type']) != ITEM_TYPE_POST) {
 			logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
@@ -364,7 +388,16 @@ function notifier_run($argv, $argc){
 
 		$encoded_item = encode_item($target_item);
 		
-		$relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin']))) ? true : false);
+		// Send comments to the owner to re-deliver to everybody in the conversation
+		// We only do this if the item in question originated on this site. This prevents looping.
+		// To clarify, a site accepting a new comment is responsible for sending it to the owner for relay.
+		// Relaying should never be initiated on a post that arrived from elsewhere.  
+
+		// We should normally be able to rely on ITEM_ORIGIN, but start_delivery_chain() incorrectly set this
+		// flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
+		// the hostname in the message_id and provides a second (fallback) opinion. 
+
+		$relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
 
 		$uplink = false;
 
@@ -476,6 +509,9 @@ function notifier_run($argv, $argc){
 
 	logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG);
 
+	// FIXME: I think we need to remove the private bit or this clause will never execute. Needs more coffee to think it through.
+	// We may in fact have to send it to clones in case the one we pick recently died. 
+
 	if($relay_to_owner && (! $private) && ($cmd !== 'relay')) {
 
 		// If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions.