diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 19:33:33 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 19:33:33 +0000 |
| commit | cf8456ab61908746c937d565462939126d23c339 (patch) | |
| tree | 02663ddf43ca19df1084f635a5afb54d8804f46c /phpBB/profile.php | |
| parent | 7844a5fa7fe9359b2bbb4134a149651dfe49c666 (diff) | |
| download | forums-cf8456ab61908746c937d565462939126d23c339.tar forums-cf8456ab61908746c937d565462939126d23c339.tar.gz forums-cf8456ab61908746c937d565462939126d23c339.tar.bz2 forums-cf8456ab61908746c937d565462939126d23c339.tar.xz forums-cf8456ab61908746c937d565462939126d23c339.zip | |
Fixed error #475726 + lang updates
git-svn-id: file:///svn/phpbb/trunk@1269 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
| -rw-r--r-- | phpBB/profile.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php index 12a62feead..068938a37b 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -76,19 +76,19 @@ function validate_email($email) $email_taken = $db->sql_fetchrow($result); if($email_taken['user_email'] != "") { - return(0); + return false; } - return(1); + return true; } else { - return(0); + return false; } } else { - return(0); + return false; } } @@ -751,9 +751,9 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) if($mode == "editprofile") { - if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id)) + if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) ) { - @unlink("./" . $board_config['avatar_path'] . "/" . $user_id); + @unlink("./" . $board_config['avatar_path'] . "/". $userdata['user_avatar']); } } @copy($user_avatar_loc, "./" . $board_config['avatar_path'] . "/$avatar_filename"); @@ -856,9 +856,9 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) if($mode == "editprofile") { - if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id)) + if(file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar'])) { - @unlink("./" . $board_config['avatar_path'] . "/" . $user_id); + @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']); } } @copy($tmp_filename, "./" . $board_config['avatar_path'] . "/$avatar_filename"); @@ -1013,7 +1013,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $emailer->send(); $emailer->reset(); - $message = $lang['Profile_updated_inactive'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index']; + $message = $lang['Profile_updated_inactive'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); // Log the user out as their account is no longer active if( $userdata['session_logged_in'] ) @@ -1025,7 +1025,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) } else { - $message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index']; + $message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); } $template->assign_vars(array( @@ -1160,7 +1160,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">') ); - $message = $message . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index']; + $message = $message . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); } @@ -1676,7 +1676,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid("index.$phpEx") . '">') ); - $message = $lang['Password_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index']; + $message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); message_die(GENERAL_MESSAGE, $message); } |