GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

work around probs with XMPPHP library

Browse Source 
darcs-hash:20080715190519-84dde-766a45bc05fff8682843323145c1bd2460f8c308.gz
This commit is contained in:
Evan Prodromou 2008-07-15 15:05:19 -04:00
parent 7ad21d3cc1
commit 3f59000e73
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/jabber.php
View File

@ -21,6 +21,27 @@ if (!defined('LACONICA')) { exit(1); }
require_once('XMPPHP/XMPP.php'); require_once('XMPPHP/XMPP.php');
# XXX: something of a hack to work around problems with the XMPPHP lib
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>";
$this->send($out);
}
}
function jabber_valid_base_jid($jid) { function jabber_valid_base_jid($jid) {
# Cheap but effective # Cheap but effective
return Validate::email($jid); return Validate::email($jid);
@ -44,7 +65,7 @@ function jabber_daemon_address() {
function jabber_connect($resource=NULL) { function jabber_connect($resource=NULL) {
static $conn = NULL; static $conn = NULL;
if (!$conn) { if (!$conn) {
$conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ? $conn = new Laconica_XMPP(common_config('xmpp', 'host') ?
common_config('xmpp', 'host') : common_config('xmpp', 'host') :
common_config('xmpp', 'server'), common_config('xmpp', 'server'),
common_config('xmpp', 'port'), common_config('xmpp', 'port'),
@ -86,28 +107,10 @@ function jabber_send_notice($to, $notice) {
} }
$msg = jabber_format_notice($profile, $notice); $msg = jabber_format_notice($profile, $notice);
$entry = jabber_format_entry($profile, $notice); $entry = jabber_format_entry($profile, $notice);
$stanza = jabber_make_stanza($to, $msg, 'chat', NULL, $entry); $conn->messageplus($to, $msg, 'chat', NULL, $entry);
common_log(LOG_DEBUG, 'full stanza = ' . $stanza, __FILE__);
$conn->send($stanza);
return true; return true;
} }
function jabber_make_stanza($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>";
return $out;
}
# Extra stuff defined by Twitter, needed by twitter clients # Extra stuff defined by Twitter, needed by twitter clients
function jabber_format_entry($profile, $notice) { function jabber_format_entry($profile, $notice) {