Merge pull request #24951 from nextcloud/version/21/beta5

21 beta5

.drone.yml

@@ -1,49 +1,4 @@
 kind: pipeline
-name: jsunit
-
-steps:
-- name: jsunit
-  image: nextcloudci/jsunit:jsunit-5
-  commands:
-    - ./autotest-js.sh
-    - curl -o codecov.sh https://codecov.io/bash
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: webpack-build
-
-steps:
-- name: build
-  image: nextcloudci/node:node-4
-  commands:
-    - npm ci
-    - npm run build
-- name: changes
-  image: nextcloudci/node:node-4
-  commands:
-    - git status
-    - bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && exit 1 )"
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
 name: checkers
 
 steps:
@@ -52,70 +7,11 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: nextcloudci/php7.2:php7.2-13
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
 
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: handlebars
-
-steps:
-- name: handlebars
-  image: node
-  commands:
-    - npm ci
-    - ./build/compile-handlebars-templates.sh
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: syntax-and-phan
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: syntax-php7.2
-  image: nextcloudci/php7.2:php7.2-13
-  commands:
-    - composer install
-    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
-- name: syntax-php7.3
-  image: nextcloudci/php7.3:php7.3-4
-  commands:
-    - composer install
-    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
-- name: syntax-php7.4
-  image: nextcloudci/php7.4:2
-  commands:
-    - composer install
-    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
-#- name: phan
-#  image: nextcloudci/php7.2:php7.2-13
-#  commands:
-#    - composer install
-#    - composer require --dev "phan/phan:0.11.1"
-#    - ./lib/composer/phan/phan/phan -k build/.phan/config.php
-#    - php ./build/.phan/plugin-checker.php
-
 trigger:
   branch:
     - master
@@ -327,18 +223,18 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: nodb-php7.2
-  image: nextcloudci/php7.2:php7.2-13
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.4
-  image: nextcloudci/php7.4:2
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+- name: nodb-php8.0
+  image: nextcloudci/php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -364,18 +260,18 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: sqlite-php7.2
-  image: nextcloudci/php7.2:php7.2-13
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.4
-  image: nextcloudci/php7.4:2
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+- name: sqlite-php8.0
+  image: nextcloudci/php8.0:latest
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -394,15 +290,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.1-php7.2
+name: mariadb10.1-php7.3
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.1-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: mariadb10.1-php7.3
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -430,15 +326,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.2-php7.2
+name: mariadb10.2-php7.3
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.2-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: mariadb10.2-php7.3
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -465,15 +361,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.3-php7.2
+name: mariadb10.3-php7.3
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.3-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: mariadb10.3-php7.3
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -500,18 +396,24 @@ trigger:
 
 ---
 kind: pipeline
-name: mariadb10.4-php7.3
+name: mariadb10.4-php7.4
+#name: mariadb10.4-php8.0
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mariadb10.4-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+- name: mariadb10.4-php7.4
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
+#- name: mariadb10.4-php8.0
+#  image: nextcloudci/php8.0:latest
+#  commands:
+#    - bash tests/drone-run-php-tests.sh || exit 0
+#    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
 
 services:
 - name: cache
@@ -536,15 +438,15 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql8.0-php7.2
+name: mysql8.0-php7.4
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mysql-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: mysql-php7.4
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -573,108 +475,7 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql5.7-php7.2
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql-php7.2
-  image: nextcloudci/php7.2:php7.2-13
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: mysql
-  image: mysql:5.7
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
----
-kind: pipeline
-name: mysql5.7-php7.3
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql-php7.3
-  image: nextcloudci/php7.3:php7.3-4
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: mysql
-  image: mysql:5.7
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
----
-kind: pipeline
-name: mysql5.6-php7.2
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql5.6-php7.2
-  image: nextcloudci/php7.2:php7.2-13
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: cache
-  image: redis
-- name: mysql
-  image: mysql:5.6
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: postgres9-php7.3
+name: postgres9.6-php7.3
 
 steps:
 - name: submodules
@@ -682,7 +483,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -692,7 +493,7 @@ services:
 - name: cache
   image: redis
 - name: postgres-9
-  image: postgres:9
+  image: postgres:9.6
   environment:
     POSTGRES_USER: oc_autotest
     POSTGRES_DB: oc_autotest_dummy
@@ -710,15 +511,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres10-php7.2
+name: postgres10-php7.3
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: postgres-php7.3
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -745,15 +546,15 @@ trigger:
 
 ---
 kind: pipeline
-name: postgres11-php7.2
+name: postgres11-php7.4
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: postgres-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: postgres-php7.4
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -781,18 +582,95 @@ trigger:
 
 ---
 kind: pipeline
-name: mysqlmb4-php7.2
+name: postgres12-php7.4
 
 steps:
 - name: submodules
   image: docker:git
   commands:
     - git submodule update --init
-- name: mysqlmb4-php7.2
-  image: nextcloudci/php7.2:php7.2-13
+- name: postgres-php7.4
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - sleep 10 # gives the database enough time to initialize
+    - POSTGRES=12 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+
+services:
+- name: cache
+  image: redis
+- name: postgres-12
+  image: postgres:12
+  environment:
+    POSTGRES_USER: oc_autotest
+    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_PASSWORD: owncloud
+  tmpfs:
+    - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: postgres13-php7.4
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: postgres-php7.4
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - sleep 10 # gives the database enough time to initialize
+    - POSTGRES=13 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+
+services:
+- name: cache
+  image: redis
+- name: postgres-13
+  image: postgres:13
+  environment:
+    POSTGRES_USER: oc_autotest
+    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_PASSWORD: owncloud
+  tmpfs:
+    - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
+name: mysqlmb4-php7.4
+#name: mysqlmb4-php8.0
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysqlmb4-php7.4
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+#- name: mysqlmb4-php8.0
+#  image: nextcloudci/php8.0:latest
+#  commands:
+#    - bash tests/drone-run-php-tests.sh || exit 0
+#    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
 
 services:
 - name: cache
@@ -825,7 +703,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -926,6 +804,31 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: integration-avatar
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: integration-avatar
+  image: nextcloudci/integration-php7.3:integration-php7.3-2
+  commands:
+    - bash tests/drone-run-integration-tests.sh || exit 0
+    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+    - cd build/integration
+    - ./run.sh features/avatar.feature
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: integration-maintenance-mode
@@ -1450,7 +1353,7 @@ steps:
   commands:
     # JavaScript files are not used in integration tests so it is not needed to
     # build them.
-    - git clone --branch stable18 --depth 1 https://github.com/nextcloud/spreed apps/spreed
+    - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed
 - name: integration-sharing-v1-video-verification
   image: nextcloudci/integration-php7.3:integration-php7.3-2
   commands:
@@ -1612,41 +1515,42 @@ kind: pipeline
 name: integration-ldap-openldap-uid-features
 
 steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: integration-ldap-openldap-uid-features
-  image: nextcloudci/integration-php7.3:integration-php7.3-2
-  commands:
-    - bash tests/drone-run-integration-tests.sh || exit 0
-    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
-    - ./occ config:system:set redis host --value=cache
-    - ./occ config:system:set redis port --value=6379 --type=integer
-    - ./occ config:system:set redis timeout --value=0 --type=integer
-    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
-    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-    - cd build/integration
-    - ./run.sh ldap_features/openldap-uid-username.feature
+    - name: submodules
+      image: docker:git
+      commands:
+          - git submodule update --init
+    - name: integration-ldap-openldap-uid-features
+      image: nextcloudci/integration-php7.3:integration-php7.3-2
+      commands:
+          - bash tests/drone-run-integration-tests.sh || exit 0
+          - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+          - ./occ config:system:set redis host --value=cache
+          - ./occ config:system:set redis port --value=6379 --type=integer
+          - ./occ config:system:set redis timeout --value=0 --type=integer
+          - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+          - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
+          - cd build/integration
+          - ./run.sh ldap_features/openldap-uid-username.feature
 
 services:
-- name: cache
-  image: redis
-- name: openldap
-  image: nextcloudci/openldap:openldap-7
-  environment:
-    SLAPD_DOMAIN: nextcloud.ci
-    SLAPD_ORGANIZATION: Nextcloud
-    SLAPD_PASSWORD: admin
-    SLAPD_ADDITIONAL_MODULES: memberof
+    - name: cache
+      image: redis
+    - name: openldap
+      image: nextcloudci/openldap:openldap-7
+      environment:
+          SLAPD_DOMAIN: nextcloud.ci
+          SLAPD_ORGANIZATION: Nextcloud
+          SLAPD_PASSWORD: admin
+          SLAPD_ADDITIONAL_MODULES: memberof
 
 trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
+    branch:
+        - master
+        - stable*
+    event:
+        - pull_request
+        - push
+type: docker
 
 ---
 kind: pipeline
@@ -1794,36 +1698,36 @@ trigger:
     - pull_request
     - push
 
----
-kind: pipeline
-name: acceptance-app-comments
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: acceptance-app-comments
-  image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
-  commands:
-    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
-
-services:
-- name: selenium
-  image: selenium/standalone-firefox:2.53.1-beryllium
-  environment:
-    # Reduce default log level for Selenium server (INFO) as it is too
-    # verbose.
-    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
+#---
+#kind: pipeline
+#name: acceptance-app-comments
+#
+#steps:
+#- name: submodules
+#  image: docker:git
+#  commands:
+#    - git submodule update --init
+#- name: acceptance-app-comments
+#  image: nextcloudci/acceptance-php7.3:acceptance-php7.3-2
+#  commands:
+#    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
+#
+#services:
+#- name: selenium
+#  image: selenium/standalone-firefox:2.53.1-beryllium
+#  environment:
+#    # Reduce default log level for Selenium server (INFO) as it is too
+#    # verbose.
+#    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
+#
+#trigger:
+#  branch:
+#    - master
+#    - stable*
+#  event:
+#    - pull_request
+#    - push
+#
 ---
 kind: pipeline
 name: acceptance-app-files
@@ -2104,13 +2008,15 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: nextcloudci/php7.2:php7.2-13
+  image: nextcloudci/php7.4:php7.4-3
+  environment:
+      CODECOV_TOKEN:
+          from_secret: CODECOV_TOKEN
   commands:
     - phpenmod xdebug
     - TEST_SELECTION=NODB ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    - bash codecov.sh -Z -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
 services:
 - name: cache
@@ -2133,13 +2039,15 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: nextcloudci/php7.2:php7.2-13
+  image: nextcloudci/php7.4:php7.4-3
+  environment:
+      CODECOV_TOKEN:
+          from_secret: CODECOV_TOKEN
   commands:
     - phpenmod xdebug
     - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    - bash codecov.sh -Z -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
 services:
 - name: cache
@@ -2162,14 +2070,16 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.2:php7.2-13
+  image: nextcloudci/php7.4:php7.4-3
+  environment:
+      CODECOV_TOKEN:
+          from_secret: CODECOV_TOKEN
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
     - TEST_SELECTION=PRIMARY-s3 ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    - bash codecov.sh -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
 services:
 - name: fake-s3
@@ -2193,14 +2103,16 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.2:php7.2-13
+  image: nextcloudci/php7.4:php7.4-3
+  environment:
+      CODECOV_TOKEN:
+          from_secret: CODECOV_TOKEN
   commands:
     - phpenmod xdebug
     - ./tests/drone-wait-objectstore.sh
     - TEST_SELECTION=PRIMARY-azure ./autotest.sh sqlite
     - wget https://codecov.io/bash -O codecov.sh
