Code

Layout fixes applied
[gosa.git] / include / class_xmlParse.inc
index 88e7e3aab511e3f003455a3613b3db837f6e327c..28eb7e6a26610ca40f0f127e7606a5ba523b18ce 100644 (file)
@@ -39,7 +39,7 @@ class xmlParse  {
        function parseMenu($file)
        {
                if (!($fp = @fopen($file, "r"))) {
-                       print_red(sprintf(_("could not open XML input '%s'."),$file));
+                       print_red(sprintf(_("Could not open XML input '%s'."),$file));
                        $this->data = array();
                        return(false);
                }
@@ -87,7 +87,7 @@ class xmlParse  {
                                $dir ="";
                        }
                        if(($ele['tag'] == "CATEGORY")&&(!empty($ele['value']))&&(isset($ele['value']))){
-                               $current[$dir]['name'] = $ele['value'];
+                               $current[preg_replace("/\/$/","",$dir)]['name'] = $ele['value'];
                        }
                        if(isset($current['type'])){
                                unset($current['type']);
@@ -96,10 +96,11 @@ class xmlParse  {
                                $dir .= preg_replace("/\.directory/","",$ele['value'])."/";
                        }
                        if(($ele['tag'] == "CATEGORY")&&(!empty($ele['value']))&&(isset($ele['value']))){
-                               $current[$dir] = $ele['value'];
+                               $current[preg_replace("/\/$/","",$dir)] = $ele['value'];
                        }
                        $curback = $current;    
                }
+               
        }