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

for some things we do not need the utf8 function. :)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6455 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-10-07 15:47:55 +00:00
parent 66c78d114b
commit f27edc4b5b
4 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/acp/acp_bbcodes.php
View file

@ -122,12 +122,12 @@ class acp_bbcodes
{ {
$sql = 'SELECT 1 as test $sql = 'SELECT 1 as test
FROM ' . BBCODES_TABLE . " FROM ' . BBCODES_TABLE . "
WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(utf8_strtolower($data['bbcode_tag'])) . "'"; WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(strtolower($data['bbcode_tag'])) . "'";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$info = $db->sql_fetchrow($result); $info = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
if ($info['test'] === '1' || in_array(utf8_strtolower($data['bbcode_tag']), $hard_coded)) if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded))
{ {
trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -358,10 +358,10 @@ class acp_bbcodes
// Lowercase tags // Lowercase tags
$bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match); $bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match);
$fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $fp_match); $fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_match);
$fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $fp_replace); $fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_replace);
$sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $sp_match); $sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_match);
$sp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "utf8_strtolower('\$0')", $sp_replace); $sp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_replace);
return array( return array(
'bbcode_tag' => $bbcode_tag, 'bbcode_tag' => $bbcode_tag,

2
phpBB/includes/db/dbal.php
View file

@ -425,7 +425,7 @@ class dbal
$this->sql_transaction('rollback'); $this->sql_transaction('rollback');
} }
if (utf8_strlen($message) > 1024) if (strlen($message) > 1024)
{ {
// We need to define $msg_long_text here to circumvent text stripping. // We need to define $msg_long_text here to circumvent text stripping.
global $msg_long_text; global $msg_long_text;

6
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -447,12 +447,6 @@ function compose_pm($id, $mode, $action)
if ($submit || $preview || $refresh) if ($submit || $preview || $refresh)
{ {
$subject = request_var('subject', '', true); $subject = request_var('subject', '', true);
if ($subject && strcmp($subject, utf8_strtoupper($subject)) === 0)
{
$subject = utf8_strtolower($subject);
}
$message_parser->message = request_var('message', '', true); $message_parser->message = request_var('message', '', true);
$icon_id = request_var('icon', 0); $icon_id = request_var('icon', 0);

8
phpBB/posting.php
View file

@ -529,14 +529,6 @@ if ($submit || $preview || $refresh)
{ {
$post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0); $post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0);
$post_data['post_subject'] = request_var('subject', '', true); $post_data['post_subject'] = request_var('subject', '', true);
// If subject is all-uppercase then we make all lowercase (we do not want to be yelled at too :P)
// Admins/Mods might want to create all-uppercase topics, therefore we do not apply this check to them (they should know better ;))
if ($post_data['post_subject'] && !$auth->acl_gets('a_', 'm_', $forum_id) && strcmp($post_data['post_subject'], utf8_strtoupper($post_data['post_subject'])) === 0)
{
$post_data['post_subject'] = utf8_strtolower($post_data['post_subject']);
}
$message_parser->message = request_var('message', '', true); $message_parser->message = request_var('message', '', true);
$post_data['username'] = request_var('username', $post_data['username']); $post_data['username'] = request_var('username', $post_data['username']);