diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index f1ac2dbd26bd7af3555274a9155617b91c3f7607..430df2301808f390d8f05bd976b97b40c45db092 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -47,12 +47,12 @@ if(count($configPrefixes) === 1) {
$ldapAccess->setUserMapper(new OCA\User_LDAP\Mapping\UserMapping($dbc));
$ldapAccess->setGroupMapper(new OCA\User_LDAP\Mapping\GroupMapping($dbc));
$userBackend = new OCA\user_ldap\USER_LDAP($ldapAccess, $ocConfig);
- $groupBackend = new OCA\user_ldap\GROUP_LDAP($ldapAccess);
+ $groupBackend = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
} else if(count($configPrefixes) > 1) {
$userBackend = new OCA\user_ldap\User_Proxy(
$configPrefixes, $ldapWrapper, $ocConfig
);
- $groupBackend = new OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
+ $groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
}
if(count($configPrefixes) > 0) {
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php
index f5352ae482a0d9e75751de68161f014f0c7fa103..84d4a2d1927f67eb74ee599f84beccb19850cbdc 100644
--- a/apps/user_ldap/lib/Command/Search.php
+++ b/apps/user_ldap/lib/Command/Search.php
@@ -29,7 +29,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use OCA\user_ldap\User_Proxy;
-use OCA\user_ldap\Group_Proxy;
+use OCA\User_LDAP\Group_Proxy;
use OCA\user_ldap\lib\Helper;
use OCA\user_ldap\lib\LDAP;
use OCP\IConfig;
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/lib/Group_LDAP.php
similarity index 99%
rename from apps/user_ldap/group_ldap.php
rename to apps/user_ldap/lib/Group_LDAP.php
index 617bdc3e6edf49e45710fe9a948cb8c393f0e6a4..163590ad03ad493a15889805aa1b6ea3f3ead19f 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -32,12 +32,12 @@
*
*/
-namespace OCA\user_ldap;
+namespace OCA\User_LDAP;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\BackendUtility;
-class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
+class Group_LDAP extends BackendUtility implements \OCP\GroupInterface {
protected $enabled = false;
/**
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/lib/Group_Proxy.php
similarity index 98%
rename from apps/user_ldap/group_proxy.php
rename to apps/user_ldap/lib/Group_Proxy.php
index 7d496a129a1766ae33939dc151e1dbc689f8e55d..00225b54287915cd91202bf1bf25f40ef06ac55f 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/lib/Group_Proxy.php
@@ -22,7 +22,7 @@
*
*/
-namespace OCA\user_ldap;
+namespace OCA\User_LDAP;
use OCA\user_ldap\lib\ILDAPWrapper;
@@ -38,7 +38,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
parent::__construct($ldap);
foreach($serverConfigPrefixes as $configPrefix) {
$this->backends[$configPrefix] =
- new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
+ new \OCA\User_LDAP\Group_LDAP($this->getAccess($configPrefix));
if(is_null($this->refBackend)) {
$this->refBackend = &$this->backends[$configPrefix];
}
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index ecf2e6daa0f594929f7fdaba4701e2f16e907f09..842f96e07ce96ebdb19b8ac63ffff3dd9ec5eb71 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -158,7 +158,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
}
/**
- * @return \OCA\user_ldap\GROUP_LDAP|\OCA\user_ldap\Group_Proxy
+ * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy
*/
static private function getGroupBE() {
if(!is_null(self::$groupBE)) {
@@ -184,9 +184,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$userMapper = new UserMapping($dbc);
$ldapAccess->setGroupMapper($groupMapper);
$ldapAccess->setUserMapper($userMapper);
- self::$groupBE = new \OCA\user_ldap\GROUP_LDAP($ldapAccess);
+ self::$groupBE = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
} else {
- self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
+ self::$groupBE = new \OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
}
return self::$groupBE;
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/GroupLDAPTest.php
similarity index 97%
rename from apps/user_ldap/tests/group_ldap.php
rename to apps/user_ldap/tests/GroupLDAPTest.php
index 51bb1d84732a64116d9db4a2dc0a1aaa822a3af5..2075f42fa517c2da86187c398a1f5780168df31f 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/GroupLDAPTest.php
@@ -24,21 +24,21 @@
*
*/
-namespace OCA\user_ldap\tests;
+namespace OCA\User_LDAP\Tests;
-use \OCA\user_ldap\GROUP_LDAP as GroupLDAP;
+use OCA\User_LDAP\Group_LDAP as GroupLDAP;
use \OCA\user_ldap\lib\Access;
use \OCA\user_ldap\lib\Connection;
use \OCA\user_ldap\lib\ILDAPWrapper;
/**
- * Class Test_Group_Ldap
+ * Class GroupLDAPTest
*
* @group DB
*
* @package OCA\user_ldap\tests
*/
-class Test_Group_Ldap extends \Test\TestCase {
+class GroupLDAPTest extends \Test\TestCase {
private function getAccessMock() {
static $conMethods;
static $accMethods;
@@ -325,7 +325,7 @@ class Test_Group_Ldap extends \Test\TestCase {
* tests that a user listing is complete, if all it's members have the group
* as their primary.
*/
- public function testUsersInGroupPrimaryMembersOnly() {
+ public function testUsersInGroupPrimaryMembersOnly() {
$access = $this->getAccessMock();
$this->enableGroups($access);
@@ -360,7 +360,7 @@ class Test_Group_Ldap extends \Test\TestCase {
* tests that a user counting is complete, if all it's members have the group
* as their primary.
*/
- public function testCountUsersInGroupPrimaryMembersOnly() {
+ public function testCountUsersInGroupPrimaryMembersOnly() {
$access = $this->getAccessMock();
$this->enableGroups($access);
diff --git a/settings/users.php b/settings/users.php
index 347cad21a2bc2fafc825c5a3a2a33dcf30ef1cac..fe20b0e84f0e0649106a03f6219e348b1025114d 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -46,8 +46,8 @@ $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
if (\OC_App::isEnabled('user_ldap')) {
$isLDAPUsed =
- $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
- || $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
+ $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP')
+ || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
if ($isLDAPUsed) {
// LDAP user count can be slow, so we sort by group name here
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;