X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Futil.php;h=30bd4d3aec96dd11ef8f8282b223c0a56cacf71d;hb=a63208b3dab1a2d1c9b924dabb86be2edc90ebed;hp=0df52c2131da9e98bd849cc8150cf2c2152aebbf;hpb=70175b9c7a54f37f165da4c96ea5441646776c83;p=quix0rs-gnu-social.git
diff --git a/lib/util.php b/lib/util.php
index 0df52c2131..30bd4d3aec 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -150,25 +150,32 @@ 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('a', array('class' => 'license floatLeft',
+ 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']));
common_element('img', array('class' => 'license',
'src' => $config['license']['image'],
'alt' => $config['license']['title']));
common_element_end('a');
- common_element_start('div', 'licenseinfo floatRight');
+ 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('div');
+ common_element_end('span');
+ common_element_end('p');
}
function common_head_menu() {
@@ -342,11 +349,48 @@ function common_canonical_email($email) {
return $email;
}
-function common_render_content($text) {
- # XXX: @ messages
+define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))');
+
+function common_render_content($text, $notice) {
+ $r = htmlspecialchars($text);
+ $id = $notice->profile_id;
+ $r = preg_replace('@https?://\S+@', '\0', $r);
+ $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $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 ''.$nickname.'';
+ }
+ # 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 ''.$nickname.'';
+ }
+ # 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 ''.$nickname.'';
+ }
+ }
+ # 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?