From c62e512989e720f3ffc02cf5d17801438bb95bdc Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Tue, 9 Aug 2016 14:05:02 +0200
Subject: [PATCH] hide global credentials in personal when a user cant add
mounts
---
apps/files_external/css/settings.css | 5 ++++
apps/files_external/templates/settings.php | 35 ++++++++++++----------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 4d5dc69a4e7..d09ab3ed427 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,3 +1,8 @@
+#files_external {
+ margin-bottom: 0;
+ padding-bottom: 0;
+}
+
#externalStorage td.status {
/* overwrite conflicting core styles */
display: table-cell;
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 6fb2a018547..640604c14c5 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -84,24 +84,9 @@
}
}
?>
-<form autocomplete="false" class="section" action="#"
- id="global_credentials">
- <h2><?php p($l->t('External Storage')); ?></h2>
- <p><?php p($l->t('Global Credentials')); ?></p>
- <input type="text" name="username"
- autocomplete="false"
- value="<?php p($_['globalCredentials']['user']); ?>"
- placeholder="<?php p($l->t('Username')) ?>"/>
- <input type="password" name="password"
- autocomplete="false"
- value="<?php p($_['globalCredentials']['password']); ?>"
- placeholder="<?php p($l->t('Password')) ?>"/>
- <input type="hidden" name="uid"
- value="<?php p($_['globalCredentialsUid']); ?>"/>
- <input type="submit" value="<?php p($l->t('Save')) ?>"/>
-</form>
<form id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+ <h2><?php p($l->t('External Storage')); ?></h2>
<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
<thead>
@@ -200,3 +185,21 @@
</p>
<?php endif; ?>
</form>
+
+<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']): ?>
+ <form autocomplete="false" class="section" action="#"
+ id="global_credentials">
+ <p><?php p($l->t('Global Credentials')); ?></p>
+ <input type="text" name="username"
+ autocomplete="false"
+ value="<?php p($_['globalCredentials']['user']); ?>"
+ placeholder="<?php p($l->t('Username')) ?>"/>
+ <input type="password" name="password"
+ autocomplete="false"
+ value="<?php p($_['globalCredentials']['password']); ?>"
+ placeholder="<?php p($l->t('Password')) ?>"/>
+ <input type="hidden" name="uid"
+ value="<?php p($_['globalCredentialsUid']); ?>"/>
+ <input type="submit" value="<?php p($l->t('Save')) ?>"/>
+ </form>
+<?php endif; ?>
--
GitLab