Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.77,1.78
|
From: Paul S. O. <ps...@us...> - 2002-02-13 01:11:38
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv29195
Modified Files:
privmsg.php
Log Message:
Fix bug with attempted deletion of non-existent messages + attempt 1E200 at fixing the incorrect URLs in email messages ...
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** privmsg.php 3 Feb 2002 19:26:07 -0000 1.77
--- privmsg.php 13 Feb 2002 01:11:35 -0000 1.78
***************
*** 672,731 ****
}
! $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . "
! WHERE ";
! $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . "
! WHERE ";
!
! $delete_sql_id = "";
! for($i = 0; $i < count($mark_list); $i++)
{
! if( $delete_sql_id != "" )
{
! $delete_sql_id .= ", ";
}
- $delete_sql_id .= $mark_list[$i];
- }
! $delete_sql .= "privmsgs_id IN ($delete_sql_id)";
! $delete_text_sql .= "privmsgs_text_id IN ($delete_sql_id)";
! $delete_sql .= " AND ";
! switch($folder)
! {
! case 'inbox':
! $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
! break;
! case 'outbox':
! $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
! break;
! case 'sentbox':
! $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
! break;
! case 'savebox':
! $delete_sql .= "( ( privmsgs_from_userid = " . $userdata['user_id'] . "
! AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
! OR ( privmsgs_to_userid = " . $userdata['user_id'] . "
! AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
! break;
! }
! if(!$del_status = $db->sql_query($delete_sql, BEGIN_TRANSACTION))
! {
! message_die(GENERAL_ERROR, "Could not delete private message info.", "", __LINE__, __FILE__, $delete_sql);
! }
! else
! {
! if(!$del_text_status = $db->sql_query($delete_text_sql, END_TRANSACTION))
{
! message_die(GENERAL_ERROR, "Could not delete private message text.", "", __LINE__, __FILE__, $delete_text_sql);
}
}
}
-
}
else if( $save && $mark_list && $folder != "savebox" && $folder != "outbox")
--- 672,733 ----
}
! if ( count($mark_list) )
{
! $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . "
! WHERE ";
! $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . "
! WHERE ";
!
! $delete_sql_id = "";
! for($i = 0; $i < count($mark_list); $i++)
{
! if( $delete_sql_id != "" )
! {
! $delete_sql_id .= ", ";
! }
! $delete_sql_id .= $mark_list[$i];
}
! $delete_sql .= "privmsgs_id IN ($delete_sql_id)";
! $delete_text_sql .= "privmsgs_text_id IN ($delete_sql_id)";
! $delete_sql .= " AND ";
! switch($folder)
! {
! case 'inbox':
! $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND (
! privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )";
! break;
! case 'outbox':
! $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
! break;
! case 'sentbox':
! $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL;
! break;
! case 'savebox':
! $delete_sql .= "( ( privmsgs_from_userid = " . $userdata['user_id'] . "
! AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " )
! OR ( privmsgs_to_userid = " . $userdata['user_id'] . "
! AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )";
! break;
! }
! if(!$del_status = $db->sql_query($delete_sql, BEGIN_TRANSACTION))
! {
! message_die(GENERAL_ERROR, "Could not delete private message info.", "", __LINE__, __FILE__, $delete_sql);
! }
! else
{
! if(!$del_text_status = $db->sql_query($delete_text_sql, END_TRANSACTION))
! {
! message_die(GENERAL_ERROR, "Could not delete private message text.", "", __LINE__, __FILE__, $delete_text_sql);
! }
}
}
}
}
else if( $save && $mark_list && $folder != "savebox" && $folder != "outbox")
***************
*** 752,759 ****
$sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : "";
! if( $db->sql_numrows($result) )
{
- $saved_info = $db->sql_fetchrow($result);
-
if( $saved_info['savebox_items'] >= $board_config['max_savebox_privmsgs'] )
{
--- 754,759 ----
$sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : "";
! if( $saved_info = $db->sql_fetchrow($result) )
{
if( $saved_info['savebox_items'] >= $board_config['max_savebox_privmsgs'] )
{
***************
*** 798,816 ****
}
! $saved_sql_id = "";
! for($i = 0; $i < count($mark_list); $i++)
{
! if( $saved_sql_id != "" )
{
! $saved_sql_id .= ", ";
}
- $saved_sql_id .= $mark_list[$i];
- }
! $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)";
! if( !$save_status = $db->sql_query($saved_sql) )
! {
! message_die(GENERAL_ERROR, "Could not save private messages.", "", __LINE__, __FILE__, $saved_sql);
}
--- 798,819 ----
}
! if ( count($mark_list) )
{
! $saved_sql_id = "";
! for($i = 0; $i < count($mark_list); $i++)
{
! if( $saved_sql_id != "" )
! {
! $saved_sql_id .= ", ";
! }
! $saved_sql_id .= $mark_list[$i];
}
! $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)";
! if( !$save_status = $db->sql_query($saved_sql) )
! {
! message_die(GENERAL_ERROR, "Could not save private messages.", "", __LINE__, __FILE__, $saved_sql);
! }
}
***************
*** 1064,1078 ****
if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
{
! if( isset($HTTP_SERVER_VARS['PHP_SELF']) || isset($HTTP_ENV_VARS['PHP_SELF']) )
{
! $script_name = ( isset($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
}
! else if( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) || isset($HTTP_ENV_VARS['SCRIPT_NAME']) )
{
! $script_name = ( isset($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
}
! else if( isset($HTTP_SERVER_VARS['PATH_INFO']) || isset($HTTP_ENV_VARS['PATH_INFO']) )
{
! $script_name = ( isset($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
}
else
--- 1067,1081 ----
if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) )
{
! if( !empty($HTTP_SERVER_VARS['PHP_SELF']) || !empty($HTTP_ENV_VARS['PHP_SELF']) )
{
! $script_name = ( !empty($HTTP_SERVER_VARS['PHP_SELF']) ) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_ENV_VARS['PHP_SELF'];
}
! else if( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) || !empty($HTTP_ENV_VARS['SCRIPT_NAME']) )
{
! $script_name = ( !empty($HTTP_SERVER_VARS['SCRIPT_NAME']) ) ? $HTTP_SERVER_VARS['SCRIPT_NAME'] : $HTTP_ENV_VARS['SCRIPT_NAME'];
}
! else if( !empty($HTTP_SERVER_VARS['PATH_INFO']) || !empty($HTTP_ENV_VARS['PATH_INFO']) )
{
! $script_name = ( !empty($HTTP_SERVER_VARS['PATH_INFO']) ) ? $HTTP_SERVER_VARS['PATH_INFO'] : $HTTP_ENV_VARS['PATH_INFO'];
}
else
***************
*** 1081,1091 ****
}
! if( isset($HTTP_SERVER_VARS['SERVER_NAME']) || isset($HTTP_ENV_VARS['SERVER_NAME']) )
{
! $server_name = ( isset($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
}
! else if( isset($HTTP_SERVER_VARS['HTTP_HOST']) || isset($HTTP_ENV_VARS['HTTP_HOST']) )
{
! $server_name = ( isset($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
}
else
--- 1084,1098 ----
}
! if ( !empty($board_config['cookie_domain']) )
! {
! $server_name = $board_config['cookie_domain'];
! }
! else if( !empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME']) )
{
! $server_name = ( !empty($HTTP_SERVER_VARS['SERVER_NAME']) ) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME'];
}
! else if( !empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST']) )
{
! $server_name = ( !empty($HTTP_SERVER_VARS['HTTP_HOST']) ) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST'];
}
else
|
