/drupal7/sites/all/modules/file_entity/file_entity.module - Diff - Club Drupal - Forge Centrale Marseille

Révision 59ae487e

Ajouté par Assos Assos il y a presque 7 ans

ID 59ae487e168119e2d2993c24c22dd9f9ebbf774f
Parent e6d32a8d
Enfant 05237dd8

Weekly update of contrib modules

      * access conditions are added for field values belonging to files only.
      */
     function file_entity_query_entity_field_access_alter(QueryAlterableInterface $query) {
       //_file_entity_query_file_entity_access_alter($query, 'entity');
       _file_entity_query_file_entity_access_alter($query, 'entity');
+    }
     /**
-...
       $tables = $query->getTables();
       $base_table = $query->getMetaData('base_table');
       // Do not use the base table for general entity queries unless this is
       // querying the file_managed table directly.
       if ($base_table && $type == 'entity' && $base_table != 'file_managed') {
         $base_table = '';
+      }
       // If no base table is specified explicitly, search for one.
       if (!$base_table) {
         $fallback = '';
-...
                   $fallback = $table;
+                }
+              }
               elseif (isset($schema['fields']['entity_id']) && isset($schema['fields']['entity_type']) && isset($schema['fields']['deleted']) && isset($schema['fields']['delta'])) {
                 // The table is a field data table, use it as fallback.
                 $base_table = $table;
+              }
+            }
+          }
+        }
-...
             $base_table = $fallback;
+          }
           else {
             // Ignore this query as it was a general field query and no
             // relationships were found to the file_managed table.
             if ($type == 'entity') {
               return;
+            }
             throw new Exception(t('Query tagged for file access but there is no fid. Add foreign keys to file_managed.fid in schema to fix.'));
+          }
+        }
-...
+            }
+          }
           if ($subquery_conditions->count()) {
           // If there is no subquery conditions, the query is likely for file usage.
           // Or user can only access public files.
           // If there are subquery conditions then add them to the subquery.
           if ($subquery_conditions->count() >= 1) {
             $subquery->condition($subquery_conditions);
+          }
             $field = 'fid';
             // Now handle entities.
             if ($type == 'entity') {
               // Set a common alias for entities.
               $base_alias = $falias;
               $field = 'entity_id';
+            }
             $subquery->where("$falias.$field = fm_access.fid");
           $field = 'fid';
           // Now handle entities.
           if ($type == 'entity') {
             // Set a common alias for entities.
             $base_alias = $falias;
             $field = ($falias == 'file_managed' ? 'fid' : 'entity_id');
+          }
           $subquery->where("$falias.$field = fm_access.fid");
             // For an entity query, attach the subquery to entity conditions.
             if ($type == 'entity') {
               $file_conditions->exists($subquery);
+            }
             // Otherwise attach it to the node query itself.
             elseif ($table == 'file_managed') {
               // Fix for https://drupal.org/node/2073085
               $db_or = db_or();
               $db_or->exists($subquery);
               $db_or->isNull($falias . '.' . $field);
               $query->condition($db_or);
+            }
             else {
               $query->exists($subquery);
+            }
           // For an entity query, attach the subquery to entity conditions.
           if ($type == 'entity') {
             $file_conditions->exists($subquery);
+          }
           // Otherwise attach it to the node query itself.
           elseif ($table == 'file_managed') {
             // Fix for https://drupal.org/node/2073085
             $db_or = db_or();
             $db_or->exists($subquery);
             $db_or->isNull($falias . '.' . $field);
             $query->condition($db_or);
+          }
           else {
             $query->exists($subquery);
+          }
+        }
+      }
-...
       if ($type == 'entity' && $file_conditions->count()) {
         // All the file access conditions are only for field values belonging to
         // files.
         $file_conditions->condition("$base_alias.entity_type", 'file');
         $or = db_or();
         $or->condition($file_conditions);
         // If the field value belongs to a non-file entity type then this function
         // does not do anything with it.
         $or->condition("$base_alias.entity_type", 'file', '<>');
         // Add the compiled set of rules to the query.
         $query->condition($or);
         if ($base_alias !== 'file_managed') {
           $file_conditions->condition("$base_alias.entity_type", 'file');
           $or = db_or();
           $or->condition($file_conditions);
           // If the field value belongs to a non-file entity type then this function
           // does not do anything with it.
           $or->condition("$base_alias.entity_type", 'file', '<>');
           // Add the compiled set of rules to the query.
           $query->condition($or);
+        }
         else {
           $query->condition($file_conditions);
+        }
+      }
+    }
-...
+    }
     function file_entity_file_get_mimetype_type($file) {
       if (is_array($file)) {
         $file = (object) $file;
+      }
       list($type, $subtype) = explode('/', $file->filemime, 2);
       return $type;
+    }
-...
         $pipe['variable'][] = "pathauto_file_{$file_type}_pattern";
+      }
+    }

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision 59ae487e

Ajouté par Assos Assos il y a presque 7 ans