Commit a77efb2447abe75d3b9902410bced61b76377de3

XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable


88	88	/**
89	89	* Build an XMPP proxy connection that'll save outgoing messages
90	90	* to the 'xmppout' queue to be picked up by xmppdaemon later.
	91	*
	92	* If queueing is disabled, we'll grab a live connection.
	93	*
	94	* @return XMPPHP
91	95	*/
92	96	function jabber_proxy()
93	97	{
94		$proxy = new Queued_XMPP(common_config('xmpp', 'host') ?
95		common_config('xmpp', 'host') :
96		common_config('xmpp', 'server'),
97		common_config('xmpp', 'port'),
98		common_config('xmpp', 'user'),
99		common_config('xmpp', 'password'),
100		common_config('xmpp', 'resource') . 'daemon',
101		common_config('xmpp', 'server'),
102		common_config('xmpp', 'debug') ?
103		true : false,
104		common_config('xmpp', 'debug') ?
105		XMPPHP_Log::LEVEL_VERBOSE : null);
106		return $proxy;
	98	if (common_config('queue', 'enabled')) {
	99	$proxy = new Queued_XMPP(common_config('xmpp', 'host') ?
	100	common_config('xmpp', 'host') :
	101	common_config('xmpp', 'server'),
	102	common_config('xmpp', 'port'),
	103	common_config('xmpp', 'user'),
	104	common_config('xmpp', 'password'),
	105	common_config('xmpp', 'resource') . 'daemon',
	106	common_config('xmpp', 'server'),
	107	common_config('xmpp', 'debug') ?
	108	true : false,
	109	common_config('xmpp', 'debug') ?
	110	XMPPHP_Log::LEVEL_VERBOSE : null);
	111	return $proxy;
	112	} else {
	113	return jabber_connect();
	114	}
107	115	}
108	116
109	117	/**


36	36	protected $site = null;
37	37	protected $pingid = 0;
38	38	protected $lastping = null;
	39	protected $conn = null;
39	40
40	41	static protected $singletons = array();
41	42