Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Apr 24th, 2012  |  syntax: Diff  |  size: 1.77 KB  |  hits: 18  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. +import logging
  2. +
  3.  from AccessControl import ClassSecurityInfo
  4.  from App.class_init import InitializeClass
  5.  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
  6. @@ -20,6 +22,7 @@ user_info_schema['postal_address'].widget = deform.widget.TextAreaWidget()
  7.  SESSION_MESSAGES = 'eea.userseditor.messages'
  8.  SESSION_FORM_DATA = 'eea.userseditor.form_data'
  9.  SESSION_FORM_ERRORS = 'eea.userseditor.form_errors'
  10. +log = logging.getLogger(__name__)
  11.  
  12.  WIDTH = 128
  13.  HEIGHT = 192
  14. @@ -90,16 +93,25 @@ class DualLDAPProxy(object):
  15.          self._legacy_ldap = legacy_ldap
  16.  
  17.      def bind_user(self, user_id, user_pw):
  18. -        self._legacy_ldap.bind_user(user_id, user_pw)
  19.          self._current_ldap.bind_user(user_id, user_pw)
  20. +        try:
  21. +            self._legacy_ldap.bind_user(user_id, user_pw)
  22. +        except ValueError:
  23. +            log.info("User %r could not bind on CIRCA legacy LDAP", user_id)
  24.  
  25.      def set_user_info(self, user_id, new_info):
  26. -        self._legacy_ldap.set_user_info(user_id, new_info)
  27.          self._current_ldap.set_user_info(user_id, new_info)
  28. +        try:
  29. +            self._legacy_ldap.set_user_info(user_id, new_info)
  30. +        except usersdb.UserNotFound:
  31. +            log.info("User %r doesn't exist in CIRCA legacy LDAP", user_id)
  32.  
  33.      def set_user_password(self, user_id, old_pw, new_pw):
  34. -        self._legacy_ldap.set_user_password(user_id, old_pw, new_pw)
  35.          self._current_ldap.set_user_password(user_id, old_pw, new_pw)
  36. +        try:
  37. +            self._legacy_ldap.set_user_password(user_id, old_pw, new_pw)
  38. +        except usersdb.UserNotFound:
  39. +            log.info("User %r doesn't exist in CIRCA legacy LDAP", user_id)
  40.  
  41.      def __getattr__(self, name):
  42.          # patch all other methods straight to front-end ldap
create a new version of this paste RAW Paste Data