@@ -8,6 +8,7 @@ FEATURES -------- * Unified authentication and access controls: just use your Drupal user name and password to login via DAV, too. +* Works against LDAP authentication provided by ldap_integration.module. * The web display of DAV collection indexes is entirely themeable. INSTALLATION @@ -41,7 +42,7 @@ TROUBLESHOOTING CREDITS ------- Developed and maintained by Arto Bendiken <http://bendiken.net/> -Additional development on Drupal 6.x by Justin R. Miller <http://codesorcery.net/> +Development on Drupal 6.x by Justin R. Miller <http://codesorcery.net/> Sponsored by MakaluMedia Group <http://www.makalumedia.com/> Sponsored by M.C. Dean, Inc. <http://www.mcdean.com/> Sponsored by SPAWAR <http://www.spawar.navy.mil/> README.txt @@ -65,8 +65,8 @@ function dav_menu() { DAV_ROOT => array( 'title' => 'DAV', 'type' => MENU_CALLBACK, - 'access callback' => 'user_access', - 'access arguments' => array('access content'), // further access controls are enforced in the DAV server + 'access callback' => 'is_bool', + 'access arguments' => array(TRUE), // further access controls are enforced in the DAV server 'page callback' => 'dav_request', ), // Administer >> Site configuration >> DAV settings @@ -334,9 +334,23 @@ function _dav_get_transient_blob($resource) { function _dav_authenticate($name, $pass) { // This is an ugly special case to support the LDAP auth module, which // does not use Drupal's authentication system. - //$func = function_exists('_ldapauth_user_authenticate') ? '_ldapauth_user_authenticate' : 'user_authenticate'; - $func = 'user_authenticate'; // FIXME when LDAP is ported to D6 - return $func(array('name' => $name, 'pass' => $pass)); + if (function_exists('ldapauth_login_validate')) { + // emulate login form values + $form_state = array( + 'values' => array( + 'name' => $name, + 'pass' => $pass + ), + ); + // ldapauth_login_validate() returns nothing, but sets global $user + global $user; + ldapauth_login_validate(NULL, $form_state); + return $user; + } + else { + // user_authenticate() returns $user object + return user_authenticate(array('name' => $name, 'pass' => $pass)); + } } function _dav_init_include_path() { dav.module 777e8aceb77084f7eef76fa76ed5db152023a2b1 Justin R. Miller incanus@codesorcery.net http://github.com/incanus/drupal-dav/commit/20c3970301330697e710ccfffdb59636ac4d0a09 20c3970301330697e710ccfffdb59636ac4d0a09 2008-09-11T21:54:03-07:00 2008-09-11T21:54:03-07:00 merged from development repository to r5437 * added ldap_integration.module support * adjusted README.txt to add LDAP info and update development credits 2993d49310a5c5945651f63f54779f79e28e82a8 Justin R. Miller incanus@codesorcery.net