Merge pull request #12585 from nextcloud/version/noid/13.0.8

13.0.8
2018-11-22 14:03:46 +01:00 · 2018-11-22 11:02:06 +01:00 · 2018-11-22 01:12:38 +00:00 · 2018-11-21 08:57:55 +01:00 · 2018-11-21 01:12:34 +00:00 · 2018-11-20 19:38:46 +01:00
2239 changed files with 84864 additions and 272697 deletions
@@ -25,7 +25,7 @@ pipeline:
    image: nextcloudci/php5.6:php5.6-8
    commands:
      - composer install
-      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
+      - ./lib/composer/bin/parallel-lint --exclude build/.phan/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
    when:
      matrix:
        TESTS: syntax-php5.6
@@ -45,6 +45,16 @@ pipeline:
    when:
      matrix:
        TESTS: syntax-php7.1
+  phan:
+    image: nextcloudci/php7.2:php7.2-11
+    commands:
+      - composer install
+      - composer require --dev "phan/phan:0.11.1"
+      - ./lib/composer/phan/phan/phan -k build/.phan/config.php
+      - php ./build/.phan/plugin-checker.php
+    when:
+      matrix:
+        TESTS: phan
  litmus-v1:
    image: nextcloudci/litmus-php7.0:litmus-php7.0-6
    commands:
@@ -160,6 +170,14 @@ pipeline:
      matrix:
        DB: NODB
        PHP: 7.1
+  nodb-php7.2:
+    image: nextcloudci/php7.2:php7.2-9
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 7.2
  sqlite-php5.6:
    image: nextcloudci/php5.6:php5.6-8
    commands:
@@ -184,7 +202,14 @@ pipeline:
      matrix:
        DB: sqlite
        PHP: 7.1
-
+  sqlite-php7.2:
+    image: nextcloudci/php7.2:php7.2-9
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 7.2
  mysql-php5.6:
    image: nextcloudci/php5.6:php5.6-8
    commands:
@@ -193,15 +218,106 @@ pipeline:
      matrix:
        DB: mysql
        PHP: 5.6
+  mysql-php7.0:
+    image: nextcloudci/php7.0:php7.0-16
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: "7.0"
+  mysql-php7.1:
+    image: nextcloudci/php7.1:php7.1-15
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 7.1
+  mysql-php7.2:
+    image: nextcloudci/php7.2:php7.2-9
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 7.2
+  mysql5.6-php5.6:
+    image: nextcloudci/php5.6:php5.6-8
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.6
+        PHP: 5.6
+  mysql5.6-php7.0:
+    image: nextcloudci/php7.0:php7.0-16
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.6
+        PHP: "7.0"
+  mysql5.6-php7.1:
+    image: nextcloudci/php7.1:php7.1-15
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.6
+        PHP: 7.1
+  mysql5.5-php5.6:
+    image: nextcloudci/php5.6:php5.6-8
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.5
+        PHP: 5.6
+  mysql5.5-php7.0:
+    image: nextcloudci/php7.0:php7.0-16
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.5
+        PHP: "7.0"
+  mysql5.5-php7.1:
+    image: nextcloudci/php7.1:php7.1-15
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql5.5
+        PHP: 7.1
  postgres-php5.6:
    image: nextcloudci/php5.6:php5.6-8
+    commands:
+      - sleep 10 # gives the database enough time to initialize
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+    when:
+      matrix:
+        DB: postgres
+        PHP: 5.6
+        POSTGRES: 9
+  postgres-php7.0:
+    image: nextcloudci/php7.0:php7.0-16
+    commands:
+      - sleep 10 # gives the database enough time to initialize
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+    when:
+      matrix:
+        DB: postgres
+        PHP: "7.0"
+  postgres-php7.1:
+    image: nextcloudci/php7.1:php7.1-15
    commands:
      - sleep 10 # gives the database enough time to initialize
      - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
    when:
      matrix:
        DB: postgres
-        PHP: 5.6
+        PHP: 7.1
  mysqlmb4-php5.6:
    image: nextcloudci/php5.6:php5.6-8
    commands:
@@ -210,10 +326,34 @@ pipeline:
      matrix:
        DB: mysqlmb4
        PHP: 5.6
+  mysqlmb4-php7.0:
+    image: nextcloudci/php7.0:php7.0-16
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: "7.0"
+  mysqlmb4-php7.1:
+    image: nextcloudci/php7.1:php7.1-15
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: 7.1
+  mysqlmb4-php7.2:
+    image: nextcloudci/php7.2:php7.2-9
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: 7.2
  integration-capabilities_features:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh capabilities_features/capabilities.feature
    when:
@@ -231,7 +371,7 @@ pipeline:
  integration-auth:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/auth.feature
    when:
@@ -240,7 +380,7 @@ pipeline:
  integration-maintenance-mode:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/maintenance-mode.feature
    when:
@@ -249,7 +389,7 @@ pipeline:
  integration-ratelimiting:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - ./occ config:system:set redis host --value=cache
      - ./occ config:system:set redis port --value=6379 --type=integer
      - ./occ config:system:set redis timeout --value=0 --type=integer
@@ -264,7 +404,7 @@ pipeline:
  integration-carddav:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/carddav.feature
    when:
@@ -273,7 +413,7 @@ pipeline:
  integration-dav-v2:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/dav-v2.feature
    when:
@@ -282,7 +422,7 @@ pipeline:
  integration-ocs-v1:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/ocs-v1.feature
    when:
@@ -291,7 +431,7 @@ pipeline:
  integration-sharing-v1:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/sharing-v1.feature
    when:
@@ -300,7 +440,7 @@ pipeline:
  integration-sharing-v1-part2:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/sharing-v1-part2.feature
    when:
@@ -309,7 +449,7 @@ pipeline:
  integration-sharing-v1-part3:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/sharing-v1-part3.feature
    when:
@@ -318,7 +458,7 @@ pipeline:
  integration-checksums-v1:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/checksums.feature
    when:
@@ -327,7 +467,7 @@ pipeline:
  integration-external-storage:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/external-storage.feature
    when:
@@ -336,7 +476,7 @@ pipeline:
  integration-provisioning-v1:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/provisioning-v1.feature
    when:
@@ -345,7 +485,7 @@ pipeline:
  integration-tags:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/tags.feature
    when:
@@ -354,7 +494,7 @@ pipeline:
  integration-caldav:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/caldav.feature
    when:
@@ -363,7 +503,7 @@ pipeline:
  integration-comments:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/comments.feature
    when:
@@ -372,7 +512,7 @@ pipeline:
  integration-favorites:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/favorites.feature
    when:
@@ -381,7 +521,7 @@ pipeline:
  integration-provisioning-v2:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/provisioning-v2.feature
    when:
@@ -390,7 +530,7 @@ pipeline:
  integration-webdav-related:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/webdav-related.feature
    when:
@@ -399,7 +539,7 @@ pipeline:
  integration-sharees-features:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh sharees_features/sharees.feature
    when:
@@ -408,7 +548,7 @@ pipeline:
  integration-sharees-v2-features:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh sharees_features/sharees_provisioningapiv2.feature
    when:
@@ -425,7 +565,7 @@ pipeline:
  integration-filesdrop-features:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh filesdrop_features/filesdrop.feature
    when:
@@ -434,7 +574,7 @@ pipeline:
  integration-transfer-ownership-features:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/transfer-ownership.feature
    when:
@@ -443,7 +583,7 @@ pipeline:
  integration-ldap-features:
      image: nextcloudci/integration-php7.0:integration-php7.0-6
      commands:
-        - ./occ maintenance:install --admin-pass=admin
+        - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
        - ./occ app:enable user_ldap
        - cd build/integration
        - ./run.sh ldap_features/ldap-ocs.feature
@@ -453,12 +593,21 @@ pipeline:
  integration-trashbin:
    image: nextcloudci/integration-php7.0:integration-php7.0-6
    commands:
-      - ./occ maintenance:install --admin-pass=admin
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
      - cd build/integration
      - ./run.sh features/trashbin.feature
    when:
      matrix:
        TESTS: integration-trashbin
+  integration-remote-api:
+    image: nextcloudci/integration-php7.0:integration-php7.0-6
+    commands:
+      - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+      - cd build/integration
+      - ./run.sh remoteapi_features/remote.feature
+    when:
+      matrix:
+        TESTS: integration-remote-api
  acceptance-access-levels:
      image: nextcloudci/integration-php7.0:integration-php7.0-6
      commands:
@@ -466,6 +615,13 @@ pipeline:
      when:
        matrix:
          TESTS-ACCEPTANCE: access-levels
+  acceptance-app-comments:
+      image: nextcloudci/integration-php7.0:integration-php7.0-6
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-comments
  acceptance-app-files:
      image: nextcloudci/integration-php7.0:integration-php7.0-6
      commands:
@@ -551,6 +707,88 @@ matrix:
      ENABLE_REDIS: true
    - TESTS: db-codecov
      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.2
+      ENABLE_REDIS: false
+    - DB: sqlite
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.2
+      ENABLE_REDIS: false
+    - DB: mysql
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: mysql
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: mysql
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: mysql
+      PHP: 7.2
+      ENABLE_REDIS: false
+    - DB: mysql5.6
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: mysql5.6
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: mysql5.6
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: mysql5.5
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: mysql5.5
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: mysql5.5
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 5.6
+      POSTGRES: 9
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 7.0
+      POSTGRES: 9
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 7.1
+      POSTGRES: 9
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 7.1
+      POSTGRES: 10
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 7.2
+      ENABLE_REDIS: false
    - TESTS: integration-capabilities_features
    - TESTS: integration-federation_features
    - TESTS: integration-maintenance-mode
@@ -579,8 +817,11 @@ matrix:
    - TESTS: integration-transfer-ownership-features
    - TESTS: integration-ldap-features
    - TESTS: integration-trashbin
+    - TESTS: integration-remote-api
    - TESTS: acceptance
      TESTS-ACCEPTANCE: access-levels
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-comments
    - TESTS: acceptance
      TESTS-ACCEPTANCE: app-files
    - TESTS: acceptance
@@ -591,6 +832,7 @@ matrix:
    - TESTS: syntax-php5.6
    - TESTS: syntax-php7.0
    - TESTS: syntax-php7.1
+    - TESTS: phan
    - TESTS: litmus-v1
    - TESTS: litmus-v2
    - TESTS: caldavtester-old-endpoint
@@ -606,33 +848,6 @@ matrix:
      ENABLE_REDIS_CLUSTER: true
    - TESTS: sqlite-php7.0-webdav-apache
      ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 7.0
-      ENABLE_REDIS: true
-    - DB: NODB
-      PHP: 7.1
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 7.0
-      ENABLE_REDIS: true
-    - DB: sqlite
-      PHP: 7.1
-      ENABLE_REDIS: true
-    - DB: mysql
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: postgres
-      PHP: 5.6
-      ENABLE_REDIS: true
-    - DB: mysqlmb4
-      PHP: 5.6
-      ENABLE_REDIS: true

 services:
  cache:
@@ -645,7 +860,7 @@ services:
    when:
      matrix:
       ENABLE_REDIS_CLUSTER: true
-  postgres:
+  postgres-9:
    image: postgres:9
    environment:
      - POSTGRES_USER=oc_autotest
@@ -656,8 +871,21 @@ services:
    when:
      matrix:
        DB: postgres
+        POSTGRES: 9
+  postgres-10:
+      image: postgres:10
+      environment:
+        - POSTGRES_USER=oc_autotest
+        - POSTGRES_DB=oc_autotest_dummy
+        - POSTGRES_PASSWORD=owncloud
+      tmpfs:
+        - /var/lib/postgresql/data
+      when:
+        matrix:
+          DB: postgres
+          POSTGRES: 10
  mysql:
-    image: mysql:5.7.22
+    image: mysql:5.7
    environment:
      - MYSQL_ROOT_PASSWORD=owncloud
      - MYSQL_USER=oc_autotest
@@ -668,6 +896,30 @@ services:
    when:
      matrix:
        DB: mysql
+  mysql:
+    image: mysql:5.6
+    environment:
+      - MYSQL_ROOT_PASSWORD=owncloud
+      - MYSQL_USER=oc_autotest
+      - MYSQL_PASSWORD=owncloud
+      - MYSQL_DATABASE=oc_autotest
+    tmpfs:
+      - /var/lib/mysql
+    when:
+      matrix:
+        DB: mysql5.6
+  mysql:
+    image: mysql:5.5
+    environment:
+      - MYSQL_ROOT_PASSWORD=owncloud
+      - MYSQL_USER=oc_autotest
+      - MYSQL_PASSWORD=owncloud
+      - MYSQL_DATABASE=oc_autotest
+    tmpfs:
+      - /var/lib/mysql
+    when:
+      matrix:
+        DB: mysql5.5
  mysqlmb4:
    image: mysql:5.7.22
    environment:
