diff --git a/base/apps/indie_external/appinfo/info.xml b/base/apps/indie_external/appinfo/info.xml
index d76a48ca43bd52511a6080a1df1a92a526569f16..a1ba7c213a1b22a017c7cd2e00c644753cabbba5 100644
--- a/base/apps/indie_external/appinfo/info.xml
+++ b/base/apps/indie_external/appinfo/info.xml
@@ -24,7 +24,7 @@
https://github.com/nextcloud/external/issues
https://github.com/nextcloud/external.git
- 3.9.0
+ 3.9.1
IndieExternal
diff --git a/base/apps/indie_external/img/quota.png b/base/apps/indie_external/img/quota.png
new file mode 100644
index 0000000000000000000000000000000000000000..d961189f1b4bf9a121f1e276f4e87648cb05cf6a
Binary files /dev/null and b/base/apps/indie_external/img/quota.png differ
diff --git a/base/apps/indie_external/lib/Migration/CopyDefaultIcons.php b/base/apps/indie_external/lib/Migration/CopyDefaultIcons.php
index df0ccdb5d5ead7b17bd2f7ccdaf2c3cf95079948..21fb1a308a9ee20f3111b7a7f39fae13de1ae8a8 100644
--- a/base/apps/indie_external/lib/Migration/CopyDefaultIcons.php
+++ b/base/apps/indie_external/lib/Migration/CopyDefaultIcons.php
@@ -81,6 +81,7 @@ class CopyDefaultIcons implements IRepairStep {
$this->copyDefaultIcon($output, $folder, 'lifesaver.png');
$this->copyDefaultIcon($output, $folder, 'meet.png');
$this->copyDefaultIcon($output, $folder, 'meet-dark.png');
+ $this->copyDefaultIcon($output, $folder, 'quota.png');
}
/**
diff --git a/base/apps/indie_external/lib/SitesManager.php b/base/apps/indie_external/lib/SitesManager.php
index 30305a3dcf695b984acc3b11520edf4cacaad7f9..0675f29aac6c244e70541e7bea7e482bbbf7ef78 100644
--- a/base/apps/indie_external/lib/SitesManager.php
+++ b/base/apps/indie_external/lib/SitesManager.php
@@ -109,8 +109,9 @@ class SitesManager {
$chat_url = getenv('CHAT_URL', true) ?: getenv('CHAT_URL');
$saml_idp_url = getenv('SAML_IDP_URL', true) ?: getenv('SAML_IDP_URL');
$saml_realm = getenv('SAML_REALM', true) ?: getenv('SAML_REALM');
+ $quota_url = "/settings/users";
- $site['url'] = str_replace(['{email}', '{uid}', '{displayname}', '{chat_url}', '{saml_idp_url}', '{saml_realm}'], [$email, $uid, $displayName, $chat_url, $saml_idp_url, $saml_realm], $site['url']);
+ $site['url'] = str_replace(['{email}', '{uid}', '{displayname}', '{chat_url}', '{saml_idp_url}', '{saml_realm}', '{quota_url}'], [$email, $uid, $displayName, $chat_url, $saml_idp_url, $saml_realm, $quota_url], $site['url']);
if ($site['name'] === 'Visio') {
$visio_url = getenv('VISIO_URL', true) ?: getenv('VISIO_URL');
@@ -199,6 +200,13 @@ class SitesManager {
}
}
+ if ($site['kind'] === 'quota') {
+ $nextcloud_url = getenv('OVERWRITE_CLI_URL', true) ?: getenv('OVERWRITE_CLI_URL');
+ if ($nextcloud_url) {
+ $site['url'] = "/settings/users";
+ }
+ }
+
$site['url'] = str_replace(['{email}', '{uid}', '{displayname}'], [$email, $uid, $displayName], $site['url']);
$langSites[$id] = $site;
diff --git a/base/apps/indie_external/lib/sites.json b/base/apps/indie_external/lib/sites.json
index 2c98a81ce279f9add2480b193cc692634008a3e6..b14f8fe9638f58e129d36fded7ae16f3fcd2a6f0 100644
--- a/base/apps/indie_external/lib/sites.json
+++ b/base/apps/indie_external/lib/sites.json
@@ -44,5 +44,17 @@
"type": "link",
"kind": "visio",
"redirect": true
- }
+ },
+ "6": {
+ "id": 6,
+ "icon": "quota.png",
+ "name": "Quota des comptes",
+ "url": "{quota_url}",
+ "type": "settings",
+ "kind": "quota",
+ "redirect": true,
+ "groups": [
+ "admin"
+ ]
+ }
}
diff --git a/base/apps/indie_external/package.json b/base/apps/indie_external/package.json
index 0990597b37d9389578525c251f164407c200cafa..de10c73db7e5a7b174c3d8b0a96ecf0ea93e12fc 100644
--- a/base/apps/indie_external/package.json
+++ b/base/apps/indie_external/package.json
@@ -1,6 +1,6 @@
{
"name": "indie_external",
- "version": "3.9.0",
+ "version": "3.9.1",
"private": true,
"description": "",
"author": "Joas Schilling ",
diff --git a/base/css/indie.scss b/base/css/indie.scss
index 847aafca77d8e5d158eb12a7d1426b111a76375b..8b1ef090f40f210e40f8ed7f3a1d77e9d939c5f6 100644
--- a/base/css/indie.scss
+++ b/base/css/indie.scss
@@ -24,3 +24,18 @@ footer .entity-name:after {
.section.development-notice .social-button {
display: none;
}
+
+/* Manage quota */
+#body-settings .app-navigation-new {display:none !important;}
+#body-settings #usergrouplist {display:none !important;}
+#body-settings [for="sendWelcomeMail"] {display:none !important;}
+#body-settings [for="showLanguages"] {display:none !important;}
+#addgroup {display:none !important;}
+.app-navigation-entry__utils .icon-delete {display:none !important;}
+
+#body-settings .groups {display:none !important;}
+#body-settings .subadmins {display:none !important;}
+#body-settings .mailAddress {display:none !important;}
+#body-settings .password {display:none !important;}
+#body-settings .userPopoverMenuWrapper {display:none !important;}
+