add SUP links to RSS and Atom, too

[quix0rs-gnu-social.git] / lib / jabber.php
diff --git a/lib/jabber.php b/lib/jabber.php

index 3e74cbbb82d8601541a9ef35d5f8712ea1cfb266..3d388bd01dbed13ca1fac68d03a484bb95b280d0 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -57,16 +57,21 @@ function jabber_connect($resource=NULL) {
                                                                 common_config('xmpp', 'debug') ?
                                                                 XMPPHP_Log::LEVEL_VERBOSE :  NULL
                                                                 );
-               $conn->autoSubscribe();
-               $conn->useEncryption(common_config('xmpp', 'encryption'));
  
                 if (!$conn) {
                         return false;
                 }
-               $conn->connect(true); # true = persistent connection
-               if ($conn->isDisconnected()) {
+
+               $conn->autoSubscribe();
+               $conn->useEncryption(common_config('xmpp', 'encryption'));
+
+               try {
+                       $conn->connect(true); # true = persistent connection
+               } catch (XMPPHP_Exception $e) {
+                       common_log(LOG_ERROR, $e->getMessage());
                         return false;
                 }
+
         $conn->processUntil('session_start');
         }
         return $conn;
@@ -87,6 +92,7 @@ function jabber_send_notice($to, $notice) {
         $msg = jabber_format_notice($profile, $notice);
         $entry = jabber_format_entry($profile, $notice);
         $conn->message($to, $msg, 'chat', NULL, $entry);
+       $profile->free();
         return true;
  }
  
@@ -117,7 +123,7 @@ function jabber_format_entry($profile, $notice) {
  
         $html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
         $html .= "<body xmlns='http://www.w3.org/1999/xhtml'>\n";
-       $html .= "<a href='".common_profile_url($profile->nickname)."'>".$profile->nickname."</a>: ";
+       $html .= "<a href='".htmlspecialchars($profile->profileurl)."'>".$profile->nickname."</a>: ";
         $html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
         $html .= "\n</body>\n";
         $html .= "\n</html>\n";
@@ -126,16 +132,9 @@ function jabber_format_entry($profile, $notice) {
         $address .= "<address type='replyto' jid='" . jabber_daemon_address() . "' />\n";
         $address .= "</addresses>\n";
  
-       $event = "<event xmlns='http://jabber.org/protocol/pubsub#event'>\n";
-    $event .= "<items xmlns='http://jabber.org/protocol/pubsub' ";
-       $event .= "node='" . common_local_url('public') . "'>\n";
-       $event .= "<item id='" . $notice->uri ."' />\n";
-       $event .= "</items>\n";
-       $event .= "</event>\n";
-       # FIXME: include the pubsub event, too.
-#      return $html . $entry . $address;
-       return $entry . $address;
-#      return $entry . "\n" . $event;
+       # FIXME: include a pubsub event, too.
+
+       return $html . $entry . $address;
  }
  
  function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
@@ -206,6 +205,9 @@ function jabber_broadcast_notice($notice) {
         $msg = jabber_format_notice($profile, $notice);
         $entry = jabber_format_entry($profile, $notice);
  
+       $profile->free();
+       unset($profile);
+       
         $sent_to = array();
         $conn = jabber_connect();
  
@@ -223,9 +225,12 @@ function jabber_broadcast_notice($notice) {
                                    'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
                                    __FILE__);
                 $conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+               $conn->processTime(0);
                 $sent_to[$user->id] = 1;
         }
  
+       $user->free();
+       
      # Now, get users subscribed to this profile
  
         $user = new User();
@@ -241,9 +246,13 @@ function jabber_broadcast_notice($notice) {
                                            'Sending notice ' . $notice->id . ' to ' . $user->jabber,
                                            __FILE__);
                         $conn->message($user->jabber, $msg, 'chat', NULL, $entry);
+                       # To keep the incoming queue from filling up, we service it after each send.
+                       $conn->processTime(0);
                 }
         }
  
+       $user->free();
+       
         return true;
  }
  
@@ -277,7 +286,9 @@ function jabber_public_notice($notice) {
                                            'Sending notice ' . $notice->id . ' to public listener ' . $address,
                                            __FILE__);
                         $conn->message($address, $msg, 'chat', NULL, $entry);
+                       $conn->processTime(0);
                 }
+               $profile->free();
         }
  
         return true;