1 files changed, 44 insertions, 9 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index d728ed7d78..d39be50251 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -261,10 +261,13 @@ function user_add($user_row, $cp_data = false)
 	* Use this event to modify the values to be inserted when a user is added
 	*
 	* @event core.user_add_modify_data
+	* @var array	user_row		Array of user details submited to user_add
+	* @var array	cp_data			Array of Custom profile fields submited to user_add
 	* @var array	sql_ary		Array of data to be inserted when a user is added
 	* @since 3.1.0-a1
+	* @change 3.1.0-b5
 	*/
-	$vars = array('sql_ary');
+	$vars = array('user_row', 'cp_data', 'sql_ary');
 	extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars)));
 
 	$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
@@ -344,6 +347,18 @@ function user_add($user_row, $cp_data = false)
 		set_config('newest_user_colour', $row['group_colour'], true);
 	}
 
+	/**
+	* Event that returns user id, user detals and user CPF of newly registared user
+	*
+	* @event core.user_add_after
+	* @var int		user_id			User id of newly registared user
+	* @var array	user_row		Array of user details submited to user_add
+	* @var array	cp_data			Array of Custom profile fields submited to user_add
+	* @since 3.1.0-b5
+	*/
+	$vars = array('user_id', 'user_row', 'cp_data');
+	extract($phpbb_dispatcher->trigger_event('core.user_add_after', compact($vars)));
+
 	return $user_id;
 }
 
@@ -755,7 +770,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 		else
 		{
 			$ban_other = explode('-', $ban_len_other);
-			if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) &&
+			if (sizeof($ban_other) == 3 && ((int) $ban_other[0] < 9999) &&
 				(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
 			{
 				$ban_end = max($current_time, $user->create_datetime()
@@ -1122,7 +1137,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 		// Update log
 		$log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_';
 
-		// Add to moderator log, admin log and user notes
+		// Add to admin log, moderator log and user notes
 		add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
 		add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
 		if ($mode == 'user')
@@ -2086,7 +2101,7 @@ function avatar_delete($mode, $row, $clean_db = false)
 	// Check if the users avatar is actually *not* a group avatar
 	if ($mode == 'user')
 	{
-		if (strpos($row['user_avatar'], 'g') === 0 || (((int)$row['user_avatar'] !== 0) && ((int)$row['user_avatar'] !== (int)$row['user_id'])))
+		if (strpos($row['user_avatar'], 'g') === 0 || (((int) $row['user_avatar'] !== 0) && ((int) $row['user_avatar'] !== (int) $row['user_id'])))
 		{
 			return false;
 		}
@@ -2419,7 +2434,7 @@ function group_correct_avatar($group_id, $old_entry)
 {
 	global $config, $db, $phpbb_root_path;
 
-	$group_id		= (int)$group_id;
+	$group_id		= (int) $group_id;
 	$ext 			= substr(strrchr($old_entry, '.'), 1);
 	$old_filename 	= get_avatar_filename($old_entry);
 	$new_filename 	= $config['avatar_salt'] . "_g$group_id.$ext";
@@ -2844,7 +2859,7 @@ function remove_default_avatar($group_id, $user_ids)
 
 	$sql = 'SELECT *
 		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
+		WHERE group_id = ' . (int) $group_id;
 	$result = $db->sql_query($sql);
 	if (!$row = $db->sql_fetchrow($result))
 	{
@@ -2885,7 +2900,7 @@ function remove_default_rank($group_id, $user_ids)
 
 	$sql = 'SELECT *
 		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
+		WHERE group_id = ' . (int) $group_id;
 	$result = $db->sql_query($sql);
 	if (!$row = $db->sql_fetchrow($result))
 	{
@@ -2896,9 +2911,9 @@ function remove_default_rank($group_id, $user_ids)
 
 	$sql = 'UPDATE ' . USERS_TABLE . '
 		SET user_rank = 0
-		WHERE group_id = ' . (int)$group_id . '
+		WHERE group_id = ' . (int) $group_id . '
 			AND user_rank <> 0
-			AND user_rank = ' . (int)$row['group_rank'] . '
+			AND user_rank = ' . (int) $row['group_rank'] . '
 			AND ' . $db->sql_in_set('user_id', $user_ids);
 	$db->sql_query($sql);
 }
@@ -3530,3 +3545,23 @@ function phpbb_get_banned_user_ids($user_ids = array(), $ban_end = true)
 
 	return $banned_ids_list;
 }
+
+/**
+* Function for assigning a template var if the zebra module got included
+*/
+function phpbb_module_zebra($mode, &$module_row)
+{
+	global $template;
+
+	$template->assign_var('S_ZEBRA_ENABLED', true);
+
+	if ($mode == 'friends')
+	{
+		$template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true);
+	}
+
+	if ($mode == 'foes')
+	{
+		$template->assign_var('S_ZEBRA_FOES_ENABLED', true);
+	}
+}