feature 731: permissions at image level

 - possibility to change image level from picture_modify
 - language change "Public" to "---"
 - possibility to sort users by level on user_list page

git-svn-id: http://piwigo.org/svn/trunk@2090 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 36 insertions, 5 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);
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 1f4b379f6..ca16d9ba6 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -643,7 +643,7 @@ $lang['Thumbnails'] = 'Thumbnails';
 $lang['obligatory_user_mail_address'] = 'Mail address is obligatory for all users';
 $lang['Minimum privacy level'] = 'Minimum privacy level';
 $lang['Privacy level'] = 'Privacy level';
-$lang['Level 0'] = 'Public';
+$lang['Level 0'] = '---';
 $lang['Level 1'] = 'Contacts';
 $lang['Level 2'] = 'Friends';
 $lang['Level 4'] = 'Family';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 5c9f5ead4..77b606a83 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -644,7 +644,7 @@ $lang['Thumbnails'] = 'Miniatures';
 $lang['obligatory_user_mail_address'] = 'L\'adresse mail est obligatoire pour tous les utilisateurs';
 $lang['Minimum privacy level'] = 'Niveau minimal de confidentialité';
 $lang['Privacy level'] = 'Niveau de confidentialité';
-$lang['Level 0'] = 'Public';
+$lang['Level 0'] = '---';
 $lang['Level 1'] = 'Contacts';
 $lang['Level 2'] = 'Amis';
 $lang['Level 4'] = 'Famille';
diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 283cae73a..931d20809 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -116,6 +116,17 @@
         <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
       </tr>
 
+	<tr>
+		<td><strong>{lang:Minimum privacy level}</strong></td>
+		<td>
+			<select name="level" size="1">
+			<!-- BEGIN level_option -->
+			<option {level_option.SELECTED} value="{level_option.VALUE}">{level_option.CONTENT} ({level_option.VALUE})</option>
+			<!-- END level_option -->
+			</select>
+	  </td>
+	</tr>
+
     </table>
 
     <p style="text-align:center;">