@@ -0,0 +1,2 @@
+*/Activity/*                        @nickvergessen
+*/Notifications/*                   @nickvergessen
@@ -83,6 +83,9 @@ nbproject
 .idea
 *.iml

+# vscode
+.vscode
+
 # geany
 *.geany

@@ -135,3 +138,7 @@ Vagrantfile
 /config/config-autotest-backup.php
 /config/autoconfig.php
 clover.xml
+
+# Tests - dependencies
+tests/acceptance/composer.lock
+tests/acceptance/vendor/
@@ -28,7 +28,10 @@
 		"_": true,
 		"OC": true,
 		"OCA": true,
+		"OCP": true,
 		"t": true,
-		"n": true
+		"n": true,
+		"escapeHTML": true,
+		"Promise": true
 	}
 }
@@ -100,6 +100,7 @@ derkostka <sebastian.kostka@gmail.com>
 Diederik de Haas <diederik@cknow.org>
 Dominik Schmidt <dev@dominik-schmidt.de>
 Donald Buczek <buczek@molgen.mpg.de>
+Donquixote <marjunebatac@gmail.com> Donquixote <marjunebatac@gmailcom>
 Doug Neiner <doug@pixelgraphics.us>
 drarko <drarko@users.noreply.github.com>
 dratini0 <dratini0@gmail.com>
@@ -140,12 +141,13 @@ ganomi <ganomi@gmail.com>
 Gaël Beaudoin <gaboo@home.gaboo.org>
 geez0x1 <geez0x1@users.noreply.github.com>
 gekmihesg <markus@gekmihesg.de>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <dev@georgswebsite.de>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
-Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <dev@georgswebsite.de>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <developer@georgehrke.com>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <ownclouddev@georgswebsite.de>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <devgeorg@ownCloud.com>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@ownCloud.com>
+Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@owncloud.com>
 Golnaz Nilieh <g382nilieh@gmail.com>
 Grundik <grundik@ololo.cc>
 Guillaume AMAT <guillaume.amat@informatique-libre.com>
@@ -315,6 +317,7 @@ Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
 Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
 Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
+Roger Szabo <roger.szabo@web.de> root <roger.szabo@web.de>
 rok <brejktru@gmail.com>
 Roland Hager <roland.hager@tu-berlin.de>
 Roland van Laar <roland@micite.net>
@@ -400,6 +403,7 @@ Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
 Vincent Cloutier <vincent1cloutier@gmail.com>
 Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
 Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
+Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
 Vitaly Kuznetsov <vitty@altlinux.ru>
 Vladimir Sapronov <vladimir.sapronov@gmail.com>
 Volkan Gezer <volkangezer@gmail.com> Volkan Gezer <wakeup@users.noreply.github.com>
@@ -1,34 +0,0 @@
-{
-  "maxReviewers": 3,
-  "numFilesToCheck": 5,
-  "alwaysNotifyForPaths": [
-    {
-      "name": "nickvergessen",
-      "files": [
-        "lib/private/Activity/**",
-        "lib/private/Notification/**",
-        "lib/public/Activity/**",
-        "lib/public/Notification/**"
-      ]
-    },
-    {
-      "name": "Xenopathic",
-      "files": [
-        "apps/files_external/**"
-      ]
-    }
-  ],
-  "userBlacklist": [
-    "DeepDiver1975",
-    "nextcloud-bot",
-    "owncloud-bot",
-    "PVince81",
-    "scrutinizer-auto-fixer",
-    "th3fallen",
-    "zander",
-    "luckydonald",
-    "jancborchardt"
-  ],
-   "createReviewRequest": true,
-   "createComment": false
-}
@@ -1,6 +1,11 @@
 before_commands:
  - 'git submodule update --init --recursive'

+checks:
+    php:
+        excluded_dependencies:
+            - etsy/phan
+
 filter:
    excluded_paths:
        - '3rdparty/*'
@@ -1,16 +1,24 @@
 Nextcloud is written by:
+ - 1 Man Projects <reed@1manprojects.de>
 - AW-UC <git@a-wesemann.de>
 - Aaron Wood <aaronjwood@gmail.com>
 - Achim Königs <garfonso@tratschtante.de>
 - Adam Williamson <awilliam@redhat.com>
- - Administrator <Administrator@WINDOWS-2012>
+ - Administrator "Administrator@WINDOWS-2012"
 - Aldo "xoen" Giambelluca <xoen@xoen.org>
 - Alex Weirig <alex.weirig@technolink.lu>
 - Alexander Bergolth <leo@strike.wu.ac.at>
+ - Allan Nordhøy <epost@anotheragency.no>
 - Andreas Fischer <bantu@owncloud.com>
+ - Andreas Pflug <dev@admin4.org>
 - Andrew Brown <andrew@casabrown.com>
+ - Andrius <andrius.kulbis@ktu.lt>
 - André Gaul <gaul@web-yard.de>
+ - Ardinis <Ardinis@users.noreply.github.com>
+ - Artem Kochnev <MrJeos@gmail.com>
+ - Artem Sidorenko <artem@posteo.de>
 - Arthur Schiwon <blizzz@arthur-schiwon.de>
+ - Axel Helmert <axel.helmert@luka.de>
 - Bart Visscher <bartv@thisnet.nl>
 - Bartek Przybylski <bart.p.pl@gmail.com>
 - Bastien Ho <bastienho@urbancube.fr>
@@ -21,7 +29,9 @@ Nextcloud is written by:
 - Birk Borkason <daniel.niccoli@gmail.com>
 - Bjoern Schiessle <bjoern@schiessle.org>
 - Björn Schießle <bjoern@schiessle.org>
+ - Boris Rybalkin <ribalkin@gmail.com>
 - Borjan Tchakaloff <borjan@tchakaloff.fr>
+ - Brent Bloxam <brent.bloxam@gmail.com>
 - Brice Maron <brice@bmaron.net>
 - Byron Marohn <combustible@live.com>
 - Carla Schroder <carla@owncloud.com>
@@ -31,41 +41,48 @@ Nextcloud is written by:
 - Christian Jürges <christian@eqipe.ch>
 - Christian Kampka <christian@kampka.net>
 - Christian Weiske <cweiske@cweiske.de>
- - Christoph Schaefer <christophł@wolkesicher.de>
+ - Christoph Schaefer "christophł@wolkesicher.de"
+ - Christoph Wickert <cwickert@suse.de>
 - Christoph Wurst <christoph@owncloud.com>
+ - Christopher Bartz <bartz@dkrz.de>
 - Christopher Schäpers <kondou@ts.unde.re>
 - Christopher T. Johnson <ctjctj@gmail.com>
 - Clark Tomlinson <fallen013@gmail.com>
- - Craig Morrissey <craig@owncloud.com>
+ - Cornelius Kölbel <cornelius.koelbel@netknights.it>
+ - Damjan Georgievski <gdamjan@gmail.com>
 - Dan Bartram <daneybartram@gmail.com>
- - Daniel Hansson <enoch85@gmail.com>
+ - Daniel Calviño Sánchez <danxuliu@gmail.com>
+ - Daniel Hansson <daniel@techandme.se>
 - Daniel Jagszent <daniel@jagszent.de>
 - Daniel Molkentin <daniel@molkentin.de>
 - Daniel Tosello <tosello.daniel@gmail.com>
 - David Prévot <taffit@debian.org>
 - David Toledo <dtoledo@solidgear.es>
+ - Derek <derek.kelly27@gmail.com>
 - Dominik Schmidt <dev@dominik-schmidt.de>
+ - Donquixote <marjunebatac@gmail.com>
 - Fabian Henze <flyser42@gmx.de>
- - Faruk Uzun <farukuzun@collabora.com>
- - Felix Böhm <felixboehm@gmx.de>
+ - Fabrizio Steiner <fabrizio.steiner@gmail.com>
+ - Felix A. Epp <work@felixepp.de>
+ - Felix Epp <work@felixepp.de>
+ - Felix Heidecke <felix@heidecke.me>
 - Felix Moeller <mail@felixmoeller.de>
- - Florian Preinstorfer <nblock@archlinux.us>
- - Florian Pritz <bluewind@xinu.at>
+ - Felix Rupp <github@felixrupp.com>
 - Florin Peter <github@florin-peter.de>
- - Francesco Rovelli <francesco.rovelli@gmail.com>
+ - Frank Isemann <frank@isemann.name>
 - Frank Karlitschek <frank@karlitschek.de>
 - François Kubler <francois@kubler.org>
 - Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
 - Gadzy <dev@gadzy.fr>
- - Georg Ehrke <georg@owncloud.com>
- - Guillaume AMAT <guillaume.amat@informatique-libre.com>
- - Hasso Tepper <hasso@zone.ee>
+ - Georg Ehrke <oc.list@georgehrke.com>
+ - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
 - Hendrik Leppelsack <hendrik@leppelsack.de>
- - Hugo Gonzalez Labrador <hglavra@gmail.com>
+ - Ilja Neumann <ineumann@owncloud.com>
 - Individual IT Services <info@individual-it.net>
 - Jakob Sack <mail@jakobsack.de>
 - Jan-Christoph Borchardt <hey@jancborchardt.net>
- - Jarrett <JetUni@users.noreply.github.com>
+ - Jan-Philipp Litza <jplitza@users.noreply.github.com>
+ - Jarkko Lehtoranta <devel@jlranta.com>
 - Jean-Louis Dupond <jean-louis@dupond.be>
 - Jens-Christian Fischer <jens-christian.fischer@switch.ch>
 - Jesús Macias <jmacias@solidgear.es>
@@ -74,80 +91,121 @@ Nextcloud is written by:
 - Joas Schilling <coding@schilljs.com>
 - Johan Björk <johanimon@gmail.com>
 - Johannes Ernst <jernst@indiecomputing.com>
+ - Johannes Schlichenmaier <johannes@schlichenmaier.info>
 - Johannes Willnecker <johannes@willnecker.com>
+ - John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ - John Molakvoæ <skjnldsv@users.noreply.github.com>
 - Jonny007-MKD <1-23-4-5@web.de>
+ - Juan Pablo Villafañez <jvillafanez@solidgear.es>
+ - Juan Pablo VillafÃ¡Ã±ez <jvillafanez@solidgear.es>
 - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
 - Julius Haertl <jus@bitgrid.net>
+ - Julius Härtl <jus@bitgrid.net>
 - Jörn Friedrich Dreyer <jfd@butonic.de>
+ - Jürgen Haas <juergen@paragon-es.de>
+ - KB7777 <k.burkowski@gmail.com>
 - Kamil Domanski <kdomanski@kdemail.net>
+ - Kawohl <john@owncloud.com>
+ - Kenneth Newwood <kenneth@newwood.name>
 - Klaas Freitag <freitag@owncloud.com>
+ - Knut Ahlers <knut@ahlers.me>
+ - Ko- <k.stoffelen@cs.ru.nl>
+ - Kristof Provost <github@sigsegv.be>
 - Lars <winnetou+github@catolic.de>
 - Laurens Post <Crote@users.noreply.github.com>
 - Laurens Post <lkpost@scept.re>
 - Lennart Rosam <hello@takuto.de>
 - Lennart Rosam <lennart.rosam@medien-systempartner.de>
- - Leonardo Diez <leio10@users.noreply.github.com>
+ - Leon Klingele <git@leonklingele.de>
+ - Leon Klingele <leon@struktur.de>
+ - Loki3000 <github@labcms.ru>
 - Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
 - Lukas Reschke <lukas@statuscode.ch>
 - Luke Policinski <lpolicinski@gmail.com>
 - Lyonel Vincent <lyonel@ezix.org>
+ - Magnus Walbeck <mw@mwalbeck.org>
 - Manish Bisht <manish.bisht490@gmail.com>
+ - Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
+ - Marin Treselj <marin@pixelipo.com>
 - Mario Kolling <mario.kolling@serpro.gov.br>
+ - Marius Blüm <marius@lineone.io>
 - Markus Goetz <markus@woboq.com>
+ - Martin <github@diemattels.at>
 - Martin Konrad <info@martin-konrad.net>
 - Martin Konrad <konrad@frib.msu.edu>
 - Martin Mattel <martin.mattel@diemattels.at>
 - Marvin Thomas Rabe <mrabe@marvinrabe.de>
 - Masaki Kawabata Neto <masaki.kawabata@gmail.com>
+ - Matthew Setter <matthew@matthewsetter.com>
+ - Maxence Lange <maxence@artificial-owl.com>
+ - Maxence Lange <maxence@nextcloud.com>
+ - Maxence Lange <maxence@pontapreta.net>
 - Michael Gapczynski <GapczynskiM@gmail.com>
 - Michael Göhler <somebody.here@gmx.de>
- - Michael Kuhn <suraia@ikkoku.de>
+ - Michael Jobst <mjobst+github@tecratech.de>
+ - Michael Letzgus <www@chronos.michael-letzgus.de>
 - Michael Roitzsch <reactorcontrol@icloud.com>
 - Michael Roth <michael.roth@rz.uni-augsburg.de>
 - Michael U <mdusher@users.noreply.github.com>
 - Miguel Prokop <miguel.prokop@vtu.com>
+ - Miha Frangez <miha.frangez@gmail.com>
 - Mitar <mitar.git@tnode.com>
 - Morris Jobke <hey@morrisjobke.de>
 - Nicolai Ehemann <en@enlightened.de>
 - Nicolas Grekas <nicolas.grekas@gmail.com>
+ - Nils <git@to.nilsschnabel.de>
 - Nmz <nemesiz@nmz.lt>
- - Normal Ra <normalraw@gmail.com>
+ - Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
 - Oliver Gasser <oliver.gasser@gmail.com>
 - Oliver Kohl D.Sc. <oliver@kohl.bz>
+ - Olivier Mehani <shtrom@ssji.net>
 - Olivier Paroz <github@oparoz.com>
- - Otto Sabart <ottosabart@seberm.com>
 - Owen Winkler <a_github@midnightcircus.com>
 - Pascal de Bruijn <pmjdebruijn@pcode.nl>
+ - Patrick Paysant <patrick.paysant@linagora.com>
 - Patrick Paysant <ppaysant@linagora.com>
+ - Patrik Kernstock <info@pkern.at>
+ - Pauli Järvinen <pauli.jarvinen@gmail.com>
 - Pellaeon Lin <nfsmwlin@gmail.com>
 - Petr Svoboda <weits666@gmail.com>
 - Phiber2000 <phiber2000@gmx.de>
 - Phil Davis <phil.davis@inf.org>
 - Philipp Kapfer <philipp.kapfer@gmx.at>
+ - Philipp Schaffrath <github@philipp.schaffrath.email>
 - Philippe Jung <phil.jung@free.fr>
- - Pierre Jochem <pierrejochem@msn.com>
 - Pierre Ozoux <pierre@ozoux.net>
+ - Pierre Rudloff <contact@rudloff.pro>
 - Piotr Filiciak <piotr@filiciak.pl>
+ - Piotr M <mrow4a@yahoo.com>
+ - Piotr Mrowczynski <mrow4a@yahoo.com>
+ - Piotr Mrówczyński <mrow4a@yahoo.com>
 - Qingping Hou <dave2008713@gmail.com>
- - Raghu Nayyar <hey@raghunayyar.com>
 - Raghu Nayyar <me@iraghu.com>
 - Ralph Krimmel <rkrimme1@gwdg.de>
 - Ramiro Aparicio <rapariciog@gmail.com>
 - Randolph Carter <RandolphCarter@fantasymail.de>
 - RealRancor <Fisch.666@gmx.de>
+ - RealRancor <fisch.666@gmx.de>
+ - Rello <Rello@users.noreply.github.com>
 - Remco Brenninkmeijer <requist1@starmail.nl>
 - Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
+ - Robert Scheck <robert@fedoraproject.org>
 - Robin Appelman <robin@icewind.nl>
 - Robin McCorkell <robin@mccorkell.me.uk>
 - Roeland Jago Douma <roeland@famdouma.nl>
- - Roman Geber <rgeber@owncloudapps.com>
+ - Roger Szabo <roger.szabo@web.de>
 - Roman Kreisel <mail@romankreisel.de>
 - Ross Nicoll <jrn@jrn.me.uk>
 - SA <stephen@mthosting.net>
 - Sam Tuke <mail@samtuke.com>
 - Sander <brantje@gmail.com>
+ - Sander Ruitenbeek <sander@grids.be>
+ - Sandro Lutz <sandro.lutz@temparus.ch>
+ - Sascha Sambale <mastixmc@gmail.com>
 - Sean Comeau <sean@ftlnetworks.ca>
 - Sebastian Döll <sebastian.doell@libasys.de>
+ - Sebastian Wessalowski <sebastian@wessalowski.org>
+ - Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
 - Senorsen <senorsen.zhang@gmail.com>
 - Serge Martin <edb@sigluy.net>
 - Sergio Bertolin <sbertolin@solidgear.es>
@@ -156,64 +214,83 @@ Nextcloud is written by:
 - Sjors van der Pluijm <sjors@desjors.nl>
 - Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
 - Stefan Rado <owncloud@sradonia.net>
+ - Stefan Schneider <stefan.schneider@squareweave.com.au>
 - Stefan Weil <sw@weilnetz.de>
 - Steffen Lindner <mail@steffen-lindner.de>
+ - Stephan Müller <mail@stephanmueller.eu>
 - Stephan Peijnik <speijnik@anexia-it.com>
- - TheSFReader <TheSFReader@gmail.com>
+ - Steven Bühner <buehner@me.com>
+ - Sujith H <sharidasan@owncloud.com>
 - Thibaut GRIDEL <tgridel@free.fr>
 - Thomas Citharel <tcit@tcit.fr>
+ - Thomas Ebert <thomas.ebert@usability.de>
 - Thomas Müller <thomas.mueller@tmit.eu>
 - Thomas Pulzer <t.pulzer@kniel.de>
 - Thomas Tanghus <thomas@tanghus.net>
 - Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 - Tim Dettrick <t.dettrick@uq.edu.au>
 - Tobia De Koninck <tobia@ledfan.be>
+ - Tobias Brunner <tobias@tobru.ch>
 - Tobias Kaminsky <tobias@kaminsky.me>
 - Tom Needham <tom@owncloud.com>
 - Torben Dannhauer <torben@dannhauer.de>
+ - Ujjwal Bhardwaj <ujjwalb1996@gmail.com>
 - Victor Dubiniuk <dubiniuk@owncloud.com>
 - Viktor Szépe <viktor@szepe.net>
 - Vincent Chan <plus.vincchan@gmail.com>
 - Vincent Cloutier <vincent1cloutier@gmail.com>
 - Vincent Petry <pvince81@owncloud.com>
+ - Vinicius Cubas Brand <vinicius@eita.org.br>
 - Volkan Gezer <volkangezer@gmail.com>
+ - William Pain <pain.william@gmail.com>
+ - Xuanwo <xuanwo@yunify.com>
 - adrien <adrien.waksberg@believedigital.com>
 - alexweirig <alex.weirig@technolink.lu>
+ - bline <scottbeck@gmail.com>
 - brumsel <brumsel@losecatcher.de>
 - cetra3 <peter@parashift.com.au>
 - cmeh <cmeh@users.noreply.github.com>
- - dampfklon <me@dampfklon.de>
+ - coderkun <olli@coderkun.de>
+ - dartcafe <github@dartcafe.de>
 - davidgumberg <davidnoizgumberg@gmail.com>
 - davitol <dtoledo@solidgear.es>
 - derkostka <sebastian.kostka@gmail.com>
+ - duritong <peter.meier+github@immerda.ch>
 - eduardo <eduardo@vnexu.net>
 - fabian <fabian@web2.0-apps.de>
 - felixboehm <felix@webhippie.de>
- - goodkiller <markopraakli@gmail.com>
 - helix84 <helix84@centrum.sk>
 - hkjolhede <hkjolhede@gmail.com>
+ - iamfool <praveenraonp@gmail.com>
 - ideaship <ideaship@users.noreply.github.com>
 - j-ed <juergen@eisfair.org>
 - jknockaert <jasper@knockaert.nl>
 - josh4trunks <joshruehlig@gmail.com>
+ - justin-sleep <justin@quarterfull.com>
 - karakayasemi <karakayasemi@itu.edu.tr>
 - macjohnny <estebanmarin@gmx.ch>
 - martin-rueegg <martin.rueegg@metaworx.ch>
 - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
 - michag86 <micha_g@arcor.de>
 - mmccarn <mmccarn-github@mmsionline.us>
+ - nhirokinet <nhirokinet@nhiroki.net>
 - nishiki <nishiki@yaegashi.fr>
+ - noveens <noveen.sachdeva@research.iiit.ac.in>
 - oparoz <owncloud@interfasys.ch>
- - root <root@oc.(none)>
+ - phisch <git@philippschaffrath.de>
+ - rakekniven <mark.ziegler@rakekniven.de>
+ - root "root@oc.(none)"
+ - root <root@localhost.localdomain>
 - scambra <sergio@entrecables.com>
 - scolebrook <scolebrook@mac.com>
 - shkdee <louis.traynard@m4x.org>
 - sualko <klaus@jsxc.org>
 - tbartenstein <tbartenstein@users.noreply.github.com>
 - tbelau666 <thomas.belau@gmx.de>
- - unclejamal3000 <andreas.pramhaas@posteo.de>
+ - tux-rampage <tux-rampage@users.noreply.github.com>
 - v1r0x <vinzenz.rosenkranz@gmail.com>
- - voxsim <Simon Vocella>
+ - vkuimov "vkuimov@nextcloud"
+ - voxsim "Simon Vocella"

 With help from many libraries and frameworks including:
 	Open Collaboration Services
@@ -1,20 +1,4 @@
-ChangeLog
+Changelog
 =========

-NC 11 (2016-12-13)
------------------
-* PHP 5.4 and 5.5 no longer supported
-* PHP 7.1 support
-* OC_L10N removed use \OCP\IL10N (#1948)
-* Preview handling is improved by sharing previews:
-  * Preview sharing (shared files/external storages)
-  * Previews are stored in the AppData
-  * Previews are served faster by not first converting them to image objects
-* Core preview route changed:
-  * Route for the urlgenerator changed from 'core_ajax_preview' to 'core.Preview.getPreview'
-  * $urlGenerator->linkToRoute('core_ajax_preview', ...) => $urlGenerator->linkToRoute('core.Preview.getPreview', ...)
-* Avatars are cached
-* Avatars are moved to AppData
-  * For existing avatars this happens automatically in a background job which means that on upgrade you might
-    not see your avatar right away. However after the job has run it should show up again automatically.
-
+The change log is at [https://nextcloud.com/changelog/](https://nextcloud.com/changelog/).
@@ -0,0 +1,9 @@
+In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.
+
+Our code of conduct offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
+
+The Code of Conduct is shared by all contributors and users who engage with the Nextcloud team and its community services. It presents a summary of the shared values and “common sense” thinking in our community.
+
+You can find our full code of conduct on our website: https://nextcloud.com/code-of-conduct/
+
+Please, keep our CoC in mind when you contribute! That way, everyone can be a part of our community in a productive, positive, creative and fun way.
@@ -15,7 +15,7 @@
 * :package: **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
 * :arrows_counterclockwise: **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
 * :rocket: **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
-* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentification.
+* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentication.

 *You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).

@@ -32,6 +32,7 @@
 * :clipboard: [Forum](https://help.nextcloud.com)
 * :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
 * :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
+* :elephant: [Mastodon](https://mastodon.xyz/@nextcloud)

 […learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)

@@ -59,7 +60,7 @@ More information how to contribute: [https://nextcloud.com/contribute/](https://

 Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.

-Several apps by default included in regular releases like [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually as required.
+Several apps that are included by default in regular releases such as [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually.

 That aside Git checkouts can be handled the same as release archives.

@@ -3,7 +3,7 @@
 * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
 * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
 *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -23,15 +23,5 @@
 *
 */

-$logger = \OC::$server->getLogger();
-$userSession = \OC::$server->getUserSession();
-$groupManager = \OC::$server->getGroupManager();
-$eventDispatcher = \OC::$server->getEventDispatcher();
-
-$auditLogger = new \OCA\Admin_Audit\AuditLogger(
-	$logger,
-	$userSession,
-	$groupManager,
-	$eventDispatcher
-);
-$auditLogger->registerHooks();
+$app = new \OCA\AdminAudit\AppInfo\Application();
+$app->register();
@@ -5,9 +5,10 @@
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
 	<licence>AGPL</licence>
 	<author>Nextcloud</author>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
+	<namespace>AdminAudit</namespace>
 	<dependencies>
