diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/dav/lib/Server.php | 6 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User/User.php | 10 |
3 files changed, 17 insertions, 1 deletions
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 9357ff9bb9e..c9cd6798018 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -18,7 +18,7 @@ <owncloud min-version="9.2" max-version="9.2" /> </dependencies> <background-jobs> - <job>OCA\DAV\CardDAV\Sync\SyncJob</job> + <job>OCA\DAV\CardDAV\SyncJob</job> </background-jobs> <repair-steps> <post-migration> diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index c49df197a89..a06d4c570f6 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -47,6 +47,7 @@ use OCP\IRequest; use OCP\SabrePluginEvent; use Sabre\CardDAV\VCFExportPlugin; use Sabre\DAV\Auth\Plugin; +use OCA\DAV\Connector\Sabre\TagsPlugin; class Server { @@ -190,6 +191,11 @@ class Server { $this->server->addPlugin( new QuotaPlugin($view) ); + $this->server->addPlugin( + new TagsPlugin( + $this->server->tree, \OC::$server->getTagManager() + ) + ); } }); } diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 3d247663b3f..b2fcac10641 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -6,6 +6,7 @@ * @author Joas Schilling <coding@schilljs.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Jörn Friedrich Dreyer <jfd@butonic.de> * * @license AGPL-3.0 * @@ -32,6 +33,7 @@ use OCP\IAvatarManager; use OCP\IConfig; use OCP\Image; use OCP\IUserManager; +use OCP\Util; /** * User @@ -111,6 +113,14 @@ class User { IConfig $config, FilesystemHelper $fs, Image $image, LogWrapper $log, IAvatarManager $avatarManager, IUserManager $userManager) { + if ($username === null) { + $log->log("uid for '$dn' must not be null!", Util::ERROR); + throw new \InvalidArgumentException('uid must not be null!'); + } else if ($username === '') { + $log->log("uid for '$dn' must not be an empty string", Util::ERROR); + throw new \InvalidArgumentException('uid must not be an empty string!'); + } + $this->access = $access; $this->connection = $access->getConnection(); $this->config = $config; |