makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Minor variable naming fixes

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-12-04 00:49:37 +01:00
parent ce653db491
commit b42ca792fd
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_users_avatar.html
View file

@ -32,8 +32,8 @@
<fieldset class="quick"> <fieldset class="quick">
<input type="submit" name="update" value="{L_SUBMIT}" class="button1" /> <input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
</fieldset>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset>
</form> </form>
<!-- INCLUDEJS avatars.js --> <!-- INCLUDEJS avatars.js -->

6
phpBB/adm/style/avatars.js
View file

@ -2,14 +2,14 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_hide() {
$('#avatar_options > div').hide(); $('#avatar_options > div').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('#avatar_option_' + selected).show(); $('#avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_hide();
$('#avatar_driver').bind('change', avatar_simplify); $('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

4
phpBB/includes/acp/acp_groups.php
View file

@ -520,7 +520,7 @@ class acp_groups
if ($config['allow_avatar']) if ($config['allow_avatar'])
{ {
$avatars_enabled = false; $avatars_enabled = false;
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type'])); $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $driver) foreach ($avatar_drivers as $driver)
{ {
@ -541,7 +541,7 @@ class acp_groups
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name, 'DRIVER' => $driver_name,
'SELECTED' => $driver == $focused_driver, 'SELECTED' => $driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

4
phpBB/includes/acp/acp_users.php
View file

@ -1801,7 +1801,7 @@ class acp_users
} }
} }
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type'])); $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
foreach ($avatar_drivers as $current_driver) foreach ($avatar_drivers as $current_driver)
{ {
@ -1823,7 +1823,7 @@ class acp_users
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name, 'DRIVER' => $driver_name,
'SELECTED' => $current_driver == $focused_driver, 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

4
phpBB/includes/ucp/ucp_groups.php
View file

@ -646,7 +646,7 @@ class ucp_groups
if ($config['allow_avatar']) if ($config['allow_avatar'])
{ {
$avatars_enabled = false; $avatars_enabled = false;
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type'])); $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
foreach ($avatar_drivers as $current_driver) foreach ($avatar_drivers as $current_driver)
{ {
@ -666,7 +666,7 @@ class ucp_groups
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name, 'DRIVER' => $driver_name,
'SELECTED' => $current_driver == $focused_driver, 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -625,7 +625,7 @@ class ucp_profile
} }
} }
$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type'])); $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
foreach ($avatar_drivers as $current_driver) foreach ($avatar_drivers as $current_driver)
{ {
@ -646,7 +646,7 @@ class ucp_profile
'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_name, 'DRIVER' => $driver_name,
'SELECTED' => $current_driver == $focused_driver, 'SELECTED' => $current_driver == $selected_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

6
phpBB/styles/prosilver/template/avatars.js
View file

@ -2,14 +2,14 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_hide() {
$('#avatar_options > div').hide(); $('#avatar_options > div').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('#avatar_option_' + selected).show(); $('#avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_hide();
$('#avatar_driver').bind('change', avatar_simplify); $('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries

6
phpBB/styles/subsilver2/template/avatars.js
View file

@ -2,14 +2,14 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_hide() {
$('.[class^="avatar_option_"]').hide(); $('.[class^="avatar_option_"]').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('.avatar_option_' + selected).show(); $('.avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_hide();
$('#avatar_driver').bind('change', avatar_simplify); $('#avatar_driver').bind('change', avatar_hide);
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries