log IP for API auth errors

[quix0rs-gnu-social.git] / lib / xmppqueuehandler.php

diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 33b987291654ef063ba8d62dc76f62add2fa8a75..986e09c25e4c353cb0d849b5a4736edfd6638cac 100644 (file)
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -22,33 +22,36 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/queuehandler.php');
 
 /**
- * Common superclass for all XMPP-using queue handlers. They all need to 
+ * Common superclass for all XMPP-using queue handlers. They all need to
  * service their message queues on idle, and forward any incoming messages
  * to the XMPP listener connection. So, we abstract out common code to a
  * superclass.
  */
 
-class XmppQueueHandler extends QueueHandler {
-    
-    function start() {
+class XmppQueueHandler extends QueueHandler
+{
+    function start()
+    {
         # Low priority; we don't want to receive messages
         $this->log(LOG_INFO, "INITIALIZE");
-        $this->conn = jabber_connect($this->_id);
+        $this->conn = jabber_connect($this->_id.$this->transport());
         if ($this->conn) {
             $this->conn->addEventHandler('message', 'forward_message', $this);
             $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
             $this->conn->setReconnectTimeout(600);
-            jabber_send_presence("Send me a message to post a notice", 'available', NULL, 'available', -1);
+            jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1);
         }
         return !is_null($this->conn);
     }
-    
-    function handle_reconnect(&$pl) {
+
+    function handle_reconnect(&$pl)
+    {
         $this->conn->processUntil('session_start');
-        $this->conn->presence(NULL, 'available', NULL, 'available', -1);
+        $this->conn->presence(null, 'available', null, 'available', -1);
     }
 
-    function idle($timeout=0) {
+    function idle($timeout=0)
+    {
         # Process the queue for as long as needed
         try {
             if ($this->conn) {
@@ -59,8 +62,9 @@ class XmppQueueHandler extends QueueHandler {
             die($e->getMessage());
         }
     }
-    
-    function forward_message(&$pl) {
+
+    function forward_message(&$pl)
+    {
         if ($pl['type'] != 'chat') {
             $this->log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']);
             return;
@@ -71,17 +75,19 @@ class XmppQueueHandler extends QueueHandler {
             return;
         }
         $this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener);
-        $this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));
+        $this->conn->message($this->listener(), $pl['body'], 'chat', null, $this->ofrom($pl['from']));
     }
 
-    function ofrom($from) {
+    function ofrom($from)
+    {
         $address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
         $address .= "<address type='ofrom' jid='$from' />\n";
         $address .= "</addresses>\n";
         return $address;
     }
 
-    function listener() {
+    function listener()
+    {
         if (common_config('xmpp', 'listener')) {
             return common_config('xmpp', 'listener');
         } else {