File: '.$file.'
'."\n\t\t".'
Line: '.$line.'
'."\n\t\t".'
FluxBB reported: '.$message."\n";
@@ -1630,7 +1635,7 @@ function remove_bad_characters($array)
$array = utf8_bad_strip($array);
// Remove control characters
- $array = preg_replace('%[\x{00}-\x{08}\x{0b}-\x{0c}\x{0e}-\x{1f}]%', '', $array);
+ $array = preg_replace('%[\x00-\x08\x0b-\x0c\x0e-\x1f]%', '', $array);
// Replace some "bad" characters
$array = str_replace(array_keys($bad_utf8_chars), array_values($bad_utf8_chars), $array);
@@ -1651,7 +1656,7 @@ function file_size($size)
for ($i = 0; $size > 1024; $i++)
$size /= 1024;
- return sprintf($lang_common['Size unit '.$units[$i]], round($size, 2));;
+ return sprintf($lang_common['Size unit '.$units[$i]], round($size, 2));
}
@@ -1754,7 +1759,7 @@ function forum_list_plugins($is_admin)
//
// Split text into chunks ($inside contains all text inside $start and $end, and $outside contains all text outside)
//
-function split_text($text, $start, $end, &$errors, $retab = true)
+function split_text($text, $start, $end, $retab = true)
{
global $pun_config, $lang_common;
@@ -1782,7 +1787,7 @@ function split_text($text, $start, $end, &$errors, $retab = true)
// Extract blocks from a text with a starting and ending string
// This function always matches the most outer block so nesting is possible
//
-function extract_blocks($text, $start, $end, &$errors = array(), $retab = true)
+function extract_blocks($text, $start, $end, $retab = true)
{
global $pun_config;
@@ -1972,6 +1977,65 @@ function ucp_preg_replace($pattern, $replace, $subject)
return $replaced;
}
+//
+// Replace four-byte characters with a question mark
+//
+// As MySQL cannot properly handle four-byte characters with the default utf-8
+// charset up until version 5.5.3 (where a special charset has to be used), they
+// need to be replaced, by question marks in this case.
+//
+function strip_bad_multibyte_chars($str)
+{
+ $result = '';
+ $length = strlen($str);
+
+ for ($i = 0; $i < $length; $i++)
+ {
+ // Replace four-byte characters (11110www 10zzzzzz 10yyyyyy 10xxxxxx)
+ $ord = ord($str[$i]);
+ if ($ord >= 240 && $ord <= 244)
+ {
+ $result .= '?';
+ $i += 3;
+ }
+ else
+ {
+ $result .= $str[$i];
+ }
+ }
+
+ return $result;
+}
+
+//
+// Check whether a file/folder is writable.
+//
+// This function also works on Windows Server where ACLs seem to be ignored.
+//
+function forum_is_writable($path)
+{
+ if (is_dir($path))
+ {
+ $path = rtrim($path, '/').'/';
+ return forum_is_writable($path.uniqid(mt_rand()).'.tmp');
+ }
+
+ // Check temporary file for read/write capabilities
+ $rm = file_exists($path);
+ $f = @fopen($path, 'a');
+
+ if ($f === false)
+ return false;
+
+ fclose($f);
+
+ if (!$rm)
+ @unlink($path);
+
+ return true;
+}
+
+
// DEBUG FUNCTIONS BELOW
//
diff --git a/include/parser.php b/include/parser.php
index 0aba148..238932d 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -1,7 +1,7 @@
$part)
- {
- $text .= $part;
- if (isset($inside[$i]))
- $text .= '[code]'.$inside[$i].'[/code]';
- }
- }
+ if (isset($inside))
+ {
+ $parts = explode("\1", $text);
+ $text = '';
+ foreach ($parts as $i => $part)
+ {
+ $text .= $part;
+ if (isset($inside[$i]))
+ $text .= '[code]'.$inside[$i].'[/code]';
+ }
+ }
// Remove empty code tags
- while (($new_text = preg_replace('%\[(code)\]\s*\[/\1\]%', '', $text)) !== NULL)
+ while (!is_null($new_text = preg_replace('%\[(code)\]\s*\[/\1\]%', '', $text)))
{
if ($new_text != $text)
$text = $new_text;
@@ -352,18 +353,13 @@ function preparse_tags($text, &$errors, $is_signature = false)
$current = strtolower($current);
// This is if we are currently in a tag which escapes other bbcode such as code
- // We keep a cound of ignored bbcodes (code tags) so we can nest them, but
+ // We keep a count of ignored bbcodes (code tags) so we can nest them, but
// only balanced sets of tags can be nested
if ($current_ignore)
{
// Increase the current ignored tags counter
if ('['.$current_ignore.']' == $current)
- {
- if (!isset($count_ignored[$current_tag]))
- $count_ignored[$current_tag] = 2;
- else
- $count_ignored[$current_tag]++;
- }
+ $count_ignored[$current_tag]++;
// Decrease the current ignored tags counter
if ('[/'.$current_ignore.']' == $current)
@@ -531,6 +527,7 @@ function preparse_tags($text, &$errors, $is_signature = false)
{
// It's an ignore tag so we don't need to worry about what's inside it
$current_ignore = $current_tag;
+ $count_ignored[$current_tag] = 1;
$new_text .= $current;
continue;
}
@@ -601,7 +598,7 @@ function preparse_tags($text, &$errors, $is_signature = false)
//
// Preparse the contents of [list] bbcode
//
-function preparse_list_tag($content, $type = '*', &$errors)
+function preparse_list_tag($content, $type = '*')
{
global $lang_common, $re_list;
@@ -610,7 +607,7 @@ function preparse_list_tag($content, $type = '*', &$errors)
if (strpos($content,'[list') !== false)
{
- $content = preg_replace($re_list, 'preparse_list_tag(\'$2\', \'$1\', $errors)', $content);
+ $content = preg_replace($re_list, 'preparse_list_tag(\'$2\', \'$1\')', $content);
}
$items = explode('[*]', str_replace('\"', '"', $content));
@@ -632,6 +629,11 @@ function preparse_list_tag($content, $type = '*', &$errors)
function handle_url_tag($url, $link = '', $bbcode = false)
{
$url = pun_trim($url);
+
+ // Deal with [url][img]http://example.com/test.png[/img][/url]
+ if (preg_match('%
![](\\\\"(.*?)\\\\"%',)
<'.$lang_common['Image link'].' - '.$alt.'>';
@@ -776,14 +778,14 @@ function do_bbcode($text, $is_signature = false)
$pattern[] = '%\[url=([^\[]+?)\](.*?)\[/url\]%e';
$pattern[] = '%\[email\]([^\[]*?)\[/email\]%';
$pattern[] = '%\[email=([^\[]+?)\](.*?)\[/email\]%';
- $pattern[] = '%\[topic\]([^\[]*?)\[/topic\]%e';
- $pattern[] = '%\[topic=([^\[]+?)\](.*?)\[/topic\]%e';
- $pattern[] = '%\[post\]([^\[]*?)\[/post\]%e';
- $pattern[] = '%\[post=([^\[]+?)\](.*?)\[/post\]%e';
- $pattern[] = '%\[forum\]([^\[]*?)\[/forum\]%e';
- $pattern[] = '%\[forum=([^\[]+?)\](.*?)\[/forum\]%e';
- $pattern[] = '%\[user\]([^\[]*?)\[/user\]%e';
- $pattern[] = '%\[user=([^\[]+?)\](.*?)\[/user\]%e';
+ $pattern[] = '%\[topic\]([1-9]\d*)\[/topic\]%e';
+ $pattern[] = '%\[topic=([1-9]\d*)\](.*?)\[/topic\]%e';
+ $pattern[] = '%\[post\]([1-9]\d*)\[/post\]%e';
+ $pattern[] = '%\[post=([1-9]\d*)\](.*?)\[/post\]%e';
+ $pattern[] = '%\[forum\]([1-9]\d*)\[/forum\]%e';
+ $pattern[] = '%\[forum=([1-9]\d*)\](.*?)\[/forum\]%e';
+ $pattern[] = '%\[user\]([1-9]\d*)\[/user\]%e';
+ $pattern[] = '%\[user=([1-9]\d*)\](.*?)\[/user\]%e';
$replace[] = 'handle_url_tag(\'$1\')';
$replace[] = 'handle_url_tag(\'$1\', \'$2\')';
@@ -812,8 +814,8 @@ function do_clickable($text)
{
$text = ' '.$text;
- $text = ucp_preg_replace('%(?<=[\s\]\)])(<)?(\[)?(\()?([\'"]?)(https?|ftp|news){1}://([\p{L}\p{N}\-]+\.([\p{L}\p{N}\-]+\.)*[\p{L}\p{N}]+(:[0-9]+)?(/[^\s\[]*[^\s.,?!\[;:-])?)\4(?(3)(\)))(?(2)(\]))(?(1)(>))(?![^\s]*\[/(?:url|img)\])%uie', 'stripslashes(\'$1$2$3$4\').handle_url_tag(\'$5://$6\', \'$5://$6\', true).stripslashes(\'$4$10$11$12\')', $text);
- $text = ucp_preg_replace('%(?<=[\s\]\)])(<)?(\[)?(\()?([\'"]?)(www|ftp)\.(([\p{L}\p{N}\-]+\.)*[\p{L}\p{N}]+(:[0-9]+)?(/[^\s\[]*[^\s.,?!\[;:-])?)\4(?(3)(\)))(?(2)(\]))(?(1)(>))(?![^\s]*\[/(?:url|img)\])%uie', 'stripslashes(\'$1$2$3$4\').handle_url_tag(\'$5.$6\', \'$5.$6\', true).stripslashes(\'$4$10$11$12\')', $text);
+ $text = ucp_preg_replace('%(?<=[\s\]\)])(<)?(\[)?(\()?([\'"]?)(https?|ftp|news){1}://([\p{L}\p{N}\-]+\.([\p{L}\p{N}\-]+\.)*[\p{L}\p{N}]+(:[0-9]+)?(/(?:[^\s\[]*[^\s.,?!\[;:-])?)?)\4(?(3)(\)))(?(2)(\]))(?(1)(>))(?![^\s]*\[/(?:url|img)\])%uie', 'stripslashes(\'$1$2$3$4\').handle_url_tag(\'$5://$6\', \'$5://$6\', true).stripslashes(\'$4$10$11$12\')', $text);
+ $text = ucp_preg_replace('%(?<=[\s\]\)])(<)?(\[)?(\()?([\'"]?)(www|ftp)\.(([\p{L}\p{N}\-]+\.)*[\p{L}\p{N}]+(:[0-9]+)?(/(?:[^\s\[]*[^\s.,?!\[;:-])?)?)\4(?(3)(\)))(?(2)(\]))(?(1)(>))(?![^\s]*\[/(?:url|img)\])%uie', 'stripslashes(\'$1$2$3$4\').handle_url_tag(\'$5.$6\', \'$5.$6\', true).stripslashes(\'$4$10$11$12\')', $text);
return substr($text, 1);
}
@@ -853,7 +855,7 @@ function parse_message($text, $hide_smilies)
// If the message contains a code tag we have to split it up (text within [code][/code] shouldn't be touched)
if (strpos($text, '[code]') !== false && strpos($text, '[/code]') !== false)
- list($inside, $text) = extract_blocks($text, '[code]', '[/code]', $errors);
+ list($inside, $text) = extract_blocks($text, '[code]', '[/code]');
if ($pun_config['p_message_bbcode'] == '1' && strpos($text, '[') !== false && strpos($text, ']') !== false)
$text = do_bbcode($text);
@@ -867,24 +869,46 @@ function parse_message($text, $hide_smilies)
$text = str_replace($pattern, $replace, $text);
// If we split up the message before we have to concatenate it together again (code tags)
- if (isset($inside)) {
- $parts = explode("\1", $text);
- $text = '';
- foreach ($parts as $i => $part)
- {
- $text .= $part;
- if (isset($inside[$i]))
- {
- $num_lines = (substr_count($inside[$i], "\n"));
- $text .= '
28) ? ' class="vscroll"' : '').'>'.pun_trim($inside[$i], "\n\r").' ';
- }
- }
- }
+ if (isset($inside))
+ {
+ $parts = explode("\1", $text);
+ $text = '';
+ foreach ($parts as $i => $part)
+ {
+ $text .= $part;
+ if (isset($inside[$i]))
+ {
+ $num_lines = (substr_count($inside[$i], "\n"));
+ $text .= '
28) ? ' class="vscroll"' : '').'>'.pun_trim($inside[$i], "\n\r").' ';
+ }
+ }
+ }
+ return clean_paragraphs($text);
+}
+
+
+//
+// Clean up paragraphs and line breaks
+//
+function clean_paragraphs($text)
+{
// Add paragraph tag around post, but make sure there are no empty paragraphs
- $text = preg_replace('%
\s*?
((\s*
)*)%i', "
$1
", $text);
- $text = str_replace('
', '
', $text);
- $text = str_replace('
', '', '
'.$text.'
');
+
+ $text = '
'.$text.'
';
+
+ // Replace any breaks next to paragraphs so our replace below catches them
+ $text = preg_replace('%()(?:\s*?
){1,2}%i', '$1', $text);
+ $text = preg_replace('%(?:
\s*?){1,2}()%i', '$1', $text);
+
+ // Remove any empty paragraph tags (inserted via quotes/lists/code/etc) which should be stripped
+ $text = str_replace('
', '', $text);
+
+ $text = preg_replace('%
\s*?
%i', '
', $text);
+
+ $text = str_replace('
', '
', $text);
+ $text = str_replace('
', '
', $text);
+ $text = str_replace('
', '
', $text);
return $text;
}
@@ -915,10 +939,5 @@ function parse_signature($text)
$replace = array('
', ' ', ' ', ' ');
$text = str_replace($pattern, $replace, $text);
- // Add paragraph tag around post, but make sure there are no empty paragraphs
- $text = preg_replace('%
\s*?
((\s*
)*)%i', "$1
", $text);
- $text = str_replace('
', '
', $text);
- $text = str_replace('
', '', '
'.$text.'
');
-
- return $text;
+ return clean_paragraphs($text);
}
diff --git a/include/search_idx.php b/include/search_idx.php
index 210b268..550f348 100644
--- a/include/search_idx.php
+++ b/include/search_idx.php
@@ -1,7 +1,7 @@
= PUN_SEARCH_MIN_WORD && $num_chars <= PUN_SEARCH_MAX_WORD;
@@ -145,6 +148,7 @@ function strip_bbcode($text)
'%\[img=([^\]]*+)\]([^[]*+)\[/img\]%' => '$2 $1', // Keep the url and description
'%\[(url|email)=([^\]]*+)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%' => '$2 $3', // Keep the url and text
'%\[(img|url|email)\]([^[]*+(?:(?!\[/\1\])\[[^[]*+)*)\[/\1\]%' => '$2', // Keep the url
+ '%\[(topic|post|forum|user)\][1-9]\d*\[/\1\]%' => ' ', // Do not index topic/post/forum/user ID
);
}
diff --git a/include/utf8/strcspn.php b/include/utf8/strcspn.php
index 1e3756d..b05e327 100644
--- a/include/utf8/strcspn.php
+++ b/include/utf8/strcspn.php
@@ -24,7 +24,7 @@ function utf8_strcspn($str, $mask, $start=null, $length=null)
$mask = preg_replace('!([\\\\\\-\\]\\[/^])!','\\\${1}', $mask);
- if ($start !== null || $length !== null)
+ if (!is_null($start) || !is_null($length))
$str = utf8_substr($str, $start, $length);
preg_match('/^[^'.$mask.']+/u', $str, $matches);
diff --git a/include/utf8/strspn.php b/include/utf8/strspn.php
index 424ceb7..49d300a 100644
--- a/include/utf8/strspn.php
+++ b/include/utf8/strspn.php
@@ -20,7 +20,7 @@ function utf8_strspn($str, $mask, $start=null, $length=null)
{
$mask = preg_replace('!([\\\\\\-\\]\\[/^])!', '\\\${1}', $mask);
- if ($start !== null || $length !== null)
+ if (!is_null($start)|| !is_null($length))
$str = utf8_substr($str, $start, $length);
preg_match('/^['.$mask.']+/u', $str, $matches);
diff --git a/include/utf8/substr_replace.php b/include/utf8/substr_replace.php
index 7fc7369..20a43b5 100644
--- a/include/utf8/substr_replace.php
+++ b/include/utf8/substr_replace.php
@@ -18,7 +18,7 @@ function utf8_substr_replace($str, $repl, $start , $length=null)
preg_match_all('/./us', $str, $ar);
preg_match_all('/./us', $repl, $rar);
- if($length === null)
+ if(is_null($length))
$length = utf8_strlen($str);
array_splice($ar[0], $start, $length, $rar[0]);
diff --git a/include/utf8/utf8.php b/include/utf8/utf8.php
index 281f18c..661b2d7 100644
--- a/include/utf8/utf8.php
+++ b/include/utf8/utf8.php
@@ -34,7 +34,7 @@ if (!defined('UTF8'))
if (extension_loaded('mbstring') && !defined('UTF8_USE_MBSTRING') && !defined('UTF8_USE_NATIVE'))
define('UTF8_USE_MBSTRING', true);
-else
+else if (!defined('UTF8_USE_NATIVE'))
define('UTF8_USE_NATIVE', true);
// utf8_strpos() and utf8_strrpos() need utf8_bad_strip() to strip invalid
diff --git a/include/utf8/utils/bad.php b/include/utf8/utils/bad.php
index 78e9d17..2704294 100644
--- a/include/utf8/utils/bad.php
+++ b/include/utf8/utils/bad.php
@@ -114,33 +114,9 @@ function utf8_bad_findall($str)
* @package utf8
* @subpackage bad
*/
-function utf8_bad_strip($str)
+function utf8_bad_strip($original)
{
- $UTF8_BAD =
- '([\x00-\x7F]'. # ASCII (including control chars)
- '|[\xC2-\xDF][\x80-\xBF]'. # Non-overlong 2-byte
- '|\xE0[\xA0-\xBF][\x80-\xBF]'. # Excluding overlongs
- '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'. # Straight 3-byte
- '|\xED[\x80-\x9F][\x80-\xBF]'. # Excluding surrogates
- '|\xF0[\x90-\xBF][\x80-\xBF]{2}'. # Planes 1-3
- '|[\xF1-\xF3][\x80-\xBF]{3}'. # Planes 4-15
- '|\xF4[\x80-\x8F][\x80-\xBF]{2}'. # Plane 16
- '|(.{1}))'; # Invalid byte
-
- ob_start();
-
- while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches))
- {
- if (!isset($matches[2]))
- echo $matches[0];
-
- $str = substr($str, strlen($matches[0]));
- }
-
- $result = ob_get_contents();
- ob_end_clean();
-
- return $result;
+ return utf8_bad_replace($original, '');
}
/**
@@ -156,33 +132,52 @@ function utf8_bad_strip($str)
* @package utf8
* @subpackage bad
*/
-function utf8_bad_replace($str, $replace='?')
-{
- $UTF8_BAD =
- '([\x00-\x7F]'. # ASCII (including control chars)
- '|[\xC2-\xDF][\x80-\xBF]'. # Non-overlong 2-byte
- '|\xE0[\xA0-\xBF][\x80-\xBF]'. # Excluding overlongs
- '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'. # Straight 3-byte
- '|\xED[\x80-\x9F][\x80-\xBF]'. # Excluding surrogates
- '|\xF0[\x90-\xBF][\x80-\xBF]{2}'. # Planes 1-3
- '|[\xF1-\xF3][\x80-\xBF]{3}'. # Planes 4-15
- '|\xF4[\x80-\x8F][\x80-\xBF]{2}'. # Plane 16
- '|(.{1}))'; # Invalid byte
+function utf8_bad_replace($original, $replace = '?') {
+ $result = '';
+
+ $strlen = strlen($original);
+ for ($i = 0; $i < $strlen;) {
+ $char = $original[$i++];
+ $byte = ord($char);
+
+ if ($byte < 0x80) $bytes = 0; // 1-bytes (00000000 - 01111111)
+ else if ($byte < 0xC0) { // 1-bytes (10000000 - 10111111)
+ $result .= $replace;
+ continue;
+ }
+ else if ($byte < 0xE0) $bytes = 1; // 2-bytes (11000000 - 11011111)
+ else if ($byte < 0xF0) $bytes = 2; // 3-bytes (11100000 - 11101111)
+ else if ($byte < 0xF8) $bytes = 3; // 4-bytes (11110000 - 11110111)
+ else if ($byte < 0xFC) $bytes = 4; // 5-bytes (11111000 - 11111011)
+ else if ($byte < 0xFE) $bytes = 5; // 6-bytes (11111100 - 11111101)
+ else { // Otherwise it's something invalid
+ $result .= $replace;
+ continue;
+ }
- ob_start();
+ // Check our input actually has enough data
+ if ($i + $bytes > $strlen) {
+ $result .= $replace;
+ continue;
+ }
- while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches))
- {
- if (!isset($matches[2]))
- echo $matches[0];
- else
- echo $replace;
+ // If we've got this far then we have a multiple-byte character
+ for ($j = 0; $j < $bytes; $j++) {
+ $byte = $original[$i + $j];
- $str = substr($str, strlen($matches[0]));
- }
+ $char .= $byte;
+ $byte = ord($byte);
- $result = ob_get_contents();
- ob_end_clean();
+ // Every following byte must be 10000000 - 10111111
+ if ($byte < 0x80 || $byte > 0xBF) {
+ $result .= $replace;
+ continue 2;
+ }
+ }
+
+ $i += $bytes;
+ $result .= $char;
+ }
return $result;
}
diff --git a/index.php b/index.php
index e80e73b..0f257ac 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
",
"req_db_host": "",
"req_db_name": "",
- "db_prefix": "",
"req_username": "",
"req_password1": "",
"req_password2": "",
@@ -272,14 +271,11 @@ function process_form(the_form)
for (var i = 0; i < the_form.length; ++i)
{
var elem = the_form.elements[i];
- if (elem.name && (/^req_/.test(elem.name)))
+ if (elem.name && required_fields[elem.name] && !elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
{
- if (!elem.value && elem.type && (/^(?:text(?:area)?|password|file)$/i.test(elem.type)))
- {
- alert('"' + element_names[elem.name] + '" ');
- elem.focus();
- return false;
- }
+ alert('"' + required_fields[elem.name] + '" ');
+ elem.focus();
+ return false;
}
}
}
@@ -338,7 +334,7 @@ function process_form(the_form)
-
|
-
|
+
|
+
|
|
query('SELECT topic_id, posted FROM '.$db->prefix.'posts WHERE id='.$pid) or error('Unable to fetch topic ID', __FILE__, __LINE__, $db->error());
if (!$db->num_rows($result))
- message($lang_common['Bad request']);
+ message($lang_common['Bad request'], false, '404 Not Found');
list($id, $posted) = $db->fetch_row($result);
@@ -85,7 +85,7 @@ else
$result = $db->query('SELECT t.subject, t.closed, t.num_replies, t.sticky, t.first_post_id, f.id AS forum_id, f.forum_name, f.moderators, fp.post_replies, 0 AS is_subscribed FROM '.$db->prefix.'topics AS t INNER JOIN '.$db->prefix.'forums AS f ON f.id=t.forum_id LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.id='.$id.' AND t.moved_to IS NULL') or error('Unable to fetch topic info', __FILE__, __LINE__, $db->error());
if (!$db->num_rows($result))
- message($lang_common['Bad request']);
+ message($lang_common['Bad request'], false, '404 Not Found');
$cur_topic = $db->fetch_assoc($result);