From: hickert Date: Mon, 11 Oct 2010 08:02:23 +0000 (+0000) Subject: Updated definitions X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=83f6556dc1670eec9359d0e9142c0c222c1bb44c;p=gosa.git Updated definitions git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19963 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc index 96ff20891..98ad80af9 100644 --- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc +++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc @@ -19,23 +19,25 @@ */ # Access constants -define ("GROUPWARE_LOOKUP", 1); -define ("GROUPWARE_READ", 2); -define ("GROUPWARE_STATUS", 4); -define ("GROUPWARE_WRITE", 8); -define ("GROUPWARE_INSERT", 16); -define ("GROUPWARE_POST", 32); -define ("GROUPWARE_CREATE", 64); -define ("GROUPWARE_DELETE", 128); -define ("GROUPWARE_ADMINISTRATE", 256); - - -define ("GROUPWARE_RIGHTS_NONE", 0); -define ("RIGHTS_GROUPWARE_READ", GROUPWARE_LOOKUP | GROUPWARE_READ | GROUPWARE_STATUS); -define ("RIGHTS_GROUPWARE_POST", RIGHTS_GROUPWARE_READ | GROUPWARE_POST); -define ("GROUPWARE_RIGHTS_APPEND", RIGHTS_GROUPWARE_POST | GROUPWARE_INSERT); -define ("RIGHTS_GROUPWARE_WRITE", GROUPWARE_RIGHTS_APPEND | GROUPWARE_WRITE | GROUPWARE_CREATE | GROUPWARE_DELETE); -define ("GROUPWARE_RIGHTS_ALL", RIGHTS_GROUPWARE_WRITE | GROUPWARE_ADMINISTRATE); +if(!defined("GROUPWARE_LOOKUP")){ + define ("GROUPWARE_LOOKUP", 1); + define ("GROUPWARE_READ", 2); + define ("GROUPWARE_STATUS", 4); + define ("GROUPWARE_WRITE", 8); + define ("GROUPWARE_INSERT", 16); + define ("GROUPWARE_POST", 32); + define ("GROUPWARE_CREATE", 64); + define ("GROUPWARE_DELETE", 128); + define ("GROUPWARE_ADMINISTRATE", 256); + + + define ("GROUPWARE_RIGHTS_NONE", 0); + define ("RIGHTS_GROUPWARE_READ", GROUPWARE_LOOKUP | GROUPWARE_READ | GROUPWARE_STATUS); + define ("RIGHTS_GROUPWARE_POST", RIGHTS_GROUPWARE_READ | GROUPWARE_POST); + define ("GROUPWARE_RIGHTS_APPEND", RIGHTS_GROUPWARE_POST | GROUPWARE_INSERT); + define ("RIGHTS_GROUPWARE_WRITE", GROUPWARE_RIGHTS_APPEND | GROUPWARE_WRITE | GROUPWARE_CREATE | GROUPWARE_DELETE); + define ("GROUPWARE_RIGHTS_ALL", RIGHTS_GROUPWARE_WRITE | GROUPWARE_ADMINISTRATE); +} diff --git a/gosa-plugins/groupware/personal/groupware/class_folderTest.inc b/gosa-plugins/groupware/personal/groupware/class_folderTest.inc index c41bd7240..d9815c78a 100644 --- a/gosa-plugins/groupware/personal/groupware/class_folderTest.inc +++ b/gosa-plugins/groupware/personal/groupware/class_folderTest.inc @@ -1,22 +1,24 @@