Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 profile.php,1.124,1.125
|
From: Paul S. O. <ps...@us...> - 2001-11-05 01:24:29
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11638
Modified Files:
profile.php
Log Message:
Added check for avatar type before attempting deletion
Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -r1.124 -r1.125
*** profile.php 2001/11/03 19:33:33 1.124
--- profile.php 2001/11/05 01:24:26 1.125
***************
*** 427,431 ****
if( $mode == "register" && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
! if(!isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']))
{
//
--- 427,431 ----
if( $mode == "register" && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
! if( !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) )
{
//
***************
*** 527,531 ****
if($mode == "editprofile")
{
! if($user_id != $userdata['user_id'])
{
$error = TRUE;
--- 527,531 ----
if($mode == "editprofile")
{
! if( $user_id != $userdata['user_id'] )
{
$error = TRUE;
***************
*** 560,564 ****
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 560,564 ----
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 592,596 ****
// Do a ban check on this email address
//
! if($email != $userdata['user_email'] || $mode == "register")
{
if( !validate_email($email) )
--- 592,596 ----
// Do a ban check on this email address
//
! if( $email != $userdata['user_email'] || $mode == "register" )
{
if( !validate_email($email) )
***************
*** 606,617 ****
$username_sql = "";
! if($board_config['allow_namechange'] || $mode == "register")
{
! if($username != $userdata['username'] || $mode == "register")
{
! if(!validate_username($username))
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 606,617 ----
$username_sql = "";
! if( $board_config['allow_namechange'] || $mode == "register" )
{
! if( $username != $userdata['username'] || $mode == "register" )
{
! if( !validate_username($username) )
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 631,635 ****
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 631,635 ----
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 644,648 ****
}
! if($mode == "register")
{
//
--- 644,648 ----
}
! if( $mode == "register" )
{
//
***************
*** 653,657 ****
$sql = "SELECT MAX(user_id) AS total
FROM " . USERS_TABLE;
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 653,657 ----
$sql = "SELECT MAX(user_id) AS total
FROM " . USERS_TABLE;
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 668,672 ****
$sql = "SELECT MAX(group_id) AS total
FROM " . GROUPS_TABLE;
! if($result = $db->sql_query($sql))
{
$row = $db->sql_fetchrow($result);
--- 668,672 ----
$sql = "SELECT MAX(group_id) AS total
FROM " . GROUPS_TABLE;
! if( $result = $db->sql_query($sql) )
{
$row = $db->sql_fetchrow($result);
***************
*** 692,696 ****
{
$error = TRUE;
! if(isset($error_msg))
{
$error_msg .= "<br />";
--- 692,696 ----
{
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 701,707 ****
if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
{
! if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
{
! @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
}
$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
--- 701,710 ----
if( isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile" )
{
! if( $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
{
! if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
! {
! @unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
! }
}
$avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
***************
*** 709,715 ****
else if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
{
! if(file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name))
{
! if($user_avatar_size <= $board_config['avatar_filesize'] && $avatar_size > 0)
{
$error_type = false;
--- 712,718 ----
else if( $user_avatar_loc != "" && $board_config['allow_avatar_upload'] )
{
! if( file_exists($user_avatar_loc) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) )
{
! if( $user_avatar_size <= $board_config['avatar_filesize'] && $avatar_size > 0)
{
$error_type = false;
***************
*** 721,725 ****
$user_avatar_filetype = $user_avatar_filetype[1];
! switch($user_avatar_filetype)
{
case "jpeg":
--- 724,728 ----
$user_avatar_filetype = $user_avatar_filetype[1];
! switch( $user_avatar_filetype )
{
case "jpeg":
***************
*** 739,748 ****
}
! if(!$error)
{
list($width, $height) = @getimagesize($user_avatar_loc);
! if( $width <= $board_config['avatar_max_width'] &&
! $height <= $board_config['avatar_max_height'] )
{
$user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
--- 742,750 ----
}
! if( !$error )
{
list($width, $height) = @getimagesize($user_avatar_loc);
! if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
$user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
***************
*** 750,754 ****
$avatar_filename = $user_id . $imgtype;
! if($mode == "editprofile")
{
if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
--- 752,756 ----
$avatar_filename = $user_id . $imgtype;
! if( $mode == "editprofile" && $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "" )
{
if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
***************
*** 764,768 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
--- 766,770 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
***************
*** 772,776 ****
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
--- 774,778 ----
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
***************
*** 778,782 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_filetype'] : $lang['Avatar_filetype'];
}
}
--- 780,784 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_filetype'] : $lang['Avatar_filetype'];
}
}
***************
*** 795,799 ****
$fsock = @fsockopen($url_ary[2], $port, $errno, $errstr);
! if($fsock)
{
$base_get = "/" . $url_ary[4];
--- 797,801 ----
$fsock = @fsockopen($url_ary[2], $port, $errno, $errstr);
! if( $fsock )
{
$base_get = "/" . $url_ary[4];
***************
*** 807,811 ****
unset($avatar_data);
! while(!@feof($fsock))
{
$avatar_data .= @fread($fsock, $board_config['avatar_filesize']);
--- 809,813 ----
unset($avatar_data);
! while( !@feof($fsock) )
{
$avatar_data .= @fread($fsock, $board_config['avatar_filesize']);
***************
*** 813,822 ****
@fclose($fsock);
! if(preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data))
{
$file_size = $file_data[1];
$file_type = $file_data[2];
! switch($file_type)
{
case "jpeg":
--- 815,824 ----
@fclose($fsock);
! if( preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data) )
{
$file_size = $file_data[1];
$file_type = $file_data[2];
! switch( $file_type )
{
case "jpeg":
***************
*** 836,840 ****
}
! if(!$error && $file_size > 0 && $file_size < $board_config['avatar_filesize'])
{
$avatar_data = substr($avatar_data, strlen($avatar_data) - $file_size, $file_size);
--- 838,842 ----
}
! if( !$error && $file_size > 0 && $file_size < $board_config['avatar_filesize'] )
{
$avatar_data = substr($avatar_data, strlen($avatar_data) - $file_size, $file_size);
***************
*** 845,849 ****
@fclose($fptr);
! if($bytes_written == $file_size)
{
list($width, $height) = @getimagesize($tmp_filename);
--- 847,851 ----
@fclose($fptr);
! if( $bytes_written == $file_size )
{
list($width, $height) = @getimagesize($tmp_filename);
***************
*** 851,861 ****
if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
$avatar_filename = $user_id . $imgtype;
! if($mode == "editprofile")
{
! if(file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']))
{
@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
--- 853,863 ----
if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] )
{
! $user_id = ( $mode == "register" ) ? $new_user_id : $userdata['user_id'];
$avatar_filename = $user_id . $imgtype;
! if( $mode == "editprofile" && $userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $userdata['user_avatar'] != "")
{
! if( file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
{
@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
***************
*** 874,878 ****
@unlink($tmp_filename);
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
--- 876,880 ----
@unlink($tmp_filename);
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Avatar_imagesize'] : $lang['Avatar_imagesize'];
}
}
***************
*** 893,897 ****
//
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['File_no_data'] : $lang['File_no_data'];
}
}
--- 895,899 ----
//
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['File_no_data'] : $lang['File_no_data'];
}
}
***************
*** 902,906 ****
//
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['No_connection_URL'] : $lang['No_connection_URL'];
}
}
--- 904,908 ----
//
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['No_connection_URL'] : $lang['No_connection_URL'];
}
}
***************
*** 908,912 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Incomplete_URL'] : $lang['Incomplete_URL'];
}
}
--- 910,914 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Incomplete_URL'] : $lang['Incomplete_URL'];
}
}
***************
*** 915,919 ****
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
--- 917,921 ----
$error = true;
$error_filesize = $lang['Avatar_filesize'] . " " . round($board_config['avatar_filesize'] / 1024) . " " . $lang['kB'];
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $error_filesize : $error_filesize;
}
}
***************
*** 935,939 ****
{
$error = true;
! $error_msg = (!empty($error_msg)) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
}
}
--- 937,941 ----
{
$error = true;
! $error_msg = ( !empty($error_msg) ) ? $error_msg . "<br />" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];
}
}
***************
*** 948,956 ****
}
! if(!$error)
{
! if($mode == "editprofile")
{
! if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN)
{
$user_active = 0;
--- 950,958 ----
}
! if( !$error )
{
! if( $mode == "editprofile" )
{
! if( $email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN )
{
$user_active = 0;
***************
*** 976,980 ****
WHERE user_id = $user_id";
! if($result = $db->sql_query($sql))
{
if( $user_active == 0 )
--- 978,982 ----
WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
{
if( $user_active == 0 )
***************
*** 1058,1062 ****
}
! if($result = $db->sql_query($sql, BEGIN_TRANSACTION))
{
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
--- 1060,1064 ----
}
! if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) )
{
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator)
***************
*** 1102,1106 ****
$emailer->extra_headers($email_headers);
! if($coppa)
{
$emailer->assign_vars(array(
--- 1104,1108 ----
$emailer->extra_headers($email_headers);
! if( $coppa )
{
$emailer->assign_vars(array(
|
