Revision 0fbab7db

b/invitations/invitations.py
30 30

  
31 31

  
32 32
from datetime import timedelta
33
import datetime
33 34
import base64
34 35
import time
35 36
import urllib
......
181 182

  
182 183
    inv = invitations[0]
183 184

  
184
    valid = timedelta(days = settings.INVITATION_VALID_DAYS)
185
    valid = timedelta(days=settings.INVITATION_VALID_DAYS)
185 186
    valid_until = inv.created + valid
187
    now = datetime.datetime.now()
186 188

  
187
    if (time.time() -
188
        time.mktime(inv.created.timetuple()) -
189
        settings.INVITATION_VALID_DAYS * 3600) > 0:
189
    if now > valid_until:
190 190
        return render_login_error("40",
191
                                  "Invitation expired (was valid until %s)"%
192
                                  valid_until.strftime('%A, %d %B %Y'))
191
                                  "Invitation has expired (was valid until " \
192
                                  "%s, now is %s" %
193
                                  (valid_until.strftime('%A, %d %B %Y'),
194
                                   now.strftime('%A, %d %B %Y')))
195

  
193 196
    #if inv.accepted == False:
194 197
    #    return render_login_error("60", "Invitation already accepted")
195 198

  

Also available in: Unified diff