X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fbbcode.php;h=a587d8c38075e5f6da2dfc066801492d8f6f8eaa;hb=7ac30330c6cb12a42419607d2883d63b4f59b379;hp=e09b1ed34259ffb02471dda4a9990899c46886ec;hpb=453082516e90aba59553fd4392b2cdfed6ae9a57;p=friendica.git
diff --git a/include/bbcode.php b/include/bbcode.php
index e09b1ed342..a587d8c380 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,6 +3,14 @@
require_once("include/oembed.php");
require_once('include/event.php');
+function bb_cleanstyle($st) {
+ return "".$st[2]."";
+}
+
+function bb_cleanclass($st) {
+ return "".$st[2]."";
+}
+
function cleancss($input) {
$cleaned = "";
@@ -213,7 +221,7 @@ function bb_ShareAttributes($match) {
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
- $author = $matches[1];
+ $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
preg_match('/author="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
@@ -246,12 +254,22 @@ function bb_ShareAttributes($match) {
if ($matches[1] != "")
$profile = $matches[1];
+ $posted = "";
+ preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $posted = $matches[1];
+
+ preg_match('/posted="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $posted = $matches[1];
+ $reldate = (($posted) ? " " . relative_date($posted) : '');
+
$headline = '
";
@@ -260,10 +278,39 @@ function bb_ShareAttributes($match) {
return($text);
}
+function bb_ShareAttributesSimple($match) {
+
+ $attributes = $match[1];
+
+ $author = "";
+ preg_match("/author='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+
+ preg_match('/author="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $author = $matches[1];
+
+ $profile = "";
+ preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+ if ($matches[1] != "")
+ $profile = $matches[1];
+
+ preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+ if ($matches[1] != "")
+ $profile = $matches[1];
+
+ $text = "
".html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' '.$author.":
»".$match[2]."«";
+
+ return($text);
+}
+
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendica - Mike Macgirvin
-function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
+function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false) {
+
+ $stamp1 = microtime(true);
$a = get_app();
@@ -302,6 +349,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// remove some newlines before the general conversion
$Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text);
+ $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text);
+
+ $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text);
+ $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text);
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
if (!$tryoembed)
@@ -316,6 +367,17 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = trim($Text);
$Text = str_replace("\r\n","\n", $Text);
+
+ // removing multiplicated newlines
+ if (get_config("system", "remove_multiplicated_lines")) {
+ $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
+ $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
+ do {
+ $oldtext = $Text;
+ $Text = str_replace($search, $replace, $Text);
+ } while ($oldtext != $Text);
+ }
+
$Text = str_replace(array("\r","\n"), array('
','
'), $Text);
if($preserve_nl)
@@ -385,10 +447,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = str_replace("[*]", "", $Text);
// Check for style sheet commands
- $Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","$2",$Text);
+ $Text = preg_replace_callback("(\[style=(.*?)\](.*?)\[\/style\])ism","bb_cleanstyle",$Text);
// Check for CSS classes
- $Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","$2",$Text);
+ $Text = preg_replace_callback("(\[class=(.*?)\](.*?)\[\/class\])ism","bb_cleanclass",$Text);
// handle nested lists
$endlessloop = 0;
@@ -483,7 +545,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '
', $Text);
// Shared content
- $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
+ if (!$simplehtml)
+ $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
+ else
+ $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributesSimple",$Text);
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
![' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
![' . '$1' . ' ' . t('Encrypted content') . ' ' . t('Encrypted content') . '](' .$a->get_baseurl() . '/images/lock_icon.gif)
', $Text);
@@ -585,7 +650,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Clean up the HTML by loading and saving the HTML with the DOM
// Only do it when it has to be done - for performance reasons
- if (!$tryoembed) {
+ // Update: Now it is done every time - since bad structured html can break a whole page
+ //if (!$tryoembed) {
$doc = new DOMDocument();
$doc->preserveWhiteSpace = false;
@@ -600,10 +666,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = str_replace('
','', $Text);
$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
- }
+ //}
call_hooks('bbcode',$Text);
+ $a->save_timestamp($stamp1, "parser");
+
return $Text;
}