diff options
Diffstat (limited to 'phpBB/includes/mcp/mcp_notes.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_notes.php | 19 | 
1 files changed, 14 insertions, 5 deletions
| diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 465ee63a98..4fd17ccf48 100644 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -74,7 +74,7 @@ class mcp_notes  	*/  	function mcp_notes_user_view($action)  	{ -		global $phpEx, $phpbb_root_path, $config; +		global $phpEx, $phpbb_root_path, $config, $phpbb_log;  		global $template, $db, $user, $auth, $phpbb_container;  		$user_id = request_var('u', 0); @@ -83,6 +83,8 @@ class mcp_notes  		$st	= request_var('st', 0);  		$sk	= request_var('sk', 'b');  		$sd	= request_var('sd', 'd'); + +		/* @var $pagination \phpbb\pagination */  		$pagination = $phpbb_container->get('pagination');  		add_form_key('mcp_notes'); @@ -142,7 +144,7 @@ class mcp_notes  							$where_sql";  					$db->sql_query($sql); -					add_log('admin', 'LOG_CLEAR_USER', $userrow['username']); +					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CLEAR_USER', false, array($userrow['username']));  					$msg = ($deletemark) ? 'MARKED_NOTES_DELETED' : 'ALL_NOTES_DELETED';  				} @@ -160,10 +162,17 @@ class mcp_notes  		{  			if (check_form_key('mcp_notes'))  			{ -				add_log('admin', 'LOG_USER_FEEDBACK', $userrow['username']); -				add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $userrow['username']); +				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_FEEDBACK', false, array($userrow['username'])); +				$phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_USER_FEEDBACK', false, array( +					'forum_id' => 0, +					'topic_id' => 0, +					$userrow['username'] +				)); +				$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_GENERAL', false, array( +					'reportee_id' => $user_id, +					$usernote +				)); -				add_log('user', $user_id, 'LOG_USER_GENERAL', $usernote);  				$msg = $user->lang['USER_FEEDBACK_ADDED'];  			}  			else | 
