OCP\JSON::callCheck(); | OCP\JSON::callCheck(); | ||||
$prefix = (string)$_POST['ldap_serverconfig_chooser']; | $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); | $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); | ||||
OCP\JSON::success(array('configuration' => $connection->getConfiguration())); | OCP\JSON::success(array('configuration' => $connection->getConfiguration())); |
} | } | ||||
} | } | ||||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||||
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); | $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix); | ||||
$connection->setConfiguration($_POST); | $connection->setConfiguration($_POST); | ||||
$connection->saveConfiguration(); | $connection->saveConfiguration(); |
$l = \OC::$server->getL10N('user_ldap'); | $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); | $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); | ||||
//needs to be true, otherwise it will also fail with an irritating message | //needs to be true, otherwise it will also fail with an irritating message | ||||
$_POST['ldap_configuration_active'] = 1; | $_POST['ldap_configuration_active'] = 1; |
} | } | ||||
$prefix = (string)$_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); | $configuration = new \OCA\user_ldap\lib\Configuration($prefix); | ||||
$con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); | $con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); |
$helper = new \OCA\user_ldap\lib\Helper(); | $helper = new \OCA\user_ldap\lib\Helper(); | ||||
$configPrefixes = $helper->getServerConfigurationPrefixes(true); | $configPrefixes = $helper->getServerConfigurationPrefixes(true); | ||||
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); | |||||
$ldapWrapper = new OCA\User_LDAP\LDAP(); | |||||
$ocConfig = \OC::$server->getConfig(); | $ocConfig = \OC::$server->getConfig(); | ||||
if(count($configPrefixes) === 1) { | if(count($configPrefixes) === 1) { | ||||
$dbc = \OC::$server->getDatabaseConnection(); | $dbc = \OC::$server->getDatabaseConnection(); |
*/ | */ | ||||
use OCA\user_ldap\lib\Helper; | 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\User_Proxy; | ||||
use OCA\User_LDAP\Mapping\UserMapping; | use OCA\User_LDAP\Mapping\UserMapping; | ||||
use OCA\User_LDAP\User\DeletedUsersIndex; | use OCA\User_LDAP\User\DeletedUsersIndex; |
use OCA\User_LDAP\User_Proxy; | 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\Helper; | ||||
use OCA\user_ldap\lib\LDAP; | |||||
use OCA\User_LDAP\LDAP; | |||||
use OCP\IConfig; | use OCP\IConfig; | ||||
class Search extends Command { | class Search extends Command { |
* @return int | * @return int | ||||
*/ | */ | ||||
protected function testConfig($configID) { | protected function testConfig($configID) { | ||||
$lw = new \OCA\user_ldap\lib\LDAP(); | |||||
$lw = new \OCA\User_LDAP\LDAP(); | |||||
$connection = new Connection($lw, $configID); | $connection = new Connection($lw, $configID); | ||||
//ensure validation is run before we attempt the bind | //ensure validation is run before we attempt the bind |
use \OCA\user_ldap\User_LDAP; | use \OCA\user_ldap\User_LDAP; | ||||
use \OCA\User_LDAP\User_Proxy; | use \OCA\User_LDAP\User_Proxy; | ||||
use \OCA\user_ldap\lib\Helper; | 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\User\DeletedUsersIndex; | ||||
use \OCA\User_LDAP\Mapping\UserMapping; | use \OCA\User_LDAP\Mapping\UserMapping; | ||||
* | * | ||||
*/ | */ | ||||
namespace OCA\user_ldap\lib; | |||||
namespace OCA\User_LDAP; | |||||
use OC\ServerNotAvailableException; | use OC\ServerNotAvailableException; | ||||
use OCA\user_ldap\lib\ILDAPWrapper; | |||||
class LDAP implements ILDAPWrapper { | class LDAP implements ILDAPWrapper { | ||||
protected $curFunc = ''; | protected $curFunc = ''; | ||||
/** | /** | ||||
* @param LDAP $link | * @param LDAP $link | ||||
* @param resource $result | * @param resource $result | ||||
* @return mixed|an | |||||
* @return mixed | |||||
*/ | */ | ||||
public function nextEntry($link, $result) { | public function nextEntry($link, $result) { | ||||
return $this->invokeLDAPMethod('next_entry', $link, $result); | return $this->invokeLDAPMethod('next_entry', $link, $result); |
public function testStringResemblesDNLDAPmod() { | public function testStringResemblesDNLDAPmod() { | ||||
list($lw, $con, $um) = $this->getConnectorAndLdapMock(); | 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); | $access = new Access($con, $lw, $um); | ||||
if(!function_exists('ldap_explode_dn')) { | if(!function_exists('ldap_explode_dn')) { |
use OCA\user_ldap\lib\Access; | use OCA\user_ldap\lib\Access; | ||||
use OCA\user_ldap\lib\Connection; | use OCA\user_ldap\lib\Connection; | ||||
use OCA\user_ldap\lib\LDAP; | |||||
use OCA\User_LDAP\LDAP; | |||||
use OCA\User_LDAP\User\Manager; | use OCA\User_LDAP\User\Manager; | ||||
abstract class AbstractIntegrationTest { | abstract class AbstractIntegrationTest { |
*/ | */ | ||||
use OC\ServerNotAvailableException; | use OC\ServerNotAvailableException; | ||||
use OCA\user_ldap\lib\LDAP; | |||||
use OCA\User_LDAP\LDAP; | |||||
/** | /** | ||||
* Class ExceptionOnLostConnection | * Class ExceptionOnLostConnection | ||||
/** @var string */ | /** @var string */ | ||||
private $ldapHost; | private $ldapHost; | ||||
/** @var OCA\user_ldap\lib\LDAP */ | |||||
/** @var \OCA\User_LDAP\LDAP */ | |||||
private $ldap; | private $ldap; | ||||
/** @var bool */ | /** @var bool */ |