diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 14d8f8a3e..f2c708022 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -409,14 +409,10 @@ $template->assign( array( ); // image level options -$tpl_options = array(); -foreach ($conf['available_permission_levels'] as $level) -{ - $tpl_options[$level] = l10n( sprintf('Level %d', $level) ); -} $template->assign( array( - 'level_options'=> $tpl_options, + 'level_options'=> get_privacy_level_options(), + 'level_options_selected' => 0, ) ); diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php index 77a1d51fc..5dbeb4f68 100644 --- a/admin/element_set_unit.php +++ b/admin/element_set_unit.php @@ -138,12 +138,6 @@ $month_list = $lang['month']; $month_list[0]='------------'; ksort($month_list); -$tpl_options = array(); -foreach ($conf['available_permission_levels'] as $level) -{ - $tpl_options[$level] = l10n( sprintf('Level %d', $level) ); -} - $template->assign( array( 'CATEGORIES_NAV'=>$page['title'], @@ -156,7 +150,7 @@ $template->assign( .'&mode=global', 'F_ACTION'=>$base_url.get_query_string_diff(array()), 'month_list' => $month_list, - 'level_options' => $tpl_options + 'level_options' => get_privacy_level_options(), ) ); @@ -245,7 +239,7 @@ SELECT '&image_id='.$row['id'], 'NAME' => !empty($row['name'])?$row['name']:'', 'AUTHOR' => !empty($row['author'])?$row['author']:'', - 'LEVEL' => !empty($row['level'])?$row['level']:'', + 'LEVEL' => !empty($row['level'])?$row['level']:'0', 'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'', 'DATE_CREATION_YEAR' => $year, 'DATE_CREATION_MONTH' => (int)$month, diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php index 0f11a5970..31cfd1e4f 100644 --- a/admin/photos_add_direct.php +++ b/admin/photos_add_direct.php @@ -430,44 +430,10 @@ display_select_cat_wrapper( // image level options -$tpl_options = array(); -foreach (array_reverse($conf['available_permission_levels']) as $level) -{ - $label = null; - - if (0 == $level) - { - $label = l10n('Everybody'); - } - else - { - $labels = array(); - $sub_levels = array_reverse($conf['available_permission_levels']); - foreach ($sub_levels as $sub_level) - { - if ($sub_level == 0 or $sub_level < $level) - { - break; - } - array_push( - $labels, - l10n( - sprintf( - 'Level %d', - $sub_level - ) - ) - ); - } - - $label = implode(', ', $labels); - } - $tpl_options[$level] = $label; -} $selected_level = isset($_POST['level']) ? $_POST['level'] : 0; $template->assign( array( - 'level_options'=> $tpl_options, + 'level_options'=> get_privacy_level_options(), 'level_options_selected' => array($selected_level) ) ); diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 557f97dad..a764f0bdb 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -259,15 +259,10 @@ if ($row['has_high'] == 'true') } // image level options -$tpl_options = array(); -foreach ($conf['available_permission_levels'] as $level) -{ - $tpl_options[$level] = l10n( sprintf('Level %d', $level) ).' ('.$level.')'; -} $selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level']; $template->assign( array( - 'level_options'=> $tpl_options, + 'level_options'=> get_privacy_level_options(), 'level_options_selected' => array($selected_level) ) ); diff --git a/admin/site_update.php b/admin/site_update.php index a42139e92..c6cc69f03 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -890,11 +890,7 @@ else $cat_selected = array(); } -$tpl_introduction['privacy_level_options']=array(); -foreach ($conf['available_permission_levels'] as $level) -{ - $tpl_introduction['privacy_level_options'][$level] = l10n( sprintf('Level %d', $level) ); -} +$tpl_introduction['privacy_level_options'] = get_privacy_level_options(); $template->assign('introduction', $tpl_introduction); diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index 4db63e05c..95fe21388 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -377,7 +377,7 @@
    • diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl index f226bff84..857512c5b 100644 --- a/admin/themes/default/template/element_set_global.tpl +++ b/admin/themes/default/template/element_set_global.tpl @@ -185,12 +185,12 @@ - {'Minimum privacy level'|@translate} + {'Who can see these photos?'|@translate} diff --git a/admin/themes/default/template/element_set_unit.tpl b/admin/themes/default/template/element_set_unit.tpl index 5b295d1e8..a70d9075e 100644 --- a/admin/themes/default/template/element_set_unit.tpl +++ b/admin/themes/default/template/element_set_unit.tpl @@ -102,7 +102,7 @@ - {'Minimum privacy level'|@translate} + {'Who can see this photo?'|@translate} {html_options options=$level_options selected=$level_options_selected} diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl index 90a2562cf..b13c1ffc8 100644 --- a/admin/themes/default/template/site_update.tpl +++ b/admin/themes/default/template/site_update.tpl @@ -69,7 +69,7 @@ diff --git a/include/functions.inc.php b/include/functions.inc.php index 16be2fca4..e44421fdb 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1524,4 +1524,46 @@ function check_input_parameter($param_name, $param_array, $is_array, $pattern) } } } + + +function get_privacy_level_options() +{ + global $conf; + + $options = array(); + foreach (array_reverse($conf['available_permission_levels']) as $level) + { + $label = null; + + if (0 == $level) + { + $label = l10n('Everybody'); + } + else + { + $labels = array(); + $sub_levels = array_reverse($conf['available_permission_levels']); + foreach ($sub_levels as $sub_level) + { + if ($sub_level == 0 or $sub_level < $level) + { + break; + } + array_push( + $labels, + l10n( + sprintf( + 'Level %d', + $sub_level + ) + ) + ); + } + + $label = implode(', ', $labels); + } + $options[$level] = $label; + } + return $options; +} ?> \ No newline at end of file diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 472d6e28f..990cb98ee 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -670,6 +670,7 @@ $lang['Select files'] = 'Select files'; $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.'; $lang['Everybody'] = 'Everybody'; $lang['Who can see these photos?'] = 'Who can see these photos?'; +$lang['Who can see this photo?'] = 'Who can see this photo?'; $lang['... or switch to the old style form'] = '... or switch to the old style form'; $lang['... or switch to the multiple files form'] = '... or switch to the multiple files form'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index ded4f38ab..d2d13861d 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -671,6 +671,7 @@ $lang['Select files'] = 'Choisir des fichiers'; $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'Fichiers JPEG ou archives ZIP contenant des fichiers JPEG s\'il vous plaît.'; $lang['Everybody'] = 'Tout le monde'; $lang['Who can see these photos?'] = 'Qui peut voir ces photos ?'; +$lang['Who can see this photo?'] = 'Qui peut voir cette photo ?'; $lang['... or switch to the old style form'] = '... ou utiliser le formulaire "à l\'ancienne"'; $lang['... or switch to the multiple files form'] = '... ou utiliser le formulaire multi-fichiers'; diff --git a/picture.php b/picture.php index ecaee0caa..80679b19f 100644 --- a/picture.php +++ b/picture.php @@ -782,7 +782,7 @@ if (is_admin()) ) ); - $template->assign('available_permission_levels', $conf['available_permission_levels']); + $template->assign('available_permission_levels', get_privacy_level_options()); } // favorite manipulation diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 73bd52840..39ef2ee9d 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -222,7 +222,7 @@ y.callService( {if $display_info.privacy_level and isset($available_permission_levels) } - {'Privacy level'|@translate}: + {'Who can see this photo?'|@translate} {/if}