From 0a112de676ab41579a40eb04d4f8b0cc96b326a7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 1 Apr 2014 14:26:06 +0200
Subject: [PATCH 1/2] external storage: change confusing 'applicable' to
 'available for'

---
 apps/files_external/templates/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index a2bdbcf4632..28836ed5b53 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -9,7 +9,7 @@
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
 				<!--<th><?php p($l->t('Options')); ?></th> -->
-				<?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Applicable').'</th>'); ?>
+				<?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
 				<th>&nbsp;</th>
 			</tr>
 		</thead>

From acfb3cfff544096342b9d44410bcb74bbffec99a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 1 Apr 2014 14:28:33 +0200
Subject: [PATCH 2/2] external storage: set storages to be available for All
 Users by default

---
 apps/files_external/templates/settings.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 28836ed5b53..e8815acaf16 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -88,9 +88,12 @@
 					data-applicable-users='<?php if (isset($mount['applicable']['users']))
 													print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
 						<select class="chzn-select"
-								multiple style="width:20em;"
-								data-placeholder="<?php p($l->t('None set')); ?>">
-							<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) print_unescaped('selected="selected"');?> ><?php p($l->t('All Users')); ?></option>
+							multiple style="width:20em;"
+							data-placeholder="<?php p($l->t('No user or group')); ?>">
+							<option value="all"
+								<?php if (empty($mount['class']) || (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users']))) print_unescaped('selected="selected"');?> >
+								<?php p($l->t('All Users')); ?>
+							</option>
 							<optgroup label="<?php p($l->t('Groups')); ?>">
 							<?php foreach ($_['groups'] as $group): ?>
 								<option value="<?php p($group); ?>(group)"