archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 1637: make the privacy level the same everywher, use "who can see this photo?"

Browse source 
instead of "minimum privacy level".

git-svn-id: http://piwigo.org/svn/trunk@6025 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-04-30 22:38:17 +00:00
commit 10dac9de37
15 changed files with 60 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/element_set_global.php
View file

@ -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,
)
);

10
admin/element_set_unit.php
View file

@ -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,

36
admin/photos_add_direct.php
View file

@ -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)
)
);

7
admin/picture_modify.php
View file

@ -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)
)
);

6
admin/site_update.php
View file

@ -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);

2
admin/themes/default/template/configuration.tpl
View file

@ -377,7 +377,7 @@
<li>
<label>
<span class="property">{'Privacy level'|@translate} ({'available for administrators only'|@translate})</span>
<span class="property">{'Who can see this photo?'|@translate} ({'available for administrators only'|@translate})</span>
<input type="checkbox" name="picture_informations[privacy_level]" {if ($display.picture_informations.privacy_level)}checked="checked"{/if}>
</label>
</li>

4
admin/themes/default/template/element_set_global.tpl
View file

@ -185,12 +185,12 @@
</tr>
<tr>
<td>{'Minimum privacy level'|@translate}</td>
<td>{'Who can see these photos?'|@translate}</td>
<td>
<label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label>
<label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label>
<select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
{html_options options=$level_options}
{html_options options=$level_options selected=$level_options_selected}
</select>
</td>
</tr>

2
admin/themes/default/template/element_set_unit.tpl
View file

@ -102,7 +102,7 @@
</td>
</tr>
<tr>
<td><strong>{'Minimum privacy level'|@translate}</strong></td>
<td><strong>{'Who can see this photo?'|@translate}</strong></td>
<td>
<select name="level-{$element.ID}">
{html_options options=$level_options selected=$element.LEVEL}

2
admin/themes/default/template/picture_modify.tpl
View file

@ -152,7 +152,7 @@
</tr>
<tr>
<td><strong>{'Minimum privacy level'|@translate}</strong></td>
<td><strong>{'Who can see this photo?'|@translate}</strong></td>
<td>
<select name="level" size="1">
{html_options options=$level_options selected=$level_options_selected}

2
admin/themes/default/template/site_update.tpl
View file

@ -69,7 +69,7 @@
<ul style="padding-left:3em">
<li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added categories and elements, deleted categories and elements)'|@translate}</label></li>
<li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li>
<li><label>{'Minimum privacy level'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
<li><label>{'Who can see these photos?'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
</ul>
</li>
</ul>

42
include/functions.inc.php
View file

@ -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;
}
?>

1
language/en_UK/admin.lang.php
View file

@ -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';

1
language/fr_FR/admin.lang.php
View file

@ -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';

2
picture.php
View file

@ -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

6
themes/default/template/picture.tpl
View file

@ -222,7 +222,7 @@ y.callService(
{if $display_info.privacy_level and isset($available_permission_levels) }
<tr id="Privacy">
<td class="label">{'Privacy level'|@translate}:</td>
<td class="label">{'Who can see this photo?'|@translate}</td>
<td class="value">
<script type="text/javascript">
{literal}function setPrivacyLevel(selectElement, rootUrl, id, level)
@ -240,9 +240,7 @@ y.callService(
}{/literal}
</script>
<select onchange="setPrivacyLevel(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}, this.options[selectedIndex].value)">
{foreach from=$available_permission_levels item=level}
<option value="{$level}"{if $current.level==$level} selected="selected"{/if}>{$pwg->l10n($pwg->sprintf('Level %d',$level))}</option>
{/foreach}
{html_options options=$available_permission_levels selected=$current.level}
</select>
</td></tr>
{/if}