diff options
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/info/mcp_pm_reports.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 50 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 6 | 
10 files changed, 49 insertions, 37 deletions
diff --git a/phpBB/includes/mcp/info/mcp_pm_reports.php b/phpBB/includes/mcp/info/mcp_pm_reports.php index 07dc564b19..d530a917cb 100644 --- a/phpBB/includes/mcp/info/mcp_pm_reports.php +++ b/phpBB/includes/mcp/info/mcp_pm_reports.php @@ -19,7 +19,7 @@ class mcp_pm_reports_info  			'title'		=> 'MCP_PM_REPORTS',  			'version'	=> '1.0.0',  			'modes'		=> array( -				'pm_reports'			=> array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), +				'pm_reports'		=> array('title' => 'MCP_PM_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),  				'pm_reports_closed'	=> array('title' => 'MCP_PM_REPORTS_CLOSED', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),  				'pm_report_details'	=> array('title' => 'MCP_PM_REPORT_DETAILS', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')),  			), diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index d3bc336293..925d0878fc 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -171,7 +171,7 @@ class mcp_ban  				case 'user':  					$pre_fill = (string) $db->sql_fetchfield('username');  				break; -				 +  				case 'ip':  					$pre_fill = (string) $db->sql_fetchfield('user_ip');  				break; diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 7c1c61dae7..b4f7f4d70a 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -224,7 +224,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)  		$topic_title = censor_text($row['topic_title']); -		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false; +		$topic_unapproved = (($row['topic_visibility'] == ITEM_UNAPPROVED || $row['topic_visibility'] == ITEM_REAPPROVE)  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;  		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;  		$topic_deleted = $row['topic_visibility'] == ITEM_DELETED;  		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&t=' . $row['topic_id'] : ''; @@ -302,7 +302,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)  		* @event core.mcp_view_forum_modify_topicrow  		* @var	array	row			Array with topic data  		* @var	array	topic_row	Template array with topic data -		* @since 3.1-A1 +		* @since 3.1.0-a1  		*/  		$vars = array('row', 'topic_row');  		extract($phpbb_dispatcher->trigger_event('core.mcp_view_forum_modify_topicrow', compact($vars))); diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index 44cab5d910..aee43c471d 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -39,7 +39,7 @@ function mcp_front_view($id, $mode, $action)  			$sql = 'SELECT COUNT(post_id) AS total  				FROM ' . POSTS_TABLE . '  				WHERE ' . $db->sql_in_set('forum_id', $forum_list) . ' -					AND post_visibility = ' . ITEM_UNAPPROVED; +					AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE));  			$result = $db->sql_query($sql);  			$total = (int) $db->sql_fetchfield('total');  			$db->sql_freeresult($result); @@ -60,7 +60,7 @@ function mcp_front_view($id, $mode, $action)  				$sql = 'SELECT post_id  					FROM ' . POSTS_TABLE . '  					WHERE ' . $db->sql_in_set('forum_id', $forum_list) . ' -						AND post_visibility = ' . ITEM_UNAPPROVED . ' +						AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . '  					ORDER BY post_time DESC';  				$result = $db->sql_query_limit($sql, 5); diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 55440bf192..6b2e9266b3 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -493,7 +493,7 @@ function mcp_move_topic($topic_ids)  			{  				$topics_moved++;  			} -			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED) +			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE)  			{  				$topics_moved_unapproved++;  			} @@ -1230,6 +1230,7 @@ function mcp_fork_topic($topic_ids)  					$total_topics++;  				break;  				case ITEM_UNAPPROVED: +				case ITEM_REAPPROVE:  					$total_topics_unapproved++;  				break;  				case ITEM_DELETED: @@ -1316,6 +1317,7 @@ function mcp_fork_topic($topic_ids)  						$total_posts++;  					break;  					case ITEM_UNAPPROVED: +					case ITEM_REAPPROVE:  						$total_posts_unapproved++;  					break;  					case ITEM_DELETED: diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 008984b1c3..b0a06dd6ce 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -170,7 +170,7 @@ class mcp_pm_reports  					'U_MCP_USER_NOTES'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $pm_info['author_id']),  					'U_MCP_WARN_REPORTER'		=> ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '',  					'U_MCP_WARN_USER'			=> ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $pm_info['author_id']) : '', -					 +  					'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),  					'MINI_POST_IMG'			=> $user->img('icon_post_target', 'POST'), @@ -304,7 +304,7 @@ class mcp_pm_reports  				$template->assign_vars(array(  					'L_EXPLAIN'				=> ($mode == 'pm_reports') ? $user->lang['MCP_PM_REPORTS_OPEN_EXPLAIN'] : $user->lang['MCP_PM_REPORTS_CLOSED_EXPLAIN'],  					'L_TITLE'				=> ($mode == 'pm_reports') ? $user->lang['MCP_PM_REPORTS_OPEN'] : $user->lang['MCP_PM_REPORTS_CLOSED'], -					 +  					'S_PM'					=> true,  					'S_MCP_ACTION'			=> $this->u_action,  					'S_CLOSED'				=> ($mode == 'pm_reports_closed') ? true : false, diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index e2d6cd15c9..5925575577 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -203,7 +203,7 @@ function mcp_post_details($id, $mode, $action)  		'S_CAN_DELETE_POST'		=> $auth->acl_get('m_delete', $post_info['forum_id']),  		'S_POST_REPORTED'		=> ($post_info['post_reported']) ? true : false, -		'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED) ? true : false, +		'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED || $post_info['post_visibility'] == ITEM_REAPPROVE) ? true : false,  		'S_POST_DELETED'		=> ($post_info['post_visibility'] == ITEM_DELETED) ? true : false,  		'S_POST_LOCKED'			=> ($post_info['post_edit_locked']) ? true : false,  		'S_USER_NOTES'			=> true, diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 8d998919e5..a71bc997e9 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -115,10 +115,10 @@ class mcp_queue  				if (!empty($topic_id_list))  				{ -					$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : ITEM_UNAPPROVED; +					$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : array(ITEM_UNAPPROVED, ITEM_REAPPROVE);  					$sql = 'SELECT post_id  						FROM ' . POSTS_TABLE . ' -						WHERE post_visibility = ' . $post_visibility . ' +						WHERE ' . $db->sql_in_set('post_visibility', $post_visibility) . '  							AND ' . $db->sql_in_set('topic_id', $topic_id_list);  					$result = $db->sql_query($sql); @@ -281,7 +281,7 @@ class mcp_queue  					'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f=$forum_id"),  					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),  					'S_POST_REPORTED'		=> $post_info['post_reported'], -					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED), +					'S_POST_UNAPPROVED'		=> $post_info['post_visibility'] == ITEM_UNAPPROVED || $post_info['post_visibility'] == ITEM_REAPPROVE,  					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],  					'S_USER_NOTES'			=> true,  					'S_POST_DELETED'		=> ($post_info['post_visibility'] == ITEM_DELETED), @@ -298,7 +298,6 @@ class mcp_queue  					'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'), -  					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&mode=unapproved_topics' : '&mode=unapproved_posts')) . '&start=' . $start . '">', '</a>'),  					'RETURN_POST'			=> sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),  					'RETURN_TOPIC_SIMPLE'	=> sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'), @@ -331,7 +330,7 @@ class mcp_queue  				$m_perm = 'm_approve';  				$is_topics = ($mode == 'unapproved_topics' || $mode == 'deleted_topics') ? true : false;  				$is_restore = ($mode == 'deleted_posts' || $mode == 'deleted_topics') ? true : false; -				$visibility_const = (!$is_restore) ? ITEM_UNAPPROVED : ITEM_DELETED; +				$visibility_const = (!$is_restore) ? array(ITEM_UNAPPROVED, ITEM_REAPPROVE) : ITEM_DELETED;  				$user->add_lang(array('viewtopic', 'viewforum')); @@ -419,7 +418,7 @@ class mcp_queue  					$sql = 'SELECT p.post_id  						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '  						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . ' -							AND p.post_visibility = ' . $visibility_const . ' +							AND ' . $db->sql_in_set('p.post_visibility', $visibility_const) . '  							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '  							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "  							AND t.topic_id = p.topic_id @@ -472,7 +471,7 @@ class mcp_queue  					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour  						FROM ' . TOPICS_TABLE . ' t  						WHERE ' . $db->sql_in_set('forum_id', $forum_list) . ' -							AND topic_visibility = ' . $visibility_const . " +							AND  ' . $db->sql_in_set('topic_visibility', $visibility_const) . "  							AND topic_delete_user <> 0  							$limit_time_sql  						ORDER BY $sort_order_sql"; @@ -660,11 +659,18 @@ class mcp_queue  					}  					$phpbb_notifications->delete_notifications('post_in_queue', $post_id); -					$phpbb_notifications->add_notifications(array( -						'quote', -						'bookmark', -						'post', -					), $post_data); +					// Only add notifications, if we are not reapproving post +					// When the topic was already approved, but was edited and +					// now needs re-approval, we don't want to notify the users +					// again. +					if ($post_data['post_visibility'] == ITEM_UNAPPROVED) +					{ +						$phpbb_notifications->add_notifications(array( +							'quote', +							'bookmark', +							'post', +						), $post_data); +					}  					$phpbb_notifications->mark_notifications_read(array(  						'quote', @@ -832,10 +838,18 @@ class mcp_queue  					));  					$phpbb_notifications->delete_notifications('topic_in_queue', $topic_id); -					$phpbb_notifications->add_notifications(array( -						'quote', -						'topic', -					), $topic_data); + +					// Only add notifications, if we are not reapproving post +					// When the topic was already approved, but was edited and +					// now needs re-approval, we don't want to notify the users +					// again. +					if ($topic_data['topic_visibility'] == ITEM_UNAPPROVED) +					{ +						$phpbb_notifications->add_notifications(array( +							'quote', +							'topic', +						), $topic_data); +					}  					$phpbb_notifications->mark_notifications_read('quote', $topic_data['post_id'], $user->data['user_id']);  					$phpbb_notifications->mark_notifications_read('topic', $topic_id, $user->data['user_id']); @@ -1060,7 +1074,7 @@ class mcp_queue  					if ($is_disapproving)  					{  						$l_log_message = ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED'; -						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $disapprove_reason); +						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $disapprove_reason, $log_data['post_username']);  					}  					else  					{ @@ -1126,7 +1140,6 @@ class mcp_queue  						$post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : '';  					} -  					if ($disapprove_all_posts_in_topic && $topic_information[$topic_id]['topic_posts_unapproved'] == 1)  					{  						// If there is only 1 post when disapproving the topic, @@ -1144,7 +1157,6 @@ class mcp_queue  			unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang); -  			if ($num_disapproved_topics)  			{  				$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC' : 'TOPICS'; diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 8026e071cd..5681b83212 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -98,10 +98,10 @@ class mcp_reports  				$post_id = $report['post_id'];  				$report_id = $report['report_id']; -				 +  				$parse_post_flags = $report['reported_post_enable_bbcode'] ? OPTION_FLAG_BBCODE : 0;  				$parse_post_flags += $report['reported_post_enable_smilies'] ? OPTION_FLAG_SMILIES : 0; -				$parse_post_flags += $report['reported_post_enable_magic_url'] ? OPTION_FLAG_LINKS : 0;  +				$parse_post_flags += $report['reported_post_enable_magic_url'] ? OPTION_FLAG_LINKS : 0;  				$post_info = get_post_data(array($post_id), 'm_report', true); @@ -144,7 +144,6 @@ class mcp_reports  				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; -  				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));  				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) @@ -187,7 +186,7 @@ class mcp_reports  					'S_CLOSE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id),  					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),  					'S_POST_REPORTED'		=> $post_info['post_reported'], -					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED), +					'S_POST_UNAPPROVED'		=> $post_info['post_visibility'] == ITEM_UNAPPROVED || $post_info['post_visibility'] == ITEM_REAPPROVE,  					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],  					'S_REPORT_CLOSED'		=> $report['report_closed'],  					'S_USER_NOTES'			=> true, @@ -578,7 +577,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)  			}  			$db->sql_query($sql); -  			if (sizeof($close_report_posts))  			{  				if ($pm) diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index cdb88bf2bf..48efa330d4 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -212,7 +212,7 @@ function mcp_topic_view($id, $mode, $action)  			parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count);  		} -		if ($row['post_visibility'] == ITEM_UNAPPROVED) +		if ($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE)  		{  			$has_unapproved_posts = true;  		} @@ -239,7 +239,7 @@ function mcp_topic_view($id, $mode, $action)  			'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),  			'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_report', $topic_info['forum_id'])), -			'S_POST_UNAPPROVED'	=> ($row['post_visibility'] == ITEM_UNAPPROVED && $auth->acl_get('m_approve', $topic_info['forum_id'])), +			'S_POST_UNAPPROVED'	=> (($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE) && $auth->acl_get('m_approve', $topic_info['forum_id'])),  			'S_POST_DELETED'	=> ($row['post_visibility'] == ITEM_DELETED && $auth->acl_get('m_approve', $topic_info['forum_id'])),  			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,  			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false, @@ -462,7 +462,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)  			while ($row = $db->sql_fetchrow($result))  			{  				// If split from selected post (split_beyond), we split the unapproved items too. -				if ($row['post_visibility'] == ITEM_UNAPPROVED && !$auth->acl_get('m_approve', $row['forum_id'])) +				if (($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE) && !$auth->acl_get('m_approve', $row['forum_id']))  				{  //					continue;  				}  | 
