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

more little bugfixes...

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3988 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-05-06 20:18:42 +00:00
parent ba013ea84c
commit c225a5b00c
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/admin/pagestart.php
View file

@ -55,6 +55,7 @@ if ($HTTP_GET_VARS['sid'] != $userdata['session_id'])
$url = preg_replace('/sid=([^&]*)(&?)/i', '', $url); $url = preg_replace('/sid=([^&]*)(&?)/i', '', $url);
$url = preg_replace('/\?$/', '', $url); $url = preg_replace('/\?$/', '', $url);
$url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id'];
redirect($url); redirect($url);
} }

3
phpBB/includes/usercp_register.php
View file

@ -330,8 +330,8 @@ if ( isset($HTTP_POST_VARS['submit']) )
{ {
if ( empty($username) ) if ( empty($username) )
{ {
// Error is already triggered, since one field is empty.
$error = TRUE; $error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Username_disallowed'];
} }
else if ( $username != $userdata['username'] || $mode == 'register' ) else if ( $username != $userdata['username'] || $mode == 'register' )
{ {
@ -367,7 +367,6 @@ if ( isset($HTTP_POST_VARS['submit']) )
$signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid); $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
} }
//??
if ( $website != '' ) if ( $website != '' )
{ {
rawurlencode($website); rawurlencode($website);

2
phpBB/language/lang_english/lang_admin.php
View file

@ -251,7 +251,7 @@ $lang['Server_port_explain'] = 'The port your server is running on, usually 80.
$lang['Site_name'] = 'Site name'; $lang['Site_name'] = 'Site name';
$lang['Site_desc'] = 'Site description'; $lang['Site_desc'] = 'Site description';
$lang['Board_disable'] = 'Disable board'; $lang['Board_disable'] = 'Disable board';
$lang['Board_disable_explain'] = 'This will make the board unavailable to users. Do not log out when you disable the board because you will not be able to log back in!'; $lang['Board_disable_explain'] = 'This will make the board unavailable to users. Administrators are able to access the Administration Panel while the board is disabled.';
$lang['Acct_activation'] = 'Enable account activation'; $lang['Acct_activation'] = 'Enable account activation';
$lang['Acc_None'] = 'None'; // These three entries are the type of activation $lang['Acc_None'] = 'None'; // These three entries are the type of activation
$lang['Acc_User'] = 'User'; $lang['Acc_User'] = 'User';

1
phpBB/login.php
View file

@ -55,6 +55,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] ) if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
{ {
$username = isset($HTTP_POST_VARS['username']) ? trim(htmlspecialchars($HTTP_POST_VARS['username'])) : ''; $username = isset($HTTP_POST_VARS['username']) ? trim(htmlspecialchars($HTTP_POST_VARS['username'])) : '';
$username = substr(str_replace("\'", "'", $username), 0, 25);
$password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : '';
$sql = "SELECT user_id, username, user_password, user_active, user_level $sql = "SELECT user_id, username, user_password, user_active, user_level