holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ken.name public key and setting correct http-status for logs

Browse Source
This commit is contained in:
Ralf Becker 2013-01-29 19:33:42 +00:00
parent b5d049f3d5
commit 90e85f4c19
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.ischedule_server.inc.php
View File

@ -526,6 +526,14 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuv+6UtGUdPerJ3s0HCng2sv3c
R3ttma0JB6rMFfOTi1oHgk+h328MfGzhZK+SA9tsRPBcrJE/3uxs4SS2XNG9qRCG R3ttma0JB6rMFfOTi1oHgk+h328MfGzhZK+SA9tsRPBcrJE/3uxs4SS2XNG9qRCG
0YMmNFOmubht4RhQhS9drSNyMZbhy2MPVbl9lHAJULFdaDdLj1hc3xTMWy8sDa8s 0YMmNFOmubht4RhQhS9drSNyMZbhy2MPVbl9lHAJULFdaDdLj1hc3xTMWy8sDa8s
M8r0gHvp/sPSe9CQQQIDAQAB M8r0gHvp/sPSe9CQQQIDAQAB
-----END PUBLIC KEY-----',
),
'ken.name' => array(
'ischedule' => '-----BEGIN PUBLIC KEY-----
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfAWRKjVWS/W4F3nUYnj4XWYsy
+DsJdTjMKiHilUgQoz5MLnWpE/rt0LZklMG4Vz0io82pvnUzRrhmiaTTynlEwkj7
gDABr/WCxv2j5vKNayz13my8z+D6efYkuHsPP8z5iQp9yzbKa8FXKb+O7AXbK5fS
3U7S1OJgMpBeCrcpdwIDAQAB
-----END PUBLIC KEY-----', -----END PUBLIC KEY-----',
), ),
'caldav.egroupware.net' => array( '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 our groupdav logging is active, log the request plus a trace, if enabled in server-config
if (groupdav::$request_starttime && isset(self::$instance)) if (groupdav::$request_starttime && isset(self::$instance))
{ {
self::$instance->_http_status = $code.' '.$http_status;
if ($GLOBALS['egw_info']['server']['exception_show_trace']) if ($GLOBALS['egw_info']['server']['exception_show_trace'])
{ {
self::$instance->log_request("\n".$e->getTraceAsString()."\n"); self::$instance->log_request("\n".$e->getTraceAsString()."\n");