makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Joas Schilling 2015-02-22 22:27:59 +01:00
commit 0357a4d89b
1 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
phpBB/includes/ucp/ucp_register.php
View file

@ -30,7 +30,7 @@ class ucp_register
function main($id, $mode) function main($id, $mode)
{ {
global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx; global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request, $phpbb_container; global $request, $phpbb_container, $phpbb_dispatcher;
// //
if ($config['require_activation'] == USER_ACTIVATION_DISABLE || if ($config['require_activation'] == USER_ACTIVATION_DISABLE ||
@ -199,6 +199,19 @@ class ucp_register
'lang' => basename($request->variable('lang', $user->lang_name)), 'lang' => basename($request->variable('lang', $user->lang_name)),
'tz' => $request->variable('tz', $timezone), '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 // Check and initialize some variables if needed
if ($submit) if ($submit)
@ -259,6 +272,19 @@ class ucp_register
$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))
{ {
@ -322,6 +348,20 @@ class ucp_register
{ {
$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... // Register user...
$user_id = user_add($user_row, $cp_data); $user_id = user_add($user_row, $cp_data);