User Settings moved on other branch

Author: maxmi

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Button.php

@@ -281,18 +281,6 @@ public function getTicketUrl($row, $link = false)
 
         return '<a href="' . $url . '" target="_blank">' .  $subject. '</a>';
     }
-        
-    public function getAdminSettings() {
-        $admin = Mage::getSingleton('admin/session')->getUser();
-        if($admin) {
-            $adminId    = $admin->getUserId();
-            $settings   = Mage::getModel('zendesk/settings')->loadByAdminId($adminId);
-            return $settings;
-        } else {
-            return false;
-        }
-        
-    }
 
     public function getStatusMap()
     {

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit.php

@@ -46,25 +46,10 @@ protected function _call($endpoint, $params = null, $method = 'GET', $data = nul
                  'Content-Type' => 'application/json'
             )
         );
-        
-        $settings = Mage::helper('zendesk')->getAdminSettings();
-
-        if($settings && isset($settings) && $settings->isConfigured() && !$global) {
-            if($settings->getUseGlobalSettings() === "0") {
-                $email = $settings->getUsername();
-                $password = Mage::helper('core')->decrypt($settings->getPassword());
-            } else {
-                $email = Mage::getStoreConfig('zendesk/general/email'). '/token';
-                $password = Mage::getStoreConfig('zendesk/general/password');
-            }
-        } else {
-            $email = Mage::getStoreConfig('zendesk/general/email'). '/token';
-            $password = Mage::getStoreConfig('zendesk/general/password');
-        }
 
         $client->setAuth(
-            $email,
-            $password
+            Mage::getStoreConfig('zendesk/general/email'). '/token',
+            Mage::getStoreConfig('zendesk/general/password')
         );
 
         if($method == 'POST' || $method == "PUT") {

src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Settings/Edit/Form.php

@@ -145,7 +145,7 @@ public function forRequester($customerEmail)
     {
         $user = Mage::getModel('zendesk/api_users')->find($customerEmail);
         if(isset($user['id'])) {
-            $response = $this->_call('users/' . $user['id'] . '/requests.json', null, 'GET', null, false, true);
+            $response = $this->_call('users/' . $user['id'] . '/requests.json', null, 'GET', null, false);
             return $response['requests'];
         } else {
             return array();