-    - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
-    - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    - bash codecov.sh -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml
 
 services:
 - name: azurite
@@ -2325,7 +2237,7 @@ trigger:
 #  commands:
 #    - git submodule update --init
 #- name: memcache-redis-cluster
-#  image: nextcloudci/php7.2:php7.2-13
+#  image: nextcloudci/php7.3:php7.3-5
 #  commands:
 #    - phpenmod xdebug
 #    - sleep 20
@@ -2345,4 +2257,3 @@ trigger:
 #  event:
 #    - pull_request
 #    - push
-

.editorconfig

@@ -10,5 +10,16 @@ indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.feature]
+indent_size = 2
+indent_style = space
+
+[*.yml]
+indent_size = 2
+indent_style = space
+
 [*.md]
 trim_trailing_whitespace = false
+
+[*.svg]
+insert_final_newline = false

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
 		dayNames: true,
 		firstDay: true
 	},
-	extends: ['nextcloud'],
+	extends: ['@nextcloud'],
 	rules: {
 		'no-tabs': 'warn',
 	}

.gitattributes

@@ -1,18 +1,22 @@
 /core/js/dist/*.js binary
 /core/js/dist/*.js.map binary
 
-/apps/accessibility/js/accessibility.js binary
-/apps/accessibility/js/accessibility.js.map binary
+/apps/accessibility/js/*.js binary
+/apps/accessibility/js/*.js.map binary
 /apps/comments/js/*.js binary
 /apps/comments/js/*.js.map binary
+/apps/dashboard/js/*.js binary
+/apps/dashboard/js/*.js.map binary
 /apps/files/js/dist/*.js binary
 /apps/files/js/dist/*.js.map binary
 /apps/files_sharing/js/dist/*.js binary
 /apps/files_sharing/js/dist/*.js.map binary
-/apps/files_versions/js/files_versions.js binary
-/apps/files_versions/js/files_versions.js.map binary
-/apps/oauth2/js/oauth2.js binary
-/apps/oauth2/js/oauth2.js.map binary
+/apps/files_trashbin/js/*.js binary
+/apps/files_trashbin/js/*.js.map binary
+/apps/files_versions/js/*.js binary
+/apps/files_versions/js/*.js.map binary
+/apps/oauth2/js/*.js binary
+/apps/oauth2/js/*.js.map binary
 /apps/settings/js/vue* binary
 /apps/systemtags/js/systemtags.js binary
 /apps/systemtags/js/systemtags.js.map binary
@@ -20,5 +24,9 @@
 /apps/twofactor_backupcodes/js/*.js.map binary
 /apps/updatenotification/js/updatenotification.js binary
 /apps/updatenotification/js/updatenotification.js.map binary
+/apps/user_status/js/*.js binary
+/apps/user_status/js/*.js.map binary
+/apps/weather_status/js/*.js binary
+/apps/weather_status/js/*.js.map binary
 /apps/workflowengine/js/*.js binary
 /apps/workflowengine/js/*.js.map binary

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-# You can add one username per supported platform and one custom link
-custom: https://www.bountysource.com/teams/nextcloud

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Help us improving by reporting a bug
 labels: bug, 0. Needs triage
 ---
@@ -9,18 +9,33 @@ Thanks for reporting issues back to Nextcloud!
 
 Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
 
-This is the bug tracker for the Server component. Find other components at https://github.com/nextcloud/
+Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
 
-For reporting potential security issues please see https://nextcloud.com/security/
+Guidelines for submitting issues:
 
-To make it possible for us to deal with the bug please fill out below information carefully. 
-You can also use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
+    - You can also filter by appending e. g. "state:open" to the search string.
+    - More info on search syntax within github: https://help.github.com/articles/searching-issues
+    
+* This repository https://github.com/nextcloud/server/issues is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+  
+* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
 
-If you are a customer and are using Nextcloud Enterprise, please submit your issue directly in the Nextcloud Portal https://portal.nextcloud.com so it gets resolved more quickly by our dedicated engineers.
-
-Note that Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
+* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
+  
+* You can also use the Issue Template app to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
 -->
 
+<!--- Please keep this note for other contributors -->
+
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
+
+
 ### Steps to reproduce
 1.
 2.
@@ -116,6 +131,9 @@ Eventually replace sensitive data as the name/IP-address of your LDAP server or
 **Operating system:**
 
 ### Logs
+
+<!--- Reports without logs might be closed as unqualified reports! -->
+
 #### Web server error log
 <details>
 <summary>Web server error log</summary>

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,35 +1,48 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: enhancement, 0. Needs triage
----
-
-<!--
-Thanks for reporting issues back to Nextcloud!
-
-Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
-
-This is the bug tracker for the Server component. Find other components at https://github.com/nextcloud/
-
-For reporting potential security issues please see https://nextcloud.com/security/
-
-To make it possible for us to best accommodate your use case, please fill out the information below carefully. 
-You can also use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
-
-If you are a customer and are using Nextcloud Enterprise, please submit your issue directly in the Nextcloud Portal https://portal.nextcloud.com so it gets resolved more quickly by our dedicated engineers.
-
-Note that Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
---> 
-
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: 🚀 Feature request
+about: Suggest an idea for this project
+labels: enhancement, 0. Needs triage
+---
+
+<!--
+Thanks for reporting issues back to Nextcloud!
+
+Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
+
+Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
+
+Guidelines for submitting issues:
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
+    - You can also filter by appending e. g. "state:open" to the search string.
+    - More info on search syntax within github: https://help.github.com/articles/searching-issues
+    
+* This repository https://github.com/nextcloud/server/issues is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+  
+* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
+
+* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
+-->
+
+
+<!--- Please keep this note for other contributors -->
+
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
+
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+    - name: ❓ Question
+      url: https://help.nextcloud.com/
+      about: I have a question …
+    - name: 💼 Nextcloud Enterprise
+      url: https://portal.nextcloud.com/
+      about: If you are a customer and are using Nextcloud Enterprise, please submit your issue directly in the Nextcloud Portal so it can be resolved by our dedicated engineers more quickly.

.github/config.yml

@@ -1,5 +1,3 @@
 firstPRMergeComment: >
     Thanks for your first pull request and welcome to the community!
     Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
-
-    Most developers hang out on IRC. So join \#nextcloud-dev on Freenode for a chat!

.github/workflows/block-merge-eol.yml

@@ -1,30 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-name: Pull request checks
-
-on: pull_request
-
-jobs:
-  block-merges-eol:
-    name: Block merges for EOL branches
-
-    # Only run on stableXX branches
-    if: startsWith( github.base_ref, 'stable')
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Download updater config
-        run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php
-
-      - name: Set server major version environment
-        run: |
-          # retrieve version number from branch reference
-          server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p')
-          echo "server_major=$server_major" >> $GITHUB_ENV
- 
-      - name: Checking if ${{ env.server_major }} is EOL
-        run: |
-          php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol' | grep --silent -i 'false'

.github/workflows/dependabot-approve-merge.yml

@@ -0,0 +1,19 @@
+name: Dependabot
+on: pull_request
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    steps:
+      # Default github action approve
+      - uses: hmarr/auto-approve-action@v2.0.0
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Nextcloud bot approve and merge request
+      - uses: ahmadnassri/action-dependabot-auto-merge@v1
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+        with:
+          target: patch
+          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/fixup.yml

@@ -1,13 +0,0 @@
-on: pull_request
-
-name: Pull request checks
-
-jobs:
-  commit-message-check:
-    name: Block fixup and squash commits
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run check
-        uses: xt0rted/block-autosquash-commits-action@master
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -0,0 +1,40 @@
+name: Lint
+on: pull_request
+
+jobs:
+  php-linters:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['7.3', '7.4', '8.0']
+    name: php${{ matrix.php-versions }} lint
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Set up php${{ matrix.php-versions }}
+      uses: shivammathur/setup-php@master
+      with:
+        php-version: ${{ matrix.php-versions }}
+        coverage: none
+    - name: Lint
+      run: composer run lint
+
+  php-cs-fixer:
+    name: php-cs check
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Set up php
+      uses: shivammathur/setup-php@master
+      with:
+        php-version: 7.4
+        coverage: none
+        tools: cs2pr
+    - name: Install dependencies
+      run: composer i
+    - name: Run coding standards check
+      run: |
+        composer run cs:check -- --format=checkstyle | cs2pr
+        composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
+      shell: bash

.github/workflows/node.yml

@@ -0,0 +1,79 @@
+name: Node
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies & build
+      run: |
+        make clean
+        npm ci
+        npm run build --if-present
+    - name: Check webpack build changes
+      run: |
+        bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )"
+      env:
+        CI: true
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: |
+          npm ci
+    - name: Test
+      run: npm run test
+
+  jsunit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+    - name: Test
+      run: ./autotest-js.sh
+
+  handlebars:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install dependencies
+        run: |
+          npm ci
+      - name: Run compile
+        run: ./build/compile-handlebars-templates.sh

.github/workflows/oci.yml

@@ -0,0 +1,56 @@
+name: PHPUnit
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+jobs:
+  phpunit-oci8:
+    runs-on: ubuntu-latest
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: [ '7.4' ]
+        databases: [ 'oci' ]
+
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
+
+    services:
+      oracle:
+        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
+        ports:
+          - "1521:1521"
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v2
+
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8
+          tools: phpunit:8.5.2
+          coverage: none
+
+      - name: Set up Nextcloud
+        run: |
+          mkdir data
+          ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
+          php -f index.php
+
+      - name: PHPUnit
+        working-directory: tests
+        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB

.github/workflows/psalm-security.yml

@@ -0,0 +1,26 @@
+name: Psalm Security Analysis
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
+
+jobs:
+  psalm:
+    name: Psalm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Psalm
+        uses: docker://vimeo/psalm-github-actions
+        with:
+          security_analysis: true
+          report_file: results.sarif
+      - name: Upload Security Analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: results.sarif

.github/workflows/static-code-analysis.yml

@@ -0,0 +1,54 @@
+name: Static code analysis
+
+on: [pull_request]
+
+jobs:
+    static-code-analysis:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Checkout submodules
+              shell: bash
+              run: |
+                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+                git submodule sync --recursive
+                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+            - name: Set up php7.4
+              uses: shivammathur/setup-php@master
+              with:
+                php-version: 7.4
+                coverage: none
+            - name: Composer install
+              run: composer i
+            - name: Psalm
+              run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+            - name: Check diff
+              run: git diff -- . ':!lib/composer'
+            - name: Show potential changes in Psalm baseline
+              run: |
+                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+
+    static-code-analysis-ocp:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Checkout submodules
+              shell: bash
+              run: |
+                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+                git submodule sync --recursive
+                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+            - name: Set up php7.4
+              uses: shivammathur/setup-php@master
+              with:
+                php-version: 7.4
+                coverage: none
+            - name: Composer install
+              run: composer i
+            - name: Psalm
+              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+            - name: Check diff
+              run: git diff -- . ':!lib/composer'
+            - name: Show potential changes in Psalm baseline
+              run: |
+                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline-ocp.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"

.github/workflows/update-psalm-baseline.yml

@@ -0,0 +1,46 @@
+name: Update Psalm baseline
+
+on:
+  schedule:
+    - cron: '5 4 * * *'
+
+jobs:
+  update-psalm-baseline:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      - name: Set up php7.4
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: 7.4
+          coverage: none
+      - name: Composer install
+        run: composer i
+      - name: Psalm
+        run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline
+      - name: Reset composer.json and composer.lock
+        run: |
+          rm -rf lib/composer
+          git checkout -- composer.json composer.lock lib/composer
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.MACHINE_USER_PAT }}
+          push-to-fork: nextcloud-pr-bot/server
+          commit-message: Update psalm baseline
+          committer: GitHub <noreply@github.com>
+          author: Nextcloud-PR-Bot <nextcloud-pr-bot@users.noreply.github.com>
+          signoff: true
+          branch: automated/noid/psalm-baseline-update
+          title: '[Automated] Update psalm-baseline.xml'
+          body: |
+            Auto-generated update psalm-baseline.xml with fixed psalm warnings
+          labels: |
+            automated pr
+          reviewers: rullzer, morrisjobke, kesselb

.gitignore

@@ -16,6 +16,8 @@
 !/apps/accessibility
 !/apps/cloud_federation_api
 !/apps/comments
+!/apps/contactsinteraction
+!/apps/dashboard
 !/apps/dav
 !/apps/files
 !/apps/federation
@@ -37,6 +39,8 @@
 !/apps/updatenotification
 !/apps/theming
 !/apps/twofactor_backupcodes
+!/apps/user_status
+!/apps/weather_status
 !/apps/workflowengine
 /apps/files_external/3rdparty/irodsphp/PHPUnitTest
 /apps/files_external/3rdparty/irodsphp/web
@@ -69,6 +73,7 @@ CVS/*
 .svn/*
 RCS/*
 *.backup*
+.php_cs.cache
 
 # kdevelop
 .kdev

.htaccess

@@ -61,16 +61,12 @@
   RewriteCond %{HTTP_USER_AGENT} DavClnt
   RewriteRule ^$ /remote.php/webdav/ [L,R=302]
   RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-  RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
-  RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
-  RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L]
-  RewriteRule ^\.well-known/nodeinfo /public.php?service=nodeinfo [QSA,L]
   RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
-  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
+  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
+  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz

.mailmap

@@ -164,6 +164,7 @@ ideaship <ideaship@users.noreply.github.com>
 Ignacio Daniel Rostagno <ignaciorostagno@vijona.com.ar>
 infoneo <infoneo@yahoo.pl>
 Insanemal <insanemal@gmail.com>
+Tobias Perschon <tobias@perschon.at> Tobias Perschon <tofuSCHNITZEL@users.noreply.github.com>
 Tobias Ramforth <tobias@ramforth.com> Tobias Ramforth <tobias.ramforth@udo.edu>
 Tobias Ramforth <tobias@ramforth.com> irgsmirx <tobias.ramforth@udo.edu>
 Isaac Rosenberg <irosenb7@gmail.com>
@@ -380,6 +381,8 @@ tbelau666 <thomas.belau@gmx.de>
 TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
+Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <tcit@tcit.fr>
+Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <github@tcit.fr>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>
@@ -405,8 +408,9 @@ Victor Dubiniuk <dubiniuk@owncloud.com> Victor Dubiniuk <victor.dubiniuk@gmail.c
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <dubiniuk@owncloud.com>
 Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
 Vincent Cloutier <vincent1cloutier@gmail.com>
-Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
-Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
+Vincent Petry <vincent@nextcloud.com> Vincent Petry <PVince81@yahoo.fr>
+Vincent Petry <vincent@nextcloud.com> Vincent Petry <vincent@vvortex.site>
+Vincent Petry <vincent@nextcloud.com> Vincent Petry <pvince81@owncloud.com>
 Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
 Vitaly Kuznetsov <vitty@altlinux.ru>
 Vladimir Sapronov <vladimir.sapronov@gmail.com>

.php_cs.dist

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+require_once './lib/composer/autoload.php';
+
+use Nextcloud\CodingStandard\Config;
+
+$config = new Config();
+$config
+	->getFinder()
+	->ignoreVCSIgnored(true)
+	->exclude('config')
+	->exclude('data')
+	->notPath('3rdparty')
+	->notPath('build/stubs')
+	->notPath('composer')
+	->notPath('vendor')
+	->in(__DIR__);
+return $config;

.tx/config

@@ -133,3 +133,51 @@ file_filter = translationfiles/<lang>/accessibility.po
 source_file = translationfiles/templates/accessibility.pot
 source_lang = en
 type = PO
+
+[nextcloud.provisioning_api]
+file_filter = translationfiles/<lang>/provisioning_api.po
+source_file = translationfiles/templates/provisioning_api.pot
+source_lang = en
+type = PO
+
+[nextcloud.lookup_server_connector]
+file_filter = translationfiles/<lang>/lookup_server_connector.po
+source_file = translationfiles/templates/lookup_server_connector.pot
+source_lang = en
+type = PO
+
+[nextcloud.dashboard-shipped-with-server]
+file_filter = translationfiles/<lang>/dashboard.po
+source_file = translationfiles/templates/dashboard.pot
+source_lang = en
+type = PO
+
+[nextcloud.contactsinteraction]
+file_filter = translationfiles/<lang>/contactsinteraction.po
+source_file = translationfiles/templates/contactsinteraction.pot
+source_lang = en
+type = PO
+
+[nextcloud.cloud_federation_api]
+file_filter = translationfiles/<lang>/cloud_federation_api.po
+source_file = translationfiles/templates/cloud_federation_api.pot
+source_lang = en
+type = PO
+
+[nextcloud.admin_audit]
+file_filter = translationfiles/<lang>/admin_audit.po
+source_file = translationfiles/templates/admin_audit.pot
+source_lang = en
+type = PO
+
+[nextcloud.user_status]
+file_filter = translationfiles/<lang>/user_status.po
+source_file = translationfiles/templates/user_status.pot
+source_lang = en
+type = PO
+
+[nextcloud.weather_status]
+file_filter = translationfiles/<lang>/weather_status.po
+source_file = translationfiles/templates/weather_status.pot
+source_lang = en
+type = PO

AUTHORS

@@ -5,17 +5,18 @@ Nextcloud is written by:
  - Achim Königs <garfonso@tratschtante.de>
  - Adam Williamson <awilliam@redhat.com>
  - Administrator "Administrator@WINDOWS-2012"
+ - Adrian Brzezinski <adrian.brzezinski@eo.pl>
  - Aldo "xoen" Giambelluca <xoen@xoen.org>
  - Alecks Gates <alecks.g@gmail.com>
  - Alejandro Varela <epma01@gmail.com>
  - Alex Weirig <alex.weirig@technolink.lu>
+ - Alexander A. Klimov <grandmaster@al2klimov.de>
  - Alexander Bergolth <leo@strike.wu.ac.at>
  - Alexey Pyltsyn <lex61rus@gmail.com>
  - Allan Nordhøy <epost@anotheragency.no>
  - Andreas Fischer <bantu@owncloud.com>
  - Andreas Pflug <dev@admin4.org>
  - Andrew Brown <andrew@casabrown.com>
- - Andrius <andrius.kulbis@ktu.lt>
  - André Gaul <gaul@web-yard.de>
  - Ardinis <Ardinis@users.noreply.github.com>
  - Ari Selseng <ari@selseng.net>
@@ -23,6 +24,7 @@ Nextcloud is written by:
  - Artem Kochnev <MrJeos@gmail.com>
  - Artem Sidorenko <artem@posteo.de>
  - Arthur Schiwon <blizzz@arthur-schiwon.de>
+ - Ashod Nakashian <ashod.nakashian@collabora.co.uk>
  - Axel Helmert <axel.helmert@luka.de>
  - Bart Visscher <bartv@thisnet.nl>
  - Bartek Przybylski <bart.p.pl@gmail.com>
@@ -30,6 +32,7 @@ Nextcloud is written by:
  - Bastien Ho <bastienho@urbancube.fr>
  - Benjamin Diele <benjamin@diele.be>
  - Benjamin Liles <benliles@arch.tamu.edu>
+ - Bernhard Ostertag <bernieo.code@gmx.de>
  - Bernhard Posselt <dev@bernhard-posselt.com>
  - Bernhard Reiter <ockham@raz.or.at>
  - Birk Borkason <daniel.niccoli@gmail.com>
@@ -45,13 +48,13 @@ Nextcloud is written by:
  - Byron Marohn <combustible@live.com>
  - Carla Schroder <carla@owncloud.com>
  - Carlos Cerrillo <ccerrillo@gmail.com>
+ - Carlos Ferreira <carlos@reendex.com>
  - Carsten Wiedmann <carsten_sttgt@gmx.de>
  - Christian <16852529+cviereck@users.noreply.github.com>
  - Christian Berendt <berendt@b1-systems.de>
  - Christian Jürges <christian@eqipe.ch>
  - Christian Kampka <christian@kampka.net>
  - Christian Oliff <christianoliff@yahoo.com>
- - Christian Weiske <cweiske@cweiske.de>
  - Christoph Schaefer "christophł@wolkesicher.de"
  - Christoph Seitz <christoph.seitz@posteo.de>
  - Christoph Wickert <cwickert@suse.de>
@@ -60,6 +63,7 @@ Nextcloud is written by:
  - Christopher Schäpers <kondou@ts.unde.re>
  - Christopher T. Johnson <ctjctj@gmail.com>
  - Clark Tomlinson <fallen013@gmail.com>
+ - Clement Wong <git@clement.hk>
  - Cornelius Kölbel <cornelius.koelbel@netknights.it>
  - Cthulhux <git@tuxproject.de>
  - Damjan Georgievski <gdamjan@gmail.com>
@@ -77,8 +81,8 @@ Nextcloud is written by:
  - Derek <derek.kelly27@gmail.com>
  - Dominik Schmidt <dev@dominik-schmidt.de>
  - Donquixote <marjunebatac@gmail.com>
+ - Elijah Martin-Merrill <elijah@nyp-itsours.com>
  - Eric Masseran <rico.masseran@gmail.com>
- - Estelle Poulin <dev@inspiredby.es>
  - Evgeny Golyshev <eugulixes@gmail.com>
  - Fabrizio Steiner <fabrizio.steiner@gmail.com>
  - Felix Epp <work@felixepp.de>
@@ -88,6 +92,7 @@ Nextcloud is written by:
  - Felix Nüsse <Felix.nuesse@t-online.de>
  - Felix Rupp <github@felixrupp.com>
  - Filis Futsarov <filisko@users.noreply.github.com>
+ - Florent <florent@coppint.com>
  - Florin Peter <github@florin-peter.de>
  - Flávio Gomes da Silva Lisboa <flavio.lisboa@serpro.gov.br>
  - Frank Isemann <frank@isemann.name>
@@ -95,16 +100,25 @@ Nextcloud is written by:
  - François Kubler <francois@kubler.org>
  - Frederic Werner <frederic-github@werner-net.work>
  - Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
+ - Gary Kim <gary@garykim.dev>
  - Georg Ehrke <oc.list@georgehrke.com>
+ - GrayFix <grayfix@gmail.com>
  - Greta Doci <gretadoci@gmail.com>
+ - GretaD <gretadoci@gmail.com>
  - Guillaume COMPAGNON <gcompagnon@outlook.com>
+ - Guillaume Virlet <github@virlet.org>
  - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
  - Hendrik Leppelsack <hendrik@leppelsack.de>
+ - Holger Hees <holger.hees@gmail.com>
  - Ilja Neumann <ineumann@owncloud.com>
  - Individual IT Services <info@individual-it.net>
+ - Iscle <albertiscle9@gmail.com>
  - J0WI <J0WI@users.noreply.github.com>
+ - Jaakko Salo <jaakkos@gmail.com>
+ - Jacob Neplokh <me@jacobneplokh.com>
  - Jakob Sack <mail@jakobsack.de>
  - Jakub Onderka <ahoj@jakubonderka.cz>
+ - Jan C. Borchardt <hey@jancborchardt.net>
  - Jan-Christoph Borchardt <hey@jancborchardt.net>
  - Jan-Philipp Litza <jplitza@users.noreply.github.com>
  - Janis Köhr <janis.koehr@novatec-gmbh.de>
@@ -119,26 +133,29 @@ Nextcloud is written by:
  - Joel S <joel.devbox@protonmail.com>
  - Johan Björk <johanimon@gmail.com>
  - Johannes Ernst <jernst@indiecomputing.com>
- - Johannes Koenig <mail@jokoenig.de>
+ - Johannes Leuker <j.leuker@hosting.de>
+ - Johannes Riedel <joeried@users.noreply.github.com>
  - Johannes Schlichenmaier <johannes@schlichenmaier.info>
  - Johannes Willnecker <johannes@willnecker.com>
  - John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  - Jonas Sulzer <jonas@violoncello.ch>
  - Jonny007-MKD <1-23-4-5@web.de>
  - Jos Poortvliet <jos@opensuse.org>
+ - Jose Quinteiro <github@quinteiro.org>
  - Juan Pablo Villafañez <jvillafanez@solidgear.es>
- - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
  - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
+ - Julien Lutran <julien.lutran@corp.ovh.com>
  - Julien Veyssier <eneiluj@posteo.net>
  - Julius Haertl <jus@bitgrid.net>
  - Julius Härtl <jus@bitgrid.net>
  - Jörn Friedrich Dreyer <jfd@butonic.de>
- - Jürgen Haas <juergen@paragon-es.de>
  - KB7777 <k.burkowski@gmail.com>
  - Kamil Domanski <kdomanski@kdemail.net>
  - Kawohl <john@owncloud.com>
  - Kenneth Newwood <kenneth@newwood.name>
+ - Kevin Lanni <therealklanni@gmail.com>
  - Kevin Ndung'u <kevgathuku@gmail.com>
+ - Kim Brose <kim.brose@rwth-aachen.de>
  - Klaas Freitag <freitag@owncloud.com>
  - Knut Ahlers <knut@ahlers.me>
  - Ko- <k.stoffelen@cs.ru.nl>
@@ -149,17 +166,20 @@ Nextcloud is written by:
  - Lars Knickrehm <mail@lars-sh.de>
  - Laurens Post <Crote@users.noreply.github.com>
  - Laurens Post <lkpost@scept.re>
+ - Lauris Binde <laurisb@users.noreply.github.com>
  - Lennart Rosam <hello@takuto.de>
  - Lennart Rosam <lennart.rosam@medien-systempartner.de>
  - Leon Klingele <git@leonklingele.de>
  - Leon Klingele <leon@struktur.de>
  - Liam Dennehy <liam@wiemax.net>
+ - Liam JACK <liamjack@users.noreply.github.com>
+ - Lionel Elie Mamane <lionel@mamane.lu>
  - Loki3000 <github@labcms.ru>
  - Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
  - Lukas Reschke <lukas@statuscode.ch>
+ - Lukas Stabe <lukas@stabe.de>
  - Luke Policinski <lpolicinski@gmail.com>
  - Magnus Walbeck <mw@mwalbeck.org>
- - Manish Bisht <manish.bisht490@gmail.com>
  - Marcel Klehr <mklehr@gmx.net>
  - Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
  - Marin Treselj <marin@pixelipo.com>
@@ -167,7 +187,6 @@ Nextcloud is written by:
  - Mario Kolling <mario.kolling@serpro.gov.br>
  - Marius Blüm <marius@lineone.io>
  - Marius David Wieschollek <git.public@mdns.eu>
- - Mark Berezovsky <xpnf@yandex.ru>
  - Markus Goetz <markus@woboq.com>
  - Markus Staab <markus.staab@redaxo.de>
  - MartB <mart.b@outlook.de>
@@ -188,38 +207,41 @@ Nextcloud is written by:
  - Michael Gapczynski <GapczynskiM@gmail.com>
  - Michael Göhler <somebody.here@gmx.de>
  - Michael Jobst <mjobst+github@tecratech.de>
+ - Michael Kuhn <michael@ikkoku.de>
  - Michael Letzgus <www@chronos.michael-letzgus.de>
  - Michael Roitzsch <reactorcontrol@icloud.com>
- - Michael Roth <michael.roth@rz.uni-augsburg.de>
  - Michael Weimann <mail@michael-weimann.eu>
  - Michael Zamot <michael@zamot.io>
  - Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
  - Miguel Prokop <miguel.prokop@vtu.com>
+ - Mikael Hammarin <mikael@try2.se>
  - Mitar <mitar.git@tnode.com>
+ - Mohammed Abdellatif <m.latief@gmail.com>
  - Morris Jobke <hey@morrisjobke.de>
  - Nicolai Ehemann <en@enlightened.de>
  - Nicolas Grekas <nicolas.grekas@gmail.com>
  - Nils <git@to.nilsschnabel.de>
+ - Nils Wittenbrink <nilswittenbrink@web.de>
  - Nmz <nemesiz@nmz.lt>
  - Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
  - Ole Ostergaard <ole.c.ostergaard@gmail.com>
  - Ole Ostergaard <ole.ostergaard@knime.com>
  - Oliver Gasser <oliver.gasser@gmail.com>
  - Oliver Kohl D.Sc. <oliver@kohl.bz>
- - Oliver Salzburg <oliver.salzburg@gmail.com>
  - Oliver Wegner <void1976@gmail.com>
  - Olivier Paroz <github@oparoz.com>
  - Owen Winkler <a_github@midnightcircus.com>
  - Pascal de Bruijn <pmjdebruijn@pcode.nl>
  - Patrick Paysant <patrick.paysant@linagora.com>
- - Patrick Paysant <ppaysant@linagora.com>
  - Patrik Kernstock <info@pkern.at>
  - Pauli Järvinen <pauli.jarvinen@gmail.com>
+ - Pavel Krasikov <klonishe@gmail.com>
  - Pellaeon Lin <nfsmwlin@gmail.com>
  - Peter Kubica <peter@kubica.ch>
  - Phil Davis <phil.davis@inf.org>
  - Philipp Kapfer <philipp.kapfer@gmx.at>
  - Philipp Schaffrath <github@philipp.schaffrath.email>
+ - Philipp Staiger <philipp@staiger.it>
  - Philippe Jung <phil.jung@free.fr>
  - Pierre Ozoux <pierre@ozoux.net>
  - Pierre Rudloff <contact@rudloff.pro>
@@ -236,12 +258,13 @@ Nextcloud is written by:
  - RealRancor <fisch.666@gmx.de>
  - Rello <Rello@users.noreply.github.com>
  - Remco Brenninkmeijer <requist1@starmail.nl>
- - Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
+ - Richard Steinmetz <richard@steinmetz.cloud>
  - Rinat Gumirov <rinat.gumirov@mail.ru>
  - Robert Dailey <rcdailey@gmail.com>
  - Robin Appelman <robin@icewind.nl>
  - Robin McCorkell <robin@mccorkell.me.uk>
  - Robin Müller <coder-hugo@users.noreply.github.com>
+ - Robin Windey <ro.windey@gmail.com>
  - Roeland Jago Douma <roeland@famdouma.nl>
  - Roger Szabo <roger.szabo@web.de>
  - Roland Tapken <roland@bitarbeiter.net>
@@ -256,11 +279,13 @@ Nextcloud is written by:
  - Sam Bull <aa6bs0@sambull.org>
  - Sam Tuke <mail@samtuke.com>
  - Samuel CHEMLA <chemla.samuel@gmail.com>
- - Sander <brantje@gmail.com>
+ - Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>
  - Sander Ruitenbeek <sander@grids.be>
  - Sandro Lutz <sandro.lutz@temparus.ch>
  - Sascha Sambale <mastixmc@gmail.com>
  - Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
+ - Scott Dutton <exussum12@users.noreply.github.com>
+ - Scott Dutton <scott@exussum.co.uk>
  - Scott Shambarger <devel@shambarger.net>
  - Sean Comeau <sean@ftlnetworks.ca>
  - Sebastian Döll <sebastian.doell@libasys.de>
@@ -271,9 +296,13 @@ Nextcloud is written by:
  - Senorsen <senorsen.zhang@gmail.com>
  - Serge Martin <edb@sigluy.net>
  - Sergej Nikolaev <kinolaev@gmail.com>
+ - Sergej Pupykin <pupykin.s@gmail.com>
+ - Sergey Shliakhov <husband.sergey@gmail.com>
  - Sergio Bertolin <sbertolin@solidgear.es>
  - Sergio Bertolín <sbertolin@solidgear.es>
  - Simon Könnecke <simonkoennecke@gmail.com>
+ - Simon Spannagel <simonspa@kth.se>
+ - Simounet <contact@simounet.net>
  - Sjors van der Pluijm <sjors@desjors.nl>
  - Stefan Rado <owncloud@sradonia.net>
  - Stefan Schneider <stefan.schneider@squareweave.com.au>
@@ -282,34 +311,40 @@ Nextcloud is written by:
  - Steffen Lindner <mail@steffen-lindner.de>
  - Stephan Müller <mail@stephanmueller.eu>
  - Stephan Peijnik <speijnik@anexia-it.com>
+ - Stephen Cuppett <steve@cuppett.com>
  - Steven Bühner <buehner@me.com>
  - Sujith H <sharidasan@owncloud.com>
+ - Sujith Haridasan <sujith.h@gmail.com>
  - Sven Strickroth <email@cs-ware.de>
  - Sylvia van Os <sylvia@hackerchick.me>
+ - Tekhnee <info@tekhnee.org>
  - Temtaime <temtaime@gmail.com>
- - Thibault Coupin <thibault.coupin@gmail.com>
  - Thibaut GRIDEL <tgridel@free.fr>
- - Thomas Citharel <tcit@tcit.fr>
+ - Thomas Citharel <nextcloud@tcit.fr>
  - Thomas Ebert <thomas.ebert@usability.de>
  - Thomas Müller <thomas.mueller@tmit.eu>
  - Thomas Pulzer <t.pulzer@kniel.de>
  - Thomas Tanghus <thomas@tanghus.net>
+ - Tiago Flores <tiago.flores@yahoo.com.br>
  - Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
  - Tim Dettrick <t.dettrick@uq.edu.au>
+ - Tim Obert <tobert@w-commerce.de>
  - Tim Terhorst <mynamewastaken+gitlab@gmail.com>
+ - TimObert <tobert@w-commerce.de>
  - Timo Förster <tfoerster@webfoersterei.de>
  - Tobia De Koninck <LEDfan@users.noreply.github.com>
  - Tobia De Koninck <tobia@ledfan.be>
- - Tobias Brunner <tobias@tobru.ch>
  - Tobias Kaminsky <tobias@kaminsky.me>
+ - Tobias Perschon <tobias@perschon.at>
  - Tom Needham <tom@owncloud.com>
  - Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
  - Tor Lillqvist <tml@collabora.com>
  - Unknown <anpz.asutp@gmail.com>
+ - Valdnet <47037905+Valdnet@users.noreply.github.com>
  - Victor Dubiniuk <dubiniuk@owncloud.com>
  - Viktor Szépe <viktor@szepe.net>
  - Vincent Chan <plus.vincchan@gmail.com>
- - Vincent Petry <pvince81@owncloud.com>
+ - Vincent Petry <vincent@nextcloud.com>
  - Vinicius Cubas Brand <vinicius@eita.org.br>
  - Vitor Mattos <vitor@php.rio>
  - Vlastimil Pecinka <pecinka@email.cz>
@@ -319,15 +354,17 @@ Nextcloud is written by:
  - Xheni Myrtaj <myrtajxheni@gmail.com>
  - Xuanwo <xuanwo@yunify.com>
  - adrien <adrien.waksberg@believedigital.com>
+ - aler9 <46489434+aler9@users.noreply.github.com>
  - alexweirig <alex.weirig@technolink.lu>
  - b108@volgograd "b108@volgograd"
+ - bladewing <lukas@ifflaender-family.de>
  - bline <scottbeck@gmail.com>
  - blizzz <blizzz@arthur-schiwon.de>
  - brad2014 <brad2014@users.noreply.github.com>
  - brumsel <brumsel@losecatcher.de>
+ - call-me-matt <nextcloud@matthiasheinisch.de>
  - cetra3 <peter@parashift.com.au>
  - cmeh <cmeh@users.noreply.github.com>
- - coderkun <olli@coderkun.de>
  - comradekingu <epost@anotheragency.no>
  - dartcafe <github@dartcafe.de>
  - davidgumberg <davidnoizgumberg@gmail.com>
@@ -335,44 +372,58 @@ Nextcloud is written by:
  - derkostka <sebastian.kostka@gmail.com>
  - duritong <peter.meier+github@immerda.ch>
  - eduardo <eduardo@vnexu.net>
+ - eleith <online+github@eleith.com>
  - enoch <lanxenet@hotmail.com>
+ - essys <essys@users.noreply.github.com>
+ - exner104 <59639860+exner104@users.noreply.github.com>
  - fabian <fabian@web2.0-apps.de>
  - felixboehm <felix@webhippie.de>
  - fnuesse <felix.nuesse@t-online.de>
  - fnuesse <fnuesse@techfak.uni-bielefeld.de>
  - helix84 <helix84@centrum.sk>
  - hkjolhede <hkjolhede@gmail.com>
+ - hoellen <dev@hoellen.eu>
  - ideaship <ideaship@users.noreply.github.com>
  - j-ed <juergen@eisfair.org>
+ - j3l11234 <297259024@qq.com>
  - jaltek <jaltek@mailbox.org>
  - jknockaert <jasper@knockaert.nl>
  - josh4trunks <joshruehlig@gmail.com>
  - karakayasemi <karakayasemi@itu.edu.tr>
+ - kevin147147 <kevintamool@gmail.com>
  - korelstar <korelstar@users.noreply.github.com>
- - labor4 <schreibtisch@labor4.ch>
+ - leith abdulla <online-nextcloud@eleith.com>
+ - lui87kw <lukas.ifflaender@uni-wuerzburg.de>
+ - lynn-stephenson <lynn.stephenson@protonmail.com>
  - macjohnny <estebanmarin@gmx.ch>
  - marco44 <cousinmarc@gmail.com>
  - martin-rueegg <martin.rueegg@metaworx.ch>
  - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
  - martink-p <47943787+martink-p@users.noreply.github.com>
+ - matt <34400929+call-me-matt@users.noreply.github.com>
+ - medcloud <42641918+medcloud@users.noreply.github.com>
  - michaelletzgus <michaelletzgus@users.noreply.github.com>
  - michag86 <micha_g@arcor.de>
  - mmccarn <mmccarn-github@mmsionline.us>
  - nhirokinet <nhirokinet@nhiroki.net>
+ - nik gaffney <nik@fo.am>
  - nishiki <nishiki@yaegashi.fr>
+ - onehappycat <one.happy.cat@gmx.com>
  - oparoz <owncloud@interfasys.ch>
  - phisch <git@philippschaffrath.de>
  - rakekniven <mark.ziegler@rakekniven.de>
  - root "root@oc.(none)"
  - root <root@localhost.localdomain>
  - rubo77 <github@r.z11.de>
+ - sammo2828 <sammo2828@gmail.com>
  - scambra <sergio@entrecables.com>
  - scolebrook <scolebrook@mac.com>
  - shkdee <louis.traynard@m4x.org>
- - sidey79 <s.butzek@gmx.de>
+ - simonspa <1677436+simonspa@users.noreply.github.com>
  - sualko <klaus@jsxc.org>
  - tbartenstein <tbartenstein@users.noreply.github.com>
  - tbelau666 <thomas.belau@gmx.de>
+ - timm2k <timm2k@gmx.de>
  - tux-rampage <tux-rampage@users.noreply.github.com>
  - v1r0x <vinzenz.rosenkranz@gmail.com>
  - voxsim "Simon Vocella"

COPYING-README

@@ -9,6 +9,7 @@ Licensing of components:
 * User: AGPL
 * XML/RPC: MIT / PHP
 * Elementary filetype icons: GPL v3+
+* Material UI icons: APACHE LICENSE, VERSION 2.0
 All unmodified files from these and other sources retain their original copyright
 and license notices: see the relevant individual files.
 

Makefile

@@ -4,7 +4,7 @@ all: clean dev-setup build-js-production
 dev-setup: clean clean-dev npm-init
 
 npm-init:
-	npm install
+	npm ci
 
 npm-update:
 	npm update
@@ -39,6 +39,7 @@ clean:
 	rm -rf apps/systemtags/js/systemtags.*
 	rm -rf apps/twofactor_backupcodes/js
 	rm -rf apps/updatenotification/js/updatenotification.*
+	rm -rf apps/user_status/js/
 	rm -rf apps/workflowengine/js/
 	rm -rf core/js/dist
 
@@ -57,5 +58,6 @@ clean-git: clean
 	git checkout -- apps/systemtags/js/systemtags.*
 	git checkout -- apps/twofactor_backupcodes/js
 	git checkout -- apps/updatenotification/js/updatenotification.*
+	git checkout -- apps/user_status/js/
 	git checkout -- apps/workflowengine/js/
 	git checkout -- core/js/dist

README.md

@@ -2,8 +2,6 @@
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud--dev%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-dev)
 
 **A safe home for all your data.**
 
@@ -45,7 +43,7 @@ There are many ways to contribute, of which development is only one! Find out [h
 
 ### Development setup 👩‍💻
 
-1. 🚀 [Set up your local development environment](https://docs.nextcloud.com/server/latest/developer_manual/general/devenv.html)
+1. 🚀 [Set up your local development environment](https://docs.nextcloud.com/server/latest/developer_manual/getting_started/devenv.html)
 2. 🐛 [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue)
 3. 👩‍🔧 Create a branch and make your changes. Remember to sign off your commits using `git commit -sm "Your commit message"`
 4. ⬆ Create a [pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue to review
@@ -58,10 +56,11 @@ Several apps that are included by default in regular releases such as [First run
 
 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.
 
+### Working with front-end code 🏗
 
-### Building front-end code 🏗
+#### Building
 
-We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
+We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
 ``` bash
 # install dependencies
@@ -77,6 +76,8 @@ make watch-js
 make build-js-production
 ```
 
+#### Commiting changes
+
 **When making changes, also commit the compiled files!**
 
 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.
@@ -91,6 +92,29 @@ Then inside the root folder of your local Nextcloud development installation, ru
 ./build/compile-handlebars-templates.sh
 ```
 
+Before checking in JS changes, make sure to also build for production:
+```
+make build-js-production
+```
+Then add the compiled files for committing.
+
+To save some time, to only rebuild for a specific app, use the following and replace the module with the app name:
+```
+MODULE=user_status make build-js-production
+```
+
+Please note that if you used `make build-js` or `make watch-js` before, you'll notice that a lot of files were marked as changed, so might need to clear the workspace first.
+
+### Working with back-end code 🏗
+
+When changing back-end PHP code, in general no additional steps are needed before checking in.
+
+However, if new files were created, you will need to run the following command to update the autoloader files:
+```bash
+build/autoloaderchecker.sh
+```
+
+After that, please also include the autoloader file changes in your commits.
 
 ### Tools we use 🛠
 

SECURITY.md

@@ -0,0 +1,25 @@
+# Security Policy
+
+## Supported Versions
+
+The latest three major release versions of Nextcloud are currently being supported with security updates.
+Please visit https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule for further details.
+
+## Reporting a Vulnerability
+
+Security is very important to us. If you have discovered a security issue with Nextcloud,
+please read our responsible disclosure guidelines and contact us at [hackerone.com/nextcloud](https://hackerone.com/nextcloud).
+Your report should include:
+
+- Product version
+- A vulnerability description
+- Reproduction steps
+
+A member of the security team will confirm the vulnerability, determine its impact, and develop a fix.
+The fix will be applied to the master branch, tested, and packaged in the next security release.
+The vulnerability will be publicly announced after the release. Finally, your name will be added
+to the [hall of fame](https://hackerone.com/nextcloud/thanks) as a thank you from the entire Nextcloud community. Note our 
+[threat model](https://nextcloud.com/security/threat-model) to know what is expected behavior.
+
+
+Please visit https://nextcloud.com/security/ for further information about security.

apps/accessibility/.l10nignore

@@ -1,2 +1,2 @@
 # compiled vue templates
-js/accessibility.js
+js/

apps/accessibility/appinfo/info.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
-    <id>accessibility</id>
-    <name>Accessibility</name>
-    <summary>Accessibility options for nextcloud</summary>
-    <description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
-    <version>1.4.0</version>
-    <licence>agpl</licence>
-    <author>John Molakvoæ</author>
-    <namespace>Accessibility</namespace>
-    <default_enable/>
+	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+	<id>accessibility</id>
+	<name>Accessibility</name>
+	<summary>Accessibility options for nextcloud</summary>
+	<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
+	<version>1.7.0</version>
+	<licence>agpl</licence>
+	<author>John Molakvoæ</author>
+	<namespace>Accessibility</namespace>
+	<default_enable/>
 
-    <category>customization</category>
+	<category>customization</category>
 
-    <bugs>https://github.com/nextcloud/server/issues</bugs>
+	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
-    <dependencies>
-        <nextcloud min-version="18" max-version="18"/>
-    </dependencies>
+	<dependencies>
+		<nextcloud min-version="21" max-version="21"/>
+	</dependencies>
 
 	<repair-steps>
 		<pre-migration>
@@ -25,8 +25,8 @@
 		</pre-migration>
 	</repair-steps>
 
-    <settings>
-        <personal>OCA\Accessibility\Settings\Personal</personal>
-        <personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
-    </settings>
+	<settings>
+		<personal>OCA\Accessibility\Settings\Personal</personal>
+		<personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
+	</settings>
 </info>

apps/accessibility/appinfo/routes.php

@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author Alexey Pyltsyn <lex61rus@gmail.com>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @author Julius Härtl <jus@bitgrid.net>
  *
@@ -26,23 +27,22 @@
 return [
 	'routes' => [
 		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
-		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
-    ],
-    'ocs' => [
+	],
+	'ocs' => [
 		[
 			'name' => 'Config#getConfig',
-			'url'  => '/api/v1/config',
+			'url' => '/api/v1/config',
 			'verb' => 'GET',
-        ],
+		],
 		[
 			'name' => 'Config#setConfig',
-			'url'  => '/api/v1/config/{key}',
+			'url' => '/api/v1/config/{key}',
 			'verb' => 'PUT',
 		],
 		[
 			'name' => 'Config#deleteConfig',
-			'url'  => '/api/v1/config/{key}',
+			'url' => '/api/v1/config/{key}',
 			'verb' => 'DELETE',
 		],
-    ]
+	]
 ];

apps/accessibility/composer/composer/ClassLoader.php

@@ -37,8 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();

apps/accessibility/composer/composer/autoload_classmap.php

@@ -6,11 +6,13 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\Accessibility\\AccessibilityProvider' => $baseDir . '/../lib/AccessibilityProvider.php',
     'OCA\\Accessibility\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Accessibility\\Controller\\AccessibilityController' => $baseDir . '/../lib/Controller/AccessibilityController.php',
     'OCA\\Accessibility\\Controller\\ConfigController' => $baseDir . '/../lib/Controller/ConfigController.php',
     'OCA\\Accessibility\\Migration\\RepairUserConfig' => $baseDir . '/../lib/Migration/RepairUserConfig.php',
+    'OCA\\Accessibility\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php',
     'OCA\\Accessibility\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
     'OCA\\Accessibility\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
 );

apps/accessibility/composer/composer/autoload_real.php

@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAccessibility
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
@@ -25,7 +28,7 @@ class ComposerAutoloaderInitAccessibility
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
         } else {

apps/accessibility/composer/composer/autoload_static.php

@@ -21,11 +21,13 @@ class ComposerStaticInitAccessibility
     );
 
     public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\Accessibility\\AccessibilityProvider' => __DIR__ . '/..' . '/../lib/AccessibilityProvider.php',
         'OCA\\Accessibility\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Accessibility\\Controller\\AccessibilityController' => __DIR__ . '/..' . '/../lib/Controller/AccessibilityController.php',
         'OCA\\Accessibility\\Controller\\ConfigController' => __DIR__ . '/..' . '/../lib/Controller/ConfigController.php',
         'OCA\\Accessibility\\Migration\\RepairUserConfig' => __DIR__ . '/..' . '/../lib/Migration/RepairUserConfig.php',
+        'OCA\\Accessibility\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php',
         'OCA\\Accessibility\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
         'OCA\\Accessibility\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
     );

apps/accessibility/css/dark.scss

@@ -5,6 +5,9 @@ $color-main-background: #181818;
 $color-background-dark: lighten($color-main-background, 4%);
 $color-background-darker: lighten($color-main-background, 8%);
 
+$color-placeholder-light: lighten($color-main-background, 10%);
+$color-placeholder-dark: lighten($color-main-background, 20%);
+
 $color-text-maxcontrast: darken($color-main-text, 30%);
 $color-text-light: darken($color-main-text, 10%);
 $color-text-lighter: darken($color-main-text, 20%);
@@ -12,7 +15,7 @@ $color-text-lighter: darken($color-main-text, 20%);
 $color-loading-light: #777;
 $color-loading-dark: #ccc;
 
-$color-box-shadow: rgba(darken($color-main-background, 70%), 0.5);
+$color-box-shadow: transparentize(darken($color-main-background, 70%), 0.5);
 
 $color-border: lighten($color-main-background, 7%);
 $color-border-dark: lighten($color-main-background, 14%);

apps/accessibility/css/fontdyslexic.scss

@@ -12,4 +12,4 @@
 	src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
 }
 
-$font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+$font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';

apps/accessibility/css/highcontrast.scss

@@ -5,6 +5,9 @@ $color-main-background: #fff;
 $color-background-dark: darken($color-main-background, 30%);
 $color-background-darker: darken($color-main-background, 30%);
 
+$color-placeholder-light: darken($color-main-background, 30%);
+$color-placeholder-dark: darken($color-main-background, 45%);
+
 $color-text-maxcontrast: $color-main-text;
 $color-text-light: $color-main-text;
 $color-text-lighter: $color-main-text;

apps/accessibility/l10n/el.js

@@ -9,11 +9,11 @@ OC.L10N.register(
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Λειτουργία με υψηλή αντίθεση για να διευκολύνει την πλοήγηση σας. Η οπτική ποιότητα θα είναι μειωμένη αλλά θα έχετε υψηλότερη ευκρίνεια.",
     "Dyslexia font" : "Γραμματοσειρά για δυσλεκτικούς",
     "Enable dyslexia font" : "Ενεργοποίηση γραμματοσειράς για δυσλεκτικούς",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη λάθη που προκαλεί η δυσλεξία στην ανάγνωση",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη προβλήματα που προκαλεί η δυσλεξία στην ανάγνωση",
     "Accessibility" : "Προσβασιμότητα",
     "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με την {guidelines} Πρόσβαση Περιεχομένου Ιστού Guidelines{linkend} 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!",
     "Enable" : "Ενεργοποίηση"
 },

apps/accessibility/l10n/el.json

@@ -7,11 +7,11 @@
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Λειτουργία με υψηλή αντίθεση για να διευκολύνει την πλοήγηση σας. Η οπτική ποιότητα θα είναι μειωμένη αλλά θα έχετε υψηλότερη ευκρίνεια.",
     "Dyslexia font" : "Γραμματοσειρά για δυσλεκτικούς",
     "Enable dyslexia font" : "Ενεργοποίηση γραμματοσειράς για δυσλεκτικούς",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη λάθη που προκαλεί η δυσλεξία στην ανάγνωση",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "Η OpenDyslexic είναι μία δωρεάν γραμματοσειρά σχεδιασμένη ώστε να περιορίζει ορισμένα από τα πιο συνήθη προβλήματα που προκαλεί η δυσλεξία στην ανάγνωση",
     "Accessibility" : "Προσβασιμότητα",
     "Accessibility options for nextcloud" : "Ρυθμίσεις προσβασιμότητας του nextcloud.",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Προσφέρει πολλαπλές επιλογές προσβασιμότητας για να διευκολύνουν τη χρήση του Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με τις {προδιαγραφές} Προδιαγραφές πρόσβασης περιεχομένου Ιστού 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Η γενική πρόσβαση είναι πολύ σημαντική για εμάς. Ακολουθούμε τα πρότυπα του διαδικτύου και ελέγχουμε ότι τα πάντα μπορούν να χρησιμοποιηθούν χωρίς ποντίκι και βοηθητικό λογισμικό όπως προγράμματα ανάγνωσης οθόνης. Στόχος μας είναι να συμμορφωνόμαστε με την {guidelines} Πρόσβαση Περιεχομένου Ιστού Guidelines{linkend} 2.1 σε επίπεδο AA, με το θέμα υψηλής αντίθεσης ακόμη και σε επίπεδο ΑΑΑ.",
     "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Αν διαπιστώσετε τυχόν προβλήματα, μη διστάσετε να τα αναφέρετε στον {issuetracker} στον διακομιστή προβλημάτων μας{linkend}. Και αν θέλετε να εμπλακείτε, ελάτε στο {designteam} στην ομάδα σχεδιασμού μας{linkend}!",
     "Enable" : "Ενεργοποίηση"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"

apps/accessibility/l10n/oc.js

@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tèma fosc",
-    "Enable dark theme" : "Activar lo tèma fosc",
-    "High contrast mode" : "Mòde fòrt contraste",
-    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
-    "Accessibility" : "Accessibilitat",
-    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud",
-    "Enable" : "Activar"
-},
-"nplurals=2; plural=(n > 1);");

apps/accessibility/l10n/oc.json

@@ -1,11 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tèma fosc",
-    "Enable dark theme" : "Activar lo tèma fosc",
-    "High contrast mode" : "Mòde fòrt contraste",
-    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
-    "Accessibility" : "Accessibilitat",
-    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud",
-    "Enable" : "Activar"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}

apps/accessibility/l10n/sc.js

@@ -1,20 +0,0 @@
-OC.L10N.register(
-    "accessibility",
-    {
-    "Dark theme" : "Tema iscuru ",
-    "Enable dark theme" : "Ativa su tema iscuru ",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Unu tema iscuru pro agiudare is ogros tuos menguende sa luminosidade e su lugore generale. Est ancora in fase de isvilupu, duncas sinnala cale si siat problema.",
-    "High contrast mode" : "Modalidade cuntrastu artu",
-    "Enable high contrast mode" : "Ativa sa modalidade cuntrastu altu",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Unu cuntrastu artu pro agiudare sa navigatzione tua. S'at a menguare sa calidade de visualizatzione, ma at a crèschere sa craresa.",
-    "Dyslexia font" : "Font pro dislessia",
-    "Enable dyslexia font" : "Ativa su font pro dislessia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est unu font lìberu pensadu pro illebiare unos cantos isbàllios comunes de leghidura causados dae sa dislessia.",
-    "Accessibility" : "Atzessibilidade",
-    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!",
-    "Enable" : "Ativa"
-},
-"nplurals=2; plural=(n != 1);");

apps/accessibility/l10n/sc.json

@@ -1,18 +0,0 @@
-{ "translations": {
-    "Dark theme" : "Tema iscuru ",
-    "Enable dark theme" : "Ativa su tema iscuru ",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Unu tema iscuru pro agiudare is ogros tuos menguende sa luminosidade e su lugore generale. Est ancora in fase de isvilupu, duncas sinnala cale si siat problema.",
-    "High contrast mode" : "Modalidade cuntrastu artu",
-    "Enable high contrast mode" : "Ativa sa modalidade cuntrastu altu",
-    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Unu cuntrastu artu pro agiudare sa navigatzione tua. S'at a menguare sa calidade de visualizatzione, ma at a crèschere sa craresa.",
-    "Dyslexia font" : "Font pro dislessia",
-    "Enable dyslexia font" : "Ativa su font pro dislessia",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic est unu font lìberu pensadu pro illebiare unos cantos isbàllios comunes de leghidura causados dae sa dislessia.",
-    "Accessibility" : "Atzessibilidade",
-    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!",
-    "Enable" : "Ativa"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}

apps/accessibility/l10n/zh_HK.js

@@ -8,13 +8,6 @@ OC.L10N.register(
     "Enable high contrast mode" : "使用高對比模式",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比模式能使您的瀏覽更容易。視覺品質將被降低，但清晰度將被提高。",
     "Dyslexia font" : "閱讀困難症字體",
-    "Enable dyslexia font" : "啟用閱讀困難症字型",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀困難引起的一些常見閱讀錯誤。",
-    "Accessibility" : "輔助工具",
-    "Accessibility options for nextcloud" : " Nextcloud 輔助工具設定",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種 輔助工具使您更易於操作 Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！",
     "Enable" : "啟用"
 },
 "nplurals=1; plural=0;");

apps/accessibility/l10n/zh_HK.json

@@ -6,13 +6,6 @@
     "Enable high contrast mode" : "使用高對比模式",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比模式能使您的瀏覽更容易。視覺品質將被降低，但清晰度將被提高。",
     "Dyslexia font" : "閱讀困難症字體",
-    "Enable dyslexia font" : "啟用閱讀困難症字型",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀困難引起的一些常見閱讀錯誤。",
-    "Accessibility" : "輔助工具",
-    "Accessibility options for nextcloud" : " Nextcloud 輔助工具設定",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種 輔助工具使您更易於操作 Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！",
     "Enable" : "啟用"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/accessibility/lib/AccessibilityProvider.php

@@ -3,9 +3,11 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Greta Doci <gretadoci@gmail.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
+ * @author Joas Schilling <coding@schilljs.com>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -51,40 +53,42 @@ class AccessibilityProvider {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName      = $appName;
+		$this->appName = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
+		$this->l = $l;
 	}
 
 	public function getThemes() {
-		return array(
+		return [
 			[
-				'id'    => 'dark',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
+				'id' => 'dark',
+				'img' => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
 				'title' => $this->l->t('Dark theme'),
-				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
+				'enableLabel' => $this->l->t('Enable dark theme'),
+				'text' => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
 			]
-		);
+		];
 	}
 
 	public function getHighContrast() {
 		return [
-				'id'    => 'highcontrast',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
-				'title' => $this->l->t('High contrast mode'),
-				'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
-			];
+			'id' => 'highcontrast',
+			'img' => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
+			'title' => $this->l->t('High contrast mode'),
+			'enableLabel' => $this->l->t('Enable high contrast mode'),
+			'text' => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
+		];
 	}
 
 	public function getFonts() {
-		return array(
+		return [
 			[
-				'id'    => 'fontdyslexic',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
+				'id' => 'fontdyslexic',
+				'img' => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
 				'title' => $this->l->t('Dyslexia font'),
-				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
+				'enableLabel' => $this->l->t('Enable dyslexia font'),
+				'text' => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
 			]
-		);
+		];
 	}
-
 }

apps/accessibility/lib/AppInfo/Application.php

@@ -1,10 +1,14 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
- * @author Alexey Pyltsyn <lex61rus@gmail.com>
- * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Joas Schilling <coding@schilljs.com>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ * @author Julius Härtl <jus@bitgrid.net>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @license GNU AGPL version 3 or any later version
@@ -26,61 +30,55 @@
 
 namespace OCA\Accessibility\AppInfo;
 
+use OCA\Accessibility\Service\JSDataService;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IConfig;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
+use function count;
+use function implode;
+use function md5;
 
-class Application extends App {
+class Application extends App implements IBootstrap {
 
 	/** @var string */
