phpBB

Code Changes

File: includes/ucp/ucp_profile.php

  Unmodified   Added   Modified   Removed
Line 31Line 31

function main($id, $mode)
{


function main($id, $mode)
{

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

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


$user->add_lang('posting');



$user->add_lang('posting');


		$preview	= $request->variable('preview', false, false, \phpbb\request\request_interface::POST);

 
		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);

		$submit		= $request->variable('submit', false, false, \phpbb\request\request_interface::POST);

		$delete		= $request->variable('delete', false, false, \phpbb\request\request_interface::POST);

 
		$error = $data = array();
$s_hidden_fields = '';


		$error = $data = array();
$s_hidden_fields = '';


Line 47Line 45
			case 'reg_details':

$data = array(

			case 'reg_details':

$data = array(

					'username'			=> utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
'email' => strtolower(request_var('email', $user->data['user_email'])),

					'username'			=> $request->variable('username', $user->data['username'], true),
'email' => strtolower($request->variable('email', $user->data['user_email'])),

					'new_password'		=> $request->variable('new_password', '', true),
'cur_password' => $request->variable('cur_password', '', true),
'password_confirm' => $request->variable('password_confirm', '', true),
);

					'new_password'		=> $request->variable('new_password', '', true),
'cur_password' => $request->variable('cur_password', '', true),
'password_confirm' => $request->variable('password_confirm', '', true),
);

 

/**
* Modify user registration data on editing account settings in UCP
*
* @event core.ucp_profile_reg_details_data
* @var array data Array with current or updated user registration data
* @var bool submit Flag indicating if submit button has been pressed
* @since 3.1.4-RC1
*/
$vars = array('data', 'submit');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_data', compact($vars)));


add_form_key('ucp_reg_details');



add_form_key('ucp_reg_details');


Line 85Line 94
					}

// Instantiate passwords manager

					}

// Instantiate passwords manager

 
					/* @var $passwords_manager \phpbb\passwords\manager */

					$passwords_manager = $phpbb_container->get('passwords.manager');

// Only check the new password against the previous password if there have been no errors

					$passwords_manager = $phpbb_container->get('passwords.manager');

// Only check the new password against the previous password if there have been no errors

Line 102Line 112
					{
$error[] = 'FORM_INVALID';
}

					{
$error[] = 'FORM_INVALID';
}

 

/**
* Validate user data on editing registration data in UCP
*
* @event core.ucp_profile_reg_details_validate
* @var array data Array with user profile data
* @var bool submit Flag indicating if submit button has been pressed
* @var array error Array of any generated errors
* @since 3.1.4-RC1
*/
$vars = array('data', 'submit', 'error');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_validate', compact($vars)));


if (!sizeof($error))
{


if (!sizeof($error))
{

Line 116Line 138

if ($auth->acl_get('u_chgname') && $config['allow_namechange'] && $data['username'] != $user->data['username'])
{


if ($auth->acl_get('u_chgname') && $config['allow_namechange'] && $data['username'] != $user->data['username'])
{

							add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_NAME', $user->data['username'], $data['username']);





							$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_UPDATE_NAME', false, array(
'reportee_id' => $user->data['user_id'],
$user->data['username'],
$data['username']
));

						}

if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !$passwords_manager->check($data['new_password'], $user->data['user_password']))
{
$user->reset_login_keys();

						}

if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !$passwords_manager->check($data['new_password'], $user->data['user_password']))
{
$user->reset_login_keys();

							add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']);




							$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_NEW_PASSWORD', false, array(
'reportee_id' => $user->data['user_id'],
$user->data['username']
));

						}

if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'])
{

						}

if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'])
{

							add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], $user->data['user_email'], $data['email']);






							$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_UPDATE_EMAIL', false, array(
'reportee_id' => $user->data['user_id'],
$user->data['username'],
$data['user_email'],
$data['email']
));

						}

$message = 'PROFILE_UPDATED';

						}

$message = 'PROFILE_UPDATED';

Line 160Line 194

if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
{


if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
{

								// Grab an array of user_id's with a_user permissions ... these users can activate a user
$admin_ary = $auth->acl_get_list(false, 'a_user', false);
$admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array();

// Also include founders
$where_sql = ' WHERE user_type = ' . USER_FOUNDER;

if (sizeof($admin_ary))
{
$where_sql .= ' OR ' . $db->sql_in_set('user_id', $admin_ary);
}

$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type
FROM ' . USERS_TABLE . ' ' .
$where_sql;
$result = $db->sql_query($sql);

while ($row = $db->sql_fetchrow($result))
{
$messenger->template('admin_activate', $row['user_lang']);
$messenger->set_addresses($row);

$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($data['username']),
'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u={$user->data['user_id']}",
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
);

$messenger->send($row['user_notify_type']);
}
$db->sql_freeresult($result);

								$notifications_manager = $phpbb_container->get('notification_manager');
$notifications_manager->add_notifications('notification.type.admin_activate_user', array(
'user_id' => $user->data['user_id'],
'user_actkey' => $user_actkey,
'user_regdate' => time(), // Notification time
));


























							}

