X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=87a8eaa9b38d6518c57c779e0cf026d5567737bf;hb=58d5d918314a2b01762c0fca33368a5a62a89512;hp=83ea3fcfa61d9ef9500c87c4de90cf167efe305e;hpb=2ee928b0816094f3166c65b851bc7f6c84e9f3c9;p=friendica.git diff --git a/include/bbcode.php b/include/bbcode.php index 83ea3fcfa6..87a8eaa9b3 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -2,14 +2,14 @@ use Friendica\App; use Friendica\Content\Smilies; +use Friendica\Content\OEmbed; use Friendica\Core\Cache; use Friendica\Core\System; use Friendica\Core\Config; -use Friendica\Object\Contact; +use Friendica\Model\Contact; +use Friendica\Util\Map; -require_once 'include/oembed.php'; require_once 'include/event.php'; -require_once 'include/map.php'; require_once 'mod/proxy.php'; require_once 'include/plaintext.php'; @@ -33,11 +33,11 @@ function bb_PictureCache($matches) { function bb_map_coords($match) { // the extra space in the following line is intentional - return str_replace($match[0], '
' . 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) { @@ -52,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"] = ""; } @@ -64,8 +67,6 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { } else { if ($simplehtml != 4) { $text = sprintf('', $data["type"]); - } else { - $span_end = ''; } $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]); @@ -229,7 +230,7 @@ function tryoembed($match) { $url = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"), array("https://www.youtube.com/", "https://player.vimeo.com/"), $url); - $o = oembed_fetch_url($url); + $o = OEmbed::fetchURL($url); if (!is_object($o)) { return $match[0]; @@ -243,7 +244,7 @@ function tryoembed($match) { return $match[0]; } - $html = oembed_format_object($o); + $html = OEmbed::formatObject($o); return $html; } @@ -267,7 +268,6 @@ function bb_spacefy($st) { * returning [i]italic[/i] */ function bb_unspacefy_and_trim($st) { - $whole_match = $st[0]; $captured = $st[1]; $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); return $unspacefied; @@ -373,7 +373,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(); @@ -415,9 +414,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; @@ -432,62 +430,67 @@ function bb_replace_images($body, $images) { } return $newbody; -}} +} -function bb_ShareAttributes($share, $simplehtml) { +function bb_ShareAttributes($share, $simplehtml) +{ $attributes = $share[2]; $author = ""; preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + if (x($matches, 1)) { + $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'); + } preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $author = $matches[1]; + } $profile = ""; preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $profile = $matches[1]; + } preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $profile = $matches[1]; + } $avatar = ""; preg_match("/avatar='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $avatar = $matches[1]; + } preg_match('/avatar="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $avatar = $matches[1]; + } $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $link = $matches[1]; + } preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $link = $matches[1]; + } $posted = ""; - $itemcache = get_itemcachepath(); - preg_match("/posted='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $posted = $matches[1]; + } preg_match('/posted="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") + if (x($matches, 1)) { $posted = $matches[1]; - - // relative dates only make sense when they aren't cached - if ($itemcache == "") - $reldate = (($posted) ? " " . relative_date($posted) : ''); + } // We only call this so that a previously unknown contact can be added. // This is important for the function "get_contact_details_by_url". @@ -496,99 +499,107 @@ function bb_ShareAttributes($share, $simplehtml) { $data = Contact::getDetailsByURL($profile); - if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != "")) - $userid_compact = $data["name"]." (".$data["addr"].")"; - else - $userid_compact = GetProfileUsername($profile,$author, true); + if (x($data, "name") && x($data, "addr")) { + $userid_compact = $data["name"] . " (" . $data["addr"] . ")"; + } else { + $userid_compact = GetProfileUsername($profile, $author, true); + } - if (isset($data["addr"]) && ($data["addr"] != "")) + if (x($data, "addr")) { $userid = $data["addr"]; - else - $userid = GetProfileUsername($profile,$author, false); + } else { + $userid = GetProfileUsername($profile, $author, false); + } - if (isset($data["name"]) && ($data["name"] != "")) + if (x($data, "name")) { $author = $data["name"]; + } - if (isset($data["micro"]) && ($data["micro"] != "")) + if (x($data, "micro")) { $avatar = $data["micro"]; + } $preshare = trim($share[1]); - if ($preshare != "") + if ($preshare != "") { $preshare .= "

"; + } switch ($simplehtml) { case 1: - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid.":
»".$share[3]."«"; + $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid . ":
»" . $share[3] . "«"; break; case 2: - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; + $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3]; break; case 3: // Diaspora - $headline .= ''.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$userid.':
'; + $headline .= '' . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $userid . ':
'; $text = trim($share[1]); - if ($text != "") + if ($text != "") { $text .= "
"; + } if (substr(normalise_link($link), 0, 19) != "http://twitter.com/") { - $text .= $headline.'
'.trim($share[3])."

"; + $text .= $headline . '
' . trim($share[3]) . "

"; - if ($link != "") - $text .= '
[l]'; - } else - $text .= '
'.$link.''; + if ($link != "") { + $text .= '
[l]'; + } + } else { + $text .= '
' . $link . ''; + } break; case 4: - $headline .= '
'.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); - $headline .= sprintf(t('%2$s %3$s'), $link, $userid, $posted); + $headline .= '
' . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + $headline .= t('%2$s %3$s', $link, $userid, $posted); $headline .= ":
"; $text = trim($share[1]); - if ($text != "") + if ($text != "") { $text .= "
"; + } - $text .= $headline.'
'.trim($share[3])."

"; + $text .= $headline . '
' . trim($share[3]) . "

"; break; case 5: - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; + $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3]; break; case 6: // app.net - $text = $preshare.">> @".$userid_compact.":
".$share[3]; + $text = $preshare . ">> @" . $userid_compact . ":
" . $share[3]; break; case 7: // statusnet/GNU Social - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3]; + $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . " @" . $userid_compact . ": " . $share[3]; break; case 8: // twitter - $text = $preshare."RT @".$userid_compact.": ".$share[3]; + $text = $preshare . "RT @" . $userid_compact . ": " . $share[3]; break; case 9: // Google+/Facebook - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$userid_compact.":
".$share[3]; + $text = $preshare . html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ":
" . $share[3]; - if ($link != "") - $text .= "

".$link; + if ($link != "") { + $text .= "

" . $link; + } break; default: - $text = trim($share[1])."\n"; + $text = trim($share[1]) . "\n"; $avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB); $tpl = get_markup_template('shared_content.tpl'); - $text .= replace_macros($tpl, - array( - '$profile' => $profile, - '$avatar' => $avatar, - '$author' => $author, - '$link' => $link, - '$posted' => $posted, - '$reldate' => $reldate, - '$content' => trim($share[3]) - ) - ); + $text .= replace_macros($tpl, array( + '$profile' => $profile, + '$avatar' => $avatar, + '$author' => $author, + '$link' => $link, + '$posted' => $posted, + '$content' => trim($share[3]) + ) + ); break; } @@ -1262,7 +1273,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '', $Text); // oembed tag - $Text = oembed_bbcode2html($Text); + $Text = OEmbed::BBCode2HTML($Text); // Avoid triple linefeeds through oembed $Text = str_replace("


", "

", $Text);