SMP-Config angepasst.. CGIs usw. wurden im Windoof-Format gespeichert... muss noch...

[people/pmueller/ipfire-2.x.git] / config / cfgroot / header-menu.pl

diff --git a/config/cfgroot/header-menu.pl b/config/cfgroot/header-menu.pl
index b2151ea5cc7ab1116a8d6b7f6b4b19e0c5d577b1..ead049d7cad1e5d33fb31500d2c678fa52b03e02 100644 (file)
--- a/config/cfgroot/header-menu.pl
+++ b/config/cfgroot/header-menu.pl
@@ -1,24 +1,24 @@
-sub genmenu\r
-{\r
-    ... snip ...\r
-    if ( ! -e "${General::swroot}/proxy/enable" && ! -e "${General::swroot}/proxy/enable_blue" ) {\r
-       splice (@{$menu{'2.status'}{'subMenu'}}, 4, 1);\r
-       splice (@{$menu{'7.mainlogs'}{'subMenu'}}, 2, 1);\r
-    }\r
-\r
-    # Read additionnal menus entry\r
-    # this have to be hardened and accepted. To be extended.\r
-    opendir (DIR, "${General::swroot}/addon-menu");\r
-    while (my $menuitem = readdir (DIR)) {\r
-\r
-       if ( $menuitem =~ /^menu\.([1-6]\..*)\..*/) {  #model is "menu.(N.submenu).filename"\r
-           my $submenu = $1;\r
-           open (FILE,"${General::swroot}/addon-menu/$menuitem") or die;\r
-           while (my $text = <FILE>) {     # file may content many entry\r
-               splice (@{$menu{$submenu}{'subMenu'}} ,-1,0, [ eval($text) ] );\r
-           }\r
-           close (FILE);\r
-       }\r
-    }\r
-    closedir (DIR);\r
-}\r
+sub genmenu
+{
+    ... snip ...
+    if ( ! -e "${General::swroot}/proxy/enable" && ! -e "${General::swroot}/proxy/enable_blue" ) {
+       splice (@{$menu{'2.status'}{'subMenu'}}, 4, 1);
+       splice (@{$menu{'7.mainlogs'}{'subMenu'}}, 2, 1);
+    }
+
+    # Read additionnal menus entry
+    # this have to be hardened and accepted. To be extended.
+    opendir (DIR, "${General::swroot}/addon-menu");
+    while (my $menuitem = readdir (DIR)) {
+
+       if ( $menuitem =~ /^menu\.([1-6]\..*)\..*/) {  #model is "menu.(N.submenu).filename"
+           my $submenu = $1;
+           open (FILE,"${General::swroot}/addon-menu/$menuitem") or die;
+           while (my $text = <FILE>) {     # file may content many entry
+               splice (@{$menu{$submenu}{'subMenu'}} ,-1,0, [ eval($text) ] );
+           }
+           close (FILE);
+       }
+    }
+    closedir (DIR);
+}