From bedf8e92a0faa38cbf7a1fd9bfd9efe51fb9a2a2 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Mon, 5 Apr 2010 20:43:40 -0400
Subject: [PATCH] Allow for configuring a separate log file specifically for
 activesync requests

---
 horde/config/conf.xml | 11 +++++++++++
 horde/rpc.php         |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 09d3445b5..1438aeb6a 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1981,6 +1981,17 @@
       <configstring name="directory" desc="Directory to hold state files (this
       directory should be writeable by the webserver):">/tmp</configstring>
      </configsection>
+     <configheader>Logging</configheader>
+     <configsection name="logging">
+      <configswitch name="type" desc="For debugging, it may be useful to send
+      activesync-related log messages to a seperate log. If you want to do this,
+      set this to Custom and enter the path to the log file to use.">
+        <case name="horde" desc="Horde" />
+        <case name="custom" desc="Custom">
+         <configstring name="path" desc="Path to logfile" />
+        </case>
+      </configswitch>
+     </configsection>
      <configsection name="securitypolicies">
      <configheader>Security Policies</configheader>
       <configswitch name="provisioning" quote="false" desc="How should device
diff --git a/horde/rpc.php b/horde/rpc.php
index 15cea1f1c..54dcde4b6 100644
--- a/horde/rpc.php
+++ b/horde/rpc.php
@@ -30,8 +30,11 @@ Horde_Registry::appInit('horde', array('authentication' => 'none', 'nocompress'
 $request = new Horde_Controller_Request_Http();
 
 /* TODO: This is for debugging, replace with logger from injector before merge */
-//$params['logger'] = new Horde_Log_Logger(new Horde_Log_Handler_Stream(fopen('/tmp/activesync.txt', 'a')));
-$params['logger'] = $GLOBALS['injector']->getInstance('Horde_Log_Logger');
+if ($conf['activesync']['logging']['type'] == 'custom') {
+    $params['logger'] = new Horde_Log_Logger(new Horde_Log_Handler_Stream(fopen($conf['activesync']['logging']['path'], 'a')));
+} else {
+    $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. */
-- 
2.11.0