use jabber.php more from xmppdaemon

darcs-hash:20080626150336-34904-bfa5ec8740ba1edf60c34e1ef6aafdfd73fc99a2.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index 2e6770651525d5bff90a102163b0da2da0f2e23e..7e33b8e399d6ebfa70c586aedfa8c1e228471a8f 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -37,7 +37,7 @@ function jabber_normalize_jid($jid) {
        }
 }
 
-function jabber_connect($resource=NULL, $status=NULL) {
+function jabber_connect($resource=NULL) {
        static $conn = NULL;
        if (!$conn) {
                $conn = new XMPP(common_config('xmpp', 'host') ?
@@ -53,14 +53,11 @@ function jabber_connect($resource=NULL, $status=NULL) {
                if (!$conn) {
                        return false;
                }
-               $conn->connect(true); # try to get a persistent connection
+               $conn->connect(true); # true = persistent connection
                if ($conn->disconnected) {
                        return false;
                }
-        $conn->processUntil('session_start');
-        if ($status) {
-               $conn->presence($status);
-               }
+       $conn->processUntil('session_start');
        }
        return $conn;
 }
@@ -74,7 +71,7 @@ function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
        return true;
 }
 
-function jabber_send_presence($status=Null, $show='available', $to=Null) {
+function jabber_send_presence($status, $show='available', $to=Null) {
        $conn = jabber_connect();
        if (!$conn) {
                return false;

diff --git a/xmppdaemon.php b/xmppdaemon.php
old mode 100644 (file)
new mode 100755 (executable)
index ac3ab8a..c8204ba
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
@@ -32,8 +33,7 @@ require_once(INSTALLDIR . '/lib/jabber.php');
 class XMPPDaemon {
 
        function XMPPDaemon($resource=NULL) {
-               static $attrs = array('server', 'port', 'user', 'password',
-                                          'resource', 'host');
+               static $attrs = array('server', 'port', 'user', 'password', 'host');
 
                foreach ($attrs as $attr)
                {
@@ -42,12 +42,20 @@ class XMPPDaemon {
 
                if ($resource) {
                        $this->resource = $resource;
+               } else {
+                       $this->resource = common_config('xmpp', 'resource') . 'daemon';
                }
+
+               $this->log(LOG_INFO, "{$this->user}@{$this->server}/{$this->resource}");
        }
 
        function connect() {
-               $this->conn = jabber_connect($this->resource,
-                                                                    "Send me a message to post a notice");
+               $connect_to = ($this->host) ? $this->host : $this->server;
+
+               $this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
+
+               $this->conn = jabber_connect($this->resource);
+
                if (!$this->conn) {
                        return false;
                }
@@ -189,30 +197,20 @@ class XMPPDaemon {
        }
 
        function subscribed($to) {
-               $this->special_presence('subscribed', $to);
+               jabber_special_presence('subscribed', $to);
        }
 
-       function special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
-               $to = htmlspecialchars($to);
-               $status = htmlspecialchars($status);
-               $out = "<presence";
-               if($to) $out .= " to='$to'";
-               if($type) $out .= " type='$type'";
-               if($show == 'available' and !$status) {
-                       $out .= "/>";
-               } else {
-                       $out .= ">";
-                       if($show && ($show != 'available')) $out .= "<show>$show</show>";
-                       if($status) $out .= "<status>$status</status>";
-                       $out .= "</presence>";
-               }
-               $this->conn->send($out);
+       function set_status($status) {
+               jabber_send_presence($status);
        }
 }
 
-$daemon = new XMPPDaemon();
+$resource = ($argc > 1) ? $argv[1] : NULL;
+
+$daemon = new XMPPDaemon($resource);
 
 if ($daemon->connect()) {
+       $daemon->set_status("Send me a message to post a notice");
        $daemon->handle();
 }
 ?>