Skip to content

Commit aed1b19

Browse files
committed
Fixes issue #5 Limit Media Source to a folder
1 parent 326135e commit aed1b19

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22

33
$_lang['source_type.awss3mediasource'] = 'AWS S3 Media Source 3.0';
4-
$_lang['source_type.awss3mediasource_desc'] = 'AWS S3 Media Source';
4+
$_lang['source_type.awss3mediasource_desc'] = 'AWS S3 Media Source';
5+
$_lang['prop_s3.baseDir_desc'] = 'S3 folder path, if set will limit Media Source to set folder path.';

core/components/awss3mediasource/model/awss3mediasource/awss3mediasource.class.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ public function getTypeDescription()
9292
*/
9393
public function getContainerList($path)
9494
{
95+
/** Need to check for the root or first loaded Media Source to add the proper baseDir if set. */
96+
if ( empty(trim($path, '/'))) {
97+
$base_dir = $this->xpdo->getOption('baseDir', $this->properties, '');
98+
$path = trim($base_dir, '/') . '/' . ltrim($path, '/');
99+
}
95100
list($listFiles, $listDirectories) = $this->listDirectory($path);
96101
$editAction = $this->getEditActionId();
97102

@@ -1140,6 +1145,14 @@ public function getDefaultProperties()
11401145
'value' => '',
11411146
'lexicon' => 'core:source',
11421147
),
1148+
'baseDir' => array(
1149+
'name' => 'baseDir',
1150+
'desc' => 'prop_s3.baseDir_desc',
1151+
'type' => 'textfield',
1152+
'options' => '',
1153+
'value' => '',
1154+
'lexicon' => 'awss3mediasource:source',
1155+
),
11431156
'key' => array(
11441157
'name' => 'key',
11451158
'desc' => 'prop_s3.key_desc',

0 commit comments

Comments
 (0)