extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

using new api class-names

Browse Source
This commit is contained in:
Ralf Becker 2016-03-22 11:13:02 +00:00
parent 0d1eb171ac
commit 53a726dd6f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/merge.php
View File

@ -23,7 +23,7 @@
* @package api * @package api
* @subpackage addressbook * @subpackage addressbook
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2015 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2015-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @version $Id$ * @version $Id$
*/ */
@ -32,13 +32,12 @@ $GLOBALS['egw_info'] = array(
'noheader' => True, 'noheader' => True,
'currentapp' => 'addressbook', 'currentapp' => 'addressbook',
'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm) 'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
'autocreate_session_callback' => array('egw_digest_auth','autocreate_session_callback'), 'autocreate_session_callback' => 'EGroupware\\Api\\Header\\Authenticate::autocreate_session_callback',
'auth_realm' => 'EGroupware document merge', 'auth_realm' => 'EGroupware document merge',
) )
); );
// if you move this file somewhere else, you need to adapt the path to the header! // if you move this file somewhere else, you need to adapt the path to the header!
$egw_dir = dirname(dirname(__FILE__)); $egw_dir = dirname(dirname(__FILE__));
require_once($egw_dir.'/phpgwapi/inc/class.egw_digest_auth.inc.php');
include($egw_dir.'/header.inc.php'); include($egw_dir.'/header.inc.php');
$merge = new addressbook_merge(); $merge = new addressbook_merge();