better cleanup of filecache when deleting an external storage

this way it can delete the cache entries even with per-user credentials

Signed-off-by: Robin Appelman <robin@icewind.nl>

.devcontainer/Dockerfile

@@ -1,47 +0,0 @@
-FROM ubuntu:focal
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-# PHP
-RUN apt-get update -y
-RUN apt-get install --no-install-recommends -y \
-    php7.4 \
-    php7.4-gd \
-    php7.4-zip \
-    php7.4-curl \
-    php7.4-xml \
-    php7.4-mbstring \
-    php7.4-sqlite \
-    php7.4-xdebug \
-    php7.4-pgsql \
-    php7.4-intl \
-    php7.4-imagick \
-    php7.4-gmp \
-    php7.4-apcu \
-    php7.4-bcmath \
-    libmagickcore-6.q16-3-extra \
-    curl \
-    vim \
-    lsof \
-    make \
-    nodejs \
-    npm
-
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
-RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/cli/conf.d/20-xdebug.ini
-
-# Docker
-RUN apt-get -y install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-RUN add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-RUN apt-get update -y
-RUN apt-get install -y docker-ce docker-ce-cli containerd.io
-RUN ln -s /var/run/docker-host.sock /var/run/docker.sock  

.devcontainer/codespace.config.php

@@ -1,18 +0,0 @@
-<?php
-
-$cloudEnvironmentId = getenv('CLOUDENV_ENVIRONMENT_ID');
-
-$CONFIG = [
-    'mail_from_address' => 'no-reply',
-    'mail_smtpmode' => 'smtp',
-    'mail_sendmailmode' => 'smtp',
-    'mail_domain' => 'example.com',
-    'mail_smtphost' => 'localhost',
-    'mail_smtpport' => '1025',
-    'memcache.local' => '\OC\Memcache\APCu',
-];
-
-if($cloudEnvironmentId !== true) {
-    $CONFIG['overwritehost'] = $cloudEnvironmentId . '-80.apps.codespaces.githubusercontent.com';
-    $CONFIG['overwriteprotocol'] = 'https';
-}

.devcontainer/devcontainer.json

@@ -1,22 +0,0 @@
-{
-	"name": "NextcloudServer",
-	"dockerComposeFile": "docker-compose.yml",
-	"service": "nextclouddev",
-	"postCreateCommand": ".devcontainer/setup.sh",
-	"forwardPorts": [
-		80,
-		8080,
-		8025
-	],
-	"runArgs": [
-		"--privileged"
-	],
-	"extensions": [
-		"felixfbecker.php-debug",
-		"felixfbecker.php-intellisense",
-		"ms-azuretools.vscode-docker"
-	],
-	"settings": {
-		"php.suggest.basic": false,
-	}
-}

.devcontainer/docker-compose.yml

@@ -1,29 +0,0 @@
-version: '3'
-services:
-  nextclouddev:
-    build: .
-    volumes:
-      - .:/workspace:cached
-      - /var/run/docker.sock:/var/run/docker-host.sock
-    command: /bin/sh -c "while sleep 1000; do :; done"
-    ports:
-      - 80:80
-      - 8080:8080
-      - 8025:8025
-
-  db:
-    image: postgres
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: postgres
-    network_mode: service:nextclouddev
-
-  adminer:
-    image: adminer
-    restart: always
-    network_mode: service:nextclouddev
-
-  mailhog:
-    image: mailhog/mailhog
-    restart: always
-    network_mode: service:nextclouddev

.devcontainer/setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
-
-cd $DIR/
-git submodule update --init
-
-# Codespace config
-cp .devcontainer/codespace.config.php config/codespace.config.php

.eslintignore

@@ -1,11 +0,0 @@
-# Ignoring folders for eslint
-node_modules/
-3rdparty/
-**/vendor/
-**/l10n/
-**/js/*
-*.config.js
-tests/lib/
-
-# TODO: remove when comments files is not using handlebar templates anymore
-apps/comments/src/templates.js

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
 		escapeHTML: true,
 		oc_userconfig: true,
 		dayNames: true,
-		firstDay: true,
+		firstDay: true
 	},
 	extends: ['@nextcloud'],
 	rules: {

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: https://nextcloud.com/include/

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-    - name: ❓ Community Support and Help
+    - name: ❓ Question
       url: https://help.nextcloud.com/
-      about: Configuration, webserver/proxy or performance issues and other questions
+      about: I have a question …
     - name: 💼 Nextcloud Enterprise
       url: https://portal.nextcloud.com/
-      about: If you are a Nextcloud Enterprise customer, or need Professional support, so it can be resolved directly by our dedicated engineers more quickly
+      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/dependabot.yml

@@ -1,165 +0,0 @@
-version: 2
-updates:
-# Linting and coding style
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Main master npm
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-
-# Testing master npm
-- package-ecosystem: npm
-  directory: "/build"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-# Testing master composer
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-
-
-# Main stableXX npm
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable19
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable20
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable21
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-# Testing StableXX composer
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable19
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable20
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
-- package-ecosystem: composer
-  directory: "/build/integration"
-  schedule:
-    interval: weekly
-    day: saturday
-    time: "03:00"
-    timezone: Europe/Paris
-  target-branch: stable21
-  labels:
-    - "3. to review"
-    - "feature: dependencies"
-  reviewers:
-    - "nextcloud/server-dependabot"
-  ignore:
-    # ignore all GitHub linguist patch updates
-    - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]

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

@@ -1,5 +1,5 @@
 name: Dependabot
-on: pull_request_target
+on: pull_request
 
 jobs:
   auto-merge:
@@ -7,15 +7,13 @@ jobs:
     steps:
       # Default github action approve
       - uses: hmarr/auto-approve-action@v2.0.0
-        if: github.ref == 'refs/heads/master' &&
-            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+        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@v2
-        if: github.ref == 'refs/heads/master' &&
-            (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+      - uses: ahmadnassri/action-dependabot-auto-merge@v1
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
-          target: minor
+          target: patch
           github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

.github/workflows/fixup.yml

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

.github/workflows/lint.yml

@@ -15,7 +15,6 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
     - name: Lint
       run: composer run lint
@@ -30,7 +29,6 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: 7.4
-        extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
         coverage: none
         tools: cs2pr
     - name: Install dependencies
@@ -40,25 +38,3 @@ jobs:
         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
-
-  node:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x]
-
-    name: eslint node${{ matrix.node-version }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Lint
-        run: npm run lint

.github/workflows/oci.yml

@@ -41,7 +41,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, oci8
           tools: phpunit:8.5.2
           coverage: none
 

.github/workflows/psalm-github.yml

@@ -1,28 +0,0 @@
-name: Psalm show github
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
-
-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
-        continue-on-error: true
-        with:
-          composer_ignore_platform_reqs: false
-          report_file: results.sarif
-      - name: Upload Analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif

.github/workflows/psalm-security.yml

@@ -1,11 +1,10 @@
 name: Psalm Security Analysis
 
 on:
-  pull_request:
   push:
-    branches:
-      - master
-      - stable*
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
 
 jobs:
   psalm:
@@ -20,7 +19,6 @@ jobs:
         uses: docker://vimeo/psalm-github-actions
         with:
           security_analysis: true
-          composer_ignore_platform_reqs: false
           report_file: results.sarif
       - name: Upload Security Analysis results to GitHub
         uses: github/codeql-action/upload-sarif@v1

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

@@ -17,7 +17,6 @@ jobs:
               uses: shivammathur/setup-php@master
               with:
                 php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
                 coverage: none
             - name: Composer install
               run: composer i
@@ -43,7 +42,6 @@ jobs:
               uses: shivammathur/setup-php@master
               with:
                 php-version: 7.4
-                extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
                 coverage: none
             - name: Composer install
               run: composer i

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

@@ -19,7 +19,6 @@ jobs:
         uses: shivammathur/setup-php@master
         with:
           php-version: 7.4
-          extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
       - name: Composer install
         run: composer i

.php_cs.dist

@@ -9,15 +9,12 @@ use Nextcloud\CodingStandard\Config;
 $config = new Config();
 $config
 	->getFinder()
+	->ignoreVCSIgnored(true)
 	->exclude('config')
 	->exclude('data')
 	->notPath('3rdparty')
-	->notPath('build/integration/vendor')
-	->notPath('build/lib')
-	->notPath('build/node_modules')
 	->notPath('build/stubs')
 	->notPath('composer')
-	->notPath('node_modules')
 	->notPath('vendor')
 	->in(__DIR__);
 return $config;

3rdparty

@@ -1 +1 @@
-Subproject commit 0d7c15582f5d2478f333c0487acf88ae881d9206
+Subproject commit fbc872de93b18d3e87367d00e281982eab74c5b9

AUTHORS

@@ -133,7 +133,7 @@ Nextcloud is written by:
  - Joel S <joel.devbox@protonmail.com>
  - Johan Björk <johanimon@gmail.com>
  - Johannes Ernst <jernst@indiecomputing.com>
- - Johannes Leuker <developers@hosting.de>
+ - Johannes Leuker <j.leuker@hosting.de>
  - Johannes Riedel <joeried@users.noreply.github.com>
  - Johannes Schlichenmaier <johannes@schlichenmaier.info>
  - Johannes Willnecker <johannes@willnecker.com>

Makefile

@@ -1,7 +1,7 @@
 all: clean dev-setup build-js-production
 
 # Dev env management
-dev-setup: clean npm-init
+dev-setup: clean clean-dev npm-init
 
 npm-init:
 	npm ci
@@ -43,6 +43,9 @@ clean:
 	rm -rf apps/workflowengine/js/
 	rm -rf core/js/dist
 
+clean-dev:
+	rm -rf node_modules
+
 clean-git: clean
 	git checkout -- apps/accessibility/js/
 	git checkout -- apps/comments/js/

apps/accessibility/appinfo/info.xml

@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 
 	<repair-steps>

apps/accessibility/css/dark.scss

@@ -2,9 +2,8 @@
 $color-main-text: #d8d8d8;
 $color-main-background: #181818;
 
-$color-background-hover: lighten($color-main-background, 4%);
-$color-background-dark: lighten($color-main-background, 7%);
-$color-background-darker: lighten($color-main-background, 14%);
+$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%);

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -40,9 +40,9 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\Exception\ParserException;
 use ScssPhp\ScssPhp\OutputStyle;
@@ -58,7 +58,7 @@ class AccessibilityController extends Controller {
 	/** @var IConfig */
 	private $config;
 
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var ITimeFactory */
@@ -82,7 +82,7 @@ class AccessibilityController extends Controller {
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
-								LoggerInterface $logger,
+								ILogger $logger,
 								ITimeFactory $timeFactory,
 								IUserSession $userSession,
 								IAppManager $appManager,
@@ -145,12 +145,7 @@ class AccessibilityController extends Controller {
 					'@import "css-variables.scss";'
 				);
 			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(),
-					[
-						'app' => 'core',
-						'exception' => $e,
-					]
-				);
+				$this->logger->error($e->getMessage(), ['app' => 'core']);
 			}
 		}
 
