54 Commits

Author SHA1 Message Date
Andrew McMillan
02182cf087 Remove duplicate constructor thinko.
Signed-off-by: Andrew McMillan <andrew@morphoss.com>
2011-01-11 10:10:59 +13:00
Andrew McMillan
20ee255898 Refactor fetching of Principal records from database.
This is a significant refactoring, replacing the old getUserBy*()
functions with a new Principal class, and replacing the old
CalDAVPrincipal class with a new DAVPrincipal class which extends
the Principal class.

At this point all regression tests pass (again) but there could
well be issues for people who use alternative authenticators
such as LDAP, although I have endeavoured to resolve those
potential issues.

Signed-off-by: Andrew McMillan <andrew@morphoss.com>
2011-01-03 10:16:43 +13:00
Andrew McMillan
77de9a024e Fix SQL for group handling from Michael Braun. 2010-11-21 00:57:14 +13:00
Jens Zahner
f6fd2d39aa Fixes to LDAP group handling by Jens Zahner 2010-08-14 13:11:04 +12:00
Andrew McMillan
22755fc766 Remove uninitialised variable possibility. 2010-06-29 23:48:43 +12:00
Rob Ostensen
34c1fee3c6 first run at ldap group support 2010-03-21 20:42:03 +13:00
Rob Ostensen
ca04a4a42e warn if there are no active admin users 2010-03-18 23:52:40 +13:00
Andrew McMillan
be7e713c69 Fix deactivation of users no longer in LDAP. 2010-03-18 23:12:31 +13:00
Andrew McMillan
a577a44a51 Siwtch to use an object for the updated users row. 2010-03-18 23:08:00 +13:00
Andrew McMillan
c4917a7e6e A more readable fix that might even be faster... 2010-03-18 22:45:30 +13:00
Andrew McMillan
eb77858c5b D'oh! 2010-03-18 22:30:56 +13:00
Andrew McMillan
390bc17209 Switching to AwlQuery. 2010-03-17 11:51:35 +13:00
Andrew McMillan
c90faa12ba No dependence on DAViCalUser.php is needed any longer. 2010-03-16 10:13:21 +13:00
Andrew McMillan
41766218a5 Add a config item to exclude some users from LDAP sync. 2010-02-25 21:19:08 +13:00
Andrew McMillan
e02514cd46 Reset the $row array each time through. 2009-10-30 19:06:00 +13:00
Matthias Mohr
526d4dce6f Translatability improvements from Matthias Mohr. 2009-10-30 09:00:41 +13:00
Andrew McMillan
0ad37c01d5 Revert to require_once(). 2009-10-27 09:13:43 +13:00
Andrew McMillan
11951a09cd Fix tabs. 2009-09-26 21:47:04 +12:00
Andrew McMillan
3fdbd17d3d Patch to support Kerberos from Benedikt Elser. 2009-09-26 21:06:20 +12:00
Andrew McMillan
49795c5cbb Rename RSCDSUser (.php) to DAViCalUser (.php) 2009-06-30 15:21:14 +12:00
Andrew McMillan
33d222bb61 If LDAP filterUsers is not set, or is empty, don't bracket it. 2009-06-09 10:34:09 +12:00
Andrew McMillan
9b069af2a9 Remove another warning possibility. 2009-05-12 23:57:19 +12:00
Andrew McMillan
f4c3292b62 Try and get rid of warnings. 2009-05-12 13:01:51 +12:00
Andrew McMillan
51b684bb7a Fix typo. 2008-05-12 20:12:57 +12:00
Andrew McMillan
4d85525e24 Tweak error messages so LDAP password is not logged. 2008-02-28 13:51:18 +13:00
Andrew Ruthven
049fc6ef03 Remove leak of password information, improve grammer and fix a typo. 2008-02-28 13:43:39 +13:00
Andrew Ruthven
8c561313e7 Fix a minor bug and add more debugging output. 2008-02-18 10:50:11 +13:00
Andrew Ruthven
3c0cb7a264 Allow multiple trees for baseDN (closes 1876287). 2008-02-15 13:57:05 +13:00
Aiko Barz
a4df7abe9f Add Active Directory support (closes 1876288).
This is slightly modified from Aiko's patch to apply cleanly and add
a few more comments to the example config.
2008-02-15 13:57:04 +13:00
Andrew Ruthven
256bf9d328 Handle the case where sync_LDAP doesn't find any users in LDAP. 2008-02-13 12:46:20 +13:00
Andrew Ruthven
0bc51a9e39 Work on "Sync LDAP with RSCDS" feature.
* Use an ugly hack so that users that are updated using the Sync
  LDAP feature retain their user_no.  Otherwise a new user_no
  was selected, and the insert failed since the username already
  existed.
* Tidy up the output messages to be more consistent.
* Only display "updating user records" if users were updated.
2008-02-13 12:33:27 +13:00
Andrew Ruthven
de50126b6e Fix the deferencing of the query variables for LDAP scope to work. 2008-02-13 11:28:40 +13:00
Andrew Ruthven
7147b5a054 Make sure that the scope config variable is set. 2008-02-13 11:01:50 +13:00
Andrew Ruthven
c4200203ca Allow specifying the search scope to use. 2008-02-13 10:35:16 +13:00
Andrew Ruthven
280e78a461 Tidy up the TLS bits a little bit. 2008-02-13 09:17:01 +13:00
Christian Kier
66114ee754 Allow LDAP drviver to use TLS (closes 1873513) 2008-02-13 09:08:45 +13:00
Andrew McMillan
7189617334 in_array looks for values, but we need to look in the keys now. 2007-11-04 21:41:20 +13:00
Andrew McMillan
e7940eef32 Add a bit more debugging. 2007-11-04 21:35:22 +13:00
Andrew McMillan
99248f42dd Fix debugging. 2007-11-04 21:22:55 +13:00
Andrew McMillan
acca66e4d8 $c needs to be global. 2007-11-04 21:20:05 +13:00
Andrew Ruthven
2744a62c28 Slight code tidy up and add some debug statements. 2007-11-04 20:09:14 +13:00
Andrew Ruthven
5ee58e34b3 Rename one more occurance on attributs to attributes, I can login with LDAP now. 2007-11-03 12:17:21 +13:00
Andrew Ruthven
ad712e9c25 Fix PHP syntax. 2007-11-03 12:12:13 +13:00
Andrew McMillan
e34807cc17 More consistently do the ldap timestamp munding. Probably this
should really be done in a separate 'munge_ldap_timestamp()' function.
2007-11-01 14:48:50 +13:00
Andrew McMillan
13f915ee1b Substantial refactoring of drivers_ldap for efficiency and code reuse.
Also switched to using the auth-functions for user create/update.
2007-10-30 14:51:06 +13:00
Andrew Ruthven
84fc0873bf Make sure the error handling will work if anonymous binding is being used. 2007-10-17 13:18:22 +13:00
Andrew Ruthven
6c872407f7 Allow the filterUser to be specified with or without brackets around it. 2007-10-17 11:58:30 +13:00
Andrew McMillan
3e2c600c33 Correct spelling, including spelling of a configuration variable name. 2007-08-15 22:12:25 +12:00
Paul Willoughby
f9bf7ff170 Allow for the LDAP protocol version to be defined. 2007-08-15 07:51:59 +12:00
Maxime Delorme
cb052ad1d7 Corrections to the LDAP configuration 2007-06-11 13:49:26 +01:00