makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

prevent posting empty messages with some UTF8-characters as well as fixing conversion in CVS.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8163 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-10-11 08:12:41 +00:00
parent 8f8cc50192
commit 10ed58b2c9
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -116,6 +116,7 @@
<li>[Change] Require confirm for deleting inactive users. (Bug #14641)</li> <li>[Change] Require confirm for deleting inactive users. (Bug #14641)</li>
<li>[Fix] Match custom BBCodes in the same way during first and second pass - patch provided by IBBoard (Bug #14268)</li> <li>[Fix] Match custom BBCodes in the same way during first and second pass - patch provided by IBBoard (Bug #14268)</li>
<li>[Fix] Correct quote parsing if opening bracket before opening quote (Bug #14667)</li> <li>[Fix] Correct quote parsing if opening bracket before opening quote (Bug #14667)</li>
<li>[Fix] Clean post message for checking length to prevent posting empty messages</li>
</ul> </ul>
<a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3> <a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3>

11
phpBB/includes/message_parser.php
View file

@ -1060,8 +1060,8 @@ class parse_message extends bbcode_firstpass
$replace = array("\\1&#058;"); $replace = array("\\1&#058;");
$this->message = preg_replace($match, $replace, trim($this->message)); $this->message = preg_replace($match, $replace, trim($this->message));
// Message length check. -1 disables this check completely. // Message length check. 0 disables this check completely.
if ($config['max_' . $mode . '_chars']) if ($config['max_' . $mode . '_chars'] > 0)
{ {
$msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message)); $msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message));
@ -1072,6 +1072,13 @@ class parse_message extends bbcode_firstpass
} }
} }
// Check for "empty" message
if (!utf8_clean_string($this->message))
{
$this->warn_msg[] = $user->lang['TOO_FEW_CHARS'];
return $this->warn_msg;
}
// Prepare BBcode (just prepares some tags for better parsing) // Prepare BBcode (just prepares some tags for better parsing)
if ($allow_bbcode && strpos($this->message, '[') !== false) if ($allow_bbcode && strpos($this->message, '[') !== false)
{ {

4
phpBB/install/convertors/convert_phpbb20.php
View file

@ -596,7 +596,7 @@ if (!$get_info)
'autoincrement' => 'post_id', 'autoincrement' => 'post_id',
'query_first' => array('target', $convert->truncate_statement . POSTS_TABLE), 'query_first' => array('target', $convert->truncate_statement . POSTS_TABLE),
'execute_first' => ' 'execute_first' => '
$config["max_post_chars"] = -1; $config["max_post_chars"] = 0;
$config["max_quote_depth"] = 0; $config["max_quote_depth"] = 0;
', ',
@ -645,7 +645,7 @@ if (!$get_info)
), ),
'execute_first' => ' 'execute_first' => '
$config["max_post_chars"] = -1; $config["max_post_chars"] = 0;
$config["max_quote_depth"] = 0; $config["max_quote_depth"] = 0;
', ',

4
phpBB/install/install_convert.php
View file

@ -612,7 +612,7 @@ class install_convert extends module
$config['max_quote_depth'] = 0; $config['max_quote_depth'] = 0;
// @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues // @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues
$config['max_post_chars'] = -1; $config['max_post_chars'] = 0;
// Set up a user as well. We _should_ have enough of a database here at this point to do this // Set up a user as well. We _should_ have enough of a database here at this point to do this
// and it helps for any core code we call // and it helps for any core code we call
@ -990,7 +990,7 @@ class install_convert extends module
$config['max_quote_depth'] = 0; $config['max_quote_depth'] = 0;
// @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues // @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues
$config['max_post_chars'] = -1; $config['max_post_chars'] = 0;
} }
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(