# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1269426812 14400
# Node ID 612580c572508ad7fd59608a642b48a935a86319
# Parent  0d8f225b01858e4957f32ce2888ab7aeaf2c2503
netbox:split networking, server, gui and tab engine

diff -r 0d8f225b0185 -r 612580c57250 lib/gui_functions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/gui_functions	Wed Mar 24 06:33:32 2010 -0400
@@ -0,0 +1,211 @@
+#!/bin/sh
+#
+#
+# Tab display engine
+#
+######################################################
+
+use_tab()
+{
+local tmp=''
+case "$2" in
+header|body)
+	$1 | while read exe name call; do
+	  case "$exe" in
+	  \#*) continue;;
+	  /*)  [ -e $exe ] || continue;;
+	  *)   which $exe > /dev/null || continue
+	  esac
+	  if [ "$2" == "header" ]; then
+	    echo -n "$tmp$name"
+	    tmp='|'
+	  else
+	    $call
+	  fi
+	done
+	;;
+*)
+	tmp=$(use_tab $1 header)
+	echo "$tmp" | grep -q \| && cat <<EOT
+<notebook labels="$tmp">
+EOT
+	[ -n "$tmp" ] && cat <<EOT
+$(use_tab $1 body)
+EOT
+	echo "$tmp" | grep -q \| && cat <<EOT
+</notebook>
+EOT
+	;;
+esac
+}
+
+#
+# GUI functions
+#
+############################################################
+
+xterm="xterm -fa MiscFixed -fs 11"
+helpbutton()
+{
+	local label;
+        label="<label>$3</label>"
+	[ -n "$3" ] || label=""
+	cat << EOT
+<button>
+	<input file icon="help"></input>$label
+	<action>$xterm -geometry $2 -title "$1 help (q to quit)" -e "( echo ; $(which $1) --help 2>&1 ) | less"</action>
+</button>
+EOT
+}
+
+editbutton()
+{
+	cat << EOT
+<button>
+	<input file icon="accessories-text-editor"></input>
+	<action type="lauch">leafpad $1</action>
+</button>
+EOT
+}
+
+manbutton()
+{
+	cat << EOT
+<button>
+	<input file icon="browser"></input>
+	<label>man</label>
+	<action>$xterm -geometry 80x24 -title "$2 man (q to quit)" -e ". /etc/profile; man $1 $2"</action>
+</button>
+EOT
+}
+
+helpdaemon()
+{
+	cat << EOT
+<hbox>
+	<text use-markup="true">
+		<label>"<b>$3</b>"</label>
+	</text>
+	<entry editable="false">
+EOT
+	eval tmp=\$$3
+	[ -n "$tmp" ] && cat << EOT
+		<default>$tmp</default>
+EOT
+	cat << EOT
+		<variable>$4</variable>
+	</entry>
+EOT
+	[ -n "$6" ] || cat << EOT
+$(helpbutton $1 $2)
+EOT
+	[ -n "$5" ] && cat << EOT
+$(manbutton $5 $1)
+EOT
+	cat << EOT
+$(editbutton /etc/daemons.conf)
+</hbox>
+EOT
+}
+
+datafile()
+{
+	cat << EOT
+<hbox>
+	<text use-markup="true">
+		<label>"<b>$3</b>"</label>
+	</text>
+ 	<entry editable="false">
+EOT
+	[ -n "$1" ] && cat << EOT
+		<default>$1</default>
+EOT
+	cat << EOT
+		<variable>$2</variable>
+	</entry>
+EOT
+	[ -n "$4" ] && cat << EOT
+$(manbutton $4)
+EOT
+	cat << EOT
+$(editbutton \$$2)
+</hbox>
+EOT
+}
+
+configfile()
+{
+	datafile "$1" $2 'Configuration:' "$3"
+}
+
+BROWSER=''
+for i in firefox opera dillo midori netsurf links ; do
+	which $i > /dev/null && BROWSER="$i" && break
+done
+case "$BROWSER" in
+links) BROWSER="links -g ";;
+esac
+
+webbutton()
+{
+	[ -f "/var/lib/tazpkg/installed/$1/receipt" ] && 
+	[ -n "$BROWSER" ] && cat << EOT
+<button>
+	<input file icon="browser"></input>
+	<label>web</label>
+	<action>. /var/lib/tazpkg/installed/$1/receipt ; $BROWSER \$WEB_SITE &</action>
+</button>
+EOT
+}
+
+wikibutton()
+{
+[ -n "$BROWSER" ] && cat <<EOT
+        <button>
+          <input file icon="browser"></input>
+	  <label>Wiki</label>
+	  <action>$BROWSER $1 &</action>
+        </button>
+EOT
+}
+
+startstopdaemon()
+{
+	local pkg
+	pkg=$1
+	[ -n "$2" ] && pkg=$2
+	if [ ! -d /var/lib/tazpkg/installed/${pkg} ]; then
+		installbox $pkg
+	fi
+	webbutton $pkg
+	cat << EOT
+<button>
+	<label>Start</label>
+	<input file icon="forward"></input>
+	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)$1 \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
+	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)\\"/RUN_DAEMONS=\\"$1 \1\\"/" /etc/rcS.conf</action>
+	<action>/etc/init.d/$1 start</action>
+</button>
+<button>
+	<label>Stop</label>
+	<input file icon="stop"></input>
+	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)$1 \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
+	<action>/etc/init.d/$1 stop</action>
+</button>
+EOT
+}
+
+installbox()
+{
+	cat << EOT
+<hbox>
+	
+	<button>
+		<input file icon="go-jump"></input>
+		<label>Install</label>
+		<action>$xterm -geometry 80x17 -title "$1 install" -e "yes y | tazpkg get-install $1 ; echo -e \"----\n\nENTER to continue...\" && read close"</action>
+		<action type="exit">restart</action>
+	</button>
+</hbox>
+EOT
+}
diff -r 0d8f225b0185 -r 612580c57250 tinyutils/netbox
--- a/tinyutils/netbox	Wed Mar 24 05:15:28 2010 -0400
+++ b/tinyutils/netbox	Wed Mar 24 06:33:32 2010 -0400
@@ -5,7 +5,9 @@
 #
 # (c) - SliTaz GNU/Linux 2009.
 #
-VERSION=20090812
+VERSION=20100315
+
+. /usr/lib/slitaz/gui_functions
 
 # Check if user is root.
 check_root()
@@ -18,6 +20,7 @@
 	fi
 }
 
+
 #
 # Functions called by the connection tab to list interfaces.
 #
@@ -66,176 +69,6 @@
 		continue ;;
 esac
 
-#
-# GUI functions
-#
-############################################################
-
-xterm="xterm -fa MiscFixed -fs 11 -bg gray93 -fg black"
-helpbutton()
-{
-	local label;
-        label="<label>$3</label>"
-	[ -n "$3" ] || label=""
-	cat << EOT
-<button>
-	<input file icon="help"></input>$label
-	<action>$xterm -geometry $2 -title "$1 help (q to quit)" -e "( echo ; $(which $1) --help 2>&1 ) | less"</action>
-</button>
-EOT
-}
-
-editbutton()
-{
-	cat << EOT
-<button>
-	<input file icon="accessories-text-editor"></input>
-	<action type="lauch">leafpad $1</action>
-</button>
-EOT
-}
-
-manbutton()
-{
-	cat << EOT
-<button>
-	<input file icon="browser"></input>
-	<label>man</label>
-	<action>$xterm -geometry 80x24 -title "$2 man (q to quit)" -e ". /etc/profile; man $1 $2"</action>
-</button>
-EOT
-}
-
-helpdaemon()
-{
-	cat << EOT
-<hbox>
-	<text use-markup="true">
-		<label>"<b>$3</b>"</label>
-	</text>
-	<entry editable="false">
-EOT
-	eval tmp=\$$3
-	[ -n "$tmp" ] && cat << EOT
-		<default>$tmp</default>
-EOT
-	cat << EOT
-		<variable>$4</variable>
-	</entry>
-EOT
-	[ -n "$6" ] || cat << EOT
-$(helpbutton $1 $2)
-EOT
-	[ -n "$5" ] && cat << EOT
-$(manbutton $5 $1)
-EOT
-	cat << EOT
-$(editbutton /etc/daemons.conf)
-</hbox>
-EOT
-}
-
-datafile()
-{
-	cat << EOT
-<hbox>
-	<text use-markup="true">
-		<label>"<b>$3</b>"</label>
-	</text>
- 	<entry editable="false">
-EOT
-	[ -n "$1" ] && cat << EOT
-		<default>$1</default>
-EOT
-	cat << EOT
-		<variable>$2</variable>
-	</entry>
-EOT
-	[ -n "$4" ] && cat << EOT
-$(manbutton $4)
-EOT
-	cat << EOT
-$(editbutton \$$2)
-</hbox>
-EOT
-}
-
-configfile()
-{
-	datafile "$1" $2 'Configuration:' "$3"
-}
-
-BROWSER=''
-for i in firefox opera dillo midori netsurf links ; do
-	which $i > /dev/null && BROWSER="$i" && break
-done
-case "$BROWSER" in
-links) BROWSER="links -g ";;
-esac
-
-webbutton()
-{
-	[ -f "/var/lib/tazpkg/installed/$1/receipt" ] && 
-	[ -n "$BROWSER" ] && cat << EOT
-<button>
-	<input file icon="browser"></input>
-	<label>web</label>
-	<action>. /var/lib/tazpkg/installed/$1/receipt ; $BROWSER \$WEB_SITE &</action>
-</button>
-EOT
-}
-
-wikibutton()
-{
-[ -n "$BROWSER" ] && cat <<EOT
-        <button>
-          <input file icon="browser"></input>
-	  <label>Wiki</label>
-	  <action>$BROWSER $1 &</action>
-        </button>
-EOT
-}
-
-startstopdaemon()
-{
-	local pkg
-	pkg=$1
-	[ -n "$2" ] && pkg=$2
-	webbutton $pkg
-	cat << EOT
-<button>
-	<label>Start</label>
-	<input file icon="forward"></input>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)$1 \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)\\"/RUN_DAEMONS=\\"$1 \1\\"/" /etc/rcS.conf</action>
-	<action>/etc/init.d/$1 start</action>
-</button>
-<button>
-	<label>Stop</label>
-	<input file icon="stop"></input>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)$1 \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
-	<action>/etc/init.d/$1 stop</action>
-</button>
-EOT
-}
-
-installbox()
-{
-	cat << EOT
-<hbox>
-	<text wrap="true" use-markup="true">
-		<label>"<i>The package <b>$1</b> is not yet installed.</i>"</label>
-	</text>
-	<button>
-		<input file icon="go-jump"></input>
-		<label>Install</label>
-		<action>$xterm -geometry 80x17 -title "$1 install" -e "yes y | tazpkg get-install $1 ; echo -e \"----\n\nENTER to continue...\" && read close"</action>
-		<action type="exit">restart</action>
-	</button>
-</hbox>
-EOT
-}
-
 set_ipup()
 {
 	[ -f /etc/ppp/ip-up ] && return
@@ -330,44 +163,7 @@
 	exit 1
 fi
 
-#
-# Tab display engine
-#
-######################################################
 
-use_tab()
-{
-local tmp=''
-case "$2" in
-header|body)
-	$1 | while read exe name call; do
-	  case "$exe" in
-	  \#*) continue;;
-	  /*)  [ -e $exe ] || continue;;
-	  *)   which $exe > /dev/null || continue
-	  esac
-	  if [ "$2" == "header" ]; then
-	    echo -n "$tmp$name"
-	    tmp='|'
-	  else
-	    $call
-	  fi
-	done
-	;;
-*)
-	tmp=$(use_tab $1 header)
-	echo "$tmp" | grep -q \| && cat <<EOT
-<notebook labels="$tmp">
-EOT
-	[ -n "$tmp" ] && cat <<EOT
-$(use_tab $1 body)
-EOT
-	echo "$tmp" | grep -q \| && cat <<EOT
-</notebook>
-EOT
-	;;
-esac
-}
 
 #
 # Status wire interfaces
@@ -460,22 +256,6 @@
 EOT
 }
 
-#
-# Status servers
-#
-tab_status_servers()
-{
-local servers
-servers="dropbear sshd inetd dhcpd dnsd named rsync httpd mbd vnc pppd knock"
-cat <<EOT
-<frame Servers>
-	<text wrap="false" width-chars="58">
-		<input>for i in $servers; do ps ww | grep \$i | grep -v grep | fold -s; done</input>
-	</text>
-</frame>
-EOT
-}
-
 data_status()
 {
 cat <<EOT
@@ -483,7 +263,6 @@
 iwconfig    Wireless\ interfaces  tab_status_wifi_iface
 iwlist      Wireless\ networks    tab_status_wifi_net
 route       Routing               tab_status_route
-ps          Servers               tab_status_servers
 EOT
 }
 
@@ -1082,611 +861,6 @@
 use_tab data_vpn
 }
 
-sshremote()
-{
-	cat << EOT
-      <hbox>
-        <text use-markup="true">
-          <label>"<b>Remote  :</b>"</label>
-        </text>
-        <entry>
-          <variable>$2</variable>
-	  <default>user@elsewhere</default>
-        </entry>
-        <button>
-          <input file icon="utilities-terminal"></input>
-	  <label>Connect</label>
-	  <action>xterm -fa MiscFixed -fs 11 -bg black -fg white -geometry 80x25 -title "$1" -e "$1 \$$2 ; echo -e \"----\nENTER to continue...\" && read close" &</action>
-        </button>
-        <button>
-          <input file icon="go-up"></input>
-	  <label>Send key</label>
-	  <action>$xterm -geometry 80x10 -title "send ssh key" -e "$0 call sendsshkey \$$2; echo -e \"----\nENTER to continue...\" && read close"</action>
-        </button>
-      </hbox>
-EOT
-}
-
-#
-# Dropbear client & server
-#
-tab_dropbear()
-{
-. /etc/daemons.conf
-set -- $DROPBEAR_OPTIONS
-while [ -n "$2" ]; do
-  [ "$1" = "-b" ] && DROPBEAR_BANNER="$2" && break
-  shift
-done
-
-cat <<EOT
-     <frame Dropbear>
-$(helpdaemon dropbear 80x30 DROPBEAR_OPTIONS DROPBEAR_OPTS)
-$(datafile /etc/dropbear/banner DROPBEAR_BANNER 'Banner   :')
-$(sshremote DROPBEAR_PEER 'dbclient -i /etc/dropbear/dropbear_rsa_host_key')
-      <hbox>
-	$(startstopdaemon dropbear)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# OpenSSH client & server
-#
-tab_openssh()
-{
-cat <<EOT
-    <frame OpenSSH>
-$(helpdaemon sshd 80x30 OPENSSH_OPTIONS OPENSSH_OPTS 8 nohelp)
-$(configfile /etc/ssh/sshd_config OPENSSH_CONF '5 sshd_config')
-$(sshremote OPENSSH_PEER 'ssh -i /etc/ssh/ssh_host_rsa_key')
-      <hbox>
-	$(startstopdaemon openssh)
-      </hbox>
-     </frame>
-EOT
-}
-
-data_sshd()
-{
-cat <<EOT
-dropbear    Dropbear      tab_dropbear
-sshd        OpenSSH       tab_openssh
-EOT
-}
-
-#
-# SSH tab
-#
-tab_sshd()
-{
-use_tab data_sshd
-}
-
-#
-# Busybox Inetd
-#
-tab_inetd()
-{
-cat <<EOT
-<frame Inetd (busybox)>
-$(helpdaemon inetd 60x14 INETD_OPTIONS INETD_OPTS)
-$(configfile /etc/inetd.conf INETD_CONF)
-      <hbox>
-EOT
-for i in $(grep bin /etc/inetd.conf | awk '{ print $6}'); do
-  i=$(basename $i)
-  helpbutton $i 60x19 $i
-done
-cat <<EOT
-	$(startstopdaemon inetd)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# ZeroConf
-#
-tab_zcip()
-{
-if [ -x /sbin/zcip -a -z "$ZCIP_OPTIONS" ]; then
-	ZCIP_OPTIONS="eth0 /etc/zcip.script"
-	cat >> /etc/daemons.conf <<EOT
-# ZeroConf options
-ZCIP_OPTIONS="$ZCIP_OPTIONS"
-
-EOT
-fi
-cat <<EOT
-     <frame Zcip (busybox)>
-$(helpdaemon zcip 60x14 ZCIP_OPTIONS ZCIP_OPTS)
-$(datafile /etc/zcip.script CZIP_SCRIPT 'Script :')
-      <hbox>
-	$(startstopdaemon zcip)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# Dhcpd ISC
-#
-tab_isc_dhcpd()
-{
-cat <<EOT
-    <frame Dhcpd (ISC)>
-$(helpdaemon dhcpd 60x14 DHCPD_OPTIONS DHCPD_OPTS)
-$(configfile /etc/dhcpd.conf DHCPD_CONF)
-      <hbox>
-	$(startstopdaemon dhcpd dhcp)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# Dhcpd Busybox
-#
-tab_udhcpd()
-{
-cat <<EOT
-    <frame Udhcpd (busybox)>
-$(helpdaemon udhcpd 60x14 UDHCPD_OPTIONS UDHCPD_OPTS)
-$(configfile /etc/udhcpd.conf UDHCPD_CONF)
-      <hbox>
-	$(startstopdaemon udhcpd busybox)
-      </hbox>
-     </frame>
-EOT
-}
-
-data_dhcpd()
-{
-cat <<EOT
-udhcpd      Udhcpd        tab_udhcpd
-dhcpd       Dhcpd         tab_isc_dhcpd
-dnsmasq     DNSmasq       tab_dnsmasq
-EOT
-}
-
-#
-# dhcpd tab
-#
-tab_dhcpd()
-{
-use_tab data_dhcpd
-}
-
-#
-# PXE forwarder
-#
-tab_gpxe()
-{
-cat <<EOT
-<frame PXE forwarder>
-      <hbox>
-        <text use-markup="true">
-          <label>"<b>WEB boot URL(s) :</b>"</label>
-        </text>
-      </hbox>
-      <hbox>
-        <entry editable="true">
-          <default>
-"$(dd bs=1 skip=5 count=255 if=/usr/share/boot/gpxe.pxe 2> /dev/null | strings)"
-          </default>
-          <variable>WEB_PXE</variable>
-        </entry>
-      </hbox>
-      <hbox>
-$(wikibutton http://wiki.slitaz.org/doku.php?id=quickstart:pxe)
-        <button>
-          <input file icon="go-jump"></input>
-	  <label>Install</label>
-	  <action>
-	echo -n "\$WEB_PXE" | cat - /dev/zero | \
-	dd conv=notrunc bs=1 seek=5 count=255 of=/usr/share/boot/gpxe.pxe
-	  </action>
-	  <action>
-	sed -i "s|tftpd -r .*\$|tftpd -r /usr/share/boot|" /etc/inetd.conf
-	  </action>
-	  <action> sed -i "/^boot_file/d" \$UDHCPD_CONF </action>
-	  <action> echo "boot_file gpxe.pxe" >> \$UDHCPD_CONF </action>
-	  <action> /etc/init.d/inetd restart </action>
-	  <action> /etc/init.d/udhcpd restart </action>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)inetd \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)udhcpd \?\\(.*\\)\\"/RUN_DAEMONS=\\"\1\2\\"/" /etc/rcS.conf</action>
-	<action>sed -i "s/RUN_DAEMONS=\\"\\(.*\\)\\"/RUN_DAEMONS=\\"udhcpd inetd \1\\"/" /etc/rcS.conf</action>
-        </button>
-      </hbox>
-</frame>
-EOT
-}
-
-#
-# PXE server
-#
-tab_pxelinux()
-{
-cat <<EOT
-<frame PXElinux>
-      <hbox>
-        <text wrap="true">
-          <label>
-"Launch Dhcpd and Inetd with Tftpd to start the PXE service."
-          </label>
-        </text>
-      </hbox>
-      <hbox>
-        <text use-markup="true">
-          <label>"<b>Configuration :</b>"</label>
-        </text>
-        <entry editable="false">
-          <default>
-$(grep bin/tftpd /etc/inetd.conf | awk '{ print $NF }')/pxelinux.cfg/default
-          </default>
-          <variable>PXE_CONF</variable>
-        </entry>
-        <button>
-          <input file icon="accessories-text-editor"></input>
-	  <action>dir=\$(dirname \$PXE_CONF); [ -d \$dir ] || mkdir -p \$dir</action>
-	  <action>lzma d /usr/share/boot/pxelinux.0.lzma \$(dirname \$PXE_CONF)/../pxelinux.0</action>
-	  <action>sed -i "/^boot_file/d" \$UDHCPD_CONF</action>
-	  <action>echo "boot_file pxelinux.0" >> \$UDHCPD_CONF</action>
-	  <action>grep -q "^siaddr" \$UDHCPD_CONF || echo "siaddr \$(ifconfig \$INTERFACE | grep inet.ad | cut -d: -f2 | cut -d\  -f1)" >> \$UDHCPD_CONF</action>
-	  <action>[ -f \$PXE_CONF ] || echo -e "label linux\n\tkernel bzImage\n\tappend initrd=rootfs.gz rw root=/dev/null vga=normal" > \$PXE_CONF</action>
-          <action type="lauch">leafpad \$PXE_CONF</action>
-        </button>
-      </hbox>
-      <hbox>
-$(wikibutton http://wiki.slitaz.org/doku.php?id=quickstart:pxe)
-        <button>
-          <input file icon="system-file-manager"></input>
-	  <label>Network boot files</label>
-	  <action>$xterm -geometry 100x25 -title "Network boot files (q to quit)" -e "find \$(dirname \$(dirname \$PXE_CONF)) -exec ls -ld {} \; | less"</action>
-        </button>
-      </hbox>
-     </frame>
-EOT
-}
-
-data_pxe()
-{
-[ -f /usr/share/boot/pxelinux.0.lzma ] && cat <<EOT
-true        PXElinux          tab_pxelinux
-EOT
-[ -f /usr/share/boot/gpxe.pxe ] && cat <<EOT
-true        PXE\ forwarder    tab_gpxe
-EOT
-}
-
-#
-# PXE
-#
-tab_pxe()
-{
-use_tab data_pxe
-}
-
-#
-# Busybox dnsd
-#
-tab_dnsd()
-{
-cat <<EOT
-    <frame Dnsd (busybox master dns)>
-$(helpdaemon dnsd 80x15 DNSD_OPTIONS DNSD_OPTS)
-$(configfile /etc/dnsd.conf DNSD_CONF)
-      <hbox>
-	$(startstopdaemon dnsd busybox)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# ISC Bind
-#
-tab_named()
-{
-cat <<EOT
-    <frame Named (ISC bind)>
-$(helpdaemon named 80x10 NAMED_OPTIONS NAMED_OPTS)
-$(configfile /etc/bind/named.conf.local NAMED_CONF)
-      <hbox>
-	$(startstopdaemon named bind)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# DNSmasq 
-#
-tab_dnsmasq()
-{
-cat <<EOT
-    <frame DNSmasq (DNS/DHCP/TFTP)>
-$(helpdaemon dnsmasq 100x34 DNSMASQ_OPTIONS DNSMASQ_OPTS)
-$(configfile /etc/dnsmasq.conf DNSMASQ_CONF)
-      <hbox>
-	$(startstopdaemon dnsmasq)
-      </hbox>
-     </frame>
-EOT
-}
-
-data_dns()
-{
-cat <<EOT
-dnsd        Dnsd          tab_dnsd
-named       Named         tab_named
-dnsmasq     DNSmasq       tab_dnsmasq
-#TODO sheerdns    Sheerdns      tab_sheerdns
-EOT
-}
-
-#
-# dns tab
-#
-tab_dns()
-{
-use_tab data_dns
-}
-
-#
-# rsync server
-#
-tab_rsync()
-{
-cat <<EOT
-     <frame Rsync>
-$(helpdaemon rsync 80x30 RSYNCD_OPTIONS RSYNCD_OPTS 1)
-$(configfile /etc/rsyncd.conf RSYNCD_CONF)
-$(datafile /etc/rsyncd.secrets RSYNCD_SECRETS 'Secrets file     :')
-      <hbox>
-	$(startstopdaemon rsyncd rsync)
-      </hbox>
-     </frame>
-EOT
-}
-
-php_ini()
-{
-[ -f /etc/php.ini ] && cat <<EOT
-      <frame PHP>
-$(configfile /etc/php.ini PHP_CONF)
-      </frame>
-EOT
-}
-
-#
-# Apache server
-#
-tab_apache()
-{
-cat <<EOT
-     <frame Apache>
-$(configfile /etc/apache/httpd.conf HTTPD_CONF)
-$(php_ini)
-      <hbox>
-	$(startstopdaemon apache)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# Lighttpd server
-#
-tab_lighttpd()
-{
-cat <<EOT
-     <frame Lighttpd>
-$(helpdaemon lighttpd 80x15 LIGHTTPD_OPTIONS LIGHTTPD_OPTS)
-$(configfile /etc/lighttpd/lighttpd.conf LIGHTTPD_CONF)
-$(php_ini)
-      <hbox>
-	$(startstopdaemon lighttpd)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# Busybox httpd server
-#
-tab_httpd()
-{
-cat <<EOT
-     <frame httpd (busybox)>
-$(helpdaemon httpd 80x30 HTTPD_OPTIONS HTTPD_OPTS)
-$(configfile /etc/httpd.conf HTTPD_CONF)
-$(php_ini)
-      <hbox>
-	$(startstopdaemon httpd busybox)
-      </hbox>
-     </frame>
-EOT
-}
-
-data_http()
-{
-cat <<EOT
-/etc/apache/httpd.conf  Apache          tab_apache
-lighttpd                Lighttpd        tab_lighttpd
-/etc/httpd.conf         Busybox\ httpd  tab_httpd
-EOT
-}
-
-#
-# http tab
-#
-tab_http()
-{
-use_tab data_http
-}
-
-#
-# Samba servers
-#
-tab_wins()
-{
-cat <<EOT
-     <frame Samba: smbd & nmbd>
-$(configfile /etc/samba/smb.conf SMBD_CONF)
-      <hbox>
-        <button>
-          <label>Reload</label>
-          <input file icon="reload"></input>
-          <action>/etc/init.d/samba reload</action>
-        </button>
-	$(startstopdaemon samba)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# x11vnc
-#
-tab_vnc()
-{
-cat <<EOT
-     <frame x11vnc>
-$(helpdaemon x11vnc 80x30 X11VNC_OPTIONS X11VNC_OPTS)
-      <hbox>
-        <text use-markup="true">
-          <label>"<b>New password</b>"</label>
-        </text>
-        <entry>
-          <variable>X11VNC_PASSWD</variable>
-        </entry>
-        <button>
-          <input file icon="reload"></input>
-          <label>Update</label>
-          <action>x11vnc -storepasswd \$X11VNC_PASSWD /etc/vnc.secret</action>
-        </button>
-      </hbox>
-      <hbox>
-	$(startstopdaemon x11vnc)
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# knock server
-#
-tab_knockd()
-{
-cat <<EOT
-    <frame Knockd: trigger backdoors>
-$(helpdaemon knockd 80x15 KNOCK_OPTIONS KNOCK_OPTS)
-$(configfile /etc/knockd.conf KNOCKD_CONF)
-      <hbox>
-	$(startstopdaemon knockd knock)
-      </hbox>
-     </frame>
-EOT
-}
-
-data_servers()
-{
-local $pxe
-pxe="#"
-[ -x /usr/bin/tftpd -a -x /usr/sbin/udhcpd ] && pxe="inetd"
-[ -x /usr/sbin/dnsmasq ] && pxe="true"
-[ -f /usr/share/boot/pxelinux.0.lzma -o /usr/share/boot/gpxe.pxe ] || pxe="#"
-cat <<EOT
-$([ -x /usr/sbin/dropbear -o -x /usr/sbin/sshd ] && echo "true" ||
-echo "#")   SSH           tab_sshd
-inetd       Inetd         tab_inetd
-zcip        ZeroConf      tab_zcip
-$([ -x /usr/sbin/udhcpd -o -x /usr/sbin/dhcpd -o -x /usr/sbin/dnsmasq ] && 
-echo "true" ||
-echo "#")   DHCP          tab_dhcpd
-$pxe        PXE           tab_pxe
-dnsmasq     tftpd         tab_dnsmasq
-$([ -x /usr/sbin/dnsd -o -x /usr/sbin/named -o -x /usr/sbin/dnsmasq ] && 
-echo "true" ||
-echo "#")   DNS           tab_dns
-rsync       Rsync         tab_rsync
-$([ -x /usr/sbin/lighttpd -o -x /usr/bin/httpd ] && echo "true" || 
-echo "#")   HTTP          tab_http
-smbd        WINS          tab_wins
-x11vnc      VNC           tab_vnc 
-knockd      Knock         tab_knockd
-#TODO+callback pppd        Pppd          tab_pppd
-#TODO pptpd       PoPToP        tab_poptop
-#TODO squid *sql openldap 
-EOT
-}
-
-#
-# Servers tab
-#
-tab_servers()
-{
-use_tab data_servers
-}
-
-#
-# Firewall tab
-#
-tab_firewall()
-{
-cat <<EOT
-    <frame Iptables>
-$(configfile /etc/iptables.conf IPTABLES_CONF)
-      <hbox>
-$(helpbutton iptables 80x30)
-$(manbutton 8 iptables)
-$(webbutton iptables)
-        <button>
-          <label>Load</label>
-          <input file icon="reload"></input>
-          <action>cat \$IPTABLES_CONF | /sbin/iptables-restore</action>
-        </button>
-        <button>
-          <label>Save</label>
-          <input file icon="go-jump"></input>
-          <action>/sbin/iptables-save > \$IPTABLES_CONF</action>
-        </button>
-      </hbox>
-     </frame>
-EOT
-}
-
-#
-# knock client
-#
-tab_knock()
-{
-cat <<EOT
-    <frame Knock>
-    <hbox>
-      <text use-markup="true">
-        <label>"<b>Options : </b>"</label>
-      </text>
-      <entry editable="true">
-        <variable>KNOCK_OPTS</variable>
-	<default>myserver.example.com 123:tcp 456:udp 789:tcp</default>
-      </entry>
-    </hbox>
-    <hbox>
-$(helpbutton knock 80x12)
-      <button>
-        <label>Start</label>
-        <input file icon="forward"></input>
-        <action>knock \$KNOCK_OPTS</action>
-      </button>
-    </hbox>
-    </frame>
-EOT
-}
-
 #
 # ether-wake
 #
@@ -1773,12 +947,9 @@
 ifconfig    Static\ IP    tab_fixed_ip
 pppoe       PPPoE         tab_pppoe
 pppd        PPP           tab_ppp
-true        System\ wide  tab_system
 true        VPN           tab_vpn
-true        Servers       tab_servers
-iptables    Firewall      tab_firewall
-knock       Knock         tab_knock
 ether-wake  Etherwake     tab_etherwake
+true        Configuration tab_system
 EOT
 }
 
@@ -1851,7 +1022,7 @@
 
 		<hbox>
 			<text use-markup="true">
-				<label>"<b>Network/Server Manager</b>"</label>
+				<label>"<b>Network Manager</b>"</label>
 			</text>
 			<pixmap>
 				<input file>/usr/share/pixmaps/netbox.png</input>