talk: Drop old FreeSWITCH integration

[ipfire.org.git] / src / web / base.py

diff --git a/src/web/base.py b/src/web/base.py
index 376eff737175cc23c220eed2ff9780069d44ea7d..504ab5961e79b702a34453c52318be6247570030 100644 (file)
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -36,13 +36,21 @@ class ratelimit(object):
 
 
 class BaseHandler(tornado.web.RequestHandler):
+       def prepare(self):
+               # Mark this as private when someone is logged in
+               if self.current_user:
+                       self.set_header("Cache-Control", "private")
+
+               # Always send Vary: Cookie
+               self.set_header("Vary", "Cookie")
+
        def set_expires(self, seconds):
                # For HTTP/1.1
                self.add_header("Cache-Control", "max-age=%s, must-revalidate" % seconds)
 
                # For HTTP/1.0
                expires = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
-               self.add_header("Expires", expires)
+               self.set_header("Expires", expires)
 
        def write_error(self, status_code, **kwargs):
                # Translate code into message
@@ -53,12 +61,6 @@ class BaseHandler(tornado.web.RequestHandler):
 
                self.render("error.html", status_code=status_code, message=message, **kwargs)
 
-       def xsrf_form_html(self, *args, **kwargs):
-               # Set Vary: Cookie header
-               self.add_header("Vary", "Cookie")
-
-               return super().xsrf_form_html(*args, **kwargs)
-
        @property
        def hostname(self):
                # Return hostname in production
@@ -220,10 +222,6 @@ class BaseHandler(tornado.web.RequestHandler):
        def releases(self):
                return self.backend.releases
 
-       @property
-       def talk(self):
-               return self.backend.talk
-
 
 class APIHandler(BaseHandler):
        def check_xsrf_cookie(self):