← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/auth/authenticate.py

  • Committer: Matt Giuca
  • Date: 2009-02-24 02:02:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1119.
  • Revision ID: matt.giuca@gmail.com-20090224020203-aqdcjnsj6y7wl32o
Added a new look to the IVLE header bar. Mmmm... Web 2.0.
Added top-level directory image-source, containing SVG and script files for
    generating the images.
ivle/webapp/coremedia/images: Added 'chrome' directory containing the rendered
    images.
Modified ivle/webapp/base/ivle-headings.html and
    ivle/webapp/coremedia/ivle.css to support the new images.
    Note that the H1 and H2 at the top of the page are no longer displayed
    (and their custom styles have been removed). There is a heading image
    instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/auth/authenticate.py
91
91
                # We just got ourselves some user details from an external
92
92
                # source. Put them in the DB.
93
93
                store.add(auth_result)
94
 
                pass
 
94
 
 
95
            # Don't allow login if it is expired or disabled.
 
96
            if auth_result.state == 'disabled' or auth_result.account_expired:
 
97
                raise AuthError("Account is not valid.")
 
98
 
95
99
            return auth_result
96
100
        else:
97
101
            raise AuthError("Internal error: "