diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/picture_modify.php | 15 | ||||
| -rw-r--r-- | admin/user_list.php | 11 |
2 files changed, 23 insertions, 3 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 052b03330..f40bae137 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -75,6 +75,7 @@ if (isset($_POST['submit']) and count($page['errors']) == 0 and !is_adviser()) $data{'id'} = $_GET['image_id']; $data{'name'} = $_POST['name']; $data{'author'} = $_POST['author']; + $data['level'] = $_POST['level']; if ($conf['allow_html_descriptions']) { @@ -274,6 +275,20 @@ if ($row['has_high'] == 'true') ); } +// image level options +$blockname = 'level_option'; +$selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level']; +foreach ($conf['available_permission_levels'] as $level) +{ + $template->assign_block_vars( + $blockname, + array( + 'VALUE' => $level, + 'CONTENT' => l10n( sprintf('Level %d', $level) ), + 'SELECTED' => ($level==$selected_level ? 'selected="selected"' : ''), + )); +} + // creation date unset($day, $month, $year); diff --git a/admin/user_list.php b/admin/user_list.php index 8845f4ebe..f9f92cbad 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -179,7 +179,9 @@ check_status(ACCESS_ADMINISTRATOR); $page['order_by_items'] = array( 'id' => $lang['registration_date'], - 'username' => $lang['Username'] + 'username' => $lang['Username'], + 'level' => l10n('Privacy level'), + 'language' => l10n('language'), ); $page['direction_items'] = array( @@ -830,7 +832,10 @@ foreach ($visible_user_list as $num => $local_user) } $properties = array(); - $properties[] = l10n( sprintf('Level %d', $local_user['level']) ); + if ( $local_user['level'] != 0 ) + { + $properties[] = l10n( sprintf('Level %d', $local_user['level']) ); + } $properties[] = (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']; @@ -853,7 +858,7 @@ foreach ($visible_user_list as $num => $local_user) ? '<BR />['.l10n('adviser').']' : ''), 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, - 'PROPERTIES' => implode( ',', $properties), + 'PROPERTIES' => implode( ', ', $properties), ) ); trigger_action('loc_assign_block_var_local_user_list', $local_user); |