]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - lib/jabber.php
projects / quix0rs-gnu-social.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
csrf protection in userauthorization
[quix0rs-gnu-social.git] / lib / jabber.php
diff --git a/lib/jabber.php b/lib/jabber.php
index b0dc24bd0dfdab0a5f775dbcdfd2d7dc5ac0cba1..1202aa32227505f4d0682389063c695728f6fa73 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -37,8 +37,11 @@ class Laconica_XMPP extends XMPPHP_XMPP {
        $out .= "<body>$body</body>";
        if($payload) $out .= $payload;
        $out .= "</message>";
-       
+
+               $cnt = strlen($out);
+               common_log(LOG_DEBUG, "Sending $cnt chars to $to");
        $this->send($out);
+               common_log(LOG_DEBUG, 'Done.');
     }
 }
 
@@ -51,7 +54,6 @@ function jabber_normalize_jid($jid) {
        if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
                $node = $matches[1];
                $server = $matches[2];
-               $resource = $matches[3];
                return strtolower($node.'@'.$server);
        } else {
                return NULL;
@@ -80,7 +82,8 @@ function jabber_connect($resource=NULL) {
                                                                XMPPHP_Log::LEVEL_VERBOSE :  NULL
                                                                );
                $conn->autoSubscribe();
-
+               $conn->useEncryption(common_config('xmpp', 'encryption'));
+               
                if (!$conn) {
                        return false;
                }
@@ -114,13 +117,14 @@ function jabber_send_notice($to, $notice) {
 # Extra stuff defined by Twitter, needed by twitter clients
 
 function jabber_format_entry($profile, $notice) {
+       
        $noticeurl = common_local_url('shownotice',
                                                                  array('notice' => $notice->id));
        $msg = jabber_format_notice($profile, $notice);
        $entry = "\n<entry xmlns='http://www.w3.org/2005/Atom'>\n";
        $entry .= "<source>\n";
        $entry .= "<title>" . $profile->nickname . " - " . common_config('site', 'name') . "</title>\n";
-       $entry .= "<link href='" . $profile->profileurl . "'/>\n";
+       $entry .= "<link href='" . htmlspecialchars($profile->profileurl) . "'/>\n";
        $entry .= "<link rel='self' type='application/rss+xml' href='" . common_local_url('userrss', array('nickname' => $profile->nickname)) . "'/>\n";
        $entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
        $entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
@@ -132,6 +136,13 @@ function jabber_format_entry($profile, $notice) {
        $entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
        $entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
        $entry .= "</entry>\n";
+
+       $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 .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
+       $html .= "\n</body>\n";
+       $html .= "\n</html>\n";
        
        $event = "<event xmlns='http://jabber.org/protocol/pubsub#event'>\n";
     $event .= "<items xmlns='http://jabber.org/protocol/pubsub' ";
@@ -140,7 +151,7 @@ function jabber_format_entry($profile, $notice) {
        $event .= "</items>\n";
        $event .= "</event>\n";
        # FIXME: include the pubsub event, too.
-       return $entry;
+       return $html . $entry;
 #      return $entry . "\n" . $event;
 }
 
@@ -194,6 +205,9 @@ function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
 }
 
 function jabber_broadcast_notice($notice) {
+       if (!common_config('xmpp', 'enabled')) {
+               return true;
+       }
        $profile = Profile::staticGet($notice->profile_id);
        if (!$profile) {
                common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
@@ -218,6 +232,9 @@ function jabber_broadcast_notice($notice) {
                                        $sent_to[$user->id] = true;
                                } else {
                                        # XXX: Not sure, but I think that's the right thing to do
+                                       common_log(LOG_WARNING,
+                                                          'Sending reply notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.',
+                                                          __FILE__);
                                        return false;
                                }
                        }
@@ -231,20 +248,40 @@ function jabber_broadcast_notice($notice) {
        if ($sub->find()) {
                while ($sub->fetch()) {
                        $user = User::staticGet($sub->subscriber);
-                       if ($user && $user->jabber && $user->jabbernotify && !$sent_to[$user->id]) {
+                       if ($user && $user->jabber && $user->jabbernotify && !array_key_exists($user->id,$sent_to)) {
                                common_log(LOG_INFO,
                                                   'Sending notice ' . $notice->id . ' to ' . $user->jabber,
                                                   __FILE__);
                                $success = jabber_send_notice($user->jabber, $notice);
                                if ($success) {
                                        $sent_to[$user->id] = true;
+                               } else {
                                        # XXX: Not sure, but I think that's the right thing to do
+                                       common_log(LOG_WARNING,
+                                                          'Sending notice ' . $notice->id . ' to ' . $user->jabber . ' FAILED, cancelling.',
+                                                          __FILE__);
                                        return false;
                                }
                        }
                }
        }
 
+       # Now, users who want everything
+       
+       $public = common_config('xmpp', 'public');
+       
+       # FIXME PRIV don't send out private messages here
+       # XXX: should we send out non-local messages if public,localonly = false? I think not
+       
+       if ($public && $notice->is_local) {
+               foreach ($public as $address) {
+                               common_log(LOG_INFO,
+                                                  'Sending notice ' . $notice->id . ' to public listener ' . $address,
+                                                  __FILE__);
+                               jabber_send_notice($address, $notice);
+               }
+       }
+       
        return true;
 }
 
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)