diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-28 00:34:43 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-28 00:34:43 +0000 |
| commit | de4133420a53b7c3187b94e2bfcff1a51444b5cd (patch) | |
| tree | 8eb0d8d4ad7ec595c5c90653aacfe3f448d2e76d /phpBB/includes/usercp_avatar.php | |
| parent | 33e84f8ea0e063a9a7a00fd671e911ec4de13817 (diff) | |
| download | forums-de4133420a53b7c3187b94e2bfcff1a51444b5cd.tar forums-de4133420a53b7c3187b94e2bfcff1a51444b5cd.tar.gz forums-de4133420a53b7c3187b94e2bfcff1a51444b5cd.tar.bz2 forums-de4133420a53b7c3187b94e2bfcff1a51444b5cd.tar.xz forums-de4133420a53b7c3187b94e2bfcff1a51444b5cd.zip | |
Rules and lang changes
git-svn-id: file:///svn/phpbb/trunk@2976 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/usercp_avatar.php')
| -rw-r--r-- | phpBB/includes/usercp_avatar.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/includes/usercp_avatar.php b/phpBB/includes/usercp_avatar.php index 84906954fb..f8042dc62f 100644 --- a/phpBB/includes/usercp_avatar.php +++ b/phpBB/includes/usercp_avatar.php @@ -128,8 +128,8 @@ function user_avatar_upload($mode, $avatar_mode, &$current_avatar, &$current_typ return; } - $avatar_filesize = $file_data1[1]; - $avatar_filetype = $file_data2[1]; + $avatar_filesize = $file_data1[1]; + $avatar_filetype = $file_data2[1]; if ( !$error && $avatar_filesize > 0 && $avatar_filesize < $board_config['avatar_filesize'] ) { @@ -184,7 +184,7 @@ function user_avatar_upload($mode, $avatar_mode, &$current_avatar, &$current_typ if ( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) { - $new_filename = uniqid($user_ip) . $imgtype; + $new_filename = uniqid() . $imgtype; if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' ) { @@ -253,7 +253,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current { if( preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $sub_file) ) { - $avatar_images[$file][$avatar_row_count][$avatar_col_count] = $file . '/' . $sub_file; + $avatar_images[$file][$avatar_row_count][$avatar_col_count] = $file . '/' . $sub_file; $avatar_name[$file][$avatar_row_count][$avatar_col_count] = ucfirst(str_replace("_", " ", preg_replace('/^(.*)\..*$/', '\1', $sub_file))); $avatar_col_count++; @@ -299,7 +299,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current for($j = 0; $j < count($avatar_images[$category][$i]); $j++) { $template->assign_block_vars('avatar_row.avatar_column', array( - "AVATAR_IMAGE" => $board_config['avatar_gallery_path'] . '/' . $avatar_images[$category][$i][$j], + "AVATAR_IMAGE" => $board_config['avatar_gallery_path'] . '/' . $avatar_images[$category][$i][$j], "AVATAR_NAME" => $avatar_name[$category][$i][$j]) ); @@ -317,16 +317,16 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current { $s_hidden_vars .= '<input type="hidden" name="' . $params[$i] . '" value="' . str_replace('"', '"', $$params[$i]) . '" />'; } - + $template->assign_vars(array( - 'L_AVATAR_GALLERY' => $lang['Avatar_gallery'], - 'L_SELECT_AVATAR' => $lang['Select_avatar'], - 'L_RETURN_PROFILE' => $lang['Return_profile'], - 'L_CATEGORY' => $lang['Select_category'], - - 'S_CATEGORY_SELECT' => $s_categories, - 'S_COLSPAN' => $s_colspan, - 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), + 'L_AVATAR_GALLERY' => $lang['Avatar_gallery'], + 'L_SELECT_AVATAR' => $lang['Select_avatar'], + 'L_RETURN_PROFILE' => $lang['Return_profile'], + 'L_CATEGORY' => $lang['Select_category'], + + 'S_CATEGORY_SELECT' => $s_categories, + 'S_COLSPAN' => $s_colspan, + 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), 'S_HIDDEN_FIELDS' => $s_hidden_vars) ); |