mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 00:25:19 +02:00
Code Issues Releases Wiki Activity

fixed bugs #1286, #1337 and #1153

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3587 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-03-03 20:53:43 +00:00
parent 1f670aa48a
commit b76e7f7022
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/admin/admin_users.php
View File

@ -316,6 +316,11 @@ if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username'])
$error = TRUE; $error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg']; $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
} }
else if ( strtolower(str_replace("\'", "''", $username)) == strtolower($userdata['username']) )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_taken'];
}
} }
if (!$error) if (!$error)

22
phpBB/includes/usercp_register.php
View File

@ -609,11 +609,27 @@ if ( isset($HTTP_POST_VARS['submit']) )
if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN )
{ {
//$emailer->use_template("admin_activate", stripslashes($user_lang)); $sql = "SELECT user_email
FROM " . USERS_TABLE . "
WHERE user_level = " . ADMIN;
if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not select Administrators', '', __LINE__, __FILE__, $sql);
}
$rows = $db->sql_fetchrowset($result);
$bcc_list = '';
for ($i = 0; $i < count($rows); $i++)
{
$bcc_list = ($bcc_list != '') ? ', ' . trim($rows[$i]['user_email']) : trim($rows[$i]['user_email']);
}
$emailer->use_template("admin_activate", $board_config['default_lang']); $emailer->use_template("admin_activate", $board_config['default_lang']);
$emailer->email_address($board_config['board_email']); $emailer->email_address(' ');
$emailer->set_subject($lang['New_account_subject']); $emailer->set_subject($lang['New_account_subject']);
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers . "Bcc: $bcc_list\n");
$emailer->assign_vars(array( $emailer->assign_vars(array(
'USERNAME' => $username, 'USERNAME' => $username,

2
phpBB/language/lang_english/lang_main.php
View File

@ -877,7 +877,7 @@ $lang['Topic_split'] = 'The selected topic has been split successfully';
$lang['Too_many_error'] = 'You have selected too many posts. You can only select one post to split a topic after!'; $lang['Too_many_error'] = 'You have selected too many posts. You can only select one post to split a topic after!';
$lang['None_selected'] = 'You have no selected any topics to perform this operation on. Please go back and select at least one.'; $lang['None_selected'] = 'You have not selected any topics to perform this operation on. Please go back and select at least one.';
$lang['New_forum'] = 'New forum'; $lang['New_forum'] = 'New forum';
$lang['This_posts_IP'] = 'IP address for this post'; $lang['This_posts_IP'] = 'IP address for this post';

3
phpBB/search.php
View File

@ -522,6 +522,7 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
for ($i = 0; $i < count($search_id_chunks); $i++) for ($i = 0; $i < count($search_id_chunks); $i++)
{ {
$where_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')' : 'p.post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')'; $where_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')' : 'p.post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')';
$select_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id' : 'p.post_id';
$from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . ' p'; $from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . ' p';
if ( $search_time ) if ( $search_time )
@ -541,7 +542,7 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
$where_sql .= " AND u.user_id = p.poster_id AND u.username LIKE '$search_author'"; $where_sql .= " AND u.user_id = p.poster_id AND u.username LIKE '$search_author'";
} }
$sql = "SELECT p.post_id $sql = "SELECT " . $select_sql . "
FROM $from_sql FROM $from_sql
WHERE $where_sql"; WHERE $where_sql";
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )