diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-27 13:34:17 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-27 13:34:17 +0200 |
| commit | 2bfbc07b7db8fbd5506b61a4e988363bfe955467 (patch) | |
| tree | 5ce36773def5a02163303aaf6682fd04d4931ca7 /phpBB/includes/ucp | |
| parent | 5442a2596718ea2ce81dfa31c44549f62311cd47 (diff) | |
| parent | b39b3da5af89d9687ff5e985244695131d36c753 (diff) | |
| download | forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.gz forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.bz2 forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.tar.xz forums-2bfbc07b7db8fbd5506b61a4e988363bfe955467.zip | |
Merge pull request #4021 from marc1706/ticket/14272
[ticket/14272] Use html5 valid input elements
* marc1706/ticket/14272:
[ticket/14272] Allow input of floats for filesize
[ticket/14272] Use input type number instead of text in avatars
[ticket/14272] Assign min and max values for avatar driver settings
[ticket/14272] Define min and max values for avatar width and height
[ticket/14272] Disable not toggled form elements
[ticket/14272] Make sure phpbb_avatar_manager was defined
[ticket/14272] Remove useless check
[ticket/14272] Fix invalid or missing min/max settings
[ticket/14272] Assign min/max for all allowed types
[ticket/14272] Only use maxlength and size for allowed input elements
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 7 |
2 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index b9606945b4..86a8226d5b 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -462,9 +462,11 @@ class ucp_groups $avatar_data = null; $avatar_error = array(); + /** @var \phpbb\avatar\manager $phpbb_avatar_manager */ + $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); + if ($config['allow_avatar']) { - $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers(); // This is normalised data, without the group_ prefix @@ -649,6 +651,14 @@ class ucp_groups $avatars_enabled = false; $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type'])); + // Assign min and max values before generating avatar driver html + $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) { $driver = $phpbb_avatar_manager->get_driver($current_driver); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index be0833254b..2708a8dedf 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -638,6 +638,13 @@ class ucp_profile $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) { $driver = $phpbb_avatar_manager->get_driver($current_driver); |