user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE);

							}

user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE);

Line 199Line 208
							$sql_ary['user_actkey'] = $user_actkey;
$sql_ary['user_newpasswd'] = '';
}

							$sql_ary['user_actkey'] = $user_actkey;
$sql_ary['user_newpasswd'] = '';
}

 

/**
* Modify user registration data before submitting it to the database
*
* @event core.ucp_profile_reg_details_sql_ary
* @var array data Array with current or updated user registration data
* @var array sql_ary Array with user registration data to submit to the database
* @since 3.1.4-RC1
*/
$vars = array('data', 'sql_ary');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_sql_ary', compact($vars)));


if (sizeof($sql_ary))
{


if (sizeof($sql_ary))
{

Line 259Line 279
				// Do not display profile information panel if not authed to do so
if (!$auth->acl_get('u_chgprofileinfo'))
{

				// Do not display profile information panel if not authed to do so
if (!$auth->acl_get('u_chgprofileinfo'))
{

 
					send_status_line(403, 'Forbidden');

					trigger_error('NO_AUTH_PROFILEINFO');
}


					trigger_error('NO_AUTH_PROFILEINFO');
}


 
				/* @var $cp \phpbb\profilefields\manager */

				$cp = $phpbb_container->get('profilefields.manager');

$cp_data = $cp_error = array();

$data = array(

				$cp = $phpbb_container->get('profilefields.manager');

$cp_data = $cp_error = array();

$data = array(

					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),

					'jabber'		=> $request->variable('jabber', $user->data['user_jabber'], true),

				);

if ($config['allow_birthdays'])

				);

if ($config['allow_birthdays'])

Line 279Line 301
						list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user->data['user_birthday']);
}


						list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user->data['user_birthday']);
}


					$data['bday_day'] = request_var('bday_day', $data['bday_day']);
$data['bday_month'] = request_var('bday_month', $data['bday_month']);
$data['bday_year'] = request_var('bday_year', $data['bday_year']);

					$data['bday_day'] = $request->variable('bday_day', $data['bday_day']);
$data['bday_month'] = $request->variable('bday_month', $data['bday_month']);
$data['bday_year'] = $request->variable('bday_year', $data['bday_year']);

					$data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
}

					$data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']);
}

 

/**
* Modify user data on editing profile in UCP
*
* @event core.ucp_profile_modify_profile_info
* @var array data Array with user profile data
* @var bool submit Flag indicating if submit button has been pressed
* @since 3.1.4-RC1
*/
$vars = array('data', 'submit');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_profile_info', compact($vars)));


add_form_key('ucp_profile_info');



add_form_key('ucp_profile_info');


Line 319Line 352
					{
$error[] = 'FORM_INVALID';
}

					{
$error[] = 'FORM_INVALID';
}

 

/**
* Validate user data on editing profile in UCP
*
* @event core.ucp_profile_validate_profile_info
* @var array data Array with user profile data
* @var bool submit Flag indicating if submit button has been pressed
* @var array error Array of any generated errors
* @since 3.1.4-RC1
*/
$vars = array('data', 'submit', 'error');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_validate_profile_info', compact($vars)));


if (!sizeof($error))
{


if (!sizeof($error))
{

Line 340Line 385
						{
$sql_ary['user_birthday'] = $data['user_birthday'];
}

						{
$sql_ary['user_birthday'] = $data['user_birthday'];
}

 

/**
* Modify profile data in UCP before submitting to the database
*
* @event core.ucp_profile_info_modify_sql_ary
* @var array cp_data Array with the user custom profile fields data
* @var array data Array with user profile data
* @var array sql_ary user options data we update
* @since 3.1.4-RC1
*/
$vars = array('cp_data', 'data', 'sql_ary');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_info_modify_sql_ary', compact($vars)));


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '

Line 373Line 430
						$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
}

						$selected = ($i == $data['bday_month']) ? ' selected="selected"' : '';
$s_birthday_month_options .= "<option value=\"$i\"$selected>$i</option>";
}

					$s_birthday_year_options = '';

 

