Disbled dashBoard in icon menu by default.

-Updated pluglist and plugin ACL check, ignores spaces and line breaks now.

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 9bc9842eb0f88f1536bd888123b437dd6a08b28a..0ad2f547f5514f2b32476858eb9eee5e43284a60 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -73,7 +73,7 @@
   <!-- These entries will be rendered on the short-cut menu -->
   <shortCutMenu>
       <plugin acl="all" class="welcome" />
-      <plugin acl="all" class="dashBoard" />
+      <!-- <plugin acl="all" class="dashBoard" />-->
   </shortCutMenu>
 
   <!-- These entries will be rendered on the path navigator -->

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index f633d55f9fd8a68742ab3902be2fc1620f07aff6..ca829d7e1b106949861ef03a513b00389c6b88b9 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -87,6 +87,10 @@ class pluglist
   {
     global $class_mapping;
 
+    // Clean ACL string, we do not want any spaces or lines breaks here. 
+    $plug['ACL'] = trim($plug['ACL']);
+
+    // Check class
     if (!isset($plug['CLASS'])){
       msg_dialog::display(
           _("Configuration error"),
@@ -128,7 +132,11 @@ class pluglist
     }
 
     foreach($acls_to_check as $acl_to_check){
+    
+      // Remove spaces and line breaks.
       $acl_to_check = trim($acl_to_check);
+      $acl_to_check = preg_replace("/ /","",$acl_to_check);
+        
 
       /* Check if the given acl tag is only valid for self acl entries  
        *          <plugin acl="users/user:self" class="user"...