MoinMoin: attachment:moin1-5-4-1user.diff of FeatureRequests/MakeInvitations

   1 --- user_orig.py	2006-07-01 20:56:00.000000000 +0200
   2 +++ user.py	2006-11-25 16:38:42.000000000 +0100
   3 @@ -936,7 +936,7 @@
   4              markup = '%s:%s' % (wikiname, pagename.replace(" ","_")) 
   5          return markup
   6  
   7 -    def mailAccountData(self, cleartext_passwd=None):
   8 +    def mailAccountData(self, cleartext_passwd=None, invitation=False):
   9          from MoinMoin.util import mail
  10          from MoinMoin.wikiutil import getSysPage
  11          _ = self._request.getText
  12 @@ -955,7 +955,9 @@
  13              self.enc_password = pwd
  14              self.save()
  15  
  16 -        text = '\n' + _("""\
  17 +        if not invitation:
  18 +
  19 +            text = '\n' + _("""\
  20  Login Name: %s
  21  
  22  Login Password: %s
  23 @@ -964,7 +966,7 @@
  24  """, formatted=False) % (
  25                          self.name, self.enc_password, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
  26  
  27 -        text = _("""\
  28 +            text = _("""\
  29  Somebody has requested to submit your account data to this email address.
  30  
  31  If you lost your password, please use the data below and just enter the
  32 @@ -974,6 +976,32 @@
  33  After successfully logging in, it is of course a good idea to set a new and known password.
  34  """, formatted=False) + text
  35  
  36 +        else:
  37 +
  38 +            text = '\n' + _("""\
  39 +Login Name: %s
  40 +
  41 +Login Password: %s
  42 +
  43 +Login URL: %s/%s?action=login
  44 +""", formatted=False) % (
  45 +                        self.name, cleartext_passwd, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
  46 +
  47 +            text = _("""\
  48 +Welcome to the %(sitename)s Wiki!
  49 +
  50 +You are invited to join our wiki community and share your ideas with us.
  51 +Please use the login name and password below to log in. To ease login, you can
  52 +also use copy and paste.
  53 +Please do also make sure that in your browser's settings cookies are enabled
  54 +for the login url so that authentications does really work and is kept while
  55 +navigating in the wiki.
  56 +
  57 +After successfully logging in, it is of course a good idea to set a new password
  58 +of your choice.
  59 +""", formatted=False) % {'sitename': self._cfg.sitename or "Wiki"}  + text
  60 +
  61 +        
  62  
  63          subject = _('[%(sitename)s] Your wiki account data',
  64                      formatted=False) % {'sitename': self._cfg.sitename or "Wiki"}