FR update to the strings THX Perig

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 7aa95e49c0db7200b10953e7283509e2ebafd772..beb73b4e2c4ce53a9ed5a6fcaf3ea56108e2040c 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,7 +1,7 @@
 <?php
 
 function hub_return($valid,$body) {
-       
+
        if($valid) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
                echo $body;
@@ -18,7 +18,7 @@ function hub_return($valid,$body) {
 // when receiving an XML feed, always return OK
 
 function hub_post_return() {
-       
+
        header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
        killme();
 
@@ -63,14 +63,15 @@ function pubsub_init(&$a) {
                        intval($owner['uid'])
                );
                if(! count($r)) {
-                       logger('pubsub: contact not found.');
+                       logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
 
-               if(! link_compare($hub_topic,$r[0]['poll'])) {
-                       logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
-                       // should abort but let's humour them.                  
-               }
+               if ($hub_topic)
+                       if(! link_compare($hub_topic,$r[0]['poll'])) {
+                               logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
+                               // should abort but let's humour them.
+                       }
 
                $contact = $r[0];
 
@@ -79,18 +80,19 @@ function pubsub_init(&$a) {
 
                if($hub_mode === 'unsubscribe') {
                        if(! strlen($hub_verify)) {
-                               logger('pubsub: bogus unsubscribe'); 
+                               logger('pubsub: bogus unsubscribe');
                                hub_return(false, '');
                        }
                        logger('pubsub: unsubscribe success');
                }
 
-               $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
-                       intval($subscribe),
-                       intval($contact['id'])
-               );
+               if ($hub_mode)
+                       $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
+                               intval($subscribe),
+                               intval($contact['id'])
+                       );
 
-               hub_return(true, $hub_challenge);               
+               hub_return(true, $hub_challenge);
        }
 }
 
@@ -120,7 +122,7 @@ function pubsub_post(&$a) {
 
        $importer = $r[0];
 
-       $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d 
+       $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d
                AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                intval($contact_id),
                intval($importer['uid']),
@@ -130,7 +132,7 @@ function pubsub_post(&$a) {
        );
 
        if(! count($r)) {
-               logger('pubsub: no contact record - ignored');
+               logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
                hub_post_return();
        }