From 3edc8546fc3dfa48bd36f8c4e03bba776316bb68 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Thu, 1 Apr 2010 14:16:19 -0400 Subject: [PATCH] ..actually allow the horde config to control the provisioning setting. Forgot to add this, it was defaulting to Off regardless of this setting. Still need to pass the rest of the params...the code is there to use them, just need to hook them up. --- horde/rpc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/horde/rpc.php b/horde/rpc.php index 0590d102a..217a91be4 100644 --- a/horde/rpc.php +++ b/horde/rpc.php @@ -35,7 +35,7 @@ $params['logger'] = $GLOBALS['injector']->getInstance('Horde_Log_Logger'); /* Look at the Content-type of the request, if it is available, to try * and determine what kind of request this is. */ -if (!empty($GLOBALS['conf']['activesync']['enabled']) && +if (!empty($conf['activesync']['enabled']) && ((strpos($request->getServer('CONTENT_TYPE'), 'application/vnd.ms-sync.wbxml') !== false) || (strpos($request->getUri(), 'Microsoft-Server-ActiveSync') !== false))) { /* ActiveSync Request */ @@ -54,6 +54,7 @@ if (!empty($GLOBALS['conf']['activesync']['enabled']) && new Horde_ActiveSync_Wbxml_Encoder(fopen('php://output', 'w+')), $request); $params['server']->setLogger($params['logger']); + $params['provisioning'] = $conf['activesync']['securitypolicies']['provisioning']; } elseif ($request->getServer('PATH_INFO') || in_array($request->getServer('REQUEST_METHOD'), array('DELETE', 'PROPFIND', 'PUT', 'OPTIONS'))) { -- 2.11.0