From 41b0b8c5f92c77e406c8fc96c810749cf99b4409 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 6 Apr 2014 23:55:46 -0700 Subject: [ticket/12254] Better language switching on registration page PHPBB3-12254 --- phpBB/phpbb/user.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'phpBB/phpbb/user.php') diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index b9b3896606..fceeb53946 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,21 @@ class user extends \phpbb\session } else { - $user_lang_name = basename($config['default_lang']); + $change_lang = request_var('change_lang', ''); + if ($change_lang) + { + global $SID, $_EXTRA_URL; + + $use_lang = basename($change_lang); + $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); + $this->data['user_lang'] = $user_lang_name; + $SID .= '&change_lang=' . $user_lang_name; + $_EXTRA_URL[] = 'change_lang=' . $user_lang_name; + } + else + { + $user_lang_name = basename($config['default_lang']); + } $user_date_format = $config['default_dateformat']; $user_timezone = $config['board_timezone']; @@ -189,7 +203,7 @@ class user extends \phpbb\session $style_id = $style_request; $SID .= '&style=' . $style_id; - $_EXTRA_URL = array('style=' . $style_id); + $_EXTRA_URL[] = 'style=' . $style_id; } else { -- cgit v1.2.1 From a5940ede5bc8a7594b84fd4b489ada2110ecbdcc Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 01:38:24 -0700 Subject: [ticket/12254] Stop using deprecated request_var in user class PHPBB3-12254 --- phpBB/phpbb/user.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb/user.php') diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index fceeb53946..d9ff75b997 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -69,7 +69,7 @@ class user extends \phpbb\session */ function setup($lang_set = false, $style_id = false) { - global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; + global $db, $request, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; global $phpbb_dispatcher; if ($this->data['user_id'] != ANONYMOUS) @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = request_var('change_lang', ''); + $change_lang = $request->variable('change_lang', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -196,7 +196,7 @@ class user extends \phpbb\session } unset($lang_set_ext); - $style_request = request_var('style', 0); + $style_request = $request->variable('style', 0); if ($style_request && (!$config['override_user_style'] || $auth->acl_get('a_styles')) && !defined('ADMIN_START')) { global $SID, $_EXTRA_URL; -- cgit v1.2.1 From daae87d65a20664af09a002f90483cc75e84d01f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 09:14:58 -0700 Subject: [ticket/12254] Use new set_lang var to avoid conflict with change_lang PHPBB3-12254 --- phpBB/phpbb/user.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb/user.php') diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index d9ff75b997..36f72a69b9 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('change_lang', ''); + $change_lang = $request->variable('set_lang', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -88,8 +88,8 @@ class user extends \phpbb\session $use_lang = basename($change_lang); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $this->data['user_lang'] = $user_lang_name; - $SID .= '&change_lang=' . $user_lang_name; - $_EXTRA_URL[] = 'change_lang=' . $user_lang_name; + $SID .= '&set_lang=' . $user_lang_name; + $_EXTRA_URL[] = 'set_lang=' . $user_lang_name; } else { -- cgit v1.2.1 From 60be5021900d0907ca65f83d11ae4f0b5ce090b0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 11 Apr 2014 08:50:15 -0700 Subject: [ticket/12254] Use 'language' instead of 'set_lang' as the variable name PHPBB3-12254 --- phpBB/phpbb/user.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/phpbb/user.php') diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 36f72a69b9..628ddd8e59 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('set_lang', ''); + $change_lang = $request->variable('language', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -88,8 +88,8 @@ class user extends \phpbb\session $use_lang = basename($change_lang); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $this->data['user_lang'] = $user_lang_name; - $SID .= '&set_lang=' . $user_lang_name; - $_EXTRA_URL[] = 'set_lang=' . $user_lang_name; + $SID .= '&language=' . $user_lang_name; + $_EXTRA_URL[] = 'language=' . $user_lang_name; } else { -- cgit v1.2.1 From 78325736b1560c17713b5207c53fe0af582fab0b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 2 May 2014 12:08:35 -0700 Subject: [ticket/12254] Use a cookie instead of SID to store language selection PHPBB3-12254 --- phpBB/phpbb/user.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'phpBB/phpbb/user.php') diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 628ddd8e59..c2dcc9db7a 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,16 +80,12 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('language', ''); + $change_lang = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); if ($change_lang) { - global $SID, $_EXTRA_URL; - $use_lang = basename($change_lang); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $this->data['user_lang'] = $user_lang_name; - $SID .= '&language=' . $user_lang_name; - $_EXTRA_URL[] = 'language=' . $user_lang_name; } else { @@ -203,7 +199,7 @@ class user extends \phpbb\session $style_id = $style_request; $SID .= '&style=' . $style_id; - $_EXTRA_URL[] = 'style=' . $style_id; + $_EXTRA_URL = array('style=' . $style_id); } else { -- cgit v1.2.1