From be15e26e5f4ee19fa6b40994b50875674f92e963 Mon Sep 17 00:00:00 2001 From: kasimi Date: Tue, 31 Oct 2017 14:56:41 +0100 Subject: [PATCH 1/5] [ticket/15431] Add event core.ucp_register_modify_template_data PHPBB3-15431 --- phpBB/includes/ucp/ucp_register.php | 41 ++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 594100ac65..83966cdaae 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -528,10 +528,7 @@ class ucp_register break; } - // Assign template vars for timezone select - phpbb_timezone_select($template, $user, $data['tz'], true); - - $template->assign_vars(array( + $template_vars = array( 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', 'USERNAME' => $data['username'], 'PASSWORD' => $data['new_password'], @@ -552,7 +549,37 @@ class ucp_register 'COOKIE_NAME' => $config['cookie_name'], 'COOKIE_PATH' => $config['cookie_path'], - )); + ); + + $tpl_name = 'ucp_register'; + $page_title = 'UCP_REGISTRATION'; + + /** + * Modify template data on the registration page + * + * @event core.ucp_register_modify_template_data + * @var array template_vars Array with template data + * @var array data Array with user data + * @var array error Array with errors + * @var array s_hidden_fields Array hidden form fields + * @var string tpl_name Template name + * @var string page_title Page title + * @since 3.2.2-RC1 + */ + $vars = array( + 'template_vars', + 'data', + 'error', + 's_hidden_fields', + 'tpl_name', + 'page_title', + ); + extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars))); + + // Assign template vars for timezone select + phpbb_timezone_select($template, $user, $data['tz'], true); + + $template->assign_vars($template_vars); // $user->profile_fields = array(); @@ -561,8 +588,8 @@ class ucp_register $cp->generate_profile_fields('register', $user->get_iso_lang_id()); // - $this->tpl_name = 'ucp_register'; - $this->page_title = 'UCP_REGISTRATION'; + $this->tpl_name = $tpl_name; + $this->page_title = $page_title; } /** From 0409191be99b0901b4c006aadf4fd1d3c93d0a06 Mon Sep 17 00:00:00 2001 From: kasimi Date: Wed, 8 Nov 2017 14:45:33 +0100 Subject: [PATCH 2/5] [ticket/15431] Fixed event argument description PHPBB3-15431 --- phpBB/includes/ucp/ucp_register.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 83966cdaae..7220872cf4 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -561,7 +561,7 @@ class ucp_register * @var array template_vars Array with template data * @var array data Array with user data * @var array error Array with errors - * @var array s_hidden_fields Array hidden form fields + * @var string s_hidden_fields HTML with hidden form field elements * @var string tpl_name Template name * @var string page_title Page title * @since 3.2.2-RC1 From 9c93c180b09669b9a054e614a5a44896b643105b Mon Sep 17 00:00:00 2001 From: kasimi Date: Wed, 29 Nov 2017 19:35:36 +0100 Subject: [PATCH 3/5] [ticket/15431] Removed $page_title PHPBB3-15431 --- phpBB/includes/ucp/ucp_register.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 7220872cf4..f424a4e95e 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -552,7 +552,6 @@ class ucp_register ); $tpl_name = 'ucp_register'; - $page_title = 'UCP_REGISTRATION'; /** * Modify template data on the registration page @@ -563,7 +562,6 @@ class ucp_register * @var array error Array with errors * @var string s_hidden_fields HTML with hidden form field elements * @var string tpl_name Template name - * @var string page_title Page title * @since 3.2.2-RC1 */ $vars = array( @@ -572,7 +570,6 @@ class ucp_register 'error', 's_hidden_fields', 'tpl_name', - 'page_title', ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars))); @@ -589,7 +586,6 @@ class ucp_register // $this->tpl_name = $tpl_name; - $this->page_title = $page_title; } /** From 65c529e66dbd4199900a2bb91a7b7ada8ccc47f0 Mon Sep 17 00:00:00 2001 From: kasimi Date: Sun, 3 Dec 2017 18:47:17 +0100 Subject: [PATCH 4/5] [ticket/15431] Split up $template_vars PHPBB3-15431 --- phpBB/includes/ucp/ucp_register.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index f424a4e95e..b2efedadb3 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -505,7 +505,6 @@ class ucp_register { $s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields()); } - $s_hidden_fields = build_hidden_fields($s_hidden_fields); // Visual Confirmation - Show images if ($config['enable_confirm']) @@ -529,7 +528,6 @@ class ucp_register } $template_vars = array( - 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', 'USERNAME' => $data['username'], 'PASSWORD' => $data['new_password'], 'PASSWORD_CONFIRM' => $data['password_confirm'], @@ -544,13 +542,13 @@ class ucp_register 'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false, 'S_REGISTRATION' => true, 'S_COPPA' => $coppa, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), 'COOKIE_NAME' => $config['cookie_name'], 'COOKIE_PATH' => $config['cookie_path'], ); + $tz = $data['tz']; $tpl_name = 'ucp_register'; /** @@ -558,9 +556,10 @@ class ucp_register * * @event core.ucp_register_modify_template_data * @var array template_vars Array with template data - * @var array data Array with user data + * @var array data Array with user data, read only * @var array error Array with errors - * @var string s_hidden_fields HTML with hidden form field elements + * @var array s_hidden_fields Array with hidden field elements + * @var string tz The selected timezone * @var string tpl_name Template name * @since 3.2.2-RC1 */ @@ -569,12 +568,18 @@ class ucp_register 'data', 'error', 's_hidden_fields', + 'tz', 'tpl_name', ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars))); // Assign template vars for timezone select - phpbb_timezone_select($template, $user, $data['tz'], true); + phpbb_timezone_select($template, $user, $tz, true); + + $template_vars = array_merge($template_vars, array( + 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', + 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), + )); $template->assign_vars($template_vars); From 6cc46a3d39f8c9d8d36ac3d873af5c0981cd2f88 Mon Sep 17 00:00:00 2001 From: kasimi Date: Sun, 3 Dec 2017 19:02:40 +0100 Subject: [PATCH 5/5] [ticket/15431] Moved phpbb_timezone_select() before the event PHPBB3-15431 --- phpBB/includes/ucp/ucp_register.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b2efedadb3..6e010a0852 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -527,6 +527,9 @@ class ucp_register break; } + // Assign template vars for timezone select + phpbb_timezone_select($template, $user, $data['tz'], true); + $template_vars = array( 'USERNAME' => $data['username'], 'PASSWORD' => $data['new_password'], @@ -548,7 +551,6 @@ class ucp_register 'COOKIE_PATH' => $config['cookie_path'], ); - $tz = $data['tz']; $tpl_name = 'ucp_register'; /** @@ -559,7 +561,6 @@ class ucp_register * @var array data Array with user data, read only * @var array error Array with errors * @var array s_hidden_fields Array with hidden field elements - * @var string tz The selected timezone * @var string tpl_name Template name * @since 3.2.2-RC1 */ @@ -568,14 +569,10 @@ class ucp_register 'data', 'error', 's_hidden_fields', - 'tz', 'tpl_name', ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars))); - // Assign template vars for timezone select - phpbb_timezone_select($template, $user, $tz, true); - $template_vars = array_merge($template_vars, array( 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),