eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change to use SVN version of XMPPHP 

darcs-hash:20080705174045-d018c-84a84f72a3f371fe767ccca890d67be3b8a127af.gz
This commit is contained in:
Evan Prodromou 2008-07-05 13:40:45 -04:00
parent 1bdd158272
commit ec76d448de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jabber.php
View File

@ -19,7 +19,7 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
require_once('xmpp.php'); require_once('XMPPHP/XMPP.php');
function jabber_valid_base_jid($jid) { function jabber_valid_base_jid($jid) {
# Cheap but effective # Cheap but effective
@ -44,7 +44,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 XMPP(common_config('xmpp', 'host') ? $conn = new XMPPHP_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'),
@ -58,7 +58,7 @@ function jabber_connect($resource=NULL) {
return false; return false;
} }
$conn->connect(true); # true = persistent connection $conn->connect(true); # true = persistent connection
if ($conn->disconnected) { if ($conn->isDisconnected()) {
return false; return false;
} }
$conn->processUntil('session_start'); $conn->processUntil('session_start');