*/
function _headerdecode($charset, $c, $str) {
- $s = ($c == 'Q') ? quoted_printable_decode($str) : base64_decode($str);
+ $s = ($c == 'Q' || $c == 'q') ? quoted_printable_decode($str) : base64_decode($str);
$s = iconv($charset, 'iso-8859-15', $s);
return str_replace('_', ' ', $s);
}
function headerDecode($value) {
- $val = preg_replace('/(=\?[^?]*\?[BQ]\?[^?]*\?=) (=\?[^?]*\?[BQ]\?[^?]*\?=)/', '\1\2', $value);
- return preg_replace('/=\?([^?]*)\?([BQ])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val);
+ $val = preg_replace('/(=\?[^?]*\?[BQbq]\?[^?]*\?=) (=\?[^?]*\?[BQbq]\?[^?]*\?=)/', '\1\2', $value);
+ return preg_replace('/=\?([^?]*)\?([BQbq])\?([^?]*)\?=/e', '_headerdecode("\1", "\2", "\3")', $val);
}
function headerEncode($value, $trim = 0) {
return $rsl;
case "x-face":
- return '<img src="xface.php?face='.base64_encode($_text).'" alt="x-face" />';
+ return '<img src="xface.php?face='.urlencode(base64_encode($_text)).'" alt="x-face" />';
default:
if (function_exists('hook_formatDisplayHeader')
return $link;
}
+function cleanurl($url)
+{
+ $url = str_replace('@', '%40', $url);
+ return '<a href="'.$url.'" title="'.$url.'">'.cutlink($url).'</a>';
+}
+
function formatbody($_text, $format='plain', $flowed=false)
{
if ($format == 'html') {
global $banana;
$url = $banana->url_regexp;
$res = preg_replace("/(<|>|")/", " \\1 ", $res);
- $res = preg_replace("!$url!ie", "'\\1<a href=\"\\2\" title=\"\\2\">'.cutlink('\\2').'</a>\\3'", $res);
+ $res = preg_replace("!$url!ie", "'\\1'.cleanurl('\\2').'\\3'", $res);
$res = preg_replace('/(["\[])?(?:mailto:)?([a-z0-9.\-+_]+@[a-z0-9.\-+_]+)(["\]])?/i', '\1<a href="mailto:\2">\2</a>\3', $res);
$res = preg_replace("/ (<|>|") /", "\\1", $res);
}
if ($format == 'html') {
- $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
- $res = preg_replace("@<br[^>]*>\n?-- \n?(<p[^>]*>)@", "<br/>-- <br/>\\2", $res);
- $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br[^>]*>)@", $res);
+ $res = preg_replace("@(</p>)\n?-- ?\n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
+ $res = preg_replace("@<br[^>]*>\n?-- ?\n?(<p[^>]*>)@", "<br/>-- <br/>\\2", $res);
+ $res = preg_replace("@(<pre[^>]*>)\n?-- ?\n@", "<br/>-- <br/>\\1", $res);
+ $parts = preg_split("@(:?<p[^>]*>\n?-- ?\n?</p>|<br[^>]*>\n?-- ?\n?<br[^>]*>)@", $res);
} else {
while (preg_match("@(^|<pre>|\n)>@i", $res)) {
$res = preg_replace("@(^|<pre>|\n)((>[^\n]*\n)+)@ie",