$now = getdate();
$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';


$now = getdate();
$s_birthday_year_options = '<option value="0"' . ((!$data['bday_year']) ? ' selected="selected"' : '') . '>--</option>';

Line 409Line 465

if (!$auth->acl_get('u_sig'))
{


if (!$auth->acl_get('u_sig'))
{

 
					send_status_line(403, 'Forbidden');

					trigger_error('NO_AUTH_SIGNATURE');
}

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


					trigger_error('NO_AUTH_SIGNATURE');
}

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


				$enable_bbcode	= ($config['allow_sig_bbcode']) ? (bool) $user->optionget('sig_bbcode') : false;
$enable_smilies = ($config['allow_sig_smilies']) ? (bool) $user->optionget('sig_smilies') : false;
$enable_urls = ($config['allow_sig_links']) ? (bool) $user->optionget('sig_links') : false;

				$preview	= $request->is_set_post('preview');







				$signature		= utf8_normalize_nfc(request_var('signature', (string) $user->data['user_sig'], true));



				$enable_bbcode	= ($config['allow_sig_bbcode']) ? $user->optionget('sig_bbcode') : false;
$enable_smilies = ($config['allow_sig_smilies']) ? $user->optionget('sig_smilies') : false;
$enable_urls = ($config['allow_sig_links']) ? $user->optionget('sig_links') : false;





				add_form_key('ucp_sig');





				$bbcode_flags = ($enable_bbcode ? OPTION_FLAG_BBCODE : 0) + ($enable_smilies ? OPTION_FLAG_SMILIES : 0) + ($enable_urls ? OPTION_FLAG_LINKS : 0);

$decoded_message = generate_text_for_edit($user->data['user_sig'], $user->data['user_sig_bbcode_uid'], $bbcode_flags);
$signature = $request->variable('signature', $decoded_message['text'], true);
$signature_preview = '';


