summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2017-04-07 11:42:33 +0200
committerBjoern Schiessle <bjoern@schiessle.org>2017-04-07 16:30:07 +0200
commit9afd160e66f2c060cb7d77d414d0c1d13ac0c3ad (patch)
tree5af9e90e90d3ebf9c002b7edc2f2003facfd6d93 /settings
parent536650c02f719cc810a0538c36113b2fa96db605 (diff)
downloadnextcloud-server-9afd160e66f2c060cb7d77d414d0c1d13ac0c3ad.tar.gz
nextcloud-server-9afd160e66f2c060cb7d77d414d0c1d13ac0c3ad.zip
allow to disable upload to lookup server, by default it is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php4
-rw-r--r--settings/templates/personal.php9
2 files changed, 12 insertions, 1 deletions
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>