diff options
author | Pavel Janík <Pavel@Janik.cz> | 2002-01-06 15:08:06 +0000 |
---|---|---|
committer | Pavel Janík <Pavel@Janik.cz> | 2002-01-06 15:08:06 +0000 |
commit | aed3fbc3874448cbc20d0d0b884174ace026564e (patch) | |
tree | 8c7054699925fbae8239e9ccaeed1d22f372401b /lisp/net/eudcb-ldap.el | |
parent | 82d72d650c92b33282cfb7de0f40df8a8b8eedb6 (diff) | |
download | emacs-aed3fbc3874448cbc20d0d0b884174ace026564e.tar.gz emacs-aed3fbc3874448cbc20d0d0b884174ace026564e.tar.bz2 emacs-aed3fbc3874448cbc20d0d0b884174ace026564e.zip |
Remove unnecessary whitespaces.
Diffstat (limited to 'lisp/net/eudcb-ldap.el')
-rw-r--r-- | lisp/net/eudcb-ldap.el | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index 9d66f3cadae..661841ba5b6 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -24,7 +24,7 @@ ;; Boston, MA 02111-1307, USA. ;;; Commentary: -;; This library provides specific LDAP protocol support for the +;; This library provides specific LDAP protocol support for the ;; Emacs Unified Directory Client package ;;; Installation: @@ -53,31 +53,31 @@ (phone . telephonenumber)) "Alist mapping EUDC attribute names to LDAP names.") -(eudc-protocol-set 'eudc-query-function 'eudc-ldap-simple-query-internal +(eudc-protocol-set 'eudc-query-function 'eudc-ldap-simple-query-internal 'ldap) (eudc-protocol-set 'eudc-list-attributes-function 'eudc-ldap-get-field-list 'ldap) -(eudc-protocol-set 'eudc-protocol-attributes-translation-alist +(eudc-protocol-set 'eudc-protocol-attributes-translation-alist 'eudc-ldap-attributes-translation-alist 'ldap) -(eudc-protocol-set 'eudc-bbdb-conversion-alist - 'eudc-ldap-bbdb-conversion-alist +(eudc-protocol-set 'eudc-bbdb-conversion-alist + 'eudc-ldap-bbdb-conversion-alist 'ldap) (eudc-protocol-set 'eudc-protocol-has-default-query-attributes nil 'ldap) -(eudc-protocol-set 'eudc-attribute-display-method-alist +(eudc-protocol-set 'eudc-attribute-display-method-alist '(("jpegphoto" . eudc-display-jpeg-inline) ("labeledurl" . eudc-display-url) ("audio" . eudc-display-sound) ("labeleduri" . eudc-display-url) - ("url" . eudc-display-url)) + ("url" . eudc-display-url)) 'ldap) -(eudc-protocol-set 'eudc-switch-to-server-hook - '(eudc-ldap-check-base) +(eudc-protocol-set 'eudc-switch-to-server-hook + '(eudc-ldap-check-base) 'ldap) (defun eudc-ldap-cleanup-record-simple (record) "Do some cleanup in a RECORD to make it suitable for EUDC." - (mapcar - (function + (mapcar + (function (lambda (field) (cons (intern (car field)) (if (cdr (cdr field)) @@ -92,8 +92,8 @@ ;; Make the record a cons-cell instead of a list if the it's single-valued ;; Filter the $ character in addresses into \n if not done by the LDAP lib (defun eudc-ldap-cleanup-record-filtering-addresses (record) - (mapcar - (function + (mapcar + (function (lambda (field) (let ((name (intern (car field))) (value (cdr field))) @@ -107,9 +107,9 @@ (defun eudc-ldap-simple-query-internal (query &optional return-attrs) "Query the LDAP server with QUERY. -QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid -LDAP attribute names. -RETURN-ATTRS is a list of attributes to return, defaulting to +QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid +LDAP attribute names. +RETURN-ATTRS is a list of attributes to return, defaulting to `eudc-default-return-attributes'." (let ((result (ldap-search (eudc-ldap-format-query-as-rfc1558 query) eudc-server @@ -118,7 +118,7 @@ RETURN-ATTRS is a list of attributes to return, defaulting to final-result) (if (or (not (boundp 'ldap-ignore-attribute-codings)) ldap-ignore-attribute-codings) - (setq result + (setq result (mapcar 'eudc-ldap-cleanup-record-filtering-addresses result)) (setq result (mapcar 'eudc-ldap-cleanup-record-simple result))) @@ -128,9 +128,9 @@ RETURN-ATTRS is a list of attributes to return, defaulting to (setq result (eudc-filter-partial-records result return-attrs))) ;; Apply eudc-duplicate-attribute-handling-method (if (not (eq 'list eudc-duplicate-attribute-handling-method)) - (mapcar + (mapcar (function (lambda (record) - (setq final-result + (setq final-result (append (eudc-filter-duplicate-attributes record) final-result)))) result)) @@ -143,12 +143,12 @@ attribute names are returned. Default to `person'" (interactive) (or eudc-server (call-interactively 'eudc-set-server)) - (let ((ldap-host-parameters-alist + (let ((ldap-host-parameters-alist (list (cons eudc-server '(scope subtree sizelimit 1))))) (mapcar 'eudc-ldap-cleanup-record - (ldap-search - (eudc-ldap-format-query-as-rfc1558 + (ldap-search + (eudc-ldap-format-query-as-rfc1558 (list (cons "objectclass" (or objectclass "person")))) @@ -156,13 +156,13 @@ attribute names are returned. Default to `person'" (defun eudc-ldap-escape-query-special-chars (string) "Value is STRING with characters forbidden in LDAP queries escaped." -;; Note that * should also be escaped but in most situations I suppose +;; Note that * should also be escaped but in most situations I suppose ;; the user doesn't want this (eudc-replace-in-string (eudc-replace-in-string (eudc-replace-in-string - (eudc-replace-in-string - string + (eudc-replace-in-string + string "\\\\" "\\5c") "(" "\\28") ")" "\\29") @@ -170,16 +170,16 @@ attribute names are returned. Default to `person'" (defun eudc-ldap-format-query-as-rfc1558 (query) "Format the EUDC QUERY list as a RFC1558 LDAP search filter." - (format "(&%s)" - (apply 'concat + (format "(&%s)" + (apply 'concat (mapcar '(lambda (item) - (format "(%s=%s)" - (car item) + (format "(%s=%s)" + (car item) (eudc-ldap-escape-query-special-chars (cdr item)))) query)))) -;;}}} +;;}}} ;;{{{ High-level interfaces (interactive functions) @@ -196,11 +196,11 @@ attribute names are returned. Default to `person'" ;; If the server is not in ldap-host-parameters-alist we add it for the ;; user (if (null (assoc eudc-server ldap-host-parameters-alist)) - (setq ldap-host-parameters-alist + (setq ldap-host-parameters-alist (cons (list eudc-server) ldap-host-parameters-alist))) (customize-variable 'ldap-host-parameters-alist))) -;;;}}} +;;}}} (eudc-register-protocol 'ldap) |