From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Tue, 20 Jul 2010 22:27:43 +0000 (-0400)
Subject: More Horde_Controller change tracking
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8e49d9cad19ae84479791d7e0330854c007ebac6;p=horde.git

More Horde_Controller change tracking
---

diff --git a/framework/Rpc/lib/Horde/Rpc/ActiveSync.php b/framework/Rpc/lib/Horde/Rpc/ActiveSync.php
index 5c78bc0fb..12322b968 100644
--- a/framework/Rpc/lib/Horde/Rpc/ActiveSync.php
+++ b/framework/Rpc/lib/Horde/Rpc/ActiveSync.php
@@ -97,8 +97,8 @@ class Horde_Rpc_ActiveSync extends Horde_Rpc
     {
         /* Not sure about this, but it's what zpush did so... */
         ob_start(null, 1048576);
-
-        switch ($this->_request->getServer('REQUEST_METHOD')) {
+        $serverVars = $this->_request->getServerVars();
+        switch ($serverVars['REQUEST_METHOD']) {
         case 'OPTIONS':
             $this->_logger->debug('Horde_Rpc_ActiveSync::getResponse() starting for OPTIONS');
             $this->_server->handleRequest('Options', null, null);
@@ -165,7 +165,8 @@ class Horde_Rpc_ActiveSync extends Horde_Rpc
         }
 
         /* Get user and possibly domain */
-        $user = $this->_request->getServer('PHP_AUTH_USER');
+        $serverVars = $this->_request->getServerVars();
+        $user = $serverVars['PHP_AUTH_USER'];
         $pos = strrpos($user, '\\');
         if ($pos !== false) {
             $domain = substr($user, 0, $pos);
@@ -175,7 +176,7 @@ class Horde_Rpc_ActiveSync extends Horde_Rpc
         }
 
         /* Get passwd */
-        $pass = $this->_request->getServer('PHP_AUTH_PW');
+        $pass = $serverVars['PHP_AUTH_PW'];
 
         /* Attempt to auth to backend */
         $results = $this->_backend->logon($user, $pass, $domain);