Robin Appelman
10 years ago
committed by
Lukas Reschke
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
6 changed files with
23 additions and
2 deletions
-
apps/dav/lib/CalDAV/BirthdayService.php
-
apps/dav/lib/CardDAV/ContactsManager.php
-
apps/dav/lib/Server.php
-
apps/federation/lib/DbHandler.php
-
apps/files_external/lib/Lib/Storage/AmazonS3.php
-
apps/files_external/lib/Lib/Storage/Swift.php
|
|
|
@ -35,6 +35,12 @@ class BirthdayService { |
|
|
|
/** @var GroupPrincipalBackend */ |
|
|
|
private $principalBackend; |
|
|
|
|
|
|
|
/** @var CalDavBackend */ |
|
|
|
private $calDavBackEnd; |
|
|
|
|
|
|
|
/** @var CardDavBackend */ |
|
|
|
private $cardDavBackEnd; |
|
|
|
|
|
|
|
/** |
|
|
|
* BirthdayService constructor. |
|
|
|
* |
|
|
|
|
|
|
|
@ -25,6 +25,8 @@ use OCP\Contacts\IManager; |
|
|
|
use OCP\IURLGenerator; |
|
|
|
|
|
|
|
class ContactsManager { |
|
|
|
/** @var CardDavBackend */ |
|
|
|
private $backend; |
|
|
|
|
|
|
|
/** |
|
|
|
* ContactsManager constructor. |
|
|
|
|
|
|
|
@ -43,6 +43,12 @@ class Server { |
|
|
|
/** @var IRequest */ |
|
|
|
private $request; |
|
|
|
|
|
|
|
/** @var string */ |
|
|
|
private $baseUri; |
|
|
|
|
|
|
|
/** @var Connector\Sabre\Server */ |
|
|
|
protected $server; |
|
|
|
|
|
|
|
public function __construct(IRequest $request, $baseUri) { |
|
|
|
$this->request = $request; |
|
|
|
$this->baseUri = $baseUri; |
|
|
|
|
|
|
|
@ -43,7 +43,7 @@ class DbHandler { |
|
|
|
private $connection; |
|
|
|
|
|
|
|
/** @var IL10N */ |
|
|
|
private $l; |
|
|
|
private $IL10N; |
|
|
|
|
|
|
|
/** @var string */ |
|
|
|
private $dbTable = 'trusted_servers'; |
|
|
|
@ -87,7 +87,7 @@ class DbHandler { |
|
|
|
return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable); |
|
|
|
} else { |
|
|
|
$message = 'Internal failure, Could not add ownCloud as trusted server: ' . $url; |
|
|
|
$message_t = $this->l->t('Could not add server'); |
|
|
|
$message_t = $this->IL10N->t('Could not add server'); |
|
|
|
throw new HintException($message, $message_t); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -74,6 +74,9 @@ class AmazonS3 extends \OC\Files\Storage\Common { |
|
|
|
*/ |
|
|
|
private $rescanDelay = 10; |
|
|
|
|
|
|
|
/** @var string */ |
|
|
|
private $id; |
|
|
|
|
|
|
|
/** |
|
|
|
* @param string $path |
|
|
|
* @return string correctly encoded path |
|
|
|
|
|
|
|
@ -68,6 +68,10 @@ class Swift extends \OC\Files\Storage\Common { |
|
|
|
* @var array |
|
|
|
*/ |
|
|
|
private $params; |
|
|
|
|
|
|
|
/** @var string */ |
|
|
|
private $id; |
|
|
|
|
|
|
|
/** |
|
|
|
* @var array |
|
|
|
*/ |
|
|
|
|