don't check for notice in rendering content; just render it!

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

diff --git a/lib/util.php b/lib/util.php
index 9c288198cb79554f3b5be57f3bbea5422effd185..54a30a914df840bbca9f4f6002ef5d606352ce71 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -150,9 +150,15 @@ function common_text($txt) {
        $xw->text($txt);
 }
 
+function common_raw($xml) {
+       global $xw;
+       $xw->writeRaw($xml);
+}
+
 function common_license_block() {
        global $config, $xw;
-       common_element_start('div', 'license');
+       common_element_start('p', 'license greenBg');
+       common_element_start('span', 'floatLeft width25');
        common_element_start('a', array('class' => 'license',
                                                                        'rel' => 'license',
                                                                        href => $config['license']['url']));
@@ -160,13 +166,16 @@ function common_license_block() {
                                                                'src' => $config['license']['image'],
                                                                'alt' => $config['license']['title']));
        common_element_end('a');
+       common_element_end('span');
+       common_element_start('span', 'floatRight width75');
        common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
        common_element('a', array('class' => 'license',
                                                          'rel' => 'license',
                                                          href => $config['license']['url']),
                                   $config['license']['title']);
        common_text(_t('. Contributors should be attributed by full name or nickname.'));
-       common_element_end('div');
+       common_element_end('span');
+       common_element_end('p');
 }
 
 function common_head_menu() {
@@ -202,7 +211,7 @@ function common_foot_menu() {
        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
                                         _t('Privacy'));
        common_menu_item(common_local_url('doc', array('title' => 'source')),
-                                        _t('Privacy'));
+                                        _t('Source'));
        common_element_end('ul');
 }
 
@@ -340,11 +349,45 @@ function common_canonical_email($email) {
        return $email;
 }
 
-function common_render_content($text) {
-       # XXX: @ messages
+function common_render_content($text, $notice) {
+       $r = htmlspecialchars($text);
+       $id = $notice->profile_id;
+       $r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
        # XXX: # tags
        # XXX: machine tags
-       return htmlspecialchars($text);
+       return $r;
+}
+
+function common_at_link($sender_id, $nickname) {
+       # Try to find profiles this profile is subscribed to that have this nickname
+       $recipient = new Profile();
+       # XXX: chokety and bad
+       $recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender_id.' and subscribed = id)', 'AND');
+       $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+       if ($recipient->find(TRUE)) {
+               return '<a href="'.$recipient->profileurl.'" class="atlink tolistenee">'.$nickname.'</a>';
+       }
+       # Try to find profiles that listen to this profile and that have this nickname
+       $recipient = new Profile();
+       # XXX: chokety and bad
+       $recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender_id.' and subscriber = id)', 'AND');
+       $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+       if ($recipient->find(TRUE)) {
+               return '<a href="'.$recipient->profileurl.'" class="atlink tolistener">'.$nickname.'</a>';
+       }
+       # If this is a local user, try to find a local user with that nickname.
+       $sender = User::staticGet($sender_id);
+       if ($sender) {
+               $recipient_user = User::staticGet('nickname', $nickname);
+               if ($recipient_user) {
+                       $recipient = $recipient->getProfile();
+                       return '<a href="'.$recipient->profileurl.'" class="atlink usertouser">'.$nickname.'</a>';
+               }
+       }
+       # Otherwise, no links. @messages from local users to remote users,
+       # or from remote users to other remote users, are just
+       # outside our ability to make intelligent guesses about
+       return $nickname;
 }
 
 // where should the avatar go for this user?
@@ -353,9 +396,9 @@ function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
        global $config;
 
        if ($size) {
-               return $user->id . '-' . $size . (($extra) ? $extra : '') . $extension;
+               return $user->id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
        } else {
-               return $user->id . '-original' . (($extra) ? $extra : '') . $extension;
+               return $user->id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
        }
 }
 
@@ -480,7 +523,7 @@ function common_mtrand($bytes) {
 }
 
 function common_timestamp() {
-       return date('YmdHisu');
+       return date('YmdHis');
 }
        
 // XXX: set up gettext