|
|
|
@ -1803,31 +1803,6 @@ function islandora_islandora_metadata_display_info() {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
* Implements hook_islandora_datastream_access(). |
|
|
|
|
*/ |
|
|
|
|
function islandora_islandora_datastream_access($op, AbstractDatastream $datastream, $user) { |
|
|
|
|
module_load_include('inc', 'islandora', 'includes/utilities'); |
|
|
|
|
$result = islandora_namespace_accessible($datastream->parent->id) && user_access($op, $user); |
|
|
|
|
|
|
|
|
|
if ($result && $op == ISLANDORA_REGENERATE_DERIVATIVES) { |
|
|
|
|
module_load_include('inc', 'islandora', 'includes/derivatives'); |
|
|
|
|
$applicable_hook = FALSE; |
|
|
|
|
$object = $datastream->parent; |
|
|
|
|
$hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); |
|
|
|
|
$hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object); |
|
|
|
|
foreach ($hooks as $hook) { |
|
|
|
|
if ($hook['destination_dsid'] == $datastream->id && islandora_datastream_access(ISLANDORA_VIEW_OBJECTS, $object[$hook['source_dsid']], $user)) { |
|
|
|
|
$applicable_hook = TRUE; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (!$applicable_hook) { |
|
|
|
|
$result = FALSE; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return $result; |
|
|
|
|
======= |
|
|
|
|
* Determines the server's operating system. |
|
|
|
|
* |
|
|
|
|
* @return string |
|
|
|
@ -1841,5 +1816,4 @@ function islandora_os_check() {
|
|
|
|
|
return 'Windows'; |
|
|
|
|
} |
|
|
|
|
return 'Unix'; |
|
|
|
|
>>>>>>> parent of db28487... ISLANDORA-441 Merging outside commits made since 1/9/2014. |
|
|
|
|
} |
|
|
|
|