[Pkg-owncloud-commits] [owncloud] 09/79: only add the possibility to import ssl root certificates to the personal setting if the user can mount external storages

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit a430e75425263913af1f322a9cffd43a7e38f766
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue Aug 4 17:50:30 2015 +0200

    only add the possibility to import ssl root certificates to the personal
    setting if the user can mount external storages
---
 settings/personal.php           | 18 +++++++++++++++++-
 settings/templates/personal.php |  2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index 8823102..203c9f6 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -104,6 +104,17 @@ $clients = array(
 	'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
 );
 
+// only show root certificate import if external storages are enabled
+$enableCertImport = false;
+$externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
+if ($externalStorageEnabled) {
+	$backends = OC_Mount_Config::getPersonalBackends();
+	if (!empty($backends)) {
+		$enableCertImport = true;
+	}
+}
+
+
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
@@ -120,6 +131,7 @@ $tmpl->assign('displayName', OC_User::getDisplayName());
 $tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true));
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
 $tmpl->assign('certs', $certificateManager->listCertificates());
+$tmpl->assign('showCertificates', $enableCertImport);
 $tmpl->assign('urlGenerator', $urlGenerator);
 
 // Get array of group ids for this user
@@ -157,7 +169,11 @@ $formsMap = array_map(function($form){
 $formsAndMore = array_merge($formsAndMore, $formsMap);
 
 // add bottom hardcoded forms from the template
-$formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') );
+if($enableCertImport) {
+	$formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') );
+}
+
+
 
 $tmpl->assign('forms', $formsAndMore);
 $tmpl->printPage();
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index e7832b8..490133c 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -205,6 +205,7 @@ if($_['passwordChangeSupported']) {
 	<?php }
 };?>
 
+<?php if($_['showCertificates']) : ?>
 <div id="ssl-root-certificates" class="section">
 	<h2><?php p($l->t('SSL root certificates')); ?></h2>
 	<table id="sslCertificate" class="grid">
@@ -242,6 +243,7 @@ if($_['passwordChangeSupported']) {
 		<input type="button" id="rootcert_import_button" value="<?php p($l->t('Import root certificate')); ?>"/>
 	</form>
 </div>
+<?php endif; ?>
 
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git