if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
$node = $matches[1];
$server = $matches[2];
- $resource = $matches[3];
return strtolower($node.'@'.$server);
} else {
return NULL;
XMPPHP_Log::LEVEL_VERBOSE : NULL
);
$conn->autoSubscribe();
-
+ $conn->useEncryption(common_config('xmpp', 'encryption'));
+
if (!$conn) {
return false;
}
$entry = "\n<entry xmlns='http://www.w3.org/2005/Atom'>\n";
$entry .= "<source>\n";
$entry .= "<title>" . $profile->nickname . " - " . common_config('site', 'name') . "</title>\n";
- $entry .= "<link href='" . $profile->profileurl . "'/>\n";
+ $entry .= "<link href='" . htmlspecialchars($profile->profileurl) . "'/>\n";
$entry .= "<link rel='self' type='application/rss+xml' href='" . common_local_url('userrss', array('nickname' => $profile->nickname)) . "'/>\n";
$entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
$entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
}
function jabber_broadcast_notice($notice) {
+ if (!common_config('xmpp', 'enabled')) {
+ return true;
+ }
$profile = Profile::staticGet($notice->profile_id);
if (!$profile) {
common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
if ($sub->find()) {
while ($sub->fetch()) {
$user = User::staticGet($sub->subscriber);
- if ($user && $user->jabber && $user->jabbernotify && !$sent_to[$user->id]) {
+ if ($user && $user->jabber && $user->jabbernotify && !array_key_exists($user->id,$sent_to)) {
common_log(LOG_INFO,
'Sending notice ' . $notice->id . ' to ' . $user->jabber,
__FILE__);
$public = common_config('xmpp', 'public');
# FIXME PRIV don't send out private messages here
+ # XXX: should we send out non-local messages if public,localonly = false? I think not
- if ($public) {
+ if ($public && $notice->is_local) {
foreach ($public as $address) {
common_log(LOG_INFO,
'Sending notice ' . $notice->id . ' to public listener ' . $address,