phpBB

Code Changes

File: includes/ucp/ucp_register.php

  Unmodified   Added   Modified   Removed
Line 29Line 29

function main($id, $mode)
{


function main($id, $mode)
{

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

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


//


//

		if ($config['require_activation'] == USER_ACTIVATION_DISABLE)


		if ($config['require_activation'] == USER_ACTIVATION_DISABLE ||
(in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN)) && !$config['email_enable']))

		{
trigger_error('UCP_REGISTER_DISABLE');
}

		{
trigger_error('UCP_REGISTER_DISABLE');
}

Line 41Line 42
		$coppa			= $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
$agreed = $request->variable('agreed', false);
$submit = $request->is_set_post('submit');

		$coppa			= $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
$agreed = $request->variable('agreed', false);
$submit = $request->is_set_post('submit');

		$change_lang	= request_var('change_lang', '');
$user_lang = request_var('lang', $user->lang_name);























		$change_lang	= $request->variable('change_lang', '');
$user_lang = $request->variable('lang', $user->lang_name);

/**
* Add UCP register data before they are assigned to the template or submitted
*
* To assign data to the template, use $template->assign_vars()
*
* @event core.ucp_register_requests_after
* @var bool coppa Is set coppa
* @var bool agreed Did user agree to coppa?
* @var bool submit Is set post submit?
* @var string change_lang Change language request
* @var string user_lang User language request
* @since 3.1.11-RC1
*/
$vars = array(
'coppa',
'agreed',
'submit',
'change_lang',
'user_lang',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_register_requests_after', compact($vars)));


if ($agreed)
{


if ($agreed)
{

Line 76Line 99
			}
}


			}
}


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

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

$error = $cp_data = $cp_error = array();

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

$error = $cp_data = $cp_error = array();

Line 87Line 111
		if (!empty($login_link_data))
{
// Confirm that we have all necessary data

		if (!empty($login_link_data))
{
// Confirm that we have all necessary data

			$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
$auth_provider = $phpbb_container->get($auth_provider);


			/* @var $provider_collection \phpbb\auth\provider_collection */
$provider_collection = $phpbb_container->get('auth.provider_collection');
$auth_provider = $provider_collection->get_provider($request->variable('auth_provider', ''));


$result = $auth_provider->login_link_has_necessary_data($login_link_data);
if ($result !== null)


$result = $auth_provider->login_link_has_necessary_data($login_link_data);
if ($result !== null)

Line 112Line 137
			{
// We do not include the password
$s_hidden_fields = array_merge($s_hidden_fields, array(

			{
// We do not include the password
$s_hidden_fields = array_merge($s_hidden_fields, array(

					'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
'email' => strtolower(request_var('email', '')),

					'username'			=> $request->variable('username', '', true),
'email' => strtolower($request->variable('email', '')),

					'lang'				=> $user->lang_name,

					'lang'				=> $user->lang_name,

					'tz'				=> request_var('tz', $config['board_timezone']),

					'tz'				=> $request->variable('tz', $config['board_timezone']),

				));

}

				));

}

Line 174Line 199
				);
}
unset($lang_row);

				);
}
unset($lang_row);

 

/**
* Allows to modify the agreements.
*
* To assign data to the template, use $template->assign_vars()
*
* @event core.ucp_register_agreement
* @since 3.1.6-RC1
*/
$phpbb_dispatcher->dispatch('core.ucp_register_agreement');


$this->tpl_name = 'ucp_agreement';
return;


$this->tpl_name = 'ucp_agreement';
return;

Line 189Line 224
		$timezone = $config['board_timezone'];

$data = array(

		$timezone = $config['board_timezone'];

$data = array(

			'username'			=> utf8_normalize_nfc(request_var('username', '', true)),

			'username'			=> $request->variable('username', '', true),

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

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

			'email'				=> strtolower(request_var('email', '')),
'lang' => basename(request_var('lang', $user->lang_name)),
'tz' => request_var('tz', $timezone),

			'email'				=> strtolower($request->variable('email', '')),
'lang' => basename($request->variable('lang', $user->lang_name)),
'tz' => $request->variable('tz', $timezone),

		);

		);

 
		/**
* Add UCP register data before they are assigned to the template or submitted
*
* To assign data to the template, use $template->assign_vars()
*
* @event core.ucp_register_data_before
* @var bool submit Do we display the form only
* or did the user press submit
* @var array data Array with current ucp registration data
* @since 3.1.4-RC1
*/
$vars = array('submit', 'data');
extract($phpbb_dispatcher->trigger_event('core.ucp_register_data_before', compact($vars)));


// Check and initialize some variables if needed
if ($submit)


// Check and initialize some variables if needed
if ($submit)

Line 256Line 304
					$error[] = $user->lang['NEW_PASSWORD_ERROR'];
}
}

					$error[] = $user->lang['NEW_PASSWORD_ERROR'];
}
}

 
			/**
* Check UCP registration data after they are submitted
*
* @event core.ucp_register_data_after
* @var bool submit Do we display the form only
* or did the user press submit
* @var array data Array with current ucp registration data
* @var array cp_data Array with custom profile fields data
* @var array error Array with list of errors
* @since 3.1.4-RC1
*/
$vars = array('submit', 'data', 'cp_data', 'error');
extract($phpbb_dispatcher->trigger_event('core.ucp_register_data_after', compact($vars)));


if (!sizeof($error))
{


if (!sizeof($error))
{

Line 297Line 358
				}

// Instantiate passwords manager

				}

// Instantiate passwords manager

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

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

$user_row = array(

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

$user_row = array(

Line 318Line 380
				{
$user_row['user_new'] = 1;
}

				{
$user_row['user_new'] = 1;
}

 
				/**
* Add into $user_row before user_add
*
* user_add allows adding more data into the users table
*
* @event core.ucp_register_user_row_after
* @var bool submit Do we display the form only
* or did the user press submit
* @var array cp_data Array with custom profile fields data
* @var array user_row Array with current ucp registration data
* @since 3.1.4-RC1
*/
$vars = array('submit', 'cp_data', 'user_row');
extract($phpbb_dispatcher->trigger_event('core.ucp_register_user_row_after', compact($vars)));


// Register user...
$user_id = user_add($user_row, $cp_data);


// Register user...
$user_id = user_add($user_row, $cp_data);

Line 388Line 464

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


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

 
					/* @var $phpbb_notifications \phpbb\notification\manager */

					$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->add_notifications('notification.type.admin_activate_user', array(
'user_id' => $user_id,

					$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->add_notifications('notification.type.admin_activate_user', array(
'user_id' => $user_id,

Line 429Line 506
			$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
}
$s_hidden_fields = build_hidden_fields($s_hidden_fields);

			$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
}
$s_hidden_fields = build_hidden_fields($s_hidden_fields);

		$confirm_image = '';

 

// Visual Confirmation - Show images
if ($config['enable_confirm'])


// Visual Confirmation - Show images
if ($config['enable_confirm'])

Line 452Line 528
			break;
}


			break;
}


		$timezone_selects = phpbb_timezone_select($template, $user, $data['tz'], true);



		// Assign template vars for timezone select
phpbb_timezone_select($template, $user, $data['tz'], true);


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

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