Merge pull request #15234 from owncloud/encryption2_core

core part of encryption 2.0

diff --cc lib/base.php
Simple merge

diff --cc lib/private/files/fileinfo.php
Simple merge

diff --cc lib/private/server.php
Simple merge

diff --cc settings/admin.php
index 9f5f36b2210b64cce450159cab5d078e6afe30fc,34e26c60d868def5ac170952f8cc6f195da29e6c..4416af1fe375acb03459b3f0837847edfdfc4461
--- 1/settings/admin.php
--- 2/settings/admin.php
+++ b/settings/admin.php
@@@ -142,9 -135,9 +159,10 @@@ $formsAndMore = array_merge($formsAndMo
  // add bottom hardcoded forms from the template
  $formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
  $formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing'));
+ $formsAndMore[] = array('anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption'));
  $formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
  $formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
 +$formsAndMore[] = array('anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks'));
  
  $template->assign('forms', $formsAndMore);
  

diff --cc settings/css/settings.css
index 050914beef6ed7ddf6dad0f78a1826e8eb914e2b,75acaf5f7272bda1799578fdb75b152d82d549c2..869a113762bfdc54e1a1d609f7479b05cac14943
--- 1/settings/css/settings.css
--- 2/settings/css/settings.css
+++ b/settings/css/settings.css
@@@ -400,10 -374,24 +400,19 @@@ doesnotexist:-o-prefocus, .strengthify-
        background-position: left center;
  }
  
 -#postsetupchecks .hint {
 -      margin-top: 15px;
 -}
 -
 -#postsetupchecks .setupwarning {
 +#admin-tips li {
        list-style: initial;
 -      font-weight: normal;
 -      margin-top: 5px;
 +}
 +#admin-tips li a {
 +      display: inline-block;
 +      padding: 3px 0;
  }
+ 
+ #selectEncryptionModules {
+       margin-left: 30px;
+       padding: 10px;
+ }
+ 
+ #encryptionModules {
+       padding: 10px;
+ }

diff --cc settings/js/admin.js
Simple merge

diff --cc settings/templates/admin.php
Simple merge