X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Fpage.py;h=ec3828d90c415c896d447f4797ef063be06153cf;hp=50585ca8e242deb2abe0c3b1a77266683fa2aed9;hb=158c4cdefc0bd5b8dabe38685c1bebccc24d656b;hpb=e0aa4f23846fa9f6bb0fb9eb021e930b035100eb

diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index 50585ca..ec3828d 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):
@@ -86,20 +85,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:
@@ -143,9 +142,11 @@ class Page(Endpoint):
                 url = None
                 if 'referer' in cherrypy.request.headers:
                     url = cherrypy.request.headers['referer']
-                elif 'REQUEST_URI' in cherrypy.request.wsgi_environ:
+                    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']
-                if url:
                     r = urlparse(unquote(url))
                     if r.query:
                         tid = t.find_tid(parse_qs(r.query))