-		<nextcloud min-version="12" max-version="12" />
+		<nextcloud min-version="13" max-version="13" />
 	</dependencies>
 	<types>
 		<logging/>
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitAdminAudit::getLoader();
@@ -0,0 +1,13 @@
+{
+    "config" : {
+        "vendor-dir": ".",
+        "optimize-autoloader": true,
+        "classmap-authoritative": true,
+        "autoloader-suffix": "AdminAudit"
+    },
+    "autoload" : {
+        "psr-4": {
+            "OCA\\AdminAudit\\": "../lib/"
+        }
+    }
+}
@@ -0,0 +1,444 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $firstCharsPsr4 = array();
+    private $prefixLengthsPsr4 = array(); // For BC with legacy static maps
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            if ('\\' !== substr($prefix, -1)) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            if ('\\' !== substr($prefix, -1)) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
@@ -0,0 +1,20 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
+    'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
+    'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',
+    'OCA\\AdminAudit\\Actions\\Console' => $baseDir . '/../lib/Actions/Console.php',
+    'OCA\\AdminAudit\\Actions\\Files' => $baseDir . '/../lib/Actions/Files.php',
+    'OCA\\AdminAudit\\Actions\\GroupManagement' => $baseDir . '/../lib/Actions/GroupManagement.php',
+    'OCA\\AdminAudit\\Actions\\Sharing' => $baseDir . '/../lib/Actions/Sharing.php',
+    'OCA\\AdminAudit\\Actions\\Trashbin' => $baseDir . '/../lib/Actions/Trashbin.php',
+    'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir . '/../lib/Actions/UserManagement.php',
+    'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
+    'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+);
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+);
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\AdminAudit\\' => array($baseDir . '/../lib'),
+);
@@ -0,0 +1,43 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitAdminAudit
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
+        } else {
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->setClassMapAuthoritative(true);
+        $loader->register(true);
+
+        return $loader;
+    }
+}
@@ -0,0 +1,43 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitAdminAudit
+{
+    public static $firstCharsPsr4 = array (
+        'O' => true,
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'OCA\\AdminAudit\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/../lib',
+        ),
+    );
+
+    public static $classMap = array (
+        'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
+        'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
+        'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',
+        'OCA\\AdminAudit\\Actions\\Console' => __DIR__ . '/..' . '/../lib/Actions/Console.php',
+        'OCA\\AdminAudit\\Actions\\Files' => __DIR__ . '/..' . '/../lib/Actions/Files.php',
+        'OCA\\AdminAudit\\Actions\\GroupManagement' => __DIR__ . '/..' . '/../lib/Actions/GroupManagement.php',
+        'OCA\\AdminAudit\\Actions\\Sharing' => __DIR__ . '/..' . '/../lib/Actions/Sharing.php',
+        'OCA\\AdminAudit\\Actions\\Trashbin' => __DIR__ . '/..' . '/../lib/Actions/Trashbin.php',
+        'OCA\\AdminAudit\\Actions\\UserManagement' => __DIR__ . '/..' . '/../lib/Actions/UserManagement.php',
+        'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
+        'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->firstCharsPsr4 = ComposerStaticInitAdminAudit::$firstCharsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitAdminAudit::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitAdminAudit::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
@@ -2,6 +2,7 @@
 /**
 * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
 *
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -20,7 +21,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;

 use OCP\ILogger;

@@ -0,0 +1,58 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author 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\Actions;
+
+class AppManagement extends Action {
+
+	/**
+	 * @param string $appName
+	 */
+	public function enableApp($appName) {
+		$this->log('App "%s" enabled',
+			['app' => $appName],
+			['app']
+		);
+	}
+
+	/**
+	 * @param string $appName
+	 * @param string[] $groups
+	 */
+	public function enableAppForGroups($appName, array $groups) {
+		$this->log('App "%s" enabled for groups: %s',
+			['app' => $appName, 'groups' => implode(', ', $groups)],
+			['app', 'groups']
+		);
+	}
+
+	/**
+	 * @param string $appName
+	 */
+	public function disableApp($appName) {
+		$this->log('App "%s" disabled',
+			['app' => $appName],
+			['app']
+		);
+	}
+}
@@ -2,6 +2,7 @@
 /**
 * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
 *
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -20,12 +21,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;

 /**
 * Class Auth logs all auth related actions
 *
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
 */
 class Auth extends Action {
 	public function loginAttempt(array $params) {
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author 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\Actions;
+
+
+class Console extends Action {
+	/**
+	 * @param $arguments
+	 */
+	public function runCommand($arguments) {
+		if ($arguments[1] === '_completion') {
+			// Don't log autocompletion
+			return;
+		}
+
+		// Remove `./occ`
+		array_shift($arguments);
+
+		$this->log('Console command executed: %s',
+			['arguments' => implode(' ', $arguments)],
+			['arguments']
+		);
+	}
+}
@@ -2,6 +2,7 @@
 /**
 * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
 *
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -20,12 +21,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;

 /**
 * Class Files logs the actions to files
 *
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
 */
 class Files extends Action {
 	/**
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
 *
 * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 * @author Roger Szabo <roger.szabo@web.de>
 *
@@ -23,18 +24,16 @@
 *
 */

-
-namespace OCA\Admin_Audit\Actions;
+namespace OCA\AdminAudit\Actions;


-use OCA\Admin_Audit\Actions\Action;
 use OCP\IGroup;
 use OCP\IUser;

 /**
 * Class GroupManagement logs all group manager related events
 *
- * @package OCA\Admin_Audit
+ * @package OCA\AdminAudit\Actions
 */
 class GroupManagement extends Action {

@@ -2,6 +2,7 @@
 /**
 * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
 *
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -20,13 +21,16 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
+
+
 use OCP\Share;

 /**
 * Class Sharing logs the sharing actions
 *
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
 */
 class Sharing extends Action {
 	/**
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
 *
 * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
 *
 * @license GNU AGPL version 3 or any later version
 *
@@ -21,8 +22,7 @@
 *
 */

-
-namespace OCA\Admin_Audit\Actions;
+namespace OCA\AdminAudit\Actions;


 class Trashbin extends Action {
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
 *
 * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -21,13 +22,16 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-namespace OCA\Admin_Audit\Actions;
+
+namespace OCA\AdminAudit\Actions;
+
+
 use OCP\IUser;

 /**
 * Class UserManagement logs all user management related actions.
 *
- * @package OCA\Admin_Audit\Actions
+ * @package OCA\AdminAudit\Actions
 */
 class UserManagement extends Action {
 	/**
@@ -66,14 +70,25 @@ class UserManagement extends Action {
 	 * @param array $params
 	 */
 	public function change(array $params) {
-		if ($params['feature'] === 'enabled') {
-			$this->log(
-				$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
-				['user' => $params['user']->getUID()],
-				[
-					'user',
-				]
-			);
+		switch($params['feature']) {
+			case 'enabled':
+				$this->log(
+					$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
+					['user' => $params['user']->getUID()],
+					[
+						'user',
+					]
+				);
+				break;
+			case 'eMailAddress':
+				$this->log(
+					'Email address changed for user %s',
+					['user' => $params['user']->getUID()],
+					[
+						'user',
+					]
+				);
+				break;
 		}
 	}

@@ -3,6 +3,7 @@
 * @copyright Bjoern Schiessle <bjoern@schiessle.org>
 *
 * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Joas Schilling <coding@schilljs.com>
 *
 * @license GNU AGPL version 3 or any later version
 *
@@ -21,8 +22,7 @@
 *
 */

-
-namespace OCA\Admin_Audit\Actions;
+namespace OCA\AdminAudit\Actions;


 class Versions extends Action {
@@ -0,0 +1,221 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author 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\AppInfo;
+
+use OC\Files\Filesystem;
+use OC\Files\Node\File;
+use OC\Group\Manager;
+use OC\User\Session;
+use OCA\AdminAudit\Actions\AppManagement;
+use OCA\AdminAudit\Actions\Auth;
+use OCA\AdminAudit\Actions\Console;
+use OCA\AdminAudit\Actions\Files;
+use OCA\AdminAudit\Actions\GroupManagement;
+use OCA\AdminAudit\Actions\Sharing;
+use OCA\AdminAudit\Actions\Trashbin;
+use OCA\AdminAudit\Actions\UserManagement;
+use OCA\AdminAudit\Actions\Versions;
+use OCP\App\ManagerEvent;
+use OCP\AppFramework\App;
+use OCP\Console\ConsoleEvent;
+use OCP\IGroupManager;
+use OCP\ILogger;
+use OCP\IPreview;
+use OCP\IUserSession;
+use OCP\Util;
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+class Application extends App {
+
+	public function __construct() {
+		parent::__construct('admin_audit');
+	}
+
+	public function register() {
+		$this->registerHooks();
+	}
+
+	/**
+	 * Register hooks in order to log them
+	 */
+	protected function registerHooks() {
+		$logger = $this->getContainer()->getServer()->getLogger();
+
+		$this->userManagementHooks($logger);
+		$this->groupHooks($logger);
+		$this->authHooks($logger);
+
+		$this->consoleHooks($logger);
+		$this->appHooks($logger);
+
+		$this->sharingHooks($logger);
+
+		$this->fileHooks($logger);
+		$this->trashbinHooks($logger);
+		$this->versionsHooks($logger);
+	}
+
+	protected function userManagementHooks(ILogger $logger) {
+		$userActions = new UserManagement($logger);
+
+		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
+		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+		Util::connectHook('OC_User', 'changeUser',	$userActions, 'change');
+
+		/** @var IUserSession|Session $userSession */
+		$userSession = $this->getContainer()->getServer()->getUserSession();
+		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+	}
+
+	protected function groupHooks(ILogger $logger)  {
+		$groupActions = new GroupManagement($logger);
+
+		/** @var IGroupManager|Manager $groupManager */
+		$groupManager = $this->getContainer()->getServer()->getGroupManager();
+		$groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
+		$groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+		$groupManager->listen('\OC\Group', 'postDelete',  [$groupActions, 'deleteGroup']);
+		$groupManager->listen('\OC\Group', 'postCreate',  [$groupActions, 'createGroup']);
+	}
+
+	protected function sharingHooks(ILogger $logger) {
+		$shareActions = new Sharing($logger);
+
+		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
+		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
+		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
+		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
+		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
+	}
+
+	protected function authHooks(ILogger $logger) {
+		$authActions = new Auth($logger);
+
+		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+	}
+
+	protected function appHooks(ILogger $logger) {
+
+		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
+			$appActions = new AppManagement($logger);
+			$appActions->enableApp($event->getAppID());
+		});
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
+			$appActions = new AppManagement($logger);
+			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
+		});
+		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
+			$appActions = new AppManagement($logger);
+			$appActions->disableApp($event->getAppID());
+		});
+
+	}
+
+	protected function consoleHooks(ILogger $logger) {
+		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
+			$appActions = new Console($logger);
+			$appActions->runCommand($event->getArguments());
+		});
+	}
+
+	protected function fileHooks(ILogger $logger) {
+		$fileActions = new Files($logger);
+		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
+		$eventDispatcher->addListener(
+			IPreview::EVENT,
+			function(GenericEvent $event) use ($fileActions) {
+				/** @var File $file */
+				$file = $event->getSubject();
+				$fileActions->preview([
+					'path' => substr($file->getInternalPath(), 5),
+					'width' => $event->getArguments()['width'],
+					'height' => $event->getArguments()['height'],
+					'crop' => $event->getArguments()['crop'],
+					'mode'  => $event->getArguments()['mode']
+				]);
+			}
+		);
+
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_rename,
+			$fileActions,
+			'rename'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_create,
+			$fileActions,
+			'create'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_copy,
+			$fileActions,
+			'copy'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_write,
+			$fileActions,
+			'write'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_update,
+			$fileActions,
+			'update'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_read,
+			$fileActions,
+			'read'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_delete,
+			$fileActions,
+			'delete'
+		);
+	}
+
+	protected function versionsHooks(ILogger $logger) {
+		$versionsActions = new Versions($logger);
+		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+	}
+
+	protected 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');
+	}
+}
@@ -1,209 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
- * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Roger Szabo <roger.szabo@web.de>
- *
- * @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\Admin_Audit;
-
-use OC\Files\Filesystem;
-use OC\Files\Node\File;
-use OCA\Admin_Audit\Actions\Auth;
-use OCA\Admin_Audit\Actions\Files;
-use OCA\Admin_Audit\Actions\GroupManagement;
-use OCA\Admin_Audit\Actions\Sharing;
-use OCA\Admin_Audit\Actions\Trashbin;
-use OCA\Admin_Audit\Actions\UserManagement;
-use OCA\Admin_Audit\Actions\Versions;
-use OCP\IGroupManager;
-use OCP\ILogger;
-use OCP\IPreview;
-use OCP\IUserSession;
-use OCP\Util;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-class AuditLogger {
-	/** @var ILogger */
-	private $logger;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * AuditLogger constructor.
-	 *
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(ILogger $logger,
-								IUserSession $userSession, 
-								IGroupManager $groupManager,
-								EventDispatcherInterface $eventDispatcher) {
-		$this->logger = $logger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	public function registerHooks() {
-		$this->userManagementHooks();
-		$this->groupHooks();
-		$this->sharingHooks();
-		$this->authHooks();
-		$this->fileHooks();
-		$this->trashbinHooks();
-		$this->versionsHooks();
-	}
-
-	/**
-	 * Connect to user management hooks
-	 */
-	private function userManagementHooks() {
-		$userActions = new UserManagement($this->logger);
-
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
-		Util::connectHook('OC_User', 'changeUser',	$userActions, 'change');
-		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-	}
-	
-	private function groupHooks()  {
-		$groupActions = new GroupManagement($this->logger);
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
-		$this->groupManager->listen('\OC\Group', 'postDelete',  [$groupActions, 'deleteGroup']);
-		$this->groupManager->listen('\OC\Group', 'postCreate',  [$groupActions, 'createGroup']);
-	}
-
-	/**
-	 * connect to sharing events
-	 */
-	private function sharingHooks() {
-		$shareActions = new Sharing($this->logger);
-
-		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
-		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	/**
-	 * connect to authentication event and related actions
-	 */
-	private function authHooks() {
-		$authActions = new Auth($this->logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-	/**
-	 * Connect to file hooks
-	 */
-	private function fileHooks() {
-		$fileActions = new Files($this->logger);
-		$this->eventDispatcher->addListener(
-			IPreview::EVENT,
-			function(GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode'  => $event->getArguments()['mode']
-				]);
-			}
-		);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	public function versionsHooks() {
-		$versionsActions = new Versions($this->logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
-	}
-
-	/**
-	 * Connect to trash bin hooks
-	 */
-	private function trashbinHooks() {
-		$trashActions = new Trashbin($this->logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
-
-}
@@ -0,0 +1,3 @@
+{
+	"directory": "js/vendor"
+}
@@ -2,7 +2,9 @@
 /**
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
 * @author Joas Schilling <coding@schilljs.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
 * @author Vincent Petry <pvince81@owncloud.com>
 *
 * @license AGPL-3.0
@@ -27,6 +29,7 @@ $eventDispatcher->addListener(
 	function() {
 		\OCP\Util::addScript('oc-backbone-webdav');
 		\OCP\Util::addScript('comments', 'merged');
+		\OCP\Util::addStyle('comments', 'autocomplete');
 		\OCP\Util::addStyle('comments', 'comments');
 	}
 );
@@ -57,14 +60,3 @@ $commentsManager->registerEventHandler(function () {
 	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
 	return $handler;
 });
-$commentsManager->registerDisplayNameResolver('user', function($id) {
-	$manager = \OC::$server->getUserManager();
-	$user = $manager->get($id);
-	if(is_null($user)) {
-		$l = \OC::$server->getL10N('comments');
-		$displayName = $l->t('Unknown user');
-	} else {
-		$displayName = $user->getDisplayName();
-	}
-	return $displayName;
-});
@@ -4,11 +4,12 @@
 	<name>Comments</name>
 	<description>Files app plugin to add comments to files</description>
 	<licence>AGPL</licence>
-	<author>Arthur Schiwon, Vincent Petry</author>
+	<author>Arthur Schiwon</author>
+	<author>Vincent Petry</author>
 	<default_enable/>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
 	<dependencies>
-		<nextcloud min-version="12" max-version="12" />
+		<nextcloud min-version="13" max-version="13" />
 	</dependencies>
 	<types>
 		<logging/>
@@ -27,4 +28,10 @@
 			<provider>OCA\Comments\Activity\Provider</provider>
 		</providers>
 	</activity>
+
+	<collaboration>
+		<plugins>
+			<plugin type="autocomplete-sort">OCA\Comments\Collaboration\CommentersSorter</plugin>
+		</plugins>
+	</collaboration>
 </info>
@@ -1,9 +1,10 @@
 <?php
-
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -20,9 +21,8 @@
 *
 */

-use \OCA\Comments\AppInfo\Application;
-
-$application = new Application();
-$application->registerRoutes($this, ['routes' => [
-	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
-]]);
+return [
+	'routes' => [
+		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+	]
+];
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitComments::getLoader();
@@ -0,0 +1,13 @@
+{
+    "config" : {
+        "vendor-dir": ".",
+        "optimize-autoloader": true,
+        "classmap-authoritative": true,
+        "autoloader-suffix": "Comments"
+    },
+    "autoload" : {
+        "psr-4": {
+            "OCA\\Comments\\": "../lib/"
+        }
+    }
+}
@@ -0,0 +1,444 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $firstCharsPsr4 = array();
+    private $prefixLengthsPsr4 = array(); // For BC with legacy static maps
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            if ('\\' !== substr($prefix, -1)) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            if ('\\' !== substr($prefix, -1)) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
@@ -0,0 +1,20 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\Comments\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
+    'OCA\\Comments\\Activity\\Listener' => $baseDir . '/../lib/Activity/Listener.php',
+    'OCA\\Comments\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
+    'OCA\\Comments\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
+    'OCA\\Comments\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    '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\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
+    'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
+);
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+);
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\Comments\\' => array($baseDir . '/../lib'),
+);
@@ -0,0 +1,43 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitComments
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitComments', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitComments', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitComments::getInitializer($loader));
+        } else {
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->setClassMapAuthoritative(true);
+        $loader->register(true);
+
+        return $loader;
+    }
+}
@@ -0,0 +1,43 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitComments
+{
+    public static $firstCharsPsr4 = array (
+        'O' => true,
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'OCA\\Comments\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/../lib',
+        ),
+    );
+
+    public static $classMap = array (
+        'OCA\\Comments\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
+        'OCA\\Comments\\Activity\\Listener' => __DIR__ . '/..' . '/../lib/Activity/Listener.php',
+        'OCA\\Comments\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
+        'OCA\\Comments\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
+        'OCA\\Comments\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        '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\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
+        'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->firstCharsPsr4 = ComposerStaticInitComments::$firstCharsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitComments::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitComments::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
@@ -0,0 +1,77 @@
+/**
+ * based upon apps/comments/js/vendor/At.js/dist/css/jquery.atwho.css,
+ * only changed colors and font-weight
+ */
+
+.atwho-view {
+	position:absolute;
+	top: 0;
+	left: 0;
+	display: none;
+	margin-top: 18px;
+	background: $color-main-background;
+	color: $color-main-text;
+	border: 1px solid $color-border;
+	border-radius: $border-radius;
+	box-shadow: 0 0 5px $color-box-shadow;
+	min-width: 120px;
+	z-index: 11110 !important;
+}
+
+.atwho-view .atwho-header {
+	padding: 5px;
+	margin: 5px;
+	cursor: pointer;
+	border-bottom: solid 1px $color-border;
+	color: $color-main-text;
+	font-size: 11px;
+	font-weight: bold;
+}
+
+.atwho-view .atwho-header .small {
+	color: $color-main-text;
+	float: right;
+	padding-top: 2px;
+	margin-right: -5px;
+	font-size: 12px;
+	font-weight: normal;
+}
+
+.atwho-view .atwho-header:hover {
+	cursor: default;
+}
+
+.atwho-view .cur {
+	background: $color-primary;
+	color: $color-primary-text;
+}
+.atwho-view .cur small {
+	color: $color-primary-text;
+}
+.atwho-view strong {
+	color: $color-main-text;
+	font-weight: normal;
+}
+.atwho-view .cur strong {
+	color: $color-primary-text;
+	font-weight: normal;
+}
+.atwho-view ul {
+	/* width: 100px; */
+	list-style:none;
+	padding:0;
+	margin:auto;
+	max-height: 200px;
+	overflow-y: auto;
+}
+.atwho-view ul li {
+	display: block;
+	padding: 5px 10px;
+	border-bottom: 1px solid $color-border;
+	cursor: pointer;
+}
+.atwho-view small {
+	font-size: smaller;
+	color: $color-main-text;
+	font-weight: normal;
+}
@@ -35,35 +35,60 @@
 	border: none;
 	opacity: .3;
 }
-#commentsTabView .newCommentForm .submit:hover,
-#commentsTabView .newCommentForm .submit:focus {
+#commentsTabView .newCommentForm .submit:not(:disabled):hover,
+#commentsTabView .newCommentForm .submit:not(:disabled):focus {
 	opacity: 1;
 }

 #commentsTabView .newCommentForm .submitLoading {
 	background-position: left;
+
+	/* Match rules for '#commentsTabView .newCommentForm .submit' to place the
+	   loading icon at the same position as the confirm icon */
+	position: absolute;
+	bottom: 0px;
+	right: 8px;
+	width: 30px;
+	margin: 0;
+	padding: 7px 9px;
+
+	/* Match rules for 'input[type="submit"]' to place the loading icon at the
+	   same position as the confirm icon */
+	min-height: 34px;
+	box-sizing: border-box;
 }

 #commentsTabView .newCommentForm .cancel {
 	margin-right: 6px;
 }

-#commentsTabView .newCommentForm textarea {
+#commentsTabView .newCommentForm div.message {
 	resize: none;
 }

+#commentsTabView .newCommentForm div.message:empty:before {
+	content: attr(data-placeholder);
+	color: grey;
+}
+
 #commentsTabView .comment {
 	position: relative;
 	margin-bottom: 30px;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
 }

-#commentsTabView .comment .avatar {
+#commentsTabView .comment .avatar,
+.atwho-view-ul * .avatar{
 	width: 32px;
 	height: 32px;
 	line-height: 32px;
+	margin-right: 5px;
 }

-#commentsTabView .comment .message .avatar {
+#commentsTabView .comment .message .avatar,
+.atwho-view-ul * .avatar
+{
 	display: inline-block;
 }

@@ -102,7 +127,7 @@
 	background-repeat: no-repeat;
 }

-#commentsTabView .authorRow>div {
+#commentsTabView .authorRow>div:not(.contactsmenu-popover) {
 	display: inline-block;
 	vertical-align: middle;
 }
@@ -112,32 +137,52 @@
 }

 #commentsTabView .comments li .message .avatar-name-wrapper,
+.atwho-view-ul * .avatar-name-wrapper,
 #commentsTabView .comment .authorRow {
 	position: relative;
+	display: inline-flex;
+	align-items: center;
+	width: 100%;
+}
+
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
+#commentsTabView .comment .authorRow .avatar:not(.currentUser),
+#commentsTabView .comment .authorRow .author:not(.currentUser) {
 	cursor: pointer;
 }

+.atwho-view-ul .avatar-name-wrapper,
+.atwho-view-ul .avatar-name-wrapper .avatar {
+	cursor: pointer;
+}
+
+#commentsTabView .comments li .message .atwho-inserted {
+	margin-left: 5px;
+}
+
+.atwho-view-ul * .avatar-name-wrapper {
+	white-space: nowrap;
+}
+
 #commentsTabView .comment .author,
 #commentsTabView .comment .date {
 	opacity: .5;
 }
-#commentsTabView .comment .author {
-	margin-left: 5px;
-}
 #commentsTabView .comment .date {
-	position: absolute;
-	right: 0;
-	top: 5px;
+	margin-left: auto;
 }

 #commentsTabView .comments li .message {
 	padding-left: 40px;
+	display: inline-flex;
+	flex-wrap: wrap;
+	align-items: center;
 }

 #commentsTabView .comment .action {
 	opacity: 0;
-	vertical-align: middle;
-	display: inline-block;
+	padding: 5px;
 }

 #commentsTabView .comment:hover .action {
@@ -148,7 +193,8 @@
 	opacity: 1;
 }

-#commentsTabView .comment .action.delete {
+#commentsTabView .comment .action.delete,
+#commentsTabView .comment .deleteLoading {
 	position: absolute;
 	right: 0;
 }
@@ -164,8 +210,6 @@
 #commentsTabView .message.error {
 	color: #e9322d;
 	border-color: #e9322d;
-	-webkit-box-shadow: 0 0 6px #f8b9b7;
-	-moz-box-shadow: 0 0 6px #f8b9b7;
 	box-shadow: 0 0 6px #f8b9b7;
 }

@@ -23,14 +23,15 @@
 	var EDIT_COMMENT_TEMPLATE =
 		'<div class="newCommentRow comment" data-id="{{id}}">' +
 		'    <div class="authorRow">' +
-		'        <div class="avatar" data-username="{{actorId}}"></div>' +
-		'        <div class="author">{{actorDisplayName}}</div>' +
+		'        <div class="avatar currentUser" data-username="{{actorId}}"></div>' +
+		'        <div class="author currentUser">{{actorDisplayName}}</div>' +
 		'{{#if isEditMode}}' +
 		'        <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
+		'        <div class="deleteLoading icon-loading-small hidden"></div>'+
 		'{{/if}}' +
 		'    </div>' +
 		'    <form class="newCommentForm">' +
