From 283186f3dad3dcb03910c765e40d36803238c00a Mon Sep 17 00:00:00 2001 From: William Panting Date: Thu, 17 Oct 2013 16:02:36 -0300 Subject: [PATCH 01/16] object ingest success message --- includes/ingest.form.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc index 0ed75385..b49556d7 100644 --- a/includes/ingest.form.inc +++ b/includes/ingest.form.inc @@ -773,6 +773,9 @@ function islandora_ingest_form_submit(array $form, array &$form_state) { try { islandora_add_object($object); $form_state['redirect'] = "islandora/object/{$object->id}"; + drupal_set_message( + t('"@label" (ID: @pid) has been ingested.', array('@label' => $object->label, '@pid' => $object->id)), + 'status'); } catch (Exception $e) { // If post hooks throws it may already exist at this point but may be From b91de5e64ea8915cbc6045e6dcb074e12bbcf2e8 Mon Sep 17 00:00:00 2001 From: yqjiang Date: Fri, 18 Oct 2013 12:36:41 +0000 Subject: [PATCH 02/16] add filter xss --- includes/dublin_core.inc | 3 +-- theme/islandora-dublin-core-display.tpl.php | 6 +++--- theme/theme.inc | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/includes/dublin_core.inc b/includes/dublin_core.inc index ec058181..ecfcc7b1 100644 --- a/includes/dublin_core.inc +++ b/includes/dublin_core.inc @@ -131,7 +131,7 @@ class DublinCore { $dc_label = explode(':', $field); $element_label = drupal_ucfirst($dc_label[1]); $dc_array[$field]['label'] = $element_label; - $dc_array[$field]['value'] = $value; + $dc_array[$field]['value'] = filter_xss($value); $dc_array[$field]['class'] = drupal_strtolower(preg_replace('/[^A-Za-z0-9]/', '-', $field)); $dc_array[$field]['dcterms'] = preg_replace('/^dc/', 'dcterms', $field); } @@ -140,7 +140,6 @@ class DublinCore { return $dc_array; } - /** * Creates a new instance of the class by parsing dc_xml. * diff --git a/theme/islandora-dublin-core-display.tpl.php b/theme/islandora-dublin-core-display.tpl.php index da67de18..2c2a02ee 100644 --- a/theme/islandora-dublin-core-display.tpl.php +++ b/theme/islandora-dublin-core-display.tpl.php @@ -20,11 +20,11 @@