updated acls

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2206 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index c1b1715a61ede02b024e9ec5c4613b5dadeee768..69d4c16c8ebdf874f08df4a5849a09e9f8a2a3b4 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -223,10 +223,11 @@ $ACLD['pureftpdAccount']=   array(
                        "FTPQuotaMBytes",
                        "FTPUploadRatio",
                        "FTPDownloadRatio");
-$ACLD['goFonConference']= array(
+$ACLD['conference']= array(
                        "goFonConference",
                        "goFonPIN",
                        "base",
+                       "delete",
                        "cn",
                        "description",
                        "telephoneNumber",                      
@@ -294,25 +295,6 @@ $ACLD['logview']   =  array("logview");
 $ACLD['mailqueue']     =  array("mailqueue","unhold_all","hold_all","del_all","requeue_all","unhold","hold","del","requeue","query","header");
 $ACLD['ldapmanager']=  array("ldapmanager","import","export","xlsexport","csvimport");
 
-$ACLD['conference']    =       array(  
-                                                               "conference",
-                                                               "cn",
-                                                               "base", 
-                                                               "description", 
-                                                               "goFonPIN",
-                                                               "goFonConferenceOption_P",
-                                                               "goFonConferenceOption_r",
-                                                       "goFonConferenceOption_M",
-                                                               "goFonConferenceOption_s",
-                                                               "goFonConferenceOption_i",
-                                                               "goFonConferenceOption_c",
-                                                       "goFonConferenceOption_D",
-                                                               "goFonConferenceOptionFormat",
-                                                               "goFonConferenceOptionLifetime",
-                                                               "telephoneNumber",      
-                                                               "goFonConferenceOwner");
-
-
 $ACLD['FAIclass']      =       array(
                                                                // Allow displaying of FAI menu element
                                                                "FAIclass"      => "FAI management enabled");