MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes in the bbcode to markdown converter to make it more compatible with Diaspora

Browse source
This commit is contained in:
Michael Vogel 2012-07-15 12:47:24 +02:00
parent 8d7d46ae7a
commit 4e9086f9b0
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/bb2diaspora.php
View file

@ -196,6 +196,15 @@ function bb2diaspora($Text,$preserve_nl = false) {
// The bbcode parser now handles youtube-links (and the other stuff) correctly. // The bbcode parser now handles youtube-links (and the other stuff) correctly.
// Additionally the html code is now fixed so that lists are now working. // Additionally the html code is now fixed so that lists are now working.
// Converting images with size parameters to simple images. Markdown doesn't know it.
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
// the following was added on 10-January-2012 due to an inability of Diaspora's
// new javascript markdown processor to handle links with images as the link "text"
// It is not optimal and may be removed if this ability is restored in the future
$Text = preg_replace("/\[url\=([^\[\]]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism",
"[img]$2[/img]\n[url]$1[/url]", $Text);
// Convert it to HTML - don't try oembed // Convert it to HTML - don't try oembed
$Text = bbcode($Text, $preserve_nl, false); $Text = bbcode($Text, $preserve_nl, false);

4
include/bbcode.php
View file

@ -115,6 +115,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$a = get_app(); $a = get_app();
// Move all spaces out of the tags
$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
// Hide all [noparse] contained bbtags by spacefying them // Hide all [noparse] contained bbtags by spacefying them
// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image? // POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?

10
include/markdownify/markdownify.php
View file

@ -735,6 +735,13 @@ class Markdownify {
$this->parser->tagAttributes['src'] = $this->decode($this->parser->tagAttributes['src']); $this->parser->tagAttributes['src'] = $this->decode($this->parser->tagAttributes['src']);
} }
// ![Alt text](/path/to/img.jpg "Optional title")
if ($this->parser->tagAttributes['title'] != "")
$this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].'"'.$this->parser->tagAttributes['title'].'")', true);
else
$this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].')', true);
/*
# [This link][id] # [This link][id]
$link_id = false; $link_id = false;
if (!empty($this->stack['a'])) { if (!empty($this->stack['a'])) {
@ -759,6 +766,7 @@ class Markdownify {
} }
$this->out('!['.$this->parser->tagAttributes['alt'].']['.$link_id.']', true); $this->out('!['.$this->parser->tagAttributes['alt'].']['.$link_id.']', true);
*/
} }
/** /**
* handle <code> tags * handle <code> tags
@ -1181,4 +1189,4 @@ class Markdownify {
function parent() { function parent() {
return end($this->parser->openTags); return end($this->parser->openTags);
} }
} }