-	public const APP_NAME = 'accessibility';
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
+	public const APP_ID = 'accessibility';
 
 	public function __construct() {
-		parent::__construct(self::APP_NAME);
-		$this->config       = \OC::$server->getConfig();
-		$this->userSession  = \OC::$server->getUserSession();
-		$this->urlGenerator = \OC::$server->getURLGenerator();
+		parent::__construct(self::APP_ID);
 	}
 
-	public function injectCss() {
+	public function register(IRegistrationContext $context): void {
+		$context->registerInitialStateProvider(JSDataService::class);
+	}
+
+	public function boot(IBootContext $context): void {
+		$context->injectFn([$this, 'injectCss']);
+	}
+
+	public function injectCss(IUserSession $userSession,
+							   IConfig $config,
+							   IURLGenerator $urlGenerator) {
 		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $this->userSession->getUser();
-		if (!is_null($loggedUser)) {
-			$userValues = $this->config->getUserKeys($loggedUser->getUID(), self::APP_NAME);
+		$loggedUser = $userSession->getUser();
+		if ($loggedUser !== null) {
+			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
-				$hash = $this->config->getUserValue($loggedUser->getUID(), self::APP_NAME, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $this->urlGenerator->linkToRoute(self::APP_NAME . '.accessibility.getCss', ['md5' => $hash]);
+				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
+			\OCP\Util::addScript('accessibility', 'accessibilityoca');
+		} else {
+			$userValues = ['dark'];
+
+			$hash = md5(implode('-', $userValues));
+			$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}
-
-	public function injectJavascript() {
-		$linkToJs = $this->urlGenerator->linkToRoute(
-			self::APP_NAME . '.accessibility.getJavascript',
-			[
-				'v' => \OC::$server->getConfig()->getAppValue('accessibility', 'cachebuster', '0'),
-			]
-		);
-
-		\OCP\Util::addHeader(
-			'script',
-			[
-				'src' => $linkToJs,
-				'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
-			],
-			''
-		);
-	}
 }

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -6,12 +6,13 @@ declare(strict_types=1);
  * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
- * @author Alexey Pyltsyn <lex61rus@gmail.com>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
+ * @author Joas Schilling <coding@schilljs.com>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @author Julius Härtl <jus@bitgrid.net>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Citharel <tcit@tcit.fr>
+ * @author Thomas Citharel <nextcloud@tcit.fr>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -32,22 +33,19 @@ declare(strict_types=1);
 
 namespace OCA\Accessibility\Controller;
 
-use Leafo\ScssPhp\Compiler;
-use Leafo\ScssPhp\Exception\ParserException;
-use Leafo\ScssPhp\Formatter\Crunched;
 use OC\Template\IconsCacher;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
-use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IRequest;
-use OCP\IURLGenerator;
-use OCP\IUserManager;
 use OCP\IUserSession;
+use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Exception\ParserException;
+use ScssPhp\ScssPhp\Formatter\Crunched;
 
 class AccessibilityController extends Controller {
 
@@ -60,24 +58,15 @@ class AccessibilityController extends Controller {
 	/** @var IConfig */
 	private $config;
 
-	/** @var IUserManager */
-	private $userManager;
-
 	/** @var ILogger */
 	private $logger;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	/** @var IUserSession */
 	private $userSession;
 
-	/** @var IAppManager */
-	private $appManager;
-
 	/** @var IconsCacher */
 	protected $iconsCacher;
 
@@ -87,58 +76,46 @@ class AccessibilityController extends Controller {
 	/** @var null|string */
 	private $injectedVariables;
 
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 * @param \OC_Defaults $defaults
-	 */
+	/** @var string */
+	private $appRoot;
+
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
-								IUserManager $userManager,
 								ILogger $logger,
-								IURLGenerator $urlGenerator,
 								ITimeFactory $timeFactory,
 								IUserSession $userSession,
 								IAppManager $appManager,
 								IconsCacher $iconsCacher,
 								\OC_Defaults $defaults) {
 		parent::__construct($appName, $request);
-		$this->appName      = $appName;
-		$this->config       = $config;
-		$this->userManager  = $userManager;
-		$this->logger       = $logger;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-		$this->userSession  = $userSession;
-		$this->appManager   = $appManager;
-		$this->iconsCacher  = $iconsCacher;
-		$this->defaults     = $defaults;
+		$this->appName = $appName;
+		$this->config = $config;
+		$this->logger = $logger;
+		$this->timeFactory = $timeFactory;
+		$this->userSession = $userSession;
+		$this->iconsCacher = $iconsCacher;
+		$this->defaults = $defaults;
 
 		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
+		$this->appRoot = $appManager->getAppPath($this->appName);
 	}
 
 	/**
-	 * @NoAdminRequired
+	 * @PublicPage
 	 * @NoCSRFRequired
 	 * @NoSameSiteCookieRequired
 	 *
 	 * @return DataDisplayResponse
 	 */
 	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
+		$css = '';
+		$imports = '';
+		if ($this->userSession->isLoggedIn()) {
+			$userValues = $this->getUserValues();
+		} else {
+			$userValues = ['dark'];
+		}
 
 		foreach ($userValues as $key => $scssFile) {
 			if ($scssFile !== false) {
@@ -178,7 +155,7 @@ class AccessibilityController extends Controller {
 
 		// Rebase all urls
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
+		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
 
 		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
 			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
@@ -197,46 +174,10 @@ class AccessibilityController extends Controller {
 		$response->addHeader('Pragma', 'cache');
 
 		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
-
-		return $response;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDownloadResponse
-	 */
-	public function getJavascript(): DataDownloadResponse {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), $this->appName, 'highcontrast', false) !== false;
+		if ($this->userSession->isLoggedIn()) {
+			$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
 		}
-		if ($theme !== false) {
-			$responseJS = '(function() {
-	OCA.Accessibility = {
-		highcontrast: ' . json_encode($highcontrast) . ',
-		theme: ' . json_encode($theme) . ',
-	};
-	document.body.classList.add(' . json_encode($theme) . ');
-})();';
-		} else {
-			$responseJS = '(function() {
-	OCA.Accessibility = {
-		highcontrast: ' . json_encode($highcontrast) . ',
-		theme: ' . json_encode($theme) . ',
-	};
-})();';
-		}
-		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
-		$response->cacheFor(3600);
+
 		return $response;
 	}
 
@@ -245,9 +186,9 @@ class AccessibilityController extends Controller {
 	 *
 	 * @return array
 	 */
-	private function getUserValues(): array{
+	private function getUserValues(): array {
 		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+		$userFont = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
 		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
 
 		return [$userTheme, $userHighContrast, $userFont];
@@ -272,7 +213,7 @@ class AccessibilityController extends Controller {
 	 * @return string
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+		$re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
 		$subst = 'url(\'' . $webDir . '/$1\')';
 
 		return preg_replace($re, $subst, $css);

apps/accessibility/lib/Controller/ConfigController.php

@@ -6,6 +6,8 @@ declare(strict_types=1);
  * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Daniel Kesselberg <mail@danielkesselberg.de>
  * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
@@ -30,13 +32,13 @@ declare(strict_types=1);
 namespace OCA\Accessibility\Controller;
 
 use OCA\Accessibility\AccessibilityProvider;
-use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCSController;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
+use OCP\PreConditionNotMetException;
 
 class ConfigController extends OCSController {
 
@@ -73,11 +75,11 @@ class ConfigController extends OCSController {
 								IUserSession $userSession,
 								AccessibilityProvider $accessibilityProvider) {
 		parent::__construct($appName, $request);
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
+		$this->appName = $appName;
+		$this->config = $config;
+		$this->userSession = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
+		$this->userId = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -103,20 +105,19 @@ class ConfigController extends OCSController {
 	 *
 	 * @param string $key theme or font
 	 * @return DataResponse
-	 * @throws Exception
+	 * @throws OCSBadRequestException|PreConditionNotMetException
 	 */
 	public function setConfig(string $key, $value): DataResponse {
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
 			if ($value === false || $value === '') {
 				throw new OCSBadRequestException('Invalid value: ' . $value);
 			}
 
 			$themes = $this->accessibilityProvider->getThemes();
-			$highcontrast = array($this->accessibilityProvider->getHighContrast());
-			$fonts  = $this->accessibilityProvider->getFonts();
+			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
+			$fonts = $this->accessibilityProvider->getFonts();
 
-			$availableOptions = array_map(function($option) {
+			$availableOptions = array_map(function ($option) {
 				return $option['id'];
 			}, array_merge($themes, $highcontrast, $fonts));
 
@@ -138,11 +139,10 @@ class ConfigController extends OCSController {
 	 *
 	 * @param string $key theme or font
 	 * @return DataResponse
-	 * @throws Exception
+	 * @throws OCSBadRequestException
 	 */
 	public function deleteConfig(string $key): DataResponse {
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
 			$this->config->deleteUserValue($this->userId, $this->appName, $key);
 			$userValues = $this->config->getUserKeys($this->userId, $this->appName);
 
@@ -156,5 +156,4 @@ class ConfigController extends OCSController {
 
 		throw new OCSBadRequestException('Invalid key: ' . $key);
 	}
-
 }

apps/accessibility/lib/Migration/RepairUserConfig.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Janis Köhr <janis.koehr@novatec-gmbh.de>
  *
  * @license GNU AGPL version 3 or any later version
@@ -73,18 +74,17 @@ class RepairUserConfig implements IRepairStep {
 	 */
 	public function run(IOutput $output) {
 		$output->startProgress();
-		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
+		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
 			if ($theme === 'themedark') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
+				$this->config->setUserValue($user->getUID(), Application::APP_ID, 'theme', 'dark');
 			}
 			if ($theme === 'themehighcontrast') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
-				$this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
+				$this->config->setUserValue($user->getUID(), Application::APP_ID, 'highcontrast', 'highcontrast');
+				$this->config->deleteUserValue($user->getUID(), Application::APP_ID, 'theme');
 			}
 			$output->advance();
 		});
 		$output->finishProgress();
 	}
-
 }

apps/accessibility/lib/Service/JSDataService.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2020, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Accessibility\Service;
+
+use OCA\Accessibility\AppInfo\Application;
+use OCP\AppFramework\Services\InitialStateProvider;
+use OCP\IConfig;
+use OCP\IUserSession;
+
+class JSDataService extends InitialStateProvider {
+	/** @var IUserSession */
+	private $userSession;
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(
+		IUserSession $userSession,
+		IConfig $config
+	) {
+		$this->userSession = $userSession;
+		$this->config = $config;
+	}
+
+	public function getKey(): string {
+		return 'data';
+	}
+
+	public function getData() {
+		$user = $this->userSession->getUser();
+
+		if ($user === null) {
+			$theme = false;
+			$highcontrast = false;
+		} else {
+			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
+			$highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
+		}
+
+		return [
+			'theme' => $theme,
+			'highcontrast' => $highcontrast,
+		];
+	}
+}

apps/accessibility/lib/Settings/Personal.php

@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
  *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -74,13 +75,13 @@ class Personal implements ISettings {
 								IURLGenerator $urlGenerator,
 								AccessibilityProvider $accessibilityProvider,
 								IInitialStateService $initialStateService) {
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->l                     = $l;
-		$this->urlGenerator          = $urlGenerator;
+		$this->appName = $appName;
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->l = $l;
+		$this->urlGenerator = $urlGenerator;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->initialStateService   = $initialStateService;
+		$this->initialStateService = $initialStateService;
 	}
 
 	/**
@@ -93,14 +94,14 @@ class Personal implements ISettings {
 
 		$availableConfig = [
 			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts'  => $this->accessibilityProvider->getFonts(),
+			'fonts' => $this->accessibilityProvider->getFonts(),
 			'highcontrast' => $this->accessibilityProvider->getHighContrast()
 		];
 
 		$userConfig = [
 			'highcontrast' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false),
-			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+			'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
 		];
 
 		$this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);

apps/accessibility/lib/Settings/PersonalSection.php

@@ -2,6 +2,7 @@
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -48,9 +49,9 @@ class PersonalSection implements IIconSection {
 	public function __construct(string $appName,
 								IURLGenerator $urlGenerator,
 								IL10N $l) {
-		$this->appName      = $appName;
+		$this->appName = $appName;
 		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
+		$this->l = $l;
 	}
 
 	/**

apps/accessibility/src/Accessibility.vue

@@ -68,7 +68,7 @@ export default {
 				.replace('{linkend}', '</a>')
 		},
 		guidelinesLink() {
-			return `<a target="_blank" href="https://www.w3.org/WAI/standards-guidelines/wcag/" rel="noreferrer nofollow">`
+			return '<a target="_blank" href="https://www.w3.org/WAI/standards-guidelines/wcag/" rel="noreferrer nofollow">'
 		},
 		descriptionDetail() {
 			return t(
@@ -80,24 +80,28 @@ export default {
 				.replace(/\{linkend\}/g, '</a>')
 		},
 		issuetrackerLink() {
-			return `<a target="_blank" href="https://github.com/nextcloud/server/issues/" rel="noreferrer nofollow">`
+			return '<a target="_blank" href="https://github.com/nextcloud/server/issues/" rel="noreferrer nofollow">'
 		},
 		designteamLink() {
-			return `<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">`
+			return '<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">'
 		},
 	},
 	methods: {
 		// SELECT handlers
 		selectHighContrast(id) {
 			this.selectItem('highcontrast', id)
+			document.body.classList.toggle('theme--highcontrast')
 		},
 		selectTheme(id) {
 			const previous = this.selected.theme
 			if (previous) {
-				document.body.classList.remove(previous)
+				document.body.classList.remove(`theme--${previous}`)
 			}
 			if (id) {
-				document.body.classList.add(id)
+				document.body.classList.remove('theme--light')
+				document.body.classList.add(`theme--${id}`)
+			} else {
+				document.body.classList.add('theme--light')
 			}
 
 			this.selectItem('theme', id)

apps/accessibility/src/accessibilityoca.js

@@ -0,0 +1,33 @@
+/**
+ * @copyright Copyright (c) 2020 Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import { loadState } from '@nextcloud/initial-state'
+
+OCA.Accessibility = loadState('accessibility', 'data')
+if (OCA.Accessibility.theme !== false) {
+	document.body.classList.add(`theme--${OCA.Accessibility.theme}`)
+} else {
+	document.body.classList.add('theme--light')
+}
+
+if (OCA.Accessibility.highcontrast !== false) {
+	document.body.classList.add('theme--highcontrast')
+}

apps/accessibility/src/components/ItemPreview.vue

@@ -8,7 +8,7 @@
 				v-model="checked"
 				type="checkbox"
 				class="checkbox">
-			<label :for="'accessibility-' + preview.id">{{ t('accessibility', 'Enable') }} {{ preview.title.toLowerCase() }}</label>
+			<label :for="'accessibility-' + preview.id">{{ preview.enableLabel }}</label>
 		</div>
 	</div>
 </template>

apps/accessibility/src/main.js

@@ -1,8 +1,27 @@
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import App from './Accessibility.vue'
 
-/* global t */
 // bind to window
 Vue.prototype.OC = OC
 Vue.prototype.t = t

apps/accessibility/webpack.js

@@ -1,11 +1,14 @@
 const path = require('path')
 
 module.exports = {
-	entry: path.join(__dirname, 'src', 'main.js'),
+	entry: {
+		accessibility: path.join(__dirname, 'src', 'main.js'),
+		accessibilityoca: path.join(__dirname, 'src', 'accessibilityoca.js'),
+	},
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'accessibility.js',
-		jsonpFunction: 'webpackJsonpAccessibility'
-	}
+		filename: '[name].js',
+		jsonpFunction: 'webpackJsonpAccessibility',
+	},
 }

apps/admin_audit/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.8.0</version>
+	<version>1.11.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="18" max-version="18"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/composer/composer/ClassLoader.php

@@ -37,8 +37,8 @@ namespace Composer\Autoload;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();

apps/admin_audit/composer/composer/autoload_classmap.php

@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = $vendorDir;
 
 return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
     'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
     'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',

apps/admin_audit/composer/composer/autoload_real.php

@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAdminAudit
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
@@ -25,7 +28,7 @@ class ComposerAutoloaderInitAdminAudit
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require __DIR__ . '/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
         } else {

apps/admin_audit/composer/composer/autoload_static.php

@@ -21,6 +21,7 @@ class ComposerStaticInitAdminAudit
     );
 
     public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
         'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
         'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',

apps/admin_audit/l10n/ar.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "التدقيق / السجلات",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "خاصية سجلات المراقبة لـ نكست كلاود مثل الوصول إلى سجلات الملفات أو المعلومات الحساسة الاخرى."
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

apps/admin_audit/l10n/ar.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "التدقيق / السجلات",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "خاصية سجلات المراقبة لـ نكست كلاود مثل الوصول إلى سجلات الملفات أو المعلومات الحساسة الاخرى."
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}

apps/admin_audit/l10n/ca.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoria/registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/ca.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoria/registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/cs.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditování / zaznamenávání událostí",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Poskytuje Nextcloud schopnosti zaznamenávání událostí, jako například zaznamenávání přístupů k souboru nebo jiných citlivých akcí."
+},
+"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/admin_audit/l10n/cs.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditování / zaznamenávání událostí",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Poskytuje Nextcloud schopnosti zaznamenávání událostí, jako například zaznamenávání přístupů k souboru nebo jiných citlivých akcí."
+},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
+}

apps/admin_audit/l10n/de.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditieren / Protokollieren",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Stellt Protokollierungsfunktionen für Nextcloud zur Verfügung wie Dateizugriffe oder andere vertrauliche Aktionen."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/de.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditieren / Protokollieren",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Stellt Protokollierungsfunktionen für Nextcloud zur Verfügung wie Dateizugriffe oder andere vertrauliche Aktionen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/de_DE.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditieren / Protokollieren",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Stellt Protokollierungsfunktionen für Nextcloud zur Verfügung wie Dateizugriffe oder andere vertrauliche Aktionen."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/de_DE.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditieren / Protokollieren",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Stellt Protokollierungsfunktionen für Nextcloud zur Verfügung wie Dateizugriffe oder andere vertrauliche Aktionen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/en_GB.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditing / Logging",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/en_GB.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditing / Logging",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/es.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Ofrece a Nextcloud capacidades de registro tales como registrar los accesos a archivos u otras acciones sensibles."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/es.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Ofrece a Nextcloud capacidades de registro tales como registrar los accesos a archivos u otras acciones sensibles."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/es_CO.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/es_CO.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/es_DO.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/es_DO.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Registro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/eu.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoretza / Erregistroa",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-i  gaitasuna ematen dio, adibidez, fitxategien atzipenak edo bestelako ekintza babesgarriak erregistratzeko."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/eu.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoretza / Erregistroa",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Nextcloud-i  gaitasuna ematen dio, adibidez, fitxategien atzipenak edo bestelako ekintza babesgarriak erregistratzeko."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/fi.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditointi / lokitus",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Tarjoaa Nextcloudille lokin ylläpidon esimerkiksi tiedostojen käytöstä tai arkaluonteisista toiminnoista."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/fi.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditointi / lokitus",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Tarjoaa Nextcloudille lokin ylläpidon esimerkiksi tiedostojen käytöstä tai arkaluonteisista toiminnoista."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/fr.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Audit / journalisation",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de journalisation pour Nextcloud telles que la journalisation des accès aux fichiers ou des actions autrement sensibles."
+},
+"nplurals=2; plural=(n > 1);");

apps/admin_audit/l10n/fr.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Audit / journalisation",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fournit des capacités de journalisation pour Nextcloud telles que la journalisation des accès aux fichiers ou des actions autrement sensibles."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}

apps/admin_audit/l10n/gl.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditoría / Rexistro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de rexistro para o Nextcloud como rexistros de acceso a ficheiros ou calquera outra acción sensíbel."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/gl.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditoría / Rexistro",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de rexistro para o Nextcloud como rexistros de acceso a ficheiros ou calquera outra acción sensíbel."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/admin_audit/l10n/hr.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Revizija/zapisivanje",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Omogućuje zapisivanje u Nextcloudu, primjerice radi bilježenja pristupa datotekama ili drugih osjetljivih radnji."
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");

apps/admin_audit/l10n/hr.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Revizija/zapisivanje",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Omogućuje zapisivanje u Nextcloudu, primjerice radi bilježenja pristupa datotekama ili drugih osjetljivih radnji."
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}