← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/cgirequest.py

Move ivle.dispatch.login.get_user_details() to ivle.webapp.security.

That empties ivle.dispatch.login, so it dies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/cgirequest.py
27
27
 
28
28
import sys
29
29
import os
30
 
import os.path
31
30
import cgi
32
31
import urllib
33
32
import traceback
138
137
        self.uri = os.environ['SCRIPT_NAME'] + os.environ['PATH_INFO']
139
138
        # Split the given path into the app (top-level dir) and sub-path
140
139
        # (after first stripping away the root directory)
 
140
        path = ivle.util.unmake_path(self.uri)
141
141
        if self.publicmode:
142
142
            self.app = None
143
 
            (_, self.path) = (ivle.util.split_path(self.uri))
 
143
            (_, self.path) = (ivle.util.split_path(path))
144
144
        else:
145
 
            (self.app, self.path) = (ivle.util.split_path(self.uri))
 
145
            (self.app, self.path) = (ivle.util.split_path(path))
146
146
        self.user = None
147
147
        self.hostname = os.environ['SERVER_NAME']
148
148
        self.headers_in = _http_headers_in_from_cgi()
152
152
        self.status = CGIRequest.HTTP_OK
153
153
        self.content_type = None        # Use Apache's default
154
154
        self.location = None
 
155
        self.title = None     # Will be set by dispatch before passing to app
155
156
        self.styles = []
156
157
        self.scripts = []
157
158
        self.got_common_vars = False