Browse Source

Merge branch 'ISLANDORA-153' into ISLANDORA-121

pull/105/head
Alexander O'Neill 14 years ago
parent
commit
d28e98d21d
  1. 2
      ObjectHelper.inc
  2. 2
      SecurityClass.inc
  3. 18
      plugins/FormBuilder.inc

2
ObjectHelper.inc

@ -336,7 +336,7 @@ class ObjectHelper {
'asOfDateTime' => "" 'asOfDateTime' => ""
); );
try { try {
$object = $client->__soapCAll('getDatastreamDissemination', array( $object = $client->__soapCall('getDatastreamDissemination', array(
'parameters' => $params 'parameters' => $params
)); ));
} catch (Exception $e) { } catch (Exception $e) {

2
SecurityClass.inc

@ -9,7 +9,7 @@
*/ */
class SecurityClass { class SecurityClass {
public static $SECURITY_CLASS_SECURITY_STREAM = 'CHILD_SECURITY'; public static $SECURITY_CLASS_SECURITY_STREAM = 'POLICY';
function SecurityClass() { function SecurityClass() {
module_load_include('inc', 'SecurityClass', ''); module_load_include('inc', 'SecurityClass', '');
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);

18
plugins/FormBuilder.inc

@ -179,7 +179,14 @@ class FormBuilder {
if (!empty( $file)) { if (!empty( $file)) {
$dformat = $mimetype->getType($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, '/'); $beginIndex = strrpos($fileUrl, '/');
$dtitle = substr($fileUrl, $beginIndex + 1); $dtitle = substr($fileUrl, $beginIndex + 1);
$dtitle = urldecode($dtitle); $dtitle = urldecode($dtitle);
@ -214,8 +221,13 @@ class FormBuilder {
} }
$dformat = $mimetype->getType($createdFile); $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, '/'); $beginIndex = strrpos($fileUrl, '/');
$dtitle = substr($fileUrl, $beginIndex + 1); $dtitle = substr($fileUrl, $beginIndex + 1);
$dtitle = urldecode($dtitle); $dtitle = urldecode($dtitle);

Loading…
Cancel
Save