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

instead of "minimum privacy level".

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

1 files changed, 1 insertions, 35 deletions

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