[Phpbb-checkins] CVS: phpBB2/includes/ucp ucp_pm.php,1.15,1.16 ucp_pm_compose.php,1.13,1.14 ucp_pm_viewfolder.php,1.10,1.11 ucp_pm_viewmessage.php,1.13,1.14

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes/ucp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5115/includes/ucp

Modified Files:
	ucp_pm.php ucp_pm_compose.php ucp_pm_viewfolder.php 
	ucp_pm_viewmessage.php 
Log Message:
- fixing some minor bugs...

Index: ucp_pm.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ucp_pm.php	1 May 2005 13:15:47 -0000	1.15
--- ucp_pm.php	19 Aug 2005 16:39:46 -0000	1.16
***************
*** 188,191 ****
--- 188,198 ----
  				}
  
+ 				// Do not allow hold messages to be seen
+ 				if ($folder_id == PRIVMSGS_HOLD_BOX)
+ 				{
+ 					trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
+ 				}
+ 
+ 
  				// First Handle Mark actions and moving messages
  

Index: ucp_pm_compose.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_compose.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ucp_pm_compose.php	19 Aug 2005 10:53:52 -0000	1.13
--- ucp_pm_compose.php	19 Aug 2005 16:39:46 -0000	1.14
***************
*** 433,437 ****
  
  		// Check checksum ... don't re-parse message if the same
! 		$update_message = ($action != 'edit' || $message_md5 != $post_checksum || $status_switch || $preview) ? true : false;
  
  		if ($update_message)
--- 433,437 ----
  
  		// Check checksum ... don't re-parse message if the same
! 		$update_message = ($action != 'edit' || $message_md5 != $message_checksum || $status_switch || $preview) ? true : false;
  
  		if ($update_message)

Index: ucp_pm_viewfolder.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_viewfolder.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ucp_pm_viewfolder.php	1 May 2005 13:15:48 -0000	1.10
--- ucp_pm_viewfolder.php	19 Aug 2005 16:39:46 -0000	1.11
***************
*** 207,210 ****
--- 207,211 ----
  	{
  		$folder_sql = ($type == 'unread') ? 't.unread = 1' : 't.new = 1';
+ 		$folder_sql .= ' AND t.folder_id NOT IN (' . PRIVMSGS_HOLD_BOX . ', ' . PRIVMSGS_NO_BOX . ')';
  		$folder_id = PRIVMSGS_INBOX;
  	}

Index: ucp_pm_viewmessage.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_viewmessage.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ucp_pm_viewmessage.php	1 May 2005 13:15:48 -0000	1.13
--- ucp_pm_viewmessage.php	19 Aug 2005 16:39:46 -0000	1.14
***************
*** 28,31 ****
--- 28,37 ----
  	}
  
+ 	// Do not allow hold messages to be seen
+ 	if ($folder_id == PRIVMSGS_HOLD_BOX)
+ 	{
+ 		trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
+ 	}
+ 
  	// Grab icons
  	$icons = array();