From aa7b52f2ac07e71b5a519854d27e0ad86fa043e4 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Wed, 6 Feb 2013 21:44:05 +0100 Subject: [PATCH 1/4] File naming conventions. --- LICENSE => LICENSE.txt | 0 README => README.txt | 0 tests/{README => README.txt} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename LICENSE => LICENSE.txt (100%) rename README => README.txt (100%) rename tests/{README => README.txt} (100%) diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/README b/README.txt similarity index 100% rename from README rename to README.txt diff --git a/tests/README b/tests/README.txt similarity index 100% rename from tests/README rename to tests/README.txt From 01f619b38c9ab4097dab05ebd08f364b8d619984 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Wed, 6 Feb 2013 21:44:20 +0100 Subject: [PATCH 2/4] Removing unused image. --- images/Crystal_Clear_action_filenew.png | Bin 1874 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/Crystal_Clear_action_filenew.png diff --git a/images/Crystal_Clear_action_filenew.png b/images/Crystal_Clear_action_filenew.png deleted file mode 100644 index 7338dfe9975a30553b2081d03e987f83299773fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1874 zcmV-Y2d(&tP)S6ngX^2#R>{!DbIj(0uBL&yKu*eo_dml=q#V z-#7j60cz~#CPwqQGfWIY8i3}s!|%l@0D~1C;^qVqSSi@IO*3!-2>&BUnyk^}X7kwz zAxNtMmN(V;7ZD&PtK82OMDy^ONz?)hrG^MT_P?^YMT0pyc+G73Io6o-wV0) zC<43nL16?+b%A6Oc!)^9iy~-aw@ws9pu7SkPHe5#2;u2swH68?P*4G*%HjZl2XvwJ zUI7H!DIl2$T^g--awAXv&ECsQ{d*3OylQ8Ki;q70{qP;&+mX@XF%ap|cqgD5U_y-v9R2iH+lnUIxz*fev<2<0>8Qd5MoVa8knoctJNX6jMhJLEk7D z{t?Ph3iQTK+H6DarAa#nfaxc}U{1ptkRcV+gH%X=jd^xZhwa#OG%A8g1Tq4lf57l3-3?mp6#lGleBo*w`-(O{(D^MGi#mZXYD1vx>lD-axN9Sc! zvcg+p$y#6r8|D3a&>QZM-><-ym>F9rn~6@vh$*HW$0a6*$+$>Re|$ znlFdP4_}m31F9l_IZFWY7Ve64fpq!1#S|bk0+IjX-byH7*zwLt4Jf8mtIFZ$R)DO4 z{AWS|8_m8Lx?42XYOt!ce*^$ei}@cNexgV?4KVU0^cJS(7f1=Y|2IItmaIoD$`oVBX+m@fsksp7~O` zfXH~E(PT#P9+cY&PJiypXu#S!!E)S((6b9{zV%YZ2b3SWS5yHqa=E%14!`^kGSz#C zhzS?m5^8`5U8t;6=vfmWV-f5hZcz}MyUcdWKQAztH#1l0Dh{j2T&g^ze+#C9R=E13 zLYK%S6;RYJ=fB`}f-%ff)wi z>2PXH@gk@<2r=u6p{*h~>sEMcF;v6~kJm`l?Eo{a0H?SWwprI0K(}}o*g;#{Bv{Ej zd8q)F0WjFjYQhZ3u`H7u);jqB$Upu(xBoFDCi9VhemM9jV~_2i z?#j>sy1`9vWhlt-GY0=kNrb*T_?Z`bEK`rfOT3~4miX;bo?B}R+|ys*ePXTg2=_tc zj$I=0Mj{eKH~=>h&?JKoPl*Ip`G;Sxe|HLJl%Ka!)V$Wd{OOk$kK8-2a~D{;cK%zI zxII1qhZU~MOTXM;yS7bI;Rf9$|k?B3eh0j#saGRt`sAn0;~ zE;ndsY?BqdK{jLeHa%!zwk6@1-ViakIF2Yv^u*!%U3-0lG;S>-$|9MF0Q* M07*qoM6N<$f;u!->;M1& From 67308b17d7399de59e8ad371541d8d80bde00919 Mon Sep 17 00:00:00 2001 From: William Panting Date: Fri, 8 Feb 2013 08:59:48 -0400 Subject: [PATCH 3/4] some datastreams were downloading into files without extensions --- includes/datastream.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/datastream.inc b/includes/datastream.inc index 74517d7c..d332d06f 100644 --- a/includes/datastream.inc +++ b/includes/datastream.inc @@ -37,7 +37,11 @@ function islandora_view_datastream(FedoraDatastream $datastream, $download = FAL header('Content-length: ' . $datastream->size); } if ($download) { - header("Content-Disposition: attachment; filename=\"{$datastream->label}\""); + // Browsers will not append all extensions. + $mime_detect = new MimeDetect(); + $extension = $mime_detect->getExtension($datastream->mimetype); + $filename = $datastream->label . '.' . $extension; + header("Content-Disposition: attachment; filename=\"$filename\""); } drupal_page_is_cacheable(FALSE); // Try not to load the file into PHP memory! From 23c42cb3aa015e8ff0c83b8297468c0405b3fcea Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Fri, 8 Feb 2013 15:41:55 +0100 Subject: [PATCH 4/4] Updated for changed config value. --- tests/islandora_web_test_case.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/islandora_web_test_case.inc b/tests/islandora_web_test_case.inc index cc5b8c67..a513de43 100644 --- a/tests/islandora_web_test_case.inc +++ b/tests/islandora_web_test_case.inc @@ -54,8 +54,8 @@ class IslandoraWebTestCase extends DrupalWebTestCase { * Stores the content of the Drupal Filter for later restoration. */ protected function backUpDrupalFilter() { - if (file_exists($this->configuration['filter_drupal_file'])) { - $this->originalDrupalFilterContent = file_get_contents($this->configuration['filter_drupal_file']); + if (file_exists($this->configuration['drupal_filter_file'])) { + $this->originalDrupalFilterContent = file_get_contents($this->configuration['drupal_filter_file']); } else { throw new Exception('Failed to find the required Drupal Filter configuration file.'); @@ -98,7 +98,7 @@ class IslandoraWebTestCase extends DrupalWebTestCase { * Stores the content of the Drupal Filter for later restoration. */ protected function restoreDrupalFilter() { - $file = $this->configuration['filter_drupal_file']; + $file = $this->configuration['drupal_filter_file']; if (isset($this->originalDrupalFilterContent)) { file_put_contents($file, $this->originalDrupalFilterContent); }