Merge pull request #8808 from nextcloud/final-12.0.6

[stable12] 12.0.6
12.0.6
2018-03-13 20:01:15 +01:00 · 2018-03-13 18:23:52 +01:00 · 2018-03-13 01:12:53 +00:00 · 2018-03-12 01:13:11 +00:00 · 2018-03-11 19:34:38 +01:00 · 2018-03-11 13:04:54 +01:00
5699 changed files with 382512 additions and 301435 deletions
@@ -1,15 +1,11 @@
 codecov:
  branch: master
-  ci:
-    - drone.nextcloud.com
-    - !scrutinizer-ci.com

 coverage:
  precision: 2
  round: down
  range: "70...100"
-  status:
-    project: off
-    patch: off

-comment: off
+comment:
+  layout: "header, diff, changes, uncovered, tree"
+  behavior: default
@@ -1,2 +0,0 @@
-*/Activity/*                        @nickvergessen
-*/Notifications/*                   @nickvergessen
@@ -1,5 +1,6 @@
 # the default generated dir + db file
 /data
+/owncloud
 /config/config.php
 /config/*.config.php
 /config/mimetype*.json
@@ -12,7 +13,6 @@

 # ignore all apps except core ones
 /apps*/*
-!/apps/accessibility
 !/apps/comments
 !/apps/dav
 !/apps/files
@@ -42,9 +42,6 @@
 /apps/files_external/3rdparty/irodsphp/prods/test*
 /apps/files_external/tests/config.*.php

