Remove c.authorized_cname

Remove all occurrences of `c.authorized_cname`, which is no longer set
by `set_cnameframe()`.

Author: Florence Yeun

r2/r2/controllers/toolbar.py

@@ -142,7 +142,7 @@ def GET_s(self, urloid):
         listing = hot_links_by_url_listing(path, sr=c.site, num=1)
         link = listing.things[0] if listing.things else None
 
-        if c.cname and not c.authorized_cname:
+        if c.cname:
             # In this case, we make some bad guesses caused by the
             # cname frame on unauthorised cnames. 
             # 1. User types http://foo.com/http://myurl?cheese=brie

r2/r2/lib/cookies.py

@@ -49,8 +49,6 @@ def __init__(self, value, expires=None, domain=None,
         self.httponly = httponly
         if domain:
             self.domain = domain
-        elif c.authorized_cname and not c.default_sr:
-            self.domain = utils.common_subdomain(request.host, c.site.domain)
         else:
             self.domain = g.domain
 

r2/r2/lib/pages/pages.py

@@ -1121,7 +1121,6 @@ class LoginFormWide(CachedTemplate):
     """generates a login form suitable for the 300px rightbox."""
     def __init__(self):
         self.cname = c.cname
-        self.auth_cname = c.authorized_cname
         CachedTemplate.__init__(self)
 
 class SubredditInfoBar(CachedTemplate):

r2/r2/lib/template_helpers.py

@@ -197,7 +197,7 @@ def js_config(extra_config=None):
         # current domain
         "cur_domain": get_domain(cname=False, subreddit=False, no_www=True),
         # where do ajax requests go?
-        "ajax_domain": get_domain(cname=c.authorized_cname, subreddit=False),
+        "ajax_domain": get_domain(cname=False, subreddit=False),
         "stats_domain": g.stats_domain or '',
         "stats_sample_rate": g.stats_sample_rate or 0,
         "extension": c.extension,

r2/r2/templates/framebuster.html

@@ -55,7 +55,7 @@
 
 
 <%def name="framebuster()">
-  %if c.cname and not c.user_is_loggedin and not c.authorized_cname:
+  %if c.cname and not c.user_is_loggedin:
     <% 
        import random 
        from r2.lib.template_helpers import get_domain

r2/r2/templates/login.html

@@ -56,7 +56,7 @@ <h3 id="cover-msg" class="modal-title">
       tabindex = 2 if register else 3
     %>
     <form id="${'register' if register else 'login'}-form" method="post" 
-          action="${add_sr(base + '/post/' + op, nocname=not c.authorized_cname)}"
+          action="${add_sr(base + '/post/' + op, nocname=True)}"
           class="form-v2">
       %if c.cname:
          <input type="hidden" name="${UrlParser.cname_get}" 
@@ -155,7 +155,7 @@ <h3 id="cover-msg" class="modal-title">
       tabindex = 2 if register else 3
     %>
     <form id="login_${op}" method="post" 
-          action="${add_sr(base + '/post/' + op, nocname=not c.authorized_cname)}"
+          action="${add_sr(base + '/post/' + op, nocname=True)}"
           class="user-form ${'register-form' if register else 'login-form'}">
       %if c.cname:
          <input type="hidden" name="${UrlParser.cname_get}" 

r2/r2/templates/loginformwide.html

@@ -33,7 +33,7 @@
   base = g.https_endpoint if not thing.cname else ''
 %>
 <form method="post"
-      action="${add_sr(base + '/post/login', nocname=not thing.auth_cname)}"
+      action="${add_sr(base + '/post/login', nocname=True)}"
       id="login_${op}"
       class="login-form login-form-side">
   %if thing.cname: