Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Web: fix BBCode transform for [img] when using HTTPS URL

This commit is contained in:
David Anderson 2015-09-02 11:37:37 -07:00
parent 8cde710008
commit c70698eeef
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html/inc/text_transform.inc
View File

@ -153,6 +153,22 @@ function replace_pre_code($text, $export) {
function bb2html($text, $export=false) { function bb2html($text, $export=false) {
$urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)"; $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
// NOTE:
// This matches https:// too; I don't understand why.
// sample results:
// Array
// (
// [0] => [img]https://a.b.c[/img]
// [1] =>
// [2] => https://a.b.c
// )
// Array
// (
// [0] => [img]http://a.b.c[/img]
// [1] => http://
// [2] => a.b.c
// )
$httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)"; $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
// List of allowable tags // List of allowable tags
$bbtags = array ( $bbtags = array (
@ -203,7 +219,7 @@ function bb2html($text, $export=false) {
"<blockquote>\\1</blockquote>", "<blockquote>\\1</blockquote>",
"<ul>\\1</ul><p>", "<ul>\\1</ul><p>",
"<ol>\\1</ol><p>", "<ol>\\1</ol><p>",
"<img hspace=\"8\" src=\"http://\\2\"> ", "<img hspace=\"8\" src=\"\\1\\2\"> ",
"<font color=\"\\1\">\\2</font>", "<font color=\"\\1\">\\2</font>",
"\\1<li>\\2\n\\3", "\\1<li>\\2\n\\3",
"<span style=\"font-size: \\1px;\">\\2</span>", "<span style=\"font-size: \\1px;\">\\2</span>",
@ -230,7 +246,7 @@ function bb2html($text, $export=false) {
"<blockquote class='postbody'>\\1</blockquote>", "<blockquote class='postbody'>\\1</blockquote>",
"<ul>\\1</ul><p>", "<ul>\\1</ul><p>",
"<ol>\\1</ol><p>", "<ol>\\1</ol><p>",
"<img hspace=\"8\" src=\"http://\\2\"> ", "<img hspace=\"8\" src=\"\\1\\2\"> ",
"<font color=\"\\1\">\\2</font>", "<font color=\"\\1\">\\2</font>",
"\\1<li>\\2\n\\3", "\\1<li>\\2\n\\3",
"<span style=\"font-size: \\1px;\">\\2</span>", "<span style=\"font-size: \\1px;\">\\2</span>",