diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-29 13:23:45 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-29 13:23:45 -0700 |
| commit | dd1fc46f0986e5675d24208199b88150f643925d (patch) | |
| tree | b19ecc1c4f60882f5cc231214398e57190d6ce14 /extlib | |
| parent | f65015b24a8448ecbb12b3897992cdaf6b563212 (diff) | |
| parent | 5b8e40aaa9bdb0c07cce0cf53cd913b0c397fdc4 (diff) | |
Merge branch '0.8.x' into design_reset
* 0.8.x: (32 commits)
admin indicators in groups
show section with admins in sidebar of group
update to latest (r76) version of XMPPHP
better output for common error handler
fix logging error
note when going background
change name of constructor for xmppdaemon
add a lot more logging to xmppdaemon
error in get_option_value wasn't returning a value
reformat commandline.inc
if not in daemon mode, xmppdaemon sends log to stdout
extract log-line formatting to its own function
got my background/foreground logic backwards
twitter status fetcher takes an id argument
more efficient fixup of conversations
commandline processing handles errors better
xmppdaemon.php can stay in foreground
command line arg handling a little more flexible
Daemon can optionally not go into the background
don't canonicalize people's text into URLs
...
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'extlib')
| -rw-r--r-- | extlib/XMPPHP/BOSH.php | 2 | ||||
| -rw-r--r-- | extlib/XMPPHP/XMLStream.php | 8 | ||||
| -rw-r--r-- | extlib/XMPPHP/XMPP.php | 13 |
3 files changed, 16 insertions, 7 deletions
diff --git a/extlib/XMPPHP/BOSH.php b/extlib/XMPPHP/BOSH.php index b147443d7..befaf60a7 100644 --- a/extlib/XMPPHP/BOSH.php +++ b/extlib/XMPPHP/BOSH.php @@ -27,7 +27,7 @@ */ /** XMPPHP_XMLStream */ -require_once "XMPP.php"; +require_once dirname(__FILE__) . "/XMPP.php"; /** * XMPPHP Main Class diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php index 0fcfea375..d33411ec5 100644 --- a/extlib/XMPPHP/XMLStream.php +++ b/extlib/XMPPHP/XMLStream.php @@ -27,13 +27,13 @@ */ /** XMPPHP_Exception */ -require_once 'Exception.php'; +require_once dirname(__FILE__) . '/Exception.php'; /** XMPPHP_XMLObj */ -require_once 'XMLObj.php'; +require_once dirname(__FILE__) . '/XMLObj.php'; /** XMPPHP_Log */ -require_once 'Log.php'; +require_once dirname(__FILE__) . '/Log.php'; /** * XMPPHP XML Stream @@ -375,7 +375,7 @@ class XMPPHP_XMLStream { * integer -> process for this amount of time */ - private function __process($maximum=0) { + private function __process($maximum=5) { $remaining = $maximum; diff --git a/extlib/XMPPHP/XMPP.php b/extlib/XMPPHP/XMPP.php index 73fbd2658..429f45e56 100644 --- a/extlib/XMPPHP/XMPP.php +++ b/extlib/XMPPHP/XMPP.php @@ -27,8 +27,8 @@ */ /** XMPPHP_XMLStream */ -require_once "XMLStream.php"; -require_once "Roster.php"; +require_once dirname(__FILE__) . "/XMLStream.php"; +require_once dirname(__FILE__) . "/Roster.php"; /** * XMPPHP Main Class @@ -208,6 +208,15 @@ class XMPPHP_XMPP extends XMPPHP_XMLStream { $this->send($out); } + /** + * Send Auth request + * + * @param string $jid + */ + public function subscribe($jid) { + $this->send("<presence type='subscribe' to='{$jid}' from='{$this->fulljid}' />"); + #$this->send("<presence type='subscribed' to='{$jid}' from='{$this->fulljid}' />"); + } /** * Message handler |