From 9868c3c590d3b07fb4f8f6808c8478b4ef98ee8b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 5 Nov 2019 10:56:00 +0100 Subject: [PATCH] fix freebusy.php to work with 19.1 without old phpwapi installed --- calendar/freebusy.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/calendar/freebusy.php b/calendar/freebusy.php index 3f9a828609..9cb0ab6312 100644 --- a/calendar/freebusy.php +++ b/calendar/freebusy.php @@ -20,7 +20,7 @@ $GLOBALS['egw_info'] = array( ), ); // check if we are loged in, by checking sessionid and kp3, as the sessionid get set automaticaly by php for php4-sessions -if (!($loged_in = @$_REQUEST['sessionid'] && @$_REQUEST['kp3'])) +if (!($loged_in = !empty($_COOKIE['sessionid']))) { $GLOBALS['egw_info']['flags']['currentapp'] = 'login'; $GLOBALS['egw_info']['flags']['noapi'] = True; @@ -37,7 +37,7 @@ function fail_exit($msg) if (!$loged_in) { - include ('../phpgwapi/inc/functions.inc.php'); + include ('../api/src/loader.php'); $GLOBALS['egw_info']['flags']['currentapp'] = 'calendar'; } // fix for SOGo connector, which does not decode the = in our f/b url @@ -92,7 +92,6 @@ if (!$loged_in) $GLOBALS['egw_info']['user']['domain'] = $domain; $GLOBALS['egw_info']['flags']['currentapp'] = 'login'; $GLOBALS['egw_info']['flags']['noapi'] = false; - require_once(EGW_API_INC . '/functions.inc.php'); $loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text'); session_unset(); session_destroy();