-		'        <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
+		'        <div contentEditable="true" class="message" data-placeholder="{{newMessagePlaceholder}}">{{message}}</div>' +
 		'        <input class="submit icon-confirm" type="submit" value="" />' +
 		'{{#if isEditMode}}' +
 		'        <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
@@ -42,8 +43,8 @@
 	var COMMENT_TEMPLATE =
 		'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
 		'    <div class="authorRow">' +
-		'        <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
-		'        <div class="author">{{actorDisplayName}}</div>' +
+		'        <div class="avatar{{#if isUserAuthor}} currentUser{{/if}}" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
+		'        <div class="author{{#if isUserAuthor}} currentUser{{/if}}">{{actorDisplayName}}</div>' +
 		'{{#if isUserAuthor}}' +
 		'        <a href="#" class="action edit icon icon-rename has-tooltip" title="{{editTooltip}}"></a>' +
 		'{{/if}}' +
@@ -62,6 +63,7 @@
 		/** @lends OCA.Comments.CommentsTabView.prototype */ {
 		id: 'commentsTabView',
 		className: 'tab commentsTabView',
+		_autoCompleteData: undefined,

 		events: {
 			'submit .newCommentForm': '_onSubmitComment',
@@ -69,7 +71,11 @@
 			'click .action.edit': '_onClickEditComment',
 			'click .action.delete': '_onClickDeleteComment',
 			'click .cancel': '_onClickCloseComment',
-			'click .comment': '_onClickComment'
+			'click .comment': '_onClickComment',
+			'keyup div.message': '_onTextChange',
+			'change div.message': '_onTextChange',
+			'input div.message': '_onTextChange',
+			'paste div.message': '_onPaste'
 		},

 		_commentMaxLength: 1000,
@@ -80,11 +86,12 @@
 			this.collection.on('request', this._onRequest, this);
 			this.collection.on('sync', this._onEndRequest, this);
 			this.collection.on('add', this._onAddModel, this);
+			this.collection.on('change:message', this._onChangeModel, this);

 			this._commentMaxThreshold = this._commentMaxLength * 0.9;

 			// TODO: error handling
-			_.bindAll(this, '_onTypeComment');
+			_.bindAll(this, '_onTypeComment', '_initAutoComplete', '_onAutoComplete');
 		},

 		template: function(params) {
@@ -140,8 +147,10 @@
 		setFileInfo: function(fileInfo) {
 			if (fileInfo) {
 				this.model = fileInfo;
+
 				this.render();
-				this.collection.setObjectId(fileInfo.id);
+				this._initAutoComplete($('#commentsTabView').find('.newCommentForm .message'));
+				this.collection.setObjectId(this.model.id);
 				// reset to first page
 				this.collection.reset([], {silent: true});
 				this.nextPage();
@@ -164,7 +173,91 @@
 			this.delegateEvents();
 			this.$el.find('.message').on('keydown input change', this._onTypeComment);

-			autosize(this.$el.find('.newCommentRow textarea'))
+			autosize(this.$el.find('.newCommentRow .message'))
+		},
+
+		_initAutoComplete: function($target) {
+			var s = this;
+			var limit = 10;
+			if(!_.isUndefined(OC.appConfig.comments)) {
+				limit = OC.appConfig.comments.maxAutoCompleteResults;
+			}
+			$target.atwho({
+				at: '@',
+				limit: limit,
+				callbacks: {
+					remoteFilter: s._onAutoComplete,
+					highlighter: function (li) {
+						// misuse the highlighter callback to instead of
+						// highlighting loads the avatars.
+						var $li = $(li);
+						$li.find('.avatar').avatar(undefined, 32);
+						return $li;
+					},
+					sorter: function (q, items) { return items; }
+				},
+				displayTpl: function (item) {
+					return '<li>'
+						+ '<span class="avatar-name-wrapper">'
+						+ '<div class="avatar" '
+						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
+						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
+						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+						+ '</span></li>';
+				},
+				insertTpl: function (item) {
+					return ''
+						+ '<span class="avatar-name-wrapper">'
+						+ '<div class="avatar" '
+						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
+						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
+						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+						+ '</span>';
+				},
+				searchKey: "label"
+			});
+			$target.on('inserted.atwho', function (je, $el) {
+				var editionMode = true;
+				s._postRenderItem(
+					// we need to pass the parent of the inserted element
+					// passing the whole comments form would re-apply and request
+					// avatars from the server
+					$(je.target).find(
+						'div[data-username="' + $el.find('[data-username]').data('username') + '"]'
+					).parent(),
+					editionMode
+				);
+			});
+		},
+
+		_onAutoComplete: function(query, callback) {
+			if(_.isEmpty(query)) {
+				return;
+			}
+			var s = this;
+			if(!_.isUndefined(this._autoCompleteRequestTimer)) {
+				clearTimeout(this._autoCompleteRequestTimer);
+			}
+			this._autoCompleteRequestTimer = _.delay(function() {
+				if(!_.isUndefined(this._autoCompleteRequestCall)) {
+					this._autoCompleteRequestCall.abort();
+				}
+				this._autoCompleteRequestCall = $.get(
+					OC.generateUrl('/autocomplete/get'),
+					{
+						search: query,
+						itemType: 'files',
+						itemId: s.model.get('id'),
+						sorter: 'commenters|share-recipients',
+						limit: OC.appConfig.comments.maxAutoCompleteResults
+					},
+					function (data) {
+						callback(data);
+					}
+				);
+			}, 400);
 		},

 		_formatItem: function(commentModel) {
@@ -215,18 +308,83 @@
 			}
 		},

+		/**
+		 * takes care of post-rendering after a new comment was added to the
+		 * collection
+		 *
+		 * @param model
+		 * @param collection
+		 * @param options
+		 * @private
+		 */
 		_onAddModel: function(model, collection, options) {
-			var $el = $(this.commentTemplate(this._formatItem(model)));
+			// we need to render it immediately, to ensure that the right
+			// order of comments is kept on opening comments tab
+			var $comment = $(this.commentTemplate(this._formatItem(model)));
 			if (!_.isUndefined(options.at) && collection.length > 1) {
-				this.$container.find('li').eq(options.at).before($el);
+				this.$container.find('li').eq(options.at).before($comment);
 			} else {
-				this.$container.append($el);
+				this.$container.append($comment);
 			}
+			this._postRenderItem($comment);
+			$('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true);
+
+			// we need to update the model, because it consists of client data
+			// only, but the server might add meta data, e.g. about mentions
+			var oldMentions = model.get('mentions');
+			var self = this;
+			model.fetch({
+				success: function (model) {
+					if(_.isEqual(oldMentions, model.get('mentions'))) {
+						// don't attempt to render if unnecessary, avoids flickering
+						return;
+					}
+					var $updated = $(self.commentTemplate(self._formatItem(model)));
+					$comment.html($updated.html());
+					self._postRenderItem($comment);
+				}
+			})

-			this._postRenderItem($el);
 		},

-		_postRenderItem: function($el) {
+		/**
+		 * takes care of post-rendering after a new comment was edited
+		 *
+		 * @param model
+		 * @private
+		 */
+		_onChangeModel: function (model) {
+			if(model.get('message').trim() === model.previous('message').trim()) {
+				return;
+			}
+
+			var $form = this.$container.find('.comment[data-id="' + model.id + '"] form');
+			var $row = $form.closest('.comment');
+			var $target = $row.data('commentEl');
+			if(_.isUndefined($target)) {
+				// ignore noise – this is only set after editing a comment and hitting post
+				return;
+			}
+			var self = this;
+
+			// we need to update the model, because it consists of client data
+			// only, but the server might add meta data, e.g. about mentions
+			model.fetch({
+				success: function (model) {
+					$target.removeClass('hidden');
+					$row.remove();
+
+					var $message = $target.find('.message');
+					$message
+						.html(self._formatMessage(model.get('message'), model.get('mentions')))
+						.find('.avatar')
+						.each(function () { $(this).avatar(); });
+					self._postRenderItem($message);
+				}
+			});
+		},
+
+		_postRenderItem: function($el, editionMode) {
 			$el.find('.has-tooltip').tooltip();
 			$el.find('.avatar').each(function() {
 				var $this = $(this);
@@ -240,16 +398,27 @@
 			}

 			var $message = $el.find('.message');
-			this._postRenderMessage($message);
+			if($message.length === 0) {
+				// it is the case when writing a comment and mentioning a person
+				$message = $el;
+			}
+			this._postRenderMessage($message, editionMode);
 		},

-		_postRenderMessage: function($el) {
+		_postRenderMessage: function($el, editionMode) {
+			if (editionMode) {
+				return;
+			}
+
 			$el.find('.avatar').each(function() {
 				var avatar = $(this);
 				var strong = $(this).next();
 				var appendTo = $(this).parent();

-				$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
+				var username = $(this).data('username');
+				if (username !== oc_current_user) {
+					$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
+				}
 			});
 		},

@@ -257,23 +426,19 @@
 		 * Convert a message to be displayed in HTML,
 		 * converts newlines to <br> tags.
 		 */
-		_formatMessage: function(message, mentions) {
+		_formatMessage: function(message, mentions, editMode) {
 			message = escapeHTML(message).replace(/\n/g, '<br/>');

 			for(var i in mentions) {
+				if(!mentions.hasOwnProperty(i)) {
+					return;
+				}
 				var mention = '@' + mentions[i].mentionId;

-				var avatar = '<div class="avatar" '
-					+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
-					+' data-user-display-name="'
-					+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
-
 				// escape possible regex characters in the name
 				mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-				var displayName = ''
-					+ '<span class="avatar-name-wrapper">'
-					+ avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>'
-					+ '</span>';
+
+				var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);

 				// replace every mention either at the start of the input or after a whitespace
 				// followed by a non-word character.
@@ -284,10 +449,29 @@
 					}
 				);
 			}
-
+			if(editMode !== true) {
+				message = OCP.Comments.plainToRich(message);
+			}
 			return message;
 		},

+		_composeHTMLMention: function(uid, displayName) {
+			var avatar = '<div class="avatar" '
+				+ 'data-username="' + _.escape(uid) + '"'
+				+ ' data-user="' + _.escape(uid) + '"'
+				+ ' data-user-display-name="'
+				+ _.escape(displayName) + '"></div>';
+
+			var isCurrentUser = (uid === OC.getCurrentUser().uid);
+
+			return ''
+				+ '<span class="atwho-inserted" contenteditable="false">'
+				+ '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">'
+				+ avatar + ' <strong>'+ _.escape(displayName)+'</strong>'
+				+ '</span>'
+				+ '</span>';
+		},
+
 		nextPage: function() {
 			if (this._loading || !this.collection.hasMoreResults()) {
 				return;
@@ -310,21 +494,32 @@
 			// spawn form
 			$comment.after($formRow);
 			$formRow.data('commentEl', $comment);
-			$formRow.find('textarea').on('keydown input change', this._onTypeComment);
+			$formRow.find('.message').on('keydown input change', this._onTypeComment);

 			// copy avatar element from original to avoid flickering
 			$formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone());
 			$formRow.find('.has-tooltip').tooltip();

+			var $message = $formRow.find('.message');
+			$message
+				.html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true))
+				.find('.avatar')
+				.each(function () { $(this).avatar(); });
+			var editionMode = true;
+			this._postRenderItem($message, editionMode);
+
 			// Enable autosize
-			autosize($formRow.find('textarea'));
+			autosize($formRow.find('.message'));
+
+			// enable autocomplete
+			this._initAutoComplete($formRow.find('.message'));

 			return false;
 		},

 		_onTypeComment: function(ev) {
 			var $field = $(ev.target);
-			var len = $field.val().length;
+			var len = $field.text().length;
 			var $submitButton = $field.data('submitButtonEl');
 			if (!$submitButton) {
 				$submitButton = $field.closest('form').find('.submit');
@@ -342,9 +537,13 @@
 			$field.toggleClass('error', limitExceeded);
 			$submitButton.prop('disabled', limitExceeded);

-			//submits form on ctrl+Enter or cmd+Enter
-			if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
+			// Submits form with Enter, but Shift+Enter is a new line. If the
+			// autocomplete popover is being shown Enter does not submit the
+			// form either; it will be handled by At.js which will add the
+			// currently selected item to the message.
+			if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) {
 				$submitButton.click();
+				ev.preventDefault();
 			}
 		},

@@ -368,10 +567,17 @@
 			ev.preventDefault();
 			var $comment = $(ev.target).closest('.comment');
 			var commentId = $comment.data('id');
-			var $loading = $comment.find('.submitLoading');
+			var $loading = $comment.find('.deleteLoading');
+			var $commentField = $comment.find('.message');
+			var $submit = $comment.find('.submit');
+			var $cancel = $comment.find('.cancel');

+			$commentField.prop('contenteditable', false);
+			$submit.prop('disabled', true);
+			$cancel.prop('disabled', true);
 			$comment.addClass('disabled');
 			$loading.removeClass('hidden');
+
 			this.collection.get(commentId).destroy({
 				success: function() {
 					$comment.data('commentEl').remove();
@@ -380,6 +586,10 @@
 				error: function() {
 					$loading.addClass('hidden');
 					$comment.removeClass('disabled');
+					$commentField.prop('contenteditable', true);
+					$submit.prop('disabled', false);
+					$cancel.prop('disabled', false);
+
 					OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId}));
 				}
 			});
@@ -393,48 +603,42 @@
 		},

 		/**
-		 * takes care of updating comment elements after submit (either new
+		 * takes care of updating comment element states after submit (either new
 		 * comment or edit).
 		 *
 		 * @param {OC.Backbone.Model} model
 		 * @param {jQuery} $form
-		 * @param {string|undefined} commentId
 		 * @private
 		 */