-# apps modules
-/apps/*/node_modules
-

 # ignore themes except the example and the README
 /themes/*
@@ -86,9 +83,6 @@ nbproject
 .idea
 *.iml

-# vscode
-.vscode
-
 # geany
 *.geany

@@ -121,7 +115,6 @@ nbproject
 /build/jsdocs/
 /npm-debug.log
 /PhantomJS_*
-/build/package-lock.json

 # puphpet
 puphpet
@@ -139,13 +132,6 @@ Vagrantfile
 /tests/autotest*
 /tests/data/lorem-copy.txt
 /tests/data/testimage-copy.png
-/tests/ui-regression/out/
-/tests/ui-regression/node_modules/
-/tests/ui-regression/package-lock.json
 /config/config-autotest-backup.php
 /config/autoconfig.php
 clover.xml
-
-# Tests - dependencies
-tests/acceptance/composer.lock
-tests/acceptance/vendor/
@@ -16,7 +16,6 @@
    Header set X-Robots-Tag "none"
    Header set X-Download-Options "noopen"
    Header set X-Permitted-Cross-Domain-Policies "none"
-    Header set Referrer-Policy "no-referrer"
    SetEnv modHeadersAvailable true
  </IfModule>

@@ -24,7 +23,7 @@
  <FilesMatch "\.(css|js|svg|gif)$">
    Header set Cache-Control "max-age=15778463"
  </FilesMatch>
-
+  
  # Let browsers cache WOFF files for a week
  <FilesMatch "\.woff$">
    Header set Cache-Control "max-age=604800"
@@ -64,7 +63,7 @@
  RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
  RewriteRule ^remote/(.*) remote.php [QSA,L]
  RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
+  RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.*
  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
@@ -28,10 +28,7 @@
 		"_": true,
 		"OC": true,
 		"OCA": true,
-		"OCP": true,
 		"t": true,
-		"n": true,
-		"escapeHTML": true,
-		"Promise": true
+		"n": true
 	}
 }
@@ -0,0 +1,2 @@
+pattern = "(?i):shipit:|:\\+1:|LGTM|👍"
+self_approval_off = true
@@ -100,7 +100,6 @@ 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>
@@ -141,13 +140,12 @@ ganomi <ganomi@gmail.com>
 Gaël Beaudoin <gaboo@home.gaboo.org>
 geez0x1 <geez0x1@users.noreply.github.com>
 gekmihesg <markus@gekmihesg.de>
-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>
+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>
 Golnaz Nilieh <g382nilieh@gmail.com>
 Grundik <grundik@ololo.cc>
 Guillaume AMAT <guillaume.amat@informatique-libre.com>
@@ -317,7 +315,6 @@ 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>
@@ -403,7 +400,6 @@ 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>
@@ -0,0 +1,34 @@
+{
+  "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,11 +1,6 @@
 before_commands:
  - 'git submodule update --init --recursive'

-checks:
-    php:
-        excluded_dependencies:
-            - etsy/phan
-
 filter:
    excluded_paths:
        - '3rdparty/*'
@@ -127,9 +127,3 @@ file_filter = translationfiles/<lang>/workflowengine.po
 source_file = translationfiles/templates/workflowengine.pot
 source_lang = en
 type = PO
-
-[nextcloud.accessibility]
-file_filter = translationfiles/<lang>/accessibility.po
-source_file = translationfiles/templates/accessibility.pot
-source_lang = en
-type = PO
@@ -1,24 +1,16 @@
 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>
@@ -29,9 +21,7 @@ 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>
@@ -41,48 +31,41 @@ 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 Wickert <cwickert@suse.de>
+ - Christoph Schaefer <christophł@wolkesicher.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>
- - Cornelius Kölbel <cornelius.koelbel@netknights.it>
- - Damjan Georgievski <gdamjan@gmail.com>
+ - Craig Morrissey <craig@owncloud.com>
 - Dan Bartram <daneybartram@gmail.com>
- - Daniel Calviño Sánchez <danxuliu@gmail.com>
- - Daniel Hansson <daniel@techandme.se>
+ - Daniel Hansson <enoch85@gmail.com>
 - 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>
- - Fabrizio Steiner <fabrizio.steiner@gmail.com>
- - Felix A. Epp <work@felixepp.de>
- - Felix Epp <work@felixepp.de>
- - Felix Heidecke <felix@heidecke.me>
+ - Faruk Uzun <farukuzun@collabora.com>
+ - Felix Böhm <felixboehm@gmx.de>
 - Felix Moeller <mail@felixmoeller.de>
- - Felix Rupp <github@felixrupp.com>
+ - Florian Preinstorfer <nblock@archlinux.us>
+ - Florian Pritz <bluewind@xinu.at>
 - Florin Peter <github@florin-peter.de>
- - Frank Isemann <frank@isemann.name>
+ - Francesco Rovelli <francesco.rovelli@gmail.com>
 - 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 <oc.list@georgehrke.com>
- - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
+ - Georg Ehrke <georg@owncloud.com>
+ - Guillaume AMAT <guillaume.amat@informatique-libre.com>
+ - Hasso Tepper <hasso@zone.ee>
 - Hendrik Leppelsack <hendrik@leppelsack.de>
- - Ilja Neumann <ineumann@owncloud.com>
+ - Hugo Gonzalez Labrador <hglavra@gmail.com>
 - Individual IT Services <info@individual-it.net>
 - Jakob Sack <mail@jakobsack.de>
 - Jan-Christoph Borchardt <hey@jancborchardt.net>
- - Jan-Philipp Litza <jplitza@users.noreply.github.com>
- - Jarkko Lehtoranta <devel@jlranta.com>
+ - Jarrett <JetUni@users.noreply.github.com>
 - Jean-Louis Dupond <jean-louis@dupond.be>
 - Jens-Christian Fischer <jens-christian.fischer@switch.ch>
 - Jesús Macias <jmacias@solidgear.es>
@@ -91,121 +74,80 @@ 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>
- - Leon Klingele <git@leonklingele.de>
- - Leon Klingele <leon@struktur.de>
- - Loki3000 <github@labcms.ru>
+ - Leonardo Diez <leio10@users.noreply.github.com>
 - 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 Jobst <mjobst+github@tecratech.de>
- - Michael Letzgus <www@chronos.michael-letzgus.de>
+ - Michael Kuhn <suraia@ikkoku.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>
- - Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
+ - Normal Ra <normalraw@gmail.com>
 - 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>
- - Roger Szabo <roger.szabo@web.de>
+ - Roman Geber <rgeber@owncloudapps.com>
 - 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>
@@ -214,83 +156,64 @@ 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>
- - Steven Bühner <buehner@me.com>
- - Sujith H <sharidasan@owncloud.com>
+ - TheSFReader <TheSFReader@gmail.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>
- - coderkun <olli@coderkun.de>
- - dartcafe <github@dartcafe.de>
+ - dampfklon <me@dampfklon.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>
- - phisch <git@philippschaffrath.de>
- - rakekniven <mark.ziegler@rakekniven.de>
- - root "root@oc.(none)"
- - root <root@localhost.localdomain>
+ - root <root@oc.(none)>
 - 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>
- - tux-rampage <tux-rampage@users.noreply.github.com>
+ - unclejamal3000 <andreas.pramhaas@posteo.de>
 - v1r0x <vinzenz.rosenkranz@gmail.com>
- - vkuimov "vkuimov@nextcloud"
- - voxsim "Simon Vocella"
+ - voxsim <Simon Vocella>

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

-The change log is at [https://nextcloud.com/changelog/](https://nextcloud.com/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.
+
@@ -1,9 +0,0 @@
-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.
@@ -58,7 +58,7 @@ like `git config --global alias.ci 'commit -s'`. Now you can commit with

 In case you are not sure how to add or update the license header correctly please have a look at [contribute/HowToApplyALicense.md][applyalicense]

-[devmanual]: https://docs.nextcloud.org/server/13/developer_manual/
+[devmanual]: https://docs.nextcloud.org/server/12/developer_manual/
 [dcofile]: https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin
 [applyalicense]: https://github.com/nextcloud/server/blob/master/contribute/HowToApplyALicense.md

@@ -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 authentication.
+* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentification.

 *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,20 +32,10 @@
 * :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)

-## Join the team :family:
-
-### How to contribute
-
-1. [Set up your local development environment](https://docs.nextcloud.com/server/14/developer_manual/general/devenv.html) :rocket:
-2. [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue) :notebook:
-3. Create a branch, a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue :computer:
-4. Wait for it to get merged and :tada:
-
-### Contribution Guidelines
+## Contribution Guidelines

 All contributions to this repository from June, 16 2016 on are considered to be
 licensed under the AGPLv3 or any later version.
@@ -65,16 +55,12 @@ Please review the [guidelines for contributing](https://github.com/nextcloud/ser

 More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/)

-### Running master checkouts
+## Running master checkouts

 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 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.
+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.

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

 Note they should never be used on production systems.
-
-## Tools we use
-
-[![BrowserStack](https://user-images.githubusercontent.com/45821/41675934-61fa3442-74c4-11e8-8c8e-90768c56ba08.png)](https://www.browserstack.com/)
@@ -1,12 +0,0 @@
-{
-	"presets": [
-		[
-			"env",
-			{
-				"targets": {
-					"browsers": ["last 2 versions", "not ie <= 11"]
-				}
-			}
-		]
-	]
-}
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = tab
-indent_size = 4
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
@@ -1,16 +0,0 @@
-module.exports = {
-	env: {
-		browser: true,
-		es6: true
-	},
-	extends: 'eslint:recommended',
-	parserOptions: {
-		sourceType: 'module'
-	},
-	rules: {
-		indent: ['error', 'tab'],
-		'linebreak-style': ['error', 'unix'],
-		quotes: ['error', 'single'],
-		semi: ['error', 'always']
-	}
-};
@@ -1,12 +0,0 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log
-yarn-error.log
-
-# Editor directories and files
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
@@ -1,3 +0,0 @@
-{
-	"esversion": 6
-}
@@ -1,26 +0,0 @@
-all: dev-setup build-js-production
-
-dev-setup: clean clean-dev npm-init
-
-npm-init:
-	npm install
-
-npm-update:
-	npm update
-
-build-js:
-	npm run dev
-
-build-js-production:
-	npm run build
-
-watch-js:
-	npm run watch
-
-clean:
-	rm -f js/accessibility.js
-	rm -f js/accessibility.js.map
-
-clean-dev:
-	rm -rf node_modules
-
@@ -1,22 +0,0 @@
-# Accessibility ♿
-
-> This app provide multiple features to ease the use of nextcloud.
-
-## Build Setup
-
-``` bash
-# install dependencies
-make dev-setup
-
-# build for development
-make build-js
-
-# build for development and watch edits
-make watch-js
-
-# build for production with minification
-make build-js-production
-
-# clean output files
-make clean
-```
@@ -1,30 +0,0 @@
-<?php
-declare (strict_types = 1);
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-$app = new \OCA\Accessibility\AppInfo\Application();
-
-// Separate from the constructor since the route are not initialized before that
-// 1. create the app
-// 2. generate css route and inject
-$app->injectCss();
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
-    <id>accessibility</id>
-    <name>Accessibility</name>
-    <summary>Accessibility options for nextcloud</summary>
-    <description><![CDATA[Provides multiple accessibilities options to ease your use of nextcloud]]></description>
-    <version>1.0.1</version>
-    <licence>agpl</licence>
-    <author>John Molakvoæ</author>
-    <namespace>Accessibility</namespace>
-    <category>accessibility</category>
-    <default_enable/>
-    <dependencies>
-        <nextcloud min-version="14" max-version="14"/>
-    </dependencies>
-    <default_enable/>
-    <bugs>https://github.com/nextcloud/server/issues</bugs>
-    <settings>
-        <personal>OCA\Accessibility\Settings\Personal</personal>
-        <personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
-    </settings>
-</info>
@@ -1,40 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-return [
-    'routes' => [
-		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
-    ],
-    'ocs' => [
-		[
-			'name' => 'Config#getConfig',
-			'url'  => '/api/v1/config',
-			'verb' => 'GET',
-        ],
-		[
-			'name' => 'Config#setConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'POST',
-		],
-    ]
-];
@@ -1,22 +0,0 @@
-@font-face {
-	font-family: 'OpenDyslexic';
-	font-style: normal;
-	font-weight: 300;
-	src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'OpenDyslexic';
-	font-style: normal;
-	font-weight: normal;
-	src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'OpenDyslexic';
-	font-style: normal;
-	font-weight: 600;
-	src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
-}
-
-$font-face: OpenDyslexic, 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
@@ -1,59 +0,0 @@
-.preview-list {
-	display: flex;
-	flex-wrap: wrap;
-}
-.preview {
-	display: flex;
-	flex-direction: column;
-	min-width: 250px;
-	max-width: 400px;
-	flex: 1 1 300px;
-	border: 1px solid var(--color-border);
-	padding: 10px;
-	border-radius: var(--border-radius);
-	transition: all 200ms ease-in-out;
-	filter: drop-shadow(0 1px 2px var(--color-box-shadow));
-	background-color: var(--color-main-background);
-	opacity: 0.9;
-	margin: 10px;
-	position: relative;
-	&,
-	* {
-		cursor: pointer;
-		user-select: none;
-	}
-	&:hover,
-	&:focus,
-	&.selected {
-		filter: drop-shadow(0 1px 4px var(--color-box-shadow));
-		opacity: 1;
-	}
-	.preview-image {
-		height: 200px;
-		background-position: top left;
-		background-size: cover;
-		background-repeat: no-repeat;
-	}
-	h3 {
-		display: flex;
-		justify-content: space-between;
-		line-height: 1em;
-		align-items: center;
-	}
-	p {
-		text-align: justify;
-	}
-	.icon-checkmark-color {
-		transition: all 100ms ease-in-out;
-		border-radius: 1em;
-		padding: 4px 5px 4px 20px;
-		background-position: 4px center;
-		opacity: 0;
-		visibility: hidden;
-	}
-	&.selected .icon-checkmark-color {
-		opacity: 1;
-		visibility: visible;
-		box-shadow: 0 0 0 1px var(--color-success);
-	}
-}
@@ -1,52 +0,0 @@
-// SCSS variables
-$color-main-text: #d8d8d8;
-$color-main-background: #181818;
-
-$color-background-dark: lighten($color-main-background, 4%);
-$color-background-darker: lighten($color-main-background, 8%);
-
-$color-text-maxcontrast: darken($color-main-text, 30%);
-$color-text-light: darken($color-main-text, 10%);
-$color-text-lighter: darken($color-main-text, 20%);
-
-$color-loading-light: #777;
-$color-loading-dark: #ccc;
-
-$color-box-shadow: rgba(darken($color-main-background, 70%), 0.5);
-
-$color-border: lighten($color-main-background, 7%);
-$color-border-dark: lighten($color-main-background, 14%);
-
-#app-navigation > ul > li > a:first-child,
-#app-navigation > ul > li > ul > li > a:first-child,
-#expanddiv a {
-	img {
-		filter: invert(100%);
-	}
-}
-.bubble,
-.app-navigation-entry-menu,
-.popovermenu {
-	li {
-		> button,
-		> a,
-		> .menuitem {
-			> img {
-				filter: invert(100%);
-			}
-		}
-	}
-}
-.bubble,
-.app-navigation-entry-menu,
-.popovermenu,
-#header .menu {
-	border: 1px solid var(--color-border);
-}
-
-// since svg icons are inverted, revert to white for the header
-.header-right > * {
-	[class^='icon-'], [class*=' icon-'] {
-		filter: invert(100%);
-	}
-}
@@ -1,57 +0,0 @@
-// Fonts
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'),
-		url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-/* overriding default light */
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans'), local('OpenSans'),
-	url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 500 700;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'),
-		url('../../../core/fonts/OpenSans-Bold.woff') format('woff');
-}
-
-// SCSS variables
-$color-main-text: #000;
-$color-main-background: #fff;
-
-$color-background-dark: darken($color-main-background, 30%);
-$color-background-darker: darken($color-main-background, 30%);
-
-$color-text-maxcontrast: $color-main-text;
-$color-text-light: $color-main-text;
-$color-text-lighter: $color-main-text;
-
-$color-loading-light: #ddd;
-$color-loading-dark: #000;
-
-$color-box-shadow: $color-main-text;
-
-$color-border: darken($color-main-background, 50%);
-$color-border-dark: darken($color-main-background, 50%);
-
-$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-
-
-// Font weight reset
-body {
-	font-weight: 400;
-}
-
-[class^='icon-'], [class*=' icon-'],
-.action {
-	opacity: 1 !important;
-}
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   sodipodi:docname="app-dark.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1880"
-     inkscape:window-height="993"
-     id="namedview4"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="36.460193"
-     inkscape:cx="8.4752826"
-     inkscape:cy="18.273624"
-     inkscape:window-x="20"
-     inkscape:window-y="67"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g848"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <g
-     id="g848"
-     transform="matrix(1.1307959,0,0,1.0801738,-1.0463882,-0.84269722)"
-     style="stroke-width:0.90481776;fill:#000000">
-    <circle
-       r="1.9587879"
-       cy="2.8315151"
-       cx="7.990303"
-       id="path844"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.90481776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill" />
-    <path
-       sodipodi:nodetypes="scsssscsccccczzcccccssssccsscs"
-       inkscape:connector-curvature="0"
-       id="path843"
-       d="m 2.3519709,4.2557871 c -0.3126291,0 -0.4819578,0.1287194 -0.5322266,0.4028321 -0.053173,0.2899914 0.1062609,0.5159057 0.4370117,0.6274414 1.420521,0.4790277 2.4256503,0.6675279 3.8410483,0.9800416 0.327839,0.072385 0.6900295,0.2893751 0.6520998,1.0948483 C 6.6985575,8.451345 6.6372144,9.7041167 6.2631031,11.323353 6.0397526,12.290062 5.6782112,13.622766 5.4305838,14.3922 5.3416728,14.668443 5.281658,14.922355 5.281658,15.031849 c 0,0.08257 0.053443,0.249642 0.097656,0.307617 0.023823,0.03125 0.075039,0.07397 0.1147462,0.09522 0.062879,0.03361 0.096262,0.03787 0.2612304,0.03663 0.3361373,-0.0026 0.4608113,-0.08245 0.6665037,-0.429687 0.4838657,-0.939315 0.7378785,-2.132191 0.9402993,-3.014266 0.092189,-0.517235 0.2624476,-1.66347 0.6710287,-1.66347 0.4085811,0 0.4979093,0.95008 0.6812062,1.687228 0.1832969,0.737148 0.6122738,2.295202 0.7738717,2.704862 0.2137476,0.54186 0.5742238,0.836985 0.8764648,0.717774 0.03316,-0.01301 0.116937,-0.04526 0.187989,-0.0708 0.147435,-0.053 0.186715,-0.07824 0.219726,-0.156249 0.0655,-0.154793 -0.01013,-0.454047 -0.349121,-1.41114 C 9.7721847,11.597192 9.2651806,9.3990255 9.3334308,7.2974743 9.3630343,6.3859259 9.6837054,6.305369 10.075725,6.2075087 c 1.17285,-0.2927798 2.00228,-0.379973 3.387085,-0.8579717 0.468513,-0.1617184 0.727539,-0.2608264 0.727539,-0.5590819 0,-0.2554049 -0.153084,-0.4346541 -0.437011,-0.5102538 -0.116851,-0.031101 -0.318383,-0.028905 -0.632326,0.00243 -1.085189,0.10834 -2.939683,0.5153868 -4.0234365,0.6710819 -0.529944,0.076133 -1.7229392,0.094015 -2.2729489,0 C 5.6763224,4.7574297 4.1363176,4.4147025 2.9061699,4.2997326 2.6560099,4.2763537 2.4068766,4.2557871 2.3519709,4.2557871 Z"
-       style="fill:#000000;stroke-width:0.9048177" />
-  </g>
-</svg>
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   sodipodi:docname="app.svg"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1880"
-     inkscape:window-height="993"
-     id="namedview4"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="36.460193"
-     inkscape:cx="8.4752826"
-     inkscape:cy="18.273624"
-     inkscape:window-x="20"
-     inkscape:window-y="67"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g848"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <g
-     id="g848"
-     transform="matrix(1.1307959,0,0,1.0801738,-1.0463882,-0.84269722)"
-     style="stroke-width:0.90481776;fill:#000000">
-    <circle
-       r="1.9587879"
-       cy="2.8315151"
-       cx="7.990303"
-       id="path844"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.90481776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill" />
-    <path
-       sodipodi:nodetypes="scsssscsccccczzcccccssssccsscs"
-       inkscape:connector-curvature="0"
-       id="path843"
-       d="m 2.3519709,4.2557871 c -0.3126291,0 -0.4819578,0.1287194 -0.5322266,0.4028321 -0.053173,0.2899914 0.1062609,0.5159057 0.4370117,0.6274414 1.420521,0.4790277 2.4256503,0.6675279 3.8410483,0.9800416 0.327839,0.072385 0.6900295,0.2893751 0.6520998,1.0948483 C 6.6985575,8.451345 6.6372144,9.7041167 6.2631031,11.323353 6.0397526,12.290062 5.6782112,13.622766 5.4305838,14.3922 5.3416728,14.668443 5.281658,14.922355 5.281658,15.031849 c 0,0.08257 0.053443,0.249642 0.097656,0.307617 0.023823,0.03125 0.075039,0.07397 0.1147462,0.09522 0.062879,0.03361 0.096262,0.03787 0.2612304,0.03663 0.3361373,-0.0026 0.4608113,-0.08245 0.6665037,-0.429687 0.4838657,-0.939315 0.7378785,-2.132191 0.9402993,-3.014266 0.092189,-0.517235 0.2624476,-1.66347 0.6710287,-1.66347 0.4085811,0 0.4979093,0.95008 0.6812062,1.687228 0.1832969,0.737148 0.6122738,2.295202 0.7738717,2.704862 0.2137476,0.54186 0.5742238,0.836985 0.8764648,0.717774 0.03316,-0.01301 0.116937,-0.04526 0.187989,-0.0708 0.147435,-0.053 0.186715,-0.07824 0.219726,-0.156249 0.0655,-0.154793 -0.01013,-0.454047 -0.349121,-1.41114 C 9.7721847,11.597192 9.2651806,9.3990255 9.3334308,7.2974743 9.3630343,6.3859259 9.6837054,6.305369 10.075725,6.2075087 c 1.17285,-0.2927798 2.00228,-0.379973 3.387085,-0.8579717 0.468513,-0.1617184 0.727539,-0.2608264 0.727539,-0.5590819 0,-0.2554049 -0.153084,-0.4346541 -0.437011,-0.5102538 -0.116851,-0.031101 -0.318383,-0.028905 -0.632326,0.00243 -1.085189,0.10834 -2.939683,0.5153868 -4.0234365,0.6710819 -0.529944,0.076133 -1.7229392,0.094015 -2.2729489,0 C 5.6763224,4.7574297 4.1363176,4.4147025 2.9061699,4.2997326 2.6560099,4.2763537 2.4068766,4.2557871 2.3519709,4.2557871 Z"
-       style="fill:#ffffff;stroke-width:0.9048177" />
-  </g>
-</svg>
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility;
-
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-class AccessibilityProvider {
-
-	/** @var string */
-	protected $appName;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IL10N */
-	private $l;
-
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->appName      = $appName;
-		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
-	}
-
-	public function getThemes() {
-		return array(
-			[
-				'id'    => 'themehighcontrast',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-highcontrast.jpg'),
-				'title' => $this->l->t('High contrast theme'),
-				'text'  => $this->l->t('A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased.')
-			], [
-				'id'    => 'themedark',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
-				'title' => $this->l->t('Dark theme (beta)'),
-				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
-			]
-		);
-	}
-
-	public function getFonts() {
-		return array(
-			[
-				'id'    => 'fontdyslexic',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
-				'title' => $this->l->t('Dyslexia font'),
-				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia. The typeface was created by Abelardo Gonzalez, who released it through an open-source license.')
-			]
-		);
-	}
-
-}
@@ -1,65 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility\AppInfo;
-
-use OCP\AppFramework\App;
-use OCP\IConfig;
-use OCP\IUserSession;
-use OCP\IURLGenerator;
-
-class Application extends App {
-
-	/** @var string */
-	protected $appName = 'accessibility';
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct() {
-		parent::__construct($this->appName);
-		$this->config       = \OC::$server->getConfig();
-		$this->userSession  = \OC::$server->getUserSession();
-		$this->urlGenerator = \OC::$server->getURLGenerator();
-	}
-
-	public function injectCss() {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $this->userSession->getUser();
-		if (!is_null($loggedUser)) {
-			$userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $this->config->getUserValue($loggedUser->getUID(), $this->appName, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-		}
-	}
-}
@@ -1,259 +0,0 @@
-<?php
-declare (strict_types = 1);
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility\Controller;
-
-use Leafo\ScssPhp\Compiler;
-use Leafo\ScssPhp\Exception\ParserException;
-use Leafo\ScssPhp\Formatter\Crunched;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataDisplayResponse;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\App\IAppManager;
-use OCP\IConfig;
-use OCP\ILogger;
-use OCP\IRequest;
-use OCP\IURLGenerator;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OC\Template\IconsCacher;
-
-class AccessibilityController extends Controller {
-
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IconsCacher */
-	protected $iconsCacher;
-
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/** @var null|string */
-	private $injectedVariables;
-
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserManager $userManager,
-								ILogger $logger,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IconsCacher $iconsCacher,
-								\OC_Defaults $defaults) {
-		parent::__construct($appName, $request);
-		$this->appName      = $appName;
-		$this->config       = $config;
-		$this->userManager  = $userManager;
-		$this->logger       = $logger;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-		$this->userSession  = $userSession;
-		$this->appManager   = $appManager;
-		$this->iconsCacher  = $iconsCacher;
-		$this->defaults     = $defaults;
-
-		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
-
-		foreach ($userValues as $key => $scssFile) {
-			if ($scssFile !== false) {
-				$imports .= '@import "' . $scssFile . '";';
-			}
-		}
-
-		if ($imports !== '') {
-			$scss = new Compiler();
-			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
-			]);
-
-			// Continue after throw
-			$scss->setIgnoreErrors(true);
-			$scss->setFormatter(Crunched::class);
-
-			// Import theme, variables and compile css4 variables
-			try {
-				$css .= $scss->compile(
-					$imports .
-					$this->getInjectedVariables() .
-					'@import "variables.scss";' .
-					'@import "css-variables.scss";'
-				);
-			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(), ['app' => 'core']);
-			}
-		}
-
-		// We don't want to override vars with url since path is different
-		$css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
-
-		// Rebase all urls
-		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
-
-		if (in_array('themedark', $userValues) && $this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
-			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedCSS()->getContent());
-			$css = $css . $iconsCss;
-		}
-
-		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-
-		// Set cache control
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-
-		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
-
-		return $response;
-	}
-
-	/**
-	 * Return an array with the user theme & font settings
-	 *
-	 * @return array
-	 */
-	private function getUserValues(): array{
-		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
-
-		return [$userTheme, $userFont];
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $rule regex to match
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function filterOutRule(string $rule, string $css): string {
-		return preg_replace($rule, '', $css);
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 *
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
-
-		return preg_replace($re, $subst, $css);
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function invertSvgIconsColor(string $css) {
-		return str_replace(['/000', '/fff', '/***'], ['/***', '/000', '/fff'], $css);
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables(): string {
-		if ($this->injectedVariables !== null) {
-			return $this->injectedVariables;
-		}
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
-		}
-
-		// check for valid variables / otherwise fall back to defaults
-		try {
-			$scss = new Compiler();
-			$scss->compile($variables);
-			$this->injectedVariables = $variables;
-		} catch (ParserException $e) {
-			$this->logger->error($e, ['app' => 'core']);
-		}
-		return $variables;
-	}
-}
@@ -1,133 +0,0 @@
-<?php
-declare (strict_types = 1);
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility\Controller;
-
-use OCA\Accessibility\AccessibilityProvider;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\OCSController;
-use OCP\AppFramework\OCS\OCSBadRequestException;
-use OCP\IConfig;
-use OCP\IRequest;
-use OCP\IUserSession;
-
-class ConfigController extends OCSController {
-
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $userId;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								AccessibilityProvider $accessibilityProvider) {
-		parent::__construct($appName, $request);
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get user accessibility config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 */
-	public function getConfig(): DataResponse {
-		return new DataResponse([
-			'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws Exception
-	 */
-	public function setConfig(string $key, $value): DataResponse {
-		if ($key === 'theme' || $key === 'font') {
-
-			if ($value === false) {
-				$this->config->deleteUserValue($this->userId, $this->appName, $key);
-				$userValues = $this->config->getUserKeys($this->userId, $this->appName);
-
-				// remove hash if no settings selected
-				if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
-					$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
-				}
-
-				return new DataResponse();
-			}
-
-			$themes = $this->accessibilityProvider->getThemes();
-			$fonts  = $this->accessibilityProvider->getFonts();
-
-			$availableOptions = array_map(function($option) {
-				return $option['id'];
-			}, array_merge($themes, $fonts));
-
-			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userId, $this->appName, $key, $value);
-				return new DataResponse();
-			}
-
-			throw new OCSBadRequestException('Invalid value: ' . $value);
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
-
-}
@@ -1,113 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility\Settings;
-
-use OCA\Accessibility\AccessibilityProvider;
-use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use OCP\IUserSession;
-use OCP\Settings\ISettings;
-
-class Personal implements ISettings {
-
-	/** @var string */
-	protected $appName;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/**
-	 * Settings constructor.
-	 *
-	 * @param string $appName
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IConfig $config,
-								IUserSession $userSession,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								AccessibilityProvider $accessibilityProvider) {
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->l                     = $l;
-		$this->urlGenerator          = $urlGenerator;
-		$this->accessibilityProvider = $accessibilityProvider;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-
-		$serverData = [
-			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts'  => $this->accessibilityProvider->getFonts(),
-			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
-		];
-
-		return new TemplateResponse($this->appName, 'settings-personal', ['serverData' => $serverData]);
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return $this->appName;
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 40;
-	}
-}
@@ -1,100 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Accessibility\Settings;
-
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use OCP\Settings\IIconSection;
-
-class PersonalSection implements IIconSection {
-
-	/** @var string */
-	protected $appName;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IL10N */
-	private $l;
-
-	/**
-	 * Personal Section constructor.
-	 *
-	 * @param string $appName
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->appName      = $appName;
-		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
-	}
-
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 13.0.0
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
-	}
-
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		return $this->appName;
-	}
-
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Accessibility');
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 15;
-	}
-}
@@ -1,33 +0,0 @@
-{
-	"name": "accessibility",
-	"description": "Provides multiple accessibilities options to ease your use of nextcloud",
-	"version": "1.0.2",
-	"author": "John Molakvoæ <skjnldsv@protonmail.com>",
-	"license": "agpl",
-	"private": true,
-	"scripts": {
-		"dev": "webpack --config webpack.dev.js",
-		"watch": "webpack --progress --watch --config webpack.dev.js",
-		"build": "webpack --progress --hide-modules --config webpack.prod.js"
-	},
-	"dependencies": {
-		"axios": "^0.18.1",
-		"vue": "^2.5.16"
-	},
-	"browserslist": [
-		"last 2 versions",
-		"not ie <= 11"
-	],
-	"devDependencies": {
-		"babel-core": "^6.26.3",
-		"babel-loader": "^7.1.5",
-		"babel-preset-env": "^1.7.0",
-		"css-loader": "^1.0.0",
-		"file-loader": "^1.1.11",
-		"vue-loader": "^15.2.6",
-		"vue-template-compiler": "^2.5.16",
-		"webpack": "^4.16.1",
-		"webpack-cli": "^3.1.0",
-		"webpack-merge": "^4.1.3"
-	}
-}
@@ -1,116 +0,0 @@
-<template>
-	<div id="accessibility">
-		<div id="themes" class="section">
-			<h2>{{t('accessibility', 'Themes')}}</h2>
-			<div class="themes-list preview-list">
-				<preview v-for="preview in themes" :preview="preview"
-						 :key="preview.id" :selected="selected.theme"
-						 v-on:select="selectTheme"></preview>
-			</div>
-		</div>
-		<div id="fonts" class="section">
-			<h2>{{t('accessibility', 'Fonts')}}</h2>
-			<div class="fonts-list preview-list">
-				<preview v-for="preview in fonts" :preview="preview"
-						 :key="preview.id" :selected="selected.font"
-						 v-on:select="selectFont"></preview>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-import preview from './components/itemPreview';
-import axios from 'axios';
-
-export default {
-	name: 'Accessibility',
-	components: { preview },
-	beforeMount() {
-		// importing server data into the app
-		const serverDataElmt = document.getElementById('serverData');
-		if (serverDataElmt !== null) {
-			this.serverData = JSON.parse(
-				document.getElementById('serverData').dataset.server
-			);
-		}
-	},
-	data() {
-		return {
-			serverData: []
-		};
-	},
-	computed: {
-		themes() {
-			return this.serverData.themes;
-		},
-		fonts() {
-			return this.serverData.fonts;
-		},
-		selected() {
-			return {
-				theme: this.serverData.theme,
-				font: this.serverData.font
-			};
-		},
-		tokenHeaders() {
-			return { headers: { requesttoken: OC.requestToken } };
-		}
-	},
-	methods: {
-		selectTheme(id) {
-			this.selectItem('theme', id);
-		},
-		selectFont(id) {
-			this.selectItem('font', id);
-		},
-
-		/**
-		 * Commit a change and force reload css
-		 * Fetching the file again will trigger the server update
-		 *
-		 * @param {string} type type of the change (font or theme)
-		 * @param {string} id the data of the change
-		 */
-		selectItem(type, id) {
-			axios.post(
-					OC.linkToOCS('apps/accessibility/api/v1/config', 2) + type,
-					{ value: id },
-					this.tokenHeaders
-				)
-				.then(response => {
-					this.serverData[type] = id;
-
-					// Remove old link
-					let link = document.querySelector('link[rel=stylesheet][href*=accessibility][href*=user-]');
-					if (!link) {
-						// insert new css
-						let link = document.createElement('link');
-						link.rel = 'stylesheet';
-						link.href = OC.generateUrl('/apps/accessibility/css/user-style.css') + '?v=' + new Date().getTime();
-						document.head.appendChild(link);
-					} else {
-						// compare arrays
-						if (
-							JSON.stringify(Object.values(this.selected)) ===
-							JSON.stringify([false, false])
-						) {
-							// if nothing is selected, blindly remove the css
-							link.remove();
-						} else {
-							// force update
-							link.href =
-								link.href.split('?')[0] +
-								'?v=' +
-								new Date().getTime();
-						}
-					}
-				})
-				.catch(err => {
-					console.log(err, err.response);
-					OC.Notification.showTemporary(t('accessibility', err.response.data.ocs.meta.message + '. Unable to apply the setting.'));
-				});
-		}
-	}
-};
-</script>
@@ -1,27 +0,0 @@
-<template>
-	<a :class="{preview: true, selected: preview.id === selected}"
-	   href="#" @click="selectItem">
-		<div class="preview-image" :style="{backgroundImage: 'url(' + preview.img + ')'}"></div>
-		<h3>
-			<span>{{preview.title}}</span>
-			<div class="icon-checkmark-color">{{t('accessibility', 'enabled')}}</div>
-		</h3>
-		<p>{{preview.text}}</p>
-	</a>
-</template>
-
-<script>
-export default {
-	name: 'itemPreview',
-	props: ['preview', 'selected'],
-	methods: {
-		selectItem() {
-			this.$emit(
-				'select',
-				// if we clicked the already selected one: disable it
-				this.preview.id === this.selected ? false : this.preview.id
-			);
-		}
-	}
-};
-</script>
@@ -1,12 +0,0 @@
-import Vue from 'vue';
-import App from './App.vue';
-
-/* global t */
-// bind to window
-Vue.prototype.OC = OC;
-Vue.prototype.t = t;
-
-new Vue({
-	el: '#accessibility',
-	render: h => h(App)
-});
@@ -1,29 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-script('accessibility', 'accessibility');
-style('accessibility', 'style');
-?>
-
-<span id="serverData" data-server="<?php p(json_encode($_['serverData']));?>"></span>
-<span id="accessibility"></span>
@@ -1,42 +0,0 @@
-const path = require('path');
-const { VueLoaderPlugin } = require('vue-loader');
-
-module.exports = {
-	entry: path.join(__dirname, 'src', 'main.js'),
-	output: {
-		path: path.resolve(__dirname, './js'),
-		publicPath: '/js/',
-		filename: 'accessibility.js'
-	},
-	module: {
-		rules: [
-			{
-				test: /\.css$/,
-				use: ['vue-style-loader', 'css-loader']
-			},
-			{
-				test: /\.vue$/,
-				loader: 'vue-loader'
-			},
-			{
-				test: /\.js$/,
-				loader: 'babel-loader',
-				exclude: /node_modules/
-			},
-			{
-				test: /\.(png|jpg|gif|svg)$/,
-				loader: 'file-loader',
-				options: {
-					name: '[name].[ext]?[hash]'
-				}
-			}
-		]
-	},
-	plugins: [new VueLoaderPlugin()],
-	resolve: {
-		alias: {
-			vue$: 'vue/dist/vue.esm.js'
-		},
-		extensions: ['*', '.js', '.vue', '.json']
-	}
-};
@@ -1,12 +0,0 @@
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
-
-module.exports = merge(common, {
-	mode: 'development',
-	devServer: {
-		historyApiFallback: true,
-		noInfo: true,
-		overlay: true
-	},
-	devtool: '#eval-source-map'
-});
@@ -1,7 +0,0 @@
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
-
-module.exports = merge(common, {
-	mode: 'production',
-	devtool: '#source-map'
-});
@@ -1,10 +1,9 @@
 <?php
-declare(strict_types=1);
 /**
 * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
 * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
 *
- * @author Joas Schilling <coding@schilljs.com>
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -24,5 +23,15 @@ declare(strict_types=1);
 *
 */

-$app = new \OCA\AdminAudit\AppInfo\Application();
-$app->register();
+$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();
@@ -1,23 +1,15 @@
 <?xml version="1.0"?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+<info>
 	<id>admin_audit</id>
 	<name>Auditing / Logging</name>
-	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.4.0</version>
-	<licence>agpl</licence>
+	<licence>AGPL</licence>
 	<author>Nextcloud</author>
-	<namespace>AdminAudit</namespace>
+	<version>1.2.0</version>
+	<dependencies>
+		<nextcloud min-version="12" max-version="12" />
+	</dependencies>
 	<types>
 		<logging/>
 	</types>
-	<category>monitoring</category>
-	<bugs>https://github.com/nextcloud/server/issues</bugs>
-	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
-	</dependencies>
-	<background-jobs>
-		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
-	</background-jobs>
 </info>
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitAdminAudit::getLoader();
@@ -1,13 +0,0 @@
-{
-    "config" : {
-        "vendor-dir": ".",
-        "optimize-autoloader": true,
-        "classmap-authoritative": true,
-        "autoloader-suffix": "AdminAudit"
-    },
-    "autoload" : {
-        "psr-4": {
-            "OCA\\AdminAudit\\": "../lib/"
-        }
-    }
-}
@@ -1,445 +0,0 @@
-<?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') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $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;
-}
@@ -1,21 +0,0 @@
-
-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.
-
@@ -1,22 +0,0 @@
-<?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\\Security' => $baseDir . '/../lib/Actions/Security.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',
-    'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => $baseDir . '/../lib/BackgroundJobs/Rotate.php',
-);
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = $vendorDir;
-
-return array(
-);
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = $vendorDir;
-
-return array(
-    'OCA\\AdminAudit\\' => array($baseDir . '/../lib'),
-);
@@ -1,43 +0,0 @@
-<?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;
-    }
-}
@@ -1,48 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInitAdminAudit
-{
-    public static $prefixLengthsPsr4 = array (
-        'O' => 
-        array (
-            'OCA\\AdminAudit\\' => 15,
-        ),
-    );
-
-    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\\Security' => __DIR__ . '/..' . '/../lib/Actions/Security.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',
-        'OCA\\AdminAudit\\BackgroundJobs\\Rotate' => __DIR__ . '/..' . '/../lib/BackgroundJobs/Rotate.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitAdminAudit::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitAdminAudit::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitAdminAudit::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}
@@ -1,59 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @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(string $appName) {
-		$this->log('App "%s" enabled',
-			['app' => $appName],
-			['app']
-		);
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string[] $groups
-	 */
-	public function enableAppForGroups(string $appName, array $groups) {
-		$this->log('App "%s" enabled for groups: %s',
-			['app' => $appName, 'groups' => implode(', ', $groups)],
-			['app', 'groups']
-		);
-	}
-
-	/**
-	 * @param string $appName
-	 */
-	public function disableApp(string $appName) {
-		$this->log('App "%s" disabled',
-			['app' => $appName],
-			['app']
-		);
-	}
-}
@@ -1,46 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @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(array $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']
-		);
-	}
-}
@@ -1,75 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\AdminAudit\Actions;
-use OCP\IUser;
-
-/**
- * Class Sharing logs the sharing actions
- *
- * @package OCA\AdminAudit\Actions
- */
-class Security extends Action {
-	/**
-	 * Log twofactor auth enabled
-	 *
-	 * @param IUser $user
-	 * @param array $params
-	 */
-	public function twofactorFailed(IUser $user, array $params) {
-		$params['uid'] = $user->getUID();
-		$params['displayName'] = $user->getDisplayName();
-
-		$this->log(
-			'Failed two factor attempt by user %s (%s) with provider %s',
-			$params,
-			[
-				'displayName',
-				'uid',
-				'provider',
-			]
-		);
-	}
-
-	/**
-	 * Logs unsharing of data
-	 *
-	 * @param IUser $user
-	 * @param array $params
-	 */
-	public function twofactorSuccess(IUser $user, array $params) {
-		$params['uid'] = $user->getUID();
-		$params['displayName'] = $user->getDisplayName();
-
-		$this->log(
-			'Successful two factor attempt by user %s (%s) with provider %s',
-			$params,
-			[
-				'displayName',
-				'uid',
-				'provider',
-			]
-		);
-	}
-}
@@ -1,257 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @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\Security;
-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\Authentication\TwoFactorAuth\IProvider;
-use OCP\Console\ConsoleEvent;
-use OCP\IGroupManager;
-use OCP\ILogger;
-use OCP\IPreview;
-use OCP\IUserSession;
-use OCP\Util;
-use Symfony\Component\EventDispatcher\GenericEvent;
-use OCP\Share;
-
-class Application extends App {
-
-	/** @var ILogger */
-	protected $logger;
-
-	public function __construct() {
-		parent::__construct('admin_audit');
-		$this->initLogger();
-	}
-
-	public function initLogger() {
-		$c = $this->getContainer()->getServer();
-		$config = $c->getConfig();
-
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
-		if($logFile === null) {
-			$this->logger = $c->getLogger();
-			return;
-		}
-		$this->logger = $c->getLogFactory()->getCustomLogger($logFile);
-
-	}
-
-	public function register() {
-		$this->registerHooks();
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	protected function registerHooks() {
-		$this->userManagementHooks();
-		$this->groupHooks();
-		$this->authHooks();
-
-		$this->consoleHooks();
-		$this->appHooks();
-
-		$this->sharingHooks();
-
-		$this->fileHooks();
-		$this->trashbinHooks();
-		$this->versionsHooks();
-
-		$this->securityHooks();
-	}
-
-	protected 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');
-
-		/** @var IUserSession|Session $userSession */
-		$userSession = $this->getContainer()->getServer()->getUserSession();
-		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
-		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
-	}
-
-	protected function groupHooks()  {
-		$groupActions = new GroupManagement($this->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() {
-		$shareActions = new Sharing($this->logger);
-
-		Util::connectHook(Share::class, 'post_shared', $shareActions, 'shared');
-		Util::connectHook(Share::class, 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook(Share::class, 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook(Share::class, 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook(Share::class, 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook(Share::class, 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	protected 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');
-	}
-
-	protected function appHooks() {
-
-		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) {
-			$appActions = new AppManagement($this->logger);
-			$appActions->enableApp($event->getAppID());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) {
-			$appActions = new AppManagement($this->logger);
-			$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
-		});
-		$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) {
-			$appActions = new AppManagement($this->logger);
-			$appActions->disableApp($event->getAppID());
-		});
-
-	}
-
-	protected function consoleHooks() {
-		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) {
-			$appActions = new Console($this->logger);
-			$appActions->runCommand($event->getArguments());
-		});
-	}
-
-	protected function fileHooks() {
-		$fileActions = new Files($this->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() {
-		$versionsActions = new Versions($this->logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
-	}
-
-	protected function trashbinHooks() {
-		$trashActions = new Trashbin($this->logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
-
-	protected function securityHooks() {
-		$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$eventDispatcher->addListener(IProvider::EVENT_SUCCESS, function(GenericEvent $event) {
-			$security = new Security($this->logger);
-			$security->twofactorSuccess($event->getSubject(), $event->getArguments());
-		});
-		$eventDispatcher->addListener(IProvider::EVENT_FAILED, function(GenericEvent $event) {
-			$security = new Security($this->logger);
-			$security->twofactorFailed($event->getSubject(), $event->getArguments());
-		});
-	}
-}
@@ -1,52 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 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\AdminAudit\BackgroundJobs;
-
-use OC\BackgroundJob\TimedJob;
-use OCP\Log\RotationTrait;
-
-class Rotate extends TimedJob {
-	use RotationTrait;
-
-	public function __construct() {
-		$this->setInterval(60*60*3);
-	}
-
-	protected function run($argument) {
-		$config = \OC::$server->getConfig();
-		$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
-		$this->filePath = $config->getAppValue('admin_audit', 'logfile', $default);
-
-		if($this->filePath === '') {
-			// default log file, nothing to do
-			return;
-		}
-
-		$this->maxSize = $config->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
-
-		if($this->shouldRotateBySize()) {
-			$this->rotate();
-		}
-	}
-}
@@ -1,9 +1,7 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
@@ -22,8 +20,7 @@ declare(strict_types=1);
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-namespace OCA\AdminAudit\Actions;
+namespace OCA\Admin_Audit\Actions;

 use OCP\ILogger;

@@ -46,10 +43,10 @@ class Action {
 	 * @param array $elements
 	 * @param bool $obfuscateParameters
 	 */
-	public function log(string $text,
+	public function log($text,
 						array $params,
 						array $elements,
-						bool $obfuscateParameters = false) {
+						$obfuscateParameters = false) {
 		foreach($elements as $element) {
 			if(!isset($params[$element])) {
 				if ($obfuscateParameters) {
@@ -1,9 +1,7 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
@@ -22,13 +20,12 @@ declare(strict_types=1);
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-namespace OCA\AdminAudit\Actions;
+namespace OCA\Admin_Audit\Actions;

 /**
 * Class Auth logs all auth related actions
 *
- * @package OCA\AdminAudit\Actions
+ * @package OCA\Admin_Audit\Actions
 */
 class Auth extends Action {
 	public function loginAttempt(array $params) {
@@ -1,9 +1,7 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
@@ -22,13 +20,12 @@ declare(strict_types=1);
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-namespace OCA\AdminAudit\Actions;
+namespace OCA\Admin_Audit\Actions;

 /**
 * Class Files logs the actions to files
 *
- * @package OCA\AdminAudit\Actions
+ * @package OCA\Admin_Audit\Actions
 */
 class Files extends Action {
 	/**
@@ -1,10 +1,8 @@
 <?php
-declare(strict_types=1);
 /**
 * @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>
 *
@@ -25,16 +23,18 @@ declare(strict_types=1);
 *
 */

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


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

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

@@ -1,9 +1,7 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
@@ -22,16 +20,13 @@ declare(strict_types=1);
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-namespace OCA\AdminAudit\Actions;
-
-
+namespace OCA\Admin_Audit\Actions;
 use OCP\Share;

 /**
 * Class Sharing logs the sharing actions
 *
- * @package OCA\AdminAudit\Actions
+ * @package OCA\Admin_Audit\Actions
 */
 class Sharing extends Action {
 	/**
@@ -78,19 +73,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the room "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
 		}
 	}

@@ -135,18 +117,6 @@ class Sharing extends Action {
 					'id',
 				]
 			);
-		} elseif($params['shareType'] === Share::SHARE_TYPE_ROOM) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the room "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
 		}
 	}

@@ -1,10 +1,8 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
 *
@@ -23,18 +21,19 @@ declare(strict_types=1);
 *
 */

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


 class Trashbin extends Action {

-	public function delete(array $params) {
+	public function delete($params) {
 		$this->log('File "%s" deleted from trash bin.',
 			['path' => $params['path']], ['path']
 		);
 	}

-	public function restore(array $params) {
+	public function restore($params) {
 		$this->log('File "%s" restored from trash bin.',
 			['path' => $params['filePath']], ['path']
 		);
@@ -1,10 +1,8 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
@@ -23,16 +21,13 @@ declare(strict_types=1);
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-namespace OCA\AdminAudit\Actions;
-
-
+namespace OCA\Admin_Audit\Actions;
 use OCP\IUser;

 /**
 * Class UserManagement logs all user management related actions.
 *
- * @package OCA\AdminAudit\Actions
+ * @package OCA\Admin_Audit\Actions
 */
 class UserManagement extends Action {
 	/**
@@ -50,19 +45,6 @@ class UserManagement extends Action {
 		);
 	}

-	/**
-	 * Log assignments of users (typically user backends)
-	 *
-	 * @param string $uid
-	 */
-	public function assign(string $uid) {
-		$this->log(
-		'UserID assigned: "%s"',
-			[ 'uid' => $uid ],
-			[ 'uid' ]
-		);
-	}
-
 	/**
 	 * Log deletion of users
 	 *
@@ -78,44 +60,20 @@ class UserManagement extends Action {
 		);
 	}

-	/**
-	 * Log unassignments of users (typically user backends, no data removed)
-	 *
-	 * @param string $uid
-	 */
-	public function unassign(string $uid) {
-		$this->log(
-			'UserID unassigned: "%s"',
-			[ 'uid' => $uid ],
-			[ 'uid' ]
-		);
-	}
-
 	/**
 	 * Log enabling of users
 	 *
 	 * @param array $params
 	 */
 	public function change(array $params) {
-		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;
+		if ($params['feature'] === 'enabled') {
+			$this->log(
+				$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
+				['user' => $params['user']->getUID()],
+				[
+					'user',
+				]
+			);
 		}
 	}

@@ -1,10 +1,8 @@
 <?php
-declare(strict_types=1);
 /**
 * @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
 *
@@ -23,12 +21,13 @@ declare(strict_types=1);
 *
 */

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


 class Versions extends Action {

-	public function rollback(array $params) {
+	public function rollback($params) {
 		$this->log('Version "%s" of "%s" was restored.',
 			[
 				'version' => $params['revision'],
@@ -38,7 +37,7 @@ class Versions extends Action {
 		);
 	}

-	public function delete(array $params) {
+	public function delete($params) {
 		$this->log('Version "%s" was deleted.',
 			['path' => $params['path']],
 			['path']
@@ -0,0 +1,209 @@
+<?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');
+	}
+
+}
@@ -1,75 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2018 Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\AdminAudit\Tests\Actions;
-
-use OCA\AdminAudit\Actions\Security;
-use OCP\ILogger;
-use OCP\IUser;
-use Test\TestCase;
-
-class SecurityTest extends TestCase {
-	/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
-	private $logger;
-
-	/** @var Security */
-	private $security;
-
-	/** @var IUser|\PHPUnit_Framework_MockObject_MockObject */
-	private $user;
-
-	public function setUp() {
-		parent::setUp();
-
-		$this->logger = $this->createMock(ILogger::class);
-		$this->security = new Security($this->logger);
-
-		$this->user = $this->createMock(IUser::class);
-		$this->user->method('getUID')->willReturn('myuid');
-		$this->user->method('getDisplayName')->willReturn('mydisplayname');
-	}
-
-	public function testTwofactorFailed() {
-		$this->logger->expects($this->once())
-			->method('info')
-			->with(
-				$this->equalTo('Failed two factor attempt by user mydisplayname (myuid) with provider myprovider'),
-				['app' => 'admin_audit']
-			);
-
-		$this->security->twofactorFailed($this->user, ['provider' => 'myprovider']);
-	}
-
-	public function testTwofactorSuccess() {
-		$this->logger->expects($this->once())
-			->method('info')
-			->with(
-				$this->equalTo('Successful two factor attempt by user mydisplayname (myuid) with provider myprovider'),
-				['app' => 'admin_audit']
-			);
-
-		$this->security->twofactorSuccess($this->user, ['provider' => 'myprovider']);
-	}
-
-}
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
@@ -1,2 +0,0 @@
-# cloud_federation_api
-The cloud federation API allows to share information like files, contacts, calendars, incoming calls, etc accross Nextcloud instances
@@ -1,22 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @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/>.
- *
- */
-
-$app = new \OCA\CloudFederationAPI\AppInfo\Application();
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
-    <id>cloud_federation_api</id>
-    <name>Cloud Federation API</name>
-    <summary>Enable clouds to communicate with each other and exchange data</summary>
-    <description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-    <version>0.0.1</version>
-    <licence>agpl</licence>
-    <author>Bjoern Schiessle</author>
-    <namespace>CloudFederationAPI</namespace>
-    <types>
-        <filesystem/>
-    </types>
-    <category>files</category>
-    <bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
-    <dependencies>
-        <nextcloud min-version="14" max-version="14"/>
-    </dependencies>
-</info>
@@ -1,37 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @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\CloudFederationAPI\AppInfo;
-
-
-use OCA\CloudFederationAPI\Capabilities;
-use OCP\AppFramework\App;
-
-class Application extends App {
-
-	public function __construct() {
-		parent::__construct('cloud_federation_api');
-
-		$container = $this->getContainer();
-		$container->registerCapability(Capabilities::class);
-	}
-}
@@ -1,64 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @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\CloudFederationAPI;
-
-
-use OCP\Capabilities\ICapability;
-use OCP\IURLGenerator;
-
-class Capabilities implements ICapability {
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-		$capabilities = ['ocm' =>
-			[
-				'enabled' => true,
-				'apiVersion' => '1.0-proposal1',
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'shareTypes' => [
-					[
-						'name' => 'file',
-						'protocols' => [
-							'webdav' => '/public.php/webdav/',
-						]
-					],
-				]
-			]
-		];
-
-		return $capabilities;
-	}
-}
@@ -1,60 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @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\CloudFederationAPI;
-use OCP\Federation\ICloudFederationProviderManager;
-use OCP\GlobalScale\IConfig as IGsConfig;
-use OCP\IConfig;
-
-
-/**
- * Class config
- *
- * handles all the config parameters
- *
- * @package OCA\CloudFederationAPI
- */
-class Config {
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager) {
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-	}
-
-	/**
-	 * get a list of supported share types
-	 *
-	 * @param string $resourceType
-	 * @return array
-	 */
-	public function getSupportedShareTypes($resourceType) {
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			return $provider->getSupportedShareTypes();
-		} catch (\Exception $e) {
-			return [];
-		}
-	}
-
-}
@@ -1,300 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @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\CloudFederationAPI\Controller;
-
-use OCA\CloudFederationAPI\Config;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\Federation\Exceptions\ActionNotSupportedException;
-use OCP\Federation\Exceptions\AuthenticationFailedException;
-use OCP\Federation\Exceptions\BadRequestException;
-use OCP\Federation\Exceptions\ProviderCouldNotAddShareException;
-use OCP\Federation\ICloudFederationFactory;
-use OCP\Federation\ICloudFederationProviderManager;
-use OCP\Federation\Exceptions\ProviderDoesNotExistsException;
-use OCP\Federation\ICloudIdManager;
-use OCP\IGroupManager;
-use OCP\ILogger;
-use OCP\IRequest;
-use OCP\IURLGenerator;
-use OCP\IUserManager;
-use OCP\Share\Exceptions\ShareNotFound;
-
-
-/**
- * Class RequestHandlerController
- *
- * handle API between different Cloud instances
- *
- * @package OCA\CloudFederationAPI\Controller
- */
-class RequestHandlerController extends Controller {
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	/** @var Config */
-	private $config;
-
-	/** @var ICloudFederationFactory */
-	private $factory;
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	public function __construct($appName,
-								IRequest $request,
-								ILogger $logger,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IURLGenerator $urlGenerator,
-								ICloudFederationProviderManager $cloudFederationProviderManager,
-								Config $config,
-								ICloudFederationFactory $factory,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-		$this->config = $config;
-		$this->factory = $factory;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * add share
-	 *
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @BruteForceProtection(action=receiveFederatedShare)
-	 *
-	 * @param string $shareWith
-	 * @param string $name resource name (e.g. document.odt)
-	 * @param string $description share description (optional)
-	 * @param string $providerId resource UID on the provider side
-	 * @param string $owner provider specific UID of the user who owns the resource
-	 * @param string $ownerDisplayName display name of the user who shared the item
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
-	 * @param array $protocol (e,.g. ['name' => 'webdav', 'options' => ['username' => 'john', 'permissions' => 31]])
-	 * @param string $shareType ('group' or 'user' share)
-	 * @param $resourceType ('file', 'calendar',...)
-	 * @return Http\DataResponse|JSONResponse
-	 *
-	 * Example: curl -H "Content-Type: application/json" -X POST -d '{"shareWith":"admin1@serve1","name":"welcome server2.txt","description":"desc","providerId":"2","owner":"admin2@http://localhost/server2","ownerDisplayName":"admin2 display","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"secret","permissions":"webdav-property"}}}' http://localhost/server/index.php/ocm/shares
-	 */
-	public function addShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, $protocol, $shareType, $resourceType) {
-
-		// check if all required parameters are set
-		if ($shareWith === null ||
-			$name === null ||
-			$providerId === null ||
-			$owner === null ||
-			$resourceType === null ||
-			$shareType === null ||
-			!is_array($protocol) ||
-			!isset($protocol['name']) ||
-			!isset ($protocol['options']) ||
-			!is_array($protocol['options']) ||
-			!isset($protocol['options']['sharedSecret'])
-		) {
-			return new JSONResponse(
-				['message' => 'Missing arguments'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		$supportedShareTypes = $this->config->getSupportedShareTypes($resourceType);
-		if (!in_array($shareType, $supportedShareTypes)) {
-			return new JSONResponse(
-				['message' => 'Share type "' . $shareType . '" not implemented'],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		}
-
-		$cloudId = $this->cloudIdManager->resolveCloudId($shareWith);
-		$shareWith = $cloudId->getUser();
-
-		if ($shareType === 'user') {
-			$shareWith = $this->mapUid($shareWith);
-
-			if (!$this->userManager->userExists($shareWith)) {
-				return new JSONResponse(
-					['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		}
-
-		if ($shareType === 'group') {
-			if(!$this->groupManager->groupExists($shareWith)) {
-				return new JSONResponse(
-					['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		}
-
-		// if no explicit display name is given, we use the uid as display name
-		$ownerDisplayName = $ownerDisplayName === null ? $owner : $ownerDisplayName;
-		$sharedByDisplayName = $sharedByDisplayName === null ? $sharedBy : $sharedByDisplayName;
-
-		// sharedBy* parameter is optional, if nothing is set we assume that it is the same user as the owner
-		if ($sharedBy === null) {
-			$sharedBy = $owner;
-			$sharedByDisplayName = $ownerDisplayName;
-		}
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			$share = $this->factory->getCloudFederationShare($shareWith, $name, $description, $providerId, $owner, $ownerDisplayName, $sharedBy, $sharedByDisplayName, '', $shareType, $resourceType);
-			$share->setProtocol($protocol);
-			$provider->shareReceived($share);
-		} catch (ProviderDoesNotExistsException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		} catch (ProviderCouldNotAddShareException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				$e->getCode()
-			);
-		} catch (\Exception $e) {
-			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		$user = $this->userManager->get($shareWith);
-		$recipientDisplayName = '';
-		if($user) {
-			$recipientDisplayName = $user->getDisplayName();
-		}
-
-		return new JSONResponse(
-			['recipientDisplayName' => $recipientDisplayName],
-			Http::STATUS_CREATED);
-
-	}
-
-	/**
-	 * receive notification about existing share
-	 *
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @BruteForceProtection(action=receiveFederatedShareNotification)
-	 *
-	 * @param string $notificationType (notification type, e.g. SHARE_ACCEPTED)
-	 * @param string $resourceType (calendar, file, contact,...)
-	 * @param string $providerId id of the share
-	 * @param array $notification the actual payload of the notification
-	 * @return JSONResponse
-	 */
-	public function receiveNotification($notificationType, $resourceType, $providerId, array $notification) {
-
-		// check if all required parameters are set
-		if ($notificationType === null ||
-			$resourceType === null ||
-			$providerId === null ||
-			!is_array($notification)
-		) {
-			return new JSONResponse(
-				['message' => 'Missing arguments'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
-			$result = $provider->notificationReceived($notificationType, $providerId, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		} catch (ShareNotFound $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		} catch (ActionNotSupportedException $e) {
-			return new JSONResponse(
-				['message' => $e->getMessage()],
-				Http::STATUS_NOT_IMPLEMENTED
-			);
-		} catch (BadRequestException $e) {
-			return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
-		} catch (AuthenticationFailedException $e) {
-			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
-		}
-		catch (\Exception $e) {
-			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		return new JSONResponse($result,Http::STATUS_CREATED);
-
-	}
-
-	/**
-	 * map login name to internal LDAP UID if a LDAP backend is in use
-	 *
-	 * @param string $uid
-	 * @return string mixed
-	 */
-	private function mapUid($uid) {
-		// FIXME this should be a method in the user management instead
-		$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
-		\OCP\Util::emitHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			array('uid' => &$uid)
-		);
-		$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
-
-		return $uid;
-	}
-
-}
@@ -1,3 +0,0 @@
-{
-	"directory": "js/vendor"
-}
@@ -1,2 +0,0 @@
-# compiled vue templates
-js/templates.js
@@ -1,25 +1,70 @@
 <?php
 /**
- * @copyright Copyright (c) 2018, Joas Schilling <coding@schilljs.com>
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Joas Schilling <coding@schilljs.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
 *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0
 *
- * 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 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
+ * 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/>.
+ * 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/>
 *
 */

-$application = new \OCA\Comments\AppInfo\Application();
-$application->register();
+$eventDispatcher = \OC::$server->getEventDispatcher();
+$eventDispatcher->addListener(
+	'OCA\Files::loadAdditionalScripts',
+	function() {
+		\OCP\Util::addScript('oc-backbone-webdav');
+		\OCP\Util::addScript('comments', 'merged');
+		\OCP\Util::addStyle('comments', 'comments');
+	}
+);
+
+$eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
+	$event->addEntityCollection('files', function($name) {
+		$nodes = \OC::$server->getUserFolder()->getById(intval($name));
+		return !empty($nodes);
+	});
+});
+
+$notificationManager = \OC::$server->getNotificationManager();
+$notificationManager->registerNotifier(
+	function() {
+		$application = new \OCP\AppFramework\App('comments');
+		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
+	},
+	function () {
+		$l = \OC::$server->getL10N('comments');
+		return ['id' => 'comments', 'name' => $l->t('Comments')];
+	}
+);
+
+$commentsManager = \OC::$server->getCommentsManager();
+$commentsManager->registerEventHandler(function () {
+	$application = new \OCP\AppFramework\App('comments');
+	/** @var \OCA\Comments\EventHandler $handler */
+	$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;
+});
@@ -1,24 +1,18 @@
 <?xml version="1.0"?>
-<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
-	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+<info>
 	<id>comments</id>
 	<name>Comments</name>
-	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.4.0</version>
-	<licence>agpl</licence>
-	<author>Arthur Schiwon</author>
-	<author>Vincent Petry</author>
+	<licence>AGPL</licence>
+	<author>Arthur Schiwon, Vincent Petry</author>
 	<default_enable/>
+	<version>1.2.0</version>
+	<dependencies>
+		<nextcloud min-version="12" max-version="12" />
+	</dependencies>
 	<types>
 		<logging/>
 	</types>
-	<category>office</category>
-	<category>social</category>
-	<bugs>https://github.com/nextcloud/server/issues</bugs>
-	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
-	</dependencies>

 	<activity>
 		<settings>
@@ -33,10 +27,4 @@
 			<provider>OCA\Comments\Activity\Provider</provider>
 		</providers>
 	</activity>
-
-	<collaboration>
-		<plugins>
-			<plugin type="autocomplete-sort">OCA\Comments\Collaboration\CommentersSorter</plugin>
-		</plugins>
-	</collaboration>
 </info>
@@ -1,10 +1,9 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
 * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
 *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -21,8 +20,9 @@
 *
 */

-return [
-	'routes' => [
-		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
-	]
-];
+use \OCA\Comments\AppInfo\Application;
+
+$application = new Application();
+$application->registerRoutes($this, ['routes' => [
+	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+]]);
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitComments::getLoader();
@@ -1,13 +0,0 @@
-{
-    "config" : {
-        "vendor-dir": ".",
-        "optimize-autoloader": true,
-        "classmap-authoritative": true,
-        "autoloader-suffix": "Comments"
-    },
-    "autoload" : {
-        "psr-4": {
-            "OCA\\Comments\\": "../lib/"
-        }
-    }
-}
--- a/Show More
+++ b/Show More