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

diaspora markdown changes, parse_url format change

Browse source
This commit is contained in:
Friendika 2011-09-20 15:23:36 -07:00
parent 119cd9c0ce
commit deeae7bdb5
4 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php"); require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.3.1109' ); define ( 'FRIENDIKA_VERSION', '2.3.1110' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1091 ); define ( 'DB_UPDATE_VERSION', 1091 );

27
include/bb2diaspora.php
View file

@ -3,30 +3,14 @@
require_once("include/oembed.php"); require_once("include/oembed.php");
require_once('include/event.php'); require_once('include/event.php');
require_once('library/markdown.php');
require_once('include/html2bbcode.php');
function diaspora2bb($s) { function diaspora2bb($s) {
// bug #127
$s = preg_replace('/\[(.+?)\]\((.+?)[^\\\]_(.+?)\)/','[$1]($2\\_$3)',$s);
$s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s);
$s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s);
$s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s);
$s = preg_replace("/\*\*(.+?)\*\*/", '[b]$1[/b]', $s);
$s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s);
$s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s);
$s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
$s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
$s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
$s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
$s = Markdown($s);
$s = html2bbcode($s);
$s = escape_tags($s);
return $s; return $s;
} }
@ -188,8 +172,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
$Text = preg_replace('/\[(.*?)\\\\_(.*?)\]\((.*?)\)/ism','[$1_$2]($3)',$Text); $Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
$Text = preg_replace('/\[(.*?)\\\\\*(.*?)\]\((.*?)\)/ism','[$1*$2]($3)',$Text);
call_hooks('bb2diaspora',$Text); call_hooks('bb2diaspora',$Text);

2
library/markdown.php
View file

@ -1528,7 +1528,7 @@ class Markdown_Parser {
| |
<\?.*?\?> | <%.*?%> # processing instruction <\?.*?\?> | <%.*?%> # processing instruction
| |
<[/!$]?[-a-zA-Z0-9:]+ # regular tags <[/!$]?[-a-zA-Z0-9:_]+ # regular tags
(?> (?>
\s \s
(?>[^"\'>]+|"[^"]*"|\'[^\']*\')* (?>[^"\'>]+|"[^"]*"|\'[^\']*\')*

2
view/theme/dispy/jot-header.tpl
View file

@ -163,7 +163,7 @@ function initEditor(cb) {
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });