From 24cc6e667d0924828c43433593b76ee37c00b000 Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Thu, 15 May 2014 14:12:20 +0000 Subject: [PATCH] Return a key for the filter, coding standards. --- includes/utilities.inc | 16 +++++++++------- islandora.api.php | 38 +++++++++++++++++++------------------- islandora.module | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/includes/utilities.inc b/includes/utilities.inc index e5d60b95..639481ed 100644 --- a/includes/utilities.inc +++ b/includes/utilities.inc @@ -486,10 +486,12 @@ function islandora_prepare_new_object($namespace = NULL, $label = NULL, $datastr // set datastream_file by url for the given scheme. Https (SSL) can // cause this to fail, and trigger an output log in watchdog. $datastream_file = url($ds['datastream_file'], array('absolute' => TRUE)); - watchdog('islandora', - 'Attempting to ingest %file in islandora_prepare_new_object(), but it does not appear to be readable. We will pass the path through url(), and pass along as such.', - array('%file' => $datastream_file), - WATCHDOG_WARNING); + watchdog( + 'islandora', + 'Attempting to ingest %file in islandora_prepare_new_object(), but it does not appear to be readable. We will pass the path through url(), and pass along as such.', + array('%file' => $datastream_file), + WATCHDOG_WARNING + ); } } @@ -859,9 +861,9 @@ function islandora_deprecated($release, $solution = NULL) { assert($bt[0]['function'] == __FUNCTION__); $function = $bt[1]['function']; $message = t('@function() has been deprecated. As of @release, please update your code before the next release.', array( - '@function' => $function, - '@release' => $release, - )); + '@function' => $function, + '@release' => $release, + )); if (isset($solution)) { $message .= "
\n" . $solution; } diff --git a/islandora.api.php b/islandora.api.php index 7031a693..dad43838 100644 --- a/islandora.api.php +++ b/islandora.api.php @@ -57,7 +57,7 @@ function hook_islandora_view_print_object($object) { * @return array * An array whose values are markup. */ -function hook_CMODEL_PID_islandora_view_object($object) { +function hook_cmodel_pid_islandora_view_object($object) { } @@ -82,7 +82,7 @@ function hook_islandora_view_object_alter(&$object, &$rendered) { * @param array $rendered * The array of rendered views. */ -function hook_CMODEL_PID_islandora_view_object_alter(&$object, &$rendered) { +function hook_cmodel_pid_islandora_view_object_alter(&$object, &$rendered) { } /** @@ -109,7 +109,7 @@ function hook_islandora_edit_object($object) { * @return array * An array whose values are markup. */ -function hook_CMODEL_PID_islandora_edit_object($object) { +function hook_cmodel_pid_islandora_edit_object($object) { } /** @@ -160,7 +160,7 @@ function hook_islandora_object_alter(AbstractObject $object, array &$context) { * * @see hook_islandora_object_alter() */ -function hook_CMODEL_PID_islandora_object_alter(AbstractObject $object, array &$context) { +function hook_cmodel_pid_islandora_object_alter(AbstractObject $object, array &$context) { } /** @@ -209,7 +209,7 @@ function hook_islandora_datastream_alter(AbstractObject $object, AbstractDatastr * * @see hook_islandora_datastream_alter() */ -function hook_CMODEL_PID_DSID_islandora_datastream_alter(AbstractObject $object, AbstractDatastream $datastream, array &$context) { +function hook_cmodel_pid_dsid_islandora_datastream_alter(AbstractObject $object, AbstractDatastream $datastream, array &$context) { } /** @@ -233,7 +233,7 @@ function hook_islandora_object_ingested(AbstractObject $object) { * * @see hook_islandora_object_ingested() */ -function hook_CMODEL_PID_islandora_object_ingested(AbstractObject $object) { +function hook_cmodel_pid_islandora_object_ingested(AbstractObject $object) { } /** @@ -258,7 +258,7 @@ function hook_islandora_object_modified(AbstractObject $object) { * * @see hook_islandora_object_modified() */ -function hook_CMODEL_PID_islandora_object_modified(AbstractObject $object) { +function hook_cmodel_pid_islandora_object_modified(AbstractObject $object) { } /** @@ -278,7 +278,7 @@ function hook_islandora_object_purged($pid) { * * @see hook_islandora_object_purged() */ -function hook_CMODEL_PID_islandora_object_purged($pid) { +function hook_cmodel_pid_islandora_object_purged($pid) { } /** @@ -303,7 +303,7 @@ function hook_islandora_datastream_ingested(AbstractObject $object, AbstractData * * @see hook_islandora_object_ingested() */ -function hook_CMODEL_PID_DSID_islandora_datastream_ingested(AbstractObject $object, AbstractDatastream $datastream) { +function hook_cmodel_pid_dsid_islandora_datastream_ingested(AbstractObject $object, AbstractDatastream $datastream) { } /** @@ -330,7 +330,7 @@ function hook_islandora_datastream_modified(AbstractObject $object, AbstractData * * @see hook_islandora_datastream_modified() */ -function hook_CMODEL_PID_islandora_datastream_modified(AbstractObject $object, AbstractDatastream $datastream) { +function hook_cmodel_pid_islandora_datastream_modified(AbstractObject $object, AbstractDatastream $datastream) { } /** @@ -352,7 +352,7 @@ function hook_islandora_datastream_purged(AbstractObject $object, $dsid) { * * @see hook_islandora_datastream_purged() */ -function hook_CMODEL_PID_islandora_datastream_purged(AbstractObject $object, $dsid) { +function hook_cmodel_pid_islandora_datastream_purged(AbstractObject $object, $dsid) { } /** @@ -489,11 +489,11 @@ function hook_islandora_ingest_steps_alter(array &$steps, array &$form_state) { * * @see hook_islandora_ingest_steps() */ -function hook_CMODEL_PID_islandora_ingest_steps(array $form_state) { +function hook_cmodel_pid_islandora_ingest_steps(array $form_state) { } /** -* Alter the generated ingest steps for the given content model. + * Alter the generated ingest steps for the given content model. * * @param array $steps * An array of steps as generated by hook_islandora_ingest_steps(). @@ -501,7 +501,7 @@ function hook_CMODEL_PID_islandora_ingest_steps(array $form_state) { * @param array $form_state * An array containing the Drupal form_state. */ -function hook_CMODEL_PID_islandora_ingest_steps_alter(array &$steps, array &$form_state) { +function hook_cmodel_pid_islandora_ingest_steps_alter(array &$steps, array &$form_state) { } /** @@ -540,7 +540,7 @@ function hook_islandora_object_access($op, $object, $user) { * * @see hook_islandora_object_access() */ -function hook_CMODEL_PID_islandora_object_access($op, $object, $user) { +function hook_cmodel_pid_islandora_object_access($op, $object, $user) { } /** @@ -579,7 +579,7 @@ function hook_islandora_datastream_access($op, $object, $user) { * * @see hook_islandora_datastream_access() */ -function hook_CMODEL_PID_islandora_datastream_access($op, $object, $user) { +function hook_cmodel_pid_islandora_datastream_access($op, $object, $user) { } /** @@ -594,7 +594,7 @@ function hook_islandora_overview_object(AbstractObject $object) { * * Content model specific. */ -function hook_CMODEL_PID_islandora_overview_object(AbstractObject $object) { +function hook_cmodel_pid_islandora_overview_object(AbstractObject $object) { return drupal_render(drupal_get_form('some_form', $object)); } /** @@ -609,7 +609,7 @@ function hook_islandora_overview_object_alter(AbstractObject &$object, &$output) * * Content model specific. */ -function hook_CMODEL_PID_islandora_overview_object_alter(AbstractObject &$object, &$output) { +function hook_cmodel_pid_islandora_overview_object_alter(AbstractObject &$object, &$output) { $output = $output . drupal_render(drupal_get_form('some_form', $object)); } @@ -694,7 +694,7 @@ function hook_islandora_derivative(AbstractObject $object = NULL) { * * @see hook_islandora_derivative() */ -function hook_CMODEL_PID_islandora_derivative() { +function hook_cmodel_pid_islandora_derivative() { } diff --git a/islandora.module b/islandora.module index 1fa1148f..ef299215 100644 --- a/islandora.module +++ b/islandora.module @@ -1728,7 +1728,7 @@ function islandora_islandora_basic_collection_get_query_filters() { if ($enforced) { $namespace_array = islandora_get_allowed_namespaces(); $namespace_sparql = implode('|', $namespace_array); - return format_string('regex(str(?object), "info:fedora/(!namespaces):")', array('!namespaces' => $namespace_sparql)); + return array('islandora_namespace_restrictions' => format_string('regex(str(?object), "info:fedora/(!namespaces):")', array('!namespaces' => $namespace_sparql))); } }