From 9afd160e66f2c060cb7d77d414d0c1d13ac0c3ad Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Fri, 7 Apr 2017 11:42:33 +0200
Subject: allow to disable upload to lookup server, by default it is enabled

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 settings/personal.php           | 4 ++++
 settings/templates/personal.php | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'settings')

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>
-- 
cgit v1.2.3


From d5173ac30f19de27327f302ae217e33c419b1960 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Fri, 7 Apr 2017 11:43:12 +0200
Subject: make sure that the selector for the visibility always fits next to
 'Profile picture'

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 settings/css/settings.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings')

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 {
-- 
cgit v1.2.3