From 47f3ea01eb5f2bb8fe0daa86bbd4067205d26765 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Thu, 23 Aug 2001 04:32:15 +0000 Subject: [PATCH] Tentatively move ACL defines outside of currentapp logic (so they work for xml/soap) --- phpgwapi/inc/functions.inc.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index 377efbc426..7c213fe1ae 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -507,6 +507,15 @@ \****************************************************************************/ define('SEP',filesystem_separator()); + /*****************************************************************************\ + * ACL defines - moved here to work for xml-rpc/soap, also * + \*****************************************************************************/ + define('PHPGW_ACL_READ',1); + define('PHPGW_ACL_ADD',2); + define('PHPGW_ACL_EDIT',4); + define('PHPGW_ACL_DELETE',8); + define('PHPGW_ACL_PRIVATE',16); + /****************************************************************************\ * Stuff to use if logging in or logging out * \****************************************************************************/ @@ -545,13 +554,15 @@ define('PHPGW_IMAGES', ExecMethod('phpgwapi.phpgw.common.get_image_path')); define('PHPGW_APP_IMAGES_DIR', ExecMethod('phpgwapi.phpgw.common.get_image_dir')); - // define('PHPGW_APP_IMAGES_DIR', $GLOBALS['phpgw']->common->get_image_dir()); + /* define('PHPGW_APP_IMAGES_DIR', $GLOBALS['phpgw']->common->get_image_dir()); */ + /* Moved outside of this logic define('PHPGW_ACL_READ',1); define('PHPGW_ACL_ADD',2); define('PHPGW_ACL_EDIT',4); define('PHPGW_ACL_DELETE',8); define('PHPGW_ACL_PRIVATE',16); + */ /********* This sets the user variables *********/ $GLOBALS['phpgw_info']['user']['private_dir'] = $GLOBALS['phpgw_info']['server']['files_dir']