[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] fudforum/setup/base/src register.php.t, 1.1.1.1.2.1
From: |
ceb |
Subject: |
[Phpgroupware-cvs] fudforum/setup/base/src register.php.t, 1.1.1.1.2.1 |
Date: |
Sat, 1 Oct 2005 00:44:00 +0200 |
Update of fudforum/setup/base/src
Modified Files:
Branch: Version-0_9_16-branch
register.php.t lines: +28 -29
Log Message:
fix for CAN-2005-2781
====================================================
Index: fudforum/setup/base/src/register.php.t
diff -u fudforum/setup/base/src/register.php.t:1.1
fudforum/setup/base/src/register.php.t:1.1.1.1.2.1
--- fudforum/setup/base/src/register.php.t:1.1 Sat Nov 1 22:57:21 2003
+++ fudforum/setup/base/src/register.php.t Fri Sep 30 22:44:30 2005
@@ -202,35 +202,34 @@
if (!($FUD_OPT_1 & 8) && (address@hidden($avatar_arr['file']) ||
empty($avatar_arr['leave']))) {
/* hack attempt for URL avatar */
$avatar_arr = null;
- } else if (($FUD_OPT_1 & 8) && isset($_FILES['avatar_upload']) &&
$_FILES['avatar_upload']['size'] > 0) { /* new upload */
- if ($_FILES['avatar_upload']['size'] >=
$CUSTOM_AVATAR_MAX_SIZE) {
- set_err('avatar', '{TEMPLATE:
register_err_avatartobig}');
- } else {
- /* [user_id].[file_extension]_'random data' */
- $file_name = $uent->id .
strrchr($_FILES['avatar_upload']['name'], '.') . '_';
- $tmp_name =
safe_tmp_copy($_FILES['avatar_upload']['tmp_name'], 0, $file_name);
-
- if (!($img_info = @getimagesize($TMP . $tmp_name))) {
- set_err('avatar', '{TEMPLATE:
register_err_not_valid_img}');
- unlink($TMP . $tmp_name);
- }
-
- list($max_w, $max_y) = explode('x',
$CUSTOM_AVATAR_MAX_DIM);
- if ($img_info[2] > ($FUD_OPT_1 & 64 ? 4 : 3)) {
- set_err('avatar', '{TEMPLATE:
register_err_avatarnotallowed}');
- unlink($TMP . $tmp_name);
- } else if ($img_info[0] >$max_w || $img_info[1]
>$max_y) {
- set_err('avatar', '{TEMPLATE:
register_err_avatardimtobig}');
- unlink($TMP . $tmp_name);
+ } else if (($FUD_OPT_1 & 8) && isset($_FILES['avatar_upload'])
&& $_FILES['avatar_upload']['size'] > 0) { /* new upload */
+ if ($_FILES['avatar_upload']['size'] >=
$CUSTOM_AVATAR_MAX_SIZE) {
+ set_err('avatar', '{TEMPLATE:
register_err_avatartobig}');
} else {
- /* remove old uploaded file, if one exists & is
not in DB */
- if (empty($avatar_arr['leave']) &&
@file_exists($avatar_arr['file'])) {
- @unlink($TMP . $avatar_arr['file']);
- }
+ $ext = array(1=>'gif', 2=>'jpg', 3=>'png',
4=>'swf');
+ if (!($img_info =
@getimagesize($_FILES['avatar_upload']['tmp_name']))) {
+ set_err('avatar', '{TEMPLATE:
register_err_not_valid_img}');
+ }
+ /* [user_id].[file_extension]_'random data' */
+ $file_name = $uent->id . '.' .
$ext[$img_info[2]] . '_';
+ $tmp_name =
safe_tmp_copy($_FILES['avatar_upload']['tmp_name'], 0, $file_name);
+
+ list($max_w, $max_y) = explode('x',
$CUSTOM_AVATAR_MAX_DIM);
+ if ($img_info[2] > ($FUD_OPT_1 & 64 ? 4 : 3)) {
+ set_err('avatar', '{TEMPLATE:
register_err_avatarnotallowed}');
+ unlink($TMP . $tmp_name);
+ } else if ($img_info[0] >$max_w || $img_info[1]
>$max_y) {
+ set_err('avatar', '{TEMPLATE:
register_err_avatardimtobig}');
+ unlink($TMP . $tmp_name);
+ } else {
+ /* remove old uploaded file, if one
exists & is not in DB */
+ if (empty($avatar_arr['leave']) &&
@file_exists($avatar_arr['file'])) {
+ @unlink($TMP .
$avatar_arr['file']);
+ }
- $avatar_arr['file'] = $tmp_name;
- $avatar_arr['del'] = 0;
- $avatar_arr['leave'] = 0;
+ $avatar_arr['file'] = $tmp_name;
+ $avatar_arr['del'] = 0;
+ $avatar_arr['leave'] = 0;
}
}
}
@@ -582,4 +581,4 @@
/*{POST_PAGE_PHP_CODE}*/
?>
-{TEMPLATE: REGISTER_PAGE}
\ No newline at end of file
+{TEMPLATE: REGISTER_PAGE}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] fudforum/setup/base/src register.php.t, 1.1.1.1.2.1,
ceb <=