gnu-social/_darcs/tentative_pristine

hunk ./lib/jabber.php 2
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
hunk ./lib/jabber.php 5
- * This program is free software: you can redistribute it and/or modify
+ * utility functions for Jabber/GTalk/XMPP messages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
hunk ./lib/jabber.php 21
+ *
+ * @category  Network
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
hunk ./lib/jabber.php 30
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
hunk ./lib/jabber.php 34
-require_once('XMPPHP/XMPP.php');
+require_once 'XMPPHP/XMPP.php';
hunk ./lib/jabber.php 36
-function jabber_valid_base_jid($jid) {
-	# Cheap but effective
-	return Validate::email($jid);
+/**
+ * checks whether a string is a syntactically valid Jabber ID (JID)
+ *
+ * @param string $jid string to check
+ *
+ * @return     boolean whether the string is a valid JID
+ */
+
+function jabber_valid_base_jid($jid)
+{
+    // Cheap but effective
+    return Validate::email($jid);
hunk ./lib/jabber.php 50
-function jabber_normalize_jid($jid) {
-	if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
-		$node = $matches[1];
-		$server = $matches[2];
-		return strtolower($node.'@'.$server);
-	} else {
-		return NULL;
-	}
+/**
+ * normalizes a Jabber ID for comparison
+ *
+ * @param string $jid JID to check
+ *
+ * @return string an equivalent JID in normalized (lowercase) form
+ */
+
+function jabber_normalize_jid($jid)
+{
+    if (preg_match("/(?:([^\@]+)\@)?([^\/]+)(?:\/(.*))?$/", $jid, $matches)) {
+        $node   = $matches[1];
+        $server = $matches[2];
+        return strtolower($node.'@'.$server);
+    } else {
+        return null;
+    }
hunk ./lib/jabber.php 69
-function jabber_daemon_address() {
-	return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
+/**
+ * the JID of the Jabber daemon for this Laconica instance
+ *
+ * @return string JID of the Jabber daemon
+ */
+
+function jabber_daemon_address()
+{
+    return common_config('xmpp', 'user') . '@' . common_config('xmpp', 'server');
hunk ./lib/jabber.php 80
-function jabber_connect($resource=NULL) {
-	static $conn = NULL;
-	if (!$conn) {
-		$conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ?
-								common_config('xmpp', 'host') :
-								common_config('xmpp', 'server'),
-								common_config('xmpp', 'port'),
-								common_config('xmpp', 'user'),
-								common_config('xmpp', 'password'),
-								($resource) ? $resource :
-								common_config('xmpp', 'resource'),
-								common_config('xmpp', 'server'),
-								common_config('xmpp', 'debug') ?
-								true : false,
-								common_config('xmpp', 'debug') ?
-								XMPPHP_Log::LEVEL_VERBOSE :  NULL
-								);
+/**
+ * connect the configured Jabber account to the configured server
+ *
+ * @param string $resource Resource to connect (defaults to configured resource)
+ *
+ * @return XMPPHP connection to the configured server
+ */
+
+function jabber_connect($resource=null)
+{
+    static $conn = null;
+    if (!$conn) {
+        $conn = new XMPPHP_XMPP(common_config('xmpp', 'host') ?
+                                common_config('xmpp', 'host') :
+                                common_config('xmpp', 'server'),
+                                common_config('xmpp', 'port'),
+                                common_config('xmpp', 'user'),
+                                common_config('xmpp', 'password'),
+                                ($resource) ? $resource :
+                                common_config('xmpp', 'resource'),
+                                common_config('xmpp', 'server'),
+                                common_config('xmpp', 'debug') ?
+                                true : false,
+                                common_config('xmpp', 'debug') ?
+                                XMPPHP_Log::LEVEL_VERBOSE :  null
+                                );
hunk ./lib/jabber.php 107
-		if (!$conn) {
-			return false;
-		}
+        if (!$conn) {
+            return false;
+        }
hunk ./lib/jabber.php 111
-		$conn->autoSubscribe();
-		$conn->useEncryption(common_config('xmpp', 'encryption'));
+        $conn->autoSubscribe();
+        $conn->useEncryption(common_config('xmpp', 'encryption'));
hunk ./lib/jabber.php 114
-		try {
-			$conn->connect(true); # true = persistent connection
-		} catch (XMPPHP_Exception $e) {
-			common_log(LOG_ERROR, $e->getMessage());
-			return false;
-		}
+        try {
+            $conn->connect(true); // true = persistent connection
+        } catch (XMPPHP_Exception $e) {
+            common_log(LOG_ERROR, $e->getMessage());
+            return false;
+        }
hunk ./lib/jabber.php 121
-    	$conn->processUntil('session_start');
-	}
-	return $conn;
+        $conn->processUntil('session_start');
+    }
+    return $conn;
hunk ./lib/jabber.php 126
-function jabber_send_notice($to, $notice) {
-	$conn = jabber_connect();
-	if (!$conn) {
-		return false;
-	}
-	$profile = Profile::staticGet($notice->profile_id);
-	if (!$profile) {
-		common_log(LOG_WARNING, 'Refusing to send notice with ' .
-		           'unknown profile ' . common_log_objstring($notice),
-		           __FILE__);
-		return false;
-	}
-	$msg = jabber_format_notice($profile, $notice);
-	$entry = jabber_format_entry($profile, $notice);
-	$conn->message($to, $msg, 'chat', NULL, $entry);
-	$profile->free();
-	return true;
+/**
+ * send a single notice to a given Jabber address
+ *
+ * @param string $to     JID to send the notice to
+ * @param Notice $notice notice to send
+ *
+ * @return boolean success value
+ */
+
+function jabber_send_notice($to, $notice)
+{
+    $conn = jabber_connect();
+    if (!$conn) {
+        return false;
+    }
+    $profile = Profile::staticGet($notice->profile_id);
+    if (!$profile) {
+        common_log(LOG_WARNING, 'Refusing to send notice with ' .
+                   'unknown profile ' . common_log_objstring($notice),
+                   __FILE__);
+        return false;
+    }
+    $msg   = jabber_format_notice($profile, $notice);
+    $entry = jabber_format_entry($profile, $notice);
+    $conn->message($to, $msg, 'chat', null, $entry);
+    $profile->free();
+    return true;
hunk ./lib/jabber.php 155
-# Extra stuff defined by Twitter, needed by twitter clients
+/**
+ * extra information for XMPP messages, as defined by Twitter
+ *
+ * @param Profile $profile Profile of the sending user
+ * @param Notice  $notice  Notice being sent
+ *
+ * @return string Extra information (Atom, HTML, addresses) in string format
+ */
hunk ./lib/jabber.php 164
-function jabber_format_entry($profile, $notice) {
+function jabber_format_entry($profile, $notice)
+{
+    // FIXME: notice url might be remote
hunk ./lib/jabber.php 168
-	# FIXME: notice url might be remote
+    $noticeurl = common_local_url('shownotice',
+                                  array('notice' => $notice->id));
hunk ./lib/jabber.php 171
-	$noticeurl = common_local_url('shownotice',
-								  array('notice' => $notice->id));
-	$msg = jabber_format_notice($profile, $notice);
-	$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='" . 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";
-	$entry .= "</source>\n";
-	$entry .= "<title>" . htmlspecialchars($msg) . "</title>\n";
-	$entry .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
-	$entry .= "<link rel='alternate' href='" . $noticeurl . "' />\n";
-	$entry .= "<id>". $notice->uri . "</id>\n";
-	$entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
-	$entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
-	$entry .= "</entry>\n";
+    $msg = jabber_format_notice($profile, $notice);
hunk ./lib/jabber.php 173
-	$html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
-	$html .= "<body xmlns='http://www.w3.org/1999/xhtml'>\n";
-	$html .= "<a href='".htmlspecialchars($profile->profileurl)."'>".$profile->nickname."</a>: ";
-	$html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
-	$html .= "\n</body>\n";
-	$html .= "\n</html>\n";
+    $self_url = common_local_url('userrss', array('nickname' => $profile->nickname));
hunk ./lib/jabber.php 175
-	$address = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
-	$address .= "<address type='replyto' jid='" . jabber_daemon_address() . "' />\n";
-	$address .= "</addresses>\n";
+    $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='" . htmlspecialchars($profile->profileurl) . "'/>\n";
+    $entry .= "<link rel='self' type='application/rss+xml' href='" . $self_url . "'/>\n";
+    $entry .= "<author><name>" . $profile->nickname . "</name></author>\n";
+    $entry .= "<icon>" . common_profile_avatar_url($profile, AVATAR_PROFILE_SIZE) . "</icon>\n";
+    $entry .= "</source>\n";
+    $entry .= "<title>" . htmlspecialchars($msg) . "</title>\n";
+    $entry .= "<summary>" . htmlspecialchars($msg) . "</summary>\n";
+    $entry .= "<link rel='alternate' href='" . $noticeurl . "' />\n";
+    $entry .= "<id>". $notice->uri . "</id>\n";
+    $entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
+    $entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
+    $entry .= "</entry>\n";
hunk ./lib/jabber.php 191
-	# FIXME: include a pubsub event, too.
+    $html  = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
+    $html .= "<body xmlns='http://www.w3.org/1999/xhtml'>\n";
+    $html .= "<a href='".htmlspecialchars($profile->profileurl)."'>".$profile->nickname."</a>: ";
+    $html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
+    $html .= "\n</body>\n";
+    $html .= "\n</html>\n";
hunk ./lib/jabber.php 198
-	return $html . $entry . $address;
+    $address  = "<addresses xmlns='http://jabber.org/protocol/address'>\n";
+    $address .= "<address type='replyto' jid='" . jabber_daemon_address() . "' />\n";
+    $address .= "</addresses>\n";
+
+    // FIXME: include a pubsub event, too.
+
+    return $html . $entry . $address;
hunk ./lib/jabber.php 207
-function jabber_send_message($to, $body, $type='chat', $subject=NULL) {
-	$conn = jabber_connect();
-	if (!$conn) {
-		return false;
-	}
-	$conn->message($to, $body, $type, $subject);
-	return true;
+/**
+ * sends a single text message to a given JID
+ *
+ * @param string $to      JID to send the message to
+ * @param string $body    body of the message
+ * @param string $type    type of the message
+ * @param string $subject subject of the message
+ *
+ * @return boolean success flag
+ */
+
+function jabber_send_message($to, $body, $type='chat', $subject=null)
+{
+    $conn = jabber_connect();
+    if (!$conn) {
+        return false;
+    }
+    $conn->message($to, $body, $type, $subject);
+    return true;
hunk ./lib/jabber.php 228
-function jabber_send_presence($status, $show='available', $to=NULL,
-							  $type = 'available', $priority=NULL)
+/**
+ * sends a presence stanza on the Jabber network
+ *
+ * @param string $status   current status, free-form string
+ * @param string $show     structured status value
+ * @param string $to       recipient of presence, null for general
+ * @param string $type     type of status message, related to $show
+ * @param int    $priority priority of the presence
+ *
+ * @return boolean success value
+ */
+
+function jabber_send_presence($status, $show='available', $to=null,
+                              $type = 'available', $priority=null)
hunk ./lib/jabber.php 243
-	$conn = jabber_connect();
-	if (!$conn) {
-		return false;
-	}
-	$conn->presence($status, $show, $to, $type, $priority);
-	return true;
+    $conn = jabber_connect();
+    if (!$conn) {
+        return false;
+    }
+    $conn->presence($status, $show, $to, $type, $priority);
+    return true;
hunk ./lib/jabber.php 251
-function jabber_confirm_address($code, $nickname, $address) {
-	$body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' .
-			'has said that your Jabber ID belongs to them. ' .
-    	    'If that\'s true, you can confirm by clicking on this URL: ' .
-        	common_local_url('confirmaddress', array('code' => $code)) .
-        	' . (If you cannot click it, copy-and-paste it into the ' .
-        	'address bar of your browser). If that user isn\'t you, ' .
-        	'or if you didn\'t request this confirmation, just ignore this message.';
+/**
+ * sends a confirmation request to a JID
+ *
+ * @param string $code     confirmation code for confirmation URL
+ * @param string $nickname nickname of confirming user
+ * @param string $address  JID to send confirmation to
+ *
+ * @return boolean success flag
+ */
+
+function jabber_confirm_address($code, $nickname, $address)
+{
+    $body = 'User "' . $nickname . '" on ' . common_config('site', 'name') . ' ' .
+      'has said that your Jabber ID belongs to them. ' .
+      'If that\'s true, you can confirm by clicking on this URL: ' .
+      common_local_url('confirmaddress', array('code' => $code)) .
+      ' . (If you cannot click it, copy-and-paste it into the ' .
+      'address bar of your browser). If that user isn\'t you, ' .
+      'or if you didn\'t request this confirmation, just ignore this message.';
hunk ./lib/jabber.php 271
-	return jabber_send_message($address, $body);
+    return jabber_send_message($address, $body);
hunk ./lib/jabber.php 274
-function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
-	$conn = jabber_connect();
+/**
+ * sends a "special" presence stanza on the Jabber network
+ *
+ * @param string $type   Type of presence
+ * @param string $to     JID to send presence to
+ * @param string $show   show value for presence
+ * @param string $status status value for presence
+ *
+ * @return boolean success flag
+ *
+ * @see jabber_send_presence()
+ */
+
+function jabber_special_presence($type, $to=null, $show=null, $status=null)
+{
+    // FIXME: why use this instead of jabber_send_presence()?
+    $conn = jabber_connect();
hunk ./lib/jabber.php 292
-	$to = htmlspecialchars($to);
-	$status = htmlspecialchars($status);
-	$out = "<presence";
-	if($to) $out .= " to='$to'";
-	if($type) $out .= " type='$type'";
-	if($show == 'available' and !$status) {
-		$out .= "/>";
-	} else {
-		$out .= ">";
-		if($show && ($show != 'available')) $out .= "<show>$show</show>";
-		if($status) $out .= "<status>$status</status>";
-		$out .= "</presence>";
-	}
-	$conn->send($out);
+    $to     = htmlspecialchars($to);
+    $status = htmlspecialchars($status);
+
+    $out = "<presence";
+    if ($to) {
+        $out .= " to='$to'";
+    }
+    if ($type) {
+        $out .= " type='$type'";
+    }
+    if ($show == 'available' and !$status) {
+        $out .= "/>";
+    } else {
+        $out .= ">";
+        if ($show && ($show != 'available')) {
+            $out .= "<show>$show</show>";
+        }
+        if ($status) {
+            $out .= "<status>$status</status>";
+        }
+        $out .= "</presence>";
+    }
+    $conn->send($out);
hunk ./lib/jabber.php 317
-function jabber_broadcast_notice($notice) {
+/**
+ * broadcast a notice to all subscribers and reply recipients
+ *
+ * This function will send a notice to all subscribers on the local server
+ * who have Jabber addresses, and have Jabber notification enabled, and
+ * have this subscription enabled for Jabber. It also sends the notice to
+ * all recipients of @-replies who have Jabber addresses and Jabber notification
+ * enabled. This is really the heart of Jabber distribution in Laconica.
+ *
+ * @param Notice $notice The notice to broadcast
+ *
+ * @return boolean success flag
+ */
hunk ./lib/jabber.php 331
-	if (!common_config('xmpp', 'enabled')) {
-		return true;
-	}
-	$profile = Profile::staticGet($notice->profile_id);
+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 ' .
+                   'unknown profile ' . common_log_objstring($notice),
+                   __FILE__);
+        return false;
+    }
hunk ./lib/jabber.php 345
-	if (!$profile) {
-		common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
-		           'unknown profile ' . common_log_objstring($notice),
-		           __FILE__);
-		return false;
-	}
+    $msg   = jabber_format_notice($profile, $notice);
+    $entry = jabber_format_entry($profile, $notice);
hunk ./lib/jabber.php 348
-	$msg = jabber_format_notice($profile, $notice);
-	$entry = jabber_format_entry($profile, $notice);
+    $profile->free();
+    unset($profile);
hunk ./lib/jabber.php 351
-	$profile->free();
-	unset($profile);
+    $sent_to = array();
hunk ./lib/jabber.php 353
-	$sent_to = array();
-	$conn = jabber_connect();
+    $conn = jabber_connect();
hunk ./lib/jabber.php 355
-	# First, get users to whom this is a direct reply
-	$user = new User();
-	$user->query('SELECT user.id, user.jabber ' .
-				 'FROM user JOIN reply ON user.id = reply.profile_id ' .
-				 'WHERE reply.notice_id = ' . $notice->id . ' ' .
-				 'AND user.jabber is not null ' .
-				 'AND user.jabbernotify = 1 ' .
-				 'AND user.jabberreplies = 1 ');
+    // First, get users to whom this is a direct reply
+    $user = new User();
+    $user->query('SELECT user.id, user.jabber ' .
+                 'FROM user JOIN reply ON user.id = reply.profile_id ' .
+                 'WHERE reply.notice_id = ' . $notice->id . ' ' .
+                 'AND user.jabber is not null ' .
+                 'AND user.jabbernotify = 1 ' .
+                 'AND user.jabberreplies = 1 ');
hunk ./lib/jabber.php 364
-	while ($user->fetch()) {
-		common_log(LOG_INFO,
-				   'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
-				   __FILE__);
-		$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
-		$conn->processTime(0);
-		$sent_to[$user->id] = 1;
-	}
+    while ($user->fetch()) {
+        common_log(LOG_INFO,
+                   'Sending reply notice ' . $notice->id . ' to ' . $user->jabber,
+                   __FILE__);
+        $conn->message($user->jabber, $msg, 'chat', null, $entry);
+        $conn->processTime(0);
+        $sent_to[$user->id] = 1;
+    }
hunk ./lib/jabber.php 373
-	$user->free();
+    $user->free();
hunk ./lib/jabber.php 375
-    # Now, get users subscribed to this profile
+    // Now, get users subscribed to this profile
hunk ./lib/jabber.php 377
-	$user = new User();
-	$user->query('SELECT user.id, user.jabber ' .
-				 'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
-				 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
-				 'AND user.jabber is not null ' .
-				 'AND user.jabbernotify = 1 ' .
+    $user = new User();
+    $user->query('SELECT user.id, user.jabber ' .
+                 'FROM user JOIN subscription ' .
+                 'ON user.id = subscription.subscriber ' .
+                 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+                 'AND user.jabber is not null ' .
+                 'AND user.jabbernotify = 1 ' .
hunk ./lib/jabber.php 386
-	while ($user->fetch()) {
-		if (!array_key_exists($user->id, $sent_to)) {
-			common_log(LOG_INFO,
-					   'Sending notice ' . $notice->id . ' to ' . $user->jabber,
-					   __FILE__);
-			$conn->message($user->jabber, $msg, 'chat', NULL, $entry);
-			# To keep the incoming queue from filling up, we service it after each send.
-			$conn->processTime(0);
-		}
-	}
+    while ($user->fetch()) {
+        if (!array_key_exists($user->id, $sent_to)) {
+            common_log(LOG_INFO,
+                       'Sending notice ' . $notice->id . ' to ' . $user->jabber,
+                       __FILE__);
+            $conn->message($user->jabber, $msg, 'chat', null, $entry);
+            // To keep the incoming queue from filling up,
+            // we service it after each send.
+            $conn->processTime(0);
+        }
+    }
hunk ./lib/jabber.php 398
-	$user->free();
+    $user->free();
hunk ./lib/jabber.php 400
-	return true;
+    return true;
hunk ./lib/jabber.php 403
-function jabber_public_notice($notice) {
+/**
+ * send a notice to all public listeners
+ *
+ * For notices that are generated on the local system (by users), we can optionally
+ * forward them to remote listeners by XMPP.
+ *
+ * @param Notice $notice notice to broadcast
+ *
+ * @return boolean success flag
+ */
hunk ./lib/jabber.php 414
-	# Now, users who want everything
+function jabber_public_notice($notice)
+{
+    // Now, users who want everything
hunk ./lib/jabber.php 418
-	$public = common_config('xmpp', 'public');
+    $public = common_config('xmpp', 'public');
hunk ./lib/jabber.php 420
-	# FIXME PRIV don't send out private messages here
-	# XXX: should we send out non-local messages if public,localonly
-	# = false? I think not
+    // FIXME PRIV don't send out private messages here
+    // XXX: should we send out non-local messages if public,localonly
+    // = false? I think not
hunk ./lib/jabber.php 424
-	if ($public && $notice->is_local) {
-		$profile = Profile::staticGet($notice->profile_id);
+    if ($public && $notice->is_local) {
+        $profile = Profile::staticGet($notice->profile_id);
hunk ./lib/jabber.php 427
-		if (!$profile) {
-			common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
-					   'unknown profile ' . common_log_objstring($notice),
-					   __FILE__);
-			return false;
-		}
+        if (!$profile) {
+            common_log(LOG_WARNING, 'Refusing to broadcast notice with ' .
+                       'unknown profile ' . common_log_objstring($notice),
+                       __FILE__);
+            return false;
+        }
hunk ./lib/jabber.php 434
-		$msg = jabber_format_notice($profile, $notice);
-		$entry = jabber_format_entry($profile, $notice);
+        $msg   = jabber_format_notice($profile, $notice);
+        $entry = jabber_format_entry($profile, $notice);
hunk ./lib/jabber.php 437
-		$conn = jabber_connect();
+        $conn = jabber_connect();
hunk ./lib/jabber.php 439
-		foreach ($public as $address) {
-			common_log(LOG_INFO,
-					   'Sending notice ' . $notice->id . ' to public listener ' . $address,
-					   __FILE__);
-			$conn->message($address, $msg, 'chat', NULL, $entry);
-			$conn->processTime(0);
-		}
-		$profile->free();
-	}
+        foreach ($public as $address) {
+            common_log(LOG_INFO,
+                       'Sending notice ' . $notice->id .
+                       ' to public listener ' . $address,
+                       __FILE__);
+            $conn->message($address, $msg, 'chat', null, $entry);
+            $conn->processTime(0);
+        }
+        $profile->free();
+    }
hunk ./lib/jabber.php 450
-	return true;
+    return true;
hunk ./lib/jabber.php 453
-function jabber_format_notice(&$profile, &$notice) {
-	return $profile->nickname . ': ' . $notice->content;
+/**
+ * makes a plain-text formatted version of a notice, suitable for Jabber distribution
+ *
+ * @param Profile &$profile profile of the sending user
+ * @param Notice  &$notice  notice being sent
+ *
+ * @return string plain-text version of the notice, with user nickname prefixed
+ */
+
+function jabber_format_notice(&$profile, &$notice)
+{
+    return $profile->nickname . ': ' . $notice->content;