-		_onSubmitSuccess: function(model, $form, commentId) {
-			var self = this;
+		_onSubmitSuccess: function(model, $form) {
 			var $submit = $form.find('.submit');
 			var $loading = $form.find('.submitLoading');
-			var $textArea = $form.find('.message');

-			model.fetch({
-				success: function(model) {
-					$submit.removeClass('hidden');
-					$loading.addClass('hidden');
-					var $target;
+			$submit.removeClass('hidden');
+			$loading.addClass('hidden');
+		},

-					if(!_.isUndefined(commentId)) {
-						var $row = $form.closest('.comment');
-						$target = $row.data('commentEl');
-						$target.removeClass('hidden');
-						$row.remove();
-					} else {
-						$target = $('.commentsTabView .comments').find('li:first');
-						$textArea.val('').prop('disabled', false);
-					}
+		_commentBodyHTML2Plain: function($el) {
+			var $comment = $el.clone();

-					var $message = $target.find('.message');
-					$message
-						.html(self._formatMessage(model.get('message'), model.get('mentions')))
-						.find('.avatar')
-						.each(function () { $(this).avatar(); });
-
-					self._postRenderMessage($message);
-				},
-				error: function () {
-					self._onSubmitError($form, commentId);
-				}
+			$comment.find('.avatar-name-wrapper').each(function () {
+				var $this = $(this);
+				var $inserted = $this.parent();
+				$inserted.html('@' + $this.find('.avatar').data('username'));
 			});
+
+			$comment.html(OCP.Comments.richToPlain($comment.html()));
+
+			var oldHtml;
+			var html = $comment.html();
+			do {
+				// replace works one by one
+				oldHtml = html;
+				html = oldHtml.replace("<br>", "\n");	// preserve line breaks
+			} while(oldHtml !== html);
+			$comment.html(html);
+
+			return $comment.text();
 		},

 		_onSubmitComment: function(e) {
@@ -444,26 +648,27 @@
 			var currentUser = OC.getCurrentUser();
 			var $submit = $form.find('.submit');
 			var $loading = $form.find('.submitLoading');
-			var $textArea = $form.find('.message');
-			var message = $textArea.val().trim();
+			var $commentField = $form.find('.message');
+			var message = $commentField.text().trim();
 			e.preventDefault();

 			if (!message.length || message.length > this._commentMaxLength) {
 				return;
 			}

-			$textArea.prop('disabled', true);
+			$commentField.prop('contenteditable', false);
 			$submit.addClass('hidden');
 			$loading.removeClass('hidden');

+			message = this._commentBodyHTML2Plain($commentField);
 			if (commentId) {
 				// edit mode
 				var comment = this.collection.get(commentId);
 				comment.save({
-					message: $textArea.val()
+					message: message
 				}, {
 					success: function(model) {
-						self._onSubmitSuccess(model, $form, commentId);
+						self._onSubmitSuccess(model, $form);
 					},
 					error: function() {
 						self._onSubmitError($form, commentId);
@@ -475,7 +680,7 @@
 					actorDisplayName: currentUser.displayName,
 					actorType: 'users',
 					verb: 'comment',
-					message: $textArea.val(),
+					message: message,
 					creationDateTime: (new Date()).toUTCString()
 				}, {
 					at: 0,
@@ -485,7 +690,7 @@
 						self._onSubmitSuccess(model, $form);
 					},
 					error: function() {
-						self._onSubmitError($form);
+						self._onSubmitError($form, undefined);
 					}
 				});
 			}
@@ -504,7 +709,7 @@
 		_onSubmitError: function($form, commentId) {
 			$form.find('.submit').removeClass('hidden');
 			$form.find('.submitLoading').addClass('hidden');
-			$form.find('.message').prop('disabled', false);
+			$form.find('.message').prop('contenteditable', true);

 			if(!_.isUndefined(commentId)) {
 				OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'});
@@ -513,6 +718,31 @@
 			}
 		},

+		/**
+		 * ensures the contenteditable div is really empty, when user removed
+		 * all input, so that the placeholder will be shown again
+		 *
+		 * @private
+		 */
+		_onTextChange: function() {
+			var $message = $('#commentsTabView').find('.newCommentForm div.message');
+			if(!$message.text().trim().length) {
+				$message.empty();
+			}
+		},
+
+		/**
+		 * Limit pasting to plain text
+		 *
+		 * @param e
+		 * @private
+		 */
+		_onPaste: function (e) {
+			e.preventDefault();
+			var text = e.originalEvent.clipboardData.getData("text/plain");
+			document.execCommand('insertText', false, text);
+		},
+
 		/**
 		 * Returns whether the given message is long and needs
 		 * collapsing
@@ -5,5 +5,7 @@
  "commentsummarymodel.js",
  "commentstabview.js",
  "filesplugin.js",
-  "activitytabviewplugin.js"
+  "activitytabviewplugin.js",
+  "vendor/Caret.js/dist/jquery.caret.min.js",
+  "vendor/At.js/dist/js/jquery.atwho.min.js"
 ]
@@ -2,6 +2,8 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author 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
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Joas Schilling <coding@schilljs.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 *
 * @license AGPL-3.0
 *
@@ -83,7 +84,7 @@ class Listener {

 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -92,7 +93,7 @@ class Listener {
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -2,6 +2,8 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author 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
@@ -174,6 +176,12 @@ class Provider implements IProvider {
 		}

 		// Fix subjects from 12.0.3 and older
+		//
+		// Do NOT Remove unless necessary
+		// Removing this will break parsing of activities that were created on
+		// Nextcloud 12, so we should keep this as long as it's acceptable.
+		// Otherwise if people upgrade over multiple releases in a short period,
+		// they will get the dead entries in their stream.
 		return [
 			'actor' => $subjectParameters[0],
 			'fileId' => (int) $event->getObjectId(),
@@ -2,6 +2,8 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author 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
@@ -1,28 +1,32 @@
 <?php
-
 /**
+ *
+ *
 * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
 *
 * @license GNU AGPL version 3 or any later version
 *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, 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 library is distributed in the hope that it will be useful,
+ * 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.
+ * 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/>.
 *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */

 namespace OCA\Comments\AppInfo;

 use OCA\Comments\Controller\Notifications;
+use OCA\Comments\JSSettingsHelper;
 use OCP\AppFramework\App;
+use OCP\Util;

 class Application extends App {

@@ -31,5 +35,8 @@ class Application extends App {
 		$container = $this->getContainer();

 		$container->registerAlias('NotificationsController', Notifications::class);
+
+		$jsSettingsHelper = new JSSettingsHelper($container->getServer());
+		Util::connectHook('\OCP\Config', 'js', $jsSettingsHelper, 'extend');
 	}
 }
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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\Collaboration;
+
+
+use OCP\Collaboration\AutoComplete\ISorter;
+use OCP\Comments\ICommentsManager;
+
+class CommentersSorter implements ISorter {
+
+	/** @var ICommentsManager */
+	private $commentsManager;
+
+	public function __construct(ICommentsManager $commentsManager) {
+		$this->commentsManager = $commentsManager;
+	}
+
+	public function getId() {
+		return 'commenters';
+	}
+
+	/**
+	 * Sorts people who commented on the given item atop (descelating) of the
+	 * others
+	 *
+	 * @param array $sortArray
+	 * @param array $context
+	 */
+	public function sort(array &$sortArray, array $context) {
+		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
+		if(count($commenters) === 0) {
+			return;
+		}
+
+		foreach ($sortArray as $type => &$byType) {
+			if(!isset($commenters[$type])) {
+				continue;
+			}
+
+			// at least on PHP 5.6 usort turned out to be not stable. So we add
+			// the current index to the value and compare it on a draw
+			$i = 0;
+			$workArray = array_map(function($element) use (&$i) {
+				return [$i++, $element];
+			}, $byType);
+
+			usort($workArray, function ($a, $b) use ($commenters, $type) {
+				$r = $this->compare($a[1], $b[1], $commenters[$type]);
+				if($r === 0) {
+					$r = $a[0] - $b[0];
+				}
+				return $r;
+			});
+
+			// and remove the index values again
+			$byType = array_column($workArray, 1);
+		}
+	}
+
+	/**
+	 * @param $type
+	 * @param $id
+	 * @return array
+	 */
+	protected function retrieveCommentsInformation($type, $id) {
+		$comments = $this->commentsManager->getForObject($type, $id);
+		if(count($comments) === 0) {
+			return [];
+		}
+
+		$actors = [];
+		foreach ($comments as $comment) {
+			if(!isset($actors[$comment->getActorType()])) {
+				$actors[$comment->getActorType()] = [];
+			}
+			if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
+				$actors[$comment->getActorType()][$comment->getActorId()] = 1;
+			} else {
+				$actors[$comment->getActorType()][$comment->getActorId()]++;
+			}
+		}
+		return $actors;
+	}
+
+	protected function compare(array $a, array $b, array $commenters) {
+		$a = $a['value']['shareWith'];
+		$b = $b['value']['shareWith'];
+
+		$valueA = isset($commenters[$a]) ? $commenters[$a] : 0;
+		$valueB = isset($commenters[$b]) ? $commenters[$b] : 0;
+
+		return $valueB - $valueA;
+	}
+}
@@ -1,22 +1,24 @@
 <?php
-
 /**
+ *
+ *
 * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 *
 * @license GNU AGPL version 3 or any later version
 *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, 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 library is distributed in the hope that it will be useful,
+ * 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.
+ * GNU Affero General Public License for more details.
 *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/>.
 *
 */

@@ -96,7 +98,7 @@ class Notifications extends Controller {
 			if($comment->getObjectType() !== 'files') {
 				return new NotFoundResponse();
 			}
-			$files = $this->folder->getById($comment->getObjectId());
+			$files = $this->folder->getById((int)$comment->getObjectId());
 			if(count($files) === 0) {
 				$this->markProcessed($comment);
 				return new NotFoundResponse();
@@ -1,5 +1,4 @@
 <?php
-
 /**
 * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
 *
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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;
+
+
+use OCP\IServerContainer;
+
+class JSSettingsHelper {
+	/** @var IServerContainer */
+	private $c;
+
+	public function __construct(IServerContainer $c) {
+		$this->c = $c;
+	}
+
+	public function extend(array $settings) {
+		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
+
+		$value = (int)$this->c->getConfig()->getAppValue('comments', 'maxAutoCompleteResults', 10);
+		$appConfig['comments']['maxAutoCompleteResults'] = $value;
+
+		$settings['array']['oc_appconfig'] = json_encode($appConfig);
+	}
+}
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -1,8 +1,11 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -94,19 +97,19 @@ class Notifier implements INotifier {
 					throw new \InvalidArgumentException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$nodes = $userFolder->getById($parameters[1]);
+				$nodes = $userFolder->getById((int)$parameters[1]);
 				if(empty($nodes)) {
-					throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
+					throw new \InvalidArgumentException('Cannot resolve file ID to node instance');
 				}
 				$node = $nodes[0];

 				if ($isDeletedActor) {
 					$notification->setParsedSubject($l->t(
-							'A (now) deleted user mentioned you in a comment on “%s”',
+							'You were mentioned on “%s”, in a comment by a user that has since been deleted',
 							[$node->getName()]
 						))
 						->setRichSubject(
-							$l->t('A (now) deleted user mentioned you in a comment on “{file}”'),
+							$l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted'),
 							[
 								'file' => [
 									'type' => 'file',
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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\Collaboration;
+
+
+use OCA\Comments\Collaboration\CommentersSorter;
+use OCP\Comments\IComment;
+use OCP\Comments\ICommentsManager;
+use OCP\IConfig;
+use Test\TestCase;
+
+class CommentersSorterTest extends TestCase {
+	/** @var  ICommentsManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $commentsManager;
+	/** @var  CommentersSorter */
+	protected $sorter;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->commentsManager = $this->createMock(ICommentsManager::class);
+
+		$this->sorter = new CommentersSorter($this->commentsManager);
+	}
+
+	/**
+	 * @dataProvider sortDataProvider
+	 * @param $data
+	 */
+	public function testSort($data) {
+		$commentMocks = [];
+		foreach($data['actors'] as $actorType => $actors) {
+			foreach ($actors as $actorId => $noOfComments) {
+				for($i=0;$i<$noOfComments;$i++) {
+					$mock = $this->createMock(IComment::class);
+					$mock->expects($this->atLeastOnce())
+						->method('getActorType')
+						->willReturn($actorType);
+					$mock->expects($this->atLeastOnce())
+						->method('getActorId')
+						->willReturn($actorId);
+					$commentMocks[] = $mock;
+				}
+			}
+		}
+
+		$this->commentsManager->expects($this->once())
+			->method('getForObject')
+			->willReturn($commentMocks);
+
+		$workArray = $data['input'];
+		$this->sorter->sort($workArray, ['itemType' => 'files', 'itemId' => '24']);
+
+		$this->assertEquals($data['expected'], $workArray);
+	}
+
+	public function sortDataProvider() {
+		return [[
+			[
+				#1 – sort properly and otherwise keep existing order
+				'actors' => ['users' => ['celia' => 3, 'darius' => 7, 'faruk' => 5, 'gail' => 5], 'bots' => ['r2-d2' => 8]],
+				'input' => [
+					'users' =>
+						[
+							['value' => ['shareWith' => 'alice']],
+							['value' => ['shareWith' => 'bob']],
+							['value' => ['shareWith' => 'celia']],
+							['value' => ['shareWith' => 'darius']],
+							['value' => ['shareWith' => 'elena']],
+							['value' => ['shareWith' => 'faruk']],
+							['value' => ['shareWith' => 'gail']],
+						],
+					'bots' => [
+						['value' => ['shareWith' => 'c-3po']],
+						['value' => ['shareWith' => 'r2-d2']],
+					]
+				],
+				'expected' => [
+					'users' =>
+						[
+							['value' => ['shareWith' => 'darius']],
+							['value' => ['shareWith' => 'faruk']],
+							['value' => ['shareWith' => 'gail']],
+							['value' => ['shareWith' => 'celia']],
+							['value' => ['shareWith' => 'alice']],
+							['value' => ['shareWith' => 'bob']],
+							['value' => ['shareWith' => 'elena']],
+						],
+					'bots' => [
+						['value' => ['shareWith' => 'r2-d2']],
+						['value' => ['shareWith' => 'c-3po']],
+					]
+				],
+			],
+			[
+				#2 – no commentors, input equals output
+				'actors' => [],
+				'input' => [
+					'users' =>
+						[
+							['value' => ['shareWith' => 'alice']],
+							['value' => ['shareWith' => 'bob']],
+							['value' => ['shareWith' => 'celia']],
+							['value' => ['shareWith' => 'darius']],
+							['value' => ['shareWith' => 'elena']],
+							['value' => ['shareWith' => 'faruk']],
+							['value' => ['shareWith' => 'gail']],
+						],
+					'bots' => [
+						['value' => ['shareWith' => 'c-3po']],
+						['value' => ['shareWith' => 'r2-d2']],
+					]
+				],
+				'expected' => [
+					'users' =>
+						[
+							['value' => ['shareWith' => 'alice']],
+							['value' => ['shareWith' => 'bob']],
+							['value' => ['shareWith' => 'celia']],
+							['value' => ['shareWith' => 'darius']],
+							['value' => ['shareWith' => 'elena']],
+							['value' => ['shareWith' => 'faruk']],
+							['value' => ['shareWith' => 'gail']],
+						],
+					'bots' => [
+						['value' => ['shareWith' => 'c-3po']],
+						['value' => ['shareWith' => 'r2-d2']],
+					]
+				],
+			],
+			[
+				#3 – no nothing
+				'actors' => [],
+				'input' => [],
+				'expected' => [],
+			],
+		]];
+	}
+}
@@ -1,8 +1,10 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -22,7 +24,17 @@
 namespace OCA\Comments\Tests\Unit\Controller;

 use OCA\Comments\Controller\Notifications;
+use OCP\Comments\IComment;
+use OCP\Comments\ICommentsManager;
 use OCP\Comments\NotFoundException;
+use OCP\Files\Folder;
+use OCP\Files\Node;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Notification\IManager;
+use OCP\Notification\INotification;
 use Test\TestCase;

 class NotificationsTest extends TestCase {
@@ -44,24 +56,24 @@ class NotificationsTest extends TestCase {
 	protected function setUp() {
 		parent::setUp();

-		$this->commentsManager = $this->getMockBuilder('\OCP\Comments\ICommentsManager')->getMock();
-		$this->folder = $this->getMockBuilder('\OCP\Files\Folder')->getMock();
-		$this->session = $this->getMockBuilder('\OCP\IUserSession')->getMock();
-		$this->notificationManager = $this->getMockBuilder('\OCP\Notification\IManager')->getMock();
+		$this->commentsManager = $this->getMockBuilder(ICommentsManager::class)->getMock();
+		$this->folder = $this->getMockBuilder(Folder::class)->getMock();
+		$this->session = $this->getMockBuilder(IUserSession::class)->getMock();
+		$this->notificationManager = $this->getMockBuilder(IManager::class)->getMock();

 		$this->notificationsController = new Notifications(
 			'comments',
-			$this->getMockBuilder('\OCP\IRequest')->getMock(),
+			$this->getMockBuilder(IRequest::class)->getMock(),
 			$this->commentsManager,
 			$this->folder,
-			$this->getMockBuilder('\OCP\IURLGenerator')->getMock(),
+			$this->getMockBuilder(IURLGenerator::class)->getMock(),
 			$this->notificationManager,
 			$this->session
 		);
 	}
 	
 	public function testViewSuccess() {
-		$comment = $this->getMockBuilder('\OCP\Comments\IComment')->getMock();
+		$comment = $this->getMockBuilder(IComment::class)->getMock();
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->will($this->returnValue('files'));
@@ -71,7 +83,7 @@ class NotificationsTest extends TestCase {
 			->with('42')
 			->will($this->returnValue($comment));

-		$file = $this->getMockBuilder('\OCP\Files\Node')->getMock();
+		$file = $this->getMockBuilder(Node::class)->getMock();

 		$this->folder->expects($this->once())
 			->method('getById')
@@ -79,9 +91,9 @@ class NotificationsTest extends TestCase {

 		$this->session->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->getMockBuilder('\OCP\IUser')->getMock()));
+			->will($this->returnValue($this->getMockBuilder(IUser::class)->getMock()));

-		$notification = $this->getMockBuilder('\OCP\Notification\INotification')->getMock();
+		$notification = $this->getMockBuilder(INotification::class)->getMock();
 		$notification->expects($this->any())
 			->method($this->anything())
 			->will($this->returnValue($notification));
@@ -119,7 +131,7 @@ class NotificationsTest extends TestCase {
 	}

 	public function testViewNoFile() {
-		$comment = $this->getMockBuilder('\OCP\Comments\IComment')->getMock();
+		$comment = $this->getMockBuilder(IComment::class)->getMock();
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->will($this->returnValue('files'));
@@ -135,9 +147,9 @@ class NotificationsTest extends TestCase {

 		$this->session->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->getMockBuilder('\OCP\IUser')->getMock()));
+			->will($this->returnValue($this->getMockBuilder(IUser::class)->getMock()));

-		$notification = $this->getMockBuilder('\OCP\Notification\INotification')->getMock();
+		$notification = $this->getMockBuilder(INotification::class)->getMock();
 		$notification->expects($this->any())
 			->method($this->anything())
 			->will($this->returnValue($notification));
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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 OCP\IServerContainer;
+use Test\TestCase;
+
+class JSSettingsHelperTest extends TestCase {
+	/** @var  IServerContainer|\PHPUnit_Framework_MockObject_MockObject */
+	protected $c;
+	/** @var  JSSettingsHelper */
+	protected $helper;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->c = $this->createMock(IServerContainer::class);
+
+		$this->helper = new JSSettingsHelper($this->c);
+	}
+
+	public function testExtend() {
+		$config = $this->createMock(IConfig::class);
+		$config->expects($this->once())
+			->method('getAppValue')
+			->with('comments', 'maxAutoCompleteResults')
+			->willReturn(13);
+
+		$this->c->expects($this->once())
+			->method('getConfig')
+			->willReturn($config);
+
+		$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']);
+	}
+}
@@ -1,8 +1,11 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -71,7 +74,7 @@ class ListenerTest extends TestCase {
 	 */
 	public function testEvaluate($eventType, $notificationMethod) {
 		/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */
-		$comment = $this->getMockBuilder('\OCP\Comments\IComment')->getMock();
+		$comment = $this->getMockBuilder(IComment::class)->getMock();
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->will($this->returnValue('files'));
@@ -90,7 +93,7 @@ class ListenerTest extends TestCase {
 			]);

 		/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */
-		$event = $this->getMockBuilder('\OCP\Comments\CommentsEvent')
+		$event = $this->getMockBuilder(CommentsEvent::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$event->expects($this->once())
@@ -101,7 +104,7 @@ class ListenerTest extends TestCase {
 			->will($this->returnValue($eventType));

 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('\OCP\Notification\INotification')->getMock();
+		$notification = $this->getMockBuilder(INotification::class)->getMock();
 		$notification->expects($this->any())
 			->method($this->anything())
 			->will($this->returnValue($notification));
@@ -136,7 +139,7 @@ class ListenerTest extends TestCase {
 	 */
 	public function testEvaluateNoMentions($eventType) {
 		/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */
-		$comment = $this->getMockBuilder('\OCP\Comments\IComment')->getMock();
+		$comment = $this->getMockBuilder(IComment::class)->getMock();
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->will($this->returnValue('files'));
@@ -148,7 +151,7 @@ class ListenerTest extends TestCase {
 			->willReturn([]);

 		/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */
-		$event = $this->getMockBuilder('\OCP\Comments\CommentsEvent')
+		$event = $this->getMockBuilder(CommentsEvent::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$event->expects($this->once())
@@ -173,7 +176,7 @@ class ListenerTest extends TestCase {

 	public function testEvaluateUserDoesNotExist() {
 		/** @var IComment|\PHPUnit_Framework_MockObject_MockObject $comment */
-		$comment = $this->getMockBuilder('\OCP\Comments\IComment')->getMock();
+		$comment = $this->getMockBuilder(IComment::class)->getMock();
 		$comment->expects($this->any())
 			->method('getObjectType')
 			->will($this->returnValue('files'));
@@ -185,7 +188,7 @@ class ListenerTest extends TestCase {
 			->willReturn([[ 'type' => 'user', 'id' => 'foobar']]);

 		/** @var CommentsEvent|\PHPUnit_Framework_MockObject_MockObject $event */
-		$event = $this->getMockBuilder('\OCP\Comments\CommentsEvent')
+		$event = $this->getMockBuilder(CommentsEvent::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$event->expects($this->once())
@@ -196,7 +199,7 @@ class ListenerTest extends TestCase {
 			->will($this->returnValue(CommentsEvent::EVENT_ADD));

 		/** @var INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('\OCP\Notification\INotification')->getMock();
+		$notification = $this->getMockBuilder(INotification::class)->getMock();
 		$notification->expects($this->any())
 			->method($this->anything())
 			->will($this->returnValue($notification));
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
 *
 * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <coding@schilljs.com>
 *
 * @license GNU AGPL version 3 or any later version
 *
@@ -187,7 +188,7 @@ class NotifierTest extends TestCase {

 	public function testPrepareSuccessDeletedUser() {
 		$fileName = 'Gre\'thor.odp';
-		$message = 'A (now) deleted user mentioned you in a comment on “Gre\'thor.odp”';
+		$message = 'You were mentioned on “Gre\'thor.odp”, in a comment by a user that has since been deleted';

 		/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */
 		$node = $this->createMock(Node::class);
@@ -229,7 +230,7 @@ class NotifierTest extends TestCase {
 		$this->notification
 			->expects($this->once())
 			->method('setRichSubject')
-			->with('A (now) deleted user mentioned you in a comment on “{file}”', $this->anything())
+			->with('You were mentioned on “{file}”, in a comment by a user that has since been deleted', $this->anything())
 			->willReturnSelf();
 		$this->notification
 			->expects($this->once())
@@ -157,7 +157,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			expect($comment.find('.avatar[data-user=macbeth] ~ .contactsmenu-popover').length).toEqual(1);

 			expect($comment.find('.avatar[data-user=banquo]').length).toEqual(1);
-			expect($comment.find('.avatar-name-wrapper:last-child strong').text()).toEqual('Lord Banquo');
+			expect($comment.find('.avatar[data-user=banquo] ~ strong').text()).toEqual('Lord Banquo');
 			expect($comment.find('.avatar[data-user=banquo] ~ .contactsmenu-popover').length).toEqual(1);
 		});

@@ -219,6 +219,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 	describe('posting comments', function() {
 		var createStub;
 		var currentUserStub;
+		var $newCommentForm;

 		beforeEach(function() {
 			view.collection.set(testComments);
@@ -229,6 +230,8 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 				displayName: 'Test User'
 			});

+			$newCommentForm = view.$el.find('.newCommentForm');
+
 			// Required for the absolute selector used to find the new comment
 			// after a successful creation in _onSubmitSuccess.
 			$('#testArea').append(view.$el);
@@ -239,8 +242,8 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 		});

 		it('creates a new comment when clicking post button', function() {
-			view.$el.find('.message').val('New message');
-			view.$el.find('form').submit();
+			$newCommentForm.find('.message').text('New message');
+			$newCommentForm.submit();

 			expect(createStub.calledOnce).toEqual(true);
 			expect(createStub.lastCall.args[0]).toEqual({
@@ -252,9 +255,82 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 				creationDateTime: new Date(Date.UTC(2016, 1, 3, 10, 5, 9)).toUTCString()
 			});
 		});
+		it('creates a new comment when typing enter', function() {
+			$newCommentForm.find('.message').text('New message');
+			var keydownEvent = new $.Event('keydown', {keyCode: 13});
+			$newCommentForm.find('.message').trigger(keydownEvent);
+
+			expect(createStub.calledOnce).toEqual(true);
+			expect(createStub.lastCall.args[0]).toEqual({
+				actorId: 'testuser',
+				actorDisplayName: 'Test User',
+				actorType: 'users',
+				verb: 'comment',
+				message: 'New message',
+				creationDateTime: new Date(Date.UTC(2016, 1, 3, 10, 5, 9)).toUTCString()
+			});
+			expect(keydownEvent.isDefaultPrevented()).toEqual(true);
+		});
+		it('creates a new mention when typing enter in the autocomplete popover', function() {
+			var autoCompleteStub = sinon.stub(view, '_onAutoComplete');
+			autoCompleteStub.callsArgWith(1, [{"id":"userId", "label":"User Name", "source":"users"}]);
+
+			// Force the autocomplete to be initialized
+			view._initAutoComplete($newCommentForm.find('.message'));
+
+			// PhantomJS does not seem to handle typing in a contenteditable, so
+			// some tricks are needed to show the autocomplete popover.
+			//
+			// Instead of sending key events to type "@u" the characters are
+			// programatically set in the input field.
+			$newCommentForm.find('.message').text('Mention to @u');
+
+			// When focusing on the input field the caret is not guaranteed to
+			// be at the end; instead of calling "focus()" on the input field
+			// the caret is explicitly set at the end of the input field, that
+			// is, after "@u".
+			var range = document.createRange();
+			range.selectNodeContents($newCommentForm.find('.message')[0]);
+			range.collapse(false);
+			var selection = window.getSelection();
+			selection.removeAllRanges();
+			selection.addRange(range);
+
+			// As PhantomJS does not handle typing in a contenteditable the key
+			// typed here is in practice ignored by At.js, but despite that it
+			// will cause the popover to be shown.
+			$newCommentForm.find('.message').trigger(new $.Event('keydown', {keyCode: 's'}));
+			$newCommentForm.find('.message').trigger(new $.Event('keyup', {keyCode: 's'}));
+
+			expect(autoCompleteStub.calledOnce).toEqual(true);
+
+			var keydownEvent = new $.Event('keydown', {keyCode: 13});
+			$newCommentForm.find('.message').trigger(keydownEvent);
+
+			expect(createStub.calledOnce).toEqual(false);
+			expect($newCommentForm.find('.message').html()).toContain('Mention to <span');
+			expect($newCommentForm.find('.message').html()).toContain('<div class="avatar"');
+			expect($newCommentForm.find('.message').html()).toContain('<strong>User Name</strong>');
+			expect($newCommentForm.find('.message').text()).not.toContain('@');
+			// In this case the default behaviour is prevented by the
+			// "onKeydown" event handler of At.js.
+			expect(keydownEvent.isDefaultPrevented()).toEqual(true);
+		});
+		it('creates a new line when typing shift+enter', function() {
+			$newCommentForm.find('.message').text('New message');
+			var keydownEvent = new $.Event('keydown', {keyCode: 13, shiftKey: true});
+			$newCommentForm.find('.message').trigger(keydownEvent);
+
+			expect(createStub.calledOnce).toEqual(false);
+			// PhantomJS does not seem to handle typing in a contenteditable, so
+			// instead of looking for a new line the best that can be done is
+			// checking that the default behaviour would have been executed.
+			expect($newCommentForm.find('.message').text()).toContain('New message');
+			expect(keydownEvent.isDefaultPrevented()).toEqual(false);
+		});
 		it('creates a new comment with mentions when clicking post button', function() {
-			view.$el.find('.message').val('New message @anotheruser');
-			view.$el.find('form').submit();
+			$newCommentForm.find('.message').text('New message @anotheruser');
+			$newCommentForm.submit();

 			var createStubExpectedData = {
 				actorId: 'testuser',
@@ -297,8 +373,8 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			expect($message.find('.avatar[data-user=anotheruser] ~ .contactsmenu-popover').length).toEqual(1);
 		});
 		it('does not create a comment if the field is empty', function() {
-			view.$el.find('.message').val('   ');
-			view.$el.find('form').submit();
+			$newCommentForm.find('.message').val('   ');
+			$newCommentForm.submit();

 			expect(createStub.notCalled).toEqual(true);
 		});
@@ -307,8 +383,8 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			for (var i = 0; i < view._commentMaxLength * 2; i++) {
 				bigMessage += 'a';
 			}
-			view.$el.find('.message').val(bigMessage);
-			view.$el.find('form').submit();
+			$newCommentForm.find('.message').val(bigMessage);
+			$newCommentForm.submit();

 			expect(createStub.notCalled).toEqual(true);
 		});
@@ -319,8 +395,8 @@ describe('OCA.Comments.CommentsTabView tests', function() {

 			beforeEach(function() {
 				tooltipStub = sinon.stub($.fn, 'tooltip');
-				$message = view.$el.find('.message');
-				$submitButton = view.$el.find('.submit');
+				$message = $newCommentForm.find('.message');
+				$submitButton = $newCommentForm.find('.submit');
 			});
 			afterEach(function() { 
 				tooltipStub.restore(); 
@@ -335,7 +411,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 				expect($message.hasClass('error')).toEqual(false);
 			});
 			it('displays tooltip when limit is almost reached', function() {
-				$message.val(createMessageWithLength(view._commentMaxLength - 2));
+				$message.text(createMessageWithLength(view._commentMaxLength - 2));
 				$message.trigger('change');

 				expect(tooltipStub.calledWith('show')).toEqual(true);
@@ -343,7 +419,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 				expect($message.hasClass('error')).toEqual(false);
 			});
 			it('displays tooltip and disabled button when limit is exceeded', function() {
-				$message.val(createMessageWithLength(view._commentMaxLength + 2));
+				$message.text(createMessageWithLength(view._commentMaxLength + 2));
 				$message.trigger('change');

 				expect(tooltipStub.calledWith('show')).toEqual(true);
@@ -439,7 +515,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			var $formRow = view.$el.find('.newCommentRow.comment[data-id=1]');
 			expect($formRow.length).toEqual(1);

-			$formRow.find('textarea').val('modified message');
+			$formRow.find('div.message').text('modified message');
 			$formRow.find('form').submit();

 			expect(saveStub.calledOnce).toEqual(true);
@@ -451,8 +527,9 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			// simulate the fact that save sets the attribute
 			model.set('message', 'modified\nmessage');
 			saveStub.yieldTo('success', model);
+			view.collection.get(model);

-			expect(fetchStub.calledOnce).toEqual(true);
+			expect(fetchStub.called).toEqual(true);
 			fetchStub.yieldTo('success', model);

 			// original comment element is visible again
@@ -472,7 +549,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			var $formRow = view.$el.find('.newCommentRow.comment[data-id=3]');
 			expect($formRow.length).toEqual(1);

-			$formRow.find('textarea').val('modified\nmessage @anotheruser');
+			$formRow.find('div.message').text('modified\nmessage @anotheruser');
 			$formRow.find('form').submit();

 			expect(saveStub.calledOnce).toEqual(true);
@@ -485,7 +562,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			model.set('message', 'modified\nmessage @anotheruser');
 			saveStub.yieldTo('success', model);

-			expect(fetchStub.calledOnce).toEqual(true);
+			expect(fetchStub.called).toEqual(true);

 			// simulate the fact that fetch sets the attribute
 			model.set('mentions', {
@@ -4,6 +4,7 @@
 *
 * @author Björn Schießle <bjoern@schiessle.org>
 * @author Joas Schilling <coding@schilljs.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 *
 * @license AGPL-3.0
@@ -52,5 +53,15 @@ $cm->register(function() use ($cm, $app) {
 	$user = \OC::$server->getUserSession()->getUser();
 	if (!is_null($user)) {
 		$app->setupContactsProvider($cm, $user->getUID());
+	} else {
+		$app->setupSystemContactsProvider($cm);
+	}
+});
+
+$calendarManager = \OC::$server->getCalendarManager();
+$calendarManager->register(function() use ($calendarManager, $app) {
+	$user = \OC::$server->getUserSession()->getUser();
+	if ($user !== null) {
+		$app->setupCalendarProvider($calendarManager, $user->getUID());
 	}
 });
@@ -1,801 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
-	<!--
-CREATE TABLE addressbooks (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principaluri VARBINARY(255),
-    displayname VARCHAR(255),
-    uri VARBINARY(200),
-    description TEXT,
-    synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1',
-    UNIQUE(principaluri(100), uri(100))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-	<table>
-
-		<name>*dbprefix*addressbooks</name>
-
-		<declaration>
-
-		<field>
-			<name>id</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<autoincrement>1</autoincrement>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-
-			<field>
-				<name>principaluri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>displayname</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>uri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>description</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>synctoken</name>
-				<type>integer</type>
-				<default>1</default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-			</field>
-			<index>
-				<name>addressbook_index</name>
-				<unique>true</unique>
-				<field>
-					<name>principaluri</name>
-				</field>
-				<field>
-					<name>uri</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-
-	<!--
-
-CREATE TABLE cards (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    addressbookid INT(11) UNSIGNED NOT NULL,
-    carddata MEDIUMBLOB,
-    uri VARBINARY(200),
-    lastmodified INT(11) UNSIGNED,
-    etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-	-->
-	<table>
-		<name>*dbprefix*cards</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>addressbookid</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-			</field>
-			<field>
-				<name>carddata</name>
-				<type>blob</type>
-			</field>
-			<field>
-				<name>uri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>lastmodified</name>
-				<type>integer</type>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>etag</name>
-				<type>text</type>
-				<length>32</length>
-			</field>
-			<field>
-				<name>size</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-		</declaration>
-	</table>
-
-	<!--
-CREATE TABLE addressbookchanges (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    uri VARBINARY(200) NOT NULL,
-    synctoken INT(11) UNSIGNED NOT NULL,
-    addressbookid INT(11) UNSIGNED NOT NULL,
-    operation TINYINT(1) NOT NULL,
-    INDEX addressbookid_synctoken (addressbookid, synctoken)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-
-	<table>
-		<name>*dbprefix*addressbookchanges</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>uri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>synctoken</name>
-				<type>integer</type>
-				<default>1</default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-			</field>
-			<field>
-				<name>addressbookid</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-			</field>
-			<field>
-				<name>operation</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>1</length>
-			</field>
-
-			<index>
-				<name>addressbookid_synctoken</name>
-				<field>
-					<name>addressbookid</name>
-				</field>
-				<field>
-					<name>synctoken</name>
-				</field>
-			</index>
-
-		</declaration>
-	</table>
-
-
-<!--
-CREATE TABLE calendarobjects (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    calendardata MEDIUMBLOB,
-    uri VARBINARY(200),
-    calendarid INTEGER UNSIGNED NOT NULL,
-    lastmodified INT(11) UNSIGNED,
-    etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL,
-    componenttype VARBINARY(8),
-    firstoccurence INT(11) UNSIGNED,
-    lastoccurence INT(11) UNSIGNED,
-    uid VARBINARY(200),
-    UNIQUE(calendarid, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-->
-<table>
-	<name>*dbprefix*calendarobjects</name>
-	<declaration>
-		<field>
-			<name>id</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<autoincrement>1</autoincrement>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>calendardata</name>
-			<type>blob</type>
-		</field>
-		<field>
-			<name>uri</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>calendarid</name>
-			<type>integer</type>
-			<unsigned>true</unsigned>
-			<notnull>true</notnull>
-		</field>
-		<field>
-			<name>lastmodified</name>
-			<type>integer</type>
-			<unsigned>true</unsigned>
-		</field>
-		<field>
-			<name>etag</name>
-			<type>text</type>
-			<length>32</length>
-		</field>
-		<field>
-			<name>size</name>
-			<type>integer</type>
-			<notnull>true</notnull>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>componenttype</name>
-			<type>text</type>
-			<length>8</length>
-		</field>
-		<field>
-			<name>firstoccurence</name>
-			<type>integer</type>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>lastoccurence</name>
-			<type>integer</type>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>uid</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<comments>0 - public, 1 - private, 2 - confidential</comments>
-			<name>classification</name>
-			<type>integer</type>
-			<default>0</default>
-		</field>
-		<index>
-			<name>calobjects_index</name>
-			<unique>true</unique>
-			<field>
-				<name>calendarid</name>
-			</field>
-			<field>
-				<name>uri</name>
-			</field>
-		</index>
-	</declaration>
-</table>
-	<!--
-	CREATE TABLE calendars (
-		id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-		principaluri VARBINARY(100),
-		displayname VARCHAR(100),
-		uri VARBINARY(200),
-		synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
-		description TEXT,
-		calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
-		calendarcolor VARBINARY(10),
-		timezone CLOB,
-		components VARBINARY(20),
-		transparent TINYINT(1) NOT NULL DEFAULT '0',
-		UNIQUE(principaluri, uri)
-	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-<table>
-	<name>*dbprefix*calendars</name>
-	<declaration>
-		<field>
-			<name>id</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<autoincrement>1</autoincrement>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>principaluri</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>displayname</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>uri</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>synctoken</name>
-			<type>integer</type>
-			<default>1</default>
-			<notnull>true</notnull>
-			<unsigned>true</unsigned>
-		</field>
-		<field>
-			<name>description</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>calendarorder</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<unsigned>true</unsigned>
-		</field>
-		<field>
-			<name>calendarcolor</name>
-			<type>text</type>
-		</field>
-		<field>
-			<name>timezone</name>
-			<type>clob</type>
-		</field>
-		<field>
-			<name>components</name>
-			<type>text</type>
-			<length>64</length>
-		</field>
-		<field>
-			<name>transparent</name>
-			<type>integer</type>
-			<length>1</length>
-			<notnull>true</notnull>
-			<default>0</default>
-		</field>
-		<index>
-			<name>calendars_index</name>
-			<unique>true</unique>
-			<field>
-				<name>principaluri</name>
-			</field>
-			<field>
-				<name>uri</name>
-			</field>
-		</index>
-	</declaration>
-</table>
-	<!--
-	CREATE TABLE calendarchanges (
-		id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-		uri VARBINARY(200) NOT NULL,
-		synctoken INT(11) UNSIGNED NOT NULL,
-		calendarid INT(11) UNSIGNED NOT NULL,
-		operation TINYINT(1) NOT NULL,
-		INDEX calendarid_synctoken (calendarid, synctoken)
-	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-	<table>
-		<name>*dbprefix*calendarchanges</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>uri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>synctoken</name>
-				<type>integer</type>
-				<default>1</default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-			</field>
-			<field>
-				<name>calendarid</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-			</field>
-			<field>
-				<name>operation</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>1</length>
-			</field>
-
-			<index>
-				<name>calendarid_synctoken</name>
-				<field>
-					<name>calendarid</name>
-				</field>
-				<field>
-					<name>synctoken</name>
-				</field>
-			</index>
-
-		</declaration>
-	</table>
-
-	<!--
-	CREATE TABLE calendarsubscriptions (
-		id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-		uri VARBINARY(200) NOT NULL,
-		principaluri VARBINARY(100) NOT NULL,
-		source TEXT,
-		displayname VARCHAR(100),
-		refreshrate VARCHAR(10),
-		calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
-		calendarcolor VARBINARY(10),
-		striptodos TINYINT(1) NULL,
-		stripalarms TINYINT(1) NULL,
-		stripattachments TINYINT(1) NULL,
-		lastmodified INT(11) UNSIGNED,
-		UNIQUE(principaluri, uri)
-	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-<table>
-	<name>*dbprefix*calendarsubscriptions</name>
-	<declaration>
-		<field>
-			<name>id</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<autoincrement>1</autoincrement>
-			<unsigned>true</unsigned>
-			<length>11</length>
-		</field>
-		<field>
-			<name>uri</name>
-			<type>text</type>
-		</field>
-		<field>
-			<name>principaluri</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>source</name>
-			<type>text</type>
-			<length>255</length>
-		</field>
-		<field>
-			<name>displayname</name>
-			<type>text</type>
-			<length>100</length>
-		</field>
-		<field>
-			<name>refreshrate</name>
-			<type>text</type>
-			<length>10</length>
-		</field>
-		<field>
-			<name>calendarorder</name>
-			<type>integer</type>
-			<default>0</default>
-			<notnull>true</notnull>
-			<unsigned>true</unsigned>
-		</field>
-		<field>
-			<name>calendarcolor</name>
-			<type>text</type>
-		</field>
-		<field>
-			<name>striptodos</name>
-			<type>integer</type>
-			<length>1</length>
-		</field>
-		<field>
-			<name>stripalarms</name>
-			<type>integer</type>
-			<length>1</length>
-		</field>
-		<field>
-			<name>stripattachments</name>
-			<type>integer</type>
-			<length>1</length>
-		</field>
-		<field>
-			<name>lastmodified</name>
-			<type>integer</type>
-			<unsigned>true</unsigned>
-		</field>
-		<index>
-			<name>calsub_index</name>
-			<unique>true</unique>
-			<field>
-				<name>principaluri</name>
-			</field>
-			<field>
-				<name>uri</name>
-			</field>
-		</index>
-	</declaration>
-</table>
-	<!--
-	CREATE TABLE schedulingobjects (
-		id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-		principaluri VARBINARY(255),
-		calendardata MEDIUMBLOB,
-		uri VARBINARY(200),
-		lastmodified INT(11) UNSIGNED,
-		etag VARBINARY(32),
-		size INT(11) UNSIGNED NOT NULL
-	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-	-->
-
-	<table>
-		<name>*dbprefix*schedulingobjects</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>principaluri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>calendardata</name>
-				<type>blob</type>
-			</field>
-			<field>
-				<name>uri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>lastmodified</name>
-				<type>integer</type>
-				<unsigned>true</unsigned>
-			</field>
-			<field>
-				<name>etag</name>
-				<type>text</type>
-				<length>32</length>
-			</field>
-			<field>
-				<name>size</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-
-		</declaration>
-	</table>
-
-	<table>
-		<name>*dbprefix*cards_properties</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>addressbookid</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>11</length>
-			</field>
-			<field>
-				<name>cardid</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>name</name>
-				<type>text</type>
-				<default></default>
-				<notnull>false</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>value</name>
-				<type>text</type>
-				<default></default>
-				<notnull>false</notnull>
-				<length>255</length>
-			</field>
-			<field>
-				<name>preferred</name>
-				<type>integer</type>
-				<default>1</default>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<index>
-				<name>card_contactid_index</name>
-				<field>
-					<name>cardid</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>card_name_index</name>
-				<field>
-					<name>name</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>card_value_index</name>
-				<field>
-					<name>value</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-
-	<table>
-		<name>*dbprefix*calendarobjects_props</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>calendarid</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>11</length>
-			</field>
-			<field>
-				<name>objectid</name>
-				<type>integer</type>
-				<default></default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>name</name>
-				<type>text</type>
-				<default></default>
-				<notnull>false</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>parameter</name>
-				<type>text</type>
-				<default></default>
-				<notnull>false</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>value</name>
-				<type>text</type>
-				<default></default>
-				<notnull>false</notnull>
-				<length>255</length>
-			</field>
-			<index>
-				<name>calendarobject_index</name>
-				<field>
-					<name>objectid</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>calendarobject_name_index</name>
-				<field>
-					<name>name</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-			<index>
-				<name>calendarobject_value_index</name>
-				<field>
-					<name>value</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-
-	<table>
-		<name>*dbprefix*dav_shares</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>11</length>
-			</field>
-			<field>
-				<name>principaluri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>type</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<field>
-				<name>access</name>
-				<type>integer</type>
-				<length>1</length>
-			</field>
-			<field>
-				<name>resourceid</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-			</field>
-			<field>
-				<name>publicuri</name>
-				<type>text</type>
-				<length>255</length>
-			</field>
-			<index>
-				<name>dav_shares_index</name>
-				<unique>true</unique>
-				<field>
-					<name>principaluri</name>
-				</field>
-				<field>
-					<name>resourceid</name>
-				</field>
-				<field>
-					<name>type</name>
-				</field>
-				<field>
-					<name>publicuri</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
@@ -4,8 +4,8 @@
 	<name>WebDAV</name>
 	<description>WebDAV endpoint</description>
 	<licence>AGPL</licence>
+	<version>1.4.7</version>
 	<author>owncloud.org</author>
-	<version>1.3.1</version>
 	<default_enable/>
 	<types>
 		<filesystem/>
@@ -15,7 +15,7 @@
 		<webdav>appinfo/v1/publicwebdav.php</webdav>
 	</public>
 	<dependencies>
-		<nextcloud min-version="12" max-version="12" />
+		<nextcloud min-version="13" max-version="13" />
 	</dependencies>
 	<repair-steps>
 		<post-migration>
@@ -29,6 +29,7 @@
 		<command>OCA\DAV\Command\CreateCalendar</command>
 		<command>OCA\DAV\Command\SyncBirthdayCalendar</command>
 		<command>OCA\DAV\Command\SyncSystemAddressBook</command>
+		<command>OCA\DAV\Command\RemoveInvalidShares</command>
 	</commands>

 	<activity>
@@ -49,4 +50,8 @@
 			<provider>OCA\DAV\CalDAV\Activity\Provider\Todo</provider>
 		</providers>
 	</activity>
+
+	<settings>
+		<admin>OCA\DAV\Settings\CalDAVSettings</admin>
+	</settings>
 </info>
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @copyright 2017, Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * @author Georg Ehrke <oc.list@georgehrke.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/>.
+ *
+ */
+
+return [
+	'routes' => [
+		['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
+		['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
+	]
+];
@@ -3,6 +3,7 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Christoph Wurst <christoph@owncloud.com>
+ * @author Georg Ehrke <oc.list@georgehrke.com>
 * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
@@ -43,15 +44,20 @@ $authBackend = new Auth(
 $principalBackend = new Principal(
 	\OC::$server->getUserManager(),
 	\OC::$server->getGroupManager(),
+	\OC::$server->getShareManager(),
+	\OC::$server->getUserSession(),
+	\OC::$server->getConfig(),
 	'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $userManager = \OC::$server->getUserManager();
 $random = \OC::$server->getSecureRandom();
+$logger = \OC::$server->getLogger();
 $dispatcher = \OC::$server->getEventDispatcher();
-$calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, $random, $dispatcher, true);
+$calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, \OC::$server->getGroupManager(), $random, $logger, $dispatcher, true);

 $debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
+$sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';

 // Root nodes
 $principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
@@ -84,7 +90,10 @@ if ($debugging) {
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
 $server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger(), new \OC\AppFramework\Utility\TimeFactory()));
+
+if ($sendInvitations) {
+	$server->addPlugin(\OC::$server->query(\OCA\DAV\CalDAV\Schedule\IMipPlugin::class));
+}
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));

 // And off we go!
@@ -3,9 +3,9 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Christoph Wurst <christoph@owncloud.com>
- * @author Georg Ehrke <georg@owncloud.com>
 * @author Joas Schilling <coding@schilljs.com>
 * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 *
 * @license AGPL-3.0
@@ -45,10 +45,13 @@ $authBackend = new Auth(
 $principalBackend = new Principal(
 	\OC::$server->getUserManager(),
 	\OC::$server->getGroupManager(),
+	\OC::$server->getShareManager(),
+	\OC::$server->getUserSession(),
+	\OC::$server->getConfig(),
 	'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
-$cardDavBackend = new CardDavBackend($db, $principalBackend, \OC::$server->getUserManager(), \OC::$server->getEventDispatcher());
+$cardDavBackend = new CardDavBackend($db, $principalBackend, \OC::$server->getUserManager(), \OC::$server->getGroupManager(), \OC::$server->getEventDispatcher());

 $debugging = \OC::$server->getConfig()->getSystemValue('debug', false);

@@ -2,10 +2,14 @@
 /**
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
 * @author Christoph Wurst <christoph@owncloud.com>
+ * @author Ko- <k.stoffelen@cs.ru.nl>
 * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Robin Appelman <robin@icewind.nl>
 * @author Roeland Jago Douma <roeland@famdouma.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
 *
 * @license AGPL-3.0
 *
@@ -2,7 +2,9 @@
 /**
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
+ * @author Ko- <k.stoffelen@cs.ru.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
 *
 * @license AGPL-3.0
 *
@@ -73,5 +73,7 @@ while(!feof($stream)) {
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination"
+	'Destination' => "$baseUri/files/$userName/$destination",
+	'OC-Total-Length' => filesize($file),
+	'X-OC-MTime' => filemtime($file)
 ]);
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitDAV::getLoader();
@@ -0,0 +1,13 @@
+{
+    "config" : {
+        "vendor-dir": ".",
+        "optimize-autoloader": true,
+        "classmap-authoritative": true,
+        "autoloader-suffix": "DAV"
+    },
+    "autoload" : {
+        "psr-4": {
+            "OCA\\DAV\\": "../lib/"
+        }
+    }
+}
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
@@ -0,0 +1,156 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\DAV\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    'OCA\\DAV\\AppInfo\\PluginManager' => $baseDir . '/../lib/AppInfo/PluginManager.php',
+    'OCA\\DAV\\Avatars\\AvatarHome' => $baseDir . '/../lib/Avatars/AvatarHome.php',
+    'OCA\\DAV\\Avatars\\AvatarNode' => $baseDir . '/../lib/Avatars/AvatarNode.php',
+    'OCA\\DAV\\Avatars\\RootCollection' => $baseDir . '/../lib/Avatars/RootCollection.php',
+    'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => $baseDir . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Backend' => $baseDir . '/../lib/CalDAV/Activity/Backend.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Filter/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Filter/Todo.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => $baseDir . '/../lib/CalDAV/Activity/Provider/Base.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Provider/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => $baseDir . '/../lib/CalDAV/Activity/Provider/Event.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Provider/Todo.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Setting/Calendar.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => $baseDir . '/../lib/CalDAV/Activity/Setting/Event.php',
+    'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Setting/Todo.php',
+    'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => $baseDir . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
+    'OCA\\DAV\\CalDAV\\BirthdayService' => $baseDir . '/../lib/CalDAV/BirthdayService.php',
+    'OCA\\DAV\\CalDAV\\CalDavBackend' => $baseDir . '/../lib/CalDAV/CalDavBackend.php',
+    'OCA\\DAV\\CalDAV\\Calendar' => $baseDir . '/../lib/CalDAV/Calendar.php',
+    'OCA\\DAV\\CalDAV\\CalendarHome' => $baseDir . '/../lib/CalDAV/CalendarHome.php',
+    'OCA\\DAV\\CalDAV\\CalendarImpl' => $baseDir . '/../lib/CalDAV/CalendarImpl.php',
+    'OCA\\DAV\\CalDAV\\CalendarManager' => $baseDir . '/../lib/CalDAV/CalendarManager.php',
+    'OCA\\DAV\\CalDAV\\CalendarObject' => $baseDir . '/../lib/CalDAV/CalendarObject.php',
+    'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir . '/../lib/CalDAV/CalendarRoot.php',
+    'OCA\\DAV\\CalDAV\\Outbox' => $baseDir . '/../lib/CalDAV/Outbox.php',
+    'OCA\\DAV\\CalDAV\\Plugin' => $baseDir . '/../lib/CalDAV/Plugin.php',
+    'OCA\\DAV\\CalDAV\\Principal\\Collection' => $baseDir . '/../lib/CalDAV/Principal/Collection.php',
+    'OCA\\DAV\\CalDAV\\Principal\\User' => $baseDir . '/../lib/CalDAV/Principal/User.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendar' => $baseDir . '/../lib/CalDAV/PublicCalendar.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendarObject' => $baseDir . '/../lib/CalDAV/PublicCalendarObject.php',
+    'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => $baseDir . '/../lib/CalDAV/PublicCalendarRoot.php',
+    'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => $baseDir . '/../lib/CalDAV/Publishing/PublishPlugin.php',
+    'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => $baseDir . '/../lib/CalDAV/Publishing/Xml/Publisher.php',
+    'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => $baseDir . '/../lib/CalDAV/Schedule/IMipPlugin.php',
+    'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => $baseDir . '/../lib/CalDAV/Schedule/Plugin.php',
+    'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => $baseDir . '/../lib/CalDAV/Search/SearchPlugin.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
+    'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+    'OCA\\DAV\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
+    'OCA\\DAV\\CardDAV\\AddressBook' => $baseDir . '/../lib/CardDAV/AddressBook.php',
+    'OCA\\DAV\\CardDAV\\AddressBookImpl' => $baseDir . '/../lib/CardDAV/AddressBookImpl.php',
+    'OCA\\DAV\\CardDAV\\AddressBookRoot' => $baseDir . '/../lib/CardDAV/AddressBookRoot.php',
+    'OCA\\DAV\\CardDAV\\CardDavBackend' => $baseDir . '/../lib/CardDAV/CardDavBackend.php',
+    'OCA\\DAV\\CardDAV\\ContactsManager' => $baseDir . '/../lib/CardDAV/ContactsManager.php',
+    'OCA\\DAV\\CardDAV\\Converter' => $baseDir . '/../lib/CardDAV/Converter.php',
+    'OCA\\DAV\\CardDAV\\ImageExportPlugin' => $baseDir . '/../lib/CardDAV/ImageExportPlugin.php',
+    'OCA\\DAV\\CardDAV\\PhotoCache' => $baseDir . '/../lib/CardDAV/PhotoCache.php',
+    'OCA\\DAV\\CardDAV\\Plugin' => $baseDir . '/../lib/CardDAV/Plugin.php',
+    'OCA\\DAV\\CardDAV\\SyncService' => $baseDir . '/../lib/CardDAV/SyncService.php',
+    'OCA\\DAV\\CardDAV\\UserAddressBooks' => $baseDir . '/../lib/CardDAV/UserAddressBooks.php',
+    'OCA\\DAV\\CardDAV\\Xml\\Groups' => $baseDir . '/../lib/CardDAV/Xml/Groups.php',
+    'OCA\\DAV\\Command\\CreateAddressBook' => $baseDir . '/../lib/Command/CreateAddressBook.php',
+    'OCA\\DAV\\Command\\CreateCalendar' => $baseDir . '/../lib/Command/CreateCalendar.php',
+    'OCA\\DAV\\Command\\RemoveInvalidShares' => $baseDir . '/../lib/Command/RemoveInvalidShares.php',
+    'OCA\\DAV\\Command\\SyncBirthdayCalendar' => $baseDir . '/../lib/Command/SyncBirthdayCalendar.php',
+    'OCA\\DAV\\Command\\SyncSystemAddressBook' => $baseDir . '/../lib/Command/SyncSystemAddressBook.php',
+    'OCA\\DAV\\Comments\\CommentNode' => $baseDir . '/../lib/Comments/CommentNode.php',
+    'OCA\\DAV\\Comments\\CommentsPlugin' => $baseDir . '/../lib/Comments/CommentsPlugin.php',
+    'OCA\\DAV\\Comments\\EntityCollection' => $baseDir . '/../lib/Comments/EntityCollection.php',
+    'OCA\\DAV\\Comments\\EntityTypeCollection' => $baseDir . '/../lib/Comments/EntityTypeCollection.php',
+    'OCA\\DAV\\Comments\\RootCollection' => $baseDir . '/../lib/Comments/RootCollection.php',
+    'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir . '/../lib/Connector/LegacyDAVACL.php',
+    'OCA\\DAV\\Connector\\PublicAuth' => $baseDir . '/../lib/Connector/PublicAuth.php',
+    'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => $baseDir . '/../lib/Connector/Sabre/AppEnabledPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Auth' => $baseDir . '/../lib/Connector/Sabre/Auth.php',
+    'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => $baseDir . '/../lib/Connector/Sabre/BearerAuth.php',
+    'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => $baseDir . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CachingTree' => $baseDir . '/../lib/Connector/Sabre/CachingTree.php',
+    'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => $baseDir . '/../lib/Connector/Sabre/ChecksumList.php',
+    'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => $baseDir . '/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => $baseDir . '/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => $baseDir . '/../lib/Connector/Sabre/CustomPropertiesBackend.php',
+    'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => $baseDir . '/../lib/Connector/Sabre/DavAclPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Directory' => $baseDir . '/../lib/Connector/Sabre/Directory.php',
+    'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => $baseDir . '/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => $baseDir . '/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => $baseDir . '/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => $baseDir . '/../lib/Connector/Sabre/Exception/FileLocked.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/Forbidden.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => $baseDir . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => $baseDir . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+    'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => $baseDir . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
+    'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => $baseDir . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\File' => $baseDir . '/../lib/Connector/Sabre/File.php',
+    'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => $baseDir . '/../lib/Connector/Sabre/FilesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => $baseDir . '/../lib/Connector/Sabre/FilesReportPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => $baseDir . '/../lib/Connector/Sabre/LockPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => $baseDir . '/../lib/Connector/Sabre/MaintenancePlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Node' => $baseDir . '/../lib/Connector/Sabre/Node.php',
+    'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => $baseDir . '/../lib/Connector/Sabre/ObjectTree.php',
+    'OCA\\DAV\\Connector\\Sabre\\Principal' => $baseDir . '/../lib/Connector/Sabre/Principal.php',
+    'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => $baseDir . '/../lib/Connector/Sabre/QuotaPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\Server' => $baseDir . '/../lib/Connector/Sabre/Server.php',
+    'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => $baseDir . '/../lib/Connector/Sabre/ServerFactory.php',
+    'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => $baseDir . '/../lib/Connector/Sabre/ShareTypeList.php',
+    'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => $baseDir . '/../lib/Connector/Sabre/SharesPlugin.php',
+    'OCA\\DAV\\Connector\\Sabre\\TagList' => $baseDir . '/../lib/Connector/Sabre/TagList.php',
+    'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => $baseDir . '/../lib/Connector/Sabre/TagsPlugin.php',
+    'OCA\\DAV\\Controller\\BirthdayCalendarController' => $baseDir . '/../lib/Controller/BirthdayCalendarController.php',
+    'OCA\\DAV\\DAV\\CustomPropertiesBackend' => $baseDir . '/../lib/DAV/CustomPropertiesBackend.php',
+    'OCA\\DAV\\DAV\\GroupPrincipalBackend' => $baseDir . '/../lib/DAV/GroupPrincipalBackend.php',
+    'OCA\\DAV\\DAV\\PublicAuth' => $baseDir . '/../lib/DAV/PublicAuth.php',
+    'OCA\\DAV\\DAV\\Sharing\\Backend' => $baseDir . '/../lib/DAV/Sharing/Backend.php',
+    'OCA\\DAV\\DAV\\Sharing\\IShareable' => $baseDir . '/../lib/DAV/Sharing/IShareable.php',
+    'OCA\\DAV\\DAV\\Sharing\\Plugin' => $baseDir . '/../lib/DAV/Sharing/Plugin.php',
+    'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => $baseDir . '/../lib/DAV/Sharing/Xml/Invite.php',
+    'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => $baseDir . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
+    'OCA\\DAV\\DAV\\SystemPrincipalBackend' => $baseDir . '/../lib/DAV/SystemPrincipalBackend.php',
+    'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => $baseDir . '/../lib/Files/BrowserErrorPagePlugin.php',
+    'OCA\\DAV\\Files\\FileSearchBackend' => $baseDir . '/../lib/Files/FileSearchBackend.php',
+    'OCA\\DAV\\Files\\FilesHome' => $baseDir . '/../lib/Files/FilesHome.php',
+    'OCA\\DAV\\Files\\LazySearchBackend' => $baseDir . '/../lib/Files/LazySearchBackend.php',
+    'OCA\\DAV\\Files\\RootCollection' => $baseDir . '/../lib/Files/RootCollection.php',
+    'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => $baseDir . '/../lib/Files/Sharing/FilesDropPlugin.php',
+    'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+    'OCA\\DAV\\HookManager' => $baseDir . '/../lib/HookManager.php',
+    'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndex.php',
+    'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+    'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
+    'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir . '/../lib/Migration/Version1004Date20170825134824.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir . '/../lib/Migration/Version1004Date20170919104507.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170924124212' => $baseDir . '/../lib/Migration/Version1004Date20170924124212.php',
+    'OCA\\DAV\\Migration\\Version1004Date20170926103422' => $baseDir . '/../lib/Migration/Version1004Date20170926103422.php',
+    'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',
+    'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
+    'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',
+    'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => $baseDir . '/../lib/SystemTag/SystemTagMappingNode.php',
+    'OCA\\DAV\\SystemTag\\SystemTagNode' => $baseDir . '/../lib/SystemTag/SystemTagNode.php',
+    'OCA\\DAV\\SystemTag\\SystemTagPlugin' => $baseDir . '/../lib/SystemTag/SystemTagPlugin.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => $baseDir . '/../lib/SystemTag/SystemTagsByIdCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => $baseDir . '/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => $baseDir . '/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
+    'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => $baseDir . '/../lib/SystemTag/SystemTagsRelationsCollection.php',
+    'OCA\\DAV\\Upload\\AssemblyStream' => $baseDir . '/../lib/Upload/AssemblyStream.php',
+    'OCA\\DAV\\Upload\\ChunkingPlugin' => $baseDir . '/../lib/Upload/ChunkingPlugin.php',
+    'OCA\\DAV\\Upload\\FutureFile' => $baseDir . '/../lib/Upload/FutureFile.php',
+    'OCA\\DAV\\Upload\\RootCollection' => $baseDir . '/../lib/Upload/RootCollection.php',
+    'OCA\\DAV\\Upload\\UploadFolder' => $baseDir . '/../lib/Upload/UploadFolder.php',
+    'OCA\\DAV\\Upload\\UploadHome' => $baseDir . '/../lib/Upload/UploadHome.php',
+);
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+);
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = $vendorDir;
+
+return array(
+    'OCA\\DAV\\' => array($baseDir . '/../lib'),
+);
@@ -0,0 +1,43 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitDAV
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitDAV', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitDAV', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitDAV::getInitializer($loader));
+        } else {
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->setClassMapAuthoritative(true);
+        $loader->register(true);
+
+        return $loader;
+    }
+}
@@ -0,0 +1,182 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitDAV
+{
+    public static $prefixLengthsPsr4 = array (
+        'O' => 
+        array (
+            'OCA\\DAV\\' => 8,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'OCA\\DAV\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/../lib',
+        ),
+    );
+
+    public static $classMap = array (
+        'OCA\\DAV\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        'OCA\\DAV\\AppInfo\\PluginManager' => __DIR__ . '/..' . '/../lib/AppInfo/PluginManager.php',
+        'OCA\\DAV\\Avatars\\AvatarHome' => __DIR__ . '/..' . '/../lib/Avatars/AvatarHome.php',
+        'OCA\\DAV\\Avatars\\AvatarNode' => __DIR__ . '/..' . '/../lib/Avatars/AvatarNode.php',
+        'OCA\\DAV\\Avatars\\RootCollection' => __DIR__ . '/..' . '/../lib/Avatars/RootCollection.php',
+        'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Backend' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Backend.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Filter/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Filter\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Filter/Todo.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Base' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Base.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Event.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Todo.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Calendar.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Event.php',
+        'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Todo.php',
+        'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
+        'OCA\\DAV\\CalDAV\\BirthdayService' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayService.php',
+        'OCA\\DAV\\CalDAV\\CalDavBackend' => __DIR__ . '/..' . '/../lib/CalDAV/CalDavBackend.php',
+        'OCA\\DAV\\CalDAV\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Calendar.php',
+        'OCA\\DAV\\CalDAV\\CalendarHome' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarHome.php',
+        'OCA\\DAV\\CalDAV\\CalendarImpl' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarImpl.php',
+        'OCA\\DAV\\CalDAV\\CalendarManager' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarManager.php',
+        'OCA\\DAV\\CalDAV\\CalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarObject.php',
+        'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarRoot.php',
+        'OCA\\DAV\\CalDAV\\Outbox' => __DIR__ . '/..' . '/../lib/CalDAV/Outbox.php',
+        'OCA\\DAV\\CalDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Plugin.php',
+        'OCA\\DAV\\CalDAV\\Principal\\Collection' => __DIR__ . '/..' . '/../lib/CalDAV/Principal/Collection.php',
+        'OCA\\DAV\\CalDAV\\Principal\\User' => __DIR__ . '/..' . '/../lib/CalDAV/Principal/User.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendar' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendar.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendarObject.php',
+        'OCA\\DAV\\CalDAV\\PublicCalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/PublicCalendarRoot.php',
+        'OCA\\DAV\\CalDAV\\Publishing\\PublishPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Publishing/PublishPlugin.php',
+        'OCA\\DAV\\CalDAV\\Publishing\\Xml\\Publisher' => __DIR__ . '/..' . '/../lib/CalDAV/Publishing/Xml/Publisher.php',
+        'OCA\\DAV\\CalDAV\\Schedule\\IMipPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Schedule/IMipPlugin.php',
+        'OCA\\DAV\\CalDAV\\Schedule\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Schedule/Plugin.php',
+        'OCA\\DAV\\CalDAV\\Search\\SearchPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/Search/SearchPlugin.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/CompFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/LimitFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/OffsetFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/ParamFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
+        'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+        'OCA\\DAV\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
+        'OCA\\DAV\\CardDAV\\AddressBook' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBook.php',
+        'OCA\\DAV\\CardDAV\\AddressBookImpl' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookImpl.php',
+        'OCA\\DAV\\CardDAV\\AddressBookRoot' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookRoot.php',
+        'OCA\\DAV\\CardDAV\\CardDavBackend' => __DIR__ . '/..' . '/../lib/CardDAV/CardDavBackend.php',
+        'OCA\\DAV\\CardDAV\\ContactsManager' => __DIR__ . '/..' . '/../lib/CardDAV/ContactsManager.php',
+        'OCA\\DAV\\CardDAV\\Converter' => __DIR__ . '/..' . '/../lib/CardDAV/Converter.php',
+        'OCA\\DAV\\CardDAV\\ImageExportPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/ImageExportPlugin.php',
+        'OCA\\DAV\\CardDAV\\PhotoCache' => __DIR__ . '/..' . '/../lib/CardDAV/PhotoCache.php',
+        'OCA\\DAV\\CardDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CardDAV/Plugin.php',
+        'OCA\\DAV\\CardDAV\\SyncService' => __DIR__ . '/..' . '/../lib/CardDAV/SyncService.php',
+        'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__ . '/..' . '/../lib/CardDAV/UserAddressBooks.php',
+        'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__ . '/..' . '/../lib/CardDAV/Xml/Groups.php',
+        'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__ . '/..' . '/../lib/Command/CreateAddressBook.php',
+        'OCA\\DAV\\Command\\CreateCalendar' => __DIR__ . '/..' . '/../lib/Command/CreateCalendar.php',
+        'OCA\\DAV\\Command\\RemoveInvalidShares' => __DIR__ . '/..' . '/../lib/Command/RemoveInvalidShares.php',
+        'OCA\\DAV\\Command\\SyncBirthdayCalendar' => __DIR__ . '/..' . '/../lib/Command/SyncBirthdayCalendar.php',
+        'OCA\\DAV\\Command\\SyncSystemAddressBook' => __DIR__ . '/..' . '/../lib/Command/SyncSystemAddressBook.php',
+        'OCA\\DAV\\Comments\\CommentNode' => __DIR__ . '/..' . '/../lib/Comments/CommentNode.php',
+        'OCA\\DAV\\Comments\\CommentsPlugin' => __DIR__ . '/..' . '/../lib/Comments/CommentsPlugin.php',
+        'OCA\\DAV\\Comments\\EntityCollection' => __DIR__ . '/..' . '/../lib/Comments/EntityCollection.php',
+        'OCA\\DAV\\Comments\\EntityTypeCollection' => __DIR__ . '/..' . '/../lib/Comments/EntityTypeCollection.php',
+        'OCA\\DAV\\Comments\\RootCollection' => __DIR__ . '/..' . '/../lib/Comments/RootCollection.php',
+        'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__ . '/..' . '/../lib/Connector/LegacyDAVACL.php',
+        'OCA\\DAV\\Connector\\PublicAuth' => __DIR__ . '/..' . '/../lib/Connector/PublicAuth.php',
+        'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\AppEnabledPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AppEnabledPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Auth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Auth.php',
+        'OCA\\DAV\\Connector\\Sabre\\BearerAuth' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BearerAuth.php',
+        'OCA\\DAV\\Connector\\Sabre\\BlockLegacyClientPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/BlockLegacyClientPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CachingTree' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CachingTree.php',
+        'OCA\\DAV\\Connector\\Sabre\\ChecksumList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ChecksumList.php',
+        'OCA\\DAV\\Connector\\Sabre\\CommentPropertiesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CommentPropertiesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CopyEtagHeaderPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CopyEtagHeaderPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/Connector/Sabre/CustomPropertiesBackend.php',
+        'OCA\\DAV\\Connector\\Sabre\\DavAclPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/DavAclPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Directory' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Directory.php',
+        'OCA\\DAV\\Connector\\Sabre\\DummyGetResponsePlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/DummyGetResponsePlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\ExceptionLoggerPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ExceptionLoggerPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\EntityTooLarge' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/EntityTooLarge.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\FileLocked' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/FileLocked.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\Forbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/Forbidden.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\InvalidPath' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/InvalidPath.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\PasswordLoginForbidden' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/PasswordLoginForbidden.php',
+        'OCA\\DAV\\Connector\\Sabre\\Exception\\UnsupportedMediaType' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Exception/UnsupportedMediaType.php',
+        'OCA\\DAV\\Connector\\Sabre\\FakeLockerPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FakeLockerPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\File' => __DIR__ . '/..' . '/../lib/Connector/Sabre/File.php',
+        'OCA\\DAV\\Connector\\Sabre\\FilesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FilesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\FilesReportPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/FilesReportPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\LockPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/LockPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\MaintenancePlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/MaintenancePlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Node' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Node.php',
+        'OCA\\DAV\\Connector\\Sabre\\ObjectTree' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ObjectTree.php',
+        'OCA\\DAV\\Connector\\Sabre\\Principal' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Principal.php',
+        'OCA\\DAV\\Connector\\Sabre\\QuotaPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/QuotaPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\Server' => __DIR__ . '/..' . '/../lib/Connector/Sabre/Server.php',
+        'OCA\\DAV\\Connector\\Sabre\\ServerFactory' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ServerFactory.php',
+        'OCA\\DAV\\Connector\\Sabre\\ShareTypeList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/ShareTypeList.php',
+        'OCA\\DAV\\Connector\\Sabre\\SharesPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/SharesPlugin.php',
+        'OCA\\DAV\\Connector\\Sabre\\TagList' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagList.php',
+        'OCA\\DAV\\Connector\\Sabre\\TagsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/TagsPlugin.php',
+        'OCA\\DAV\\Controller\\BirthdayCalendarController' => __DIR__ . '/..' . '/../lib/Controller/BirthdayCalendarController.php',
+        'OCA\\DAV\\DAV\\CustomPropertiesBackend' => __DIR__ . '/..' . '/../lib/DAV/CustomPropertiesBackend.php',
+        'OCA\\DAV\\DAV\\GroupPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/GroupPrincipalBackend.php',
+        'OCA\\DAV\\DAV\\PublicAuth' => __DIR__ . '/..' . '/../lib/DAV/PublicAuth.php',
+        'OCA\\DAV\\DAV\\Sharing\\Backend' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Backend.php',
+        'OCA\\DAV\\DAV\\Sharing\\IShareable' => __DIR__ . '/..' . '/../lib/DAV/Sharing/IShareable.php',
+        'OCA\\DAV\\DAV\\Sharing\\Plugin' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Plugin.php',
+        'OCA\\DAV\\DAV\\Sharing\\Xml\\Invite' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/Invite.php',
+        'OCA\\DAV\\DAV\\Sharing\\Xml\\ShareRequest' => __DIR__ . '/..' . '/../lib/DAV/Sharing/Xml/ShareRequest.php',
+        'OCA\\DAV\\DAV\\SystemPrincipalBackend' => __DIR__ . '/..' . '/../lib/DAV/SystemPrincipalBackend.php',
+        'OCA\\DAV\\Files\\BrowserErrorPagePlugin' => __DIR__ . '/..' . '/../lib/Files/BrowserErrorPagePlugin.php',
+        'OCA\\DAV\\Files\\FileSearchBackend' => __DIR__ . '/..' . '/../lib/Files/FileSearchBackend.php',
+        'OCA\\DAV\\Files\\FilesHome' => __DIR__ . '/..' . '/../lib/Files/FilesHome.php',
+        'OCA\\DAV\\Files\\LazySearchBackend' => __DIR__ . '/..' . '/../lib/Files/LazySearchBackend.php',
+        'OCA\\DAV\\Files\\RootCollection' => __DIR__ . '/..' . '/../lib/Files/RootCollection.php',
+        'OCA\\DAV\\Files\\Sharing\\FilesDropPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/FilesDropPlugin.php',
+        'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
+        'OCA\\DAV\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
+        'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndex.php',
+        'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+        'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
+        'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170825134824.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170919104507.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170924124212' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170924124212.php',
+        'OCA\\DAV\\Migration\\Version1004Date20170926103422' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170926103422.php',
+        'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',
+        'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
+        'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',
+        'OCA\\DAV\\SystemTag\\SystemTagMappingNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagMappingNode.php',
+        'OCA\\DAV\\SystemTag\\SystemTagNode' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagNode.php',
+        'OCA\\DAV\\SystemTag\\SystemTagPlugin' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagPlugin.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsByIdCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsByIdCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsObjectMappingCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsObjectMappingCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsObjectTypeCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsObjectTypeCollection.php',
+        'OCA\\DAV\\SystemTag\\SystemTagsRelationsCollection' => __DIR__ . '/..' . '/../lib/SystemTag/SystemTagsRelationsCollection.php',
+        'OCA\\DAV\\Upload\\AssemblyStream' => __DIR__ . '/..' . '/../lib/Upload/AssemblyStream.php',
+        'OCA\\DAV\\Upload\\ChunkingPlugin' => __DIR__ . '/..' . '/../lib/Upload/ChunkingPlugin.php',
+        'OCA\\DAV\\Upload\\FutureFile' => __DIR__ . '/..' . '/../lib/Upload/FutureFile.php',
+        'OCA\\DAV\\Upload\\RootCollection' => __DIR__ . '/..' . '/../lib/Upload/RootCollection.php',
+        'OCA\\DAV\\Upload\\UploadFolder' => __DIR__ . '/..' . '/../lib/Upload/UploadFolder.php',
+        'OCA\\DAV\\Upload\\UploadHome' => __DIR__ . '/..' . '/../lib/Upload/UploadHome.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInitDAV::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitDAV::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitDAV::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
@@ -0,0 +1,38 @@
+/**
+ * @copyright 2017, Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * @author Georg Ehrke <oc.list@georgehrke.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/>.
+ *
+ */
+"use strict";
+
+$('#caldavSendInvitations').change(function() {
+	var val = $(this)[0].checked;
+
+	OCP.AppConfig.setValue('dav', 'sendInvitations', val ? 'yes' : 'no');
+});
+
+$('#caldavGenerateBirthdayCalendar').change(function() {
+	var val = $(this)[0].checked;
+
+	if (val) {
+		$.post(OC.generateUrl('/apps/dav/enableBirthdayCalendar'));
+	} else {
+		$.post(OC.generateUrl('/apps/dav/disableBirthdayCalendar'));
+	}
+});
@@ -2,9 +2,10 @@
 /**
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Georg Ehrke <georg@owncloud.com>
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Georg Ehrke <oc.list@georgehrke.com>
 * @author Joas Schilling <coding@schilljs.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 *
 * @license AGPL-3.0
@@ -28,13 +29,15 @@ use OC\AppFramework\Utility\SimpleContainer;
 use OCA\DAV\CalDAV\Activity\Backend;
 use OCA\DAV\CalDAV\Activity\Provider\Event;
 use OCA\DAV\CalDAV\BirthdayService;
+use OCA\DAV\CalDAV\CalendarManager;
 use OCA\DAV\Capabilities;
 use OCA\DAV\CardDAV\ContactsManager;
 use OCA\DAV\CardDAV\PhotoCache;
 use OCA\DAV\CardDAV\SyncService;
 use OCA\DAV\HookManager;
 use \OCP\AppFramework\App;
-use OCP\Contacts\IManager;
+use OCP\Contacts\IManager as IContactsManager;
+use OCP\Calendar\IManager as ICalendarManager;
 use OCP\IUser;
 use Symfony\Component\EventDispatcher\GenericEvent;

@@ -62,16 +65,35 @@ class Application extends App {
 	}

 	/**
-	 * @param IManager $contactsManager
+	 * @param IContactsManager $contactsManager
 	 * @param string $userID
 	 */
-	public function setupContactsProvider(IManager $contactsManager, $userID) {
+	public function setupContactsProvider(IContactsManager $contactsManager, $userID) {
 		/** @var ContactsManager $cm */
 		$cm = $this->getContainer()->query(ContactsManager::class);
 		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
 		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
 	}

+	/**
+	 * @param IManager $contactsManager
+	 */
+	public function setupSystemContactsProvider(IContactsManager $contactsManager) {
+		/** @var ContactsManager $cm */
+		$cm = $this->getContainer()->query(ContactsManager::class);
+		$urlGenerator = $this->getContainer()->getServer()->getURLGenerator();
+		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+	}
+
+	/**
+	 * @param ICalendarManager $calendarManager
+	 * @param string $userId
+	 */
+	public function setupCalendarProvider(ICalendarManager $calendarManager, $userId) {
+		$cm = $this->getContainer()->query(CalendarManager::class);
+		$cm->setupCalendarProvider($calendarManager, $userId);
+	}
+
 	public function registerHooks() {
 		/** @var HookManager $hm */
 		$hm = $this->getContainer()->query(HookManager::class);
@@ -166,6 +188,15 @@ class Application extends App {
 			);
 		});

+		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function(GenericEvent $event) {
+			/** @var Backend $backend */
+			$backend = $this->getContainer()->query(Backend::class);
+			$backend->onCalendarPublication(
+				$event->getArgument('calendarData'),
+				$event->getArgument('public')
+			);
+		});
+
 		$listener = function(GenericEvent $event, $eventName) {
 			/** @var Backend $backend */
 			$backend = $this->getContainer()->query(Backend::class);
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, ownCloud GmbH.
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\DAV\AppInfo;
+
+use OCP\App\IAppManager;
+use OC\ServerContainer;
+use OCP\AppFramework\QueryException;
+
+/**
+ * Manager for DAV plugins from apps, used to register them
+ * to the Sabre server.
+ */
+class PluginManager {
+
+	/**
+	 * @var ServerContainer
+	 */
+	private $container;
+
+	/**
+	 * @var IAppManager
+	 */
+	private $appManager;
+
+	/**
+	 * App plugins
+	 *
+	 * @var array
+	 */
+	private $plugins = null;
+
+	/**
+	 * App collections
+	 *
+	 * @var array
+	 */
+	private $collections = null;
+
+	/**
+	 * Contstruct a PluginManager
+	 *
+	 * @param ServerContainer $container server container for resolving plugin classes
+	 * @param IAppManager $appManager app manager to loading apps and their info
+	 */
+	public function __construct(ServerContainer $container, IAppManager $appManager) {
+		$this->container = $container;
+		$this->appManager = $appManager;
+	}
+
+	/**
+	 * Returns an array of app-registered plugins
+	 *
+	 * @return array
+	 */
+	public function getAppPlugins() {
+		if (null === $this->plugins) {
+			$this->populate();
+		}
+		return $this->plugins;
+	}
+
+	/**
+	 * Returns an array of app-registered collections
+	 *
+	 * @return array
+	 */
+	public function getAppCollections() {
+		if (null === $this->collections) {
+			$this->populate();
+		}
+		return $this->collections;
+	}
+
+	/**
+	 * Retrieve plugin and collection list and populate attributes
+	 */
+	private function populate() {
+		$this->plugins = [];
+		$this->collections = [];
+		foreach ($this->appManager->getInstalledApps() as $app) {
+			// load plugins and collections from info.xml
+			$info = $this->appManager->getAppInfo($app);
+			if (!isset($info['types']) || !in_array('dav', $info['types'], true)) {
+				continue;
+			}
+			// FIXME: switch to public API once available
+			// load app to make sure its classes are available
+			\OC_App::loadApp($app);
+			$this->loadSabrePluginsFromInfoXml($this->extractPluginList($info));
+			$this->loadSabreCollectionsFromInfoXml($this->extractCollectionList($info));
+		}
+	}
+
+	private function extractPluginList(array $array) {
+		if (isset($array['sabre']) && is_array($array['sabre'])) {
+			if (isset($array['sabre']['plugins']) && is_array($array['sabre']['plugins'])) {
+				if (isset($array['sabre']['plugins']['plugin'])) {
+					$items = $array['sabre']['plugins']['plugin'];
+					if (!is_array($items)) {
+						$items = [$items];
+					}
+					return $items;
+				}
+			}
+		}
+		return [];
+	}
+
+	private function extractCollectionList(array $array) {
+		if (isset($array['sabre']) && is_array($array['sabre'])) {
+			if (isset($array['sabre']['collections']) && is_array($array['sabre']['collections'])) {
+				if (isset($array['sabre']['collections']['collection'])) {
+					$items = $array['sabre']['collections']['collection'];
+					if (!is_array($items)) {
+						$items = [$items];
+					}
+					return $items;
+				}
+			}
+		}
+		return [];
+	}
+
+	private function loadSabrePluginsFromInfoXml(array $plugins) {
+		foreach ($plugins as $plugin) {
+			try {
+				$this->plugins[] = $this->container->query($plugin);
+			} catch (QueryException $e) {
+				if (class_exists($plugin)) {
+					$this->plugins[] = new $plugin();
+				} else {
+					throw new \Exception("Sabre plugin class '$plugin' is unknown and could not be loaded");
+				}
+			}
+		}
+	}
+
+	private function loadSabreCollectionsFromInfoXml(array $collections) {
+		foreach ($collections as $collection) {
+			try {
+				$this->collections[] = $this->container->query($collection);
+			} catch (QueryException $e) {
+				if (class_exists($collection)) {
+					$this->collections[] = new $collection();
+				} else {
+					throw new \Exception("Sabre collection class '$collection' is unknown and could not be loaded");
+				}
+			}
+		}
+	}
+
+}
@@ -1,8 +1,11 @@
 <?php
 /**
+ * @copyright Copyright (c) 2016, ownCloud GmbH
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 *
- * @copyright Copyright (c) 2016, ownCloud GmbH
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -1,8 +1,10 @@
 <?php
 /**
+ * @copyright Copyright (c) 2016, ownCloud GmbH
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 *
- * @copyright Copyright (c) 2016, ownCloud GmbH
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -1,5 +1,27 @@
 <?php
-
+/**
+ *
+ *
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @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\DAV\Avatars;

 use Sabre\DAVACL\AbstractPrincipalCollection;
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @copyright 2017 Georg Ehrke <oc.list@georgehrke.com>
+ *
+ * @author Georg Ehrke <oc.list@georgehrke.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\DAV\BackgroundJob;
+
+use OC\BackgroundJob\QueuedJob;
+use OCA\DAV\CalDAV\BirthdayService;
+use OCP\IConfig;
+
+class GenerateBirthdayCalendarBackgroundJob extends QueuedJob {
+
+	/** @var BirthdayService */
+	private $birthdayService;
+
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * GenerateAllBirthdayCalendarsBackgroundJob constructor.
+	 *
+	 * @param BirthdayService $birthdayService
+	 * @param IConfig $config
+	 */
+	public function __construct(BirthdayService $birthdayService,
+								IConfig $config) {
+		$this->birthdayService = $birthdayService;
+		$this->config = $config;
+	}
+
+	/**
+	 * @param array $arguments
+	 */
+	public function run($arguments) {
+		$userId = $arguments['userId'];
+
+		// make sure admin didn't change his mind
+		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+		if ($isGloballyEnabled !== 'yes') {
+			return;
+		}
+
+		// did the user opt out?
+		$isUserEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+		if ($isUserEnabled !== 'yes') {
+			return;
+		}
+
+		$this->birthdayService->syncUser($userId);
+	}
+}
@@ -2,6 +2,9 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author Joas Schilling <coding@schilljs.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
@@ -89,6 +92,16 @@ class Backend {
 		$this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
 	}

+	/**
+	 * Creates activities when a calendar was (un)published
+	 *
+	 * @param array $calendarData
+	 * @param bool $publishStatus
+	 */
+	public function onCalendarPublication(array $calendarData, $publishStatus) {
+		$this->triggerCalendarActivity($publishStatus ? Calendar::SUBJECT_PUBLISH : Calendar::SUBJECT_UNPUBLISH, $calendarData);
+	}
+
 	/**
 	 * Creates activities for all related users when a calendar was touched
 	 *
@@ -135,8 +148,12 @@ class Backend {
 				->setSubject(
 					$user === $currentUser ? $action . '_self' : $action,
 					[
-						$currentUser,
-						$calendarData['{DAV:}displayname'],
+						'actor' => $currentUser,
+						'calendar' => [
+							'id' => (int) $calendarData['id'],
+							'uri' => $calendarData['uri'],
+							'name' => $calendarData['{DAV:}displayname'],
+						],
 					]
 				);
 			$this->activityManager->publish($event);
@@ -187,8 +204,13 @@ class Backend {

 				if ($owner !== $principal[2]) {
 					$parameters = [
-						$principal[2],
-						$calendarData['{DAV:}displayname'],
+						'actor' => $event->getAuthor(),
+						'calendar' => [
+							'id' => (int) $calendarData['id'],
+							'uri' => $calendarData['uri'],
+							'name' => $calendarData['{DAV:}displayname'],
+						],
+						'user' => $principal[2],
 					];

 					if ($owner === $event->getAuthor()) {
@@ -201,7 +223,6 @@ class Backend {
 						$this->activityManager->publish($event);

 						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
-						$parameters[] = $event->getAuthor();
 					}

 					$event->setAffectedUser($owner)
@@ -212,8 +233,13 @@ class Backend {
 				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);

 				$parameters = [
-					$principal[2],
-					$calendarData['{DAV:}displayname'],
+					'actor' => $event->getAuthor(),
+					'calendar' => [
+						'id' => (int) $calendarData['id'],
+						'uri' => $calendarData['uri'],
+						'name' => $calendarData['{DAV:}displayname'],
+					],
+					'group' => $principal[2],
 				];

 				if ($owner === $event->getAuthor()) {
@@ -224,7 +250,6 @@ class Backend {
 					$this->activityManager->publish($event);

 					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
-					$parameters[] = $event->getAuthor();
 				}

 				$event->setAffectedUser($owner)
@@ -250,8 +275,13 @@ class Backend {

 				if ($owner !== $principal[2]) {
 					$parameters = [
-						$principal[2],
-						$calendarData['{DAV:}displayname'],
+						'actor' => $event->getAuthor(),
+						'calendar' => [
+							'id' => (int) $calendarData['id'],
+							'uri' => $calendarData['uri'],
+							'name' => $calendarData['{DAV:}displayname'],
+						],
+						'user' => $principal[2],
 					];

 					if ($owner === $event->getAuthor()) {
@@ -262,7 +292,6 @@ class Backend {
 						$this->activityManager->publish($event);

 						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
-						$parameters[] = $event->getAuthor();
 					}

 					$event->setAffectedUser($owner)
@@ -273,8 +302,13 @@ class Backend {
 				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);

 				$parameters = [
-					$principal[2],
-					$calendarData['{DAV:}displayname'],
+					'actor' => $event->getAuthor(),
+					'calendar' => [
+						'id' => (int) $calendarData['id'],
+						'uri' => $calendarData['uri'],
+						'name' => $calendarData['{DAV:}displayname'],
+					],
+					'group' => $principal[2],
 				];

 				if ($owner === $event->getAuthor()) {
@@ -285,7 +319,6 @@ class Backend {
 					$this->activityManager->publish($event);

 					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
-					$parameters[] = $event->getAuthor();
 				}

 				$event->setAffectedUser($owner)
@@ -347,8 +380,12 @@ class Backend {
 			->setSubject(
 				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
 				[
-					$event->getAuthor(),
-					$properties['{DAV:}displayname'],
+					'actor' => $event->getAuthor(),
+					'calendar' => [
+						'id' => (int) $properties['id'],
+						'uri' => $properties['uri'],
+						'name' => $properties['{DAV:}displayname'],
+					],
 				]
 			);

@@ -401,9 +438,13 @@ class Backend {
 				->setSubject(
 					$user === $currentUser ? $action . '_self' : $action,
 					[
-						$currentUser,
-						$calendarData['{DAV:}displayname'],
-						[
+						'actor' => $event->getAuthor(),
+						'calendar' => [
+							'id' => (int) $calendarData['id'],
+							'uri' => $calendarData['uri'],
+							'name' => $calendarData['{DAV:}displayname'],
+						],
+						'object' => [
 							'id' => $object['id'],
 							'name' => $object['name'],
 						],
@@ -2,6 +2,8 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author 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
@@ -2,6 +2,8 @@
 /**
 * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
 *
+ * @author 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
--- a/Show More
+++ b/Show More