From 90e85f4c194f23e6783ff82589a8f7d3064a9e9f Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 29 Jan 2013 19:33:42 +0000 Subject: [PATCH] added ken.name public key and setting correct http-status for logs --- phpgwapi/inc/class.ischedule_server.inc.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/phpgwapi/inc/class.ischedule_server.inc.php b/phpgwapi/inc/class.ischedule_server.inc.php index bcdb2a7ede..7b5f5159f5 100644 --- a/phpgwapi/inc/class.ischedule_server.inc.php +++ b/phpgwapi/inc/class.ischedule_server.inc.php @@ -526,6 +526,14 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuv+6UtGUdPerJ3s0HCng2sv3c R3ttma0JB6rMFfOTi1oHgk+h328MfGzhZK+SA9tsRPBcrJE/3uxs4SS2XNG9qRCG 0YMmNFOmubht4RhQhS9drSNyMZbhy2MPVbl9lHAJULFdaDdLj1hc3xTMWy8sDa8s M8r0gHvp/sPSe9CQQQIDAQAB +-----END PUBLIC KEY-----', + ), + 'ken.name' => array( + 'ischedule' => '-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfAWRKjVWS/W4F3nUYnj4XWYsy ++DsJdTjMKiHilUgQoz5MLnWpE/rt0LZklMG4Vz0io82pvnUzRrhmiaTTynlEwkj7 +gDABr/WCxv2j5vKNayz13my8z+D6efYkuHsPP8z5iQp9yzbKa8FXKb+O7AXbK5fS +3U7S1OJgMpBeCrcpdwIDAQAB -----END PUBLIC KEY-----', ), 'caldav.egroupware.net' => array( @@ -788,6 +796,7 @@ yXUKsIQVi3qPyPdB3QIDAQAB // if our groupdav logging is active, log the request plus a trace, if enabled in server-config if (groupdav::$request_starttime && isset(self::$instance)) { + self::$instance->_http_status = $code.' '.$http_status; if ($GLOBALS['egw_info']['server']['exception_show_trace']) { self::$instance->log_request("\n".$e->getTraceAsString()."\n");