tag each side of the duplex

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index a703dbee9c46bbb66868144f4947245b27c9eb02..cc2846735f7a7682e00f67369b2fac16b6a897f4 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -278,10 +278,19 @@
                if((! strlen($rr['dfrn-id'])) && (! $rr['duplex']))
                        continue;
 
-               $idtosend = (($rr['dfrn-id']) ? $rr['dfrn-id'] : $rr['issued-id']);
+
+               $idtosend = $orig_id = (($rr['dfrn-id']) ? $rr['dfrn-id'] : $rr['issued-id']);
+
+               if($rr['duplex'] && $rr['dfrn-id'])
+                       $idtosend = '0:' . $orig_id;
+               if($rr['duplex'] && $rr['issued-id'])
+                       $idtosend = '1:' . $orig_id;            
 
                $url = $rr['notify'] . '?dfrn_id=' . $idtosend;
 
+               if($debugging)
+                       echo "URL: $url";
+
                $xml = fetch_url($url);
 
                if($debugging)
@@ -312,7 +321,11 @@
                }
 
                $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-               if($final_dfrn_id != $idtosend) {
+
+               if(strpos($final_dfrn_id,':') == 1)
+                       $final_dfrn_id = substr($final_dfrn_id,2);
+
+               if($final_dfrn_id != $orig_id) {
                        // did not decode properly - cannot trust this site 
                        continue;
                }