lcase tname

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index b6ff34fb7cc1dde3a7faf4832d9226cfe88adee9..acc907480685ff1cc2dcd9f2f71a98f32669468a 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -593,8 +593,9 @@ define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet
 function common_render_content($text, $notice) {
        $r = htmlspecialchars($text);
        $id = $notice->profile_id;
-       $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
+       $r = preg_replace('@https?://[^)\]>\s]+@', '<a href="\0" class="extlink">\0</a>', $r);
        $r = preg_replace('/(^|\s+)@([a-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);
        # XXX: # tags
        # XXX: machine tags
        return $r;
@@ -724,6 +725,8 @@ function common_fancy_url($action, $args=NULL) {
                return common_path('settings/'.$action);
         case 'profilesettings':
                return common_path('settings/profile');
+        case 'emailsettings':
+               return common_path('settings/email');
         case 'openidsettings':
                return common_path('settings/openid');
         case 'newnotice':
@@ -862,16 +865,22 @@ function common_redirect($url, $code=307) {
 }
 
 function common_save_replies($notice) {
+       # Alternative reply format
+       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);
-       if (!$cnt) {
+       if (!$cnt && !$tname) {
                return true;
        }
+       # XXX: is there another way to make an array copy?
+       $names = ($tname) ? array_unique(array_merge($match[1], array(strtolower($tname)))) : $match[1];
        $sender = Profile::staticGet($notice->profile_id);
        # store replied only for first @ (what user/notice what the reply directed,
        # we assume first @ is it)
-       for ($i=0; $i<count($match[1]); $i++) {
-               $nickname = $match[1][$i];
+       for ($i=0; $i<count($names); $i++) {
+               $nickname = $names[$i];
                $recipient = common_relative_profile($sender, $nickname, $notice->created);
                if (!$recipient) {
                        continue;
@@ -1269,3 +1278,13 @@ function common_markup_to_html($c) {
        $c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
        return Markdown($c);
 }
+
+function common_profile_avatar_url($profile, $size=AVATAR_PROFILE_SIZE) {
+       $avatar = $profile->getAvatar($size);
+       if ($avatar) {
+               return common_avatar_display_url($avatar);
+       } else {
+               return common_default_avatar($size);
+       }
+}
+       
\ No newline at end of file