From 3cccb5ecb1cd010435bfc5058159d7ac9d958dcd Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 5 Sep 2015 04:54:48 +0200
Subject: [PATCH] The repair option is added to the settings

---
 include/notifier.php | 10 +++++++---
 mod/settings.php     |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/notifier.php b/include/notifier.php
index 84ed9884aa..002b3c8d74 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -295,7 +295,7 @@ function notifier_run(&$argv, &$argc){
 			$relay_to_owner = false;
 
 		if($relay_to_owner) {
-			logger('notifier: followup', LOGGER_DEBUG);
+			logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
 			// local followup to remote post
 			$followup = true;
 			$public_message = false; // not public
@@ -331,6 +331,8 @@ function notifier_run(&$argv, &$argc){
 		} else {
 			$followup = false;
 
+			logger('Distributing directly '.$target_item["guid"], LOGGER_DEBUG);
+
 			// don't send deletions onward for other people's stuff
 
 			if($target_item['deleted'] && (! intval($target_item['wall']))) {
@@ -378,7 +380,7 @@ function notifier_run(&$argv, &$argc){
 			}
 
 			if (count($url_recipients))
-				logger('notifier: url_recipients ' . print_r($url_recipients,true));
+				logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
 
 			$conversants = array_unique($conversants);
 
@@ -394,6 +396,8 @@ function notifier_run(&$argv, &$argc){
 		// We have not only to look at the parent, since it could be a Friendica thread.
 		if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
 
+			logger('Some parent is OStatus for '.$target_item["guid"], LOGGER_DEBUG);
+
 			// Send a salmon notification to every person we mentioned in the post
 			$arr = explode(',',$target_item['tag']);
 			foreach($arr as $x) {
@@ -650,7 +654,7 @@ function notifier_run(&$argv, &$argc){
 			if($contact['self'])
 				continue;
 
-			logger("Deliver to ".$contact['url'], LOGGER_DEBUG);
+			logger("Deliver ".$target_item["guid"]." to ".$contact['url'], LOGGER_DEBUG);
 
 			// potentially more than one recipient. Start a new process and space them out a bit.
 			// we will deliver single recipient types of message and email recipients here.
diff --git a/mod/settings.php b/mod/settings.php
index 3a07e714d0..3d1e88ebc0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -770,6 +770,8 @@ function settings_content(&$a) {
 		$settings_connectors .= '<span class="field_help">'.t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.').'</span>';
 		$settings_connectors .= '</div>';
 
+		$settings_connectors .= '<p><a href="'.$a->get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
+
 		/*
 		// Deactivated by now - it doesn't seem to work reliable
 		$legacy_contact = get_pconfig(local_user(), 'system', 'ostatus_legacy_contact');