phpBB

Code Changes

File: includes/ucp/ucp_groups.php

  Unmodified   Added   Modified   Removed
Line 31Line 31
		global $config, $phpbb_root_path, $phpEx, $phpbb_admin_path;
global $db, $user, $auth, $cache, $template;
global $request, $phpbb_container, $phpbb_log;

		global $config, $phpbb_root_path, $phpEx, $phpbb_admin_path;
global $db, $user, $auth, $cache, $template;
global $request, $phpbb_container, $phpbb_log;

 

/** @var \phpbb\language\language $language Language object */
$language = $phpbb_container->get('language');


$user->add_lang('groups');



$user->add_lang('groups');


Line 396Line 399
				$action		= (isset($_POST['addusers'])) ? 'addusers' : $request->variable('action', '');
$group_id = $request->variable('g', 0);


				$action		= (isset($_POST['addusers'])) ? 'addusers' : $request->variable('action', '');
$group_id = $request->variable('g', 0);


 
				if (!function_exists('phpbb_get_user_rank'))
{

				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);

				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);

 
				}


add_form_key('ucp_groups');



add_form_key('ucp_groups');


Line 528Line 534
								'teampage'	=> $group_row['group_teampage'],
);


								'teampage'	=> $group_row['group_teampage'],
);


							if ($config['allow_avatar'])






							if (!check_form_key('ucp_groups'))
{
$error[] = $user->lang['FORM_INVALID'];
}

if (!count($error) && $config['allow_avatar'])

							{
// Handle avatar
$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));

							{
// Handle avatar
$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));

Line 548Line 559

// Merge any avatars errors into the primary error array
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));


// Merge any avatars errors into the primary error array
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));

							}

if (!check_form_key('ucp_groups'))
{
$error[] = $user->lang['FORM_INVALID'];

 
							}

// Validate submitted colour value

							}

// Validate submitted colour value

Line 867Line 873
						if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . $return_page);

						if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . $return_page);

 
						}

if (!check_form_key('ucp_groups'))
{
trigger_error($user->lang('FORM_INVALID') . $return_page);

						}

if (!($row = group_memberships($group_id, $user->data['user_id'])))

						}

if (!($row = group_memberships($group_id, $user->data['user_id'])))

Line 1054Line 1065

if (confirm_box(true))
{


if (confirm_box(true))
{

 
							$return_manage_page = '<br /><br />' . $language->lang('RETURN_PAGE', '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>');


							// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
{

							// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
{

								trigger_error($user->lang[$error] . $return_page);













								$display_message = $language->lang($error);

if ($error == 'GROUP_USERS_INVALID')
{
// Find which users don't exist
$actual_name_ary = $name_ary;
$actual_user_id_ary = [];
user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true);

$display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp')));
}

trigger_error($display_message . $return_manage_page);

							}


							}


							trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));

							trigger_error($language->lang('GROUP_USERS_ADDED') . $return_manage_page);

						}
else
{

						}
else
{