X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Futil.php;h=30bd4d3aec96dd11ef8f8282b223c0a56cacf71d;hb=a63208b3dab1a2d1c9b924dabb86be2edc90ebed;hp=31a2cbd4f79b067821cec6b30ef58892a2870f24;hpb=90b4873a00b0d8b4249a323fc84a7460024f491b;p=quix0rs-gnu-social.git
diff --git a/lib/util.php b/lib/util.php
index 31a2cbd4f7..30bd4d3aec 100644
--- 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,22 +349,59 @@ 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?
-function common_avatar_filename($user, $extension, $size=NULL) {
+function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
global $config;
if ($size) {
- return $user->id . '-' . $size . $extension;
+ return $user->id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
} else {
- return $user->id . '-original' . $extension;
+ return $user->id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
}
}
@@ -447,6 +493,42 @@ function common_root_url() {
return "http://".$config['site']['server'].'/'.$pathpart;
}
+# returns $bytes bytes of random data as a hexadecimal string
+# "good" here is a goal and not a guarantee
+
+function common_good_rand($bytes) {
+ # XXX: use random.org...?
+ if (file_exists('/dev/urandom')) {
+ return common_urandom($bytes);
+ } else { # FIXME: this is probably not good enough
+ return common_mtrand($bytes);
+ }
+}
+
+function common_urandom($bytes) {
+ $h = fopen('/dev/urandom', 'rb');
+ # should not block
+ $src = fread($h, $bytes);
+ fclose($h);
+ $enc = '';
+ for ($i = 0; $i < $bytes; $i++) {
+ $enc .= sprintf("%02x", (ord($src[$i])));
+ }
+ return $enc;
+}
+
+function common_mtrand($bytes) {
+ $enc = '';
+ for ($i = 0; $i < $bytes; $i++) {
+ $enc .= sprintf("%02x", mt_rand(0, 255));
+ }
+ return $enc;
+}
+
+function common_timestamp() {
+ return date('YmdHis');
+}
+
// XXX: set up gettext
function _t($str) {