|
From: Paul S. O. <ps...@us...> - 2001-11-21 15:56:16
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv15794
Modified Files:
privmsg.php
Log Message:
PM popup and icon are finally in place
Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** privmsg.php 2001/11/19 23:56:00 1.52
--- privmsg.php 2001/11/21 15:56:12 1.53
***************
*** 119,124 ****
// Start main
//
! if( $mode == "read" )
{
if( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
--- 119,163 ----
// Start main
//
! if( $mode == "newpm" )
{
+ $gen_simple_header = TRUE;
+
+ $page_title = $lang['Private_Messaging'];
+ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+
+ $template->set_filenames(array(
+ "body" => "privmsgs_popup.tpl")
+ );
+
+ if( $userdata['session_logged_in'] )
+ {
+ if( $userdata['user_new_privmsg'] )
+ {
+ $l_new_message = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['You_new_pm'] : $lang['You_new_pms'];
+ }
+ else
+ {
+ $l_new_message = $lang['You_no_new_pm'];
+ }
+
+ $l_new_message .= "<br /><br />" . sprintf($lang['Click_view_privmsg'], "<a href=\"" . append_sid("privmsg.".$phpEx."?folder=inbox") . "\" onClick=\"jump_to_inbox();return false;\" target=\"_new\">", "</a>");
+ }
+ else
+ {
+ $l_new_message = $lang['Login_check_pm'];
+ }
+
+ $template->assign_vars(array(
+ "L_CLOSE_WINDOW" => $lang['Close_window'],
+ "L_MESSAGE" => $l_new_message)
+ );
+
+ $template->pparse("body");
+
+ include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+
+ }
+ else if( $mode == "read" )
+ {
if( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
***************
*** 932,936 ****
if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql);
}
--- 971,975 ----
if( !$result = $db->sql_query($sql) )
{
! message_die(GENERAL_MESSAGE, $lang['No_such_user']);
}
|