3 files changed, 91 insertions, 24 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 976589bac1..fec32146c1 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1451,6 +1451,18 @@ class acp_users
 						$error[] = 'FORM_INVALID';
 					}
 
+					/**
+					* Validate profile data in ACP before submitting to the database
+					*
+					* @event core.acp_users_profile_validate
+					* @var	bool	submit		Flag indicating if submit button has been pressed
+					* @var	array	data		Array with user profile data
+					* @var	array	error		Array with the form errors
+					* @since 3.1.4-RC1
+					*/
+					$vars = array('submit', 'data', 'error');
+					extract($phpbb_dispatcher->trigger_event('core.acp_users_profile_validate', compact($vars)));
+
 					if (!sizeof($error))
 					{
 						$sql_ary = array(
@@ -1466,9 +1478,10 @@ class acp_users
 						* @var	array	data		Array with user profile data
 						* @var	int		user_id		The user id
 						* @var	array	user_row	Array with the full user data
+						* @var	array	sql_ary		Array with sql data
 						* @since 3.1.4-RC1
 						*/
-						$vars = array('cp_data', 'data', 'user_id', 'user_row');
+						$vars = array('cp_data', 'data', 'user_id', 'user_row', 'sql_ary');
 						extract($phpbb_dispatcher->trigger_event('core.acp_users_profile_modify_sql_ary', compact($vars)));
 
 						$sql = 'UPDATE ' . USERS_TABLE . '
diff --git a/phpBB/includes/functions_mcp.php b/phpBB/includes/functions_mcp.php
index ad3b1a8e28..46e85c5674 100644
--- a/phpBB/includes/functions_mcp.php
+++ b/phpBB/includes/functions_mcp.php
@@ -424,28 +424,6 @@ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by
 					AND t.topic_id = p.topic_id
 					AND t.topic_visibility <> p.post_visibility';
 
-			/**
-			* This event allows you to control the SQL query to retrieve the list of unapproved and deleted posts
-			*
-			* @event core.mcp_sorting_unapproved_deleted_posts_query_before
-			* @var	string	sql					The current SQL search string
-			* @var	int		forum_id			The forum id of the posts the user is trying to access
-			* @var	int		topic_id			The topic id of the posts the user is trying to access
-			* @var	int		min_time			Integer with the minimum post time that the user is searching for
-			* @var	int		visibility_const	Integer with one of the possible ITEM_* constant values
-			* @var	string	where_sql			Extra information included in the WHERE clause. It must end with "WHERE" or "AND" or "OR"
-			* @since 3.1.4-RC1
-			*/
-			$vars = array(
-				'sql',
-				'forum_id',
-				'topic_id',
-				'min_time',
-				'visibility_const',
-				'where_sql',
-			);
-			extract($phpbb_dispatcher->trigger_event('core.mcp_sorting_unapproved_deleted_posts_query_before', compact($vars)));
-
 			if ($min_time)
 			{
 				$sql .= ' AND post_time >= ' . $min_time;
@@ -576,6 +554,56 @@ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by
 			break;
 	}
 
+	// Default total to -1 to allow editing by the event
+	$total = -1;
+
+	/**
+	* This event allows you to control the SQL query used to get the total number
+	* of reports the user can access.
+	*
+	* This total is used for the pagination and for displaying the total number
+	* of reports to the user
+	*
+	*
+	* @event core.mcp_sorting_query_before
+	* @var	string	sql					The current SQL search string
+	* @var	string	mode				An id related to the module(s) the user is viewing
+	* @var	string	type				Which kind of information is this being used for displaying. Posts, topics, etc...
+	* @var	int		forum_id			The forum id of the posts the user is trying to access, if not 0
+	* @var	int		topic_id			The topic id of the posts the user is trying to access, if not 0
+	* @var	int		sort_days			The max age of the oldest report to be shown, in days
+	* @var	string	sort_key			The way the user has decided to sort the data.
+	*									The valid values must be in the keys of the sort_by_* variables
+	* @var	string	sort_dir			Either 'd' for "DESC" or 'a' for 'ASC' in the SQL query
+	* @var	int		limit_days			The possible max ages of the oldest report for the user to choose, in days.
+	* @var	array	sort_by_sql			SQL text (values) for the possible names of the ways of sorting data (keys).
+	* @var	array	sort_by_text		Language text (values) for the possible names of the ways of sorting data (keys).
+	* @var	int		min_time			Integer with the minimum post time that the user is searching for
+	* @var	int		limit_time_sql		Time limiting options used in the SQL query.
+	* @var	int		total				The total number of reports that exist. Only set if you want to override the result
+	* @var	string	where_sql			Extra information included in the WHERE clause. It must end with "WHERE" or "AND" or "OR".
+	*									Set to "WHERE" and set total above -1 to override the total value
+	* @since 3.1.4-RC1
+	*/
+	$vars = array(
+		'sql',
+		'mode',
+		'type',
+		'forum_id',
+		'topic_id',
+		'sort_days',
+		'sort_key',
+		'sort_dir',
+		'limit_days',
+		'sort_by_sql',
+		'sort_by_text',
+		'min_time',
+		'limit_time_sql',
+		'total',
+		'where_sql',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.mcp_sorting_query_before', compact($vars)));
+
 	if (!isset($sort_by_sql[$sort_key]))
 	{
 		$sort_key = $default_key;
@@ -607,7 +635,7 @@ function phpbb_mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by
 		$total = (int) $db->sql_fetchfield('total');
 		$db->sql_freeresult($result);
 	}
-	else
+	else if ($total < -1)
 	{
 		$total = -1;
 	}
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index fa28bd89a4..59952182df 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -90,6 +90,32 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	// we include the language file here
 	$user->add_lang('viewtopic');
 
+	/**
+	* Modify the default vars before composing a PM
+	*
+	* @event core.ucp_pm_compose_modify_data
+	* @var	int		msg_id					post_id in the page request
+	* @var	int		to_user_id				The id of whom the message is to
+	* @var	int		to_group_id				The id of the group the message is to
+	* @var	bool	submit					Whether the form has been submitted
+	* @var	bool	preview					Whether the user is previewing the PM or not
+	* @var	string	action					One of: post, reply, quote, forward, quotepost, edit, delete, smilies
+	* @var	bool	delete					Whether the user is deleting the PM
+	* @var	int		reply_to_all			Value of reply_to_all request variable.
+	* @since 3.1.4-RC1
+	*/
+	$vars = array(
+		'msg_id',
+		'to_user_id',
+		'to_group_id',
+		'submit',
+		'preview',
+		'action',
+		'delete',
+		'reply_to_all',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.ucp_pm_compose_modify_data', compact($vars)));
+
 	// Output PM_TO box if message composing
 	if ($action != 'edit')
 	{