diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-08-27 16:54:07 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-08-27 16:54:07 -0400 |
| commit | b9f0ea6f0e16f2314a2bdd56365205e7a3c31aa1 (patch) | |
| tree | a4739cd2c39c4736a5789a80b47ab0cf174d2be3 /lib/jabber.php | |
| parent | adeb19f1f7a82b17cee85ade1ac06fcd48e0d4cb (diff) | |
break up monolithic xmppdaemon into multiple queue handlers
Eventually, the poor xmppdaemon has become overloaded with extra
tasks. So, I've broken it up. Now, we have 5 background scripts, and
more coming:
* xmppdaemon.php - handles incoming XMPP messages only.
* xmppqueuehandler.php - sends notices from the queue out through XMPP.
* smsqueuehandler.php - sends notices from the queue out over SMS
* ombqueuehandler.php - sends notices from the queue out over OMB
* xmppconfirmhandler.php - sends confirmation requests out over XMPP.
This is in addition to maildaemon.php, which takes incoming messages.
None of these are "true" daemons -- they don't daemonize themselves
automatically. Use nohup or another tool to background them. monit can
also be useful to keep them running.
At some point, these might become fork()'ing daemons, able to handle
more than one notice at a time. For now, I'm just running multiple
instances, hoping they don't interfere.
darcs-hash:20080827205407-84dde-97884a12f5f4e54c93bc785bd280683d1ee7e749.gz
Diffstat (limited to 'lib/jabber.php')
| -rw-r--r-- | lib/jabber.php | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index 1202aa322..e2f7ca3c8 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -26,23 +26,45 @@ require_once('XMPPHP/XMPP.php'); class Laconica_XMPP extends XMPPHP_XMPP { function messageplus($to, $body, $type = 'chat', $subject = null, $payload = null) { - $to = htmlspecialchars($to); - $body = htmlspecialchars($body); - $subject = htmlspecialchars($subject); - - $jid = jabber_daemon_address(); - - $out = "<message from='$jid' to='$to' type='$type'>"; - if($subject) $out .= "<subject>$subject</subject>"; - $out .= "<body>$body</body>"; - if($payload) $out .= $payload; - $out .= "</message>"; - + $to = htmlspecialchars($to); + $body = htmlspecialchars($body); + $subject = htmlspecialchars($subject); + + $jid = jabber_daemon_address(); + + $out = "<message from='$jid' to='$to' type='$type'>"; + if($subject) $out .= "<subject>$subject</subject>"; + $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); + $this->send($out); common_log(LOG_DEBUG, 'Done.'); } + + public function presence($status = null, $show = 'available', $to = null, $type='available', $priority=NULL) { + if($type == 'available') $type = ''; + $to = htmlspecialchars($to); + $status = htmlspecialchars($status); + if($show == 'unavailable') $type = 'unavailable'; + + $out = "<presence"; + if($to) $out .= " to='$to'"; + if($type) $out .= " type='$type'"; + if($show == 'available' and !$status and is_null($priority)) { + $out .= "/>"; + } else { + $out .= ">"; + if($show != 'available') $out .= "<show>$show</show>"; + if($status) $out .= "<status>$status</status>"; + if(!is_null($priority)) $out .= "<priority>$priority</priority>"; + $out .= "</presence>"; + } + + $this->send($out); + } } function jabber_valid_base_jid($jid) { @@ -64,7 +86,7 @@ function jabber_daemon_address() { return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server'); } -function jabber_connect($resource=NULL) { +function jabber_connect($resource=NULL, $status=NULL, $priority=NULL) { static $conn = NULL; if (!$conn) { $conn = new Laconica_XMPP(common_config('xmpp', 'host') ? @@ -92,6 +114,8 @@ function jabber_connect($resource=NULL) { return false; } $conn->processUntil('session_start'); + $conn->getRoster(); + $conn->presence($presence, $priority); } return $conn; } |