diff --git a/apps/settings/src/components/Encryption.vue b/apps/settings/src/components/Encryption.vue
deleted file mode 100644
index c1e2d6cce0c89..0000000000000
--- a/apps/settings/src/components/Encryption.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
- {{ t('settings', 'Please read carefully before activating server-side encryption:') }}
- {{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }}
-
- {{ t('settings', 'No encryption module loaded, please enable an encryption module in the app menu.') }}
-
+ {{ textExistingFilesNotEncrypted }}
+ {{ t('settings', 'To encrypt all existing files run this OCC command:') }}
+
+ {{ t('settings', 'Disabling server side encryption is only possible using OCC, please refer to the documentation.') }}
+
+ {{ t('settings', 'Please read carefully before activating server-side encryption:') }}
+
-
-
- {{ t('settings', 'Select default encryption module:') }}
-
-
-
+
+ occ encryption:encrypt-all
+ {{ t('settings', 'Select default encryption module:') }}
+
+
+
+
+ {{ t('settings', 'This is the final warning: Do you really want to enable encryption?') }} +
+ + + + diff --git a/apps/settings/src/components/Encryption/sharedTexts.ts b/apps/settings/src/components/Encryption/sharedTexts.ts new file mode 100644 index 0000000000000..94d23be07f231 --- /dev/null +++ b/apps/settings/src/components/Encryption/sharedTexts.ts @@ -0,0 +1,7 @@ +/*! + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +import { t } from '@nextcloud/l10n' + +export const textExistingFilesNotEncrypted = t('settings', 'For performance reasons, when you enable encryption on a Nextcloud server only new and changed files are encrypted.') diff --git a/apps/settings/src/main-admin-security.js b/apps/settings/src/main-admin-security.js index a5c239683e7d7..8d8f904f46324 100644 --- a/apps/settings/src/main-admin-security.js +++ b/apps/settings/src/main-admin-security.js @@ -26,7 +26,7 @@ import { loadState } from '@nextcloud/initial-state' import Vue from 'vue' import AdminTwoFactor from './components/AdminTwoFactor.vue' -import Encryption from './components/Encryption.vue' +import EncryptionSettings from './components/Encryption/EncryptionSettings.vue' import store from './store/admin-security.js' // eslint-disable-next-line camelcase @@ -47,5 +47,5 @@ new View({ store, }).$mount('#two-factor-auth-settings') -const EncryptionView = Vue.extend(Encryption) +const EncryptionView = Vue.extend(EncryptionSettings) new EncryptionView().$mount('#vue-admin-encryption') diff --git a/dist/core-common.js b/dist/core-common.js index 9984165a6e164..5f0ae6b439e30 100644 --- a/dist/core-common.js +++ b/dist/core-common.js @@ -1,3 +1,3 @@ /*! For license information please see core-common.js.LICENSE.txt */ -(self.webpackChunknextcloud=self.webpackChunknextcloud||[]).push([[4208],{30352:(e,t,n)=>{"use strict";n.d(t,{ZL:()=>l});var a=n(85471);function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}var i={selector:"vue-portal-target-".concat(((e=21)=>{let t="",n=e;for(;n--;)t+="useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict"[64*Math.random()|0];return t})())},o="undefined"!=typeof window&&void 0!==("undefined"==typeof document?"undefined":r(document)),s=a.Ay.extend({abstract:!0,name:"PortalOutlet",props:["nodes","tag"],data:function(e){return{updatedNodes:e.nodes}},render:function(e){var t=this.updatedNodes&&this.updatedNodes();return t?1!==t.length||t[0].text?e(this.tag||"DIV",t):t:e()},destroyed:function(){var e=this.$el;e&&e.parentNode.removeChild(e)}}),l=a.Ay.extend({name:"VueSimplePortal",props:{disabled:{type:Boolean},prepend:{type:Boolean},selector:{type:String,default:function(){return"#".concat(i.selector)}},tag:{type:String,default:"DIV"}},render:function(e){if(this.disabled){var t=this.$scopedSlots&&this.$scopedSlots.default();return t?t.length<2&&!t[0].text?t:e(this.tag,t):e()}return e()},created:function(){this.getTargetEl()||this.insertTargetEl()},updated:function(){var e=this;this.$nextTick((function(){e.disabled||e.slotFn===e.$scopedSlots.default||(e.container.updatedNodes=e.$scopedSlots.default),e.slotFn=e.$scopedSlots.default}))},beforeDestroy:function(){this.unmount()},watch:{disabled:{immediate:!0,handler:function(e){e?this.unmount():this.$nextTick(this.mount)}}},methods:{getTargetEl:function(){if(o)return document.querySelector(this.selector)},insertTargetEl:function(){if(o){var e=document.querySelector("body"),t=document.createElement(this.tag);t.id=this.selector.substring(1),e.appendChild(t)}},mount:function(){if(o){var e=this.getTargetEl(),t=document.createElement("DIV");this.prepend&&e.firstChild?e.insertBefore(t,e.firstChild):e.appendChild(t),this.container=new s({el:t,parent:this,propsData:{tag:this.tag,nodes:this.$scopedSlots.default}})}},unmount:function(){this.container&&(this.container.$destroy(),delete this.container)}}});"undefined"!=typeof window&&window.Vue&&window.Vue===a.Ay&&a.Ay.use((function(e){var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};e.component(n.name||"portal",l),n.defaultSelector&&(t=n.defaultSelector,i.selector=t)}))},42660:(e,t,n)=>{"use strict";var a=n(49574),r=Object.prototype.hasOwnProperty,i={align:"text-align",valign:"vertical-align",height:"height",width:"width"};function o(e){var t;if("tr"===e.tagName||"td"===e.tagName||"th"===e.tagName)for(t in i)r.call(i,t)&&void 0!==e.properties[t]&&(s(e,i[t],e.properties[t]),delete e.properties[t])}function s(e,t,n){var a=(e.properties.style||"").trim();a&&!/;\s*/.test(a)&&(a+=";"),a&&(a+=" ");var r=a+t+": "+n+";";e.properties.style=r}e.exports=function(e){return a(e,"element",o),e}},20856:e=>{"use strict";function t(e){if("string"==typeof e)return function(e){return function(t){return Boolean(t&&t.type===e)}}(e);if(null==e)return r;if("object"==typeof e)return("length"in e?a:n)(e);if("function"==typeof e)return e;throw new Error("Expected function, string, or object as test")}function n(e){return function(t){var n;for(n in e)if(t[n]!==e[n])return!1;return!0}}function a(e){var n=function(e){for(var n=[],a=e.length,r=-1;++r{"use strict";e.exports=s;var a=n(20856),r=!0,i="skip",o=!1;function s(e,t,n,r){var s;"function"==typeof t&&"function"!=typeof n&&(r=n,n=t,t=null),s=a(t),function e(a,u,d){var c,h=[];return(t&&!s(a,u,d[d.length-1]||null)||(h=l(n(a,d)))[0]!==o)&&a.children&&h[0]!==i?(c=l(function(t,n){for(var a,i=r?-1:1,s=(r?t.length:-1)+i;s>-1&&s{"use strict";const a=n(43918),r=n(32923),i=n(8904);e.exports={XMLParser:r,XMLValidator:a,XMLBuilder:i}},35334:(e,t)=>{"use strict";const n=":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",a="["+n+"]["+n+"\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*",r=new RegExp("^"+a+"$");t.isExist=function(e){return void 0!==e},t.isEmptyObject=function(e){return 0===Object.keys(e).length},t.merge=function(e,t,n){if(t){const a=Object.keys(t),r=a.length;for(let i=0;i>1,d=-7,c=n?r-1:0,h=n?-1:1,p=e[t+c];for(c+=h,i=p&(1<<-d)-1,p>>=-d,d+=s;d>0;i=256*i+e[t+c],c+=h,d-=8);for(o=i&(1<<-d)-1,i>>=-d,d+=a;d>0;o=256*o+e[t+c],c+=h,d-=8);if(0===i)i=1-u;else{if(i===l)return o?NaN:1/0*(p?-1:1);o+=Math.pow(2,a),i-=u}return(p?-1:1)*o*Math.pow(2,i-a)},t.write=function(e,t,n,a,r,i){var o,s,l,u=8*i-r-1,d=(1<>1,h=23===r?Math.pow(2,-24)-Math.pow(2,-77):0,p=a?0:i-1,f=a?1:-1,m=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,o=d):(o=Math.floor(Math.log(t)/Math.LN2),t*(l=Math.pow(2,-o))<1&&(o--,l*=2),(t+=o+c>=1?h/l:h*Math.pow(2,1-c))*l>=2&&(o++,l/=2),o+c>=d?(s=0,o=d):o+c>=1?(s=(t*l-1)*Math.pow(2,r),o+=c):(s=t*Math.pow(2,c-1)*Math.pow(2,r),o=0));r>=8;e[n+p]=255&s,p+=f,s/=256,r-=8);for(o=o<","
"],col:[2,"
"],tr:[2,"","
"],td:[3,"
"],_default:[0,"",""]};function De(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&x(e,t)?E.merge([e],n):n}function Se(e,t){for(var n=0,a=e.length;n",""]);var Be=/<|?\w+;/;function Me(e,t,n,a,r){for(var i,o,s,l,u,d,c=t.createDocumentFragment(),h=[],p=0,f=e.length;p","