From 7ef0f8e12e78a0aaba7db0b6a0b557838b5fe4c8 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Thu, 28 Mar 2013 11:55:47 -0700
Subject: [PATCH] Remove stuff related to the 300x100 sponsorships.

These are taken care of automatically by tandem ads via Adzerk through
reddit-plugin-adzerk.
---
 r2/r2/controllers/api.py             | 45 +++++++----------------
 r2/r2/lib/validator/validator.py     |  8 -----
 r2/r2/models/subreddit.py            | 15 --------
 r2/r2/public/static/js/analytics.js  |  8 ++---
 r2/r2/templates/createsubreddit.html | 53 ----------------------------
 r2/r2/templates/sponsorshipbox.html  | 22 ------------
 6 files changed, 14 insertions(+), 137 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index f012838db..ccc6d2002 100755
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -1541,21 +1541,16 @@ class ApiController(RedditController, OAuth2ResourceController):
 
     @require_oauth2_scope("modconfig")
     @validatedForm(VSrModerator(perms='config'),
-                   VModhash(),
-                   sponsor = VInt("sponsor", min = 0, max = 1))
+                   VModhash())
     @api_doc(api_section.subreddits)
-    def POST_delete_sr_header(self, form, jquery, sponsor):
+    def POST_delete_sr_header(self, form, jquery):
         """
         Called when the user request that the header on a sr be reset.
         """
         # just in case we need to kill this feature from XSS
         if g.css_killswitch:
             return self.abort(403,'forbidden')
-        if sponsor and c.user_is_admin:
-            c.site.sponsorship_img = None
-            c.site.sponsorship_size = None
-            c.site._commit()
-        elif c.site.header:
+        if c.site.header:
             c.site.header = None
             c.site.header_size = None
             c.site._commit()
@@ -1588,10 +1583,9 @@ class ApiController(RedditController, OAuth2ResourceController):
               name = VCssName("name"),
               img_type = VImageType('img_type'),
               form_id = VLength('formid', max_length = 100), 
-              header = VInt('header', max=1, min=0),
-              sponsor = VSubredditSponsorship('sponsor'))
+              header = VInt('header', max=1, min=0))
     @api_doc(api_section.subreddits)
