[Phpbb-checkins] r10076 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html posting.php viewtopic.php

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

Author: acydburn
Date: Mon Aug 31 13:29:45 2009
New Revision: 10076

Log:
Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/posting.php
    branches/phpBB-3_0_0/phpBB/viewtopic.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Mon Aug 31 13:29:45 2009
***************
*** 201,206 ****
--- 201,207 ----
  		<li>[Fix] Sort private messages by message time and not message id. (Bug #50015)</li>
  		<li>[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)</li>
  		<li>[Fix] Only show &quot;Add friend&quot; and &quot;Add foe&quot; links if the specific module is enabled. (Bug #50475)</li>
+ 		<li>[Fix] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/posting.php (original)
--- branches/phpBB-3_0_0/phpBB/posting.php Mon Aug 31 13:29:45 2009
***************
*** 1433,1439 ****
  	'S_EDIT_REASON'				=> ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
  	'S_DISPLAY_USERNAME'		=> (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
  	'S_SHOW_TOPIC_ICONS'		=> $s_topic_icons,
! 	'S_DELETE_ALLOWED'			=> ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
  	'S_BBCODE_ALLOWED'			=> $bbcode_status,
  	'S_BBCODE_CHECKED'			=> ($bbcode_checked) ? ' checked="checked"' : '',
  	'S_SMILIES_ALLOWED'			=> $smilies_status,
--- 1433,1439 ----
  	'S_EDIT_REASON'				=> ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
  	'S_DISPLAY_USERNAME'		=> (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false,
  	'S_SHOW_TOPIC_ICONS'		=> $s_topic_icons,
! 	'S_DELETE_ALLOWED'			=> ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked']) || $auth->acl_get('m_delete', $forum_id))) ? true : false,
  	'S_BBCODE_ALLOWED'			=> $bbcode_status,
  	'S_BBCODE_CHECKED'			=> ($bbcode_checked) ? ' checked="checked"' : '',
  	'S_SMILIES_ALLOWED'			=> $smilies_status,
***************
*** 1545,1551 ****
  	global $phpbb_root_path, $phpEx;
  
  	// If moderator removing post or user itself removing post, present a confirmation screen
! 	if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])))
  	{
  		$s_hidden_fields = build_hidden_fields(array(
  			'p'		=> $post_id,
--- 1545,1551 ----
  	global $phpbb_root_path, $phpEx;
  
  	// If moderator removing post or user itself removing post, present a confirmation screen
! 	if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked']))
  	{
  		$s_hidden_fields = build_hidden_fields(array(
  			'p'		=> $post_id,

Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Mon Aug 31 13:29:45 2009
***************
*** 1465,1470 ****
--- 1465,1484 ----
  		$s_first_unread = $first_unread = true;
  	}
  
+ 	$edit_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_edit', $forum_id) || (
+ 		$user->data['user_id'] == $poster_id &&
+ 		$auth->acl_get('f_edit', $forum_id) &&
+ 		!$row['post_edit_locked'] &&
+ 		($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])
+ 	)));
+ 
+ 	$delete_allowed = ($user->data['is_registered'] && ($auth->acl_get('m_delete', $forum_id) || (
+ 		$user->data['user_id'] == $poster_id &&
+ 		$auth->acl_get('f_delete', $forum_id) &&
+ 		$topic_data['topic_last_post_id'] == $row['post_id'] &&
+ 		// we do not want to allowe removal of the last post if a moderator locked it!
+ 		!$row['post_edit_locked']
+ 	)));
  
  	//
  	$postrow = array(
***************
*** 1499,1508 ****
  		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
  		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
  
! 		'U_EDIT'			=> (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : ''),
  		'U_QUOTE'			=> ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
  		'U_INFO'			=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, $user->session_id) : '',
! 		'U_DELETE'			=> (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && !$row['post_edit_locked'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : ''),
  
  		'U_PROFILE'		=> $user_cache[$poster_id]['profile'],
  		'U_SEARCH'		=> $user_cache[$poster_id]['search'],
--- 1513,1522 ----
  		'ONLINE_IMG'			=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')),
  		'S_ONLINE'				=> ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false),
  
! 		'U_EDIT'			=> ($edit_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
  		'U_QUOTE'			=> ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
  		'U_INFO'			=> ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=post_details&amp;f=$forum_id&amp;p=" . $row['post_id'], true, $user->session_id) : '',
! 		'U_DELETE'			=> ($delete_allowed) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&amp;f=$forum_id&amp;p={$row['post_id']}") : '',
  
  		'U_PROFILE'		=> $user_cache[$poster_id]['profile'],
  		'U_SEARCH'		=> $user_cache[$poster_id]['search'],