Diff for /basket/groups.py between versions 1.4 and 1.5

version 1.4, 2006/04/06 16:49:14 version 1.5, 2006/04/12 19:37:34
Line 9  from types import * Line 9  from types import *
   
 from AccessControl import SecurityManagement  from AccessControl import SecurityManagement
   
   import smtplib
   
   def sendForm(self,fromaddr,subject,content,nextPage="index_html",RESPONSE=None):
                   """sendform"""
                   fromaddr=fromaddr.strip("\r\n\t") # sicherstellen dass keine zusaetzlichen headerzeilen eingefuegt werden
                   subject=subject.strip("\r\n\t") # sicherstellen dass keine zusaetzlichen headerzeilen eingefuegt werden
                   toaddrs=self.toAddrs
   
                   subject="%s %s"%(self.subjectAdd,subject)
                   
                   msg = ("From: %s\r\nSubject: %s\r\nTo: %s\r\n\r\n"
                          % (fromaddr, subject, ", ".join(toaddrs)))
                   server = smtplib.SMTP("mail.mpiwg-berlin.mpg.de")
                   #server.set_debuglevel(1)
                   msg=msg+content
                   server.sendmail(fromaddr, toaddrs, msg)
                   server.quit()
   
                   if RESPONSE:
                           RESPONSE.redirect(nextPage)
 class GroupFolder(Folder):  class GroupFolder(Folder):
     """Folder which contains groups"""      """Folder which contains groups"""
           
Line 21  class GroupFolder(Folder): Line 41  class GroupFolder(Folder):
         #TODO: check if user already exists in LDAP          #TODO: check if user already exists in LDAP
         #TODO: email is not registered yet, because MPIWGUserfolder is not working with CookieCrumbler          #TODO: email is not registered yet, because MPIWGUserfolder is not working with CookieCrumbler
         #print [x for x in repr(self.acl_users.getUserNames())]          #print [x for x in repr(self.acl_users.getUserNames())]
           
           if not (len(user.split("@")) ==2):
               pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddUserErrorInvalidEmail.zpt')).__of__(self)
               return pt(user=user)
               
               
         if user in repr(self.acl_users.getUserNames()):          if user in repr(self.acl_users.getUserNames()):
             return "ERROR: username already exists"              
               pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddUserErrorAlreadyExists.zpt')).__of__(self)
               return pt(user=user)
                   
         if user and password:          if user and password:
             #self.acl_users.addUser(user,password,email)              #self.acl_users.addUser(user,password,email)

Removed from v.1.4  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>