summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib
diff options
context:
space:
mode:
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r--apps/user_ldap/lib/Command/CheckUser.php4
-rw-r--r--apps/user_ldap/lib/Command/ShowRemnants.php4
-rw-r--r--apps/user_ldap/lib/Jobs/CleanUp.php4
-rw-r--r--apps/user_ldap/lib/User/DeletedUsersIndex.php (renamed from apps/user_ldap/lib/user/deletedusersindex.php)6
-rw-r--r--apps/user_ldap/lib/User/IUserTools.php (renamed from apps/user_ldap/lib/user/iusertools.php)2
-rw-r--r--apps/user_ldap/lib/User/Manager.php (renamed from apps/user_ldap/lib/user/manager.php)17
-rw-r--r--apps/user_ldap/lib/User/OfflineUser.php (renamed from apps/user_ldap/lib/user/offlineuser.php)2
-rw-r--r--apps/user_ldap/lib/User/User.php (renamed from apps/user_ldap/lib/user/user.php)2
-rw-r--r--apps/user_ldap/lib/User_LDAP.php6
-rw-r--r--apps/user_ldap/lib/User_Proxy.php4
-rw-r--r--apps/user_ldap/lib/access.php5
11 files changed, 27 insertions, 29 deletions
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index c8c46bbdff2..f26b2f4546b 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -28,7 +28,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-use OCA\User_LDAP\lib\User\DeletedUsersIndex;
+use OCA\User_LDAP\User\DeletedUsersIndex;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\lib\Helper as LDAPHelper;
use OCA\User_LDAP\User_Proxy;
@@ -40,7 +40,7 @@ class CheckUser extends Command {
/** @var \OCA\User_LDAP\lib\Helper */
protected $helper;
- /** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+ /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
protected $dui;
/** @var \OCA\User_LDAP\Mapping\UserMapping */
diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php
index de435ec4327..59da6e5522d 100644
--- a/apps/user_ldap/lib/Command/ShowRemnants.php
+++ b/apps/user_ldap/lib/Command/ShowRemnants.php
@@ -28,11 +28,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-use OCA\user_ldap\lib\user\DeletedUsersIndex;
+use OCA\User_LDAP\User\DeletedUsersIndex;
use OCP\IDateTimeFormatter;
class ShowRemnants extends Command {
- /** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+ /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
protected $dui;
/** @var \OCP\IDateTimeFormatter */
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
index d3af1cf12fa..fb4f37203c1 100644
--- a/apps/user_ldap/lib/Jobs/CleanUp.php
+++ b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -27,7 +27,7 @@ use \OCA\user_ldap\User_LDAP;
use \OCA\User_LDAP\User_Proxy;
use \OCA\user_ldap\lib\Helper;
use \OCA\user_ldap\lib\LDAP;
-use \OCA\user_ldap\lib\user\DeletedUsersIndex;
+use \OCA\User_LDAP\User\DeletedUsersIndex;
use \OCA\User_LDAP\Mapping\UserMapping;
/**
@@ -59,7 +59,7 @@ class CleanUp extends TimedJob {
/** @var \OCA\User_LDAP\Mapping\UserMapping */
protected $mapping;
- /** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+ /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
protected $dui;
public function __construct() {
diff --git a/apps/user_ldap/lib/user/deletedusersindex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php
index 48daeb9b8bc..7a9823786dd 100644
--- a/apps/user_ldap/lib/user/deletedusersindex.php
+++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php
@@ -21,7 +21,7 @@
*
*/
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
use OCA\User_LDAP\Mapping\UserMapping;
@@ -63,7 +63,7 @@ class DeletedUsersIndex {
/**
* reads LDAP users marked as deleted from the database
- * @return \OCA\user_ldap\lib\user\OfflineUser[]
+ * @return \OCA\User_LDAP\User\OfflineUser[]
*/
private function fetchDeletedUsers() {
$deletedUsers = $this->config->getUsersForUserValue(
@@ -80,7 +80,7 @@ class DeletedUsersIndex {
/**
* returns all LDAP users that are marked as deleted
- * @return \OCA\user_ldap\lib\user\OfflineUser[]
+ * @return \OCA\User_LDAP\User\OfflineUser[]
*/
public function getUsers() {
if(is_array($this->deletedUsers)) {
diff --git a/apps/user_ldap/lib/user/iusertools.php b/apps/user_ldap/lib/User/IUserTools.php
index b0eb9e1ffb3..747b46ec68a 100644
--- a/apps/user_ldap/lib/user/iusertools.php
+++ b/apps/user_ldap/lib/User/IUserTools.php
@@ -20,7 +20,7 @@
*
*/
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
/**
* IUserTools
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/User/Manager.php
index dc12ebd6e9d..ca86970d477 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -23,13 +23,10 @@
*
*/
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
-use OCA\user_ldap\lib\user\IUserTools;
-use OCA\user_ldap\lib\user\User;
use OCA\user_ldap\lib\LogWrapper;
use OCA\user_ldap\lib\FilesystemHelper;
-use OCA\user_ldap\lib\user\OfflineUser;
use OCP\IAvatarManager;
use OCP\IConfig;
use OCP\IDBConnection;
@@ -65,8 +62,8 @@ class Manager {
protected $avatarManager;
/**
- * array['byDN'] \OCA\user_ldap\lib\User[]
- * ['byUid'] \OCA\user_ldap\lib\User[]
+ * array['byDN'] \OCA\User_LDAP\User\User[]
+ * ['byUid'] \OCA\User_LDAP\User\User[]
* @var array $users
*/
protected $users = array(
@@ -112,7 +109,7 @@ class Manager {
* property array
* @param string $dn the DN of the user
* @param string $uid the internal (owncloud) username
- * @return \OCA\user_ldap\lib\User\User
+ * @return \OCA\User_LDAP\User\User
*/
private function createAndCache($dn, $uid) {
$this->checkAccess();
@@ -187,7 +184,7 @@ class Manager {
/**
* creates and returns an instance of OfflineUser for the specified user
* @param string $id
- * @return \OCA\user_ldap\lib\user\OfflineUser
+ * @return \OCA\User_LDAP\User\OfflineUser
*/
public function getDeletedUser($id) {
return new OfflineUser(
@@ -200,7 +197,7 @@ class Manager {
/**
* @brief returns a User object by it's ownCloud username
* @param string $id the DN or username of the user
- * @return \OCA\user_ldap\lib\user\User|\OCA\user_ldap\lib\user\OfflineUser|null
+ * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
*/
protected function createInstancyByUserName($id) {
//most likely a uid. Check whether it is a deleted user
@@ -217,7 +214,7 @@ class Manager {
/**
* @brief returns a User object by it's DN or ownCloud username
* @param string $id the DN or username of the user
- * @return \OCA\user_ldap\lib\user\User|\OCA\user_ldap\lib\user\OfflineUser|null
+ * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
* @throws \Exception when connection could not be established
*/
public function get($id) {
diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/User/OfflineUser.php
index aee1a137a96..a3a9995490d 100644
--- a/apps/user_ldap/lib/user/offlineuser.php
+++ b/apps/user_ldap/lib/User/OfflineUser.php
@@ -21,7 +21,7 @@
*
*/
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
use OCA\User_LDAP\Mapping\UserMapping;
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/User/User.php
index 4da8ae5f098..4b9e3a3c9fc 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -22,7 +22,7 @@
*
*/
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
use OCA\user_ldap\lib\Connection;
use OCA\user_ldap\lib\FilesystemHelper;
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 29ea8496587..1098a30a501 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -34,8 +34,8 @@ namespace OCA\User_LDAP;
use OC\User\NoUserException;
use OCA\user_ldap\lib\BackendUtility;
use OCA\user_ldap\lib\Access;
-use OCA\user_ldap\lib\user\OfflineUser;
-use OCA\User_LDAP\lib\User\User;
+use OCA\User_LDAP\User\OfflineUser;
+use OCA\User_LDAP\User\User;
use OCP\IConfig;
class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserInterface {
@@ -201,7 +201,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
/**
* checks whether a user is still available on LDAP
*
- * @param string|\OCA\User_LDAP\lib\user\User $user either the ownCloud user
+ * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
* name or an instance of that user
* @return bool
* @throws \Exception
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index 73883a3d47e..aba8398fa20 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -27,7 +27,7 @@
namespace OCA\User_LDAP;
use OCA\user_ldap\lib\ILDAPWrapper;
-use OCA\User_LDAP\lib\User\User;
+use OCA\User_LDAP\User\User;
use \OCA\user_ldap\User_LDAP;
use OCP\IConfig;
@@ -162,7 +162,7 @@ class User_Proxy extends lib\Proxy implements \OCP\IUserBackend, \OCP\UserInterf
/**
* check if a user exists on LDAP
- * @param string|\OCA\User_LDAP\lib\User\User $user either the ownCloud user
+ * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
* name or an instance of that user
* @return boolean
*/
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f92ded64797..814de3f4092 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -37,14 +37,15 @@
namespace OCA\user_ldap\lib;
-use OCA\user_ldap\lib\user\OfflineUser;
+use OCA\User_LDAP\User\IUserTools;
+use OCA\User_LDAP\User\OfflineUser;
use OCA\User_LDAP\Mapping\AbstractMapping;
/**
* Class Access
* @package OCA\user_ldap\lib
*/
-class Access extends LDAPUtility implements user\IUserTools {
+class Access extends LDAPUtility implements IUserTools {
/**
* @var \OCA\user_ldap\lib\Connection
*/
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 16:19:12 +0000