From 3a791ef9b5c395afc387e057a02c67b14116c8b9 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 19 Oct 2015 17:00:03 -0400
Subject: [PATCH] Remove unnecessary field

---
 .../application/controllers/SoundcloudController.php | 12 +++++-------
 .../application/controllers/ThirdPartyController.php |  7 ++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/SoundcloudController.php b/airtime_mvc/application/controllers/SoundcloudController.php
index 73ce365db..e0f7298c6 100644
--- a/airtime_mvc/application/controllers/SoundcloudController.php
+++ b/airtime_mvc/application/controllers/SoundcloudController.php
@@ -10,13 +10,10 @@ class SoundcloudController extends ThirdPartyController implements OAuth2Control
      */
     protected $_service;
 
-    /**
-     * @var string Application_Model_Preference service request token accessor function name
-     */
-    protected $_SERVICE_TOKEN_ACCESSOR = 'setSoundCloudRequestToken';
-
     /**
      * Set up SoundCloud access variables.
+     *
+     * @return void
      */
     public function init() {
         parent::init();
@@ -78,8 +75,7 @@ class SoundcloudController extends ThirdPartyController implements OAuth2Control
      * @return void
      */
     public function deauthorizeAction() {
-        $function = $this->_SERVICE_TOKEN_ACCESSOR;
-        Application_Model_Preference::$function("");
+        Application_Model_Preference::setSoundCloudRequestToken("");
         header('Location: ' . $this->_baseUrl . 'preference');  // Redirect back to the preference page
     }
 
@@ -97,6 +93,8 @@ class SoundcloudController extends ThirdPartyController implements OAuth2Control
 
     /**
      * Fetch the permalink to a file on SoundCloud and redirect to it.
+     *
+     * @return void
      */
     public function viewOnSoundCloudAction() {
         $request = $this->getRequest();
diff --git a/airtime_mvc/application/controllers/ThirdPartyController.php b/airtime_mvc/application/controllers/ThirdPartyController.php
index 1794a3251..a28542d57 100644
--- a/airtime_mvc/application/controllers/ThirdPartyController.php
+++ b/airtime_mvc/application/controllers/ThirdPartyController.php
@@ -15,13 +15,10 @@ abstract class ThirdPartyController extends Zend_Controller_Action {
      */
     protected $_service;
 
-    /**
-     * @var string Application_Model_Preference service request token accessor function name
-     */
-    protected $_SERVICE_TOKEN_ACCESSOR;
-
     /**
      * Disable controller rendering and initialize
+     *
+     * @return void
      */
     public function init() {
         $this->_baseUrl = Application_Common_HTTPHelper::getStationUrl();