-    def POST_upload_sr_img(self, file, header, sponsor, name, form_id, img_type):
+    def POST_upload_sr_img(self, file, header, name, form_id, img_type):
         """
         Called on /about/stylesheet when an image needs to be replaced
         or uploaded, as well as on /about/edit for updating the
@@ -1614,7 +1608,7 @@ class ApiController(RedditController, OAuth2ResourceController):
         add_image_to_sr = False
         size = None
         
-        if not sponsor and not header:
+        if not header:
             add_image_to_sr = True
             if not name:
                 # error if the name wasn't specified and the image was not for a sponsored link or header
@@ -1637,19 +1631,15 @@ class ApiController(RedditController, OAuth2ResourceController):
             if header:
                 c.site.header = new_url
                 c.site.header_size = size
-            elif sponsor and c.user_is_admin:
-                c.site.sponsorship_img = new_url
-                c.site.sponsorship_size = size
             if add_image_to_sr:
                 c.site.add_image(name, url = new_url)
             c.site._commit()
 
-            if not sponsor:
-                if header:
-                    kw = dict(details='upload_image_header')
-                else:
-                    kw = dict(details='upload_image', description=name)
-                ModAction.create(c.site, c.user, action='editsettings', **kw)
+            if header:
+                kw = dict(details='upload_image_header')
+            else:
+                kw = dict(details='upload_image', description=name)
+            ModAction.create(c.site, c.user, action='editsettings', **kw)
 
             return UploadedImage(_('saved'), new_url, name, 
                                  errors=errors, form_id=form_id).render()
@@ -1681,15 +1671,10 @@ class ApiController(RedditController, OAuth2ResourceController):
                    wiki_edit_karma = VInt("wiki_edit_karma", coerce=False, num_default=0, min=0),
                    wiki_edit_age = VInt("wiki_edit_age", coerce=False, num_default=0, min=0),
                    ip = ValidIP(),
-                   sponsor_text =VLength('sponsorship-text', max_length = 500),
-                   sponsor_name =VLength('sponsorship-name', max_length = 64),
-                   sponsor_url = VLength('sponsorship-url', max_length = 500),
                    css_on_cname = VBoolean("css_on_cname"),
                    )
     @api_doc(api_section.subreddits)
-    def POST_site_admin(self, form, jquery, name, ip, sr,
-                        sponsor_text, sponsor_url, sponsor_name, **kw):
-        
+    def POST_site_admin(self, form, jquery, name, ip, sr, **kw):
         def apply_wikid_field(sr, form, pagename, value, prev, field, error):
             id_field_name = 'prev_%s_id' % field
             try:
@@ -1820,12 +1805,6 @@ class ApiController(RedditController, OAuth2ResourceController):
 
         #editting an existing reddit
         elif sr.is_moderator_with_perms(c.user, 'config') or c.user_is_admin:
-
-            if c.user_is_admin:
-                sr.sponsorship_text = sponsor_text or ""
-                sr.sponsorship_url = sponsor_url or None
-                sr.sponsorship_name = sponsor_name or None
-
             #assume sr existed, or was just built
             old_domain = sr.domain
 
diff --git a/r2/r2/lib/validator/validator.py b/r2/r2/lib/validator/validator.py
index 4baa6d243..268c2c40e 100644
--- a/r2/r2/lib/validator/validator.py
+++ b/r2/r2/lib/validator/validator.py
@@ -1545,14 +1545,6 @@ class VImageType(Validator):
             return 'png'
         return img_type
 
-class VSubredditSponsorship(VInt):
-    max = 1
-    min = 0
-    def run(self, val):
-        s = super(VSubredditSponsorship, self).run(val)
-        if s and not c.user_is_admin:
-            abort(403, "forbidden")
-        return s
 
 class ValidEmails(Validator):
     """Validates a list of email addresses passed in as a string and
diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py
index 77d18c95d..fe2fcc28d 100644
--- a/r2/r2/models/subreddit.py
+++ b/r2/r2/models/subreddit.py
@@ -87,10 +87,6 @@ class Subreddit(Thing, Printable):
                      over_18 = False,
                      exclude_banned_modqueue = False,
                      mod_actions = 0,
-                     sponsorship_text = "this subreddit is sponsored by",
-                     sponsorship_url = None,
-                     sponsorship_img = None,
-                     sponsorship_name = None,
                      # do we allow self-posts, links only, or any?
                      link_type = 'any', # one of ('link', 'self', 'any')
                      flair_enabled = True,
@@ -1155,17 +1151,6 @@ class DefaultSR(_DefaultSR):
     def stylesheet_hash(self):
         return self._base.stylesheet_hash if self._base else ""
 
-    @property
-    def sponsorship_url(self):
-        return self._base.sponsorship_url if self._base else ""
-
-    @property
-    def sponsorship_text(self):
-        return self._base.sponsorship_text if self._base else ""
-
-    @property
-    def sponsorship_img(self):
-        return self._base.sponsorship_img if self._base else ""
 
 class MultiReddit(_DefaultSR):
     name = 'multi'
