Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2019-02-13 02:14:56 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2019-02-14 17:22:22 +0300
commit792bcb82ae5149c86afcd4d550e3a22d60d330f7 (patch)
treeca2ecccf6865254fb7ed463424a4ae34d7ddeded /apps/files_external/lib
parenta26bcd8e8fa11870c9192d24c73fbef3ef6112de (diff)
add LDAP ConfigHandler for external storages and "$home" var
* handler registered upon OCA\\Files_External::loadAdditionalBackends event as user_ldap is loaded before files_external * new configuration field "ldapExtStorageHomeAttribute" (not in GUI yet) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/files_external/lib')
-rw-r--r--apps/files_external/lib/AppInfo/Application.php3
-rw-r--r--apps/files_external/lib/Lib/Storage/FTP.php2
-rw-r--r--apps/files_external/lib/Service/BackendService.php2
3 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index 5b12377fdb8..01de6f1e40b 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -94,7 +94,8 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide
// TODO: obsolete these and use the TokenProvider to get the user's password from the session
$this->getAuthMechanisms();
- // app developers: do NOT depend on this! it will disappear with oC 9.0!
+ // don't remove this, as app loading order might be a side effect and
+ // querying the service from the server not reliable
\OC::$server->getEventDispatcher()->dispatch(
'OCA\\Files_External::loadAdditionalBackends'
);
diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php
index dc4ab9cb0e1..db2ae9cf298 100644
--- a/apps/files_external/lib/Lib/Storage/FTP.php
+++ b/apps/files_external/lib/Lib/Storage/FTP.php
@@ -44,8 +44,6 @@ class FTP extends StreamWrapper{
private $secure;
private $root;
- private static $tempFiles=array();
-
public function __construct($params) {
if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
$this->host=$params['host'];
diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php
index 05bda1998da..3c66e8eb3cd 100644
--- a/apps/files_external/lib/Service/BackendService.php
+++ b/apps/files_external/lib/Service/BackendService.php
@@ -328,7 +328,7 @@ class BackendService {
'Handler for %s is not an instance of IConfigHandler', $placeholder
));
}
- $this->configHandlers[] = $handler;
+ $this->configHandlers[$placeholder] = $handler;
$newLoaded = true;
}
$this->configHandlerLoaders = [];