|
From: Paul S. O. <ps...@us...> - 2001-11-19 01:05:02
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv26508/includes
Modified Files:
page_header.php
Log Message:
Altered storage of private message info
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** page_header.php 2001/11/18 15:00:54 1.65
--- page_header.php 2001/11/19 01:04:58 1.66
***************
*** 158,180 ****
if( $userdata['session_logged_in'] )
{
! $sql = "SELECT COUNT(privmsgs_type) AS new_messages
! FROM " . PRIVMSGS_TABLE . "
! WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
! AND privmsgs_to_userid = " . $userdata['user_id'];
! if( !$result_pm = $db->sql_query($sql) )
{
! message_die(GENERAL_MESSAGE, "Couldn't obtain user/online information.", "", __LINE__, __FILE__, $sql);
! }
! if( $pm_result = $db->sql_fetchrow($result_pm) )
! {
! $new_pm_messages = $pm_result['new_messages'];
! $l_message_new = ( $new_pm_messages == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
! $l_privmsgs_text = sprintf($l_message_new, $new_pm_messages);
}
else
{
$l_privmsgs_text = $lang['No_new_pm'];
}
}
--- 158,198 ----
if( $userdata['session_logged_in'] )
{
! if( $userdata['user_new_privmsg'] )
{
! $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
! $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']);
! if( $userdata['user_last_privmsg'] > $userdata['session_start'] )
! {
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_last_privmsg = " . $userdata['session_start'] . "
! WHERE user_id = " . $userdata['user_id'];
! if( !$status = $db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Could not update private message new/read time for user.", "", __LINE__, __FILE__, $sql);
! }
! $s_privmsg_new = true;
! }
! else
! {
! $s_privmsg_new = 0;
! }
}
else
{
$l_privmsgs_text = $lang['No_new_pm'];
+
+ $s_privmsg_new = 0;
+ }
+
+ if( $userdata['user_unread_privmsg'] )
+ {
+ $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
+ $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']);
+ }
+ else
+ {
+ $l_privmsgs_text_unread = $lang['No_unread_pm'];
}
}
***************
*** 182,185 ****
--- 200,205 ----
{
$l_privmsgs_text = $lang['Login_check_pm'];
+ $l_privmsgs_text_unread = "";
+ $s_privmsg_new = 0;
}
***************
*** 196,200 ****
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
! "PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
--- 216,221 ----
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
! "PRIVATE_MESSAGE_INFO_UNREAD" => $l_privmsgs_text_unread,
! "PRIVATE_MESSAGE_NEW_FLAG" => $s_privmsg_new,
"LAST_VISIT_DATE" => sprintf($lang['You_last_visit'], $s_last_visit),
|