mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
fix freebusy.php to work with 19.1 without old phpwapi installed
This commit is contained in:
parent
b8a7c64301
commit
9868c3c590
@ -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
|
// 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']['currentapp'] = 'login';
|
||||||
$GLOBALS['egw_info']['flags']['noapi'] = True;
|
$GLOBALS['egw_info']['flags']['noapi'] = True;
|
||||||
@ -37,7 +37,7 @@ function fail_exit($msg)
|
|||||||
|
|
||||||
if (!$loged_in)
|
if (!$loged_in)
|
||||||
{
|
{
|
||||||
include ('../phpgwapi/inc/functions.inc.php');
|
include ('../api/src/loader.php');
|
||||||
$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
|
$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
|
||||||
}
|
}
|
||||||
// fix for SOGo connector, which does not decode the = in our f/b url
|
// 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']['user']['domain'] = $domain;
|
||||||
$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
|
$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
|
||||||
$GLOBALS['egw_info']['flags']['noapi'] = false;
|
$GLOBALS['egw_info']['flags']['noapi'] = false;
|
||||||
require_once(EGW_API_INC . '/functions.inc.php');
|
|
||||||
$loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text');
|
$loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text');
|
||||||
session_unset();
|
session_unset();
|
||||||
session_destroy();
|
session_destroy();
|
||||||
|
Loading…
Reference in New Issue
Block a user