@@ -259,12 +254,7 @@ class AccessibilityController extends Controller {
 			$scss->compile($variables);
 			$this->injectedVariables = $variables;
 		} catch (ParserException $e) {
-			$this->logger->error($e->getMessage(),
-				[
-					'app' => 'core',
-					'exception' => $e,
-				]
-			);
+			$this->logger->logException($e, ['app' => 'core']);
 		}
 		return $variables;
 	}

apps/accessibility/lib/Controller/ConfigController.php

@@ -117,7 +117,7 @@ class ConfigController extends OCSController {
 			$highcontrast = [$this->accessibilityProvider->getHighContrast()];
 			$fonts = $this->accessibilityProvider->getFonts();
 
-			$availableOptions = array_map(function ($option): string {
+			$availableOptions = array_map(function ($option) {
 				return $option['id'];
 			}, array_merge($themes, $highcontrast, $fonts));
 

apps/accessibility/lib/Settings/Personal.php

@@ -27,8 +27,8 @@ namespace OCA\Accessibility\Settings;
 
 use OCA\Accessibility\AccessibilityProvider;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
+use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
@@ -55,16 +55,26 @@ class Personal implements ISettings {
 	/** @var AccessibilityProvider */
 	private $accessibilityProvider;
 
-	/** @var IInitialState */
+	/** @var IInitialStateService */
 	private $initialStateService;
 
+	/**
+	 * Settings constructor.
+	 *
+	 * @param string $appName
+	 * @param IConfig $config
+	 * @param IUserSession $userSession
+	 * @param IL10N $l
+	 * @param IURLGenerator $urlGenerator
+	 * @param AccessibilityProvider $accessibilityProvider
+	 */
 	public function __construct(string $appName,
 								IConfig $config,
 								IUserSession $userSession,
 								IL10N $l,
 								IURLGenerator $urlGenerator,
 								AccessibilityProvider $accessibilityProvider,
-								IInitialState $initialStateService) {
+								IInitialStateService $initialStateService) {
 		$this->appName = $appName;
 		$this->config = $config;
 		$this->userSession = $userSession;
@@ -78,7 +88,7 @@ class Personal implements ISettings {
 	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
 	 * @since 9.1
 	 */
-	public function getForm(): TemplateResponse {
+	public function getForm() {
 		Util::addScript('accessibility', 'accessibility');
 		Util::addStyle('accessibility', 'style');
 
@@ -94,8 +104,8 @@ class Personal implements ISettings {
 			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
 		];
 
-		$this->initialStateService->provideInitialState('available-config', $availableConfig);
-		$this->initialStateService->provideInitialState('user-config', $userConfig);
+		$this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);
+		$this->initialStateService->provideInitialState($this->appName, 'user-config', $userConfig);
 
 		return new TemplateResponse($this->appName, 'settings-personal');
 	}
@@ -104,7 +114,7 @@ class Personal implements ISettings {
 	 * @return string the section ID, e.g. 'sharing'
 	 * @since 9.1
 	 */
-	public function getSection(): string {
+	public function getSection() {
 		return $this->appName;
 	}
 
@@ -116,7 +126,7 @@ class Personal implements ISettings {
 	 * E.g.: 70
 	 * @since 9.1
 	 */
-	public function getPriority(): int {
+	public function getPriority() {
 		return 40;
 	}
 }

apps/accessibility/src/accessibilityoca.js

@@ -1,7 +1,7 @@
 /**
  * @copyright Copyright (c) 2020 Roeland Jago Douma <roeland@famdouma.nl>
  *
- * @author Jan C. Borchardt <hey@jancborchardt.net>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @license GNU AGPL version 3 or any later version
@@ -17,10 +17,8 @@
  * 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/>.
- *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 import { loadState } from '@nextcloud/initial-state'
 
 OCA.Accessibility = loadState('accessibility', 'data')

apps/accessibility/src/main.js

@@ -16,10 +16,8 @@
  * 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/>.
- *
+ * 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'

apps/accessibility/webpack.js

@@ -1,25 +1,3 @@
-/**
- * @copyright Copyright (c) 2016 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/>.
- *
- */
-
 const path = require('path')
 
 module.exports = {

apps/admin_audit/appinfo/info.xml

@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/composer/composer/autoload_classmap.php

@@ -20,5 +20,4 @@ return array(
     'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
     'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
-    'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => $baseDir . '/../lib/Listener/CriticalActionPerformedEventListener.php',
 );

apps/admin_audit/composer/composer/autoload_static.php

@@ -35,7 +35,6 @@ class ComposerStaticInitAdminAudit
         'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
         'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
-        'OCA\\AdminAudit\\Listener\\CriticalActionPerformedEventListener' => __DIR__ . '/..' . '/../lib/Listener/CriticalActionPerformedEventListener.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/admin_audit/lib/Actions/Action.php

@@ -29,13 +29,16 @@ declare(strict_types=1);
 
 namespace OCA\AdminAudit\Actions;
 
-use Psr\Log\LoggerInterface;
+use OCP\ILogger;
 
 class Action {
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	private $logger;
 
-	public function __construct(LoggerInterface $logger) {
+	/**
+	 * @param ILogger $logger
+	 */
+	public function __construct(ILogger $logger) {
 		$this->logger = $logger;
 	}
 
@@ -50,7 +53,7 @@ class Action {
 	public function log(string $text,
 						array $params,
 						array $elements,
-						bool $obfuscateParameters = false): void {
+						bool $obfuscateParameters = false) {
 		foreach ($elements as $element) {
 			if (!isset($params[$element])) {
 				if ($obfuscateParameters) {

apps/admin_audit/lib/Actions/AppManagement.php

@@ -32,7 +32,7 @@ class AppManagement extends Action {
 	/**
 	 * @param string $appName
 	 */
-	public function enableApp(string $appName): void {
+	public function enableApp(string $appName) {
 		$this->log('App "%s" enabled',
 			['app' => $appName],
 			['app']
@@ -43,7 +43,7 @@ class AppManagement extends Action {
 	 * @param string $appName
 	 * @param string[] $groups
 	 */
-	public function enableAppForGroups(string $appName, array $groups): void {
+	public function enableAppForGroups(string $appName, array $groups) {
 		$this->log('App "%1$s" enabled for groups: %2$s',
 			['app' => $appName, 'groups' => implode(', ', $groups)],
 			['app', 'groups']
@@ -53,7 +53,7 @@ class AppManagement extends Action {
 	/**
 	 * @param string $appName
 	 */
-	public function disableApp(string $appName): void {
+	public function disableApp(string $appName) {
 		$this->log('App "%s" disabled',
 			['app' => $appName],
 			['app']

apps/admin_audit/lib/Actions/Auth.php

@@ -33,7 +33,7 @@ namespace OCA\AdminAudit\Actions;
  * @package OCA\AdminAudit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params): void {
+	public function loginAttempt(array $params) {
 		$this->log(
 			'Login attempt: "%s"',
 			$params,
@@ -44,7 +44,7 @@ class Auth extends Action {
 		);
 	}
 
-	public function loginSuccessful(array $params): void {
+	public function loginSuccessful(array $params) {
 		$this->log(
 			'Login successful: "%s"',
 			$params,
@@ -55,7 +55,7 @@ class Auth extends Action {
 		);
 	}
 
-	public function logout(array $params): void {
+	public function logout(array $params) {
 		$this->log(
 			'Logout occurred',
 			[],

apps/admin_audit/lib/Actions/Console.php

@@ -32,7 +32,7 @@ class Console extends Action {
 	/**
 	 * @param $arguments
 	 */
-	public function runCommand(array $arguments): void {
+	public function runCommand(array $arguments) {
 		if (!isset($arguments[1]) || $arguments[1] === '_completion') {
 			// Don't log autocompletion
 			return;

apps/admin_audit/lib/Actions/Files.php

@@ -38,7 +38,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function read(array $params): void {
+	public function read(array $params) {
 		$this->log(
 			'File accessed: "%s"',
 			$params,
@@ -53,7 +53,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function rename(array $params): void {
+	public function rename(array $params) {
 		$this->log(
 			'File renamed: "%s" to "%s"',
 			$params,
@@ -69,7 +69,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function create(array $params): void {
+	public function create(array $params) {
 		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
 			return;
 		}
@@ -88,7 +88,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function copy(array $params): void {
+	public function copy(array $params) {
 		$this->log(
 			'File copied: "%s" to "%s"',
 			$params,
@@ -104,7 +104,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function write(array $params): void {
+	public function write(array $params) {
 		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
 			return;
 		}
@@ -123,7 +123,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function update(array $params): void {
+	public function update(array $params) {
 		$this->log(
 			'File updated: "%s"',
 			$params,
@@ -138,7 +138,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log(
 			'File deleted: "%s"',
 			$params,
@@ -153,7 +153,7 @@ class Files extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function preview(array $params): void {
+	public function preview(array $params) {
 		$this->log(
 			'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
 			$params,

apps/admin_audit/lib/Actions/GroupManagement.php

@@ -45,7 +45,7 @@ class GroupManagement extends Action {
 	 * @param IGroup $group
 	 * @param IUser $user
 	 */
-	public function addUser(IGroup $group, IUser $user): void {
+	public function addUser(IGroup $group, IUser $user) {
 		$this->log('User "%s" added to group "%s"',
 			[
 				'group' => $group->getGID(),
@@ -63,7 +63,7 @@ class GroupManagement extends Action {
 	 * @param IGroup $group
 	 * @param IUser $user
 	 */
-	public function removeUser(IGroup $group, IUser $user): void {
+	public function removeUser(IGroup $group, IUser $user) {
 		$this->log('User "%s" removed from group "%s"',
 			[
 				'group' => $group->getGID(),
@@ -74,13 +74,13 @@ class GroupManagement extends Action {
 			]
 		);
 	}
-
+	
 	/**
 	 * log create group to group event
 	 *
 	 * @param IGroup $group
 	 */
-	public function createGroup(IGroup $group): void {
+	public function createGroup(IGroup $group) {
 		$this->log('Group created: "%s"',
 			[
 				'group' => $group->getGID()
@@ -96,7 +96,7 @@ class GroupManagement extends Action {
 	 *
 	 * @param IGroup $group
 	 */
-	public function deleteGroup(IGroup $group): void {
+	public function deleteGroup(IGroup $group) {
 		$this->log('Group deleted: "%s"',
 			[
 				'group' => $group->getGID()

apps/admin_audit/lib/Actions/Security.php

@@ -41,7 +41,7 @@ class Security extends Action {
 	 * @param IUser $user
 	 * @param array $params
 	 */
-	public function twofactorFailed(IUser $user, array $params): void {
+	public function twofactorFailed(IUser $user, array $params) {
 		$params['uid'] = $user->getUID();
 		$params['displayName'] = $user->getDisplayName();
 
@@ -62,7 +62,7 @@ class Security extends Action {
 	 * @param IUser $user
 	 * @param array $params
 	 */
-	public function twofactorSuccess(IUser $user, array $params): void {
+	public function twofactorSuccess(IUser $user, array $params) {
 		$params['uid'] = $user->getUID();
 		$params['displayName'] = $user->getDisplayName();
 

apps/admin_audit/lib/Actions/Sharing.php

@@ -43,7 +43,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function shared(array $params): void {
+	public function shared(array $params) {
 		if ($params['shareType'] === IShare::TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
@@ -168,7 +168,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function unshare(array $params): void {
+	public function unshare(array $params) {
 		if ($params['shareType'] === IShare::TYPE_LINK) {
 			$this->log(
 				'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
@@ -284,7 +284,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updatePermissions(array $params): void {
+	public function updatePermissions(array $params) {
 		$this->log(
 			'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
 			$params,
@@ -302,7 +302,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updatePassword(array $params): void {
+	public function updatePassword(array $params) {
 		$this->log(
 			'The password of the publicly shared %s "%s" with ID "%s" has been changed',
 			$params,
@@ -319,27 +319,16 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function updateExpirationDate(array $params): void {
-		if ($params['date'] === null) {
-			$this->log(
-				'The expiration date of the publicly shared %s with ID "%s" has been removed',
-				$params,
-				[
-					'itemType',
-					'itemSource',
-				]
-			);
-		} else {
-			$this->log(
-				'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
-				$params,
-				[
-					'itemType',
-					'itemSource',
-					'date',
-				]
-			);
-		}
+	public function updateExpirationDate(array $params) {
+		$this->log(
+			'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
+			$params,
+			[
+				'itemType',
+				'itemSource',
+				'date',
+			]
+		);
 	}
 
 	/**
@@ -347,7 +336,7 @@ class Sharing extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function shareAccessed(array $params): void {
+	public function shareAccessed(array $params) {
 		$this->log(
 			'The shared %s with the token "%s" by "%s" has been accessed.',
 			$params,

apps/admin_audit/lib/Actions/Trashbin.php

@@ -29,13 +29,13 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;
 
 class Trashbin extends Action {
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log('File "%s" deleted from trash bin.',
 			['path' => $params['path']], ['path']
 		);
 	}
 
-	public function restore(array $params): void {
+	public function restore(array $params) {
 		$this->log('File "%s" restored from trash bin.',
 			['path' => $params['filePath']], ['path']
 		);

apps/admin_audit/lib/Actions/UserManagement.php

@@ -44,7 +44,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function create(array $params): void {
+	public function create(array $params) {
 		$this->log(
 			'User created: "%s"',
 			$params,
@@ -59,7 +59,7 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function assign(string $uid): void {
+	public function assign(string $uid) {
 		$this->log(
 		'UserID assigned: "%s"',
 			[ 'uid' => $uid ],
@@ -72,7 +72,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log(
 			'User deleted: "%s"',
 			$params,
@@ -87,7 +87,7 @@ class UserManagement extends Action {
 	 *
 	 * @param string $uid
 	 */
-	public function unassign(string $uid): void {
+	public function unassign(string $uid) {
 		$this->log(
 			'UserID unassigned: "%s"',
 			[ 'uid' => $uid ],
@@ -100,7 +100,7 @@ class UserManagement extends Action {
 	 *
 	 * @param array $params
 	 */
-	public function change(array $params): void {
+	public function change(array $params) {
 		switch ($params['feature']) {
 			case 'enabled':
 				$this->log(
@@ -130,7 +130,7 @@ class UserManagement extends Action {
 	 *
 	 * @param IUser $user
 	 */
-	public function setPassword(IUser $user): void {
+	public function setPassword(IUser $user) {
 		if ($user->getBackendClassName() === 'Database') {
 			$this->log(
 				'Password of user "%s" has been changed',

apps/admin_audit/lib/Actions/Versions.php

@@ -29,7 +29,7 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Actions;
 
 class Versions extends Action {
-	public function rollback(array $params): void {
+	public function rollback(array $params) {
 		$this->log('Version "%s" of "%s" was restored.',
 			[
 				'version' => $params['revision'],
@@ -39,7 +39,7 @@ class Versions extends Action {
 		);
 	}
 
-	public function delete(array $params): void {
+	public function delete(array $params) {
 		$this->log('Version "%s" was deleted.',
 			['path' => $params['path']],
 			['path']

apps/admin_audit/lib/AppInfo/Application.php

@@ -49,7 +49,6 @@ use OCA\AdminAudit\Actions\Sharing;
 use OCA\AdminAudit\Actions\Trashbin;
 use OCA\AdminAudit\Actions\UserManagement;
 use OCA\AdminAudit\Actions\Versions;
-use OCA\AdminAudit\Listener\CriticalActionPerformedEventListener;
 use OCP\App\ManagerEvent;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -59,20 +58,19 @@ use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\Console\ConsoleEvent;
 use OCP\IConfig;
 use OCP\IGroupManager;
+use OCP\ILogger;
 use OCP\IPreview;
 use OCP\IServerContainer;
 use OCP\IUserSession;
-use OCP\Log\Audit\CriticalActionPerformedEvent;
 use OCP\Log\ILogFactory;
 use OCP\Share;
 use OCP\Util;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
 
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	protected $logger;
 
 	public function __construct() {
@@ -80,11 +78,10 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(CriticalActionPerformedEvent::class, CriticalActionPerformedEventListener::class);
 	}
 
 	public function boot(IBootContext $context): void {
-		/** @var LoggerInterface $logger */
+		/** @var ILogger $logger */
 		$logger = $context->injectFn(
 			Closure::fromCallable([$this, 'getLogger'])
 		);
@@ -97,22 +94,22 @@ class Application extends App implements IBootstrap {
 	}
 
 	private function getLogger(IConfig $config,
-							   LoggerInterface $logger,
-							   ILogFactory $logFactory): LoggerInterface {
+							   ILogger $logger,
+							   ILogFactory $logFactory): ILogger {
 		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
 		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($logFile === null) {
 			return $logger;
 		}
-		return $logFactory->getCustomPsrLogger($logFile);
+		return $logFactory->getCustomLogger($logFile);
 	}
 
 	/**
 	 * Register hooks in order to log them
 	 */
-	private function registerHooks(LoggerInterface $logger,
-									 IServerContainer $serverContainer): void {
+	private function registerHooks(ILogger $logger,
+									 IServerContainer $serverContainer) {
 		$this->userManagementHooks($logger, $serverContainer->get(IUserSession::class));
 		$this->groupHooks($logger, $serverContainer->get(IGroupManager::class));
 		$this->authHooks($logger);
@@ -131,8 +128,8 @@ class Application extends App implements IBootstrap {
 		$this->securityHooks($logger, $eventDispatcher);
 	}
 
-	private function userManagementHooks(LoggerInterface $logger,
-										 IUserSession $userSession): void {
+	private function userManagementHooks(ILogger $logger,
+										 IUserSession $userSession) {
 		$userActions = new UserManagement($logger);
 
 		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
@@ -145,8 +142,8 @@ class Application extends App implements IBootstrap {
 		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
 	}
 
-	private function groupHooks(LoggerInterface $logger,
-								IGroupManager $groupManager): void {
+	private function groupHooks(ILogger $logger,
+								IGroupManager $groupManager) {
 		$groupActions = new GroupManagement($logger);
 
 		assert($groupManager instanceof GroupManager);
@@ -156,7 +153,7 @@ class Application extends App implements IBootstrap {
 		$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
 	}
 
-	private function sharingHooks(LoggerInterface $logger): void {
+	private function sharingHooks(ILogger $logger) {
 		$shareActions = new Sharing($logger);
 
 		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
@@ -168,7 +165,7 @@ class Application extends App implements IBootstrap {
 		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
 	}
 
-	private function authHooks(LoggerInterface $logger): void {
+	private function authHooks(ILogger $logger) {
 		$authActions = new Auth($logger);
 
 		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
@@ -176,8 +173,8 @@ class Application extends App implements IBootstrap {
 		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
 	}
 
-	private function appHooks(LoggerInterface $logger,
-							  EventDispatcherInterface $eventDispatcher): void {
+	private function appHooks(ILogger $logger,
+							  EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function (ManagerEvent $event) use ($logger) {
 			$appActions = new AppManagement($logger);
 			$appActions->enableApp($event->getAppID());
@@ -192,16 +189,16 @@ class Application extends App implements IBootstrap {
 		});
 	}
 
-	private function consoleHooks(LoggerInterface $logger,
-								  EventDispatcherInterface $eventDispatcher): void {
+	private function consoleHooks(ILogger $logger,
+								  EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function (ConsoleEvent $event) use ($logger) {
 			$appActions = new Console($logger);
 			$appActions->runCommand($event->getArguments());
 		});
 	}
 
-	private function fileHooks(LoggerInterface $logger,
-							   EventDispatcherInterface $eventDispatcher): void {
+	private function fileHooks(ILogger $logger,
+							   EventDispatcherInterface $eventDispatcher) {
 		$fileActions = new Files($logger);
 		$eventDispatcher->addListener(
 			IPreview::EVENT,
@@ -262,20 +259,20 @@ class Application extends App implements IBootstrap {
 		);
 	}
 
-	private function versionsHooks(LoggerInterface $logger): void {
+	private function versionsHooks(ILogger $logger) {
 		$versionsActions = new Versions($logger);
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
 		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
-	private function trashbinHooks(LoggerInterface $logger): void {
+	private function trashbinHooks(ILogger $logger) {
 		$trashActions = new Trashbin($logger);
 		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
 		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
 	}
 
-	private function securityHooks(LoggerInterface $logger,
-								   EventDispatcherInterface $eventDispatcher): void {
+	private function securityHooks(ILogger $logger,
+								   EventDispatcherInterface $eventDispatcher) {
 		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function (GenericEvent $event) use ($logger) {
 			$security = new Security($logger);
 			$security->twofactorSuccess($event->getSubject(), $event->getArguments());

apps/admin_audit/lib/BackgroundJobs/Rotate.php

@@ -1,7 +1,4 @@
 <?php
-
-declare(strict_types=1);
-
 /**
  * @copyright Copyright (c) 2018 Arthur Schiwon <blizzz@arthur-schiwon.de>
  *
@@ -28,31 +25,26 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\BackgroundJobs;
 
 use OC\BackgroundJob\TimedJob;
-use OCP\IConfig;
 use OCP\Log\RotationTrait;
 
 class Rotate extends TimedJob {
 	use RotationTrait;
 
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig  $config) {
-		$this->config = $config;
-
+	public function __construct() {
 		$this->setInterval(60 * 60 * 3);
 	}
 
 	protected function run($argument) {
-		$default = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$this->filePath = $this->config->getAppValue('admin_audit', 'logfile', $default);
+		$config = \OC::$server->getConfig();
+		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
+		$this->filePath = $config->getAppValue('admin_audit', 'logfile', $default);
 
 		if ($this->filePath === '') {
 			// default log file, nothing to do
 			return;
 		}
 
-		$this->maxSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
+		$this->maxSize = $config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
 
 		if ($this->shouldRotateBySize()) {
 			$this->rotate();

apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.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/>.
- *
- */
-
-namespace OCA\AdminAudit\Listener;
-
-use OCA\AdminAudit\Actions\Action;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use OCP\Log\Audit\CriticalActionPerformedEvent;
-
-class CriticalActionPerformedEventListener extends Action implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof CriticalActionPerformedEvent)) {
-			return;
-		}
-
-		$this->log(
-			$event->getLogMessage(),
-			$event->getParameters(),
-			array_keys($event->getParameters()),
-			$event->getObfuscateParameters()
-		);
-	}
-}

apps/admin_audit/tests/Actions/SecurityTest.php

@@ -28,12 +28,12 @@ declare(strict_types=1);
 namespace OCA\AdminAudit\Tests\Actions;
 
 use OCA\AdminAudit\Actions\Security;
+use OCP\ILogger;
 use OCP\IUser;
-use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class SecurityTest extends TestCase {
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
 	private $logger;
 
 	/** @var Security */
@@ -45,7 +45,7 @@ class SecurityTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->logger = $this->createMock(ILogger::class);
 		$this->security = new Security($this->logger);
 
 		$this->user = $this->createMock(IUser::class);

apps/cloud_federation_api/appinfo/info.xml

@@ -15,6 +15,6 @@
 	<category>files</category>
 	<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 </info>

apps/cloud_federation_api/l10n/tr.js

@@ -1,8 +1,8 @@
 OC.L10N.register(
     "cloud_federation_api",
     {
-    "Cloud Federation API" : "Birleşik Bulut API",
+    "Cloud Federation API" : "Bulut Birleşim API",
     "Enable clouds to communicate with each other and exchange data" : "Karşılıklı iletişim kurmak için bulut hizmetlerini kullanın",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Birleşik Bulut API, farklı Nextcloud kopyalarının birbiri ile iletişim kurarak karşılıklı veri aktarmasını sağlar."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Bulut Birleşim API farklı Nextcloud kopyalarının birbiri ile iletişim kurarak karşılıklı veri aktarmasını sağlar."
 },
 "nplurals=2; plural=(n > 1);");

apps/cloud_federation_api/l10n/tr.json

@@ -1,6 +1,6 @@
 { "translations": {
-    "Cloud Federation API" : "Birleşik Bulut API",
+    "Cloud Federation API" : "Bulut Birleşim API",
     "Enable clouds to communicate with each other and exchange data" : "Karşılıklı iletişim kurmak için bulut hizmetlerini kullanın",
-    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Birleşik Bulut API, farklı Nextcloud kopyalarının birbiri ile iletişim kurarak karşılıklı veri aktarmasını sağlar."
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Bulut Birleşim API farklı Nextcloud kopyalarının birbiri ile iletişim kurarak karşılıklı veri aktarmasını sağlar."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

@@ -38,11 +38,11 @@ use OCP\Federation\ICloudFederationFactory;
 use OCP\Federation\ICloudFederationProviderManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IGroupManager;
+use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Share\Exceptions\ShareNotFound;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class RequestHandlerController
@@ -53,7 +53,7 @@ use Psr\Log\LoggerInterface;
  */
 class RequestHandlerController extends Controller {
 
-	/** @var LoggerInterface */
+	/** @var ILogger */
 	private $logger;
 
 	/** @var IUserManager */
@@ -79,7 +79,7 @@ class RequestHandlerController extends Controller {
 
 	public function __construct($appName,
 								IRequest $request,
-								LoggerInterface $logger,
+								ILogger $logger,
 								IUserManager $userManager,
 								IGroupManager $groupManager,
 								IURLGenerator $urlGenerator,

apps/comments/appinfo/info.xml

@@ -17,7 +17,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 
 	<activity>

apps/comments/composer/composer/autoload_classmap.php

@@ -16,10 +16,10 @@ return array(
     'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir . '/../lib/Collaboration/CommentersSorter.php',
     'OCA\\Comments\\Controller\\Notifications' => $baseDir . '/../lib/Controller/Notifications.php',
     'OCA\\Comments\\EventHandler' => $baseDir . '/../lib/EventHandler.php',
+    'OCA\\Comments\\JSSettingsHelper' => $baseDir . '/../lib/JSSettingsHelper.php',
     'OCA\\Comments\\Listener\\CommentsEntityEventListener' => $baseDir . '/../lib/Listener/CommentsEntityEventListener.php',
     'OCA\\Comments\\Listener\\LoadAdditionalScripts' => $baseDir . '/../lib/Listener/LoadAdditionalScripts.php',
     'OCA\\Comments\\Listener\\LoadSidebarScripts' => $baseDir . '/../lib/Listener/LoadSidebarScripts.php',
-    'OCA\\Comments\\MaxAutoCompleteResultsInitialState' => $baseDir . '/../lib/MaxAutoCompleteResultsInitialState.php',
     'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
     'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
     'OCA\\Comments\\Search\\CommentsSearchProvider' => $baseDir . '/../lib/Search/CommentsSearchProvider.php',

apps/comments/composer/composer/autoload_static.php

@@ -31,10 +31,10 @@ class ComposerStaticInitComments
         'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__ . '/..' . '/../lib/Collaboration/CommentersSorter.php',
         'OCA\\Comments\\Controller\\Notifications' => __DIR__ . '/..' . '/../lib/Controller/Notifications.php',
         'OCA\\Comments\\EventHandler' => __DIR__ . '/..' . '/../lib/EventHandler.php',
+        'OCA\\Comments\\JSSettingsHelper' => __DIR__ . '/..' . '/../lib/JSSettingsHelper.php',
         'OCA\\Comments\\Listener\\CommentsEntityEventListener' => __DIR__ . '/..' . '/../lib/Listener/CommentsEntityEventListener.php',
         'OCA\\Comments\\Listener\\LoadAdditionalScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadAdditionalScripts.php',
         'OCA\\Comments\\Listener\\LoadSidebarScripts' => __DIR__ . '/..' . '/../lib/Listener/LoadSidebarScripts.php',
-        'OCA\\Comments\\MaxAutoCompleteResultsInitialState' => __DIR__ . '/..' . '/../lib/MaxAutoCompleteResultsInitialState.php',
         'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
         'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
         'OCA\\Comments\\Search\\CommentsSearchProvider' => __DIR__ . '/..' . '/../lib/Search/CommentsSearchProvider.php',

apps/comments/js/comments-tab.js

@@ -1,24 +1,2 @@
-!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/js/",n(n.s=706)}({706:function(e,n){
-/**
- * @copyright Copyright (c) 2020 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/>.
- *
- */
-let o=null;const r=new OCA.Files.Sidebar.Tab({id:"comments",name:t("comments","Comments"),icon:"icon-comment",async mount(e,t,n){o&&o.$destroy(),o=new OCA.Comments.View("files",{parent:n}),await o.update(t.id),o.$mount(e)},update(e){o.update(e.id)},destroy(){o.$destroy(),o=null},scrollBottomReached(){o.onScrollBottomReached()}});window.addEventListener("DOMContentLoaded",(function(){OCA.Files&&OCA.Files.Sidebar&&OCA.Files.Sidebar.registerTab(r)}))}});
+!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=742)}({742:function(e,n){function r(e,n,t,r,o,i,u){try{var c=e[i](u),a=c.value}catch(e){return void t(e)}c.done?n(a):Promise.resolve(a).then(r,o)}var o=null,i=new OCA.Files.Sidebar.Tab({id:"comments",name:t("comments","Comments"),icon:"icon-comment",mount:function(e,n,t){return(i=regeneratorRuntime.mark((function r(){return regeneratorRuntime.wrap((function(r){for(;;)switch(r.prev=r.next){case 0:return o&&o.$destroy(),o=new OCA.Comments.View("files",{parent:t}),r.next=4,o.update(n.id);case 4:o.$mount(e);case 5:case"end":return r.stop()}}),r)})),function(){var e=this,n=arguments;return new Promise((function(t,o){var u=i.apply(e,n);function c(e){r(u,t,o,c,a,"next",e)}function a(e){r(u,t,o,c,a,"throw",e)}c(void 0)}))})();var i},update:function(e){o.update(e.id)},destroy:function(){o.$destroy(),o=null},scrollBottomReached:function(){o.onScrollBottomReached()}});window.addEventListener("DOMContentLoaded",(function(){OCA.Files&&OCA.Files.Sidebar&&OCA.Files.Sidebar.registerTab(i)}))}});
 //# sourceMappingURL=comments-tab.js.map

apps/comments/lib/AppInfo/Application.php

@@ -31,10 +31,10 @@ use Closure;
 use OCA\Comments\Capabilities;
 use OCA\Comments\Controller\Notifications;
 use OCA\Comments\EventHandler;
+use OCA\Comments\JSSettingsHelper;
 use OCA\Comments\Listener\CommentsEntityEventListener;
 use OCA\Comments\Listener\LoadAdditionalScripts;
 use OCA\Comments\Listener\LoadSidebarScripts;
-use OCA\Comments\MaxAutoCompleteResultsInitialState;
 use OCA\Comments\Notification\Notifier;
 use OCA\Comments\Search\LegacyProvider;
 use OCA\Comments\Search\CommentsSearchProvider;
@@ -45,8 +45,10 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Comments\CommentsEntityEvent;
+use OCP\IConfig;
 use OCP\ISearch;
 use OCP\IServerContainer;
+use OCP\Util;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'comments';
@@ -73,18 +75,22 @@ class Application extends App implements IBootstrap {
 			CommentsEntityEventListener::class
 		);
 		$context->registerSearchProvider(CommentsSearchProvider::class);
-
-		$context->registerInitialStateProvider(MaxAutoCompleteResultsInitialState::class);
-
-		$context->registerNotifierService(Notifier::class);
 	}
 
 	public function boot(IBootContext $context): void {
+		$context->injectFn(Closure::fromCallable([$this, 'registerNotifier']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
 
+		$jsSettingsHelper = new JSSettingsHelper($context->getAppContainer()->get(IConfig::class));
+		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
+
 		$context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]);
 	}
 
+	protected function registerNotifier(IServerContainer $container) {
+		$container->getNotificationManager()->registerNotifierService(Notifier::class);
+	}
+
 	protected function registerCommentsEventHandler(IServerContainer $container) {
 		$container->getCommentsManager()->registerEventHandler(function () {
 			return $this->getContainer()->query(EventHandler::class);

apps/comments/lib/JSSettingsHelper.php

@@ -1,11 +1,9 @@
 <?php
-
-declare(strict_types=1);
-
 /**
- * @copyright Copyright (c) 2021 Roeland Jago Douma <roeland@famdouma.nl>
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
  *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,23 +24,22 @@ declare(strict_types=1);
 
 namespace OCA\Comments;
 
-use OCP\AppFramework\Services\InitialStateProvider;
 use OCP\IConfig;
 
-class MaxAutoCompleteResultsInitialState extends InitialStateProvider {
-
+class JSSettingsHelper {
 	/** @var IConfig */
-	private $config;
+	private $c;
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
+	public function __construct(IConfig $c) {
+		$this->c = $c;
 	}
 
-	public function getKey(): string {
-		return 'maxAutoCompleteResults';
-	}
+	public function extend(array $settings) {
+		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
 
-	public function getData(): int {
-		return (int)$this->config->getAppValue('comments', 'maxAutoCompleteResults', '10');
+		$value = (int)$this->c->getAppValue('comments', 'maxAutoCompleteResults', 10);
+		$appConfig['comments']['maxAutoCompleteResults'] = $value;
+
+		$settings['array']['oc_appconfig'] = json_encode($appConfig);
 	}
 }

apps/comments/lib/Notification/Notifier.php

@@ -133,7 +133,7 @@ class Notifier implements INotifier {
 				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
 					// Remove /user/files/...
 					$fullPath = $path;
-					[,,, $path] = explode('/', $fullPath, 4);
+					list(,,, $path) = explode('/', $fullPath, 4);
 				}
 				$subjectParameters = [
 					'file' => [
@@ -155,7 +155,7 @@ class Notifier implements INotifier {
 						'name' => $displayName,
 					];
 				}
-				[$message, $messageParameters] = $this->commentToRichMessage($comment);
+				list($message, $messageParameters) = $this->commentToRichMessage($comment);
 				$notification->setRichSubject($subject, $subjectParameters)
 					->setParsedSubject($this->richToParsed($subject, $subjectParameters))
 					->setRichMessage($message, $messageParameters)

apps/comments/src/activitytabviewplugin.js

@@ -1,24 +1,11 @@
 /**
+ * @author Joas Schilling <coding@schilljs.com>
  * Copyright (c) 2016
  *
- * @author Joas Schilling <coding@schilljs.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/>.
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
+ * See the COPYING-README file.
  */
 
 (function() {

apps/comments/src/app.js

@@ -1,23 +1,10 @@
-/**
+/*
  * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
  *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Vincent Petry <vincent@nextcloud.com>
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
- * @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/>.
+ * See the COPYING-README file.
  *
  */
 

apps/comments/src/comments.js

@@ -1,26 +1,3 @@
-/**
- * @copyright Copyright (c) 2016 Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @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/>.
- *
- */
-
 import './app'
 import './templates'
 import './filesplugin'

apps/comments/src/components/Comment.vue

@@ -66,12 +66,11 @@
 		</div>
 
 		<!-- Message editor -->
-		<div v-if="editor || editing" class="comment__editor ">
+		<div class="comment__editor " v-if="editor || editing">
 			<RichContenteditable ref="editor"
+				v-model="localMessage"
 				:auto-complete="autoComplete"
 				:contenteditable="!loading"
-				:value="localMessage"
-				@update:value="updateLocalMessage"
 				@submit="onSubmit" />
 			<input v-tooltip="t('comments', 'Post comment')"
 				:class="loading ? 'icon-loading-small' :'icon-confirm'"

apps/comments/src/filesplugin.js

@@ -1,26 +1,10 @@
-/**
+/*
  * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
  *
- * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Michael Jobst <mjobst+github@tecratech.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Vincent Petry <vincent@nextcloud.com>
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
- * @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/>.
+ * See the COPYING-README file.
  *
  */
 

apps/comments/src/mixins/CommentMixin.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/services/CommentsInstance.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/services/DavClient.js

@@ -1,5 +1,5 @@
 /**
- * @copyright Copyright (c) 2021 John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
  *
@@ -20,19 +20,18 @@
  *
  */
 
-import { createClient, getPatcher } from 'webdav'
+import webdav from 'webdav'
 import axios from '@nextcloud/axios'
-
 import { getRootPath } from '../utils/davUtils'
 
 // Add this so the server knows it is an request from the browser
 axios.defaults.headers['X-Requested-With'] = 'XMLHttpRequest'
 
 // force our axios
-const patcher = getPatcher()
+const patcher = webdav.getPatcher()
 patcher.patch('request', axios)
 
 // init webdav client
-const client = createClient(getRootPath())
+const client = webdav.createClient(getRootPath())
 
 export default client

apps/comments/src/services/DeleteComment.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/services/EditComment.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/services/GetComments.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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
@@ -20,7 +20,7 @@
  *
  */
 
-import { parseXML, prepareFileFromProps } from 'webdav/dist/node/tools/dav'
+import { parseXML, prepareFileFromProps } from 'webdav/dist/node/interface/dav'
 import { processResponsePayload } from 'webdav/dist/node/response'
 import client from './DavClient'
 

apps/comments/src/services/NewComment.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/templates.js

@@ -1,17 +1,123 @@
 (function() {
   var template = Handlebars.template, templates = OCA.Comments.Templates = OCA.Comments.Templates || {};
-templates['filesplugin'] = template({"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
-    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3="function", alias4=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    };
+templates['comment'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return " unread";
+},"3":function(container,depth0,helpers,partials,data) {
+    return " collapsed";
+},"5":function(container,depth0,helpers,partials,data) {
+    return " currentUser";
+},"7":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "data-username=\""
+    + container.escapeExpression(((helper = (helper = helpers.actorId || (depth0 != null ? depth0.actorId : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"actorId","hash":{},"data":data}) : helper)))
+    + "\"";
+},"9":function(container,depth0,helpers,partials,data) {
+    return "			<a href=\"#\" class=\"action more icon icon-more has-tooltip\"></a>\n			<div class=\"deleteLoading icon-loading-small hidden\"></div>\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    return "		<div class=\"message-overlay\"></div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<li class=\"comment"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUnread : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLong : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\" data-id=\""
+    + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n	<div class=\"authorRow\">\n		<div class=\"avatar"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\" "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.actorId : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> </div>\n		<div class=\"author"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">"
+    + alias4(((helper = (helper = helpers.actorDisplayName || (depth0 != null ? depth0.actorDisplayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorDisplayName","hash":{},"data":data}) : helper)))
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "		<div class=\"date has-tooltip live-relative-timestamp\" data-timestamp=\""
+    + alias4(((helper = (helper = helpers.timestamp || (depth0 != null ? depth0.timestamp : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"timestamp","hash":{},"data":data}) : helper)))
+    + "\" title=\""
+    + alias4(((helper = (helper = helpers.altDate || (depth0 != null ? depth0.altDate : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"altDate","hash":{},"data":data}) : helper)))
+    + "\">"
+    + alias4(((helper = (helper = helpers.date || (depth0 != null ? depth0.date : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"date","hash":{},"data":data}) : helper)))
+    + "</div>\n	</div>\n	<div class=\"message\">"
+    + ((stack1 = ((helper = (helper = helpers.formattedMessage || (depth0 != null ? depth0.formattedMessage : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"formattedMessage","hash":{},"data":data}) : helper))) != null ? stack1 : "")
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLong : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</li>\n";
+},"useData":true});
+templates['commentsmodifymenu'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "		<li>\n			<a href=\"#\" class=\"menuitem action "
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + " permanent\" data-action=\""
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.iconClass : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+    + "				<span>"
+    + alias4(((helper = (helper = helpers.displayName || (depth0 != null ? depth0.displayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"displayName","hash":{},"data":data}) : helper)))
+    + "</span>\n			</a>\n		</li>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "					<span class=\"icon "
+    + container.escapeExpression(((helper = (helper = helpers.iconClass || (depth0 != null ? depth0.iconClass : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"iconClass","hash":{},"data":data}) : helper)))
+    + "\"></span>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    return "					<span class=\"no-icon\"></span>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<ul>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.items : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</ul>\n";
+},"useData":true});
+templates['edit_comment'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "			<div class=\"action-container\">\n				<a href=\"#\" class=\"action cancel icon icon-close has-tooltip\" title=\""
+    + container.escapeExpression(((helper = (helper = helpers.cancelText || (depth0 != null ? depth0.cancelText : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"cancelText","hash":{},"data":data}) : helper)))
+    + "\"></a>\n			</div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<"
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + " class=\"newCommentRow comment\" data-id=\""
+    + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n	<div class=\"authorRow\">\n		<div class=\"avatar currentUser\" data-username=\""
+    + alias4(((helper = (helper = helpers.actorId || (depth0 != null ? depth0.actorId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorId","hash":{},"data":data}) : helper)))
+    + "\"></div>\n		<div class=\"author currentUser\">"
+    + alias4(((helper = (helper = helpers.actorDisplayName || (depth0 != null ? depth0.actorDisplayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorDisplayName","hash":{},"data":data}) : helper)))
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isEditMode : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "	</div>\n	<form class=\"newCommentForm\">\n		<div contentEditable=\"true\" class=\"message\" data-placeholder=\""
+    + alias4(((helper = (helper = helpers.newMessagePlaceholder || (depth0 != null ? depth0.newMessagePlaceholder : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"newMessagePlaceholder","hash":{},"data":data}) : helper)))
+    + "\">"
+    + alias4(((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"message","hash":{},"data":data}) : helper)))
+    + "</div>\n		<input class=\"submit icon-confirm has-tooltip\" type=\"submit\" value=\"\" title=\""
+    + alias4(((helper = (helper = helpers.submitText || (depth0 != null ? depth0.submitText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"submitText","hash":{},"data":data}) : helper)))
+    + "\"/>\n		<div class=\"submitLoading icon-loading-small hidden\"></div>\n	</form>\n</"
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + ">\n";
+},"useData":true});
+templates['filesplugin'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "<a class=\"action action-comment permanent\" title=\""
-    + alias4(((helper = (helper = lookupProperty(helpers,"countMessage") || (depth0 != null ? lookupProperty(depth0,"countMessage") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"countMessage","hash":{},"data":data,"loc":{"start":{"line":1,"column":50},"end":{"line":1,"column":66}}}) : helper)))
+    + alias4(((helper = (helper = helpers.countMessage || (depth0 != null ? depth0.countMessage : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"countMessage","hash":{},"data":data}) : helper)))
     + "\" href=\"#\">\n	<img class=\"svg\" src=\""
-    + alias4(((helper = (helper = lookupProperty(helpers,"iconUrl") || (depth0 != null ? lookupProperty(depth0,"iconUrl") : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"iconUrl","hash":{},"data":data,"loc":{"start":{"line":2,"column":23},"end":{"line":2,"column":34}}}) : helper)))
+    + alias4(((helper = (helper = helpers.iconUrl || (depth0 != null ? depth0.iconUrl : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"iconUrl","hash":{},"data":data}) : helper)))
     + "\"/>\n</a>\n";
 },"useData":true});
+templates['view'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<ul class=\"comments\">\n</ul>\n<div class=\"emptycontent hidden\"><div class=\"icon-comment\"></div>\n	<p>"
+    + alias4(((helper = (helper = helpers.emptyResultLabel || (depth0 != null ? depth0.emptyResultLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"emptyResultLabel","hash":{},"data":data}) : helper)))
+    + "</p></div>\n<input type=\"button\" class=\"showMore hidden\" value=\""
+    + alias4(((helper = (helper = helpers.moreLabel || (depth0 != null ? depth0.moreLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"moreLabel","hash":{},"data":data}) : helper)))
+    + "\" name=\"show-more\" id=\"show-more\" />\n<div class=\"loading hidden\" style=\"height: 50px\"></div>\n";
+},"useData":true});
 })();

apps/comments/src/utils/cancelableRequest.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/utils/davUtils.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/utils/numberUtil.js

@@ -12,7 +12,7 @@
  *
  * 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
+ * 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

apps/comments/src/views/Comments.vue

@@ -70,7 +70,6 @@
 <script>
 import { generateOcsUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
-import { loadState } from '@nextcloud/initial-state'
 import axios from '@nextcloud/axios'
 import VTooltip from 'v-tooltip'
 import Vue from 'vue'
@@ -227,7 +226,7 @@ export default {
 					itemType: 'files',
 					itemId: this.ressourceId,
 					sorter: 'commenters|share-recipients',
-					limit: loadState('comments', 'maxAutoCompleteResults'),
+					limit: OC.appConfig?.comments?.maxAutoCompleteResults || 25,
 				},
 			})
 			return callback(results.data.ocs.data)

apps/comments/tests/Unit/JSSettingsHelperTest.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @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\Comments\Tests\Unit;
+
+use OCA\Comments\JSSettingsHelper;
+use OCP\IConfig;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class JSSettingsHelperTest extends TestCase {
+	/** @var  IConfig|MockObject */
+	protected $c;
+	/** @var  JSSettingsHelper */
+	protected $helper;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->c = $this->createMock(IConfig::class);
+
+		$this->helper = new JSSettingsHelper($this->c);
+	}
+
+	public function testExtend() {
+		$this->c->expects($this->once())
+			->method('getAppValue')
+			->with('comments', 'maxAutoCompleteResults')
+			->willReturn(13);
+
+		$config = [
+			'oc_appconfig' => json_encode([
+				'anotherapp' => [
+					'foo' => 'bar',
+					'foobar' => true
+				]
+			])
+		];
+
+		$this->helper->extend(['array' => &$config]);
+
+		$appConfig = json_decode($config['oc_appconfig'], true);
+		$this->assertTrue(isset($appConfig['comments']));
+		$this->assertTrue(isset($appConfig['anotherapp']));
+		$this->assertSame(2, count($appConfig['anotherapp']));
+		$this->assertSame(13, $appConfig['comments']['maxAutoCompleteResults']);
+	}
+}

apps/comments/tests/js/filespluginSpec.js

@@ -1,23 +1,10 @@
-/**
+/*
  * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
  *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Vincent Petry <vincent@nextcloud.com>
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
  *
- * @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/>.
+ * See the COPYING-README file.
  *
  */
 

apps/comments/webpack.js

@@ -1,26 +1,3 @@
-/**
- * @copyright Copyright (c) 2016 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @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/>.
- *
- */
-
 const path = require('path')
 
 module.exports = {

apps/contactsinteraction/appinfo/info.xml

@@ -17,7 +17,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>

apps/contactsinteraction/lib/AddressBook.php

@@ -170,7 +170,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	}
 
 	private function getUid(): string {
-		[, $uid] = \Sabre\Uri\split($this->principalUri);
+		list(, $uid) = \Sabre\Uri\split($this->principalUri);
 		return $uid;
 	}
 }

apps/dashboard/README.md

@@ -28,6 +28,6 @@ A reference to why it was very difficult to actually find good background pictur
 - We need to have a good balance of different motives, e.g. not too many landscape pics.
 - Same for a good balance of different colors.
 - The photo needs to work as a background. Photos with objects focused in the middle don’t really work as they will be overlapped by the widgets anyway.
-- Especially the top part cannot have too much differing contrast, as then it’s not possible to see the navigation icons.
+- Especially the top part can’t have too much differing contrast, as then it’s not possible to see the navigation icons.
 - We serve the pictures at 4k resolution and most of the selected images are also available in 6k or higher so it is future-proof.
 - For the search of course we had to limit to CC0, CC By and CC By-Sa. Only CC0 would have been practically impossible cause there’s just not so many good ones which fit.

apps/dashboard/appinfo/info.xml

@@ -16,7 +16,7 @@
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 
 	<dependencies>
-		<nextcloud min-version="22" max-version="22"/>
+		<nextcloud min-version="21" max-version="21"/>
 	</dependencies>
 
 	<navigations>

apps/dashboard/l10n/ar.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "Show something" : "أظهر شي ما",
     "Customize" : "تعديل",
     "Edit widgets" : "تعديل الودجات",
+    "Get more widgets from the app store" : "احصل على ودجات من متجر التطبيقات",
     "Change background image" : "تغييرصورة الخلفية",
     "Weather service" : "خدمة احوال الطقس",
     "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "لخصوصيتك، يتم استدعاء بيانات احوال الطقس عبر خادم نكست كلاود الخاص بك نيابه عنك ولذلك خدمة احوال الطقس لا تشارك المعلومات الشخصية.",
@@ -26,7 +27,6 @@ OC.L10N.register(
     "Default images" : "الصور الإفتراضية",
     "Plain background" : "خلفية سادة",
     "Insert from {productName}" : "اضف من {productName}",
-    "Get more widgets from the app store" : "احصل على ودجات من متجر التطبيقات",
     "Good night, {name}" : "تصبح على خير، {name}",
     "Good night" : "تصبح على خير",
     "Pick from files" : "اختر من الملفات"

apps/dashboard/l10n/ar.json

@@ -4,6 +4,7 @@
     "Show something" : "أظهر شي ما",
     "Customize" : "تعديل",
     "Edit widgets" : "تعديل الودجات",
+    "Get more widgets from the app store" : "احصل على ودجات من متجر التطبيقات",
     "Change background image" : "تغييرصورة الخلفية",
     "Weather service" : "خدمة احوال الطقس",
     "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "لخصوصيتك، يتم استدعاء بيانات احوال الطقس عبر خادم نكست كلاود الخاص بك نيابه عنك ولذلك خدمة احوال الطقس لا تشارك المعلومات الشخصية.",
@@ -24,7 +25,6 @@
     "Default images" : "الصور الإفتراضية",
     "Plain background" : "خلفية سادة",
     "Insert from {productName}" : "اضف من {productName}",
-    "Get more widgets from the app store" : "احصل على ودجات من متجر التطبيقات",
     "Good night, {name}" : "تصبح على خير، {name}",
     "Good night" : "تصبح على خير",
     "Pick from files" : "اختر من الملفات"

apps/dashboard/l10n/bg.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "Show something" : "Покажи нещо",
     "Customize" : "Персонизиране",
     "Edit widgets" : "Редактиране на изпълнимите модули",
+    "Get more widgets from the app store" : "Вземете повече приспособления от  app store",
     "Change background image" : "Промяна на фоновото изображение",
     "Weather service" : "Метеорологична услуга",
     "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "За вашата поверителност данните за времето се изискват от Nextcloud  сървъра ви от ваше име, така че метеорологичната служба не получава лична информация.",
@@ -26,7 +27,6 @@ OC.L10N.register(
     "Default images" : "Изображения по подразбиране",
     "Plain background" : "Обикновен фон",
     "Insert from {productName}" : "Вмъкване от {productName}",
-    "Get more widgets from the app store" : "Вземете повече приспособления от  app store",
     "Good night, {name}" : "Лека нощ, {name}",
     "Good night" : "Лека нощ",
     "Pick from files" : "Избери от Файловете"

apps/dashboard/l10n/bg.json

@@ -4,6 +4,7 @@
     "Show something" : "Покажи нещо",
     "Customize" : "Персонизиране",
     "Edit widgets" : "Редактиране на изпълнимите модули",
+    "Get more widgets from the app store" : "Вземете повече приспособления от  app store",
     "Change background image" : "Промяна на фоновото изображение",
     "Weather service" : "Метеорологична услуга",
     "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "За вашата поверителност данните за времето се изискват от Nextcloud  сървъра ви от ваше име, така че метеорологичната служба не получава лична информация.",
@@ -24,7 +25,6 @@
     "Default images" : "Изображения по подразбиране",
     "Plain background" : "Обикновен фон",
     "Insert from {productName}" : "Вмъкване от {productName}",
-    "Get more widgets from the app store" : "Вземете повече приспособления от  app store",
     "Good night, {name}" : "Лека нощ, {name}",
     "Good night" : "Лека нощ",
     "Pick from files" : "Избери от Файловете"

apps/dashboard/l10n/ca.js

@@ -6,6 +6,7 @@ OC.L10N.register(
     "Show something" : "Mostra alguna cosa",
     "Customize" : "Personalitza",
     "Edit widgets" : "Edita els ginys",
+    "Get more widgets from the app store" : "Obtenir més ginys de la botiga d'aplicacions",
     "Change background image" : "Canvia la imatge de fons",
     "Weather service" : "Servei meteorològic",
     "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Per a la seva privacitat, les dades meteorològiques les sol·licita el seu servidor Nextcloud en el seu lloc perquè el servei meteorològic no rebi cap informació personal.",
@@ -26,7 +27,6 @@ OC.L10N.register(
     "Default images" : "Imatges predeterminades",
     "Plain background" : "Fons senzill",
     "Insert from {productName}" : "Insereix des de {productName}",
-    "Get more widgets from the app store" : "Obtenir més ginys de la botiga d'aplicacions",
     "Good night, {name}" : "Bona nit, {name}",
     "Good night" : "Bona nit",
     "Pick from files" : "Tria entre fitxers"