mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-06-24 22:39:31 +00:00
Bump LDAP package to 2.0
This commit is contained in:
Michael Babker
parent
e77dd2eec7
commit
3f88c73580
|
|
@ -21,6 +21,7 @@
|
|||
"joomla/event": "dist",
|
||||
"joomla/http": "dist",
|
||||
"joomla/image": "dist",
|
||||
"joomla/ldap": "dist",
|
||||
"joomla/oauth1": "dist",
|
||||
"joomla/oauth2": "dist",
|
||||
"joomla/mediawiki": "dist",
|
||||
|
|
@ -57,7 +58,7 @@
|
|||
"joomla/filter": "^1.3.2",
|
||||
"joomla/http": "~2.0@dev",
|
||||
"joomla/image": "~2.0@dev",
|
||||
"joomla/ldap": "~1.1",
|
||||
"joomla/ldap": "~2.0@dev",
|
||||
"joomla/oauth1": "~2.0@dev",
|
||||
"joomla/oauth2": "~2.0@dev",
|
||||
"joomla/registry": "~2.0@dev",
|
||||
|
|
|
|||
57
composer.lock
generated
57
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "45a034f7d5968eeb83f375414e066f4f",
|
||||
"content-hash": "1b6050ba99b860420e8946ea8a43d8c5",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
|
|
@ -1022,33 +1022,37 @@
|
|||
"time": "2014-10-12T18:01:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "joomla/ldap",
|
||||
"version": "1.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/joomla-framework/ldap.git",
|
||||
"reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/joomla-framework/ldap/zipball/2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208",
|
||||
"reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-ldap": "*",
|
||||
"php": "^5.3.10|~7.0",
|
||||
"symfony/polyfill-php56": "~1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
|
||||
"squizlabs/php_codesniffer": "1.*"
|
||||
},
|
||||
"name": "joomla/ldap",
|
||||
"version": "dev-2.0-dev",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/joomla-framework/ldap.git",
|
||||
"reference": "9da0299c4a104d09b0776936d87a9b9c60bac95e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/joomla-framework/ldap/zipball/9da0299c4a104d09b0776936d87a9b9c60bac95e",
|
||||
"reference": "9da0299c4a104d09b0776936d87a9b9c60bac95e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-ldap": "*",
|
||||
"php": "~7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"joomla/registry": "^1.4.5|~2.0",
|
||||
"phpunit/phpunit": "~6.3",
|
||||
"squizlabs/php_codesniffer": "1.*"
|
||||
},
|
||||
"type": "joomla-package",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-2.0-dev": "2.0-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Joomla\\Ldap\\": "src/",
|
||||
"Joomla\\Ldap\\Tests\\": "Tests/"
|
||||
"Joomla\\Ldap\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
|
|
@ -1062,7 +1066,7 @@
|
|||
"joomla",
|
||||
"ldap"
|
||||
],
|
||||
"time": "2017-07-27T13:13:55+00:00"
|
||||
"time": "2017-11-16T12:59:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "joomla/oauth1",
|
||||
|
|
@ -5124,6 +5128,7 @@
|
|||
"joomla/event": 20,
|
||||
"joomla/http": 20,
|
||||
"joomla/image": 20,
|
||||
"joomla/ldap": 20,
|
||||
"joomla/oauth1": 20,
|
||||
"joomla/oauth2": 20,
|
||||
"joomla/registry": 20,
|
||||
|
|
|
|||
46
libraries/vendor/composer/autoload_classmap.php
vendored
46
libraries/vendor/composer/autoload_classmap.php
vendored
|
|
@ -395,25 +395,25 @@ return array(
|
|||
'Joomla\\CMS\\Log\\Logger\\MessagequeueLogger' => $baseDir . '/libraries/src/Log/Logger/MessagequeueLogger.php',
|
||||
'Joomla\\CMS\\Log\\Logger\\SyslogLogger' => $baseDir . '/libraries/src/Log/Logger/SyslogLogger.php',
|
||||
'Joomla\\CMS\\Log\\Logger\\W3cLogger' => $baseDir . '/libraries/src/Log/Logger/W3cLogger.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\AdminController' => $baseDir . '/libraries/src/Mvc/Controller/AdminController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\BaseController' => $baseDir . '/libraries/src/Mvc/Controller/BaseController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\ControllerInterface' => $baseDir . '/libraries/src/Mvc/Controller/ControllerInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\FormController' => $baseDir . '/libraries/src/Mvc/Controller/FormController.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\LegacyFactory' => $baseDir . '/libraries/src/Mvc/Factory/LegacyFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactory' => $baseDir . '/libraries/src/Mvc/Factory/MVCFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactoryInterface' => $baseDir . '/libraries/src/Mvc/Factory/MVCFactoryInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\AdminModel' => $baseDir . '/libraries/src/Mvc/Model/AdminModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel' => $baseDir . '/libraries/src/Mvc/Model/BaseDatabaseModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\FormModel' => $baseDir . '/libraries/src/Mvc/Model/FormModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ItemModel' => $baseDir . '/libraries/src/Mvc/Model/ItemModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ListModel' => $baseDir . '/libraries/src/Mvc/Model/ListModel.php',
|
||||
'Joomla\\CMS\\MVC\\View\\AbstractView' => $baseDir . '/libraries/src/Mvc/View/AbstractView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoriesView' => $baseDir . '/libraries/src/Mvc/View/CategoriesView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryFeedView' => $baseDir . '/libraries/src/Mvc/View/CategoryFeedView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryView' => $baseDir . '/libraries/src/Mvc/View/CategoryView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\FormView' => $baseDir . '/libraries/src/Mvc/View/FormView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\HtmlView' => $baseDir . '/libraries/src/Mvc/View/HtmlView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\ListView' => $baseDir . '/libraries/src/Mvc/View/ListView.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\AdminController' => $baseDir . '/libraries/src/MVC/Controller/AdminController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\BaseController' => $baseDir . '/libraries/src/MVC/Controller/BaseController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\ControllerInterface' => $baseDir . '/libraries/src/MVC/Controller/ControllerInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\FormController' => $baseDir . '/libraries/src/MVC/Controller/FormController.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\LegacyFactory' => $baseDir . '/libraries/src/MVC/Factory/LegacyFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactory' => $baseDir . '/libraries/src/MVC/Factory/MVCFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactoryInterface' => $baseDir . '/libraries/src/MVC/Factory/MVCFactoryInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\AdminModel' => $baseDir . '/libraries/src/MVC/Model/AdminModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel' => $baseDir . '/libraries/src/MVC/Model/BaseDatabaseModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\FormModel' => $baseDir . '/libraries/src/MVC/Model/FormModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ItemModel' => $baseDir . '/libraries/src/MVC/Model/ItemModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ListModel' => $baseDir . '/libraries/src/MVC/Model/ListModel.php',
|
||||
'Joomla\\CMS\\MVC\\View\\AbstractView' => $baseDir . '/libraries/src/MVC/View/AbstractView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoriesView' => $baseDir . '/libraries/src/MVC/View/CategoriesView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryFeedView' => $baseDir . '/libraries/src/MVC/View/CategoryFeedView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryView' => $baseDir . '/libraries/src/MVC/View/CategoryView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\FormView' => $baseDir . '/libraries/src/MVC/View/FormView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\HtmlView' => $baseDir . '/libraries/src/MVC/View/HtmlView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\ListView' => $baseDir . '/libraries/src/MVC/View/ListView.php',
|
||||
'Joomla\\CMS\\Mail\\Mail' => $baseDir . '/libraries/src/Mail/Mail.php',
|
||||
'Joomla\\CMS\\Mail\\MailHelper' => $baseDir . '/libraries/src/Mail/MailHelper.php',
|
||||
'Joomla\\CMS\\Menu\\AbstractMenu' => $baseDir . '/libraries/src/Menu/AbstractMenu.php',
|
||||
|
|
@ -641,15 +641,7 @@ return array(
|
|||
'Joomla\\Input\\Files' => $vendorDir . '/joomla/input/src/Files.php',
|
||||
'Joomla\\Input\\Input' => $vendorDir . '/joomla/input/src/Input.php',
|
||||
'Joomla\\Input\\Json' => $vendorDir . '/joomla/input/src/Json.php',
|
||||
'Joomla\\Input\\Tests\\CliTest' => $vendorDir . '/joomla/input/Tests/CliTest.php',
|
||||
'Joomla\\Input\\Tests\\CookieTest' => $vendorDir . '/joomla/input/Tests/CookieTest.php',
|
||||
'Joomla\\Input\\Tests\\FilesTest' => $vendorDir . '/joomla/input/Tests/FilesTest.php',
|
||||
'Joomla\\Input\\Tests\\FilterInputMock' => $vendorDir . '/joomla/input/Tests/Stubs/FilterInputMock.php',
|
||||
'Joomla\\Input\\Tests\\InputMocker' => $vendorDir . '/joomla/input/Tests/InputMocker.php',
|
||||
'Joomla\\Input\\Tests\\InputTest' => $vendorDir . '/joomla/input/Tests/InputTest.php',
|
||||
'Joomla\\Input\\Tests\\JsonTest' => $vendorDir . '/joomla/input/Tests/JsonTest.php',
|
||||
'Joomla\\Ldap\\LdapClient' => $vendorDir . '/joomla/ldap/src/LdapClient.php',
|
||||
'Joomla\\Ldap\\Tests\\LdapClientTest' => $vendorDir . '/joomla/ldap/Tests/LdapClientTest.php',
|
||||
'Joomla\\OAuth1\\Client' => $vendorDir . '/joomla/oauth1/src/Client.php',
|
||||
'Joomla\\OAuth2\\Client' => $vendorDir . '/joomla/oauth2/src/Client.php',
|
||||
'Joomla\\Registry\\Factory' => $vendorDir . '/joomla/registry/src/Factory.php',
|
||||
|
|
|
|||
2
libraries/vendor/composer/autoload_files.php
vendored
2
libraries/vendor/composer/autoload_files.php
vendored
|
|
@ -22,7 +22,7 @@ return array(
|
|||
'4292e2fa66516089e6006723267587b4' => $vendorDir . '/joomla/string/src/phputf8/utils/ascii.php',
|
||||
'87465e33b7551b401bf051928f220e9a' => $vendorDir . '/joomla/string/src/phputf8/utils/validation.php',
|
||||
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
|
||||
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
|
||||
'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
|
||||
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
|
||||
'3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
|
||||
);
|
||||
|
|
|
|||
1
libraries/vendor/composer/autoload_psr4.php
vendored
1
libraries/vendor/composer/autoload_psr4.php
vendored
|
|
@ -24,7 +24,6 @@ return array(
|
|||
'Joomla\\Registry\\' => array($vendorDir . '/joomla/registry/src'),
|
||||
'Joomla\\OAuth2\\' => array($vendorDir . '/joomla/oauth2/src'),
|
||||
'Joomla\\OAuth1\\' => array($vendorDir . '/joomla/oauth1/src'),
|
||||
'Joomla\\Ldap\\Tests\\' => array($vendorDir . '/joomla/ldap/Tests'),
|
||||
'Joomla\\Ldap\\' => array($vendorDir . '/joomla/ldap/src'),
|
||||
'Joomla\\Input\\Tests\\' => array($vendorDir . '/joomla/input/Tests'),
|
||||
'Joomla\\Input\\' => array($vendorDir . '/joomla/input/src'),
|
||||
|
|
|
|||
53
libraries/vendor/composer/autoload_static.php
vendored
53
libraries/vendor/composer/autoload_static.php
vendored
|
|
@ -23,8 +23,8 @@ class ComposerStaticInit8462306b3e4ab2d2c9bfd5cc383e4b0c
|
|||
'4292e2fa66516089e6006723267587b4' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/ascii.php',
|
||||
'87465e33b7551b401bf051928f220e9a' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/validation.php',
|
||||
'5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
|
||||
'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
|
||||
'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php',
|
||||
'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
|
||||
'3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php',
|
||||
);
|
||||
|
||||
|
|
@ -61,7 +61,6 @@ class ComposerStaticInit8462306b3e4ab2d2c9bfd5cc383e4b0c
|
|||
'Joomla\\Registry\\' => 16,
|
||||
'Joomla\\OAuth2\\' => 14,
|
||||
'Joomla\\OAuth1\\' => 14,
|
||||
'Joomla\\Ldap\\Tests\\' => 18,
|
||||
'Joomla\\Ldap\\' => 12,
|
||||
'Joomla\\Input\\Tests\\' => 19,
|
||||
'Joomla\\Input\\' => 13,
|
||||
|
|
@ -167,10 +166,6 @@ class ComposerStaticInit8462306b3e4ab2d2c9bfd5cc383e4b0c
|
|||
array (
|
||||
0 => __DIR__ . '/..' . '/joomla/oauth1/src',
|
||||
),
|
||||
'Joomla\\Ldap\\Tests\\' =>
|
||||
array (
|
||||
0 => __DIR__ . '/..' . '/joomla/ldap/Tests',
|
||||
),
|
||||
'Joomla\\Ldap\\' =>
|
||||
array (
|
||||
0 => __DIR__ . '/..' . '/joomla/ldap/src',
|
||||
|
|
@ -643,25 +638,25 @@ class ComposerStaticInit8462306b3e4ab2d2c9bfd5cc383e4b0c
|
|||
'Joomla\\CMS\\Log\\Logger\\MessagequeueLogger' => __DIR__ . '/../../..' . '/libraries/src/Log/Logger/MessagequeueLogger.php',
|
||||
'Joomla\\CMS\\Log\\Logger\\SyslogLogger' => __DIR__ . '/../../..' . '/libraries/src/Log/Logger/SyslogLogger.php',
|
||||
'Joomla\\CMS\\Log\\Logger\\W3cLogger' => __DIR__ . '/../../..' . '/libraries/src/Log/Logger/W3cLogger.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\AdminController' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Controller/AdminController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\BaseController' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Controller/BaseController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\ControllerInterface' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Controller/ControllerInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\FormController' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Controller/FormController.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\LegacyFactory' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Factory/LegacyFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactory' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Factory/MVCFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactoryInterface' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Factory/MVCFactoryInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\AdminModel' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Model/AdminModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Model/BaseDatabaseModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\FormModel' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Model/FormModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ItemModel' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Model/ItemModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ListModel' => __DIR__ . '/../../..' . '/libraries/src/Mvc/Model/ListModel.php',
|
||||
'Joomla\\CMS\\MVC\\View\\AbstractView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/AbstractView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoriesView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/CategoriesView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryFeedView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/CategoryFeedView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/CategoryView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\FormView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/FormView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\HtmlView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/HtmlView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\ListView' => __DIR__ . '/../../..' . '/libraries/src/Mvc/View/ListView.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\AdminController' => __DIR__ . '/../../..' . '/libraries/src/MVC/Controller/AdminController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\BaseController' => __DIR__ . '/../../..' . '/libraries/src/MVC/Controller/BaseController.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\ControllerInterface' => __DIR__ . '/../../..' . '/libraries/src/MVC/Controller/ControllerInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Controller\\FormController' => __DIR__ . '/../../..' . '/libraries/src/MVC/Controller/FormController.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\LegacyFactory' => __DIR__ . '/../../..' . '/libraries/src/MVC/Factory/LegacyFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactory' => __DIR__ . '/../../..' . '/libraries/src/MVC/Factory/MVCFactory.php',
|
||||
'Joomla\\CMS\\MVC\\Factory\\MVCFactoryInterface' => __DIR__ . '/../../..' . '/libraries/src/MVC/Factory/MVCFactoryInterface.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\AdminModel' => __DIR__ . '/../../..' . '/libraries/src/MVC/Model/AdminModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel' => __DIR__ . '/../../..' . '/libraries/src/MVC/Model/BaseDatabaseModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\FormModel' => __DIR__ . '/../../..' . '/libraries/src/MVC/Model/FormModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ItemModel' => __DIR__ . '/../../..' . '/libraries/src/MVC/Model/ItemModel.php',
|
||||
'Joomla\\CMS\\MVC\\Model\\ListModel' => __DIR__ . '/../../..' . '/libraries/src/MVC/Model/ListModel.php',
|
||||
'Joomla\\CMS\\MVC\\View\\AbstractView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/AbstractView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoriesView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/CategoriesView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryFeedView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/CategoryFeedView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\CategoryView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/CategoryView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\FormView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/FormView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\HtmlView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/HtmlView.php',
|
||||
'Joomla\\CMS\\MVC\\View\\ListView' => __DIR__ . '/../../..' . '/libraries/src/MVC/View/ListView.php',
|
||||
'Joomla\\CMS\\Mail\\Mail' => __DIR__ . '/../../..' . '/libraries/src/Mail/Mail.php',
|
||||
'Joomla\\CMS\\Mail\\MailHelper' => __DIR__ . '/../../..' . '/libraries/src/Mail/MailHelper.php',
|
||||
'Joomla\\CMS\\Menu\\AbstractMenu' => __DIR__ . '/../../..' . '/libraries/src/Menu/AbstractMenu.php',
|
||||
|
|
@ -889,15 +884,7 @@ class ComposerStaticInit8462306b3e4ab2d2c9bfd5cc383e4b0c
|
|||
'Joomla\\Input\\Files' => __DIR__ . '/..' . '/joomla/input/src/Files.php',
|
||||
'Joomla\\Input\\Input' => __DIR__ . '/..' . '/joomla/input/src/Input.php',
|
||||
'Joomla\\Input\\Json' => __DIR__ . '/..' . '/joomla/input/src/Json.php',
|
||||
'Joomla\\Input\\Tests\\CliTest' => __DIR__ . '/..' . '/joomla/input/Tests/CliTest.php',
|
||||
'Joomla\\Input\\Tests\\CookieTest' => __DIR__ . '/..' . '/joomla/input/Tests/CookieTest.php',
|
||||
'Joomla\\Input\\Tests\\FilesTest' => __DIR__ . '/..' . '/joomla/input/Tests/FilesTest.php',
|
||||
'Joomla\\Input\\Tests\\FilterInputMock' => __DIR__ . '/..' . '/joomla/input/Tests/Stubs/FilterInputMock.php',
|
||||
'Joomla\\Input\\Tests\\InputMocker' => __DIR__ . '/..' . '/joomla/input/Tests/InputMocker.php',
|
||||
'Joomla\\Input\\Tests\\InputTest' => __DIR__ . '/..' . '/joomla/input/Tests/InputTest.php',
|
||||
'Joomla\\Input\\Tests\\JsonTest' => __DIR__ . '/..' . '/joomla/input/Tests/JsonTest.php',
|
||||
'Joomla\\Ldap\\LdapClient' => __DIR__ . '/..' . '/joomla/ldap/src/LdapClient.php',
|
||||
'Joomla\\Ldap\\Tests\\LdapClientTest' => __DIR__ . '/..' . '/joomla/ldap/Tests/LdapClientTest.php',
|
||||
'Joomla\\OAuth1\\Client' => __DIR__ . '/..' . '/joomla/oauth1/src/Client.php',
|
||||
'Joomla\\OAuth2\\Client' => __DIR__ . '/..' . '/joomla/oauth2/src/Client.php',
|
||||
'Joomla\\Registry\\Factory' => __DIR__ . '/..' . '/joomla/registry/src/Factory.php',
|
||||
|
|
|
|||
94
libraries/vendor/composer/installed.json
vendored
94
libraries/vendor/composer/installed.json
vendored
|
|
@ -1582,51 +1582,6 @@
|
|||
"shim"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "joomla/ldap",
|
||||
"version": "1.2.0",
|
||||
"version_normalized": "1.2.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/joomla-framework/ldap.git",
|
||||
"reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/joomla-framework/ldap/zipball/2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208",
|
||||
"reference": "2d82a7e9ad0aa1091e8121ab8e194ff0e9d14208",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-ldap": "*",
|
||||
"php": "^5.3.10|~7.0",
|
||||
"symfony/polyfill-php56": "~1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
|
||||
"squizlabs/php_codesniffer": "1.*"
|
||||
},
|
||||
"time": "2017-07-27T13:13:55+00:00",
|
||||
"type": "joomla-package",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Joomla\\Ldap\\": "src/",
|
||||
"Joomla\\Ldap\\Tests\\": "Tests/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"GPL-2.0+"
|
||||
],
|
||||
"description": "Joomla LDAP Package",
|
||||
"homepage": "https://github.com/joomla-framework/ldap",
|
||||
"keywords": [
|
||||
"framework",
|
||||
"joomla",
|
||||
"ldap"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "joomla/session",
|
||||
"version": "dev-2.0-dev",
|
||||
|
|
@ -2180,5 +2135,54 @@
|
|||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com"
|
||||
},
|
||||
{
|
||||
"name": "joomla/ldap",
|
||||
"version": "dev-2.0-dev",
|
||||
"version_normalized": "dev-2.0-dev",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/joomla-framework/ldap.git",
|
||||
"reference": "9da0299c4a104d09b0776936d87a9b9c60bac95e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/joomla-framework/ldap/zipball/9da0299c4a104d09b0776936d87a9b9c60bac95e",
|
||||
"reference": "9da0299c4a104d09b0776936d87a9b9c60bac95e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-ldap": "*",
|
||||
"php": "~7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"joomla/registry": "^1.4.5|~2.0",
|
||||
"phpunit/phpunit": "~6.3",
|
||||
"squizlabs/php_codesniffer": "1.*"
|
||||
},
|
||||
"time": "2017-11-16T12:59:31+00:00",
|
||||
"type": "joomla-package",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-2.0-dev": "2.0-dev"
|
||||
}
|
||||
},
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Joomla\\Ldap\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"GPL-2.0+"
|
||||
],
|
||||
"description": "Joomla LDAP Package",
|
||||
"homepage": "https://github.com/joomla-framework/ldap",
|
||||
"keywords": [
|
||||
"framework",
|
||||
"joomla",
|
||||
"ldap"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
349
libraries/vendor/joomla/ldap/src/LdapClient.php
vendored
349
libraries/vendor/joomla/ldap/src/LdapClient.php
vendored
|
|
@ -1,8 +1,8 @@
|
|||
<?php
|
||||
/**
|
||||
* Part of the Joomla Framework Client Package
|
||||
* Part of the Joomla Framework LDAP Package
|
||||
*
|
||||
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
|
||||
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
|
||||
* @license GNU General Public License version 2 or later; see LICENSE
|
||||
*/
|
||||
|
||||
|
|
@ -16,85 +16,117 @@ namespace Joomla\Ldap;
|
|||
class LdapClient
|
||||
{
|
||||
/**
|
||||
* @var string Hostname of LDAP server
|
||||
* Hostname of LDAP server
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $host = null;
|
||||
|
||||
/**
|
||||
* @var bool Authorization Method to use
|
||||
* Authorization Method to use
|
||||
*
|
||||
* @var boolean
|
||||
* @since 1.0
|
||||
*/
|
||||
public $auth_method = null;
|
||||
|
||||
/**
|
||||
* @var int Port of LDAP server
|
||||
* Port of LDAP server
|
||||
*
|
||||
* @var integer
|
||||
* @since 1.0
|
||||
*/
|
||||
public $port = null;
|
||||
|
||||
/**
|
||||
* @var string Base DN (e.g. o=MyDir)
|
||||
* Base DN (e.g. o=MyDir)
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $base_dn = null;
|
||||
|
||||
/**
|
||||
* @var string User DN (e.g. cn=Users,o=MyDir)
|
||||
* User DN (e.g. cn=Users,o=MyDir)
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $users_dn = null;
|
||||
|
||||
/**
|
||||
* @var string Search String
|
||||
* Search String
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $search_string = null;
|
||||
|
||||
/**
|
||||
* @var boolean Use LDAP Version 3
|
||||
* Use LDAP Version 3
|
||||
*
|
||||
* @var boolean
|
||||
* @since 1.0
|
||||
*/
|
||||
public $use_ldapV3 = null;
|
||||
|
||||
/**
|
||||
* @var boolean No referrals (server transfers)
|
||||
* No referrals (server transfers)
|
||||
*
|
||||
* @var boolean
|
||||
* @since 1.0
|
||||
*/
|
||||
public $no_referrals = null;
|
||||
|
||||
/**
|
||||
* @var boolean Negotiate TLS (encrypted communications)
|
||||
* Negotiate TLS (encrypted communications)
|
||||
*
|
||||
* @var boolean
|
||||
* @since 1.0
|
||||
*/
|
||||
public $negotiate_tls = null;
|
||||
|
||||
/**
|
||||
* @var string Username to connect to server
|
||||
* Username to connect to server
|
||||
*
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $username = null;
|
||||
|
||||
/**
|
||||
* Password to connect to server
|
||||
*
|
||||
* @var string Password to connect to server
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
public $password = null;
|
||||
|
||||
/**
|
||||
* @var mixed LDAP Resource Identifier
|
||||
* LDAP Resource Identifier
|
||||
*
|
||||
* @var resource
|
||||
* @since 1.0
|
||||
*/
|
||||
private $resource = null;
|
||||
|
||||
/**
|
||||
* Current DN
|
||||
*
|
||||
* @var string Current DN
|
||||
* @var string
|
||||
* @since 1.0
|
||||
*/
|
||||
private $dn = null;
|
||||
|
||||
/**
|
||||
* Flag tracking whether the connection has been bound
|
||||
*
|
||||
* @var boolean
|
||||
* @since 1.3.0
|
||||
*/
|
||||
private $isBound = false;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
|
@ -124,9 +156,19 @@ class LdapClient
|
|||
}
|
||||
|
||||
/**
|
||||
* Connect to server
|
||||
* Class destructor.
|
||||
*
|
||||
* @return boolean True if successful
|
||||
* @since 1.3.0
|
||||
*/
|
||||
public function __destruct()
|
||||
{
|
||||
$this->close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to an LDAP server
|
||||
*
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
|
|
@ -137,37 +179,29 @@ class LdapClient
|
|||
return false;
|
||||
}
|
||||
|
||||
$this->resource = @ ldap_connect($this->host, $this->port);
|
||||
$this->resource = ldap_connect($this->host, $this->port);
|
||||
|
||||
if ($this->resource)
|
||||
{
|
||||
if ($this->use_ldapV3)
|
||||
{
|
||||
if (!@ldap_set_option($this->resource, LDAP_OPT_PROTOCOL_VERSION, 3))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!@ldap_set_option($this->resource, LDAP_OPT_REFERRALS, (int) $this->no_referrals))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->negotiate_tls)
|
||||
{
|
||||
if (!@ldap_start_tls($this->resource))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
if (!$this->resource)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->use_ldapV3 && !ldap_set_option($this->resource, LDAP_OPT_PROTOCOL_VERSION, 3))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ldap_set_option($this->resource, LDAP_OPT_REFERRALS, (int) $this->no_referrals))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($this->negotiate_tls && !ldap_start_tls($this->resource))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -179,7 +213,12 @@ class LdapClient
|
|||
*/
|
||||
public function close()
|
||||
{
|
||||
@ ldap_close($this->resource);
|
||||
if ($this->isConnected())
|
||||
{
|
||||
$this->unbind();
|
||||
}
|
||||
|
||||
$this->resource = null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -209,9 +248,9 @@ class LdapClient
|
|||
}
|
||||
|
||||
/**
|
||||
* Get the DN
|
||||
* Get the configured DN
|
||||
*
|
||||
* @return string The current dn
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
|
|
@ -223,15 +262,23 @@ class LdapClient
|
|||
/**
|
||||
* Anonymously binds to LDAP directory
|
||||
*
|
||||
* @return array
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function anonymous_bind()
|
||||
{
|
||||
$bindResult = @ldap_bind($this->resource);
|
||||
if (!$this->isConnected())
|
||||
{
|
||||
if (!$this->connect())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return $bindResult;
|
||||
$this->isBound = ldap_bind($this->resource);
|
||||
|
||||
return $this->isBound;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -247,6 +294,14 @@ class LdapClient
|
|||
*/
|
||||
public function bind($username = null, $password = null, $nosub = 0)
|
||||
{
|
||||
if (!$this->isConnected())
|
||||
{
|
||||
if (!$this->connect())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (is_null($username))
|
||||
{
|
||||
$username = $this->username;
|
||||
|
|
@ -258,9 +313,27 @@ class LdapClient
|
|||
}
|
||||
|
||||
$this->setDn($username, $nosub);
|
||||
$bindResult = @ldap_bind($this->resource, $this->getDn(), $password);
|
||||
|
||||
return $bindResult;
|
||||
$this->isBound = ldap_bind($this->resource, $this->getDn(), $password);
|
||||
|
||||
return $this->isBound;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unbinds from the LDAP directory
|
||||
*
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.3.0
|
||||
*/
|
||||
public function unbind()
|
||||
{
|
||||
if ($this->isBound && $this->resource && is_resource($this->resource))
|
||||
{
|
||||
return ldap_unbind($this->resource);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -270,7 +343,7 @@ class LdapClient
|
|||
*
|
||||
* @return array Search results
|
||||
*
|
||||
* @since 1.0
|
||||
* @since 1.0
|
||||
*/
|
||||
public function simple_search($search)
|
||||
{
|
||||
|
|
@ -299,6 +372,11 @@ class LdapClient
|
|||
{
|
||||
$result = array();
|
||||
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return $result;
|
||||
}
|
||||
|
||||
if ($dnoverride)
|
||||
{
|
||||
$dn = $dnoverride;
|
||||
|
|
@ -308,13 +386,11 @@ class LdapClient
|
|||
$dn = $this->base_dn;
|
||||
}
|
||||
|
||||
$resource = $this->resource;
|
||||
|
||||
foreach ($filters as $search_filter)
|
||||
{
|
||||
$search_result = @ldap_search($resource, $dn, $search_filter, $attributes);
|
||||
$search_result = ldap_search($this->resource, $dn, $search_filter, $attributes);
|
||||
|
||||
if ($search_result && ($count = @ldap_count_entries($resource, $search_result)) > 0)
|
||||
if ($search_result && ($count = ldap_count_entries($this->resource, $search_result)) > 0)
|
||||
{
|
||||
for ($i = 0; $i < $count; $i++)
|
||||
{
|
||||
|
|
@ -322,15 +398,15 @@ class LdapClient
|
|||
|
||||
if (!$i)
|
||||
{
|
||||
$firstentry = @ldap_first_entry($resource, $search_result);
|
||||
$firstentry = ldap_first_entry($this->resource, $search_result);
|
||||
}
|
||||
else
|
||||
{
|
||||
$firstentry = @ldap_next_entry($resource, $firstentry);
|
||||
$firstentry = ldap_next_entry($this->resource, $firstentry);
|
||||
}
|
||||
|
||||
// Load user-specified attributes
|
||||
$result_array = @ldap_get_attributes($resource, $firstentry);
|
||||
$result_array = ldap_get_attributes($this->resource, $firstentry);
|
||||
|
||||
// LDAP returns an array of arrays, fit this into attributes result array
|
||||
foreach ($result_array as $ki => $ai)
|
||||
|
|
@ -347,7 +423,7 @@ class LdapClient
|
|||
}
|
||||
}
|
||||
|
||||
$result[$i]['dn'] = @ldap_get_dn($resource, $firstentry);
|
||||
$result[$i]['dn'] = ldap_get_dn($this->resource, $firstentry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -356,153 +432,193 @@ class LdapClient
|
|||
}
|
||||
|
||||
/**
|
||||
* Replace an entry and return a true or false result
|
||||
* Replace attribute values with new ones
|
||||
*
|
||||
* @param string $dn The DN which contains the attribute you want to replace
|
||||
* @param string $attribute The attribute values you want to replace
|
||||
*
|
||||
* @return mixed result of comparison (true, false, -1 on error)
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function replace($dn, $attribute)
|
||||
{
|
||||
return @ldap_mod_replace($this->resource, $dn, $attribute);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_mod_replace($this->resource, $dn, $attribute);
|
||||
}
|
||||
|
||||
/**
|
||||
* Modifies an entry and return a true or false result
|
||||
* Modify an LDAP entry
|
||||
*
|
||||
* @param string $dn The DN which contains the attribute you want to modify
|
||||
* @param string $attribute The attribute values you want to modify
|
||||
*
|
||||
* @return mixed result of comparison (true, false, -1 on error)
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function modify($dn, $attribute)
|
||||
{
|
||||
return @ldap_modify($this->resource, $dn, $attribute);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_modify($this->resource, $dn, $attribute);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes attribute value from given dn and return a true or false result
|
||||
* Delete attribute values from current attributes
|
||||
*
|
||||
* @param string $dn The DN which contains the attribute you want to remove
|
||||
* @param string $attribute The attribute values you want to remove
|
||||
*
|
||||
* @return mixed result of comparison (true, false, -1 on error)
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function remove($dn, $attribute)
|
||||
{
|
||||
$resource = $this->resource;
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return @ldap_mod_del($resource, $dn, $attribute);
|
||||
return ldap_mod_del($this->resource, $dn, $attribute);
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare an entry and return a true or false result
|
||||
* Compare value of attribute found in entry specified with DN
|
||||
*
|
||||
* @param string $dn The DN which contains the attribute you want to compare
|
||||
* @param string $attribute The attribute whose value you want to compare
|
||||
* @param string $value The value you want to check against the LDAP attribute
|
||||
*
|
||||
* @return mixed result of comparison (true, false, -1 on error)
|
||||
* @return boolean|integer Boolean result of the comparison or -1 on error
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function compare($dn, $attribute, $value)
|
||||
{
|
||||
return @ldap_compare($this->resource, $dn, $attribute, $value);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_compare($this->resource, $dn, $attribute, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Read all or specified attributes of given dn
|
||||
* Read attributes of a given DN
|
||||
*
|
||||
* @param string $dn The DN of the object you want to read
|
||||
*
|
||||
* @return mixed array of attributes or -1 on error
|
||||
* @return array|boolean Array of attributes for the given DN or boolean false on failure
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function read($dn)
|
||||
{
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
$base = substr($dn, strpos($dn, ',') + 1);
|
||||
$cn = substr($dn, 0, strpos($dn, ','));
|
||||
$result = @ldap_read($this->resource, $base, $cn);
|
||||
$result = ldap_read($this->resource, $base, $cn);
|
||||
|
||||
if ($result)
|
||||
if ($result === false)
|
||||
{
|
||||
return @ldap_get_entries($this->resource, $result);
|
||||
}
|
||||
else
|
||||
{
|
||||
return $result;
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_get_entries($this->resource, $result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a given DN from the tree
|
||||
* Delete an entry from a directory
|
||||
*
|
||||
* @param string $dn The DN of the object you want to delete
|
||||
*
|
||||
* @return boolean Result of operation
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function delete($dn)
|
||||
{
|
||||
return @ldap_delete($this->resource, $dn);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_delete($this->resource, $dn);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new DN
|
||||
* Add entries to LDAP directory
|
||||
*
|
||||
* @param string $dn The DN where you want to put the object
|
||||
* @param array $entries An array of arrays describing the object to add
|
||||
*
|
||||
* @return boolean Result of operation
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function create($dn, array $entries)
|
||||
{
|
||||
return @ldap_add($this->resource, $dn, $entries);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_add($this->resource, $dn, $entries);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an attribute to the given DN
|
||||
* Note: DN has to exist already
|
||||
* Add attribute values to current attributes
|
||||
*
|
||||
* @param string $dn The DN of the entry to add the attribute
|
||||
* @param array $entry An array of arrays with attributes to add
|
||||
*
|
||||
* @return boolean Result of operation
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function add($dn, array $entry)
|
||||
{
|
||||
return @ldap_mod_add($this->resource, $dn, $entry);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_mod_add($this->resource, $dn, $entry);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rename the entry
|
||||
* Modify the name of an entry
|
||||
*
|
||||
* @param string $dn The DN of the entry at the moment
|
||||
* @param string $newdn The DN of the entry should be (only cn=newvalue)
|
||||
* @param string $newparent The full DN of the parent (null by default)
|
||||
* @param boolean $deleteolddn Delete the old values (default)
|
||||
*
|
||||
* @return boolean Result of operation
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function rename($dn, $newdn, $newparent, $deleteolddn)
|
||||
{
|
||||
return @ldap_rename($this->resource, $dn, $newdn, $newparent, $deleteolddn);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return ldap_rename($this->resource, $dn, $newdn, $newparent, $deleteolddn);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -518,19 +634,36 @@ class LdapClient
|
|||
*/
|
||||
public function escape($value, $ignore = '', $flags = 0)
|
||||
{
|
||||
return @ldap_escape($value, $ignore, $flags);
|
||||
return ldap_escape($value, $ignore, $flags);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the error message
|
||||
* Return the LDAP error message of the last LDAP command
|
||||
*
|
||||
* @return string error message
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
public function getErrorMsg()
|
||||
{
|
||||
return @ldap_error($this->resource);
|
||||
if (!$this->isBound || !$this->isConnected())
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
return ldap_error($this->resource);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the connection is established
|
||||
*
|
||||
* @return boolean
|
||||
*
|
||||
* @since 1.3.0
|
||||
*/
|
||||
public function isConnected()
|
||||
{
|
||||
return $this->resource && is_resource($this->resource);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -538,7 +671,7 @@ class LdapClient
|
|||
*
|
||||
* @param string $ip IP Address (e.g. xxx.xxx.xxx.xxx)
|
||||
*
|
||||
* @return string Net address
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
|
|
@ -615,7 +748,9 @@ class LdapClient
|
|||
'TCP6',
|
||||
'Reserved (12)',
|
||||
'URL',
|
||||
'Count');
|
||||
'Count'
|
||||
);
|
||||
|
||||
$len = strlen($networkaddress);
|
||||
|
||||
if ($len > 0)
|
||||
|
|
@ -652,7 +787,7 @@ class LdapClient
|
|||
* @param string $password Clear text password to encrypt
|
||||
* @param string $type Type of password hash, either md5 or SHA
|
||||
*
|
||||
* @return string Encrypted password
|
||||
* @return string
|
||||
*
|
||||
* @since 1.0
|
||||
*/
|
||||
|
|
@ -661,15 +796,11 @@ class LdapClient
|
|||
switch (strtolower($type))
|
||||
{
|
||||
case 'sha':
|
||||
$userpassword = '{SHA}' . base64_encode(pack('H*', sha1($password)));
|
||||
break;
|
||||
return '{SHA}' . base64_encode(pack('H*', sha1($password)));
|
||||
|
||||
case 'md5':
|
||||
default:
|
||||
$userpassword = '{MD5}' . base64_encode(pack('H*', md5($password)));
|
||||
break;
|
||||
return '{MD5}' . base64_encode(pack('H*', md5($password)));
|
||||
}
|
||||
|
||||
return $userpassword;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user