X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Fpage.py;h=094a6a949702c390fe346eda81cd24a417f978d4;hp=f4e53d69fb2cbc31388ba0f8513071a320a9da2a;hb=1bcc0d697dd37a9268641f0cbaa7e9e781552233;hpb=075c3c53f72fde8e18af3f505249bef8812b7da3

diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index f4e53d6..094a6a9 100644
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -49,7 +49,6 @@ class Page(Endpoint):
         self.basepath = cherrypy.config.get('base.mount', "")
         self.user = None
         self._is_form_page = form
-        self.default_headers = dict()
         self.auth_protect = False
 
     def get_url(self):
@@ -72,7 +71,6 @@ class Page(Endpoint):
         return False
 
     def __call__(self, *args, **kwargs):
-        # pylint: disable=star-args
         cherrypy.response.headers.update(self.default_headers)
 
         self.user = UserSession().get_user()
@@ -86,20 +84,20 @@ class Page(Endpoint):
                 return op(*args[1:], **kwargs)
         else:
             if self._is_form_page:
-                self._debug("method: %s" % cherrypy.request.method)
+                self.debug("method: %s" % cherrypy.request.method)
                 op = getattr(self, cherrypy.request.method, None)
                 if callable(op):
                     # Basic CSRF protection
                     if cherrypy.request.method != 'GET':
                         url = self.get_url()
                         if 'referer' not in cherrypy.request.headers:
-                            self._debug("Missing referer in %s request to %s"
-                                        % (cherrypy.request.method, url))
+                            self.debug("Missing referer in %s request to %s"
+                                       % (cherrypy.request.method, url))
                             raise cherrypy.HTTPError(403)
                         referer = cherrypy.request.headers['referer']
                         if not self._check_referer(referer, url):
-                            self._debug("Wrong referer %s in request to %s"
-                                        % (referer, url))
+                            self.debug("Wrong referer %s in request to %s"
+                                       % (referer, url))
                             raise cherrypy.HTTPError(403)
                     return op(*args, **kwargs)
             else:
@@ -117,7 +115,6 @@ class Page(Endpoint):
         return model
 
     def _template(self, *args, **kwargs):
-        # pylint: disable=star-args
         t = self._site['template_env'].get_template(args[0])
         m = self._template_model()
         m.update(kwargs)
@@ -138,9 +135,17 @@ class Page(Endpoint):
             # Try with kwargs first
             tid = t.find_tid(kwargs)
             if not tid:
-                # If no TID yet See if we have it in a referer
+                # If no TID yet See if we have it in a referer or in the
+                # environment in the REDIRECT_URL
+                url = None
                 if 'referer' in cherrypy.request.headers:
-                    r = urlparse(unquote(cherrypy.request.headers['referer']))
+                    url = cherrypy.request.headers['referer']
+                    r = urlparse(unquote(url))
+                    if r.query:
+                        tid = t.find_tid(parse_qs(r.query))
+                if not tid and 'REQUEST_URI' in cherrypy.request.wsgi_environ:
+                    url = cherrypy.request.wsgi_environ['REQUEST_URI']
+                    r = urlparse(unquote(url))
                     if r.query:
                         tid = t.find_tid(parse_qs(r.query))
                 if not tid: