From 8ff2a1d1a3aad7c95e139c9336a6b90ea6f4bfec Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Wed, 5 Jan 2011 11:13:36 -0400
Subject: [PATCH 1/2] Changed 'CHILD_SECURITY' to 'POLICY' for canIngestHere
 function.

---
 ObjectHelper.inc  | 2 +-
 SecurityClass.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ObjectHelper.inc b/ObjectHelper.inc
index 0aa76e68..9b24f088 100644
--- a/ObjectHelper.inc
+++ b/ObjectHelper.inc
@@ -336,7 +336,7 @@ class ObjectHelper {
         'asOfDateTime' => ""
     );
     try {
-      $object = $client->__soapCAll('getDatastreamDissemination', array(
+      $object = $client->__soapCall('getDatastreamDissemination', array(
                   'parameters' => $params
               ));
     } catch (Exception $e) {
diff --git a/SecurityClass.inc b/SecurityClass.inc
index ded59cf3..c314cbd1 100644
--- a/SecurityClass.inc
+++ b/SecurityClass.inc
@@ -9,7 +9,7 @@
  */
 
 class SecurityClass {
-  public static $SECURITY_CLASS_SECURITY_STREAM = 'CHILD_SECURITY';
+  public static $SECURITY_CLASS_SECURITY_STREAM = 'POLICY';
   function SecurityClass() {
     module_load_include('inc', 'SecurityClass', '');
     drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);

From 06fcef3f4f0191152c83935e1fcff1c098525602 Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Thu, 6 Jan 2011 13:12:19 -0400
Subject: [PATCH 2/2] ISLANDORA-153When uploading a file with an & in it ...
 ingest breaks

---
 plugins/FormBuilder.inc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/FormBuilder.inc b/plugins/FormBuilder.inc
index dbedda75..4fd3fa7d 100644
--- a/plugins/FormBuilder.inc
+++ b/plugins/FormBuilder.inc
@@ -179,7 +179,14 @@ class FormBuilder {
 
     if (!empty( $file)) {
       $dformat = $mimetype->getType($file);
-      $fileUrl = $base_url . '/'. drupal_urlencode($file);
+      
+      $parts = explode('/', $file);
+      foreach ($parts as $n => $part) {
+        $parts[$n] = rawurlencode($part);
+      }
+      $path = implode('/', $parts);
+      $fileUrl = $base_url . '/' . $path;
+      
       $beginIndex = strrpos($fileUrl, '/');
       $dtitle = substr($fileUrl, $beginIndex + 1);
       $dtitle = urldecode($dtitle);
@@ -214,8 +221,13 @@ class FormBuilder {
 	} 
 
         $dformat = $mimetype->getType($createdFile);
-        $fileUrl = $base_url . '/'. drupal_urlencode($createdFile);
-	
+	$parts = explode('/', $createdFile);
+        foreach ($parts as $n => $part) {
+          $parts[$n] = rawurlencode($part);
+        }
+        $path = implode('/', $parts);
+        $fileUrl = $base_url . '/' . $path;
+      
         $beginIndex = strrpos($fileUrl, '/');
         $dtitle = substr($fileUrl, $beginIndex + 1);
         $dtitle = urldecode($dtitle);