diff --git a/phpBB/common.php b/phpBB/common.php index 6950bdbee8..d3c5693141 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -122,7 +122,6 @@ else $board_config['avatar_filesize'] = $config['avatar_filesize']; $board_config['avatar_path'] = $config['avatar_path']; } - include('language/lang_'.$board_config['default_lang'].'.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index b36aa9c39f..bec83c8ba8 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -149,6 +149,7 @@ $lang['Post_new_in'] = "Post New Topic in:"; // Followed by forum name // $lang['Website'] = "Website"; $lang['From'] = "From"; +$lang['Wrong_Profile'] = "You cannot modify a profile that is not your own."; // // Memberslist @@ -170,10 +171,10 @@ $lang['All'] = "All"; // // Topic Admin <= Should be blank for now -// +// // -// Errors (not related to a +// Errors (not related to a // specific failure on a page, eg. // incorrect password messages do // not belong here!) @@ -378,7 +379,7 @@ $l_memberslist = "Memberslist"; $l_faq = "FAQ"; $l_privmsgs = "Private $l_messages"; $l_sendpmsg = "Send a Private Message"; -$l_postedtotal = +$l_postedtotal = $l_wehave = "We have"; $l_regedusers = "registered users."; $l_newestuser = "The newest Registered User is"; diff --git a/phpBB/posting.php b/phpBB/posting.php index 8a2b025e28..4658ff2d69 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -124,7 +124,7 @@ if(!$is_auth[$is_auth_type]) // to read this forum ... // include('includes/page_header.'.$phpEx); - + $msg = "I am sorry but you are not currently authorised to post to this forum. You could try logging on and trying again. If you are logged on then this is a private forum for which you have not been granted access."; $template->set_filenames(array( @@ -147,9 +147,9 @@ $error = FALSE; // // Set initial conditions // -$disable_html = (isset($HTTP_POST_VARS['disable_html'])) ? $HTTP_POST_VARS['disable_html'] : !$userdata['user_allowhtml']; -$disable_bbcode = (isset($HTTP_POST_VARS['disable_bbcode'])) ? $HTTP_POST_VARS['disable_bbcode'] : !$userdata['user_allowbbcode']; -$disable_smilies = (isset($HTTP_POST_VARS['disable_smile'])) ? $HTTP_POST_VARS['disable_smile'] : !$userdata['user_allowsmile']; +$disable_html = (isset($HTTP_POST_VARS['disable_html'])) ? $HTTP_POST_VARS['disable_html'] : $userdata['user_allowhtml']; +$disable_bbcode = (isset($HTTP_POST_VARS['disable_bbcode'])) ? $HTTP_POST_VARS['disable_bbcode'] : $userdata['user_allowbbcode']; +$disable_smilies = (isset($HTTP_POST_VARS['disable_smile'])) ? $HTTP_POST_VARS['disable_smile'] : $userdata['user_allowsmile']; $attach_sig = (isset($HTTP_POST_VARS['attach_sig'])) ? $HTTP_POST_VARS['attach_sig'] : $userdata['user_attachsig']; $notify = (isset($HTTP_POST_VARS['notify'])) ? $HTTP_POST_VARS['notify'] : $userdata["always_notify"]; @@ -163,8 +163,8 @@ if(isset($HTTP_POST_VARS['submit'])) // if($mode != 'editpost') { - $sql = "SELECT max(post_time) AS last_post_time - FROM ".POSTS_TABLE." + $sql = "SELECT max(post_time) AS last_post_time + FROM ".POSTS_TABLE." WHERE poster_ip = '$user_ip'"; if($result = $db->sql_query($sql)) { @@ -454,7 +454,7 @@ switch($mode) } - + break; case 'reply': @@ -520,7 +520,7 @@ switch($mode) error_die(SQL_ERROR, "Couldn't commit"); } } - + $msg = "$l_stored

$l_click $l_here$l_viewmsg

$l_click $l_here $l_returntopic"; $template->set_filenames(array( @@ -779,7 +779,7 @@ if($error) error_die(GENERAL_ERROR, "Sorry, no there is no such forum"); } - $sql = "SELECT forum_name + $sql = "SELECT forum_name FROM ".FORUMS_TABLE." WHERE forum_id = $forum_id"; if(!$result = $db->sql_query($sql)) diff --git a/phpBB/profile.php b/phpBB/profile.php index e799ca6c88..beaa7f743a 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -13,7 +13,7 @@ /*************************************************************************** - * + * * This program is free software; you can redistribute it and/or modified * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -48,11 +48,11 @@ function validate_username($username) // a UNION clause which would be very nice here :( // So we have to use two queries case 'mysql': - $sql_users = "SELECT username - FROM ".USERS_TABLE." + $sql_users = "SELECT username + FROM ".USERS_TABLE." WHERE LOWER(username) = '".strtolower($username)."'"; - $sql_disallow = "SELECT disallow_username - FROM ".DISALLOW_TABLE." + $sql_disallow = "SELECT disallow_username + FROM ".DISALLOW_TABLE." WHERE disallow_username = '$username'"; if($result = $db->sql_query($sql_users)) @@ -72,12 +72,12 @@ function validate_username($username) break; default: - $sql = "SELECT disallow_username - FROM ".DISALLOW_TABLE." - WHERE disallow_username = '$username' - UNION - SELECT username - FROM ".USERS_TABLE." + $sql = "SELECT disallow_username + FROM ".DISALLOW_TABLE." + WHERE disallow_username = '$username' + UNION + SELECT username + FROM ".USERS_TABLE." WHERE LOWER(username) = '".strtolower($username)."'"; if($result = $db->sql_query($sql)) @@ -97,9 +97,9 @@ function language_select($default, $dirname="language/") global $phpEx; $dir = opendir($dirname); $lang_select = "