diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-04-10 11:04:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 11:04:19 +0200 |
| commit | 235563f0a0481209f2e5d0303afe0b4db36bfcb6 (patch) | |
| tree | e596b9e7aab8cd7cfe1641495a9c8edd54033243 /settings | |
| parent | 09c66c93c54a81b4747abb3191f604cd67bfc601 (diff) | |
| parent | 78f0b5c19fe3101e3f10b5da70411681cd9b3d3e (diff) | |
| download | nextcloud-server-235563f0a0481209f2e5d0303afe0b4db36bfcb6.tar.gz nextcloud-server-235563f0a0481209f2e5d0303afe0b4db36bfcb6.zip | |
Merge pull request #4250 from nextcloud/disable-lookupserver-upload
allow admin to disable lookupserver upload
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 2 | ||||
| -rw-r--r-- | settings/personal.php | 4 | ||||
| -rw-r--r-- | settings/templates/personal.php | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 884fe1d50d0..5ca62248c09 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -28,7 +28,7 @@ input#openid, input#webdav { width:20em; } } #avatarform { - width: 145px; + min-width: 145px; padding-right: 0; } #avatarform .avatardiv { diff --git a/settings/personal.php b/settings/personal.php index a4449754f64..2c46a9f8dd2 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -186,6 +186,10 @@ $tmpl->assign('certs', $certificateManager->listCertificates()); $tmpl->assign('showCertificates', $enableCertImport); $tmpl->assign('urlGenerator', $urlGenerator); +$lookupServerUploadEnabled = $config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes'); +$lookupServerUploadEnabled = $lookupServerUploadEnabled === 'yes'; +$tmpl->assign('lookupServerUploadEnabled', $lookupServerUploadEnabled); + // Get array of group ids for this user $groups = \OC::$server->getGroupManager()->getUserIdGroups(OC_User::getUser()); $groups2 = array_map(function($group) { return $group->getGID(); }, $groups); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d94fbb33770..10df437523b 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -67,7 +67,9 @@ </div> </div> <span class="icon-checkmark hidden"/> + <?php if($_['lookupServerUploadEnabled']) { ?> <input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>"> + <?php } ?> </form> </div> @@ -86,7 +88,9 @@ <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> <?php } ?> <span class="icon-checkmark hidden"/> + <?php if($_['lookupServerUploadEnabled']) { ?> <input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>"> + <?php } ?> </form> </div> <div class="personal-settings-setting-box"> @@ -107,9 +111,12 @@ <em><?php p($l->t('For password reset and notifications')); ?></em> <?php } ?> <span class="icon-checkmark hidden"/> + <?php if($_['lookupServerUploadEnabled']) { ?> <input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>"> + <?php } ?> </form> </div> + <?php if($_['lookupServerUploadEnabled']) { ?> <div class="personal-settings-setting-box"> <form id="phoneform" class="section"> <h2> @@ -164,7 +171,7 @@ <input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>"> </form> </div> - + <?php } ?> <span class="msg"></span> </div> </div> |