X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fbbcode.php;h=be59c180726860a0292f2e10ef0b9e574afbd56f;hb=0305aa2d8218a0919526a08910ffaebfdc5bb2c5;hp=99f997762ffeb1cb9bb661102607adedbda610e4;hpb=17b05c9ad9a8b87c6db77a4bbfafcb2ebc8dc3d3;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index 99f997762f..be59c18072 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,13 +1,16 @@
' . generate_map(str_replace('/', ' ', $match[1])) . '', $match[0]);
+ return str_replace($match[0], '
' . Map::byCoordinates(str_replace('/', ' ', $match[1])) . '
', $match[0]);
}
function bb_map_location($match) {
// the extra space in the following line is intentional
- return str_replace($match[0], '' . generate_named_map($match[1]) . '
', $match[0]);
+ return str_replace($match[0], '' . Map::byLocation($match[1]) . '
', $match[0]);
}
function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
@@ -49,7 +52,10 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
$data["title"] = str_replace(array("http://", "https://"), "", $data["title"]);
}
- if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false)) && ($data["image"] != "")) {
+ if (((strpos($data["text"], "[img=") !== false)
+ || (strpos($data["text"], "[img]") !== false)
+ || Config::get('system', 'always_show_preview'))
+ && ($data["image"] != "")) {
$data["preview"] = $data["image"];
$data["image"] = "";
}
@@ -370,7 +376,6 @@ function bb_tag_preg_replace($pattern, $replace, $name, $s) {
return $string;
}
-if (! function_exists('bb_extract_images')) {
function bb_extract_images($body) {
$saved_image = array();
@@ -412,9 +417,8 @@ function bb_extract_images($body) {
$new_body = $new_body . $orig_body;
return array('body' => $new_body, 'images' => $saved_image);
-}}
+}
-if (! function_exists('bb_replace_images')) {
function bb_replace_images($body, $images) {
$newbody = $body;
@@ -429,7 +433,7 @@ function bb_replace_images($body, $images) {
}
return $newbody;
-}}
+}
function bb_ShareAttributes($share, $simplehtml) {
$attributes = $share[2];
@@ -489,9 +493,9 @@ function bb_ShareAttributes($share, $simplehtml) {
// We only call this so that a previously unknown contact can be added.
// This is important for the function "get_contact_details_by_url".
// This function then can fetch an entry from the contact table.
- get_contact($profile, 0);
+ Contact::getIdForURL($profile, 0);
- $data = get_contact_details_by_url($profile);
+ $data = Contact::getDetailsByURL($profile);
if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != ""))
$userid_compact = $data["name"]." (".$data["addr"].")";
@@ -699,7 +703,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
}
function bb_DiasporaLinks($match) {
- return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
+ return "[url=".System::baseUrl()."/display/".$match[1]."]".$match[2]."[/url]";
}
function bb_RemovePictureLinks($match) {
@@ -911,7 +915,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
$Text = str_replace("\r\n", "\n", $Text);
// removing multiplicated newlines
- if (get_config("system", "remove_multiplicated_lines")) {
+ if (Config::get("system", "remove_multiplicated_lines")) {
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
"\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
@@ -938,17 +942,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
// Remove all hashtag addresses
if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) {
- $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+ $Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
} elseif ($simplehtml == 3) {
- $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1$3',
$Text);
} elseif ($simplehtml == 7) {
- $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1$3',
$Text);
} elseif (!$simplehtml) {
- $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+ $Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1$3',
$Text);
}
@@ -960,13 +964,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
"[bookmark=$1]$2[/bookmark]", $Text);
if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
- $Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
- //$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
+ $Text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
+ //$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text);
}
if ($simplehtml == 5) {
- $Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
+ $Text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
}
// Perform URL Search
@@ -983,6 +987,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
// Handle Diaspora posts
$Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
+ // Server independent link to posts and comments
+ // See issue: https://github.com/diaspora/diaspora_federation/issues/75
+ $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
+ $Text = preg_replace($expression, System::baseUrl()."/display/$1", $Text);
+
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
// if ($simplehtml != 7) {
if (!$forplaintext) {
@@ -1018,7 +1027,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
// we may need to restrict this further if it picks up too many strays
// link acct:user@host to a webfinger profile redirector
- $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $Text);
+ $Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $Text);
// Perform MAIL Search
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '$1', $Text);
@@ -1191,9 +1200,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
return bb_ShareAttributes($match, $simplehtml);
}, $Text);
- $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
![' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .App::get_baseurl() . '/images/lock_icon.gif)
', $Text);
- $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .App::get_baseurl() . '/images/lock_icon.gif)
', $Text);
- //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .App::get_baseurl() . '/images/lock_icon.gif)
', $Text);
+ $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
![' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
+ $Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
+ //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .System::baseUrl() . '/images/lock_icon.gif)
', $Text);
// Try to Oembed
if ($tryoembed) {
@@ -1276,6 +1285,10 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
$Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism", '', $Text);
}
+ // Replace non graphical smilies for external posts
+ if ($simplehtml) {
+ $Text = Smilies::replace($Text, false, true);
+ }
// Replace inline code blocks
$Text = preg_replace_callback("|(?!
]*>)([^<]*)
(?!
]*>)|ism",