X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=23abb142636456b0c982e7428c42d032df0564fe;hb=8deac7248e7db35515d7810491f9136deffa3098;hp=1bc5b95b00ca452581a4c2ffb3f3753134efe804;hpb=22057e01bd6fdf366340e6fdbdf6bb1252bceb8c;p=quix0rs-gnu-social.git
diff --git a/lib/util.php b/lib/util.php
index 1bc5b95b00..23abb14263 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -711,12 +711,47 @@ function common_render_text($text) {
$r = htmlspecialchars($text);
$r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
- $r = preg_replace('@https?://[^)\]>\s]+@', '\0', $r);
+ $r = preg_replace_callback('@https?://[^\]>\s]+@', 'common_render_uri_thingy', $r);
$r = preg_replace('/(^|\s+)#([A-Za-z0-9_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
# XXX: machine tags
return $r;
}
+function common_render_uri_thingy($matches) {
+ $uri = $matches[0];
+ $trailer = '';
+
+ # Some heuristics for extracting URIs from surrounding punctuation
+ # Strip from trailing text...
+ if (preg_match('/^(.*)([,.:"\']+)$/', $uri, $matches)) {
+ $uri = $matches[1];
+ $trailer = $matches[2];
+ }
+
+ $pairs = array(
+ ']' => '[', # technically disallowed in URIs, but used in Java docs
+ ')' => '(', # far too frequent in Wikipedia and MSDN
+ );
+ $final = substr($uri, -1, 1);
+ if (isset($pairs[$final])) {
+ $openers = substr_count($uri, $pairs[$final]);
+ $closers = substr_count($uri, $final);
+ if ($closers > $openers) {
+ // Assume the paren was opened outside the URI
+ $uri = substr($uri, 0, -1);
+ $trailer = $final . $trailer;
+ }
+ }
+ return '' . $uri . '' . $trailer;
+}
+
+function common_xml_safe_str($str) {
+ $xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8');
+
+ // Replace control, formatting, and surrogate characters with '*', ala Twitter
+ return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
+}
+
function common_tag_link($tag) {
$canonical = common_canonical_tag($tag);
$url = common_local_url('tag', array('tag' => $canonical));
@@ -976,7 +1011,11 @@ function common_fancy_url($action, $args=NULL) {
default: return common_simple_url($action, $args);
}
case 'sup':
- return common_path('main/sup');
+ if ($args && isset($args['seconds'])) {
+ return common_path('main/sup?seconds='.$args['seconds']);
+ } else {
+ return common_path('main/sup');
+ }
default:
return common_simple_url($action, $args);
}
@@ -1142,7 +1181,7 @@ function common_broadcast_notice($notice, $remote=false) {
// If it's not a Twitter-style reply, or if the user WANTS to send replies...
- if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/', $notice->content) ||
+ if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
(($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
$result = common_twitter_broadcast($notice, $flink);