tobias/friendica
1
0
Fork 0
Code Pull requests Activity

more spaces/curly braces added

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-04-05 22:39:57 +02:00
parent a4773a1ac0
commit 32ffe4a711
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 68 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
include/bbcode.php
View file

@ -9,35 +9,38 @@ require_once('include/Contact.php');
require_once('include/plaintext.php'); require_once('include/plaintext.php');
function bb_PictureCacheExt($matches) { function bb_PictureCacheExt($matches) {
if (strpos($matches[3], "data:image/") === 0) if (strpos($matches[3], "data:image/") === 0) {
return ($matches[0]); return ($matches[0]);
}
$matches[3] = proxy_url($matches[3]); $matches[3] = proxy_url($matches[3]);
return "[img=".$matches[1]."x".$matches[2]."]".$matches[3]."[/img]"; return "[img=" . $matches[1] . "x" . $matches[2] . "]" . $matches[3] . "[/img]";
} }
function bb_PictureCache($matches) { function bb_PictureCache($matches) {
if (strpos($matches[1], "data:image/") === 0) if (strpos($matches[1], "data:image/") === 0) {
return ($matches[0]); return ($matches[0]);
}
$matches[1] = proxy_url($matches[1]); $matches[1] = proxy_url($matches[1]);
return "[img]".$matches[1]."[/img]"; return "[img]" . $matches[1] . "[/img]";
} }
function bb_map_coords($match) { function bb_map_coords($match) {
// the extra space in the following line is intentional // the extra space in the following line is intentional
return str_replace($match[0],'<div class="map" >' . generate_map(str_replace('/',' ',$match[1])) . '</div>', $match[0]); return str_replace($match[0], '<div class="map" >' . generate_map(str_replace('/',' ', $match[1])) . '</div>', $match[0]);
} }
function bb_map_location($match) { function bb_map_location($match) {
// the extra space in the following line is intentional // the extra space in the following line is intentional
return str_replace($match[0],'<div class="map" >' . generate_named_map($match[1]) . '</div>', $match[0]); return str_replace($match[0], '<div class="map" >' . generate_named_map($match[1]) . '</div>', $match[0]);
} }
function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
$data = get_attachment_data($Text); $data = get_attachment_data($Text);
if (!$data) if (!$data) {
return $Text; return $Text;
}
if (isset($data["title"])) { if (isset($data["title"])) {
$data["title"] = strip_tags($data["title"]); $data["title"] = strip_tags($data["title"]);
@ -57,83 +60,91 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
// If the link description is similar to the text above then don't add the link description // If the link description is similar to the text above then don't add the link description
if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR if (($data["title"] != "") AND ((strpos($test1,$test2) !== false) OR
(similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) (similar_text($test1,$test2) / strlen($data["title"])) > 0.9)) {
$title2 = $data["url"]; $title2 = $data["url"];
}
$text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />', $text = sprintf('<a href="%s" title="%s" class="attachment thumbnail" rel="nofollow external">%s</a><br />',
$data["url"], $data["title"], $title2); $data["url"], $data["title"], $title2);
} elseif (($simplehtml != 4) AND ($simplehtml != 0)) } elseif (($simplehtml != 4) AND ($simplehtml != 0)) {
$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]); $text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]);
else { } else {
$text = sprintf('<span class="type-%s">', $data["type"]); $text = sprintf('<span class="type-%s">', $data["type"]);
$bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]); $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
if ($tryoembed) if ($tryoembed) {
$oembed = tryoembed($bookmark); $oembed = tryoembed($bookmark);
else } else {
$oembed = $bookmark[0]; $oembed = $bookmark[0];
}
if (strstr(strtolower($oembed), "<iframe ")) if (strstr(strtolower($oembed), "<iframe ")) {
$text = $oembed; $text = $oembed;
else { } else {
if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img ")) if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img ")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]); $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]);
elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) } elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]); $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]);
}
if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) {
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]); $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]);
else } else {
$text .= $oembed; $text .= $oembed;
}
if (trim($data["description"]) != "") if (trim($data["description"]) != "") {
$text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"]))); $text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
}
} }
} }
return $data["text"].$text.$data["after"]; return $data["text"] . $text . $data["after"];
} }
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) { function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {
$data = get_attachment_data($Text); $data = get_attachment_data($Text);
if (!$data) if (!$data) {
return $Text; return $Text;
} elseif ($nolink) {
if ($nolink) return $data["text"] . $data["after"];
return $data["text"].$data["after"]; }
$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false); $title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false); $text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
if ($plaintext OR (($title != "") AND strstr($text, $title))) if ($plaintext OR (($title != "") AND strstr($text, $title))) {
$data["title"] = $data["url"]; $data["title"] = $data["url"];
elseif (($text != "") AND strstr($title, $text)) { } elseif (($text != "") AND strstr($title, $text)) {
$data["text"] = $data["title"]; $data["text"] = $data["title"];
$data["title"] = $data["url"]; $data["title"] = $data["url"];
} }
if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) {
return $data["title"].$data["after"]; return $data["title"] . $data["after"];
}
// If the link already is included in the post, don't add it again // If the link already is included in the post, don't add it again
if (($data["url"] != "") AND strpos($data["text"], $data["url"])) if (($data["url"] != "") AND strpos($data["text"], $data["url"])) {
return $data["text"].$data["after"]; return $data["text"] . $data["after"];
}
$text = $data["text"]; $text = $data["text"];
if (($data["url"] != "") AND ($data["title"] != "")) if (($data["url"] != "") AND ($data["title"] != "")) {
$text .= "\n[url=".$data["url"]."]".$data["title"]."[/url]"; $text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
elseif (($data["url"] != "")) } elseif (($data["url"] != "")) {
$text .= "\n".$data["url"]; $text .= "\n" . $data["url"];
}
return $text."\n".$data["after"]; return $text . "\n" . $data["after"];
} }
function bb_cleanstyle($st) { function bb_cleanstyle($st) {
return "<span style=\"".cleancss($st[1]).";\">".$st[2]."</span>"; return "<span style=\"" . cleancss($st[1]) . ";\">" . $st[2] . "</span>";
} }
function bb_cleanclass($st) { function bb_cleanclass($st) {
return "<span class=\"".cleancss($st[1])."\">".$st[2]."</span>"; return "<span class=\"" . cleancss($st[1]) . "\">" . $st[2] . "</span>";
} }
function cleancss($input) { function cleancss($input) {
@ -145,11 +156,13 @@ function cleancss($input) {
for ($i = 0; $i < strlen($input); $i++) { for ($i = 0; $i < strlen($input); $i++) {
$char = substr($input, $i, 1); $char = substr($input, $i, 1);
if (($char >= "a") and ($char <= "z")) if (($char >= "a") and ($char <= "z")) {
$cleaned .= $char; $cleaned .= $char;
}
if (!(strpos(" #;:0123456789-_.%", $char) === false)) if (!(strpos(" #;:0123456789-_.%", $char) === false)) {
$cleaned .= $char; $cleaned .= $char;
}
} }
return($cleaned); return($cleaned);
@ -160,10 +173,10 @@ function stripcode_br_cb($s) {
} }
function bb_onelinecode_cb($match) { function bb_onelinecode_cb($match) {
if (strpos($match[1],"<br>")===false){ if (strpos($match[1], "<br>") === false) {
return "<key>".$match[1]."</key>"; return "<key>" . $match[1] . "</key>";
} }
return "<code>".$match[1]."</code>"; return "<code>" . $match[1] . "</code>";
} }
function tryoembed($match){ function tryoembed($match){
@ -173,18 +186,22 @@ function tryoembed($match){
$url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"), $url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
array("https://www.youtube.com/", "https://player.vimeo.com/"), $url); array("https://www.youtube.com/", "https://player.vimeo.com/"), $url);
$o = oembed_fetch_url($url); $o = oembed_fetch_url($url);
if (!is_object($o)) if (!is_object($o)) {
return $match[0]; return $match[0];
}
if (isset($match[2])) if (isset($match[2])) {
$o->title = $match[2]; $o->title = $match[2];
}
if ($o->type=="error") return $match[0]; if ($o->type == "error") {
return $match[0];
}
$html = oembed_format_object($o); $html = oembed_format_object($o);
return $html; return $html;
} }
@ -194,11 +211,11 @@ function tryoembed($match){
// to hide them from parser. // to hide them from parser.
function bb_spacefy($st) { function bb_spacefy($st) {
$whole_match = $st[0]; $whole_match = $st[0];
$captured = $st[1]; $captured = $st[1];
$spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured);
$new_str = str_replace($captured, $spacefied, $whole_match); $new_str = str_replace($captured, $spacefied, $whole_match);
return $new_str; return $new_str;
} }
// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], // The previously spacefied [noparse][ i ]italic[ /i ][/noparse],