The repair option is added to the settings

diff --git a/include/notifier.php b/include/notifier.php
index 84ed9884aaa85d2eb0ae2bab18f6adbdfc2083f8..002b3c8d74302e0d79000ec201dc050ff6632a1e 100644 (file)
--- 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 3a07e714d07acf9e2678fb6d1aba79fe52b42c0b..3d1e88ebc07b71308889de02ea846c6f5189ffc6 100644 (file)
--- 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');