diff --git a/r2/r2/public/static/js/analytics.js b/r2/r2/public/static/js/analytics.js
index c0ac61ea1..e6aae150c 100644
--- a/r2/r2/public/static/js/analytics.js
+++ b/r2/r2/public/static/js/analytics.js
@@ -5,14 +5,14 @@ r.analytics = {
     init: function() {
         // these guys are relying on the custom 'onshow' from jquery.reddit.js
         $(document).delegate(
-            '.promotedlink.promoted, .sponsorshipbox[data-fullname]',
+            '.promotedlink.promoted',
             'onshow',
             _.bind(function(ev) {
                 this.fetchTrackersOrFirePixel(ev.target)
             }, this)
         )
 
-        $('.promotedlink.promoted:visible, .sponsorshipbox:visible').trigger('onshow')
+        $('.promotedlink.promoted:visible').trigger('onshow')
         $('form.google-checkout').on('submit', this.fireGoogleCheckout)
         $('form.gold-checkout').one('submit', this.fireGoldCheckout)
     },
@@ -28,13 +28,9 @@ r.analytics = {
 
         var $el = $(el),
             fullname = $el.data('fullname'),
-            sponsorship = $el.data('sponsorship'),
             campaign = $el.data('cid'),
             trackingName = fullname
 
-        if (sponsorship)
-            trackingName += '_' + sponsorship
-
         // append a hyphen even if there's no campaign
         trackingName += '-' + (campaign || '')
 
diff --git a/r2/r2/templates/createsubreddit.html b/r2/r2/templates/createsubreddit.html
index 78faa0a51..20a2a359a 100644
--- a/r2/r2/templates/createsubreddit.html
+++ b/r2/r2/templates/createsubreddit.html
@@ -329,59 +329,6 @@
         </li>
       </ul>
     </%utils:line_field>
-
-  %if c.user_is_admin:
-    <%utils:line_field title="${_('sponsorship')}">
-      <ul class="upload">
-        <li>
-          <input type="text" name="sponsorship-text"
-                 value="${thing.site.sponsorship_text}"
-                 />
-        </li>
-        <li>
-          <input type="text" name="sponsorship-name"
-                 %if thing.site.sponsorship_name:
-                     value="${thing.site.sponsorship_name}"
-                 %else:
-                     placeholder="${_('name this campaign (for traffic)')}" 
-                 %endif
-                 />
-        </li>
-        <li>
-          <input type="text" name="sponsorship-url" 
-                 %if thing.site.sponsorship_url:
-                     value="${thing.site.sponsorship_url}"
-                 %else:
-                     placeholder="${_('enter link url here')}"
-                 %endif
-                 />
-        </li>
-        <li>
-          <%utils:image_upload post_target="/api/upload_sr_img" 
-                               current_image="${thing.site.sponsorship_img}"
-                               label="${_('upload sponsorship image')}"
-                               form_id="sponsor-upload",
-                               ask_type="${True}">
-            <br/>
-            <button id="delete-sponsor" class="delete-img"
-                   %if not thing.site.sponsorship_img:
-                      style="display: none;"
-                   %endif
-                   onclick="return post_form(this.form, 'delete_sr_header');">
-              ${_('delete')}
-            </button>
-            
-            <div class="clearleft"></div>
-            <input type="hidden" name="uh" value="${c.modhash}" />
-            <input type="hidden" name="r"  value="${c.site.name}" />
-            <input type="hidden" name="sponsor" value="1" />
-          </%utils:image_upload>
-        </li>
-      </ul>
-    </%utils:line_field>
-
-  %endif
-
 %endif
 
 
diff --git a/r2/r2/templates/sponsorshipbox.html b/r2/r2/templates/sponsorshipbox.html
index 1b4762dc9..11fe24ebb 100644
--- a/r2/r2/templates/sponsorshipbox.html
+++ b/r2/r2/templates/sponsorshipbox.html
@@ -20,26 +20,4 @@
 ## reddit Inc. All Rights Reserved.
 ###############################################################################
 
-%if c.site.sponsorship_url and c.site.sponsorship_img:
-<%
-   from r2.models.subreddit import FakeSubreddit
-   from r2.lib.template_helpers import s3_https_if_secure
-   name = c.site._fullname
-%>
-<div class="thing sponsorshipbox id-${name}" data-fullname="${name}" data-sponsorship="${c.site.sponsorship_name}">
-  <span>${c.site.sponsorship_text}</span>
-  <div>
-    <a class="title" href="${c.site.sponsorship_url}">
-    <%
-        if not hasattr(c.site, 'sponsorship_size'):
-            size_str = ''
-        else:
-            size_str = "width='%d' height='%d'" % (c.site.sponsorship_size[0], c.site.sponsorship_size[1])
-    %>
-       <img alt="sponsor" ${size_str} src="${s3_https_if_secure(c.site.sponsorship_img)}" />
-    </a>
-  </div>
-</div>
-%else:
 <div class="sponsorshipbox"></div>
-%endif