diff --git a/includes/orphaned_objects.inc b/includes/orphaned_objects.inc index 829b4811..f7100acf 100644 --- a/includes/orphaned_objects.inc +++ b/includes/orphaned_objects.inc @@ -16,7 +16,7 @@ * @return array * An array containing the form to be rendered. */ -function islandora_orphaned_objects_manage_form($form, $form_state) { +function islandora_manage_orphaned_objects_form($form, $form_state) { if (isset($form_state['show_confirm'])) { $pids = $form_state['pids_to_delete']; if (count($form_state['pids_to_delete']) == 1) { @@ -40,7 +40,7 @@ function islandora_orphaned_objects_manage_form($form, $form_state) { '#type' => 'submit', '#value' => t('Confirm'), '#weight' => 2, - '#submit' => array('islandora_orphaned_objects_manage_confirm_submit'), + '#submit' => array('islandora_manage_orphaned_objects_confirm_submit'), ); $form['cancel_submit'] = array( '#type' => 'submit', @@ -71,14 +71,14 @@ function islandora_orphaned_objects_manage_form($form, $form_state) { $form['submit_selected'] = array( '#type' => 'submit', '#name' => 'islandora-orphaned-objects-submit-selected', - '#validate' => array('islandora_orphaned_objects_manage_delete_selected_validate'), - '#submit' => array('islandora_orphaned_objects_manage_delete_submit'), + '#validate' => array('islandora_delete_selected_orphaned_objects_validate'), + '#submit' => array('islandora_delete_orphaned_objects_submit'), '#value' => t('Delete Selected'), ); $form['submit_all'] = array( '#type' => 'submit', '#name' => 'islandora-orphaned-objects-submit-all', - '#submit' => array('islandora_orphaned_objects_manage_delete_submit'), + '#submit' => array('islandora_delete_orphaned_objects_submit'), '#value' => t('Delete All'), ); } @@ -93,7 +93,7 @@ function islandora_orphaned_objects_manage_form($form, $form_state) { * @param array $form_state * An array containing the Drupal form state. */ -function islandora_orphaned_objects_manage_delete_selected_validate($form, $form_state) { +function islandora_delete_selected_orphaned_objects_validate($form, $form_state) { $selected = array_filter($form_state['values']['management_table']); if (empty($selected)) { form_error($form['management_table'], t('At least one object must be selected to delete!')); @@ -107,7 +107,7 @@ function islandora_orphaned_objects_manage_delete_selected_validate($form, $form * @param array $form_state * An array containing the Drupal form state. */ -function islandora_orphaned_objects_manage_delete_submit(&$form, &$form_state) { +function islandora_delete_orphaned_objects_submit(&$form, &$form_state) { if ($form_state['triggering_element']['#name'] == 'islandora-orphaned-objects-submit-selected') { $selected = array_keys(array_filter($form_state['values']['management_table'])); } @@ -127,8 +127,8 @@ function islandora_orphaned_objects_manage_delete_submit(&$form, &$form_state) { * @param array $form_state * An array containing the Drupal form state. */ -function islandora_orphaned_objects_manage_confirm_submit($form, &$form_state) { - $batch = islandora_orphaned_objects_delete_create_batch($form_state['pids_to_delete']); +function islandora_manage_orphaned_objects_confirm_submit($form, &$form_state) { + $batch = islandora_delete_orphaned_objects_create_batch($form_state['pids_to_delete']); batch_set($batch); } @@ -199,17 +199,17 @@ EOQ; * @return array * An array detailing the batch that is about to be run. */ -function islandora_orphaned_objects_delete_create_batch($pids) { +function islandora_delete_orphaned_objects_create_batch($pids) { // Set up a batch operation. $batch = array( 'operations' => array( - array('islandora_orphaned_objects_delete_batch_operation', array($pids)), + array('islandora_delete_orphaned_objects_batch_operation', array($pids)), ), 'title' => t('Deleting the selected objects...'), 'init_message' => t('Preparing to delete objects.'), 'progress_message' => t('Time elapsed: @elapsed
Estimated time remaining @estimate.'), 'error_message' => t('An error has occurred.'), - 'finished' => 'islandora_orphaned_objects_delete_batch_finished', + 'finished' => 'islandora_delete_orphaned_objects_batch_finished', 'file' => drupal_get_path('module', 'islandora') . '/includes/orphaned_objects.inc', ); return $batch; @@ -222,7 +222,7 @@ function islandora_orphaned_objects_delete_create_batch($pids) { * @param array $context * The context of the Drupal batch. */ -function islandora_orphaned_objects_delete_batch_operation($pids, &$context) { +function islandora_delete_orphaned_objects_batch_operation($pids, &$context) { if (empty($context['sandbox'])) { $context['sandbox'] = array(); $context['sandbox']['progress'] = 0; @@ -255,7 +255,7 @@ function islandora_orphaned_objects_delete_batch_operation($pids, &$context) { * @param array $operations * The operations array that was used in the batch. */ -function islandora_orphaned_objects_delete_batch_finished($success, $results, $operations) { +function islandora_delete_orphaned_objects_batch_finished($success, $results, $operations) { if ($success) { $message = format_plural(count($results['success']), 'One object deleted.', '@count objects deleted.'); } diff --git a/islandora.module b/islandora.module index ee2cc6b2..38d4c4d4 100644 --- a/islandora.module +++ b/islandora.module @@ -39,6 +39,7 @@ define('ISLANDORA_MANAGE_DELETED_OBJECTS', 'manage deleted objects'); define('ISLANDORA_REVERT_DATASTREAM', 'revert to old datastream'); define('ISLANDORA_REGENERATE_DERIVATIVES', 'regenerate derivatives for an object'); define('ISLANDORA_REPLACE_DATASTREAM_CONTENT', 'replace a datastream with new content, preserving version history'); +define('ISLANDORA_MANAGE_ORPHANED_OBJECTS', 'view and delete a list of orphaned objects'); // Hooks. define('ISLANDORA_VIEW_HOOK', 'islandora_view_object'); @@ -401,7 +402,7 @@ function islandora_menu() { 'title' => 'Orphaned Islandora objects', 'description' => 'List of orphaned Islandora objects.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('islandora_orphaned_objects_manage_form'), + 'page arguments' => array('islandora_manage_orphaned_objects_form'), 'access arguments' => array('ISLANDORA_MANAGE_ORPHANED_OBJECTS'), 'file' => 'includes/orphaned_objects.inc', );