@@ -28,6 +28,6 @@ OCP\JSON::checkAppEnabled('user_ldap'); | |||
OCP\JSON::callCheck(); | |||
$prefix = (string)$_POST['ldap_serverconfig_chooser']; | |||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); | |||
OCP\JSON::success(array('configuration' => $connection->getConfiguration())); |
@@ -41,7 +41,7 @@ foreach($chkboxes as $boxid) { | |||
} | |||
} | |||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); | |||
$connection->setConfiguration($_POST); | |||
$connection->saveConfiguration(); |
@@ -30,7 +30,7 @@ OCP\JSON::callCheck(); | |||
$l = \OC::$server->getL10N('user_ldap'); | |||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); | |||
//needs to be true, otherwise it will also fail with an irritating message | |||
$_POST['ldap_configuration_active'] = 1; |
@@ -41,7 +41,7 @@ if(!isset($_POST['ldap_serverconfig_chooser'])) { | |||
} | |||
$prefix = (string)$_POST['ldap_serverconfig_chooser']; | |||
$ldapWrapper = new \OCA\user_ldap\lib\LDAP(); | |||
$ldapWrapper = new \OCA\User_LDAP\LDAP(); | |||
$configuration = new \OCA\user_ldap\lib\Configuration($prefix); | |||
$con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); |
@@ -29,7 +29,7 @@ OCP\App::registerAdmin('user_ldap', 'settings'); | |||
$helper = new \OCA\user_ldap\lib\Helper(); | |||
$configPrefixes = $helper->getServerConfigurationPrefixes(true); | |||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||
$ocConfig = \OC::$server->getConfig(); | |||
if(count($configPrefixes) === 1) { | |||
$dbc = \OC::$server->getDatabaseConnection(); |
@@ -22,7 +22,7 @@ | |||
*/ | |||
use OCA\user_ldap\lib\Helper; | |||
use OCA\user_ldap\lib\LDAP; | |||
use OCA\User_LDAP\LDAP; | |||
use OCA\User_LDAP\User_Proxy; | |||
use OCA\User_LDAP\Mapping\UserMapping; | |||
use OCA\User_LDAP\User\DeletedUsersIndex; |
@@ -31,7 +31,7 @@ use Symfony\Component\Console\Output\OutputInterface; | |||
use OCA\User_LDAP\User_Proxy; | |||
use OCA\User_LDAP\Group_Proxy; | |||
use OCA\user_ldap\lib\Helper; | |||
use OCA\user_ldap\lib\LDAP; | |||
use OCA\User_LDAP\LDAP; | |||
use OCP\IConfig; | |||
class Search extends Command { |
@@ -71,7 +71,7 @@ class TestConfig extends Command { | |||
* @return int | |||
*/ | |||
protected function testConfig($configID) { | |||
$lw = new \OCA\user_ldap\lib\LDAP(); | |||
$lw = new \OCA\User_LDAP\LDAP(); | |||
$connection = new Connection($lw, $configID); | |||
//ensure validation is run before we attempt the bind |
@@ -26,7 +26,7 @@ use \OC\BackgroundJob\TimedJob; | |||
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\LDAP; | |||
use \OCA\User_LDAP\User\DeletedUsersIndex; | |||
use \OCA\User_LDAP\Mapping\UserMapping; | |||
@@ -24,9 +24,10 @@ | |||
* | |||
*/ | |||
namespace OCA\user_ldap\lib; | |||
namespace OCA\User_LDAP; | |||
use OC\ServerNotAvailableException; | |||
use OCA\user_ldap\lib\ILDAPWrapper; | |||
class LDAP implements ILDAPWrapper { | |||
protected $curFunc = ''; | |||
@@ -160,7 +161,7 @@ class LDAP implements ILDAPWrapper { | |||
/** | |||
* @param LDAP $link | |||
* @param resource $result | |||
* @return mixed|an | |||
* @return mixed | |||
*/ | |||
public function nextEntry($link, $result) { | |||
return $this->invokeLDAPMethod('next_entry', $link, $result); |
@@ -209,7 +209,7 @@ class Test_Access extends \Test\TestCase { | |||
public function testStringResemblesDNLDAPmod() { | |||
list($lw, $con, $um) = $this->getConnectorAndLdapMock(); | |||
$lw = new \OCA\user_ldap\lib\LDAP(); | |||
$lw = new \OCA\User_LDAP\LDAP(); | |||
$access = new Access($con, $lw, $um); | |||
if(!function_exists('ldap_explode_dn')) { |
@@ -23,7 +23,7 @@ namespace OCA\user_ldap\tests\integration; | |||
use OCA\user_ldap\lib\Access; | |||
use OCA\user_ldap\lib\Connection; | |||
use OCA\user_ldap\lib\LDAP; | |||
use OCA\User_LDAP\LDAP; | |||
use OCA\User_LDAP\User\Manager; | |||
abstract class AbstractIntegrationTest { |
@@ -20,7 +20,7 @@ | |||
*/ | |||
use OC\ServerNotAvailableException; | |||
use OCA\user_ldap\lib\LDAP; | |||
use OCA\User_LDAP\LDAP; | |||
/** | |||
* Class ExceptionOnLostConnection | |||
@@ -51,7 +51,7 @@ class ExceptionOnLostConnection { | |||
/** @var string */ | |||
private $ldapHost; | |||
/** @var OCA\user_ldap\lib\LDAP */ | |||
/** @var \OCA\User_LDAP\LDAP */ | |||
private $ldap; | |||
/** @var bool */ |