Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

lib/classes/databox/field.class.php

@@ -190,7 +190,7 @@ class databox_field implements cache_cacheableInterface
     }
     catch (Exception $e)
     {
-      
+
     }
 
     if ($row['dces_element'])
@@ -667,7 +667,7 @@ class databox_field implements cache_cacheableInterface
     }
     catch (Exception $e)
     {
-      
+
     }
 
     return $this;

lib/classes/databox/status.class.php

@@ -160,8 +160,20 @@ class databox_status
 
     $sbas_ids = $user->ACL()->get_granted_sbas();
 
+    $see_all = array();
+
     foreach ($sbas_ids as $databox)
     {
+      $see_all[$databox->get_sbas_id()] = false;
+
+      foreach($databox->get_collections() as $collection)
+      {
+        if($user->ACL()->has_right_on_base($collection->get_base_id(), 'chgstatus'))
+        {
+          $see_all[$databox->get_sbas_id()] = true;
+          break;
+        }
+      }
       try
       {
         $statuses[$databox->get_sbas_id()] = $databox->get_statusbits();
@@ -177,15 +189,15 @@ class databox_status
     foreach ($statuses as $sbas_id => $status)
     {
 
-      $see_all = false;
+      $see_this = isset($see_all[$sbas_id]) ? $see_all[$sbas_id] : false;
 
       if ($user->ACL()->has_right_on_sbas($sbas_id, 'bas_modify_struct'))
-        $see_all = true;
+        $see_this = true;
 
       foreach ($status as $bit => $props)
       {
 
-        if ($props['searchable'] == 0 && !$see_all)
+        if ($props['searchable'] == 0 && !$see_this)
           continue;
 
         $set = false;

lib/classes/databox/subdefAbstract.class.php

@@ -22,7 +22,7 @@ abstract class databox_subdefAbstract
    *
    * @var boolean
    */
-  protected $debug = true;
+  protected $debug = false;
   /**
    *
    * @var string

lib/classes/databox/subdefsStructure.class.php

@@ -65,6 +65,7 @@ class databox_subdefsStructure implements IteratorAggregate
     );
 
     if (!$sx_struct)
+
       return $this;
 
     $subdefgroup = $sx_struct->subdefs[0];