if ($submit || $preview)
{


if ($submit || $preview)
{

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



					$enable_bbcode	= ($config['allow_sig_bbcode']) ? !$request->variable('disable_bbcode', false) : false;
$enable_smilies = ($config['allow_sig_smilies']) ? !$request->variable('disable_smilies', false) : false;
$enable_urls = ($config['allow_sig_links']) ? !$request->variable('disable_magic_url', false) : false;





					$enable_bbcode	= ($config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', false)) ? false : true) : false;
$enable_smilies = ($config['allow_sig_smilies']) ? ((request_var('disable_smilies', false)) ? false : true) : false;
$enable_urls = ($config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false;

if (!sizeof($error))

					if (!check_form_key('ucp_sig'))





					{

					{

						$message_parser = new parse_message($signature);



						$error[] = 'FORM_INVALID';
}
}





						// Allowing Quote BBCode
$message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, $config['allow_sig_img'], $config['allow_sig_flash'], true, $config['allow_sig_links'], true, 'sig');























				/**
* Modify user signature on editing profile in UCP
*
* @event core.ucp_profile_modify_signature
* @var bool enable_bbcode Whether or not bbcode is enabled
* @var bool enable_smilies Whether or not smilies are enabled
* @var bool enable_urls Whether or not urls are enabled
* @var string signature Users signature text
* @var array error Any error strings
* @var bool submit Whether or not the form has been sumitted
* @var bool preview Whether or not the signature is being previewed
* @since 3.1.10-RC1
* @change 3.2.0-RC2 Removed message parser
*/
$vars = array(
'enable_bbcode',
'enable_smilies',
'enable_urls',
'signature',
'error',
'submit',
'preview',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_signature', compact($vars)));





						if (sizeof($message_parser->warn_msg))

















				$bbcode_uid = $bbcode_bitfield = $bbcode_flags = '';
$warn_msg = generate_text_for_storage(
$signature,
$bbcode_uid,
$bbcode_bitfield,
$bbcode_flags,
$enable_bbcode,
$enable_urls,
$enable_smilies,
$config['allow_sig_img'],
$config['allow_sig_flash'],
true,
$config['allow_sig_links'],
'sig'
);

if (sizeof($warn_msg))

						{

						{

							$error[] = implode('<br />', $message_parser->warn_msg);

					$error += $warn_msg;

						}


						}


						if (!check_form_key('ucp_sig'))

				if (!$submit)

						{

						{

							$error[] = 'FORM_INVALID';


					// Parse it for displaying
$signature_preview = generate_text_for_display($signature, $bbcode_uid, $bbcode_bitfield, $bbcode_flags);

						}

						}


if (!sizeof($error) && $submit)


				else
{
if (!sizeof($error))

						{
$user->optionset('sig_bbcode', $enable_bbcode);
$user->optionset('sig_smilies', $enable_smilies);
$user->optionset('sig_links', $enable_urls);

$sql_ary = array(

						{
$user->optionset('sig_bbcode', $enable_bbcode);
$user->optionset('sig_smilies', $enable_smilies);
$user->optionset('sig_links', $enable_urls);

$sql_ary = array(

								'user_sig'					=> (string) $message_parser->message,

							'user_sig'					=> $signature,

								'user_options'				=> $user->data['user_options'],

								'user_options'				=> $user->data['user_options'],

								'user_sig_bbcode_uid'		=> (string) $message_parser->bbcode_uid,
'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield

							'user_sig_bbcode_uid'		=> $bbcode_uid,
'user_sig_bbcode_bitfield' => $bbcode_bitfield

							);

							);

 

/**
* Modify user registration data before submitting it to the database
*
* @event core.ucp_profile_modify_signature_sql_ary
* @var array sql_ary Array with user signature data to submit to the database
* @since 3.1.10-RC1
*/
$vars = array('sql_ary');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_modify_signature_sql_ary', compact($vars)));


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '

Line 473Line 584

// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);


// Replace "error" strings with their real, localised form
$error = array_map(array($user, 'lang'), $error);

				}

 




				$signature_preview = '';
if ($preview)

				if ($request->is_set_post('preview'))


				{

				{

					// Now parse it for displaying
$signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
unset($message_parser);

					$decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_flags);



				}


				}


				decode_message($signature, $user->data['user_sig_bbcode_uid']);


				/** @var \phpbb\controller\helper $controller_helper */
$controller_helper = $phpbb_container->get('controller.helper');


$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',


$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',

					'SIGNATURE'			=> $signature,

					'SIGNATURE'			=> $decoded_message['text'],

					'SIGNATURE_PREVIEW'	=> $signature_preview,

'S_BBCODE_CHECKED' => (!$enable_bbcode) ? ' checked="checked"' : '',
'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '',
'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '',


					'SIGNATURE_PREVIEW'	=> $signature_preview,

'S_BBCODE_CHECKED' => (!$enable_bbcode) ? ' checked="checked"' : '',
'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '',
'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '',


					'BBCODE_STATUS'			=> ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>'),

					'BBCODE_STATUS'			=> $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_bbcode_controller') . '">', '</a>'),

					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],

					'SMILIES_STATUS'		=> ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],

Line 509Line 617
					'S_BBCODE_FLASH'		=> ($config['allow_sig_flash']) ? true : false,
'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false)
);

					'S_BBCODE_FLASH'		=> ($config['allow_sig_flash']) ? true : false,
'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false)
);

 

add_form_key('ucp_sig');


// Build custom bbcodes array
display_custom_bbcodes();


// Build custom bbcodes array
display_custom_bbcodes();

Line 526Line 636

if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
{


if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
{

 
					/* @var $phpbb_avatar_manager \phpbb\avatar\manager */

					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();


					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();


Line 552Line 663
										'user_avatar_width' => $result['avatar_width'],
'user_avatar_height' => $result['avatar_height'],
);

										'user_avatar_width' => $result['avatar_width'],
'user_avatar_height' => $result['avatar_height'],
);

 

/**
* Trigger events on successfull avatar change
*
* @event core.ucp_profile_avatar_sql
* @var array result Array with data to be stored in DB
* @since 3.1.11-RC1
*/
$vars = array('result');
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_avatar_sql', compact($vars)));


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . (int) $user->data['user_id'];


$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . (int) $user->data['user_id'];



 
									$db->sql_query($sql);

meta_refresh(3, $this->u_action);

									$db->sql_query($sql);

meta_refresh(3, $this->u_action);

Line 593Line 713
					}

$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));

					}

$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));

 

$template->assign_vars(array(
'AVATAR_MIN_WIDTH' => $config['avatar_min_width'],
'AVATAR_MAX_WIDTH' => $config['avatar_max_width'],
'AVATAR_MIN_HEIGHT' => $config['avatar_min_height'],
'AVATAR_MAX_HEIGHT' => $config['avatar_max_height'],
));


foreach ($avatar_drivers as $current_driver)
{


foreach ($avatar_drivers as $current_driver)
{

Line 644Line 771

if ($submit)
{


if ($submit)
{

					$keys = request_var('keys', array(''));

					$keys = $request->variable('keys', array(''));


if (!check_form_key('ucp_autologin_keys'))
{


if (!check_form_key('ucp_autologin_keys'))
{