diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-12-12 17:25:03 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-19 10:17:17 +0100 |
commit | 6da33e1ea7bb340e22330941d2a980a1414210b0 (patch) | |
tree | 3717d08e21cb02a149ae109f4efeecb83ba582c1 /apps | |
parent | 5c6e08213e6ed52517f9f729ae91a2973f09c182 (diff) | |
download | nextcloud-server-6da33e1ea7bb340e22330941d2a980a1414210b0.tar.gz nextcloud-server-6da33e1ea7bb340e22330941d2a980a1414210b0.zip |
introduce names for user backends - IUserBackend
* LDAP with multiple servers also proved backendName
Diffstat (limited to 'apps')
-rw-r--r-- | apps/user_ldap/user_ldap.php | 11 | ||||
-rw-r--r-- | apps/user_ldap/user_proxy.php | 10 | ||||
-rw-r--r-- | apps/user_webdavauth/user_webdavauth.php | 10 |
3 files changed, 28 insertions, 3 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 52278082312..cb3779eeeed 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -27,7 +27,7 @@ namespace OCA\user_ldap; use OCA\user_ldap\lib\BackendUtility; -class USER_LDAP extends BackendUtility implements \OCP\UserInterface { +class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserInterface { /** * checks whether the user is allowed to change his avatar in ownCloud * @param string $uid the ownCloud user name @@ -299,4 +299,13 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface { $this->access->connection->writeToCache($cacheKey, $entries); return $entries; } + + /** + * Backend name to be shown in user management + * @return string the name of the backend to be shown + */ + public function getBackendName(){ + return 'LDAP'; + } + } diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php index fa4d6939303..6414a048071 100644 --- a/apps/user_ldap/user_proxy.php +++ b/apps/user_ldap/user_proxy.php @@ -25,7 +25,7 @@ namespace OCA\user_ldap; use OCA\user_ldap\lib\ILDAPWrapper; -class User_Proxy extends lib\Proxy implements \OCP\UserInterface { +class User_Proxy extends lib\Proxy implements \OCP\IUserBackend, \OCP\UserInterface { private $backends = array(); private $refBackend = null; @@ -118,6 +118,14 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface { } /** + * Backend name to be shown in user management + * @return string the name of the backend to be shown + */ + public function getBackendName() { + return $this->refBackend->getBackendName(); + } + + /** * Get a list of all users * @return string[] with all uids * diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php index 86e5b916f3d..1154a7865be 100644 --- a/apps/user_webdavauth/user_webdavauth.php +++ b/apps/user_webdavauth/user_webdavauth.php @@ -21,7 +21,7 @@ * */ -class OC_USER_WEBDAVAUTH extends OC_User_Backend { +class OC_USER_WEBDAVAUTH extends OC_User_Backend implements \OCP\IUserBackend { protected $webdavauth_url; public function __construct() { @@ -86,4 +86,12 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { return $returnArray; } + + /** + * Backend name to be shown in user management + * @return string the name of the backend to be shown + */ + public function getBackendName(){ + return 'WebDAV'; + } } |