forked from extern/egroupware
* ActiveDirectory: using adLDAP now from adldap2/adldap2=4.0.4 via composer
This commit is contained in:
parent
5fa3d455a5
commit
e1f8fa7799
@ -17,10 +17,6 @@ svn_branch = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(sv
|
||||
[api/src/Db/ADOdb]
|
||||
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ADOdb.git
|
||||
|
||||
[api/src/Accounts/Ads]
|
||||
checkout = svn checkout -q https://svn.code.sf.net/p/adldap/code/trunk/src Ads
|
||||
skip = [ $1 = "tag" -o $1 = "untag" -o $1 = "branch" ]
|
||||
|
||||
[api/js/ckeditor]
|
||||
checkout = svn checkout -q https://github.com/EGroupware/ckeditor-dev/branches/trunk/dev/builder/release/ckeditor
|
||||
skip = [ $1 = "tag" -o $1 = "untag" -o $1 = "branch" ]
|
||||
|
@ -15,7 +15,7 @@ namespace EGroupware\Api\Accounts;
|
||||
|
||||
use EGroupware\Api;
|
||||
|
||||
require_once __DIR__.'/Ads/adLDAP.php';
|
||||
require_once EGW_INCLUDE_ROOT.'vendor/adldap2/adldap2/src/adLDAP.php';
|
||||
use adLDAPException;
|
||||
|
||||
/**
|
||||
@ -27,9 +27,9 @@ use adLDAPException;
|
||||
* Easiest way to enable SSL on a win2008r2 DC is to install role "Active Director Certificate Services"
|
||||
* or in German "Active Directory-Zertificatsdienste" AND reboot.
|
||||
*
|
||||
* Changing passwords currently requires ads_admin user (configured in setup) to have "Reset Password"
|
||||
* priveledges, as PHP can not delete unicodePwd attribute with old password and set it in same
|
||||
* operation with new password!
|
||||
* Changing passwords require ldap_modify_batch method available in PHP 5.4 >= 5.4.26,
|
||||
* PHP 5.5 >= 5.5.10 or PHP 5.6+. In earlier PHP versions ads_admin user (configured in setup)
|
||||
* has to have "Reset Password" priveledges!
|
||||
*
|
||||
* @access internal only use the interface provided by the accounts class
|
||||
* @link http://www.selfadsi.org/user-attributes-w2k8.htm
|
||||
|
@ -32,7 +32,8 @@
|
||||
"bower-asset/jquery-touchswipe": "1.6.*",
|
||||
"bower-asset/jquery-ui":"=1.11.2",
|
||||
"npm-asset/as-jqplot" : "1.0.*",
|
||||
"npm-asset/gridster":"0.5.*"
|
||||
"npm-asset/gridster":"0.5.*",
|
||||
"adldap2/adldap2": "=4.0.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~4.8|~5.4"
|
||||
|
54
composer.lock
generated
54
composer.lock
generated
@ -4,9 +4,59 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "7dfe0794bda17cb35ba87b68d1c6f49c",
|
||||
"content-hash": "60a9736be80b34714f237b6a4429fe5e",
|
||||
"hash": "9a74cc9727567f9100d4d1311228aede",
|
||||
"content-hash": "d6ed8efbe2b9261641cf2d9ca9f1d01b",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adldap2/adldap2",
|
||||
"version": "v4.0.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Adldap2/Adldap2.git",
|
||||
"reference": "58702274158a785817c1e983343180051c44a6f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/58702274158a785817c1e983343180051c44a6f4",
|
||||
"reference": "58702274158a785817c1e983343180051c44a6f4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-ldap": "*"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Scott Barnett",
|
||||
"email": "scott@wiggumworld.com",
|
||||
"role": "Developer"
|
||||
},
|
||||
{
|
||||
"name": "Richard Hyland",
|
||||
"email": "adldap@richardhyland.com",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "adLDAP, PHP LDAP library for manipulating Active Directory",
|
||||
"keywords": [
|
||||
"active directory",
|
||||
"ldap",
|
||||
"windows"
|
||||
],
|
||||
"time": "2016-07-14 18:11:24"
|
||||
},
|
||||
{
|
||||
"name": "bower-asset/fastclick",
|
||||
"version": "v1.0.6",
|
||||
|
Loading…
Reference in New Issue
Block a user