1 files changed, 13 insertions, 85 deletions

diff --git a/lib/util.php b/lib/util.php
index 61f5d6c16..d30a56c77 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -424,6 +424,7 @@ function common_render_content($text, $notice)
     $r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
     $r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
     $r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
+    $r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
     return $r;
 }
 
@@ -595,6 +596,17 @@ function common_at_link($sender_id, $nickname)
     }
 }
 
+function common_group_link($sender_id, $nickname)
+{
+    $sender = Profile::staticGet($sender_id);
+    $group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
+    if ($group && $sender->isMember($group)) {
+        return '<span class="vcard"><a href="'.htmlspecialchars($group->permalink()).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
+    } else {
+        return $nickname;
+    }
+}
+
 function common_at_hash_link($sender_id, $tag)
 {
     $user = User::staticGet($sender_id);
@@ -1052,95 +1064,11 @@ function common_redirect($url, $code=307)
     $xo->startXML('a',
                   '-//W3C//DTD XHTML 1.0 Strict//EN',
                   'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
-    $xo->output('a', array('href' => $url), $url);
+    $xo->element('a', array('href' => $url), $url);
     $xo->endXML();
     exit;
 }
 
-function common_save_replies($notice)
-{
-    // Alternative reply format
-    $tname = false;
-    if (preg_match('/^T ([A-Z0-9]{1,64}) /', $notice->content, $match)) {
-        $tname = $match[1];
-    }
-    // extract all @messages
-    $cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $notice->content, $match);
-
-    $names = array();
-
-    if ($cnt || $tname) {
-        // XXX: is there another way to make an array copy?
-        $names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
-    }
-
-    $sender = Profile::staticGet($notice->profile_id);
-
-    $replied = array();
-
-    // store replied only for first @ (what user/notice what the reply directed,
-    // we assume first @ is it)
-
-    for ($i=0; $i<count($names); $i++) {
-        $nickname = $names[$i];
-        $recipient = common_relative_profile($sender, $nickname, $notice->created);
-        if (!$recipient) {
-            continue;
-        }
-        if ($i == 0 && ($recipient->id != $sender->id) && !$notice->reply_to) { // Don't save reply to self
-            $reply_for = $recipient;
-            $recipient_notice = $reply_for->getCurrentNotice();
-            if ($recipient_notice) {
-                $orig = clone($notice);
-                $notice->reply_to = $recipient_notice->id;
-                $notice->update($orig);
-            }
-        }
-        // Don't save replies from blocked profile to local user
-        $recipient_user = User::staticGet('id', $recipient->id);
-        if ($recipient_user && $recipient_user->hasBlocked($sender)) {
-            continue;
-        }
-        $reply = new Reply();
-        $reply->notice_id = $notice->id;
-        $reply->profile_id = $recipient->id;
-        $id = $reply->insert();
-        if (!$id) {
-            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-            common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
-            common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
-            return;
-        } else {
-            $replied[$recipient->id] = 1;
-        }
-    }
-
-    // Hash format replies, too
-    $cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $notice->content, $match);
-    if ($cnt) {
-        foreach ($match[1] as $tag) {
-            $tagged = Profile_tag::getTagged($sender->id, $tag);
-            foreach ($tagged as $t) {
-                if (!$replied[$t->id]) {
-                    // Don't save replies from blocked profile to local user
-                    $t_user = User::staticGet('id', $t->id);
-                    if ($t_user && $t_user->hasBlocked($sender)) {
-                        continue;
-                    }
-                    $reply = new Reply();
-                    $reply->notice_id = $notice->id;
-                    $reply->profile_id = $t->id;
-                    $id = $reply->insert();
-                    if (!$id) {
-                        common_log_db_error($reply, 'INSERT', __FILE__);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
-
 function common_broadcast_notice($notice, $remote=false)
 {