Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-1.3.1.tar.bz2 and ./bartlby-1.3.1.tar.bz2 differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/agent.c ./bartlby-agent/agent.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/agent.c	2008-04-07 21:23:26.000000000 +0200
+++ ./bartlby-agent/agent.c	2008-10-10 00:26:11.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: agent.c 17 2008-04-07 19:23:26Z hjanuschka $ */
+/* $Id: agent.c 74 2008-10-09 22:26:11Z hjanuschka $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
@@ -14,12 +14,14 @@
  *   visit: www.bartlby.org for support
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 17 $
+$Revision: 74 $
 $HeadURL: https://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-agent/agent.c $
-$Date: 2008-04-07 21:23:26 +0200 (Mo, 07 Apr 2008) $
+$Date: 2008-10-10 00:26:11 +0200 (Fr, 10 Okt 2008) $
 $Author: hjanuschka $ 
 */
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <stdio.h>
 #include <syslog.h>
 #include <stdlib.h>
@@ -32,6 +34,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
 
 char * getConfigValue(char * key, char * fname);
 
@@ -63,8 +68,11 @@
    	unsigned int namelen = sizeof(name);
 	char * agent_load_limit;
 	char * allowed_ip_list;
-	
-	
+	char * host_name_in_allowed_cfg;
+	char * cfg_ip_entry;
+	struct hostent * remote_host;
+	char * ip_to_check;
+		
 	FILE * fplg;
 	
 	struct sigaction act1, oact1;
@@ -78,6 +86,7 @@
         fflush(stdout);
         agent_load_limit=getConfigValue("agent_load_limit", argv[argc-1]);
         allowed_ip_list=getConfigValue("allowed_ips", argv[argc-1]);
+        host_name_in_allowed_cfg=getConfigValue("host_name_allowed", argv[argc-1]);
         
         if(agent_load_limit == NULL) {
         	agent_load_limit=strdup("10");	
@@ -92,6 +101,27 @@
         
         token=strtok(allowed_ip_list,",");
         
+        
+        act1.sa_handler = agent_conn_timeout;
+	sigemptyset(&act1.sa_mask);
+	act1.sa_flags=0;
+	#ifdef SA_INTERRUPT
+	act1.sa_flags |= SA_INTERRUPT;
+	#endif
+	if(sigaction(SIGALRM, &act1, &oact1) < 0) {
+		
+		printf("2|ALARM SETUP ERROR\n\n");
+		fflush(stdout);	
+		sleep(2);
+		exit(1);
+				
+		return -1;
+	
+		
+	}
+	connection_timed_out=0;
+	alarm(CONN_TIMEOUT);
+        
         if (getpeername(0,(struct sockaddr *)&name, &namelen) < 0) {
    		//syslog(LOG_ERR, "getpeername: %m");
    		exit(1);
@@ -101,11 +131,38 @@
         
         while(token != NULL) {
         	//printf("CHECKING: %s against %s\n", token, inet_ntoa(name.sin_addr));
-        	if(strcmp(token, inet_ntoa(name.sin_addr)) == 0) {
+        	cfg_ip_entry=strdup(token);
+        	ip_to_check=strdup(inet_ntoa(name.sin_addr));
+        	
+        	if(host_name_in_allowed_cfg != NULL) {
+        		//we have to resolve the entrys
+        		
+        		if((remote_host = gethostbyname(cfg_ip_entry)) == 0) {
+				printf("dns failed\n");
+				sleep(2);
+				exit(1);
+			}
+			//remote_side.sin_addr.s_addr =  ;
+        		//free prev. vars
+        		
+        		free(cfg_ip_entry);
+        		cfg_ip_entry=strdup(inet_ntoa(*(struct in_addr*)remote_host->h_addr_list[0]));
+        		
+        		
+        			
+        	}
+        	//printf("Comparing: %s against %s\n", cfg_ip_entry, ip_to_check);
+        	if(strcmp(cfg_ip_entry, ip_to_check) == 0) {
         		ip_ok=0;	
         	}
+        	free(cfg_ip_entry);
+        	free(ip_to_check);
+        	
         	token=strtok(NULL, ",");	
         }
+        
+        
+        free(host_name_in_allowed_cfg);
         free(allowed_ip_list);
         if(ip_ok < 0) {
         	//sleep(1);
@@ -117,23 +174,7 @@
 		exit(1);
         }
         
-        act1.sa_handler = agent_conn_timeout;
-	sigemptyset(&act1.sa_mask);
-	act1.sa_flags=0;
-	#ifdef SA_INTERRUPT
-	act1.sa_flags |= SA_INTERRUPT;
-	#endif
-	if(sigaction(SIGALRM, &act1, &oact1) < 0) {
-		
-		printf("2|ALARM SETUP ERROR\n\n");
-		fflush(stdout);	
-		sleep(2);
-		exit(1);
-				
-		return -1;
-	
-		
-	}
+ 
 	
     	sprintf(svc_back, "1|ouuutsch");
         
@@ -144,10 +185,18 @@
         }
         
         
-        
+       	#ifndef __APPLE__ 
         load=fopen("/proc/loadavg", "r");
         fscanf(load, "%f %f %f", &loadavg[0], &loadavg[1], &loadavg[2]);
         fclose(load);
+	#else
+	//Stupid
+	load=NULL;
+	loadavg[0]=0.0;
+	loadavg[1]=0.0;
+	loadavg[2]=0.0;
+
+	#endif
         
         if(loadavg[0] < atof(agent_load_limit)) {
 		free(agent_load_limit);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/agent_v2.c ./bartlby-agent/agent_v2.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/agent_v2.c	2008-04-07 21:23:26.000000000 +0200
+++ ./bartlby-agent/agent_v2.c	2008-10-09 21:39:41.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: agent_v2.c 17 2008-04-07 19:23:26Z hjanuschka $ */
+/* $Id: agent_v2.c 70 2008-10-09 19:39:41Z hjanuschka $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
@@ -14,12 +14,14 @@
  *   visit: www.bartlby.org for support
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 17 $
+$Revision: 70 $
 $HeadURL: https://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-agent/agent_v2.c $
-$Date: 2008-04-07 21:23:26 +0200 (Mo, 07 Apr 2008) $
+$Date: 2008-10-09 21:39:41 +0200 (Do, 09 Okt 2008) $
 $Author: hjanuschka $ 
 */
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <stdio.h>
 #include <syslog.h>
 #include <stdlib.h>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/bartlby_agent.plist ./bartlby-agent/bartlby_agent.plist
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/bartlby_agent.plist	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-agent/bartlby_agent.plist	2008-10-09 21:39:41.000000000 +0200
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>Label</key>
+        <string>org.bartlby.agent</string>
+        <key>ServiceDescription</key>
+        <string>Bartlby System Monitoring Agent</string>
+        <key>ProgramArguments</key>
+        <array>
+                <string>/opt/bartlby-agent/bartlby_agent</string>
+                <string>/opt/bartlby-agent/bartlby.cfg</string>
+        </array>
+        <key>UserName</key>
+        <string>bartlby</string>
+        <key>inetdCompatibility</key>
+        <dict>
+                <key>Wait</key>
+                <false/>
+        </dict>
+        <key>Sockets</key>
+        <dict>
+                <key>Listeners</key>
+                <dict>
+                        <key>SockServiceName</key>
+                        <string>bartlbya</string>
+                </dict>
+        </dict>
+</dict>
+</plist> 
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/config.c ./bartlby-agent/config.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/config.c	2008-04-07 21:23:26.000000000 +0200
+++ ./bartlby-agent/config.c	2008-10-09 21:39:41.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: config.c 17 2008-04-07 19:23:26Z hjanuschka $ */
+/* $Id: config.c 70 2008-10-09 19:39:41Z hjanuschka $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
@@ -14,15 +14,17 @@
  *   visit: www.bartlby.org for support
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 17 $
+$Revision: 70 $
 $HeadURL: https://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-agent/config.c $
-$Date: 2008-04-07 21:23:26 +0200 (Mo, 07 Apr 2008) $
+$Date: 2008-10-09 21:39:41 +0200 (Do, 09 Okt 2008) $
 $Author: hjanuschka $ 
 */
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <string.h>
 
 
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/global.c ./bartlby-agent/global.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-agent/global.c	2008-04-07 21:23:26.000000000 +0200
+++ ./bartlby-agent/global.c	2008-10-09 21:39:41.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: global.c 17 2008-04-07 19:23:26Z hjanuschka $ */
+/* $Id: global.c 70 2008-10-09 19:39:41Z hjanuschka $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
@@ -14,12 +14,14 @@
  *   visit: www.bartlby.org for support
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 17 $
+$Revision: 70 $
 $HeadURL: https://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-agent/global.c $
-$Date: 2008-04-07 21:23:26 +0200 (Mo, 07 Apr 2008) $
+$Date: 2008-10-09 21:39:41 +0200 (Do, 09 Okt 2008) $
 $Author: hjanuschka $ 
 */
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <stdio.h>
 #include <syslog.h>
 #include <stdlib.h>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/configure.ac ./bartlby-core/configure.ac
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/configure.ac	2008-04-03 11:15:43.000000000 +0200
+++ ./bartlby-core/configure.ac	2008-04-18 00:11:05.000000000 +0200
@@ -1,115 +1,115 @@
-AC_DEFUN(AC_CHECK_LIBMYSQLCLIENT, [
-  AC_MSG_CHECKING(for MySQL Client support)
-
-  AC_ARG_ENABLE(
-    mysql,
-    [  --disable-mysql         disable MySQL support],
-    WITH_MYSQL="$enableval", WITH_MYSQL="yes")
-
-  AC_ARG_WITH(
-    mysql-inc,
-    [  --with-mysql-inc=PATH   include path for MySQL headers],
-    mysql_incdir="$withval", mysql_incdir="no")
-
-  AC_ARG_WITH(
-    mysql-lib,
-    [  --with-mysql-lib=PATH   library path for MySQL libraries],
-    mysql_libdir="$withval", mysql_libdir="no")
-
-  if test "$WITH_MYSQL" = "no"; then
-    AC_MSG_RESULT(no)
-    dnl MySQL is required currently, enforce it.
-    AC_MSG_ERROR([MySQL support is currently required. You tried to disable it.])
-  else
-    AC_MSG_RESULT(yes)
-
-    if test -n "$ac_cv_header_mysqlclient_mysql_incdir"; then
-      INC_MYSQL="$ac_cv_header_mysqlclient_mysql_incdir"
-    fi
-
-    if test -n "$ac_cv_lib_mysqlclient_mysql_libdir"; then
-      LIB_MYSQL="$ac_cv_lib_mysqlclient_mysql_libdir"
-    fi
-
-    dnl MySQL Header Check
-    temp="$CPPFLAGS"
-    if test "$mysql_incdir" != "no"; then
-      INC_MYSQL="-I$mysql_incdir"
-      CPPFLAGS="$temp $INC_MYSQL"
-      dnl Un-Set any cached results, since user is specifying a specific directory.
-      unset ac_cv_header_mysql_mysql_h
-    fi
-    AC_CHECK_HEADER(mysql/mysql.h, WITH_MYSQL="yes", WITH_MYSQL="no")
-    if test "$WITH_MYSQL" = "no"; then
-      dnl If our normal search or user suggested attempt failed, then try the known default for MySQL.
-      INC_MYSQL="-I/usr/local/include"
-      CPPFLAGS="$temp $INC_MYSQL"
-      dnl Un-Set any cached results, to force the second check to go.
-      unset ac_cv_header_mysql_mysql_h
-      AC_CHECK_HEADER(mysql/mysql.h, WITH_MYSQL="yes", WITH_MYSQL="no")
-    fi
-    CPPFLAGS="$temp"
-
-    if test "$WITH_MYSQL" = "no"; then
-      dnl The headers are required currently, enforce it.
-      AC_MSG_ERROR([Unable to locate <mysql/mysql.h>. MySQL support is currently required.])
-      dnl The above error will be removed eventually, and we need to clear this var if it fails.
-      INC_MYSQL=""
-    else
-      dnl Cache trick for header.
-      ac_cv_header_mysqlclient_mysql_incdir="$INC_MYSQL"
-      dnl MySQL Lib Check
-      temp="$LIBS"
-      if test "$mysql_libdir" != "no"; then
-        LIB_MYSQL="-L$mysql_libdir"
-        LIBS="$temp $LIB_MYSQL"
-        dnl Un-Set any cached results, since user is specifying a specific directory.
-        unset ac_cv_lib_mysqlclient_mysql_real_connect
-        unset ac_cv_lib_mysqlclient_mysql_real_query
-      fi
-      AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes",
-      [
-        dnl If our normal search or user suggested attempt failed, then try the known default for MySQL.
-        LIB_MYSQL="-L/usr/local/lib/mysql"
-        LIBS="$temp $LIB_MYSQL"
-        dnl Un-Set any cached results, to force the second check to go.
-        unset ac_cv_lib_mysqlclient_mysql_real_connect
-        unset ac_cv_lib_mysqlclient_mysql_real_query
-        echo "Attempting to locate in $LIB_MYSQL..."
-        AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes",
-        [
-          dnl Try a common RPM location for the MySQL libraries.
-          LIB_MYSQL="-L/usr/lib/mysql"
-          LIBS="$temp $LIB_MYSQL"
-          dnl Un-Set any cached results, to force the second check to go.
-          unset ac_cv_lib_mysqlclient_mysql_real_connect
-          unset ac_cv_lib_mysqlclient_mysql_real_query
-          echo "Attempting to locate in $LIB_MYSQL..."
-          AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes", WITH_MYSQL="no")
-        ])
-      ])
-      if test "$WITH_MYSQL" = "yes"; then
-          AC_CHECK_LIB(mysqlclient, mysql_real_query, WITH_MYSQL="yes", WITH_MYSQL="no")
-      fi
-      LIBS="$temp"
-
-      if test "$WITH_MYSQL" = "no"; then
-        dnl The libs are required currently, enforce it.
-        AC_MSG_ERROR([Unable to locate -lmysqlclient. MySQL support is currently required.])
-        dnl The above error will be removed eventually, and we need to clear this var if it fails.
-        LIB_MYSQL=""
-      else
-        AC_DEFINE(HAVE_MYSQL)
-        dnl Cache trick for lib.
-        ac_cv_lib_mysqlclient_mysql_libdir="$LIB_MYSQL"
-        LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
-      fi
-    fi
-
-    dnl Subst must happen to remove variables.
-    AC_SUBST(INC_MYSQL)
-    AC_SUBST(LIB_MYSQL)
-  fi
+AC_DEFUN(AC_CHECK_LIBMYSQLCLIENT, [
+  AC_MSG_CHECKING(for MySQL Client support)
+
+  AC_ARG_ENABLE(
+    mysql,
+    [  --disable-mysql         disable MySQL support],
+    WITH_MYSQL="$enableval", WITH_MYSQL="yes")
+
+  AC_ARG_WITH(
+    mysql-inc,
+    [  --with-mysql-inc=PATH   include path for MySQL headers],
+    mysql_incdir="$withval", mysql_incdir="no")
+
+  AC_ARG_WITH(
+    mysql-lib,
+    [  --with-mysql-lib=PATH   library path for MySQL libraries],
+    mysql_libdir="$withval", mysql_libdir="no")
+
+  if test "$WITH_MYSQL" = "no"; then
+    AC_MSG_RESULT(no)
+    dnl MySQL is required currently, enforce it.
+    AC_MSG_ERROR([MySQL support is currently required. You tried to disable it.])
+  else
+    AC_MSG_RESULT(yes)
+
+    if test -n "$ac_cv_header_mysqlclient_mysql_incdir"; then
+      INC_MYSQL="$ac_cv_header_mysqlclient_mysql_incdir"
+    fi
+
+    if test -n "$ac_cv_lib_mysqlclient_mysql_libdir"; then
+      LIB_MYSQL="$ac_cv_lib_mysqlclient_mysql_libdir"
+    fi
+
+    dnl MySQL Header Check
+    temp="$CPPFLAGS"
+    if test "$mysql_incdir" != "no"; then
+      INC_MYSQL="-I$mysql_incdir"
+      CPPFLAGS="$temp $INC_MYSQL"
+      dnl Un-Set any cached results, since user is specifying a specific directory.
+      unset ac_cv_header_mysql_mysql_h
+    fi
+    AC_CHECK_HEADER(mysql/mysql.h, WITH_MYSQL="yes", WITH_MYSQL="no")
+    if test "$WITH_MYSQL" = "no"; then
+      dnl If our normal search or user suggested attempt failed, then try the known default for MySQL.
+      INC_MYSQL="-I/usr/local/include"
+      CPPFLAGS="$temp $INC_MYSQL"
+      dnl Un-Set any cached results, to force the second check to go.
+      unset ac_cv_header_mysql_mysql_h
+      AC_CHECK_HEADER(mysql/mysql.h, WITH_MYSQL="yes", WITH_MYSQL="no")
+    fi
+    CPPFLAGS="$temp"
+
+    if test "$WITH_MYSQL" = "no"; then
+      dnl The headers are required currently, enforce it.
+      AC_MSG_ERROR([Unable to locate <mysql/mysql.h>. MySQL support is currently required.])
+      dnl The above error will be removed eventually, and we need to clear this var if it fails.
+      INC_MYSQL=""
+    else
+      dnl Cache trick for header.
+      ac_cv_header_mysqlclient_mysql_incdir="$INC_MYSQL"
+      dnl MySQL Lib Check
+      temp="$LIBS"
+      if test "$mysql_libdir" != "no"; then
+        LIB_MYSQL="-L$mysql_libdir"
+        LIBS="$temp $LIB_MYSQL"
+        dnl Un-Set any cached results, since user is specifying a specific directory.
+        unset ac_cv_lib_mysqlclient_mysql_real_connect
+        unset ac_cv_lib_mysqlclient_mysql_real_query
+      fi
+      AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes",
+      [
+        dnl If our normal search or user suggested attempt failed, then try the known default for MySQL.
+        LIB_MYSQL="-L/usr/local/lib/mysql"
+        LIBS="$temp $LIB_MYSQL"
+        dnl Un-Set any cached results, to force the second check to go.
+        unset ac_cv_lib_mysqlclient_mysql_real_connect
+        unset ac_cv_lib_mysqlclient_mysql_real_query
+        echo "Attempting to locate in $LIB_MYSQL..."
+        AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes",
+        [
+          dnl Try a common RPM location for the MySQL libraries.
+          LIB_MYSQL="-L/usr/lib/mysql"
+          LIBS="$temp $LIB_MYSQL"
+          dnl Un-Set any cached results, to force the second check to go.
+          unset ac_cv_lib_mysqlclient_mysql_real_connect
+          unset ac_cv_lib_mysqlclient_mysql_real_query
+          echo "Attempting to locate in $LIB_MYSQL..."
+          AC_CHECK_LIB(mysqlclient, mysql_real_connect, WITH_MYSQL="yes", WITH_MYSQL="no")
+        ])
+      ])
+      if test "$WITH_MYSQL" = "yes"; then
+          AC_CHECK_LIB(mysqlclient, mysql_real_query, WITH_MYSQL="yes", WITH_MYSQL="no")
+      fi
+      LIBS="$temp"
+
+      if test "$WITH_MYSQL" = "no"; then
+        dnl The libs are required currently, enforce it.
+        AC_MSG_ERROR([Unable to locate -lmysqlclient. MySQL support is currently required.])
+        dnl The above error will be removed eventually, and we need to clear this var if it fails.
+        LIB_MYSQL=""
+      else
+        AC_DEFINE(HAVE_MYSQL)
+        dnl Cache trick for lib.
+        ac_cv_lib_mysqlclient_mysql_libdir="$LIB_MYSQL"
+        LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
+      fi
+    fi
+
+    dnl Subst must happen to remove variables.
+    AC_SUBST(INC_MYSQL)
+    AC_SUBST(LIB_MYSQL)
+  fi
 ])
 
 
@@ -124,22 +124,22 @@
 
 AC_ARG_WITH(mysql-user, AC_HELP_STRING([--with-mysql-user], [Mysql User]), MYSQL_USER="${withval}", MYSQL_USER="root")
 AC_SUBST(MYSQL_USER)
-
-
-dnl check for mysql password 
+
+
+dnl check for mysql password 
 
 AC_ARG_WITH(mysql-password,AC_HELP_STRING([--with-mysql-password], [Mysql password]), MYSQL_PASS="$withval", MYSQL_PASS="xxx")
 AC_SUBST(MYSQL_PASS)
-
+
 dnl check for mysql host
 AC_ARG_WITH(mysql-host, AC_HELP_STRING([--with-mysql-host], [Mysql host]), MYSQL_HOST="${withval}",MYSQL_HOST="localhost")
 AC_SUBST(MYSQL_HOST)
-
-dnl check for mysql db
+
+dnl check for mysql db
 
 AC_ARG_WITH(mysql-db,AC_HELP_STRING([--with-mysql-db], [Mysql db]), MYSQL_DB="$withval", MYSQL_DB="bartlby")
 AC_SUBST(MYSQL_DB)
-
+
 dnl check for plugin dir
 
 AC_ARG_WITH(plugin-dir,AC_HELP_STRING([--with-plugin-dir], [Where are the plugins located]), PLUGIN_DIR="${withval}", PLUGIN_DIR="${prefix}/bartlby-plugins/")
@@ -147,177 +147,177 @@
 
 AC_CHECK_LIB(socket, socket)
 
-AC_CHECK_LIBMYSQLCLIENT
-
-
-AC_MSG_CHECKING(for nrep enabled)
-AC_ARG_ENABLE(
-    nrpe,
-    [  --enable-nrpe	enable NRPE support],
-    WITH_NRPE="$enableval", WITH_NRPE="no")
-
-if test "$WITH_NRPE" = "yes"; then
-	NRPE_ADDON="-DWITH_NRPE"
-	AC_SUBST(NRPE_ADDON)
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)	
-fi;
-
-AC_MSG_CHECKING(for libsnmp support)
-
-AC_ARG_ENABLE(
-    snmp,
-    [  --enable-snmp	enable SNMP support],
-    WITH_SNMP="$enableval", WITH_SNMP="no")
-
-if test "$WITH_SNMP" = "yes"; then
-	AC_MSG_RESULT(yes)
-	AC_ARG_WITH(snmp-include-dir,
-		AC_HELP_STRING(
-			[--with-snmp-include-dir],
-			[SNMP include base directory [[/usr/(local/)include]]]),
-		[snmp_include_dir=$withval])
-	AC_ARG_WITH(snmp-lib-dir,
-		AC_HELP_STRING(
-			[--with-snmp-lib-dir],
-			[SNMP library directory [[/usr/(local/)lib]]]),
-		[snmp_lib_dir=$withval])
-		
-		
-	# Determine UCD or Net-SNMP include path
-	if test "x$snmp_include_dir" != "x"; then
-	  for i in / /ucd-snmp /include/ucd-snmp; do
-	    test -f $snmp_include_dir/$i/snmp.h && SNMP_INCDIR=$snmp_include_dir/$i
-	  done
-	  for i in / /net-snmp /include/net-snmp; do
-	    test -f $snmp_include_dir/$i/net-snmp-config.h && SNMP_INCDIR=$snmp_include_dir/$i
-	  done
-	else
-	  for i in /usr/local/include /usr/include; do
-	    test -f $i/snmp.h && SNMP_INCDIR=$i
-	    test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp
-	    test -f $i/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/net-snmp
-	    test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
-	    test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
-	    test -f $i/snmp/include/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/snmp/include/net-snmp
-	  done
-	fi
-	
-	# Determine UCD or Net-SNMP library path
-	if test "x$snmp_lib_dir" != "x"; then
-	  test -f $snmp_lib_dir/libsnmp.a -o -f $snmp_lib_dir/libsnmp.so && SNMP_LIBDIR=$snmp_lib_dir
-	  test -f $snmp_lib_dir/libnetsnmp.a -o -f $snmp_lib_dir/libnetsnmp.so && SNMP_LIBDIR=$snmp_lib_dir
-	else
-	  for i in /usr/local/lib /usr/lib /usr/sfw/lib; do
-	    test -f $i/libsnmp.a -o -f $i/libsnmp.so && SNMP_LIBDIR=$i
-	    test -f $i/libnetsnmp.a -o -f $i/libnetsnmp.so && SNMP_LIBDIR=$i
-	  done
-	fi
-	
-	if test -z "$SNMP_INCDIR"; then
-	  if test "x$snmp_include_dir" != "x";then
-	    AC_MSG_ERROR(Cannot find SNMP headers under $snmp_include_dir)
-	  else
-	    AC_MSG_ERROR(Cannot find SNMP headers.  Use --with-snmp-include-dir= to specify non-default path.)
-	  fi
-	fi
-	
-	if test -z "$SNMP_LIBDIR"; then
-	  if test "x$snmp_lib_dir" != "x";then
-	    AC_MSG_ERROR(Cannot find SNMP libraries under $snmp_lib_dir)
-	  else
-	    AC_MSG_ERROR(Cannot find SNMP libraries.  Use --with-snmp-lib-dir= to specify non-default path.)
-	  fi
-	fi
-	LDFLAGS="$LDFLAGS -L$SNMP_LIBDIR"
-	CPPFLAGS="$CPPFLAGS -I$SNMP_INCDIR"
-	
-	AC_CHECK_LIB(snmp, snmp_timeout,,
-		AC_MSG_ERROR(Cannot find UCD-SNMP libraries))
-	
-	SNMP_ADDON="-DSNMP_ADDON"
-	SNMP_FLAG="-lsnmp"
-	SNMP_LIBDIR="-L$SNMP_LIBDIR"
-	SNMP_INCDIR="-I$SNMP_INCDIR"
-	AC_SUBST(SNMP_LIBDIR)
-	AC_SUBST(SNMP_INCDIR)
-	AC_SUBST(SNMP_ADDON)
-	AC_SUBST(SNMP_FLAG)
-	
-else
-	AC_MSG_RESULT(no)
+AC_CHECK_LIBMYSQLCLIENT
+
+
+AC_MSG_CHECKING(for nrep enabled)
+AC_ARG_ENABLE(
+    nrpe,
+    [  --enable-nrpe	enable NRPE support],
+    WITH_NRPE="$enableval", WITH_NRPE="no")
+
+if test "$WITH_NRPE" = "yes"; then
+	NRPE_ADDON="-DWITH_NRPE"
+	AC_SUBST(NRPE_ADDON)
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)	
+fi;
+
+AC_MSG_CHECKING(for libsnmp support)
+
+AC_ARG_ENABLE(
+    snmp,
+    [  --enable-snmp	enable SNMP support],
+    WITH_SNMP="$enableval", WITH_SNMP="no")
+
+if test "$WITH_SNMP" = "yes"; then
+	AC_MSG_RESULT(yes)
+	AC_ARG_WITH(snmp-include-dir,
+		AC_HELP_STRING(
+			[--with-snmp-include-dir],
+			[SNMP include base directory [[/usr/(local/)include]]]),
+		[snmp_include_dir=$withval])
+	AC_ARG_WITH(snmp-lib-dir,
+		AC_HELP_STRING(
+			[--with-snmp-lib-dir],
+			[SNMP library directory [[/usr/(local/)lib]]]),
+		[snmp_lib_dir=$withval])
+		
+		
+	# Determine UCD or Net-SNMP include path
+	if test "x$snmp_include_dir" != "x"; then
+	  for i in / /ucd-snmp /include/ucd-snmp; do
+	    test -f $snmp_include_dir/$i/snmp.h && SNMP_INCDIR=$snmp_include_dir/$i
+	  done
+	  for i in / /net-snmp /include/net-snmp; do
+	    test -f $snmp_include_dir/$i/net-snmp-config.h && SNMP_INCDIR=$snmp_include_dir/$i
+	  done
+	else
+	  for i in /usr/local/include /usr/include; do
+	    test -f $i/snmp.h && SNMP_INCDIR=$i
+	    test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp
+	    test -f $i/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/net-snmp
+	    test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
+	    test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
+	    test -f $i/snmp/include/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/snmp/include/net-snmp
+	  done
+	fi
+	
+	# Determine UCD or Net-SNMP library path
+	if test "x$snmp_lib_dir" != "x"; then
+	  test -f $snmp_lib_dir/libsnmp.a -o -f $snmp_lib_dir/libsnmp.so && SNMP_LIBDIR=$snmp_lib_dir
+	  test -f $snmp_lib_dir/libnetsnmp.a -o -f $snmp_lib_dir/libnetsnmp.so && SNMP_LIBDIR=$snmp_lib_dir
+	else
+	  for i in /usr/local/lib /usr/lib /usr/sfw/lib; do
+	    test -f $i/libsnmp.a -o -f $i/libsnmp.so && SNMP_LIBDIR=$i
+	    test -f $i/libnetsnmp.a -o -f $i/libnetsnmp.so && SNMP_LIBDIR=$i
+	  done
+	fi
+	
+	if test -z "$SNMP_INCDIR"; then
+	  if test "x$snmp_include_dir" != "x";then
+	    AC_MSG_ERROR(Cannot find SNMP headers under $snmp_include_dir)
+	  else
+	    AC_MSG_ERROR(Cannot find SNMP headers.  Use --with-snmp-include-dir= to specify non-default path.)
+	  fi
+	fi
+	
+	if test -z "$SNMP_LIBDIR"; then
+	  if test "x$snmp_lib_dir" != "x";then
+	    AC_MSG_ERROR(Cannot find SNMP libraries under $snmp_lib_dir)
+	  else
+	    AC_MSG_ERROR(Cannot find SNMP libraries.  Use --with-snmp-lib-dir= to specify non-default path.)
+	  fi
+	fi
+	LDFLAGS="$LDFLAGS -L$SNMP_LIBDIR"
+	CPPFLAGS="$CPPFLAGS -I$SNMP_INCDIR"
+	
+	AC_CHECK_LIB(snmp, snmp_timeout,,
+		AC_MSG_ERROR(Cannot find UCD-SNMP libraries))
+	
+	SNMP_ADDON="-DSNMP_ADDON"
+	SNMP_FLAG="-lsnmp"
+	SNMP_LIBDIR="-L$SNMP_LIBDIR"
+	SNMP_INCDIR="-I$SNMP_INCDIR"
+	AC_SUBST(SNMP_LIBDIR)
+	AC_SUBST(SNMP_INCDIR)
+	AC_SUBST(SNMP_ADDON)
+	AC_SUBST(SNMP_FLAG)
+	
+else
+	AC_MSG_RESULT(no)
 fi;	
-
-dnl Check for ssl library.
-  enable_ssl=yes
-  
-  AC_ARG_ENABLE(ssl,
-  [  --enable-ssl=PREFIX       Enable SSL in varios parts of CORE)],
-  [
-  	case "$withval" in
-  		n|no)
-  			;;
-  		y|ye|yes)
-  			enable_ssl=yes
-  			;;
-  		*)
-  			SSL_DIR="$withval"
-  			LIBS="$LIBS -L$SSL_DIR/lib"
-  			enable_ssl=yes
-  			;;
-  	esac
-  ])
-  AC_MSG_CHECKING(for OpenSSL support)
-  if test "$enable_ssl" == "yes" ; then
-  	AC_MSG_RESULT(yes)
-  	AC_CHECK_LIB(ssl, SSL_library_init,ssl_lib_found=yes,ssl_lib_found=no)
-  	AC_CHECK_HEADER(openssl/ssl.h,ssl_lib_found=yes,ssl_lib_found=no)
-  	
-  	if test "$ssl_lib_found" == "yes"; then
-  	
-  		OPENSSL_ADDON="-DHAVE_SSL"
-		OPENSSL_FLAG="-lssl -lcrypto"
-		OPENSSL_LIBDIR="-L$SSL_DIR/include"
-		OPENSSL_INCDIR=""
-		AC_SUBST(OPENSSL_LIBDIR)
-		AC_SUBST(OPENSSL_INCDIR)
-		AC_SUBST(OPENSSL_ADDON)
-		AC_SUBST(OPENSSL_FLAG)
-		openssl dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/bartlby_v2_dh.h
-	fi;
-  		
-  else
-  	AC_MSG_ERROR([Unable to locate -lssl -lcrypto. OpenSSL support is currently required.])
-  	
-  fi
-
-
+
+dnl Check for ssl library.
+  enable_ssl=yes
+  
+  AC_ARG_ENABLE(ssl,
+  [  --enable-ssl=PREFIX       Enable SSL in varios parts of CORE)],
+  [
+  	case "$withval" in
+  		n|no)
+  			;;
+  		y|ye|yes)
+  			enable_ssl=yes
+  			;;
+  		*)
+  			SSL_DIR="$withval"
+  			LIBS="$LIBS -L$SSL_DIR/lib"
+  			enable_ssl=yes
+  			;;
+  	esac
+  ])
+  AC_MSG_CHECKING(for OpenSSL support)
+  if test "$enable_ssl" == "yes" ; then
+  	AC_MSG_RESULT(yes)
+  	AC_CHECK_LIB(ssl, SSL_library_init,ssl_lib_found=yes,ssl_lib_found=no)
+  	AC_CHECK_HEADER(openssl/ssl.h,ssl_lib_found=yes,ssl_lib_found=no)
+  	
+  	if test "$ssl_lib_found" == "yes"; then
+  	
+  		OPENSSL_ADDON="-DHAVE_SSL"
+		OPENSSL_FLAG="-lssl -lcrypto"
+		OPENSSL_LIBDIR="-L$SSL_DIR/include"
+		OPENSSL_INCDIR=""
+		AC_SUBST(OPENSSL_LIBDIR)
+		AC_SUBST(OPENSSL_INCDIR)
+		AC_SUBST(OPENSSL_ADDON)
+		AC_SUBST(OPENSSL_FLAG)
+		openssl dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/bartlby_v2_dh.h
+	fi;
+  		
+  else
+  	AC_MSG_ERROR([Unable to locate -lssl -lcrypto. OpenSSL support is currently required.])
+  	
+  fi
+
+
 
 AC_CHECK_LIB([dl], [dlopen],[LD_DL="-ldl"],[AC_MSG_ERROR([libdl needed to be found])])
 AC_SUBST(LD_DL)
-
-
-dnl User stuff
-
+
+
+dnl User stuff
+
 AC_ARG_WITH(user, AC_HELP_STRING([--with-user], [Bartlby User]), BARTLBY_USER="${withval}",BARTLBY_USER="bartlby")
-AC_SUBST(BARTLBY_USER)
-INSTALL_OPTIONS="-o $BARTLBY_USER";
+AC_SUBST(BARTLBY_USER)
+INSTALL_OPTIONS="-o $BARTLBY_USER";
 AC_SUBST(BARTLBY_USER)
 
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_MAKE_SET
-
-AC_PATH_PROG(INSTALL_PATH, install)
-AC_PATH_PROG(OPEN_SSL_PATH, openssl)
-if test "x${INSTALL_PATH}" = "x" ; then
- AC_MSG_ERROR(["install" is not found please fix it])
-fi
-
-AC_SUBST(INSTALL_PATH)
-AC_SUBST(INSTALL_OPTIONS)
+AC_PROG_MAKE_SET
+
+AC_PATH_PROG(INSTALL_PATH, install)
+AC_PATH_PROG(OPEN_SSL_PATH, openssl)
+if test "x${INSTALL_PATH}" = "x" ; then
+ AC_MSG_ERROR(["install" is not found please fix it])
+fi
+
+AC_SUBST(INSTALL_PATH)
+AC_SUBST(INSTALL_OPTIONS)
 
 
 # Checks for libraries.
@@ -360,5 +360,5 @@
 echo "User: $MYSQL_USER";
 echo "Password: $MYSQL_PASS";
 echo "Host: $MYSQL_HOST";
-echo "database: $MYSQL_DB";
+echo "database: $MYSQL_DB";
 echo "install: $INSTALL_PATH a $install_path";
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/include/bartlby.h ./bartlby-core/include/bartlby.h
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/include/bartlby.h	2008-04-06 22:57:54.000000000 +0200
+++ ./bartlby-core/include/bartlby.h	2008-04-18 00:17:51.000000000 +0200
@@ -1,8 +1,8 @@
 
 #define PROGNAME "bartlby"
 #define REL_NAME "autobot"
-#define VERSION  "1.3.1"
-#define EXPECTCORE 1103381 //Module V Check's
+#define VERSION  "1.3.2"
+#define EXPECTCORE 1103391 //Module V Check's
 
 #define MAX_CCACHE 1024
 #define MAX_CCACHE_KEY 1024
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/Makefile ./bartlby-core/Makefile
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/Makefile	2008-04-16 23:00:55.000000000 +0200
+++ ./bartlby-core/Makefile	2008-04-18 00:16:54.000000000 +0200
@@ -49,6 +49,16 @@
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && make clean); \
 	done
+
+
+distclean:
+	@list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && make clean); \
+	done
+	$(RMVFR) bartlby.cfg
+	$(RMVFR) Makefile.conf
+	$(RMVFR) include/bartlby_v2_dh.h
+
 changelog:
 	../make_changelog
 	
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/src/check_active.c ./bartlby-core/src/check_active.c
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-core/src/check_active.c	2008-04-07 21:20:34.000000000 +0200
+++ ./bartlby-core/src/check_active.c	2008-06-16 19:29:08.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: check_active.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* $Id: check_active.c 57 2008-06-16 17:29:08Z hjanuschka $ */
 /* ----------------------------------------------------------------------- *
  *
  *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
@@ -14,9 +14,9 @@
  *   visit: www.bartlby.org for support
  * ----------------------------------------------------------------------- */
 /*
-$Revision: 16 $
+$Revision: 57 $
 $HeadURL: https://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/check_active.c $
-$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Date: 2008-06-16 19:29:08 +0200 (Mo, 16 Jun 2008) $
 $Author: hjanuschka $ 
 */
 #include <stdio.h>
@@ -224,7 +224,7 @@
    		
    		curr_line[cur_char_idx]=rmessage[char_idx];
    		
-   		if(rmessage[char_idx] == '\n' || char_idx == strlen(rmessage)) {
+   		if(rmessage[char_idx] == '\n' || char_idx == strlen(rmessage) || char_idx == 1023) { //END of rmessage buffer :)
    			curr_line[cur_char_idx]='\0';
    			
    			if(strlen(curr_line) > 0) {
@@ -267,7 +267,7 @@
 	return_token = strtok(line, "|");
         if(return_token != NULL) {
         	//Verfiy result code to be 0-2 :-) 
-        	if(return_token[0] != '0' && return_token[0] != '1' && return_token[0] != '2') {
+        	if(return_token[0] != '0' && return_token[0] != '1' && return_token[0] != '2' && return_token[0] != '4') {
         		svc->current_state=STATE_UNKOWN;	
         	} else {
         		svc->current_state=atoi(return_token);
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_check_apt ./bartlby-plugins/bartlby_check_apt
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_check_apt	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-plugins/bartlby_check_apt	2008-05-30 13:02:18.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+#
+## apt-check
+##
+
+APTOUTPUT=`apt-get update 2>&1`
+EXITCODE=$?
+if [ "$EXITCODE" -ne "0" ]
+then
+	echo "problem with apt-get update"
+	exit 2;
+fi
+
+#
+# simulate "-s" an upgrade
+#
+
+APTOUTPUT=`apt-get -s -u upgrade 2>&1|grep "upgraded,"|awk '{print $1}'`
+if [ "$APTOUTPUT" -ne "0" ]
+then
+	echo "$APTOUTPUT requiring upgrade";
+	exit 4; #INFO only
+fi
+
+
+echo "no upgrades required";
+exit 0;
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby.funcs ./bartlby-plugins/bartlby.funcs
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby.funcs	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-plugins/bartlby.funcs	2008-10-10 00:06:18.000000000 +0200
@@ -28,6 +28,7 @@
 export STATE_OK=0
 export STATE_WARNING=1
 export STATE_CRITICAL=2
+export OS=$(uname)
 
 
 function has_executable {
@@ -122,4 +123,4 @@
 function set_my_name {
 	export MY_NAME=$1;
 	
-}
\ No newline at end of file
+}
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_load ./bartlby-plugins/bartlby_load
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_load	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-plugins/bartlby_load	2008-10-10 00:25:37.000000000 +0200
@@ -90,9 +90,24 @@
 
 if [ "$SNMP" = "false" ];
 then
-	load1l=$(cat /proc/loadavg|awk '{print $1}');
-	load2l=$(cat /proc/loadavg|awk '{print $2}');
-	load3l=$(cat /proc/loadavg|awk '{print $3}');
+	case $OS in
+		Linux)	
+			load1l=$(cat /proc/loadavg|awk '{print $1}');
+			load2l=$(cat /proc/loadavg|awk '{print $2}');
+			load3l=$(cat /proc/loadavg|awk '{print $3}');
+		;;
+		Darwin)
+
+			load1l=$(uptime 2>&1|grep averages|awk '{ print $8}'|sed 's/,/./');	
+			load2l=$(uptime 2>&1|grep averages|awk '{ print $9}'|sed 's/,/./');	
+			load3l=$(uptime 2>&1|grep averages|awk '{ print $10}'|sed 's/,/./');	
+		;;
+		*)
+			end_critical "OS unsupported $OS";
+		;;
+	esac
+
+
 else
 	has_executable "snmpget"
 	#UCD-SNMP-MIB::laLoad.1
@@ -122,4 +137,4 @@
                 
                 end_ok "load: $C_LEVEL , $txt";
         fi;
-done;
\ No newline at end of file
+done;
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_process.sh ./bartlby-plugins/bartlby_process.sh
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_process.sh	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-plugins/bartlby_process.sh	2008-10-01 11:27:35.000000000 +0200
@@ -56,6 +56,8 @@
 plg_get_arg "H" "SNMP_HOST";
 plg_get_arg "v" "SNMP_VER";
 
+plg_get_arg "I" "PROC_INV";
+
 
 if [ "$W_LEVEL" = "false" ];
 then
@@ -81,6 +83,7 @@
 	echo "-p Process to find (looks at whole command line)";
 	echo "-w Warn if count of found processes is lower than -w (Default: 1)";
 	echo "-w Critical if count of found processes is lower than -w (Default: 1)";
+	echo "-I Invert result, alert if there are more than X procs found";
 	echo "-S use SNMP mode"; 
 	echo "  -C Community (default: public)";
 	echo "  -H Host (default: localhost)";
@@ -114,12 +117,19 @@
 	
 	cnt=`qpst  -r $P_TO_FIND -i -p $$ -P $$  -c`; #exit code isnt safe as of 255 limitation ;-)
 	echo -n " [ found $cnt processes for $P_TO_FIND $1/$2 ]\\dbr";
+	DR="-lt";
+
+	if [ "$3" = "true" ];
+	then
+		DR="-gt";
+	fi;
+	
 	
-	if [ $cnt -lt $2 ]; 
+	if [ $cnt $DR $2 ]; 
 	then
 		exit $STATE_CRITICAL;
 	fi;
-	if [ $cnt -lt $1 ];
+	if [ $cnt $DR $1 ];
 	then
 		exit $STATE_WARNING;
 	fi;
@@ -139,7 +149,8 @@
 if [ "$SNMP" = "false" ];
 then
 
-	MY_OUT_STR=`check_proc $W_LEVEL $C_LEVEL`;
+	
+	MY_OUT_STR=`check_proc $W_LEVEL $C_LEVEL $PROC_INV`;
 	ECO=$?;
 else
 	has_executable "snmpget"
@@ -191,4 +202,4 @@
 #parse args
 #get part list
 #df each part
-#produce warning/crit/ok
\ No newline at end of file
+#produce warning/crit/ok
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_swap.sh ./bartlby-plugins/bartlby_swap.sh
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/bartlby_swap.sh	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-plugins/bartlby_swap.sh	2008-10-08 00:35:04.000000000 +0200
@@ -1,18 +1,15 @@
 #!/bin/sh
 #########################################
 # Bartlby Check Disk
-# $Id: bartlby_swap.sh,v 1.6 2006/12/25 02:08:30 hjanuschka Exp $ */
+# $Id: bartlby_swap.sh,v 1.5 2006/09/09 19:38:42 hjanuschka Exp $ */
 #
 #
-# $Revision: 1.6 $
+# $Revision: 1.5 $
 # $Source: /cvsroot/bartlby/bartlby-plugins/bartlby_swap.sh,v $
 #
 #
 #
 # $Log: bartlby_swap.sh,v $
-# Revision 1.6  2006/12/25 02:08:30  hjanuschka
-# auto commit
-#
 # Revision 1.5  2006/09/09 19:38:42  hjanuschka
 # auto commit
 #
@@ -33,8 +30,6 @@
 #
 #########################################
 
-#sleep 120
-
 VERSION="0.1";
 MY_PATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
 if [ -f $MY_PATH/bartlby.funcs ]; then
@@ -171,11 +166,20 @@
 	
 }
 function check_swap {
+
+	
  	if [ ! -f /proc/swaps ];
  	then
  		echo -n " Swap maybe not enabled on your system";
  		exit $STATE_WARNING; 	
  	fi;
+	#seems to be swap file is existing even if no swap is attached
+	swapcount=$(cat /proc/swaps|wc -l);
+	if [ $swapcount = 1 ];
+	then
+		echo -n " Swap maybe not enabled on your system";
+		exit $STATE_WARNING;
+	fi;
  		
  	hundred=`cat /proc/swaps |grep -v "Filename"|awk '{ ges += \$3; us += \$4; } END {print ges}' 2>&1`
  	used=`cat /proc/swaps |grep -v "Filename"|awk '{ ges += \$3; us += \$4; } END {print us}' 2>&1`
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/Makefile ./bartlby-plugins/Makefile
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-plugins/Makefile	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-plugins/Makefile	2008-05-26 13:24:46.000000000 +0200
@@ -44,6 +44,7 @@
 	$(CPPVA) -m 777 bartlby_snmp.sh $(BARTLBY_HOME)/;
 	$(CPPVA) -m 777 bartlby_swap.sh $(BARTLBY_HOME)/;
 	$(CPPVA) -m 777 bartlby_files_in_dir $(BARTLBY_HOME)/;
+	$(CPPVA) -m 777 bartlby_check_apt $(BARTLBY_HOME)/;
 	
 
 clean:
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/1.php ./bartlby-ui/1.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/1.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/1.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-<?
-shmop_open();
-?>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bartlby_action.php ./bartlby-ui/bartlby_action.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bartlby_action.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/bartlby_action.php	2008-05-24 12:44:33.000000000 +0200
@@ -7,9 +7,10 @@
 if($_POST[action]) {
 	$act=$_POST[action];	
 }
+$btl=new BartlbyUi($Bartlby_CONF);
 $layout= new Layout();
 $layout->setTitle("Bartlby Action ($act)");
-$btl=new BartlbyUi($Bartlby_CONF);
+
 
 $layout->Table("100%");
 
@@ -551,10 +552,18 @@
 			if($df == false) {
 				$exec_plan="";	
 			}
-			$ads=bartlby_add_service($btl->CFG, $_GET[service_server], $_GET[service_plugin],$_GET[service_name],$_GET[service_args],$_GET[notify_enabled], $exec_plan,$_GET[service_interval],$_GET[service_type],$_GET[service_var], $_GET[service_passive_timeout], $_GET[service_check_timeout], $_GET[service_ack], $_GET[service_retain], $_GET[service_snmp_community], $_GET[service_snmp_objid], $_GET[service_snmp_version], $_GET[service_snmp_warning], $_GET[service_snmp_critical], $_GET[service_snmp_type],$_GET[service_active], $_GET[flap_seconds],$_GET[renotify_interval], $_GET[escalate_divisor]);
-			$global_msg=bartlby_get_server_by_id($btl->CFG, $_GET[service_server]);
-			$global_msg[exec_plan]=$btl->resolveServicePlan($exec_plan);
 			
+			for($x = 0; $x<count($_GET[service_server]); $x++) {
+				$server_id=$_GET[service_server][$x];
+				$ads=bartlby_add_service($btl->CFG, $server_id, $_GET[service_plugin],$_GET[service_name],$_GET[service_args],$_GET[notify_enabled], $exec_plan,$_GET[service_interval],$_GET[service_type],$_GET[service_var], $_GET[service_passive_timeout], $_GET[service_check_timeout], $_GET[service_ack], $_GET[service_retain], $_GET[service_snmp_community], $_GET[service_snmp_objid], $_GET[service_snmp_version], $_GET[service_snmp_warning], $_GET[service_snmp_critical], $_GET[service_snmp_type],$_GET[service_active], $_GET[flap_seconds],$_GET[renotify_interval], $_GET[escalate_divisor]);
+				$tmp=bartlby_get_server_by_id($btl->CFG, $server_id);
+
+				$global_msg[server_name] .= $tmp[server_name] . ",";
+			
+
+			}	
+			
+			$global_msg[exec_plan]=$btl->resolveServicePlan($exec_plan);
 			$act="service_" . $_GET[service_type];
 			if($_GET[service_type] == 3) {
 				$global_msg[group_out] = $btl->resolveGroupString($_GET[service_var]);				
@@ -677,11 +686,11 @@
 );
 
 $content = "<table>" . $ov . "</table>";
-$layout->push_outside($layout->create_box($layout->BoxTitle, $content));
+$layout->create_box($layout->BoxTitle, $content, "Message");
 
 $btl->getExtensionsReturn("_POST_" . $act, $layout);
 $layout->BoxTitle="";
 
 
 $layout->TableEnd();
-$layout->display();
+$layout->display("bartlby_action");
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bartlby-ui.class.php ./bartlby-ui/bartlby-ui.class.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bartlby-ui.class.php	2008-04-06 22:57:23.000000000 +0200
+++ ./bartlby-ui/bartlby-ui.class.php	2008-09-07 14:49:37.000000000 +0200
@@ -1,11 +1,34 @@
 <?
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+
 include_once("bartlbystorage.class.php");
 
 session_start();
 
 set_time_limit(0);
 set_magic_quotes_runtime(0);
-define("BARTLBY_UI_VERSION", "1.42");
+define("BARTLBY_UI_VERSION", "2.1");
+define("BARTLBY_RELNOT", "");
 $wdays[0]="Sunday";
 $wdays[1]="Monday";
 $wdays[2]="Tuesday";
@@ -629,6 +652,12 @@
 		}	
 	
 		
+
+		if(bartlby_config("ui-extra.conf", "theme") != "") {
+			$this->theme=bartlby_config("ui-extra.conf", "theme");
+		} else {
+			$this->theme="classic";
+		}
 		
 		
 		$this->BASE_URL=substr($_SERVER[SCRIPT_URI], 0, strrpos($_SERVER[SCRIPT_URI], "/")+1);				
@@ -1104,9 +1133,9 @@
 	function is_gone($state) {
 		switch($state) {
 			case 1:
-				return "<img src='images/emblem-generic.png' alt='Object changed you should reload' border=0>";
+				return "<img src='themes/" . $this->theme . "/images/emblem-generic.png' alt='Object changed you should reload' border=0>";
 			case 2:
-				return "<img src='images/emblem-important.png' alt='Object deleted you should reload' border=0>";
+				return "<img src='themes/" . $this->theme . "/images/emblem-important.png' alt='Object deleted you should reload' border=0>";
 			default:
 				return "";
 		}
@@ -1184,6 +1213,11 @@
          	);
     		return $i;
 	}
+	function setTheme($name="classic") {
+		if($name=="") $name="classic";
+		$this->theme=$name;	
+	}
+	
 	function getExtensionsReturn($method, $layout, $ign=false) {
 		$r=array();
 		$dhl = opendir("extensions");
@@ -1206,9 +1240,9 @@
 							array_push($r, $ex);
 							
 							if(!file_exists("extensions/" . $file . ".disabled")) {
-								$endis="<tr><td colspan=2 align=right><a href=\"javascript:void(0);\" onClick=\"xajax_toggle_extension('$file')\" title='$file extension is enabled click to change'><img id='extension_$file' border=0 src='images/extension_enable.gif'></A></td></tr>";
+								$endis="<tr><td colspan=2 align=right><a href=\"javascript:void(0);\" onClick=\"xajax_toggle_extension('$file')\" title='$file extension is enabled click to change'><img id='extension_img_$file' border=0 src='themes/" . $this->theme . "/images/extension_enable.gif'></A></td></tr>";
 							} else {
-								$endis="<tr><td colspan=2 align=right><a href=\"javascript:void(0);\" onClick=\"xajax_toggle_extension('$file')\" title='$file extension is disabled click to change'><img id='extension_$file' border=0 src='images/extension_disable.gif'></A></td></tr>";	
+								$endis="<tr><td colspan=2 align=right><a href=\"javascript:void(0);\" onClick=\"xajax_toggle_extension('$file')\" title='$file extension is disabled click to change'><img id='extension_img_$file' border=0 src='themes/" . $this->theme . "/images/extension_disable.gif'></A></td></tr>";	
 							}
 							
 							
@@ -1225,7 +1259,7 @@
 							</table>";
 							
 							
-							@$layout->push_outside($layout->create_box($info_box_title, $core_content));
+							$layout->create_box($info_box_title, $core_content, "extension_" . $ex[ex_name]);
 						}
 								
 						
@@ -1818,19 +1852,19 @@
 			return $re;	
 	}
 	function getserveroptions($defaults, $layout) {
-		$modify = "<a href='modify_server.php?server_id=" . $defaults[server_id] . "'><img src='images/modify.gif' title='Modify this server' border=0></A>";
-		$copy = "<a href='modify_server.php?copy=true&server_id=" . $defaults[server_id] . "'><img src='images/edit-copy.gif' title='Copy (Create a similar) this Server' border=0></A>";
-		$logview= "<a href='logview.php?server_id=" . $defaults[server_id]. "' ><font size=1><img  title='View Events for this Server' src='images/icon_view.gif' border=0></A>";
+		$modify = "<a href='modify_server.php?server_id=" . $defaults[server_id] . "'><img src='themes/" . $this->theme . "/images/modify.gif' title='Modify this server' border=0></A>";
+		$copy = "<a href='modify_server.php?copy=true&server_id=" . $defaults[server_id] . "'><img src='themes/" . $this->theme . "/images/edit-copy.gif' title='Copy (Create a similar) this Server' border=0></A>";
+		$logview= "<a href='logview.php?server_id=" . $defaults[server_id]. "' ><font size=1><img  title='View Events for this Server' src='themes/" . $this->theme . "/images/icon_view.gif' border=0></A>";
 		
 		if($defaults[server_enabled] == 1) {
-			$check = "<a title='Disable Checks for this Server' href='javascript:void(0);' onClick=\"xajax_toggle_server_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='server_" . $defaults[server_id] . "' src='images/enabled.gif'  border=0></A>";
+			$check = "<a title='Disable Checks for this Server' href='javascript:void(0);' onClick=\"xajax_toggle_server_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='server_" . $defaults[server_id] . "' src='themes/" . $this->theme . "/images/enabled.gif'  border=0></A>";
 		} else {
-			$check = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='images/diabled.gif' id='server_" . $defaults[server_id] . "' title='Enable  Checks for this Service' border=0></A>";
+			$check = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='themes/" . $this->theme . "/images/diabled.gif' id='server_" . $defaults[server_id] . "' title='Enable  Checks for this Service' border=0></A>";
 		}
 		if($defaults[server_notify] == 1) {
-			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='images/trigger.gif' id='trigger_" . $defaults[server_id] . "' title='Disable Notifications for this Service' border=0></A>";
+			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='themes/" . $this->theme . "/images/trigger.gif' id='trigger_" . $defaults[server_id] . "' title='Disable Notifications for this Service' border=0></A>";
 		} else {
-			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='trigger_" . $defaults[server_id] . "' src='images/notrigger.gif' title='Enable Notifications for this Service' border=0></A>";
+			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_server_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='trigger_" . $defaults[server_id] . "' src='themes/" . $this->theme . "/images/notrigger.gif' title='Enable Notifications for this Service' border=0></A>";
 		}
 		$is_gone=$this->is_gone($defaults[server_gone]);
 		
@@ -1839,33 +1873,33 @@
 
 	function getserviceOptions($defaults, $layout) {
 		if($defaults[service_active] == 1) {
-			$check = "<a title='Disable Checks for this Service' href='javascript:void(0);' onClick=\"xajax_toggle_service_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='service_" . $defaults[service_id] . "' src='images/enabled.gif'  border=0></A>";
+			$check = "<a title='Disable Checks for this Service' href='javascript:void(0);' onClick=\"xajax_toggle_service_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='service_" . $defaults[service_id] . "' src='themes/" . $this->theme . "/images/enabled.gif'  border=0></A>";
 		} else {
-			$check = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='images/diabled.gif' id='service_" . $defaults[service_id] . "' title='Enable  Checks for this Service' border=0></A>";
+			$check = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='themes/" . $this->theme . "/images/diabled.gif' id='service_" . $defaults[service_id] . "' title='Enable  Checks for this Service' border=0></A>";
 		}
 		if($defaults[notify_enabled] == 1) {
-			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='images/trigger.gif' id='trigger_" . $defaults[service_id] . "' title='Disable Notifications for this Service' border=0></A>";
+			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img src='themes/" . $this->theme . "/images/trigger.gif' id='trigger_" . $defaults[service_id] . "' title='Disable Notifications for this Service' border=0></A>";
 		} else {
-			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='trigger_" . $defaults[service_id] . "' src='images/notrigger.gif' title='Enable Notifications for this Service' border=0></A>";
+			$notifys = "<a href='javascript:void(0);' onClick=\"xajax_toggle_service_notify_check('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img id='trigger_" . $defaults[service_id] . "' src='themes/" . $this->theme . "/images/notrigger.gif' title='Enable Notifications for this Service' border=0></A>";
 		}
 		if($defaults[is_downtime] == 1) {
-			$downtime="<img src='images/icon_work.gif' title='Service is in downtime (" . date("d.m.Y H:i:s", $defaults[downtime_from])  . "-" . date("d.m.Y H:i:s", $servs[$x][downtime_to]) . "): " . $defaults[downtime_notice] . "'>";	
+			$downtime="<img src='themes/" . $this->theme . "/images/icon_work.gif' title='Service is in downtime (" . date("d.m.Y H:i:s", $defaults[downtime_from])  . "-" . date("d.m.Y H:i:s", $servs[$x][downtime_to]) . "): " . $defaults[downtime_notice] . "'>";	
 		} else {
 			$downtime="&nbsp;";
 		}
 				
 		
-		$modify = "<a href='modify_service.php?service_id=" . $defaults[service_id] . "'><img src='images/modify.gif' title='Modify this Service' border=0></A>";
-		$force = "<a href='javascript:void(0);' onClick=\"xajax_forceCheck('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img title='Force an immediate Check' src='images/force.gif' border=0></A>";
-		$comments="<a href='view_comments.php?service_id=" . $defaults[service_id] . "'><img title='Comments for this Service' src='images/icon_comments.gif' border=0></A>";
-		$logview= "<a href='logview.php?service_id=" . $defaults[service_id]. "' ><font size=1><img  title='View Events for this Service' src='images/icon_view.gif' border=0></A>";				
-		$reports = "<a href='create_report.php?service_id=" . $defaults[service_id]. "' ><font size=1><img  title='Create Report' src='images/create_report.gif' border=0></A>";				
+		$modify = "<a href='modify_service.php?service_id=" . $defaults[service_id] . "'><img src='themes/" . $this->theme . "/images/modify.gif' title='Modify this Service' border=0></A>";
+		$force = "<a href='javascript:void(0);' onClick=\"xajax_forceCheck('" . $defaults[server_id] . "', '" . $defaults[service_id] . "')\"><img title='Force an immediate Check' src='themes/" . $this->theme . "/images/force.gif' border=0></A>";
+		$comments="<a href='view_comments.php?service_id=" . $defaults[service_id] . "'><img title='Comments for this Service' src='themes/" . $this->theme . "/images/icon_comments.gif' border=0></A>";
+		$logview= "<a href='logview.php?service_id=" . $defaults[service_id]. "' ><font size=1><img  title='View Events for this Service' src='themes/" . $this->theme . "/images/icon_view.gif' border=0></A>";				
+		$reports = "<a href='create_report.php?service_id=" . $defaults[service_id]. "' ><font size=1><img  title='Create Report' src='themes/" . $this->theme . "/images/create_report.gif' border=0></A>";				
 		if(file_exists($this->PERFDIR . "/" . $defaults[plugin])) {
-			$stat = "<a href='bartlby_action.php?service_id=" . $defaults[service_id] . "&server_id=" . $defaults[server_id] . "&action=perfhandler_graph'><img title='Graph collected perf handler data' src='images/icon_stat.gif' border=0></A>";				
+			$stat = "<a href='bartlby_action.php?service_id=" . $defaults[service_id] . "&server_id=" . $defaults[server_id] . "&action=perfhandler_graph'><img title='Graph collected perf handler data' src='themes/" . $this->theme . "/images/icon_stat.gif' border=0></A>";				
 		} else {
 			$stat = "";
 		}
-		$copy = "<a href='modify_service.php?copy=true&service_id=" . $defaults[service_id] . "'><img src='images/edit-copy.gif' title='Copy (Create a similar) this Service' border=0></A>";				
+		$copy = "<a href='modify_service.php?copy=true&service_id=" . $defaults[service_id] . "'><img src='themes/" . $this->theme . "/images/edit-copy.gif' title='Copy (Create a similar) this Service' border=0></A>";				
 
 		$is_gone=$this->is_gone($defaults[is_gone]);
 				
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bulk_actions.php ./bartlby-ui/bulk_actions.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/bulk_actions.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/bulk_actions.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,32 @@
+<?
+include "layout.class.php";
+include "config.php";
+include "bartlby-ui.class.php";
+$btl=new BartlbyUi($Bartlby_CONF);
+
+$layout= new Layout();
+$layout->set_menu("main");
+$layout->setTitle("");
+
+
+$servers=$btl->GetSVCMap();
+
+$servcs = array();
+while(list($k, $v) = @each($servers)) {
+	for($y=0; $y<count($v); $y++) {
+		array_push($servcs, $v[$y]);	
+	}
+}
+
+
+
+$title="Services";  
+$content = "asdf";
+
+$layout->create_box($title, $content, "core_info", array(
+	'services' => $servcs,
+), "bulk_services");
+
+
+
+$layout->display("bulk_actions");
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/cli.php ./bartlby-ui/cli.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/cli.php	2008-04-06 18:23:17.000000000 +0200
+++ ./bartlby-ui/cli.php	2008-05-30 13:54:16.000000000 +0200
@@ -44,6 +44,8 @@
 $reopen_server=false;
 $running_only=0;
 $ticker="|";
+$hide_warns=0;
+$hide_infos=0;
 
 $ncurses_session = ncurses_init();
 $main = ncurses_newwin(0, 0, 0, 0); // main window
@@ -99,7 +101,28 @@
 	if($k == 115 || $reopen_server == true) {
 		btl_disp_server();
 	}
-	
+	if($k == 119) {
+		if($hide_warns == 0)  {
+			$hide_warns = 1;
+		} else {
+			$hide_warns = 0;
+		}
+	}
+	if($k == 82) {
+		//reset view :-)
+		$hide_warns=0;
+		$hide_infos=0;
+		$alerts_only=1;
+
+	}
+	if($k == 105) {
+                if($hide_infos == 0)  {
+                        $hide_infos = 1;
+                } else {
+                        $hide_infos = 0;
+                }
+        }
+
 	if($k == 258) {
 		if($selected_pos > $lines/2) {
 			$start_from=$start_from+1;	
@@ -195,6 +218,16 @@
 						ncurses_color_set(4);
 					break;
 				}
+				if($hide_warns == 1) {
+					if($servs[$x][current_state] == 1) {
+                                                continue;
+                                        }
+				}
+				if($hide_infos == 1) {
+                                        if($servs[$x][current_state] == 4) {
+                                                continue;
+                                        }
+                                }
 
 				if($alerts_only == 1) {
 					if($servs[$x][current_state] == 0) {
@@ -796,6 +829,9 @@
 		array(1, "a" , "Only disable service wich arent OK"),
 		array(1, "d", "also show downtimed services"),
 		array(1, "r", "only show checks wich are currently running"),
+		array(1, "w", "hide services wich are in state:warning"),
+		array(1, "i", "hide services wich are in state:info"),
+		array(1, "R", "Reset filter's"),
 		array(0, "Service Detail:"),
 		array(1, "f", "Force Check"),
 		array(1, "c", "Check enable/disable"),
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/config.php ./bartlby-ui/config.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/config.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/config.php	2008-09-07 14:09:01.000000000 +0200
@@ -1,4 +1,26 @@
 <?
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+
 	$Bartlby_CONF="/opt/bartlby-dev/etc/bartlby.cfg";
 	if(file_exists("setup.php")) {
 		include("setup.php");
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/create_map.php ./bartlby-ui/create_map.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/create_map.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/create_map.php	2008-09-07 14:09:01.000000000 +0200
@@ -1,3 +1,13 @@
+<?
+	include "config.php";
+	include "layout.class.php";
+	include "bartlby-ui.class.php";
+	$btl=new BartlbyUi($Bartlby_CONF);
+	$info=$btl->getInfo();
+	$layout= new Layout();
+	$layout->setTemplate("nonav.html");
+?>
+<script type="text/javascript" src="js/dom-drag.js"></script>
 <script type="text/javascript">
 
 /***********************************************
@@ -13,7 +23,7 @@
 var offsetdivfrompointerY=14 //Customize y offset of tooltip DIV relative to pointer image. Tip: Set it to (height_of_pointer_image-1).
 
 document.write('<div id="dhtmltooltip"></div>') //write out tooltip DIV
-document.write('<img id="dhtmlpointer" src="images/arrow2.gif">') //write out pointer image
+document.write('<img id="dhtmlpointer" src="themes/<?=$layout->theme?>/images/arrow2.gif">') //write out pointer image
 
 var ie=document.all
 var ns6=document.getElementById && !document.all
@@ -27,8 +37,10 @@
 return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
 }
 
-function ddrivetip(thetext, thewidth, thecolor){
-if (ns6||ie){
+function ddrivetip(thetext, thewidth, thecolor){
+
+if (ns6||ie){
+
 if (typeof thewidth!="undefined") tipobj.style.width=thewidth+"px"
 if (typeof thecolor!="undefined" && thecolor!="") tipobj.style.backgroundColor=thecolor
 tipobj.innerHTML=thetext
@@ -245,13 +257,8 @@
 <input type="button" onClick='layer_pos();' value="Store">
 <input type="button" onClick='showAdd();' value="Add">
 <?
-	include "config.php";
-	include "layout.class.php";
-	include "bartlby-ui.class.php";
-	$btl=new BartlbyUi($Bartlby_CONF);
-	$info=$btl->getInfo();
-	$layout= new Layout();
-	$layout->setTemplate("nonav.html");
+
+	
 	$layout->Table("100%");
 	
 	$server_ico="<select name='icon'>";
@@ -319,7 +326,7 @@
 	}
 	
 	$layout->TableEnd();
-	$layout->display("no");
+	
 	
 	//Load Defaults ;-)
 	$fp=@fopen("create_map.dat","r");
@@ -328,7 +335,8 @@
 				$estr .= @fgets($fp, 1024);
 			}
 		}
-	@fclose($fp);
+	@fclose($fp);
+
 	@eval($estr);
 	echo "<script>\n";
 	echo "var layerTop = new Array();\n";
@@ -354,7 +362,9 @@
 	$srvmsg .= "</tr></table>";
 	$mover="ddrivetip('" . $srvmsg . "', 300);";
 	$mout="hideddrivetip();";
-	echo '<div onMouseOut="' . $mout . '" onMouseOver="' . $mover . '" id="bartlby" style="position: relative; left:0; top:0;width:100px;height:100px"><img src="images/btl-logo.gif"></div>';
+	echo '<div onMouseOut="' . $mout . '" onMouseOver="' . $mover . '" id="bartlby" style="position: relative; left:0; top:0;width:100px;height:100px"><img src="themes/' . $layout->theme . '/images/btl-logo.gif"></div>';
+
+	echo $layout->OUT;
 ?>
 
 
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/error.php ./bartlby-ui/error.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/error.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/error.php	2008-09-07 14:09:01.000000000 +0200
@@ -3,9 +3,10 @@
 	include "layout.class.php";
 	include "bartlby-ui.class.php";
 	
+	$btl = new BartlbyUi($Bartlby_CONF, false, false);
 	$layout= new Layout();
 	$layout->setTitle("Error");
-	$btl = new BartlbyUi($Bartlby_CONF, false, false);
+	
 	
 $layout->OUT .= "<script>
 		function doRetry() {
@@ -102,4 +103,4 @@
 	$layout->TableEnd();
 	$layout->display();
 	
-?>
\ No newline at end of file
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/AgentSyncer/sync.php ./bartlby-ui/extensions/AgentSyncer/sync.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/AgentSyncer/sync.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/extensions/AgentSyncer/sync.php	2008-09-07 15:04:09.000000000 +0200
@@ -71,6 +71,17 @@
 		echo " " . $xy . "\n";
 		flush();
 	}
+
+	$fn = $plugin_root . "/bartlby.funcs";
+        echo "PLUGIN extensions_wrap.php?script=AgentSyncer/getplugin.php&plugin=$k $k";
+        if(file_exists($fn)) {
+	       $xy=@md5_file($fn);
+        } else {
+                 $xy="-";
+        }
+        echo " " . $xy . "\n";
+        flush();
+
 	
 	$fn="extensions/AgentSyncer/bartlby_agent." . $_GET[arch];
 	echo "AB extensions_wrap.php?script=AgentSyncer/getab.php?bin=$fn $fn";
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/action.php ./bartlby-ui/extensions/ArS/action.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/action.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/extensions/ArS/action.php	2008-10-14 13:29:28.000000000 +0200
@@ -0,0 +1,212 @@
+<?
+
+	
+	include "config.php";
+	include "layout.class.php";
+	include "bartlby-ui.class.php";
+	include "Mail.php";
+	include "Mail/mime.php";
+	include "extensions/ArS/ArS.class.php";
+	
+	
+	
+	$btl=new BartlbyUi($Bartlby_CONF);
+	$btl->hasRight("super_user");
+	$sg = new ArS();
+	$servers=$btl->GetSVCMap();
+	
+	
+	$layout= new Layout();
+	$layout->setTitle("ArS: action");
+	
+	$layout->set_menu("ArS");
+	$layout->Form("fm1", "extensions_wrap.php");
+	$layout->Table("100%");
+	
+	if($_GET[action] == "add") {
+		$action="Adding report";	
+		
+		$da = $sg->storage->load_key("reports");
+		$reports=unserialize($da);
+		if(!is_array($reports)) {
+			$reports=array();	
+		}
+		
+		array_push($reports, $_GET);
+		
+		$da = serialize($reports);
+		$da = $sg->storage->save_key("reports", $da);
+		
+		$output = "report added!!!";
+		
+		
+		
+	} else if($_GET[action] == "delete") {
+		$action = "delete report";
+		
+		$da = $sg->storage->load_key("reports");
+		$reports=unserialize($da);
+		$y=0;
+		
+		for($x=0; $x<count($reports); $x++) {
+			if($x != $_GET[ars_report]) {
+				$new[$y]=$reports[$x];
+				$y++;	
+			}
+		}
+		
+		$da = serialize($new);
+		$sg->storage->save_key("reports", $da);
+		
+		$output = "report deleted";	
+	} else if($_GET[action] == "sendout") {
+		
+		$action = "sending out the reports";
+		
+		
+		$da = $sg->storage->load_key("reports");
+		$reports=unserialize($da);
+		$y=0;
+		
+		
+		for($x=0; $x<count($reports); $x++) {
+			$rf=false;
+			$defaults=bartlby_get_service_by_id($btl->CFG, $reports[$x][ars_service_id]);
+			$rap = "Report for: " . $defaults[server_name] . "/" . $defaults[service_name] . "\n";
+			$btl_subj = "Bartlby report";
+			
+			@reset($servers);
+			while(@list($k, $v) = @each($servers)) {
+				for($z=0; $z<count($v); $z++) {
+					if($v[$z][service_id]==$reports[$x][ars_service_id]) {
+						$lstate=$v[$z][current_state];
+					}
+				}	
+			}
+			
+			
+			if($_GET[wich] == "daily") {
+				
+				if($reports[$x][ars_daily]) {
+					$rap .= "DAILY REPORT:\n\n";
+					$rep = $btl->do_report(date("d.m.Y", time()-86400), date("d.m.Y", time()-86400), $lstate, $reports[$x][ars_service_id]);
+					$rap .= "FROM: " . date("d.m.Y", time()-86400) . " TO: " . date("d.m.Y", time()-86400) . "\n";
+					$file =  $sg->format_report($rep, $reports[$x][ars_type], $rap);
+					$rf=true;
+				
+				
+				}
+			}
+			if($_GET[wich] == "weekly") {
+				if($reports[$x][ars_weekly]) {
+					$rap .= "WEEKLY REPORT:\n\n";
+					$rep = $btl->do_report(date("d.m.Y", time()-(86400*7)), date("d.m.Y"), $lstate, $reports[$x][ars_service_id]);
+					$rap .= "FROM: " . date("d.m.Y", time()-(86400*7)) . " TO: " . date("d.m.Y", time()) . "\n";
+					$file =  $sg->format_report($rep, $reports[$x][ars_type], $rap);
+					$rf=true;
+					
+					
+				}		
+			}
+			
+			if($_GET[wich] == "monthly") {
+				if($reports[$x][ars_monthly]) {
+					$rap .= "MONTHLY REPORT:\n\n";
+					$rep = $btl->do_report(date("d.m.Y", time()-(86400*31)), date("d.m.Y"), $lstate, $reports[$x][ars_service_id]);
+					$rap .= "FROM: " . date("d.m.Y", time()-(86400*31)) . " TO: " . date("d.m.Y", time()) . "\n";
+					$file =  $sg->format_report($rep, $reports[$x][ars_type], $rap);
+
+					$rf=true;
+					
+				}	
+			}
+			
+					
+			
+			
+			
+			if($rf == true) {
+				$headers = array('From' =>  $sg->storage->load_key("ars_smtp_from") , 'To' => $reports[$x][ars_to],
+						   'Subject' => $btl_subj);
+					   
+					   
+				$smtp = Mail::factory('smtp',
+		                	array ('host' =>  $sg->storage->load_key("ars_smtp_host"),
+              		          		'auth' => false,
+                        		   	'timeout' => 10,
+                        			'debug' => false
+                			));
+			
+                	
+                	
+	                	$tmpfname = tempnam ("/tmp", "ArS");
+			
+				$fp = fopen($tmpfname, "w");
+				fwrite($fp, $file);
+				fclose($fp);
+			
+				copy($tmpfname, $tmpfname . ".html");
+				unlink($tmpfname);
+			
+				$mime = new Mail_Mime();
+				$mime->setTxtBody("see the attachment for details");
+				
+				$mime->addAttachment($tmpfname . ".html", "text/html", "report.html");
+			
+			
+				//update perf handler ;)
+				$btl->updatePerfHandler($defaults[server_id], $defaults[service_id]);
+        	        	$path=bartlby_config($btl->CFG, "performance_rrd_htdocs");
+	                	foreach(glob($path . "/" . $reports[$x][ars_service_id] . "_*.png") as $fn) {
+                		     	//$mime->addAttachment($fn, "image/png", basename($fn), true, 'base64', 'inline');
+		                     	$mime->addHTMLImage($fn, "image/png", basename($fn), true);
+		                     	$file .= "<img src='" . basename($fn) . "'><br>";
+	                	}
+	                	$mime->setHTMLBody($file);
+	                	$body=$mime->get();
+				$hdrs=$mime->headers($headers);
+                	
+                	
+                		$mail = $smtp->send($reports[$x][ars_to], $hdrs, $body);
+
+			}
+
+			
+			
+			
+		}
+		
+		
+		$output = "done";
+			
+	}
+	
+	
+	
+	
+	
+	
+	
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "<b>$action</b>")
+			)
+		)
+
+);	
+$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "$output")
+			)
+		)
+
+);	
+
+
+	$layout->FormEnd();
+	
+	$layout->TableEnd();
+	$layout->display();
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/add.php ./bartlby-ui/extensions/ArS/add.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/add.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/extensions/ArS/add.php	2008-10-14 13:29:28.000000000 +0200
@@ -0,0 +1,131 @@
+<?
+	
+	include "config.php";
+	include "layout.class.php";
+	include "bartlby-ui.class.php";
+	
+	include "extensions/ArS/ArS.class.php";
+	
+	
+	
+	$btl=new BartlbyUi($Bartlby_CONF);
+	$btl->hasRight("super_user");
+	$sg = new ArS();
+	$servers=$btl->GetSVCMap();
+	
+	$layout= new Layout();
+	$layout->setTitle("ArS: Add Report");
+	
+	$layout->set_menu("ArS");
+	$layout->Form("fm1", "extensions_wrap.php");
+	$layout->Table("100%");
+	
+	$defaults=bartlby_get_service_by_id($btl->CFG, $_GET[service_id]);
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "<b>Add a automated report</b>")
+			)
+		)
+
+);	
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Service:" . $layout->Field("ars_service_id", "hidden", $_GET[service_id]) . $layout->Field("action", "hidden", "add"),
+				1=>$defaults[server_name] . "/" . $defaults[service_name]
+			)
+		)
+
+);	
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Recipient:",
+				1=>$layout->Field("ars_to", "textbox", "")
+			)
+		)
+
+);	
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Daily:" .$layout->Field("script", "hidden", "ArS/action.php"),
+				1=>$layout->Field("ars_daily", "checkbox", "checked")
+			)
+		)
+
+);
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Weekly:",
+				1=>$layout->Field("ars_weekly", "checkbox", "checked")
+			)
+		)
+
+);
+
+
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Monthly:",
+				1=>$layout->Field("ars_monthly", "checkbox", "checked")
+			)
+		)
+
+);
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Include Performance Charts:",
+				1=>$layout->Field("ars_perf", "checkbox", "checked")
+			)
+		)
+
+);
+
+$typos[0][s]=0;
+$typos[0][k]="html";
+$typos[0][v]="html";
+
+$typos[1][s]=0;
+$typos[1][k]="csv";
+$typos[1][v]="csv";
+
+
+$typos[2][s]=0;
+$typos[2][k]="xls";
+$typos[2][v]="xls";
+
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>"Format:",
+				1=>$layout->DropDown("ars_type", $typos)
+			)
+		)
+
+);
+
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>Array(
+					'colspan'=> 2,
+					"align"=>"right",
+					'show'=>$layout->Field("Subm", "button", "next->", "" ," onClick='xajax_ExtensionAjax(\"ArS\", \"xajax_ars_add_form\", xajax.getFormValues(\"fm1\"))'") . $layout->Field("server_id", "hidden", $_GET[server_id])
+					)
+			)
+		)
+
+);
+	$layout->FormEnd();
+	
+	$layout->TableEnd();
+	$layout->display();
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/ArS.class.php ./bartlby-ui/extensions/ArS/ArS.class.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/ArS.class.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/extensions/ArS/ArS.class.php	2008-10-14 13:29:28.000000000 +0200
@@ -0,0 +1,195 @@
+<?
+
+include "config.php";
+include_once "bartlbystorage.class.php";
+
+
+
+class ArS {
+	function ArS() {
+		$this->layout = new Layout();
+		$this->storage = new BartlbyStorage("ArS");
+		
+	}
+	
+	
+	function _About() {
+		return "Automated Reporting System (EXPERIMENTAL)!!!";
+			
+	}
+	function format_report($rep, $type='html', $hdr) {
+		global $btl;
+		
+		
+		
+		$svc=$rep[svc];
+		$state_array=$rep[state_array];
+		$notify=$rep[notify];
+		$files_scanned=$rep[files_scanned];
+		
+		$hun=$svc[0]+$svc[1]+$svc[2];
+		
+		
+		
+		
+		switch($type) {
+			case 'html':
+				$rap ="<html><head><style>td{font-size:12px; font-family:tahoma}</style></head><body>";
+				$rap .= "<table width=100% border=3>";
+			break;	
+		}
+		switch($type) {
+			case 'html':
+				$rap .= "<tr><td colspan=3>" . $hdr . "</td></tr>";
+			break;	
+		}
+		
+		switch($type) {
+			case 'html':
+				$rap .= "<tr><td colspan=3><b>Service Availability</b></td></tr>";
+			break;	
+		}
+		
+		while(list($state, $time) = @each($svc)) {
+			
+								
+			$perc =   (($hun-$time) * 100 / $hun);
+			$perc =100-$perc;
+			
+			
+			switch($type) {
+				case 'html':
+					$rap .= "<tr>";
+					$rap .= "<td>";
+					$rap .= "<font color=" . $btl->getColor($state) . ">" . $btl->getState($state) . "</font>";
+					$rap .= "</td>";
+					$rap .= "<td>";
+					$rap .= $btl->intervall($time);
+					$rap .= "</td>";
+					$rap .= "<td>";
+					$rap .= round($perc,2);
+					$rap .= "%</td>";
+					$rap .= "</tr>";
+				break;	
+			}
+			
+			
+			
+			
+		}
+		
+		switch($type) {
+			case 'html':
+				$rap .= "<tr><td colspan=3><b>Notifications</b></td></tr>";
+			break;	
+		}
+		while(list($worker, $dd) = @each($notify)) {
+			
+			switch($type) {
+				case 'html':
+					$rap .= "<tr><td colspan=2>" . $worker . "</td><td>";
+				break;	
+			}
+			
+					
+			while(list($trigger, $dd1) = @each($dd)) {
+				$rap .= "\t" . $trigger . "<br>";
+				while(list($k, $ts) = @each($dd1)) {
+					
+					switch($type) {
+						case 'html':
+							$rap .= "<li>" . date("d.m.Y H:i:s", $ts[0]) . " (" . $btl->getState($ts[1]) . ")<br>";
+						break;	
+					}
+				}
+			}
+			switch($type) {
+				case 'html':
+					$rap .= "</td></tr>";
+				break;	
+			}
+						
+		}
+		switch($type) {
+			case 'html':
+				$rap .= "<tr><td colspan=3><b>Output</b></td></tr>";
+			break;	
+		}
+		for($xy=0; $xy<count($state_array);$xy++) {
+				switch($type) {
+					case 'html':
+						$o1 .= "<tr>";
+						$o1 .= "<td>" . date("d.m.Y H:i:s", $state_array[$xy][end]) . "</td>";
+						$o1 .= "<td>" .  $btl->getState($state_array[$xy][lstate]) . " </td>";
+						$o1 .= "<td>" . $state_array[$xy][msg] . " </td>";
+						$o1 .= "</tr>";
+					
+					break;	
+				}
+								
+		}
+		
+		$rap .= $o1;
+		
+		switch($type) {
+			case 'html':
+				$rap .= "</table></body></html>";
+			break;	
+		}
+		
+		return $rap;
+	
+	}
+	
+	function xajax_ars_delete_form() {
+		global $xajax;
+		$res = new xajaxResponse();
+		$values = $xajax->_xmlToArray("xjxquery", $_GET[xajaxargs][2]);
+		
+		if($values[ars_report] == "") {
+			$res->AddScript("alert('no report selected to delete')");	
+		} else {
+			$res->AddScript("document.fm1.submit()");	
+		}
+		
+		return $res;	
+	}
+	function xajax_ars_add_form() {
+		global $xajax;
+		$res = new xajaxResponse();
+		$values = $xajax->_xmlToArray("xjxquery", $_GET[xajaxargs][2]);
+		
+		if($values[ars_to] == "") {
+			$res->addAssign("error_ars_to", "innerHTML", "required field");			
+		} else {
+			$res->AddScript("document.fm1.submit()");	
+		}
+		
+		return $res;
+	}
+	function _permissions() {
+		global $worker_rights;
+		
+		$r = "ArS requires 'super user' right";
+		return $r;
+	}
+	
+	function _Menu() {
+		$r =  $this->layout->beginMenu();
+		$r .= $this->layout->addRoot("ArS");
+		$r .= $this->layout->addSub("ArS", "Settings","extensions_wrap.php?script=ArS/settings.php");
+		$r .= $this->layout->addSub("ArS", "View/Delete","extensions_wrap.php?script=ArS/view.php");
+		$r .= $this->layout->addSub("ArS", "Add","service_list.php?script=extensions_wrap.php%3fscript=ArS/add.php");
+		
+		
+		$r .= $this->layout->endMenu();
+		return $r;
+	}
+	
+	
+	
+	
+	
+}
+
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/settings.php ./bartlby-ui/extensions/ArS/settings.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/settings.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/extensions/ArS/settings.php	2008-10-14 13:29:28.000000000 +0200
@@ -0,0 +1,85 @@
+<?
+	
+	include "config.php";
+	include "layout.class.php";
+	include "bartlby-ui.class.php";
+	
+	include "extensions/ArS/ArS.class.php";
+	
+	
+	
+	$btl=new BartlbyUi($Bartlby_CONF);
+	$btl->hasRight("super_user");
+	$sg = new ArS();
+	$servers=$btl->GetSVCMap();
+	
+	$layout= new Layout();
+	$layout->setTitle("ArS: Settings");
+	
+	$layout->set_menu("ArS");
+	$layout->Form("fm1", "extensions_wrap.php");
+	$layout->Table("100%");
+	
+	
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "<b>Settings</b>")
+			)
+		)
+
+);
+
+if($_GET[ars_smtp_host]) {
+	$sg->storage->save_key("ars_smtp_from", $_GET[ars_smtp_from]);	
+	$sg->storage->save_key("ars_smtp_host", $_GET[ars_smtp_host]);	
+	$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "<b><font color=red>saved!</font></b>")
+			)
+		)
+
+	);
+}
+
+	
+	$layout->Tr(
+		$layout->Td(
+				Array(
+				
+					0=>"Smtp Host",
+					1=>$layout->Field("ars_smtp_host", "text", $sg->storage->load_key("ars_smtp_host"))
+				)
+			)
+	
+	);	
+	$layout->Tr(
+		$layout->Td(
+				Array(
+				
+					0=>"MAIL FROM:",
+					1=>$layout->Field("ars_smtp_from", "text", $sg->storage->load_key("ars_smtp_from"))
+				)
+			)
+	
+	);	
+	
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>Array(
+					'colspan'=> 2,
+					"align"=>"right",
+					'show'=>$layout->Field("script", "hidden", "ArS/settings.php") . $layout->Field("Subm", "submit", "save", "" )
+					)
+			)
+		)
+
+);
+	$layout->FormEnd();
+	
+	$layout->TableEnd();
+	$layout->display();
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/view.php ./bartlby-ui/extensions/ArS/view.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/ArS/view.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/extensions/ArS/view.php	2008-10-14 13:29:28.000000000 +0200
@@ -0,0 +1,83 @@
+<?
+	
+	include "config.php";
+	include "layout.class.php";
+	include "bartlby-ui.class.php";
+	
+	include "extensions/ArS/ArS.class.php";
+	
+	
+	
+	$btl=new BartlbyUi($Bartlby_CONF);
+	$btl->hasRight("super_user");
+	$sg = new ArS();
+	$servers=$btl->GetSVCMap();
+	
+	$layout= new Layout();
+	$layout->setTitle("ArS: View Report");
+	
+	$layout->set_menu("ArS");
+	$layout->Form("fm1", "extensions_wrap.php");
+	$layout->Table("100%");
+	
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				array("colspan" => 2, "show" => "<b>Known reports</b>")
+			)
+		)
+
+);
+
+
+	$da = $sg->storage->load_key("reports");
+	$reports=unserialize($da);
+	
+	for($x=0; $x<count($reports); $x++) {
+	
+		$defaults=bartlby_get_service_by_id($btl->CFG, $reports[$x][ars_service_id]);
+		if($reports[$x][ars_daily])
+			$day="daily";
+		else
+			$day="";
+		
+		if($reports[$x][ars_weekly])
+			$week="weekly";
+		else
+			$week="";
+		
+		if($reports[$x][ars_monthly])
+			$month="month";
+		else
+			$month="";
+		
+		
+		$layout->Tr(
+			$layout->Td(
+					Array(
+					
+						0=>"<input type=radio name='ars_report' value='" . $x . "'>" .  $layout->Field("action", "hidden", "delete") . $layout->Field("script", "hidden", "ArS/action.php"),
+						1=>$reports[$x][ars_to] . "(" . $defaults[server_name] . "/" . $defaults[service_name] . ") $day $week $month"
+					)
+				)
+		
+		);	
+	}
+
+$layout->Tr(
+	$layout->Td(
+			Array(
+				0=>Array(
+					'colspan'=> 2,
+					"align"=>"right",
+					'show'=>$layout->Field("Subm", "button", "delete", "" ," onClick='xajax_ExtensionAjax(\"ArS\", \"xajax_ars_delete_form\", xajax.getFormValues(\"fm1\"))'") . $layout->Field("server_id", "hidden", $_GET[server_id])
+					)
+			)
+		)
+
+);
+	$layout->FormEnd();
+	
+	$layout->TableEnd();
+	$layout->display();
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/Basket/Basket.class.php ./bartlby-ui/extensions/Basket/Basket.class.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/extensions/Basket/Basket.class.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/extensions/Basket/Basket.class.php	2008-09-07 14:09:01.000000000 +0200
@@ -37,7 +37,7 @@
        	
        	$r = "<table class='nopad'>
 			<tr>                                                                      
-				<td class='nav_main' onClick=\"doToggle('BasketFavorites')\"><img id='BasketFavorites_plus' src='images/minus.gif' border=0> Fav. Services</td>                      
+				<td class='nav_main' onClick=\"doToggle('BasketFavorites')\"><img id='BasketFavorites_plus' src='themes/" . $btl->theme . "/images/minus.gif' border=0> Fav. Services</td>                      
 			</tr>
 			<tr>
 				<td class=\"nav_place\">&nbsp;</td>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/flash/pie.html ./bartlby-ui/flash/pie.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/flash/pie.html	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/flash/pie.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>ARSCHLOCH</title>
-</head>
-<body bgcolor="#ffffff">
-<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" 
-	codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" 
-	width="700" 
-	height="500" 
-	id="pie" 
-	align="middle">
-<param name="allowScriptAccess" value="sameDomain" />
-<param name="movie" value="pie.swf?text_1=Guasdt&text_2=Schlecht&text_3=Gehtso&value_1=10&value_2=20&value_3=70" />
-<param name="quality" value="high" />
-<embed src="pie.swf?text_1=Guaast&text_2=Schlecht&text_3=Gehtso&text_1=Gehtso&value_1=10&value_2=20&value_3=70" quality="high" width="700" height="500" name="pie" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
-</object>
-</body>
-</html>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/html/bartlby.footer ./bartlby-ui/html/bartlby.footer
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/html/bartlby.footer	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/html/bartlby.footer	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-</body>
-</html>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/html/bartlby.header ./bartlby-ui/html/bartlby.header
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/html/bartlby.header	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/html/bartlby.header	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-<html>
-<head>
-<title>Bartlby Web interface</title>
-<style>
-	table {
-		border: solid black 1px;
-	}
-	td.row1 {
-		border: solid black 1px;
-		color: 000000;
-		font-size: 10px;
-		font-family: tahoma;
-	}
-</style>
-</head>
-
-<body bgcolor=cccccc>
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/agent_syncer.gif and ./bartlby-ui/images/agent_syncer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/arrow2.gif and ./bartlby-ui/images/arrow2.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/barcode.gif and ./bartlby-ui/images/barcode.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_01.gif and ./bartlby-ui/images/bartlby1-bar-green_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_01.png and ./bartlby-ui/images/bartlby1-bar-green_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_02.gif and ./bartlby-ui/images/bartlby1-bar-green_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_02.png and ./bartlby-ui/images/bartlby1-bar-green_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_04.gif and ./bartlby-ui/images/bartlby1-bar-green_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-green_04.png and ./bartlby-ui/images/bartlby1-bar-green_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_01.gif and ./bartlby-ui/images/bartlby1-bar-red_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_01.png and ./bartlby-ui/images/bartlby1-bar-red_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_02.gif and ./bartlby-ui/images/bartlby1-bar-red_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_02.png and ./bartlby-ui/images/bartlby1-bar-red_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_04.gif and ./bartlby-ui/images/bartlby1-bar-red_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-red_04.png and ./bartlby-ui/images/bartlby1-bar-red_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-silver_01.gif and ./bartlby-ui/images/bartlby1-bar-silver_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-silver_02.gif and ./bartlby-ui/images/bartlby1-bar-silver_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-silver_04.gif and ./bartlby-ui/images/bartlby1-bar-silver_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_01.gif and ./bartlby-ui/images/bartlby1-bar-yellow_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_01.png and ./bartlby-ui/images/bartlby1-bar-yellow_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_02.gif and ./bartlby-ui/images/bartlby1-bar-yellow_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_02.png and ./bartlby-ui/images/bartlby1-bar-yellow_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_04.gif and ./bartlby-ui/images/bartlby1-bar-yellow_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bar-yellow_04.png and ./bartlby-ui/images/bartlby1-bar-yellow_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-bg.jpg and ./bartlby-ui/images/bartlby1-bg.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bartlby1-first-aid.gif and ./bartlby-ui/images/bartlby1-first-aid.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bg_body.gif and ./bartlby-ui/images/bg_body.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bg_body.png and ./bartlby-ui/images/bg_body.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bg_header.gif and ./bartlby-ui/images/bg_header.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bg_header.jpg and ./bartlby-ui/images/bg_header.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bg_header.png and ./bartlby-ui/images/bg_header.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bi-oc-green.gif and ./bartlby-ui/images/bi-oc-green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bi-oc-red.gif and ./bartlby-ui/images/bi-oc-red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bi-oc-silver.gif and ./bartlby-ui/images/bi-oc-silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/bi-oc-yellow.gif and ./bartlby-ui/images/bi-oc-yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/black.gif and ./bartlby-ui/images/black.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/blue.gif and ./bartlby-ui/images/blue.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_01.png and ./bartlby-ui/images/box_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_02.png and ./bartlby-ui/images/box_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_04.png and ./bartlby-ui/images/box_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_06.png and ./bartlby-ui/images/box_06.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_08.png and ./bartlby-ui/images/box_08.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_09.png and ./bartlby-ui/images/box_09.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_10.png and ./bartlby-ui/images/box_10.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_11.png and ./bartlby-ui/images/box_11.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_15.png and ./bartlby-ui/images/box_15.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_16.png and ./bartlby-ui/images/box_16.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_17.png and ./bartlby-ui/images/box_17.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_21.png and ./bartlby-ui/images/box_21.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_22.png and ./bartlby-ui/images/box_22.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_23.png and ./bartlby-ui/images/box_23.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_bg.gif and ./bartlby-ui/images/box_bg.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_bg.png and ./bartlby-ui/images/box_bg.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_run_down.gif and ./bartlby-ui/images/box_run_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_run_down.png and ./bartlby-ui/images/box_run_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_run_up.gif and ./bartlby-ui/images/box_run_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/box_run_up.png and ./bartlby-ui/images/box_run_up.png differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl.css ./bartlby-ui/images/btl.css
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl.css	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/images/btl.css	1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-body { background-color: #C2CBCF; font-family: tahoma; font-size:12px; }
-input,td,select { font-size:12px; font-family:tahoma; }
-
-.suggest_link {
-				background-color: #FFFFFF;
-				padding: 2px 6px 2px 6px;
-			}
-			.suggest_link_over {
-				background-color: #3366CC;
-				padding: 2px 6px 2px 6px;
-			}
-			#search_suggest {
-				position: absolute; 
-				background-color: #FFFFFF; 
-				text-align: left; 
-				border: 1px solid #000000;			
-			}		
-
-.none { font-size:12px; font-family:tahoma; }
-
-.big_table { font-size: 10px; }
-.nopad {padding: 0; border-collapse: collapse; border-spacing: 0;}
-td.navi { vertical-align:top; font-family: tahoma; font-size: 10pt;  width: 125px;}
-td.content { vertical-align: top; font-family: tahoma; font-size:12px; }
-td.bg_header {  vertical-align: top; background-image: url(bg_header.jpg); height:105; background-repeat: no-repeat; padding-left:5px; padding-top:5px;}
-td.bg_body{  vertical-align: top; background-image: url(bartlby1-bg.jpg); height:663; background-repeat: no-repeat; }
-
-td.nav_main { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff;  background-image: url(btn_main.gif); height:21px; width:121px; background-repeat: no-repeat; }
-td.nav_sub { font-weight: bold; vertical-align: middle; padding-left: 3px; padding-top:0px; font-size:10px; color:#ffffff;  background-image: url(btn_sub.gif); height:12px; width:107px; background-repeat: no-repeat; }
-td.nav_place { font-size:1px; height:5px; }
-
-td.header { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff; height:21px; width:121px; background-color:#999999; }
-
-a:link.sub { text-decoration:none; font-size:10px; color:#ffffff; }
-a:visited.sub { text-decoration:none; font-size:10px; color:#ffffff; }
-a:hover.sub { text-decoration:underline; font-size:10px; color:#ffffff; }
-
-a:link {font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
-a:visited{font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
-a:hover{font-weight:bold; text-decoration:underline; font-size:12px; color:#000000; }
-
-td.box_left_corner_top { background-image: url(left_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
-td.box_top_run { width:650px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(box_run_up.gif); height:20px;  }
-td.box_right_corner_top { background-image: url(right_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
-
-td.box_left_corner_bottom { background-image: url(left_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
-td.box_bottom_run { width:250px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(box_run_down.gif); background-repeat: repeat-x; height:20px; font-size:1px;  }
-td.box_right_corner_bottom { background-image: url(right_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
-td.box_left_run { background-image: url(left_corner_run.gif); height:20px; width:16px;  }
-td.box_right_run { background-image: url(right_corner_run.gif); height:20px; width:16px;  }
-td.box_content { width:840px; background-image: url(box_bg.gif); font-family:tahoma; font-size:12px; color:#010101; }
-
-
-td.header1 { font-size:12px; font-family:tahoma; }
-td.header { font-size:12px; font-family:tahoma; }
-
-
-td.red_img {  padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(bi-oc-red.gif);background-repeat: no-repeat;}
-td.green_img { padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(bi-oc-green.gif);background-repeat: no-repeat;}
-td.orange_img {  padding-left:5px;   padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(bi-oc-yellow.gif);background-repeat: no-repeat;}
-td.silver_img {   padding-left:5px;  padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(bi-oc-silver.gif);background-repeat: no-repeat;}
-
-
-
-td.red { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:000000; background-color:#F83838}
-td.green { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#33FF00}
-td.orange { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#FFFF00}
-td.blue { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#ACACAC}
-
-div.reload {z-index:101;visibility:hidden; position: absolute; left: 840px; top:80px;}
-div.ui_performance { position: absolute; left: 5px; top:83px;}
-div.clock {position: absolute; left: 800px; top:110px; color:#000000;z-index:3;}
-div.quick_look {position: absolute; left: 380px; top:81px; color:#000000;z-index:3;}
-
-div.help {position: absolute; left: 1024px; top:0px; color:#000000;z-index:3;}
-
-
-.font1 {font-weight:bold; color:#999999; font-family:tahoma; font-size:12px;}
-.font2 {font-weight:bold; color:#000000; font-family:tahoma; font-size:12px;}
-
-
-
-td.bar_left_yellow {background-image: url(bartlby1-bar-yellow_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
-td.bar_right_yellow {background-image: url(bartlby1-bar-yellow_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
-td.bar_middle_yellow {background-image: url(bartlby1-bar-yellow_02.gif); height:39px; width:4px; }
-
-td.bar_left_silver {background-image: url(bartlby1-bar-silver_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
-td.bar_right_silver {background-image: url(bartlby1-bar-silver_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
-td.bar_middle_silver {background-image: url(bartlby1-bar-silver_02.gif); height:39px; width:4px; }
-
-
-
-td.bar_left_green {background-image: url(bartlby1-bar-green_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
-td.bar_right_green {background-image: url(bartlby1-bar-green_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
-td.bar_middle_green {background-image: url(bartlby1-bar-green_02.gif); height:39px; width:4px; }
-
-td.bar_left_red {background-image: url(bartlby1-bar-red_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
-td.bar_right_red {background-image: url(bartlby1-bar-red_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
-td.bar_middle_red {background-image: url(bartlby1-bar-red_02.gif); height:39px; width:4px; }
-
-
-td.red_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(s_red.gif);background-repeat: no-repeat;}
-td.green_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(s_green.gif);background-repeat: no-repeat;}
-td.orange_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(s_yellow.gif);background-repeat: no-repeat;}
-td.yellow_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(s_yellow.gif);background-repeat: no-repeat;}
-td.silver_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(s_silver.gif);background-repeat: no-repeat;}
-
-
-
-
-#dropmenudiv{
-position:absolute;
-border:1px solid black;
-border-bottom-width: 0;
-font:normal 12px Tahoma;
-line-height:18px;
-z-index:100;
-}
-
-#dropmenudiv a{
-width: 100%;
-display: block;
-text-indent: 3px;
-border-bottom: 1px solid black;
-padding: 1px 0;
-text-decoration: none;
-font-weight: bold;
-}
-
-#dropmenudiv a:hover{ /*hover background color*/
-background-color: #C2CBCF;
-}
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl.js ./bartlby-ui/images/btl.js
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl.js	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/images/btl.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,143 +0,0 @@
-function serviceManageIconChange(f) {
-	selval=f.server_icon.options[f.server_icon.selectedIndex].value;
-	ph = document.getElementById("picholder");
-	ph.innerHTML="<img src='server_icons/" + selval + "'>";
-		
-}
-function openMap() {
-	window.open('create_map.php','','width=1024,height=786, scrollbar=yes, scrollbars=yes')
-}
-function doReloadButton() {
-	var obj = document.getElementById("reload");
-        obj.style.visibility = "visible";
-}
-
-var menuwidth='250px' //default menu width
-var menubgcolor='999999'  //menu bgcolor
-var disappeardelay=250  //menu disappear speed onMouseout (in miliseconds)
-var hidemenu_onclick="yes" //hide menu when user clicks within menu?
-
-/////No further editting needed
-
-var ie4=document.all
-var ns6=document.getElementById&&!document.all
-
-if (ie4||ns6)
-document.write('<div id="dropmenudiv" style="visibility:hidden;width:'+menuwidth+';background-color:'+menubgcolor+'" onMouseover="clearhidemenu()" onMouseout="dynamichide(event)"></div>')
-
-function getposOffset(what, offsettype){
-var totaloffset=(offsettype=="left")? what.offsetLeft : what.offsetTop;
-var parentEl=what.offsetParent;
-while (parentEl!=null){
-totaloffset=(offsettype=="left")? totaloffset+parentEl.offsetLeft : totaloffset+parentEl.offsetTop;
-parentEl=parentEl.offsetParent;
-}
-return totaloffset;
-}
-
-
-function showhide(obj, e, visible, hidden, menuwidth){
-if (ie4||ns6)
-dropmenuobj.style.left=dropmenuobj.style.top=-500
-if (menuwidth!=""){
-dropmenuobj.widthobj=dropmenuobj.style
-dropmenuobj.widthobj.width=menuwidth
-}
-if (e.type=="click" && obj.visibility==hidden || e.type=="mouseover")
-obj.visibility=visible
-else if (e.type=="click")
-obj.visibility=hidden
-}
-
-function iecompattest(){
-return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
-}
-
-function clearbrowseredge(obj, whichedge){
-var edgeoffset=0
-if (whichedge=="rightedge"){
-var windowedge=ie4 && !window.opera? iecompattest().scrollLeft+iecompattest().clientWidth-15 : window.pageXOffset+window.innerWidth-15
-dropmenuobj.contentmeasure=dropmenuobj.offsetWidth
-if (windowedge-dropmenuobj.x < dropmenuobj.contentmeasure)
-edgeoffset=dropmenuobj.contentmeasure-obj.offsetWidth
-}
-else{
-var topedge=ie4 && !window.opera? iecompattest().scrollTop : window.pageYOffset
-var windowedge=ie4 && !window.opera? iecompattest().scrollTop+iecompattest().clientHeight-15 : window.pageYOffset+window.innerHeight-18
-dropmenuobj.contentmeasure=dropmenuobj.offsetHeight
-if (windowedge-dropmenuobj.y < dropmenuobj.contentmeasure){ //move up?
-edgeoffset=dropmenuobj.contentmeasure+obj.offsetHeight
-if ((dropmenuobj.y-topedge)<dropmenuobj.contentmeasure) //up no good either?
-edgeoffset=dropmenuobj.y+obj.offsetHeight-topedge
-}
-}
-return edgeoffset
-}
-
-function populatemenu(what){
-if (ie4||ns6)
-dropmenuobj.innerHTML=what.join("")
-}
-
-
-function dropdownmenu(obj, e, menucontents, menuwidth){
-if (window.event) event.cancelBubble=true
-else if (e.stopPropagation) e.stopPropagation()
-clearhidemenu()
-dropmenuobj=document.getElementById? document.getElementById("dropmenudiv") : dropmenudiv
-populatemenu(menucontents)
-
-if (ie4||ns6){
-showhide(dropmenuobj.style, e, "visible", "hidden", menuwidth)
-dropmenuobj.x=getposOffset(obj, "left")
-dropmenuobj.y=getposOffset(obj, "top")
-dropmenuobj.style.left=dropmenuobj.x-clearbrowseredge(obj, "rightedge")+"px"
-dropmenuobj.style.top=dropmenuobj.y-clearbrowseredge(obj, "bottomedge")+obj.offsetHeight+"px"
-}
-
-return clickreturnvalue()
-}
-
-function clickreturnvalue(){
-if (ie4||ns6) return false
-else return true
-}
-
-function contains_ns6(a, b) {
-while (b.parentNode)
-if ((b = b.parentNode) == a)
-return true;
-return false;
-}
-
-function dynamichide(e){
-if (ie4&&!dropmenuobj.contains(e.toElement))
-delayhidemenu()
-else if (ns6&&e.currentTarget!= e.relatedTarget&& !contains_ns6(e.currentTarget, e.relatedTarget))
-delayhidemenu()
-}
-
-function hidemenu(e){
-if (typeof dropmenuobj!="undefined"){
-if (ie4||ns6)
-dropmenuobj.style.visibility="hidden"
-}
-}
-
-function delayhidemenu(){
-if (ie4||ns6)
-delayhide=setTimeout("hidemenu()",disappeardelay)
-}
-
-function clearhidemenu(){
-if (typeof delayhide!="undefined")
-clearTimeout(delayhide)
-}
-
-if (hidemenu_onclick=="yes")
-document.onclick=hidemenu
-
-
-
-
-
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl-logo.gif and ./bartlby-ui/images/btl-logo.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btl-logo.png and ./bartlby-ui/images/btl-logo.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btn_main.gif and ./bartlby-ui/images/btn_main.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btn_main.png and ./bartlby-ui/images/btn_main.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btn_sub.gif and ./bartlby-ui/images/btn_sub.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/btn_sub.png and ./bartlby-ui/images/btn_sub.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/create_report.gif and ./bartlby-ui/images/create_report.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/critical.gif and ./bartlby-ui/images/critical.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/critical.png and ./bartlby-ui/images/critical.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/diabled.gif and ./bartlby-ui/images/diabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/diabled.png and ./bartlby-ui/images/diabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/Disable-Sirene.gif and ./bartlby-ui/images/Disable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/edit-copy.gif and ./bartlby-ui/images/edit-copy.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/emblem-generic.png and ./bartlby-ui/images/emblem-generic.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/emblem-important.png and ./bartlby-ui/images/emblem-important.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/enabled.gif and ./bartlby-ui/images/enabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/enabled.png and ./bartlby-ui/images/enabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/Enable-Sirene.gif and ./bartlby-ui/images/Enable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/extension_disable.gif and ./bartlby-ui/images/extension_disable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/extension_enable.gif and ./bartlby-ui/images/extension_enable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/extensions.gif and ./bartlby-ui/images/extensions.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/force.gif and ./bartlby-ui/images/force.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/green.png and ./bartlby-ui/images/green.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/header_bar.png and ./bartlby-ui/images/header_bar.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_comments.gif and ./bartlby-ui/images/icon_comments.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_comments.png and ./bartlby-ui/images/icon_comments.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_stat.gif and ./bartlby-ui/images/icon_stat.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_view.gif and ./bartlby-ui/images/icon_view.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_view.png and ./bartlby-ui/images/icon_view.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_work1.gif and ./bartlby-ui/images/icon_work1.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_work1.png and ./bartlby-ui/images/icon_work1.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/icon_work.gif and ./bartlby-ui/images/icon_work.gif differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/index.html ./bartlby-ui/images/index.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/index.html	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/images/index.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-<html>
-<head>
-<title>bartlby</title>
-<link rel="stylesheet" id="CSS" type="text/css" href="btl.css"></link>
-</head>
-<body leftmargin=0 topmargin=0>
-	<table width="100%" class="nopad">
-		<tr>
-			<td  class="bg_header"><img src='btl-logo.png'></td>
-			
-		</tr>
-		<tr>
-			<td class="bg_body">
-				<table class="nopad">
-					<tr>
-						<td class="navi">
-							<table class="nopad">
-								<tr>
-									<td class="nav_main">Main<td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='#' class="sub">Sub</A><td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='#' class="sub">Sub</A><td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_main">Main1<td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='#' class="sub">Sub1</A><td>
-								</tr>
-								
-							</table>
-						</td>
-						<td class="content">
-							<table class="nopad">
-								<tr>
-									<td class="box_left_corner_top">&nbsp;</td>
-									<td class="box_top_run">Title</td>
-									<td class="box_right_corner_top">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="box_left_run">&nbsp;</td>
-									<td class="box_content"><!--BTUICONTENT--></td>
-									<td class="box_right_run">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="box_left_corner_bottom">&nbsp;</td>
-									<td class="box_bottom_run">&nbsp;</td>
-									<td class="box_right_corner_bottom">&nbsp;</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>			
-			</td>
-			
-		</tr>
-	</table>
-</body>
-</html>
\ No newline at end of file
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/info.gif and ./bartlby-ui/images/info.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/info.png and ./bartlby-ui/images/info.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/keys.gif and ./bartlby-ui/images/keys.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_down.gif and ./bartlby-ui/images/left_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_down.png and ./bartlby-ui/images/left_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_run.gif and ./bartlby-ui/images/left_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_run.png and ./bartlby-ui/images/left_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_up.gif and ./bartlby-ui/images/left_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/left_corner_up.png and ./bartlby-ui/images/left_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/minus.gif and ./bartlby-ui/images/minus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/modify.gif and ./bartlby-ui/images/modify.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/notrigger.gif and ./bartlby-ui/images/notrigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/notrigger.png and ./bartlby-ui/images/notrigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/ok.gif and ./bartlby-ui/images/ok.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/ok.png and ./bartlby-ui/images/ok.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/plus.gif and ./bartlby-ui/images/plus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/red.png and ./bartlby-ui/images/red.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_down.gif and ./bartlby-ui/images/right_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_down.png and ./bartlby-ui/images/right_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_run.gif and ./bartlby-ui/images/right_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_run.png and ./bartlby-ui/images/right_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_up.gif and ./bartlby-ui/images/right_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/right_corner_up.png and ./bartlby-ui/images/right_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/s_green.gif and ./bartlby-ui/images/s_green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/spacer.gif and ./bartlby-ui/images/spacer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/s_red.gif and ./bartlby-ui/images/s_red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/s_silver.gif and ./bartlby-ui/images/s_silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/s_yellow.gif and ./bartlby-ui/images/s_yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/trigger.gif and ./bartlby-ui/images/trigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/trigger.png and ./bartlby-ui/images/trigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/warning.gif and ./bartlby-ui/images/warning.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/warning.png and ./bartlby-ui/images/warning.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/images/yellow.png and ./bartlby-ui/images/yellow.png differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/index.php ./bartlby-ui/index.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/index.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/index.php	2008-09-12 17:14:44.000000000 +0200
@@ -1,12 +1,22 @@
+<?
+	include "config.php";
+
+        include "layout.class.php";
+        include "bartlby-ui.class.php";
+
+        $btl=new BartlbyUi($Bartlby_CONF, false, false);
+        $layout= new Layout();
+
+?>
 <body bgcolor="C2CBCF">
-<center><img src='images/btl-logo.gif'></center>
+<center><img src='themes/<?=$layout->theme?>/images/btl-logo.gif'></center>
 <?
-	$dhl=opendir("images/");
+	$dhl=opendir("themes/" . $layout->theme . "/images/");
 	while($f = readdir($dhl)) {
-		if($f == "." || $f == ".." || is_dir("images/" . $f) || !preg_match("/.*\.[png|gif|jpg]/", $f)) {
+		if($f == "." || $f == ".." || is_dir("themes/" . $layout->theme . "/images/" . $f) || !preg_match("/.*\.[png|gif|jpg]/", $f)) {
 			continue;	
 		}	
-		$str .= "'images/" . $f . "',";
+		$str .= "'themes/" .  $layout->theme . "/images/" . $f . "',";
 	}
 	
 	closedir($dhl);
@@ -20,8 +30,8 @@
 ?>
 
 <link rel="shortcut icon" href="favicon.ico" > 
-<link rel="stylesheet" id="CSS" type="text/css" href="images/btl.css"></link>
-<script type="text/javascript" src="images/btl.js"></script>
+<link rel="stylesheet" id="CSS" type="text/css" href="themes/<?=$layout->theme?>/btl.css"></link>
+<script type="text/javascript" src="js/btl.js"></script>
 
 <script language="JavaScript">
 <!-- begin hiding
@@ -43,9 +53,9 @@
 if (document.images) {
 	var dots = new Array() 
 	dots[0] = new Image(1,1)
-	dots[0].src = "images/black.gif" // default preloadbar color (note: You can substitute it with your image, but it has to be 1x1 size)
+	dots[0].src = "themes/<?=$layout->theme?>/images/black.gif" // default preloadbar color (note: You can substitute it with your image, but it has to be 1x1 size)
 	dots[1] = new Image(1,1)
-	dots[1].src = "images/blue.gif" // color of bar as preloading progresses (same note as above)
+	dots[1].src = "themes/<?=$layout->theme?>/images/blue.gif" // color of bar as preloading progresses (same note as above)
 	var preImages = new Array(),coverage = Math.floor(lengthOfPreloadBar/yourImages.length),currCount = 0
 	var loaded = new Array(),i,covered,timerID
 	var leftOverWidth = lengthOfPreloadBar%coverage
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/js/btl.js ./bartlby-ui/js/btl.js
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/js/btl.js	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/js/btl.js	2008-09-07 14:49:37.000000000 +0200
@@ -0,0 +1,236 @@
+
+	global_reload=1;
+	function toggleReload() {
+		if(global_reload == 1) {
+				global_reload=0;
+		} else {
+				global_reload=1;
+		}
+	}
+	function GenericToggleFix(elID, st) {
+	//alert(elID);
+	//alert(st);
+		obj=document.getElementById(elID);
+		//alert(obj);
+		obj.style.display=st;  
+	}
+	function GenericToggle(elID) {
+		obj=document.getElementById(elID);
+		obj.style.display=!(obj.style.display=="block")? "block" : "none";  
+	}
+	function jsLogout() {
+		r=confirm("You really want to logout?");	
+		if(r == true) {
+			document.location.href='logout.php';	
+		}
+	}
+	function doToggle(elID) {
+		switch(elID) {
+			case 'main':
+				elID="Monitoring";
+			break;
+			case 'report':
+				elID="Reporting";
+			break;
+			case 'client':
+				elID="Server/s";
+			break;
+			case 'services':
+				elID="Service/s";
+			break;
+			case 'downtimes':
+				elID="Downtime/s";
+			break;
+			case 'worker':
+				elID="Worker/s";
+			break;
+			case 'core':
+				elID="Core";
+			break;
+			
+		}
+		imgPlus='themes/'+js_theme_name+'/images/plus.gif';
+		imgMinus='themes/'+js_theme_name+'/images/minus.gif';
+		obj=document.getElementById(elID + "_sub");
+		obj.style.display=!(obj.style.display=="block")? "block" : "none";  
+		
+		
+		obji=document.getElementById(elID + "_plus");
+		cImg="images" + obji.src.substring(obji.src.lastIndexOf("/"), obji.src.length);
+		
+		
+		obji.src=!(cImg==imgMinus)? imgMinus : imgPlus;  
+		
+	}
+
+	var buffer_suggest = 
+	{
+	        bufferText: false,
+	        bufferTime: 500,
+	        
+	        modified : function(strId, fcn, scr)
+	        {
+	                setTimeout('buffer_suggest.compareBuffer("'+strId+'","'+document.getElementById(strId).value+'","'+ fcn +'", "'+scr+'");', this.bufferTime);
+	        },
+	        
+	        compareBuffer : function(strId, strText, fcn, scr)
+	        {
+	            if (strText == document.getElementById(strId).value && strText != this.bufferText)
+	            {
+	                this.bufferText = strText;
+	                buffer_suggest.makeRequest(strId, fcn, scr);
+	            }
+	        },
+	        
+	        makeRequest : function(strId, fcn, scr)
+	        {
+	            	            
+	            eval(fcn + "(document.getElementById(strId).value, scr)");
+	        }
+	}
+
+
+
+function serviceManageIconChange(f) {
+	selval=f.server_icon.options[f.server_icon.selectedIndex].value;
+	ph = document.getElementById("picholder");
+	ph.innerHTML="<img src='server_icons/" + selval + "'>";
+		
+}
+function openMap() {
+	window.open('create_map.php','','width=1024,height=786, scrollbar=yes, scrollbars=yes')
+}
+function doReloadButton() {
+	var obj = document.getElementById("reload");
+        obj.style.visibility = "visible";
+}
+
+var menuwidth='250px' //default menu width
+var menubgcolor='999999'  //menu bgcolor
+var disappeardelay=250  //menu disappear speed onMouseout (in miliseconds)
+var hidemenu_onclick="yes" //hide menu when user clicks within menu?
+
+/////No further editting needed
+
+var ie4=document.all
+var ns6=document.getElementById&&!document.all
+
+if (ie4||ns6)
+document.write('<div id="dropmenudiv" style="visibility:hidden;width:'+menuwidth+';background-color:'+menubgcolor+'" onMouseover="clearhidemenu()" onMouseout="dynamichide(event)"></div>')
+
+function getposOffset(what, offsettype){
+var totaloffset=(offsettype=="left")? what.offsetLeft : what.offsetTop;
+var parentEl=what.offsetParent;
+while (parentEl!=null){
+totaloffset=(offsettype=="left")? totaloffset+parentEl.offsetLeft : totaloffset+parentEl.offsetTop;
+parentEl=parentEl.offsetParent;
+}
+return totaloffset;
+}
+
+
+function showhide(obj, e, visible, hidden, menuwidth){
+if (ie4||ns6)
+dropmenuobj.style.left=dropmenuobj.style.top=-500
+if (menuwidth!=""){
+dropmenuobj.widthobj=dropmenuobj.style
+dropmenuobj.widthobj.width=menuwidth
+}
+if (e.type=="click" && obj.visibility==hidden || e.type=="mouseover")
+obj.visibility=visible
+else if (e.type=="click")
+obj.visibility=hidden
+}
+
+function iecompattest(){
+return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
+}
+
+function clearbrowseredge(obj, whichedge){
+var edgeoffset=0
+if (whichedge=="rightedge"){
+var windowedge=ie4 && !window.opera? iecompattest().scrollLeft+iecompattest().clientWidth-15 : window.pageXOffset+window.innerWidth-15
+dropmenuobj.contentmeasure=dropmenuobj.offsetWidth
+if (windowedge-dropmenuobj.x < dropmenuobj.contentmeasure)
+edgeoffset=dropmenuobj.contentmeasure-obj.offsetWidth
+}
+else{
+var topedge=ie4 && !window.opera? iecompattest().scrollTop : window.pageYOffset
+var windowedge=ie4 && !window.opera? iecompattest().scrollTop+iecompattest().clientHeight-15 : window.pageYOffset+window.innerHeight-18
+dropmenuobj.contentmeasure=dropmenuobj.offsetHeight
+if (windowedge-dropmenuobj.y < dropmenuobj.contentmeasure){ //move up?
+edgeoffset=dropmenuobj.contentmeasure+obj.offsetHeight
+if ((dropmenuobj.y-topedge)<dropmenuobj.contentmeasure) //up no good either?
+edgeoffset=dropmenuobj.y+obj.offsetHeight-topedge
+}
+}
+return edgeoffset
+}
+
+function populatemenu(what){
+if (ie4||ns6)
+dropmenuobj.innerHTML=what.join("")
+}
+
+
+function dropdownmenu(obj, e, menucontents, menuwidth){
+if (window.event) event.cancelBubble=true
+else if (e.stopPropagation) e.stopPropagation()
+clearhidemenu()
+dropmenuobj=document.getElementById? document.getElementById("dropmenudiv") : dropmenudiv
+populatemenu(menucontents)
+
+if (ie4||ns6){
+showhide(dropmenuobj.style, e, "visible", "hidden", menuwidth)
+dropmenuobj.x=getposOffset(obj, "left")
+dropmenuobj.y=getposOffset(obj, "top")
+dropmenuobj.style.left=dropmenuobj.x-clearbrowseredge(obj, "rightedge")+"px"
+dropmenuobj.style.top=dropmenuobj.y-clearbrowseredge(obj, "bottomedge")+obj.offsetHeight+"px"
+}
+
+return clickreturnvalue()
+}
+
+function clickreturnvalue(){
+if (ie4||ns6) return false
+else return true
+}
+
+function contains_ns6(a, b) {
+while (b.parentNode)
+if ((b = b.parentNode) == a)
+return true;
+return false;
+}
+
+function dynamichide(e){
+if (ie4&&!dropmenuobj.contains(e.toElement))
+delayhidemenu()
+else if (ns6&&e.currentTarget!= e.relatedTarget&& !contains_ns6(e.currentTarget, e.relatedTarget))
+delayhidemenu()
+}
+
+function hidemenu(e){
+if (typeof dropmenuobj!="undefined"){
+if (ie4||ns6)
+dropmenuobj.style.visibility="hidden"
+}
+}
+
+function delayhidemenu(){
+if (ie4||ns6)
+delayhide=setTimeout("hidemenu()",disappeardelay)
+}
+
+function clearhidemenu(){
+if (typeof delayhide!="undefined")
+clearTimeout(delayhide)
+}
+
+if (hidemenu_onclick=="yes")
+document.onclick=hidemenu
+
+
+
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/js/dom-drag.js ./bartlby-ui/js/dom-drag.js
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/js/dom-drag.js	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/js/dom-drag.js	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,121 @@
+/**************************************************
+* dom-drag.js
+* 09.25.2001
+* www.youngpup.net
+**************************************************
+* 10.28.2001 - fixed minor bug where events
+* sometimes fired off the handle, not the root.
+**************************************************/
+
+var Drag = {
+
+obj : null,
+
+init : function(o, oRoot, minX, maxX, minY, maxY, bSwapHorzRef, bSwapVertRef, fXMapper, fYMapper)
+{
+o.onmousedown = Drag.start;
+
+o.hmode = bSwapHorzRef ? false : true ;
+o.vmode = bSwapVertRef ? false : true ;
+
+o.root = oRoot && oRoot != null ? oRoot : o ;
+
+if (o.hmode && isNaN(parseInt(o.root.style.left ))) o.root.style.left = "0px";
+if (o.vmode && isNaN(parseInt(o.root.style.top ))) o.root.style.top = "0px";
+if (!o.hmode && isNaN(parseInt(o.root.style.right ))) o.root.style.right = "0px";
+if (!o.vmode && isNaN(parseInt(o.root.style.bottom))) o.root.style.bottom = "0px";
+
+o.minX = typeof minX != 'undefined' ? minX : null;
+o.minY = typeof minY != 'undefined' ? minY : null;
+o.maxX = typeof maxX != 'undefined' ? maxX : null;
+o.maxY = typeof maxY != 'undefined' ? maxY : null;
+
+o.xMapper = fXMapper ? fXMapper : null;
+o.yMapper = fYMapper ? fYMapper : null;
+
+o.root.onDragStart = new Function();
+o.root.onDragEnd = new Function();
+o.root.onDrag = new Function();
+},
+
+start : function(e)
+{
+var o = Drag.obj = this;
+e = Drag.fixE(e);
+var y = parseInt(o.vmode ? o.root.style.top : o.root.style.bottom);
+var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
+o.root.onDragStart(x, y);
+
+o.lastMouseX = e.clientX;
+o.lastMouseY = e.clientY;
+
+if (o.hmode) {
+if (o.minX != null) o.minMouseX = e.clientX - x + o.minX;
+if (o.maxX != null) o.maxMouseX = o.minMouseX + o.maxX - o.minX;
+} else {
+if (o.minX != null) o.maxMouseX = -o.minX + e.clientX + x;
+if (o.maxX != null) o.minMouseX = -o.maxX + e.clientX + x;
+}
+
+if (o.vmode) {
+if (o.minY != null) o.minMouseY = e.clientY - y + o.minY;
+if (o.maxY != null) o.maxMouseY = o.minMouseY + o.maxY - o.minY;
+} else {
+if (o.minY != null) o.maxMouseY = -o.minY + e.clientY + y;
+if (o.maxY != null) o.minMouseY = -o.maxY + e.clientY + y;
+}
+
+document.onmousemove = Drag.drag;
+document.onmouseup = Drag.end;
+
+return false;
+},
+
+drag : function(e)
+{
+e = Drag.fixE(e);
+var o = Drag.obj;
+
+var ey = e.clientY;
+var ex = e.clientX;
+var y = parseInt(o.vmode ? o.root.style.top : o.root.style.bottom);
+var x = parseInt(o.hmode ? o.root.style.left : o.root.style.right );
+var nx, ny;
+
+if (o.minX != null) ex = o.hmode ? Math.max(ex, o.minMouseX) : Math.min(ex, o.maxMouseX);
+if (o.maxX != null) ex = o.hmode ? Math.min(ex, o.maxMouseX) : Math.max(ex, o.minMouseX);
+if (o.minY != null) ey = o.vmode ? Math.max(ey, o.minMouseY) : Math.min(ey, o.maxMouseY);
+if (o.maxY != null) ey = o.vmode ? Math.min(ey, o.maxMouseY) : Math.max(ey, o.minMouseY);
+
+nx = x + ((ex - o.lastMouseX) * (o.hmode ? 1 : -1));
+ny = y + ((ey - o.lastMouseY) * (o.vmode ? 1 : -1));
+
+if (o.xMapper) nx = o.xMapper(y)
+else if (o.yMapper) ny = o.yMapper(x)
+
+Drag.obj.root.style[o.hmode ? "left" : "right"] = nx + "px";
+Drag.obj.root.style[o.vmode ? "top" : "bottom"] = ny + "px";
+Drag.obj.lastMouseX = ex;
+Drag.obj.lastMouseY = ey;
+
+Drag.obj.root.onDrag(nx, ny);
+return false;
+},
+
+end : function()
+{
+document.onmousemove = null;
+document.onmouseup = null;
+Drag.obj.root.onDragEnd( parseInt(Drag.obj.root.style[Drag.obj.hmode ? "left" : "right"]),
+parseInt(Drag.obj.root.style[Drag.obj.vmode ? "top" : "bottom"]));
+Drag.obj = null;
+},
+
+fixE : function(e)
+{
+if (typeof e == 'undefined') e = window.event;
+if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
+if (typeof e.layerY == 'undefined') e.layerY = e.offsetY;
+return e;
+}
+};
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/layout.class.php ./bartlby-ui/layout.class.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/layout.class.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/layout.class.php	2008-10-13 22:04:01.000000000 +0200
@@ -1,25 +1,26 @@
 <?
-#////////////////////////////////////////////
-#//
-#// MXS(erver) Project by h.januschka
-#// initatated august 2003
-#// -------------------------------------
-#// MultiPlayerMedia Server with the main 
-#// goal to have an easy interface for 
-#// Macromedia FLASH© games and Guis
-#//
-#//
-#//
-#//
-#//--------------------------------------------
-#// @package WAI
-#// @file LAYOUT.class.php
-#// @author klewan <klewan@chello.at>
-#// @desc centralized layout control :)
-#//
-#//
-#//
-#////////////////////////////////////////////
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+
 
 require_once ("xajax/xajax.inc.php");
 include("xajax.common.php");
@@ -27,7 +28,13 @@
 class Layout {
 	var $OUT;
 	var $template_file;
+	var $box_count;
 	
+
+	function setTheme($name="classic") {
+		if($name=="") $name="classic";
+		$this->theme=$name;	
+	}
 	
 	function set_menu($men) {
 		$this->OUT .= "<script>doToggle('" . $men . "');</script>";	
@@ -42,6 +49,13 @@
 		$this->template_file=$file;
 	}
 	function Layout($scr='') {
+		$this->box_count=1;
+		if(bartlby_config("ui-extra.conf", "theme") != "") {
+			$this->theme=bartlby_config("ui-extra.conf", "theme");
+		} else {
+			$this->theme="classic";
+		}
+
 		$this->template_file="template.html";
 		$this->start_time=$this->microtime_float();
 		$this->menu_set=false;
@@ -157,7 +171,8 @@
 		return "";	
 	}
 	function addRoot($name) {
-		$r = "<table class=\"nopad\">	<tr><td class=\"nav_main\" onClick=\"doToggle('$name')\"><img id='" . $name . "_plus' src='images/plus.gif' border=0> $name</td></tr><tr><td class=\"nav_place\">&nbsp;</td></tr></table><table class=\"nopad\" id='" . $name . "_sub' style='display:none;'>";
+
+		$r = "<table class=\"nopad\">	<tr><td class=\"nav_main\" onClick=\"doToggle('$name')\"><img id='" . $name . "_plus' src='themes/" . $this->theme . "/images/plus.gif' border=0> $name</td></tr><tr><td class=\"nav_place\">&nbsp;</td></tr></table><table class=\"nopad\" id='" . $name . "_sub' style='display:none;'>";
 		
 		
 		return $r;	
@@ -170,8 +185,8 @@
 		return "</table>";	
 	}
 	
-	function display($cr="") {
-		//global $BARTLBY_UI_VERSION;
+	function display($lineup_file="") {
+		if($lineup_file=="no") $lineup_file="";
 		global $xajax;
 		
 		if($this->menu_set == false) {
@@ -185,20 +200,77 @@
 			$this->set_menu("downtimes");
 			
 		}
+		$this->template_file="themes/" . $this->theme . "/theme.php";
 			
 		$this->end_time=$this->microtime_float();
 		$diff=$this->end_time-$this->start_time;
-		$source_file=$_SERVER[SCRIPT_URI];
-		$source_file=str_replace(".php", ".phps",$source_file);
-		$bname=basename($source_file);
 		
+
+		//Create Menu.
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Monitoring");
+                $this->ext_menu .= $this->addSub("Monitoring", "Overview","overview.php");
+                $this->ext_menu .= $this->addSub("Monitoring", "Services","services.php");
+                $this->ext_menu .= $this->addSub("Monitoring", "Servers","extensions_wrap.php?script=ServerGroups/groupview.php");
+		$this->ext_menu .= $this->endMenu();
+
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Reporting");
+                $this->ext_menu .= $this->addSub("Reporting", "Report/s","create_report.php");
+                $this->ext_menu .= $this->addSub("Reporting", "Logfile","logview.php");
+                $this->ext_menu .= $this->addSub("Reporting", "Notifications","logview.php?bartlby_filter=@NOT@");
+		$this->ext_menu .= $this->endMenu();
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Server/s");
+                $this->ext_menu .= $this->addSub("Server/s", "Add","add_server.php");
+                $this->ext_menu .= $this->addSub("Server/s", "Modify","server_list.php?script=modify_server.php");
+                $this->ext_menu .= $this->addSub("Server/s", "Delete","server_list.php?script=delete_server.php");
+		$this->ext_menu .= $this->EndMenu();
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Packages");
+                $this->ext_menu .= $this->addSub("Packages", "Install","server_list.php?script=install_pkg.php");
+                $this->ext_menu .= $this->addSub("Packages", "Uninstall","server_list.php?script=uninstall_pkg.php");
+                $this->ext_menu .= $this->addSub("Packages", "Create","package_create.php");
+                $this->ext_menu .= $this->addSub("Packages", "Delete","package_delete.php");
+		$this->ext_menu .= $this->endMenu();
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Service/s");
+                $this->ext_menu .= $this->addSub("Service/s", "Add","add_service.php");
+                $this->ext_menu .= $this->addSub("Service/s", "Modify","service_list.php?script=modify_service.php");
+                $this->ext_menu .= $this->addSub("Service/s", "Delete","service_list.php?script=delete_service.php");
+                $this->ext_menu .= $this->addSub("Service/s", "Bulk","bulk_actions.php");
+		$this->ext_menu .= $this->endMenu();
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Downtime/s");
+                $this->ext_menu .= $this->addSub("Downtime/s", "Add","service_list.php?script=add_downtime.php");
+                $this->ext_menu .= $this->addSub("Downtime/s", "Modify","downtime_list.php?script=modify_downtime.php");
+                $this->ext_menu .= $this->addSub("Downtime/s", "Delete","downtime_list.php?script=delete_downtime.php");
+		$this->ext_menu .= $this->endMenu();
+
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Worker/s");
+                $this->ext_menu .= $this->addSub("Worker/s", "Add","add_worker.php");
+                $this->ext_menu .= $this->addSub("Worker/s", "Modify","user_list.php?script=modify_worker.php");
+                $this->ext_menu .= $this->addSub("Worker/s", "Delete","user_list.php?script=delete_worker.php");
+		$this->ext_menu .= $this->addSub("Worker/s", "Permissions","user_list.php?script=permission_worker.php");
+		$this->ext_menu .= $this->endMenu();
+
+
+		
+
+
+
 		$dhl = opendir("extensions");
 		while($file = readdir($dhl)) {
 			if($file != "." && $file != "..") {
 				if(!file_exists("extensions/" .  $file . ".disabled")) {
 					@include_once("extensions/" . $file . "/" . $file . ".class.php");
-					
-					
 					if (class_exists($file)) {
 						eval("\$clh = new " . $file . "();");
 						if(method_exists($clh, "_menu")) {
@@ -210,58 +282,130 @@
 		}
 		closedir();
 		
+
+		$this->ext_menu .= $this->beginMenu();
+		$this->ext_menu .= $this->addRoot("Core");
+                $this->ext_menu .= $this->addSub("Core", "Reload","bartlby_action.php?action=reload");
+                $this->ext_menu .= $this->addSub("Core", "Config","choose_config.php");
+                $this->ext_menu .= $this->addSub("Core", "Statistic","statistic.php");
+		$this->ext_menu .= $this->addSub("Core", "Event Queue","event_queue.php");
+		$this->ext_menu .= $this->addSub("Core", "Extensions","extensions.php");
+		$this->ext_menu .= $this->addSub("Core", "About","version.php");
+		$this->ext_menu .= $this->endMenu();
+
 		
+		$this->BTUICONTENT=$this->OUT;
+		$this->BTUIOUTSIDE=$this->OUTSIDE;
+		$this->BTUIBOXTITLE=$this->BoxTitle;
+		$this->BTUITIME=round($diff,2);
+		$this->BTLEXTMENU=$this->ext_menu;
+		$this->SERVERTIME=date("d.m.Y H:i:s");
+		$this->XAJAX=$xajax->getJavascript("xajax");			
+		$this->UIVERSION=BARTLBY_UI_VERSION;
+		$this->RELNOT=BARTLBY_RELNOT;
 		
-		$fp=fopen($this->template_file, "r");
-		while(!feof($fp)) {
-			$str=fgets($fp, 1024);
-			$o = str_replace("<!--BTUICONTENT-->",$this->OUT,$str);
-			$o = str_replace("<!--BTUIOUTSIDE-->",$this->OUTSIDE,$o);
-			$o = str_replace("<!--BTUIBOXTITLE-->",$this->BoxTitle,$o);
-			$o = str_replace("<!--BTUITIME-->",round($diff,2),$o);
-			$o = str_replace("<!--BTLEXTMENU-->",$this->ext_menu,$o);
-			$o = str_replace("<!--SERVERTIME-->",date("d.m.Y H:i:s") ,$o);
-			$o = str_replace("<!--XAJAX-->", $xajax->getJavascript("xajax"), $o);
-			$o = str_replace("<!--UIVERSION-->",BARTLBY_UI_VERSION ,$o);
-			echo $o; 	
+		$this->create_box($this->BoxTitle, $this->OUT, "MAIN");
+
+
+		//Default LineUp
+		if($lineup_file == "") {
+			$lineup_file="default";
 		}
-		fclose($fp);
+
+		$lineup_path="themes/" . $this->theme . "/lineups/" . $lineup_file . ".php";
+		if(!file_exists($lineup_path)) {
+			$lineup_path="themes/classic/lineups/default.php";
+		}
+		ob_start();
+			include($lineup_path);
+		
+		$this->BTUIOUTSIDE = ob_get_contents();		
+		ob_end_clean();
+		
+
+		ob_start();
+			include($this->template_file);
 		
+		$o = ob_get_contents();
+		ob_end_clean();
+
+		echo $o;
+
+
 			
 		
 		
 	}
-	function create_box($title, $content, $id="") {
-		if($id != "") {
-			$oid = " id=\"$id\" ";
+
+	function disp_box($name) {
+		if($name != "UNPLACED") {
+			$regexp=0;
+			if(preg_match("/\*/", $name)) $regexp=1;
+			
+			if($regexp == 0) {
+				$this->boxes_placed[$name]=true;
+				return $this->boxes[$name];
+			} else {
+				//Find Matching boxes;
+				$r = "";
+				while(list($k, $v) = @each($this->boxes)) {
+					if(preg_match("/" . $name . "/i", $k)) {
+					
+						$this->boxes_placed[$k]=true;
+						$r .= $this->boxes[$k];
+					}
+				}
+				return $r;
+			}
 		} else {
-			$oid = "";	
+				
+			@krsort($this->boxes);
+			while(list($k, $v) = @each($this->boxes)) {
+				if($this->boxes_placed[$k] != true) {
+					$r .= $v;
+				}			
+			}
+			return $r;
 		}
+	}
+	function create_box($title, $content, $id="", $plcs="", $box_file="") {
+		global $btl;
 		
+		$layout=$this;
+		$put_a_standard_box_around_me=true;
+		if($id != "") {
+			$oid = $id;
+		} else {
+			//$oid = rand(100,2);	
+			$oid=$this->box_count;
+			$this->box_count++;
+		}
+		if(!is_array($plcs)) {
+			$box_file="default_box.php";
+		} else {
+			$box_file .= ".php";
+		}
+		$boxes_path="themes/" . $this->theme . "/boxes/" . $box_file;
+		if(!file_exists($boxes_path)) {
+			
+			$boxes_path="themes/classic/boxes/" . $box_file;
+		}
+		ob_start();
+			include($boxes_path);
 		
-		$rr .= '
-			<table class="nopad" ' . $oid . '>
-				<tr>
-					<td class="box_left_corner_top">&nbsp;</td>
-					<td class="box_top_run">' . $title . '</td>
-					<td class="box_right_corner_top">&nbsp;</td>
-				</tr>
-				<tr>
-					<td class="box_left_run">&nbsp;</td>
-					<td class="box_content">' . $content . '</td>
-					<td class="box_right_run">&nbsp;</td>
-				</tr>
-				<tr>
-					<td class="box_left_corner_bottom">&nbsp;</td>
-					<td class="box_bottom_run">&nbsp;</td>
-					<td class="box_right_corner_bottom">&nbsp;</td>
-				</tr>
-			</table>
-		';
-		return $rr;
+		$o = ob_get_contents();	
+			
+		ob_end_clean();		
+		$this->boxes[$oid]=$o;
+		if($box_file != "default_box.php" && $put_a_standard_box_around_me == true) { //pack into a standard box
+			$this->create_box($title, $o, $oid);
+		}
+
+
+		return $oid;
 	}
 	function push_outside($content) {
-		$this->OUTSIDE .= $content;
+		//echo "HELLP!!!";
 	}
 
-}
\ No newline at end of file
+}
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/logview.php ./bartlby-ui/logview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/logview.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/logview.php	2008-09-07 14:09:01.000000000 +0200
@@ -231,7 +231,7 @@
 					1=>Array(
 						'class'=>'header1',
 						'width'=>25,						
-						'show'=>"<img src='images/$img'>"
+						'show'=>"<img src='themes/" . $layout->theme . "/images/$img'>"
 						),
 					2=>Array(
 						'width'=>720,
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/modify_service.php ./bartlby-ui/modify_service.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/modify_service.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/modify_service.php	2008-05-24 12:44:33.000000000 +0200
@@ -42,10 +42,16 @@
 $defaults=@bartlby_get_service_by_id($btl->CFG, $_GET[service_id]);
 
 $fm_action="modify_service";
+$server_list_type="";
+$server_field_name="service_server";
+
 if($_GET["copy"] == "true") {
 	$fm_action="add_service";
 	$btl->hasRight("action.copy_service");
+	$server_list_type="multiple";
+	$server_field_name="service_server[]";
 }
+
 if($_GET["new"] == "true") {
 	$fm_action="add_service";
 	$btl->hasRight("action.add_service");
@@ -65,7 +71,8 @@
 	
 	$defaults[escalate_divisor]=(int)bartlby_config("ui-extra.conf", "new.service.escalate_divisor");
 	$defaults[renotify_interval]=(int)bartlby_config("ui-extra.conf", "new.service.renotify_interval");
-	
+	$server_list_type="multiple";
+	$server_field_name="service_server[]";	
 	
 }
 if($fm_action == "modify_service") {
@@ -311,7 +318,7 @@
 	$layout->Td(
 		array(
 			0=>"Service Server",
-			1=>$layout->DropDown("service_server", $servers)
+			1=>$layout->DropDown($server_field_name, $servers, $server_list_type)
 			
 		)
 	)
@@ -664,4 +671,4 @@
 
 $layout->TableEnd();
 $layout->FormEnd();
-$layout->display();
\ No newline at end of file
+$layout->display();
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/nonav.html ./bartlby-ui/nonav.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/nonav.html	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/nonav.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title>bartlby</title>
-
-<link rel="stylesheet" id="CSS" type="text/css" href="images/btl.css"></link>
-<script type="text/javascript" src="images/btl.js"></script>
-<script type="text/javascript" src="images/dom-drag.js"></script>
-
-</head>
-<!--BTUICONTENT-->
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/overview.php ./bartlby-ui/overview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/overview.php	2008-04-08 16:42:58.000000000 +0200
+++ ./bartlby-ui/overview.php	2008-09-07 14:49:37.000000000 +0200
@@ -1,12 +1,37 @@
 <?
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+
 	include "config.php";
 
 	include "layout.class.php";
 	include "bartlby-ui.class.php";
 	
 	$btl=new BartlbyUi($Bartlby_CONF);
-	$btl->hasRight("main.overview");
 	$layout= new Layout();
+
+
+	$btl->hasRight("main.overview");
+
 	$layout->set_menu("main");
 	$layout->MetaRefresh(30);
 	$layout->Table("100%");
@@ -16,26 +41,19 @@
 	$reload_status="data is up-to-date";
 	
 	if ($info[sirene_mode] == 0) {
-		$sir="<a href='#' title='Enable Sirene' onClick=\"document.location.href='bartlby_action.php?action=sirene_enable';\"><img border=0 title='Enable Sirene' src='images/Disable-Sirene.gif'></A>";	
+		$sir="<a href='#' title='Enable Sirene' onClick=\"document.location.href='bartlby_action.php?action=sirene_enable';\"><img border=0 title='Enable Sirene' src='themes/" . $layout->theme . "/images/Disable-Sirene.gif'></A>";	
 	} else {
 		$sirene_intv=bartlby_config($btl->CFG, "sirene_interval");
 		if(!$sirene_intv) {
 			$sirene_intv=600;
 		}
-		$sir="Notify Every: $sirene_intv Seconds <a title='Disable Sirene' href='#' onClick=\"document.location.href='bartlby_action.php?action=sirene_disable';\"><img border=0 title='Disable Sirene' src='images/Enable-Sirene.gif'></A>";	
+		$sir="Notify Every: $sirene_intv Seconds <a title='Disable Sirene' href='#' onClick=\"document.location.href='bartlby_action.php?action=sirene_disable';\"><img border=0 title='Disable Sirene' src='" . $layout->theme . "images/Enable-Sirene.gif'></A>";	
 	}
 	
 	
 	
 	$quickview_disabled=bartlby_config("ui-extra.conf", "quickview_enabled");
-	/*
-	$mode=bartlby_config($btl->CFG, "i_am_a_slave");
-	if(!$mode) {
-		$vmode="MASTER";	
-	} else {
-		$vmode="SLAVE<br>dont change anything";	
-	}
-	*/
+	
 	if($info[round_time_count] > 0 &&  $info[round_time_sum] > 0 ) {
 		$rndMS=round($info[round_time_sum] / $info[round_time_count], 2);
 	} else {
@@ -44,40 +62,9 @@
 	
 		
 	
-	/*
-	$is_repl_on=bartlby_config($btl->CFG, "replication");
-	if(!$is_repl_on) {
-		$is_repl_on="false";	
-	}
-	$repl = "Replication enabled:<font class='font2'> <b>$is_repl_on</b><br>";
-	if($is_repl_on == "true") {
-			$repl_cnt=bartlby_config($btl->CFG, "replicate_cnt");
-			$repl .="Replicating to $repl_cnt Servers every " . bartlby_config($btl->CFG, "replication_intervall") . "<br>";
-			for($x=1; $x<=$repl_cnt; $x++) {
-				$repl .= str_repeat("&nbsp;", 20) . " Server:" . bartlby_config($btl->CFG, "replicate[" . $x . "]") . "<br>";	
-			}
-			$repl .= "Last Replication was on:" . date("d.m.Y H:i:s", $btl->info[last_replication]) . "<br></font>";
-	}
-	*/
+	
 	$servers=$btl->GetSVCMap();
 	
-	$mode=bartlby_config("ui-extra.conf", "xml_remote_count");
-	if($mode) {
-		$remote_xml=array();
-		for($xml_X=1; $xml_X<=$mode; $xml_X++) {
-				$xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]");
-				$xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]");
-				if($xml_cur) {
-					$xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias);
-					if($xml_return) {
-						array_push($remote_xml, $xml_return);	
-					}
-				}
-		}
-		
-		
-			
-	}
 	
 	
 	$hosts_sum=count($servers);
@@ -200,81 +187,7 @@
 	}
 
 	$bar=$prozent_float . "% Ok - $prozent_crit_float % Critical";
-
-	/*
-	for($x=0; $x<$service_sum; $x++) {
-		
-		$svc=bartlby_get_service($btl->CFG, $x);
-		
-		$qck[$svc[server_name]][$svc[last_state]]++;	
-		$qck[$svc[server_name]][10]=$svc[server_id];
-	}
-	
-	*/
-	
-	$quick_view = "<table class='nopad' width=100%>";
-	while(list($k, $v)=@each($qck)) {
 		
-		if($k != $last_qck) {
-			$cl="";
-			$STATE="UP";
-			if ($hosts_a_down[$qck[$k][10]] == 1) {
-				$cl="";
-				$STATE="DOWN";
-			}
-			$quick_view .= "<tr>";
-			$quick_view .= "<td class=$cl><img src='server_icons/" . $qck[$k][server_icon] . "'><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "'>" . $qck[$k][server_name] . "</A></td>";
-			$quick_view .= "<td class=$cl><font size=1>$STATE</td>";
-			$quick_view .= "<td class=$cl><table width=100>";
-			
-			$sf=false;
-			if($qck[$k][0]) {
-				$sf=true;
-				$qo="<tr><td class=green_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=0'>" . $qck[$k][0] . " OK's</A></td></tr>";
-			}
-			if($qck[$k][1]) {
-				$sf=true;
-				$qw="<tr><td class=orange_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=1'>" . $qck[$k][1] . " Warnings</A></td></tr>";
-			}
-			
-			if($qck[$k][2]) {
-				$sf=true;
-				$qc="<tr><td class=red_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=2'>" . $qck[$k][2] . " Criticals</A></td></tr>";
-			}
-			
-			if($qck[$k][3]) {
-				$sf=true;
-				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=3'>" . $qck[$k][3] . " Unkown</A></td></tr>";
-			}
-			if($qck[$k][4]) {
-				$sf=true;
-				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=4'>" . $qck[$k][4] . " Info</A></td></tr>";
-			}
-			if($qck[$k][downtime]) {
-				//$qk="<tr><td class=silver_box><font size=1>" . $qck[$k][downtime] . " Downtime</td></tr>";
-				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&downtime=true'>" . $qck[$k][downtime] . " Downtime</A></td></tr>";
-			}
-			if($qck[$k][acks]) {
-				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=2&acks=yes'>" . $qck[$k][acks] . " Ack Wait</A></td></tr>";
-			}
-					
-				$quick_view .= "$qo";
-				$quick_view .= "$qw";
-				$quick_view .= "$qc";
-				$quick_view .= "$qk";
-			$quick_view .= "</table></td>";
-			$quick_view .= "</tr>";
-			$quick_view .= "<tr><td colspan=3><hr noshade></td></tr>";
-		}
-		
-		$last_qck=$k;	
-		$qo="";
-		$qw="";
-		$qc="";
-		$qk="";
-	}
-	
-	
 	if($gdelay_count>0 && $gdelay_sum > 0) {
 		
 		$avgDEL = round($gdelay_sum/$gdelay_count,2);
@@ -282,6 +195,8 @@
 		$avgDEL = 0;	
 	}
 	
+	
+	
 	$max_running = bartlby_config($btl->CFG, "max_concurent_checks");
 	$max_load = bartlby_config($btl->CFG, "max_load");
 	$curr_load = my_sys_getloadavg();
@@ -302,206 +217,67 @@
 	} else {
 		$load_bar = "<font color=green>" . $info[current_running]  . "</font> Load: <font color=green>" . $curr_load[0] . " / " . $max_load . " </font>";	
 	}
-	$info_box_title='Core Information<div class="clock" nowrap>Time: ' . date("d.m.Y H:i:s") . '</div>';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table class='nopad' width='100%'>
-		<tr>
-			<td class='font1'>(Logged in as: <font class='font2'>" . $btl->user . "</font>)</td>
-			<td align=right class='font1'>Uptime:<font class='font2'>" . $btl->intervall(time()-$btl->info[startup_time]) . "</font></td>
-		</tr>
-		<tr>
-			<td class='font1'>Services: <font class='font2'>" . $info[services] . "&nbsp;&nbsp;&nbsp;&nbsp;Workers: " . $info[workers] . "&nbsp;&nbsp;&nbsp;&nbsp;Downtimes: " . $info[downtimes]. "&nbsp;&nbsp;&nbsp;&nbsp;</td>
-			<td align=right class='font1'>Datalib:<font class='font2'>" . $lib[Name] . "-" . $lib[Version] . "</font></td>
-		</tr>
-		<tr>
-			<td class='font1' colspan=1>
-			Running: $load_bar
-			</td>
-			<td align=right class='font1'>Avg Round Time:<font class='font2'>" . $rndMS . " ms / avg service delay: " . $avgDEL . " sec.</font></td>
-		</tr>
-		
-		<tr>
-			<td colspan=2 class='font1'>Version: <font class='font2'>" . $btl->getRelease() . "</font></td>
-			
-		</tr>
-		<tr>
-			<td colspan=2 class='font1'>Reload: <font class='font2'>" . $reload_status . "</font></td>
-			
-		</tr>
-		
-		
-		
-		<tr>
-			<td class='font1'>&nbsp;</td>
-			<td align=right class='font1'><font class='font2'>$sir</font></td>
-		</tr>
-	</table>";
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+	$info_box_title='Core Information';  
+	$core_content = "";
+	$layout->create_box($info_box_title, $core_content, "core_info", array(
+		'user' => $btl->user,
+		'time' =>  date("d.m.Y H:i:s"),
+		'uptime' =>  $btl->intervall(time()-$btl->info[startup_time]),
+		'services' => $info[services],
+		'workers' => $info[workers],
+		'downtimes' => $info[downtimes],
+		'datalib' => $lib[Name],
+		'datalib_version' => $lib[Version],
+		'running' => $load_bar,
+		'round_ms_time' => $rndMS,
+		'average_delay' => $avgDEL,
+		'release_name' => $btl->getRelease(),
+		'reload_state' => $reload_status,
+		'sirene'  => $sir
+		
+		), "core_info");
 	
 	
 	
 	
 	
-	$quick_view .= "</table>";
-	$tac_title='Tactical Overview<div class="clock"></div>';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$tac_content = "<table class='nopad' width='100%'>
-		<tr>
-			<td colspan=2 class='font1'>Hosts:<font class='font2'>" . $hosts_sum . "</font></td>
-			<td colspan=5 align=left class='font1'>Services:<font class='font2'>" . $service_sum . "</font></td>
-		</tr>
-		<tr>
-			<td class='font1'>Up:<font class='font2'>" . $hosts_up. "</font></td>
-			<td class='font1'>Down:<font class='font2'>" . $hosts_down. "</font></td>
-			<td class='font1'><a href='services.php?expect_state=0'><font color=green>OK</font></A>:<font class='font2'>" . $services_ok. "</font></td>
-			<td class='font1'><a href='services.php?expect_state=1'><font color=orange>Warning</font></A>:<font class='font2'>" . $services_warning. "</font></td>
-			<td class='font1'><a href='services.php?expect_state=2'><font color=red>Critical</font></A>:<font class='font2'>" . $services_critical. "</font></td>
-			<td class='font1'><a href='services.php?downtime=true'>Downtime</A>:<font class='font2'>" . $services_downtime. "</font></td>
-			<td class='font1'><a href='services.php?acks=yes'>Acks</A> outstanding:<font class='font2'>" . $acks_outstanding. "</font></td>
-			<td class='font1'><a href='services.php?expect_state=0&invert=true'>all failures</A></td>
-		</tr>
-		<tr>
-			<td class='font1' colspan=7>$repl</td>
-			
-		</tr>
-	</table>";
-	$layout->push_outside($layout->create_box($tac_title, $tac_content));
-	
-	$health_title='System Health<div class="clock"></div>';  
-	$silverbar = "<table class='nopad'>
-		<tr>
-			<td class='bar_left_silver'>&nbsp;</td>
-			<td class='bar_middle_silver' style='width:" . 100*7.3 . "'></td>
-			<td class='bar_right_silver'>&nbsp;</td>
-			<td class='font2'>" . $prozent_float . "% OK</td>
-			
-		</tr>
-		
-	</table>";
-	
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$health_content = "<div style='position:relative; z-index:2; '> <table class='nopad'>
-		<tr>
-			<td  class='bar_left_" . $color . "'>&nbsp;</td>
-			<td class='bar_middle_" . $color . "' style='width:" . $prozent_float*7.3 . "'></td>
-			<td class='bar_right_" . $color . "'>&nbsp;</td>
-			<td class='font2'>&nbsp;</td>
-			
-		</tr>
-		
-	</table></div><div style='position:relative; z-index:1; top:-40px;'>$silverbar</div>";
-	$layout->push_outside($layout->create_box($health_title, $health_content));
 	
-	//Generate external boxes ;-)
-	
-	for($bx=0; $bx<count($remote_xml); $bx++) {
-		$xml_base_url=substr($remote_xml[$bx][url], 0, strrpos($remote_xml[$bx][url], "/")+1);
-		
-		$xml_box_content=$btl->XMLBoxHealth($remote_xml[$bx][info],$remote_xml[$bx][services]);
-		$remote_xml[$bx][qck]=$xml_box_content[qck];
-		$xml_box_title=$remote_xml[$bx][alias];
-		
-		$silverbar = "<table class='nopad'>
-		<tr>
-			<td class='bar_left_silver'>&nbsp;</td>
-			<td class='bar_middle_silver' style='width:" . 100*7.3 . "'></td>
-			<td class='bar_right_silver'>&nbsp;</td>
-			<td class='font2'>" . $xml_box_content[prozent_float] . "% OK</td>
-			
-		</tr>
-		
-		</table>";
-		
-		$xml_box_output = "<div style='position:relative; z-index:2; '> <table class='nopad'>
-		<tr>
-			<td  class='bar_left_" . $xml_box_content[color] . "'>&nbsp;</td>
-			<td class='bar_middle_" . $xml_box_content[color] . "' style='width:" . $xml_box_content[prozent_float]*7.3 . "'></td>
-			<td class='bar_right_" . $xml_box_content[color] . "'>&nbsp;</td>
-			<td class='font2'>&nbsp;</td>
-			
-		</tr>
-		
-		
-	</table></div><div style='position:relative; z-index:1; top:-40px;'>$silverbar</div>
-	<table class='nopad' width='100%'>
-		<tr>
-			
-			<td colspan=6 class='font1'>Uptime: <font class='font2'>" . $btl->intervall(time()-$remote_xml[$bx][info][0][startup_time]) . "</font></td>
-			
-		</tr>
-		<tr>
-			<td colspan=6 class='font1'>Home: <font class='font2'><a target='_blank' href='$xml_base_url'>" . $xml_base_url . "</A></font></td>
-			
-		</tr>
-		<tr>
-			<td colspan=6 class='font1'>Version:<font class='font2'>" . $remote_xml[$bx][info][0][version] . "</font></td>
-			
-		</tr>
-		<tr>
-			<td colspan=2 class='font1'>Hosts:<font class='font2'>" . $xml_box_content[hosts_sum] . "</font></td>
-			<td colspan=4 align=left class='font1'>Services:<font class='font2'>" . $xml_box_content[service_sum] . "</font></td>
-		</tr>
-		<tr>
-			<td class='font1'>Up:<font class='font2'>" . $xml_box_content[hosts_up]. "</font></td>
-			<td class='font1'>Down:<font class='font2'>" . $xml_box_content[hosts_down] . "</font></td>
-			<td class='font1'>OK:<font class='font2'>" . $xml_box_content[services_ok]. "</font></td>
-			<td class='font1'>Warning:<font class='font2'>" . $xml_box_content[services_warning]. "</font></td>
-			<td class='font1'>Critical:<font class='font2'>" . $xml_box_content[services_critical]. "</font></td>
-			<td class='font1'>Downtime:<font class='font2'>" . $xml_box_content[services_downtime]. "</font></td>
-			<td class='font1'>Acks outstanding:<font class='font2'>" . $xml_box_content[acks_outstanding]. "</font></td>
-		</tr>
-		
-		
-	</table>
-	
-	";
-	$layout->push_outside($layout->create_box($xml_box_title, $xml_box_output));
-		
-		
-		
-		
-	}
-	//Generate external quick views ;-)
-	
-	for($bx=0; $bx<count($remote_xml); $bx++) {
-		
-		$xml_box_content=$btl->XMLQuickView($remote_xml[$bx][info],$remote_xml[$bx][qck], $bx+1);
-		$xml_box_title=$remote_xml[$bx][alias] . " --> QuickView";
-		
-		
-		$layout->push_outside($layout->create_box($xml_box_title, $xml_box_content));
-		
-		
-		
-		
-	}
+	$tac_title='Tactical Overview';  
+	$layout->create_box($tac_title, $tac_content, "tactical_overview",array(
+		'host_sum' => $hosts_sum,
+		'hosts_up' => $hosts_up,
+		'hosts_down' => $hosts_down,
+		'services_ok' => $services_ok,
+		'services_warning' => $services_warning,
+		'services_critical' => $services_critical,
+		'services_downtime' => $services_downtime,
+		'acks_outstanding' => $acks_outstanding,
+		'services_sum' => $service_sum
+	
+	), "tactical_overview");
+	
+	$health_title='System Health';  
+	$layout->create_box($health_title, $health_content,"system_health", array(
+			'prozent_float' => $prozent_float,
+			'color' => $color
+		), "system_health");
 	
 	
 	$layout->setTitle("QuickView");
-	
 	$r=$btl->getExtensionsReturn("_overview", $layout);
 	
 	if($quickview_disabled != "false") {
-		$layout->Tr(
-		$layout->Td(
-				array(0=>$quick_view)
-			)
-
-		);
+		$qv_title='Quick View';  
+		$layout->create_box($qv_title, $qv_content,"quick_view", array(
+				'quick_view' => $qck
+			), "quick_view");
 		
-	} else {
-		$layout->Tr(
-		$layout->Td(
-				array(0=>"<i>Disabled</i>")
-			)
-
-		);	
-	}
-	
+	} 
 	
 	
+	$layout->boxes_placed[MAIN]=false;
 	$layout->TableEnd();
-	$layout->display();
+	$layout->display("overview");
 	
 	
 function my_sys_getloadavg() {
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/permission_worker.php ./bartlby-ui/permission_worker.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/permission_worker.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/permission_worker.php	2008-11-26 16:49:02.000000000 +0100
@@ -167,6 +167,8 @@
 	
 	
 	$title="UI privileges";  
+	$ov .= $layout->Field("worker_id", "hidden", $_GET[worker_id]) . "<input type=submit value='Save'>";
+	$ov .= "</form>";
 	$content = "<table>" . $ov . "</table>";
 	$layout->push_outside($layout->create_box($title, $content));
 	
@@ -174,10 +176,10 @@
 
 	
 	$title="";  
-	$content = $layout->Field("worker_id", "hidden", $_GET[worker_id]) . "<input type=submit value='Save'>";
-	$layout->push_outside($layout->create_box($title, $content));
+
+	//$layout->push_outside($layout->create_box($title, $content));
+
 
 
 
-$ov .= "</form>";
-$layout->display();
\ No newline at end of file
+$layout->display();
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/server_detail.php ./bartlby-ui/server_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/server_detail.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/server_detail.php	2008-10-13 22:04:01.000000000 +0200
@@ -24,12 +24,9 @@
 $layout= new Layout();
 $layout->set_menu("main");
 $layout->setTitle("Services");
-if(preg_match("/^XML:(.*):(.*)$/i", $_GET[server_id], $match)) {
-	$defaults=$btl->remoteServerByID($match[1], $match[2]);
-} else {
-	$defaults=bartlby_get_server_by_id($btl->CFG, $_GET[server_id]);
-	$btl->hasServerRight($_GET[server_id]);
-}
+
+$defaults=bartlby_get_server_by_id($btl->CFG, $_GET[server_id]);
+$btl->hasServerRight($_GET[server_id]);
 
 if(!$defaults) {
 	$btl->redirectError("BARTLBY::OBJECT::MISSING");
@@ -37,25 +34,8 @@
 }
 
 $map=$btl->getSVCMap($btl->CFG, NULL, NULL);
-$mode=bartlby_config("ui-extra.conf", "xml_remote_count");
-if($mode) {
-	$remote_xml=array();
-	for($xml_X=1; $xml_X<=$mode; $xml_X++) {
-			$xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]");
-			$xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]");
-			if($xml_cur) {
-				$xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias);
-				$btl->appendXML_to_svc_map($xml_return[services], $xml_cur_alias, $map, $xml_X);	
-			}
-	}
-	
-	
-		
-}
-
-
 $server_map=$map[$_GET[server_id]];
-$layout->Table("100%");
+
 
 if($btl->isServerUp($_GET[server_id], $map)) {
 	$isup="<font color='green'>UP</font>";	
@@ -66,7 +46,6 @@
 $services_assigned="";
 
 for($x=0; $x<count($server_map); $x++) {
-	//$services_assigned .= "<a href='service_detail.php?service_place=" . $server_map[$x][shm_place] . "'>" . $server_map[$x][service_name] . "</A><br>";
 	$dmp_info[$server_map[$x][current_state]] += 1;
 	
 }
@@ -75,12 +54,6 @@
 		$services_assigned .= "<a href='services.php?server_id=" . $_GET[server_id] . "&expect_state=" . $k . "'><font color='" . $btl->getColor($k) . "'>" . $btl->getState($k) . "</font></A>:" . $v . ",";
 }
 
-
-//echo $defaults[last_notify_send] . "<br>";
-
-
-
-
 if($defaults["server_notify"]==1) {
 	$noti_en="true";
 } else {
@@ -95,91 +68,23 @@
 
 
 $info_box_title='Server Info';  
-// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-$core_content = "<table  width='100%'>
-	<tr>
-		<td width=150 class='font2'>Name:</td>
-		<td align=left >" . $defaults[server_name] . "</font></td> 
-		<td>&nbsp;</td>     
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Status:</td>
-		<td align=left >" . $isup . "</font></td> 
-		<td>&nbsp;</td>     
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Ip:</td>
-		<td align=left >" . $defaults[server_ip] . "/" . gethostbyname($defaults[server_ip]) . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Port:</td>
-		<td align=left >" . $defaults[server_port] . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Notifications?:</td>
-		<td align=left >" . $noti_en . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Enabled ?:</td>
-		<td align=left >" . $server_en . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Last notify sent:</td>
-		<td align=left >" . date("d.m.Y H:i:s", $defaults[last_notify_send]) . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Flap Seconds:</td>
-		<td align=left >" . $defaults[server_flap_seconds] . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Icon:</td>
-		<td align=left ><img src='server_icons/" . $defaults[server_icon] . "'></font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Location:</td>
-		<td align=left >" . getGeoip(gethostbyname($defaults[server_ip])) . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	
-	<tr>
-		<td width=150 class='font2' valign=top>Server Life indicator:</td>
-		<td align=left >" . $btl->resolveDeadMarker($defaults[server_dead], $map) . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	
-	
-	
-</table>";
-
 
-
-$layout->push_outside($layout->create_box($info_box_title, $core_content));
+$layout->create_box($info_box_title, $core_content, "server_detail_server_info", array(
+										"service" => $defaults,
+										"isup" => $isup,
+										"notify_enabled" => $noti_en,
+										"server_enabled" => $server_en,
+										"map" => $map
+										),
+			"server_detail_server_info");
 
 
 $info_box_title='Services';  
-// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-$core_content = "<table  width='100%'>
-	<tr>
-		<td width=150 class='font2'>Number of services:</td>
-		<td>" . count($server_map) . "</td> 
-	</tr>
-	<tr>
-		<td width=150 class='font2' valign=top>Services: </td>
-		<td> <a href='services.php?server_id=$_GET[server_id]'>All</A>," . $services_assigned . "</td> 
-	</tr>
-	
-	
-</table>";
-
-
-$layout->push_outside($layout->create_box($info_box_title, $core_content));
+$layout->create_box($info_box_title, $core_content, "server_detail_services", array(
+									"services_assigned" => $services_assigned,
+									"server_map" => $server_map
+									)
+			, "server_detail_services");
 	
 
 
@@ -190,6 +95,6 @@
 
 
 
-$layout->TableEnd();
 
-$layout->display();
\ No newline at end of file
+
+$layout->display("server_detail");
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/service_detail.php ./bartlby-ui/service_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/service_detail.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/service_detail.php	2008-10-13 21:28:10.000000000 +0200
@@ -15,13 +15,9 @@
 	$_GET[service_place] = $btl->findSHMPlace($_GET[service_id]);	
 }
 
-if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) {
-	$defaults=$btl->remoteServiceByID($match[1], $match[2]);
-} else {
-	$defaults=bartlby_get_service($btl->CFG, $_GET[service_place]);
-	
-	$btl->hasServerorServiceRight($defaults[service_id]);
-}
+$defaults=bartlby_get_service($btl->CFG, $_GET[service_place]);
+$btl->hasServerorServiceRight($defaults[service_id]);
+
 if(!$defaults) {
 	$btl->redirectError("BARTLBY::OBJECT::MISSING");
 	exit(1);	
@@ -32,7 +28,7 @@
 } 
 
 $map=$btl->getSVCMap($btl->CFG, NULL, NULL);
-$layout->Table("100%");
+
 
 $svc_color=$btl->getColor($defaults[current_state]);
 $svc_state=$btl->getState($defaults[current_state]);
@@ -143,195 +139,43 @@
 
 
 $info_box_title='Service Info';  
-// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-$core_content = "<table  width='100%'>
-	<tr>
-		<td width=150 class='font2'>Server:</td>
-		<td align=left ><a href='server_detail.php?server_id=" . $defaults[server_id]  . "'>" . $defaults[server_name] . "</A> ( IP: " . gethostbyname($defaults[client_ip]) . " Port: " . $defaults[client_port] . " )</font> $server_enabled </td> 
-		<td>&nbsp;</td>     
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Name:</td>
-		<td align=left >" . $defaults[service_name] . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>ID:</td>
-		<td align=left >" . $defaults[service_id] . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Type:</td>
-		<td align=left >" . $svc_type . "</font></td>  
-		<td>&nbsp;</td>         
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Current State:</td>
-		<td align=left><font color='$svc_color'>" . $svc_state . "</font></td> 
-		<td>&nbsp;</td>          
-	</tr>
-	<tr>
-		<td width=150 class='font2' Valign=top>Server Life Indicator:</td>
-		<td align=left>" . $btl->resolveDeadMarker($defaults[server_dead], $map) . "</td> 
-		<td>&nbsp;</td>          
-	</tr>
-	
-	<tr>
-		<td width=150 class='font2'>Last Check:</td>
-		<td align=left >" . date("d.m.Y H:i:s", $defaults[last_check]) . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>approx. next Check:</td>
-		<td align=left >" . date("d.m.Y H:i:s", $defaults[last_check]+$defaults[check_interval]) . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	
-	<tr>
-		<td width=150 class='font2'>Check intervall:</td>
-		<td align=left >" . $defaults[check_interval_original] . " / " . $defaults[check_interval] .  "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Last Notify Send:</td>
-		
-		<td align=left >" . date("d.m.Y H:i:s", $defaults[last_notify_send]) . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-		<tr>
-		<td width=150 class='font2'>Re-Notification Interval</td>
-		
-		<td align=left >" .  $renot_en ."</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-		<tr>
-		<td width=150 class='font2'>Escalate after:</td>
-		
-		<td align=left >" . $escal_en  . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Notify Enabled:</td>
-		<td align=left >" . $noti_en . " $server_noti_enabled</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Check Enabled:</td>
-		<td align=left >" . $serv_en . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2' valign=top>Check Plan:</td>
-		<td align=left >" . $plan_box . "</td>
-		<td>&nbsp;</td>           
-	</tr>
-	
-	<tr>
-		<td width=150 class='font2'>Flap count:</td>
-		<td align=left >" . $defaults[flap_count] . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Flap seconds:</td>
-		<td align=left >" . $defaults[flap_seconds] . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Ack settings:</td>
-		<td align=left >" . $needs_ack . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-
-	<tr>
-		<td width=150 class='font2'>Status:</td>
-		<td align=left >" . $defaults[service_retain_current] . "/"  . $defaults[service_retain] . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>	
-	
-		<tr>
-		<td width=150 class='font2'>Is Running?:</td>
-		<td align=left >" .  $currun . "</font></td>
-		<td>&nbsp;</td>           
-	</tr>	
-	<tr>
-		<td width=150 class='font2'>Average Check Time:</td>
-		<td align=left >" .  $svcMS . " ms</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	<tr>
-		<td width=150 class='font2'>Average delay Time:</td>
-		<td align=left >" .  $svcDEL . " Seconds</font></td>
-		<td>&nbsp;</td>           
-	</tr>
-	
-</table>";
-
-$layout->push_outside($layout->create_box($info_box_title, $core_content));
+$layout->create_box($info_box_title, $core_content, "service_detail_service_info", array(
+											"service" => $defaults,
+											"service_type" => $svc_type,
+											"map" => $map,
+											"server_enabled" => $server_enabled,
+											"currently_running" => $currun,
+											"renotify" => $renot_en,
+											"escalate" => $escal_en,
+											"server_notifications" => $server_noti_enabled,
+											"server_enabled" => $server_enabled,
+											"service_ms" => $svcMS,
+											"service_delay" => $svcDEL,
+											"service_enabled" => $serv_en,
+											"notify_enabled" => $noti_en,
+											"needs_ack" => $needs_ack,
+											"color" => $svc_color,
+											"state" => $svc_state,
+											"check_plan" => $plan_box
+											)
+											
+		, "service_detail_service_info");
 
 if($defaults[is_downtime] == 1) {
 	$info_box_title='Downtime';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table  width='100%'>
-		<tr>
-			<td width=150 class='font2'>From:</td>
-			<td>" . date("d.m.Y H:i", $defaults[downtime_from]) . "</td> 
-		</tr>
-		<tr>
-			<td width=150 class='font2'>To:</td>
-			<td>" . date("d.m.Y H:i", $defaults[downtime_from]) . "</td> 
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Left:</td>
-			<td>" . $btl->Intervall($defaults[downtime_to]-time()) . "</td> 
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Notice/Reason:</td>
-			<td>" . $defaults[downtime_notice] . "</td> 
-		</tr>
-		
-	</table>";
-	
-	
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+	$core_content = "";
+	$layout->create_box($info_box_title, $core_content, "service_detail_downtime_notice", array("service" => $defaults), "service_detail_downtime_notice");
 	
 }
 
 $info_box_title='Last Output';  
-// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-$core_content = "<table  width='100%'>
-	<tr>
-		<td>" . str_replace( "\\dbr", "<br>",nl2br(htmlspecialchars($defaults[new_server_text]))) . "</td> 
-	</tr>
-	
-	
-</table>";
-
-
-$layout->push_outside($layout->create_box($info_box_title, $core_content));
+$layout->create_box($info_box_title, $core_content, "service_detail_status_text", array("service" => $defaults), "service_detail_status_text");
 
 if($defaults[service_type] == 2 || $defaults[service_type] == 1 || $defaults[service_type] == 4 || $defaults[service_type] == 6 || $defaults[service_type] == 7|| $defaults[service_type] == 8  || $defaults[service_type] == 9){
 	$info_box_title='Plugin settings';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table  width='100%'>
-		<tr>
-			<td width=150 class='font2'>Plugin:</td>
-			<td align=left >" . htmlspecialchars($defaults[plugin]) . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Plugin Arguments:</td>
-			<td align=left >" . htmlspecialchars($defaults[plugin_arguments]) . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Plugin Timeout:</td>
-			<td align=left >" . $defaults[service_check_timeout] . " Seconds</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		
-	</table>";
+	$core_content = "";
 	
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+	$layout->create_box($info_box_title, $core_content, "service_detail_plugin_info", array("service" => $defaults), "service_detail_plugin_info");
 }
 
 
@@ -343,42 +187,7 @@
 		$snmp_type = "Greater";
 	} 
 	$info_box_title='SNMP Service';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table  width='100%'>
-		<tr>
-			<td width=150 class='font2'>Community:</td>
-			<td align=left >" . $defaults[service_snmp_community] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Object ID:</td>
-			<td align=left >" . $defaults[service_snmp_objid] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Protocol Version:</td>
-			<td align=left >" . $defaults[service_snmp_version] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Warning:</td>
-			<td align=left >" . $defaults[service_snmp_warning] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Critical:</td>
-			<td align=left >" . $defaults[service_snmp_critical] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Match Type:</td>
-			<td align=left >" . $snmp_type . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		
-	</table>";
-	
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+	$layout->create_box($info_box_title, $core_content, "service_detail_snmp", array("service"=>$defaults, "snmp_type"=>$snmp_type), "service_detail_snmp");
 }
 
 
@@ -398,84 +207,18 @@
 		$ibox[$defaults[current_state]][s]=1;
 		$state_dropdown=$layout->DropDown("passive_state", $ibox);
 		
-	$info_box_title='Passive Service';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table  width='100%'>
-		<form name='pp' action='bartlby_action.php' method=POST>
-		<tr>
-			<td width=150 class='font2'>Timeout:</td>
-			<td align=left >" . $defaults[service_passive_timeout] . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		<tr>
-			<td width=150 class='font2'>Submit manually:</td>
-			<td align=left >$state_dropdown<input type='hidden' name='action' value='submit_passive'><input type='hidden' name='service_id' value='" . $defaults[service_id] . "'><input type='text' name='passive_text'><input type=submit value='store'></font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		</form>
-	</table>";
-	
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+		$info_box_title='Passive Service';  
+		$layout->create_box($info_box_title, $core_content, "service_detail_passive", array("service" => $defaults, "state_dropdown" => $state_dropdown), "service_detail_passive");
 }
 if($defaults[service_type] == 3){
 	$info_box_title='Group Service';  
-	// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-	$core_content = "<table  width='100%'>
-		<tr>
-			<td width=150 class='font2'>Check String:</td>
-			<td align=left >" . $btl->resolveGroupString($defaults[service_var]) . "</font></td>
-			<td>&nbsp;</td>           
-		</tr>
-		
-		
-	</table>";
-	
-	$layout->push_outside($layout->create_box($info_box_title, $core_content));
+	$layout->create_box($info_box_title, $core_content, "service_detail_group_check", array("service" => $defaults), "service_detail_group_check");
 }
 
-//special_ui's
-if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) {
-	$special_counter=$btl->XMLRemoteConfig($match[1], "ui-extra.conf", "special_addon_ui_" . $defaults[service_id_real] . "_cnt");	
-} else {
-	$special_counter=bartlby_config("ui-extra.conf", "special_addon_ui_" . $defaults[service_id] . "_cnt");
-	
-}
-if($special_counter) {
-	
-	for($spc=1; $spc<=$special_counter; $spc++) {
-		
-		if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) {
-			$spc_name=$btl->XMLRemoteConfig($match[1], "ui-extra.conf", "special_addon_ui_" . $defaults[service_id_real] . "_[" . $spc ."]_name");
-		} else {
-			$spc_name=bartlby_config("ui-extra.conf", "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]_name");
-		}
-		//$layout->OUT .= "menu" . $defaults[service_id] . "[" . $spc_real . "]='" . str_replace("^", "=", bartlby_config($btl->CFG, "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]")) . "';\n";
-		$info_box_title="$spc_name";  
-		// (<i>Logged in as:</i><font color="#000000"><b>' . $btl->user . '</b></font>) Uptime: <font color="#000000">' . $btl->intervall(time()-$btl->info[startup_time]) . '</font>'
-		
-		if(preg_match("/^XML:(.*):(.*)$/i", $_GET[service_place], $match)) {
-			
-			$special_value=$btl->XMLRemoteConfig($match[1], 'ui-extra.conf', "special_addon_ui_" . $defaults[service_id_real] . "_[" . $spc ."]");
-		} else {
-			$special_value=bartlby_config('ui-extra.conf', "special_addon_ui_" . $defaults[service_id] . "_[" . $spc ."]");
-		}
-		
-		$core_content = "<table  width='100%'>
-			<tr>
-				<td>" . str_replace("^", "=", $special_value) . "</td>           
-			</tr>
-			
-			
-		</table>";
-		
-		$layout->push_outside($layout->create_box($info_box_title, $core_content));
-	}
-	
-}
 
 $r=$btl->getExtensionsReturn("_serviceDetail", $layout);
 
 $layout->OUT .= $btl->getserviceOptions($defaults, $layout);
-$layout->TableEnd();
 
-$layout->display();
\ No newline at end of file
+
+$layout->display("service_detail");
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/services.php ./bartlby-ui/services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/services.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/services.php	2008-11-11 17:16:41.000000000 +0100
@@ -3,55 +3,23 @@
 	include "config.php";
 	include "bartlby-ui.class.php";
 
+	$btl=new BartlbyUi($Bartlby_CONF);
 	$layout= new Layout();
 	$layout->MetaRefresh(240);
 	$layout->Table("100%");
 	
-	$btl=new BartlbyUi($Bartlby_CONF);
+	
 	$btl->hasRight("main.services");
 	$map = $btl->GetSVCMap($_GET[service_state]);	
 
 
 	
-	$mode=bartlby_config("ui-extra.conf", "xml_remote_count");
-	$do_xml=true;
-	if($_GET[server_id]) {
-		if(!preg_match("/^XML.*/i", $_GET[server_id])) {
-			$do_xml=false;	
-		}	
-	}
-	if($do_xml==true) {
-		if($mode) {
-			$remote_xml=array();
-			for($xml_X=1; $xml_X<=$mode; $xml_X++) {
-					$xml_cur=bartlby_config("ui-extra.conf", "xml_remote[" . $xml_X . "]");
-					$xml_cur_alias=bartlby_config("ui-extra.conf", "xml_alias[" . $xml_X . "]");
-					if($xml_cur) {
-						$xml_return = $btl->getRemoteStatus($xml_cur, $xml_cur_alias);
-						$btl->appendXML_to_svc_map($xml_return[services], $xml_cur_alias, $map, $xml_X);	
-					}
-			}
-		
-		
-			
-		}
-	}
-	
-	
 	
 	$layout->set_menu("main");
-	
 	$layout->setTitle("Services");
 	
 	$display_serv=$_GET[server_id];
-	if(!$display_serv) {
-		while(list($k,$v) = @each($map)) {
-		//	$display_serv=$k;
-			
-			break;	
-		}
-		@reset($map);	
-	}
+	
 	
 		
 		while(list($k, $servs) = @each($map)) {
@@ -66,12 +34,13 @@
 			$forward_link=$btl->create_pagelinks("services.php?expect_state=" . $_GET[expect_state] . "&server_id=" . $_GET[server_id], count($servs)-1, $perp, $curp,$k ."site");
 			
 			
-			$cur_box_title="<a href='server_detail.php?server_id=" . $servs[0][server_id] . "'>" . $servs[0][server_name] . "</A> ( " . $servs[0][client_ip] . ":" . $servs[0][client_port] . " ) $forward_link"; //. "<a href='package_create.php?action=create_package&server_id="  . $servs[0][server_id] . "'><font size=1><img src='images/icon_work1.gif' border=0></a>";
-			$cur_box_content = "<table class='service_table' cellpadding=2>";
+			$cur_box_title="<a href='server_detail.php?server_id=" . $servs[0][server_id] . "'>" . $servs[0][server_name] . "</A> ( " . $servs[0][client_ip] . ":" . $servs[0][client_port] . " ) $forward_link"; //. "<a href='package_create.php?action=create_package&server_id="  . $servs[0][server_id] . "'><font size=1><img src='themes/" . $layout->theme . "/images/icon_work1.gif' border=0></a>";
+			
 			
 			$d=0;
 			$skip_em=($curp*$perp)-$perp;
 			$f=false;
+			$services_found=array();
 			for($x=$skip_em; $x<count($servs); $x++) {
 				
 				
@@ -99,6 +68,7 @@
 				if($_GET[acks] == "yes" && $servs[$x][service_ack] != 2) {
 					continue;	
 				}
+				
 				$d++;
 						
 				$displayed_services++;
@@ -119,104 +89,42 @@
 					$svc_state="Downtime";
 					$svc_color="silver";	
 				}
-				$cur_box_content .= $layout->Tr(
-					$layout->Td(
-						Array(
-							
-							0=>array(
-								"width"=>58,
-								"align"=>"center",
-								"show"=>"<b><a href='services.php?expect_state=" . $servs[$x][current_state] . "'><font style='font-size:9px;'>" . $svc_state . "</A></b>",
-								'class'=>$svc_color . "_img"
-							   ),
-							1=>array(
-								"width"=>80,
-								"class"=>$class,
-								"show"=>"<font size=1>" . date("d.m.y H:i:s", $servs[$x][last_check])
-							   ),
-							2=>array(
-								"width"=>80,
-								"class"=>$class,
-								"show"=>"<font size=1>" .  date("d.m.y H:i:s", $servs[$x][last_check]+$servs[$x][check_interval])
-							   ),						
-							3=>array(
-								"width"=>150,
-								"class"=>"header1",
-								"show"=>"<a href='service_detail.php?service_place=" . $servs[$x][shm_place] . "'><b>" . $servs[$x][service_name]  . "$working_on $flap_pic</b><br>" . "<br> " . $btl->getserviceOptions($servs[$x],$layout) . "</font>"
-							   ),
-							4=>array(
-								"width"=>450,
-								"class"=>$class,
-								"show"=>str_replace( "\\dbr", "<br>",nl2br($servs[$x][new_server_text]))
-							   )
-						)
-					)
-				, true);
+				$servs[$x][color]=$svc_color;
+				$servs[$x][state_readable]=$svc_state;
+				$servs[$x]["class"]=$class;
+				array_push($services_found, $servs[$x]);			
 				$f=true;
+				$abc=$servs[$x][server_id];
+
 			}
-			$cur_box_content .= "</table>";
+
+			
 			if($f == true) {
-				$layout->push_outside($layout->create_box($cur_box_title, $cur_box_content));
+
+				
 				$displayed_servers++;
+				$layout->create_box($cur_box_title, $cur_box_content, "server_box_" . $abc,
+											array(
+												"services" => $services_found,
+												"state" => $svc_state,
+												"color" => $svc_color,
+												
+												
+											)
+				
+				,"service_list_element");
+				
+				
+				
+				
 			}
 	}
-	$legend_content="<table class='nopad' width='100%'>
-		<tr>
-			
-			<td width=15><img src='images/diabled.gif'></td>
-			<td align=left class='font2'>Service Check is disabled</td>
-			
-			
-			<td width=15><img src='images/notrigger.gif'></td>
-			<td align=left class='font2'>Notifications are disabled</td>
-			
-			<td width=15><img src='images/icon_view.gif'></td>
-			<td align=left class='font2'>View Logfile</td>
-			
-			
-			
-			
-		</tr>
-		<tr>
-			<td width=15><img src='images/enabled.gif'></td>
-			<td align=left class='font2'>Service Check is enabled</td>
-			
-			<td width=15><img src='images/trigger.gif'></td>
-			<td align=left class='font2'>Notifications are enabled</td>
-			
-			<td width=15><img src='images/icon_comments.gif'></td>
-			<td align=left class='font2'>Comments</td>
-			
-			
-			
-		</tr>
-
 	
-		<tr>
-                        <td width=15><img src='images/force.gif'></td>
-                        <td align=left class='font2'>Force Check</td>
-
-                        <td width=15><img src='images/edit-copy.gif'></td>
-                        <td align=left class='font2'>Copy service</td>
-
-                        <td width=15><img src='images/create_report.gif'></td>
-                        <td align=left class='font2'>Create Report</td>
-
-
-
-                </tr>	
-		<tr>
-			<td width=15><img src='images/icon_stat.gif'></td>
-			<td align=left class='font2'>Update graph</td>
-			
-			<td width=15><img src='images/modify.gif'></td>
-                        <td  colspan=3 align=left class='font2'>Modify Service</td>
-
-		</tr>
-		
-	</table>";
+	$legend_content="";
+	
+	$layout->create_box("Legend", $legend_content, "legend", array("a"=>"b"), "legend");
+	
 	
-	$layout->push_outside($layout->create_box("Legend", $legend_content));
 	$layout->Tr(
 	$layout->Td(
 			Array(
@@ -232,8 +140,8 @@
 
 	$r=$btl->getExtensionsReturn("_services", $layout);
 	
-
+	$layout->boxes_placed[MAIN]=true;
 	$layout->TableEnd();
-	$layout->display();
+	$layout->display("services");
 	
 ?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/setup.php ./bartlby-ui/setup.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/setup.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/setup.php	2008-04-24 00:58:07.000000000 +0200
@@ -33,7 +33,6 @@
 <h2>Checking default disabled UI extensions</h2>
 <pre>
 <?
-$bad_error_found=false;
 foreach(glob("extensions/*.disabled") as $fname) {
 	echo $fname . ".....";
 	
@@ -178,4 +177,4 @@
 	}	
 	return true;
 }
-?>
\ No newline at end of file
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/template.html ./bartlby-ui/template.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/template.html	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/template.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,472 +0,0 @@
-<html>
-<head>
-<title>bartlby</title>
-<link rel="shortcut icon" href="favicon.ico" > 
-<link rel="stylesheet" id="CSS" type="text/css" href="images/btl.css"></link>
-<script type="text/javascript" src="images/btl.js"></script>
-
-<!--XAJAX-->
-
-
-<script>
-	global_reload=1;
-	function toggleReload() {
-		if(global_reload == 1) {
-				global_reload=0;
-		} else {
-				global_reload=1;
-		}
-	}
-	function GenericToggleFix(elID, st) {
-	//alert(elID);
-	//alert(st);
-		obj=document.getElementById(elID);
-		//alert(obj);
-		obj.style.display=st;  
-	}
-	function GenericToggle(elID) {
-		obj=document.getElementById(elID);
-		obj.style.display=!(obj.style.display=="block")? "block" : "none";  
-	}
-	function jsLogout() {
-		r=confirm("You really want to logout?");	
-		if(r == true) {
-			document.location.href='logout.php';	
-		}
-	}
-	function doToggle(elID) {
-		imgPlus='images/plus.gif';
-		imgMinus='images/minus.gif';
-		obj=document.getElementById(elID + "_sub");
-		obj.style.display=!(obj.style.display=="block")? "block" : "none";  
-		
-		
-		obji=document.getElementById(elID + "_plus");
-		cImg="images" + obji.src.substring(obji.src.lastIndexOf("/"), obji.src.length);
-		
-		
-		obji.src=!(cImg==imgMinus)? imgMinus : imgPlus;  
-		
-	}
-
-	var buffer_suggest = 
-	{
-	        bufferText: false,
-	        bufferTime: 500,
-	        
-	        modified : function(strId, fcn, scr)
-	        {
-	                setTimeout('buffer_suggest.compareBuffer("'+strId+'","'+document.getElementById(strId).value+'","'+ fcn +'", "'+scr+'");', this.bufferTime);
-	        },
-	        
-	        compareBuffer : function(strId, strText, fcn, scr)
-	        {
-	            if (strText == document.getElementById(strId).value && strText != this.bufferText)
-	            {
-	                this.bufferText = strText;
-	                buffer_suggest.makeRequest(strId, fcn, scr);
-	            }
-	        },
-	        
-	        makeRequest : function(strId, fcn, scr)
-	        {
-	            	            
-	            eval(fcn + "(document.getElementById(strId).value, scr)");
-	        }
-	}
-	
-
-</script>
-</head>
-
-<body leftmargin=0 topmargin=0>
-	<table width="100%" class="nopad">
-		<tr>
-			<td  class="bg_header"><a href='overview.php'><img border=0 src='images/btl-logo.gif'></A>
-			<div class="reload" id="reload"><input type=button style='width:155px' name="reload_button" value="reload" onClick="document.location.href='bartlby_action.php?action=reload';"></div>
-			<div class="ui_performance" id="reload"><font size=1>UI-Version: <font size=1><!--UIVERSION--></font> Page Render:<!--BTUITIME--> secs &nbsp;&nbsp;&nbsp;&nbsp;<!--SERVERTIME--> &nbsp;&nbsp;&nbsp;&nbsp;</div>
-			<div style='position: absolute; left:1050Px;top:80px;'><input type=button value=Logout  style='width:50px; font-size:10px; padding-top:0px; height:18px' onClick='jsLogout()'></div>
-			<div class="quick_look" id="quick_look" style="z-index:100"><font size=1>Auto Reload<input type='checkbox' checked onClick='toggleReload()' style='height:10px'>   Quick look<input onkeyup="buffer_suggest.modified('qlook', 'xajax_QuickLook');" id=qlook autocomplete='off' type=text name="qlook" style="border:solid black 1px;font-size:10px; height:17px"><div id='quick_suggest'></div></div>
-			<div class="help" id="help">
-				<!--<iframe height=768 width=245 src='http://bartlby.sf.net/help/'></iframe>-->
-			</div>
-			
-			</td>
-			
-		</tr>
-		<tr>
-			<td class="bg_body">
-				<table class="nopad">
-					<tr>
-						<td class="navi">
-							<table class="nopad">
-								<tr>
-								<td onClick="doToggle('main')" class="nav_main"><img id='main_plus' src='images/plus.gif' border=0> Monitoring </td>
-								</tr>
-							</table>
-							<table class="nopad" id="main_sub" style='display: none;'>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='overview.php' class="sub">Overview</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='services.php' class="sub">Services</A></td>
-								</tr>
-																
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								 <tr>
-                                                                        <td class="nav_sub"><a href='extensions_wrap.php?script=ServerGroups/groupview.php' class="sub">Servers</A></td>
-                                                                </tr>
-
-                                                                <tr>
-                                                                        <td class="nav_place">&nbsp;</td>
-                                                                </tr>
-
-								
-								
-								
-							</table>
-							<table class="nopad">
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td onClick="doToggle('report')" class="nav_main"><img id='report_plus' src='images/plus.gif' border=0> Reporting</td>
-								</tr>
-							</table>
-							<table class="nopad" id="report_sub" style='display: none;'>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='create_report.php' class="sub">Report/s</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='logview.php' class="sub">Logfile</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='logview.php?bartlby_filter=@NOT@' class="sub">Notifications</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad">
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td onClick="doToggle('client')" class="nav_main"><img id='client_plus' src='images/plus.gif' border=0> Clients(s)</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad" id="client_sub" style='display: none;'>
-								
-								<tr>
-									<td class="nav_sub"><a href='add_server.php' class="sub">Add</A></td>
-								</tr>
-								
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='server_list.php?script=modify_server.php' class="sub">Modify</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='server_list.php?script=delete_server.php' class="sub">Delete</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad">
-								<tr>
-									<td onClick="doToggle('packages')" class="nav_main"><img id='packages_plus' src='images/plus.gif' border=0> Packages</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad" id="packages_sub" style='display: none;'>
-								<tr>
-									<td class="nav_sub"><a href='server_list.php?script=install_pkg.php' class="sub">Install</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='server_list.php?script=uninstall_pkg.php' class="sub">Uninstall</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='package_create.php' class="sub">Create</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='package_delete.php' class="sub">Delete</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad">
-								<tr>
-									<td onClick="doToggle('services')" class="nav_main"><img id='services_plus' src='images/plus.gif' border=0> Services(s)</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad" id='services_sub' style='display:none;'>
-								<tr>
-									<td class="nav_sub"><a href='add_service.php' class="sub">Add</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='service_list.php?script=modify_service.php' class="sub">Modify</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='service_list.php?script=delete_service.php' class="sub">Delete</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<!--<tr>
-									<td class="nav_sub"><a href='javascript:openMap();' class="sub">Modify Map</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>-->
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad">
-								<tr>
-									<td onClick="doToggle('downtimes')" class="nav_main"><img id='downtimes_plus' src='images/plus.gif' border=0> Downtime(s)</td>
-								</tr>
-								
-							</table>
-							<table class="nopad" id='downtimes_sub' style='display:none;'>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='service_list.php?script=add_downtime.php' class="sub">Add</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='downtime_list.php?script=modify_downtime.php' class="sub">Modify</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='downtime_list.php?script=delete_downtime.php' class="sub">Delete</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad">
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								
-								<tr>
-									<td class="nav_main" onClick="doToggle('worker')"><img id='worker_plus' src='images/plus.gif' border=0> Worker(s)</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad" id='worker_sub' style='display:none;'>
-								<tr>
-									<td class="nav_sub"><a href='add_worker.php' class="sub">Add</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='user_list.php?script=modify_worker.php' class="sub">Modify</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='user_list.php?script=delete_worker.php' class="sub">Delete</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='user_list.php?script=permission_worker.php' class="sub">Permissions</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							
-							<!--BTLEXTMENU-->
-							<table class="nopad">
-								<tr>
-									<td class="nav_main" onClick="doToggle('core')"><img id='core_plus' src='images/plus.gif' border=0> Core</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							<table class="nopad" id='core_sub' style='display:none;'>
-								<tr>
-									<td class="nav_sub"><a href='bartlby_action.php?action=reload' class="sub">Reload</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='bartlby_action.php?action=stop' class="sub">Stop bartlby</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='choose_config.php' class="sub">Config</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='statistic.php' class="sub">Process info</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='version.php' class="sub">Version</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='event_queue.php' class="sub">Event Queue</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_sub"><a href='extensions.php' class="sub">Extensions</A></td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-								<tr>
-									<td class="nav_place">&nbsp;</td>
-								</tr>
-							</table>
-							
-							
-							
-							
-							<table class="nopad">
-								<tr>
-									<td><a target='_blank' href='http://wiki.bartlby.org/dokuwiki/doku.php'><img border=0 src='images/bartlby1-first-aid.gif'></A></td>
-								</tr>
-								<tr>
-									<td><a href="http://www.spreadfirefox.com/?q=affiliates&amp;id=0&amp;t=85"><img border="0" alt="Get Firefox!" title="Get Firefox!" src="http://sfx-images.mozilla.org/affiliates/Buttons/80x15/firefox_80x15.png"/></a></td>
-								</tr>
-								
-							</table>
-						</td>
-						<td class="content">
-							<table class="nopad">
-								<tr>
-									<td><!--BTUIOUTSIDE--></td>
-								</tr>
-								<tr>
-									<td>
-										<table class="nopad">
-											<tr>
-												<td class="box_left_corner_top">&nbsp;</td>
-												<td class="box_top_run"><!--BTUIBOXTITLE--></td>
-												<td class="box_right_corner_top">&nbsp;</td>
-											</tr>
-											<tr>
-												<td class="box_left_run">&nbsp;</td>
-												<td class="box_content"><!--BTUICONTENT--></td>
-												<td class="box_right_run">&nbsp;</td>
-											</tr>
-											<tr>
-												<td class="box_left_corner_bottom">&nbsp;</td>
-												<td class="box_bottom_run">&nbsp;</td>
-												<td class="box_right_corner_bottom">&nbsp;</td>
-											</tr>
-										</table>
-										<center>
-										<table>
-											<tr>
-												<td>
-													
-													<font style='font-family:tahoma; font-size:8pt; color:#ffffff'><a href='http://www.bartlby.org/' target='_blank'>bartlby</A> is a GPLv2 product of <a href='http://www.januschka.com/' target='_blank'>januschka.com</A></font>
-												</td>
-											</tr>
-										</table>
-										</center>
-									</td>
-								</tr>
-									
-							</table>
-						</td>
-					</tr>
-				</table>			
-			</td>
-			
-		</tr>
-	</table>
-
-
-
-
-<div id='bartlby_basket' style="position:absolute; left: 1010px; top:110px;"></div>
-
-
-
-</body>
-</html>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/bulk_services.php ./bartlby-ui/themes/classic/boxes/bulk_services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/bulk_services.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/bulk_services.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,103 @@
+<script>
+	var bulk_selected_svcs = new Array();
+	var bulk_result = new Array();
+	
+	function bulk_select_all() {
+		bc=document.service_sel.bulk_services;
+		for(x=0; x<bc.length; x++) {
+			bc[x].checked=true;
+		}		
+	}
+
+	function bulk_add_selected() {
+		bc=document.service_sel.bulk_services;
+		for(x=0; x<bc.length; x++) {
+			if(bc[x].checked == true) {
+				res=bc[x].value.split(";");
+				//bulk_service_add(res[0], res[1]);
+				bulk_result.push(new Array(res[0], res[1]));
+				
+			}
+		}
+		bulk_redraw_result();
+		
+	}
+	function bulk_service_add(id, label) {
+		bulk_selected_svcs.push(new Array(id, label));
+		bulk_add_to_result(id, label);
+	}
+	function bulk_force_check() {
+		for(x=0; x<bulk_result.length; x++) {
+			sel_svc=bulk_result[x];
+			id=sel_svc[0];
+			label=sel_svc[1];
+			
+			document.getElementById("bulk_status").innerHTML="Forcing Check on: " + label;
+			xajax_forceCheck(-1, id);
+
+			
+		}
+		document.getElementById("bulk_status").innerHTML="DONE!";
+	}
+	function bulk_add_to_result(id, label) {
+		for(x=0; x<bulk_result.length; x++) {
+			c=bulk_result[x];
+			if(c[0] == id) return;
+		}
+		document.getElementById("service_selected").innerHTML += label + " <a href=\"javascript:bulk_remove_from_result(" + id + ")\">remove</A><br>";
+		bulk_result.push(new Array(id, label));
+	}
+	function bulk_remove_from_result(id) {
+		for(x=0; x<bulk_result.length; x++) {
+			c=bulk_result[x];
+			if(c[0] == id) {
+				bulk_result[x] = -1;			
+			}
+		}
+		bulk_redraw_result();
+	}
+	function bulk_redraw_result() {
+		document.getElementById("service_selected").innerHTML = "";
+		for(x=0; x<bulk_result.length; x++) {
+			c=bulk_result[x];
+			if(c!=-1) {
+				label=c[1];
+				id=c[0];			
+			
+				document.getElementById("service_selected").innerHTML += label + " <a href=\"javascript:bulk_remove_from_result(" + id + ")\">remove</A><br>";
+			}
+		}
+		
+	}
+
+</script>
+<form name="service_sel" id=service_sel>
+<div id=service_search>
+	Search: <input type=text name=serv_search id=serv_search onkeyup="buffer_suggest.modified('serv_search', 'xajax_BulkServiceSearch');">
+<b>Status</b>
+<div id=bulk_status>
+	
+	
+	
+</div>
+</div>
+<div id=serviceXY>
+	<input type=button onClick='bulk_add_selected()' value='Add Selected'>
+	<input type=button onClick="bulk_select_all()" value='Select All from Result'>
+</div>
+<b>Search Result</b><br>
+<div id=service_result>
+	
+</div>
+<b>Already  Selected</b><br>
+<div id=service_selected>
+	
+</div>
+<b>Actions</b><br>
+<div id=serviceXY>
+	
+	<input type=button onClick='bulk_force_check()' value='Force Check'>
+	
+</div>
+
+</form>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/core_info.php ./bartlby-ui/themes/classic/boxes/core_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/core_info.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/core_info.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,52 @@
+<?
+/*
+	$layout->create_box($info_box_title, $core_content, "core_info", array(
+		'user' => $btl->user,
+		'time' =>  date("d.m.Y H:i:s"),
+		'uptime' =>  $btl->intervall(time()-$btl->info[startup_time]),
+		'services' => $info[services],
+		'workers' => $info[workers],
+		'downtimes' => $info[downtimes],
+		'datalib' => $lib[Name],
+		'datalib_version' => $lib[Version],
+		'running' => $load_bar,
+		'round_ms_time' => $rndMS,
+		'average_delay' => $avgDEL,
+		'release_name' => $btl->getRelease(),
+		'reload_state' => $reload_status,
+		'sirene'  => $sir
+
+*/
+?>
+<table class='nopad' width='100%'>
+		<tr>
+			<td class='font1'>(Logged in as: <font class='font2'><?=$plcs[user]?></font>)</td>
+			<td align=right class='font1'>Uptime:<font class='font2'><?=$plcs[uptime]?></font></td>
+		</tr>
+		<tr>
+			<td class='font1'>Services: <font class='font2'><?=$plcs[services]?>&nbsp;&nbsp;&nbsp;&nbsp;Workers: <?=$plcs[workers]?>&nbsp;&nbsp;&nbsp;&nbsp;Downtimes: <?=$plcs[downtimes]?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+			<td align=right class='font1'>Datalib:<font class='font2'><?=$plcs[datalib]?>-<?=$plcs[datalib_version]?></font></td>
+		</tr>
+		<tr>
+			<td class='font1' colspan=1>
+			Running: <?=$plcs[running]?>
+			</td>
+			<td align=right class='font1'>Avg Round Time:<font class='font2'><?=$plcs[round_ms_time]?> ms / avg service delay: <?=$plcs[average_delay]?> sec.</font></td>
+		</tr>
+		
+		<tr>
+			<td colspan=2 class='font1'>Version: <font class='font2'><?=$plcs[release_name]?></font></td>
+			
+		</tr>
+		<tr>
+			<td colspan=2 class='font1'>Reload: <font class='font2'><?=$plcs[reload_state]?></font></td>
+			
+		</tr>
+		
+		
+		
+		<tr>
+			<td class='font1'>&nbsp;</td>
+			<td align=right class='font1'><font class='font2'><?=$plcs[sirene]?></font></td>
+		</tr>
+	</table>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/default_box.php ./bartlby-ui/themes/classic/boxes/default_box.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/default_box.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/default_box.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,17 @@
+<table class="nopad" id="<?=$oid?>">
+				<tr>
+					<td class="box_left_corner_top">&nbsp;</td>
+					<td class="box_top_run"><?=$title?></td>
+					<td class="box_right_corner_top">&nbsp;</td>
+				</tr>
+				<tr>
+					<td class="box_left_run">&nbsp;</td>
+					<td class="box_content"><?=$content?></td>
+					<td class="box_right_run">&nbsp;</td>
+				</tr>
+				<tr>
+					<td class="box_left_corner_bottom">&nbsp;</td>
+					<td class="box_bottom_run">&nbsp;</td>
+					<td class="box_right_corner_bottom">&nbsp;</td>
+				</tr>
+			</table>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/legend.php ./bartlby-ui/themes/classic/boxes/legend.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/legend.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/legend.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,58 @@
+<?
+//$put_a_standard_box_around_me=false;
+?>
+<table class='nopad' width='100%'>
+		<tr>
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/diabled.gif'></td>
+			<td align=left class='font2'>Service Check is disabled</td>
+			
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/notrigger.gif'></td>
+			<td align=left class='font2'>Notifications are disabled</td>
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/icon_view.gif'></td>
+			<td align=left class='font2'>View Logfile</td>
+			
+			
+			
+			
+		</tr>
+		<tr>
+			<td width=15><img src='themes/<?=$layout->theme?>/images/enabled.gif'></td>
+			<td align=left class='font2'>Service Check is enabled</td>
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/trigger.gif'></td>
+			<td align=left class='font2'>Notifications are enabled</td>
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/icon_comments.gif'></td>
+			<td align=left class='font2'>Comments</td>
+			
+			
+			
+		</tr>
+
+	
+		<tr>
+                        <td width=15><img src='themes/<?=$layout->theme?>/images/force.gif'></td>
+                        <td align=left class='font2'>Force Check</td>
+
+                        <td width=15><img src='themes/<?=$layout->theme?>/images/edit-copy.gif'></td>
+                        <td align=left class='font2'>Copy service</td>
+
+                        <td width=15><img src='themes/<?=$layout->theme?>/images/create_report.gif'></td>
+                        <td align=left class='font2'>Create Report</td>
+
+
+
+                </tr>	
+		<tr>
+			<td width=15><img src='themes/<?=$layout->theme?>/images/icon_stat.gif'></td>
+			<td align=left class='font2'>Update graph</td>
+			
+			<td width=15><img src='themes/<?=$layout->theme?>/images/modify.gif'></td>
+                        <td  colspan=3 align=left class='font2'>Modify Service</td>
+
+		</tr>
+		
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/quick_view.php ./bartlby-ui/themes/classic/boxes/quick_view.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/quick_view.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/quick_view.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,73 @@
+<?
+/*
+input: quick_view
+
+*/
+
+
+$qck = $plcs[quick_view];
+$quick_view = "<table class='nopad' width=100%>";
+	while(list($k, $v)=@each($qck)) {
+		
+		if($k != $last_qck) {
+			$cl="";
+			$STATE="UP";
+			if ($hosts_a_down[$qck[$k][10]] == 1) {
+				$cl="";
+				$STATE="DOWN";
+			}
+			$quick_view .= "<tr>";
+			$quick_view .= "<td class=$cl><img src='server_icons/" . $qck[$k][server_icon] . "'><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "'>" . $qck[$k][server_name] . "</A></td>";
+			$quick_view .= "<td class=$cl><font size=1>$STATE</td>";
+			$quick_view .= "<td class=$cl><table width=100>";
+			
+			$sf=false;
+			if($qck[$k][0]) {
+				$sf=true;
+				$qo="<tr><td class=green_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=0'>" . $qck[$k][0] . " OK's</A></td></tr>";
+			}
+			if($qck[$k][1]) {
+				$sf=true;
+				$qw="<tr><td class=orange_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=1'>" . $qck[$k][1] . " Warnings</A></td></tr>";
+			}
+			
+			if($qck[$k][2]) {
+				$sf=true;
+				$qc="<tr><td class=red_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=2'>" . $qck[$k][2] . " Criticals</A></td></tr>";
+			}
+			
+			if($qck[$k][3]) {
+				$sf=true;
+				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=3'>" . $qck[$k][3] . " Unkown</A></td></tr>";
+			}
+			if($qck[$k][4]) {
+				$sf=true;
+				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=4'>" . $qck[$k][4] . " Info</A></td></tr>";
+			}
+			if($qck[$k][downtime]) {
+				//$qk="<tr><td class=silver_box><font size=1>" . $qck[$k][downtime] . " Downtime</td></tr>";
+				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&downtime=true'>" . $qck[$k][downtime] . " Downtime</A></td></tr>";
+			}
+			if($qck[$k][acks]) {
+				$qk="<tr><td class=silver_box><font size=1><a href='services.php?server_id=" . $qck[$k][10] . "&expect_state=2&acks=yes'>" . $qck[$k][acks] . " Ack Wait</A></td></tr>";
+			}
+					
+				$quick_view .= "$qo";
+				$quick_view .= "$qw";
+				$quick_view .= "$qc";
+				$quick_view .= "$qk";
+			$quick_view .= "</table></td>";
+			$quick_view .= "</tr>";
+			$quick_view .= "<tr><td colspan=3><hr noshade></td></tr>";
+		}
+		
+		$last_qck=$k;	
+		$qo="";
+		$qw="";
+		$qc="";
+		$qk="";
+	}
+	$quick_view .= "</table>";
+
+	echo $quick_view;
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/server_detail_server_info.php ./bartlby-ui/themes/classic/boxes/server_detail_server_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/server_detail_server_info.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/server_detail_server_info.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,61 @@
+<table  width='100%'>
+	<tr>
+		<td width=150 class='font2'>Name:</td>
+		<td align=left ><?=$plcs[service][server_name]?></font></td> 
+		<td>&nbsp;</td>     
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Status:</td>
+		<td align=left ><?=$plcs[isup]?></font></td> 
+		<td>&nbsp;</td>     
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Ip:</td>
+		<td align=left ><?=$plcs[service][server_ip]?>/<?=gethostbyname($plcs[service][server_ip])?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Port:</td>
+		<td align=left ><?=$plcs[service][server_port]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Notifications?:</td>
+		<td align=left ><?=$plcs[notify_enabled]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Enabled ?:</td>
+		<td align=left ><?=$plcs[server_enabled]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Last notify sent:</td>
+		<td align=left ><?=date("d.m.Y H:i:s", $plcs[service][last_notify_send])?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Flap Seconds:</td>
+		<td align=left ><?=$plcs[service][server_flap_seconds]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Icon:</td>
+		<td align=left ><img src='server_icons/<?=$plcs[service][server_icon]?>'></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Location:</td>
+		<td align=left ><?=getGeoip(gethostbyname($plcs[service][server_ip]))?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	
+	<tr>
+		<td width=150 class='font2' valign=top>Server Life indicator:</td>
+		<td align=left ><?=$btl->resolveDeadMarker($plcs[service][server_dead], $plcs[map])?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	
+	
+	
+</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/server_detail_services.php ./bartlby-ui/themes/classic/boxes/server_detail_services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/server_detail_services.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/server_detail_services.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,12 @@
+<table  width='100%'>
+	<tr>
+		<td width=150 class='font2'>Number of services:</td>
+		<td><?=count($plcs[server_map])?></td> 
+	</tr>
+	<tr>
+		<td width=150 class='font2' valign=top>Services: </td>
+		<td> <a href='services.php?server_id=<?=$_GET[server_id]?>'>All</A>,<?=$plcs[services_assigned]?></td> 
+	</tr>
+	
+	
+</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php ./bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_downtime_notice.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,19 @@
+<table  width='100%'>
+		<tr>
+			<td width=150 class='font2'>From:</td>
+			<td><?=date("d.m.Y H:i", $plcs[service][downtime_from])?></td> 
+		</tr>
+		<tr>
+			<td width=150 class='font2'>To:</td>
+			<td><?=date("d.m.Y H:i", $plcs[service][downtime_from])?></td> 
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Left:</td>
+			<td><?=$btl->Intervall($plcs[service][downtime_to]-time())?></td> 
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Notice/Reason:</td>
+			<td><?=$plcs[service][downtime_notice]?></td> 
+		</tr>
+		
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_group_check.php ./bartlby-ui/themes/classic/boxes/service_detail_group_check.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_group_check.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_group_check.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,9 @@
+<table  width='100%'>
+		<tr>
+			<td width=150 class='font2'>Check String:</td>
+			<td align=left ><?=$btl->resolveGroupString($plcs[service][service_var])?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		
+		
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_passive.php ./bartlby-ui/themes/classic/boxes/service_detail_passive.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_passive.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_passive.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,14 @@
+<table  width='100%'>
+		<form name='pp' action='bartlby_action.php' method=POST>
+		<tr>
+			<td width=150 class='font2'>Timeout:</td>
+			<td align=left ><?=$plcs[service][service_passive_timeout]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Submit manually:</td>
+			<td align=left ><?=$plcs[state_dropdown]?><input type='hidden' name='action' value='submit_passive'><input type='hidden' name='service_id' value='<?=$plcs[service][service_id]?>'><input type='text' name='passive_text'><input type=submit value='store'></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		</form>
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php ./bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_plugin_info.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,18 @@
+<table  width='100%'>
+		<tr>
+			<td width=150 class='font2'>Plugin:</td>
+			<td align=left ><?=htmlspecialchars($plcs[service][plugin])?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Plugin Arguments:</td>
+			<td align=left ><?=htmlspecialchars($plcs[service][plugin_arguments])?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Plugin Timeout:</td>
+			<td align=left ><?=$plcs[service][service_check_timeout]?> Seconds</font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_service_info.php ./bartlby-ui/themes/classic/boxes/service_detail_service_info.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_service_info.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_service_info.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,143 @@
+<?
+/*
+	"service" => $defaults,
+											"service_type" => $svc_type,
+											"map" => $map,
+											"server_enabled" => $server_enabled,
+											"currently_running" => $currun,
+											"renotify" => $renot_en,
+											"escalate" => $escal_en,
+											"server_notifications" => $server_noti_enabled,
+											"server_enabled" => $server_enabled,
+											"service_ms" => $svcMS,
+											"service_delay" => $svcDEL,
+											"service_enabled" => $serv_en,
+											"notify_enabled" => $noti_en,
+											"needs_ack" => $needs_ack,
+											"color" => $svc_color,
+											"state" => $svc_state
+
+*/
+
+?>
+<table  width='100%'>
+	<tr>
+		<td width=150 class='font2'>Server:</td>
+		<td align=left ><a href='server_detail.php?server_id=<?=$plcs[service][server_id] ?>'><?=$plcs[service][server_name]?></A> ( IP: <?=gethostbyname($plcs[service][client_ip])?> Port: <?=$plcs[service][client_port]?> )</font> <?=$plcs[server_enabled]?> </td> 
+		<td>&nbsp;</td>     
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Name:</td>
+		<td align=left ><?=$plcs[service][service_name]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>ID:</td>
+		<td align=left ><?=$plcs[service][service_id]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Type:</td>
+		<td align=left ><?=$plcs[service_type]?></font></td>  
+		<td>&nbsp;</td>         
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Current State:</td>
+		<td align=left><font color='<?=$plcs[color]?>'><?=$plcs[state]?></font></td> 
+		<td>&nbsp;</td>          
+	</tr>
+	<tr>
+		<td width=150 class='font2' Valign=top>Server Life Indicator:</td>
+		<td align=left><?=$btl->resolveDeadMarker($plcs[service][server_dead], $plcs[map])?></td> 
+		<td>&nbsp;</td>          
+	</tr>
+	
+	<tr>
+		<td width=150 class='font2'>Last Check:</td>
+		<td align=left ><?=date("d.m.Y H:i:s", $plcs[service][last_check])?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>approx. next Check:</td>
+		<td align=left ><?=date("d.m.Y H:i:s", $plcs[service][last_check]+$plcs[service][check_interval])?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	
+	<tr>
+		<td width=150 class='font2'>Check intervall:</td>
+		<td align=left ><?=$plcs[service][check_interval_original]?> / <?=$plcs[service][check_interval]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Last Notify Send:</td>
+		
+		<td align=left ><?=date("d.m.Y H:i:s", $plcs[service][last_notify_send])?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+		<tr>
+		<td width=150 class='font2'>Re-Notification Interval</td>
+		
+		<td align=left ><?=$plcs[renotify]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+		<tr>
+		<td width=150 class='font2'>Escalate after:</td>
+		
+		<td align=left ><?=$plcs[escalate]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Notify Enabled:</td>
+		<td align=left ><?=$plcs[notify_enabled]?> <?=$plcs[server_notifications]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Check Enabled:</td>
+		<td align=left ><?=$plcs[service_enabled]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2' valign=top>Check Plan:</td>
+		<td align=left ><?=$plcs[check_plan]?></td>
+		<td>&nbsp;</td>           
+	</tr>
+	
+	<tr>
+		<td width=150 class='font2'>Flap count:</td>
+		<td align=left ><?=$plcs[service][flap_count]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Flap seconds:</td>
+		<td align=left ><?=$plcs[service][flap_seconds]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Ack settings:</td>
+		<td align=left ><?=$plcs[needs_ack]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>
+
+	<tr>
+		<td width=150 class='font2'>Status:</td>
+		<td align=left ><?=$plcs[service][service_retain_current]?> / <?=$plcs[service][service_retain]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>	
+	
+		<tr>
+		<td width=150 class='font2'>Is Running?:</td>
+		<td align=left ><?= $plcs[currently_running]?></font></td>
+		<td>&nbsp;</td>           
+	</tr>	
+	<tr>
+		<td width=150 class='font2'>Average Check Time:</td>
+		<td align=left ><?= $plcs[service_ms]?> ms</font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	<tr>
+		<td width=150 class='font2'>Average delay Time:</td>
+		<td align=left ><?= $plcs[service_delay]?> Seconds</font></td>
+		<td>&nbsp;</td>           
+	</tr>
+	
+</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_snmp.php ./bartlby-ui/themes/classic/boxes/service_detail_snmp.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_snmp.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_snmp.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,33 @@
+<table  width='100%'>
+		<tr>
+			<td width=150 class='font2'>Community:</td>
+			<td align=left ><?=$plcs[service][service_snmp_community]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Object ID:</td>
+			<td align=left ><?=$plcs[service][service_snmp_objid]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Protocol Version:</td>
+			<td align=left ><?=$plcs[service][service_snmp_version]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Warning:</td>
+			<td align=left ><?=$plcs[service][service_snmp_warning]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Critical:</td>
+			<td align=left ><?=$plcs[service][service_snmp_critical]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		<tr>
+			<td width=150 class='font2'>Match Type:</td>
+			<td align=left ><?=$plcs[snmp_type]?></font></td>
+			<td>&nbsp;</td>           
+		</tr>
+		
+	</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_status_text.php ./bartlby-ui/themes/classic/boxes/service_detail_status_text.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_detail_status_text.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_detail_status_text.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,7 @@
+<table  width='100%'>
+	<tr>
+		<td><?=str_replace( "\\dbr", "<br>",nl2br(htmlspecialchars($plcs[service][new_server_text])))?></td> 
+	</tr>
+	
+	
+</table>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_list_element.php ./bartlby-ui/themes/classic/boxes/service_list_element.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/service_list_element.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/service_list_element.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,34 @@
+<?
+
+//$put_a_standard_box_around_me=false;
+for($s_element=0; $s_element<count($plcs[services]); $s_element++) {
+?>
+
+<table class='service_table' cellpadding=2>
+	<tr>
+		<td   align='center'  valign=top width='58'  class='<?=$plcs[services][$s_element][color]?>_img'>
+				<b><a href='services.php?expect_state=<?=$plcs[services][$s_element][current_state]?>'><font style='font-size:9px;'><?=$plcs[services][$s_element][state_readable]?></A></b>
+		</td>
+		<td   align=left  valign=top width='80'  class='<?=$plcs[services][$s_element]["class"]?>'>
+			<font size=1><?=date("d.m.y H:i:s", $plcs[services][$s_element][last_check])?>
+		</td>
+		<td   align=left  valign=top width='80'  class='<?=$plcs[services][$s_element]["class"]?>'>
+			<font size=1><?=date("d.m.y H:i:s", $plcs[services][$s_element][last_check]+$plcs[services][$s_element][check_interval])?>
+
+		</td>
+		<td   align=left  valign=top width='150'  class='<?=$plcs[services][$s_element]["class"]?>'>
+			<a href='service_detail.php?service_place=<?=$plcs[services][$s_element][shm_place]?>'><b><?=$plcs[services][$s_element][service_name]?></A>
+			<br>
+			<?=$btl->getserviceOptions($plcs[services][$s_element], $layout)?>
+		</td>
+		<td   align=left  valign=top width='450'  class='<?=$plcs[services][$s_element]["class"]?>'>
+			<?=str_replace( "\\dbr","<br>", nl2br($plcs[services][$s_element][new_server_text]))?>
+
+		</td>
+
+	</tr>
+</table>
+
+<?
+}
+?>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/system_health.php ./bartlby-ui/themes/classic/boxes/system_health.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/system_health.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/system_health.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,31 @@
+<?
+/*
+$layout->create_box($health_title, $health_content,"system_health", array(
+			'prozent_float' => $prozent_float,
+			'color' => $color
+		), "system_health");
+*/
+?>
+<?
+$silverbar = "<table class='nopad'>
+		<tr>
+			<td class='bar_left_silver'>&nbsp;</td>
+			<td class='bar_middle_silver' style='width:" . 100*7.3 . "'></td>
+			<td class='bar_right_silver'>&nbsp;</td>
+			<td class='font2'>" . $plcs[prozent_float] . "% OK</td>
+			
+		</tr>
+		
+	</table>";
+?>
+	
+<div style='position:relative; z-index:2; '> <table class='nopad'>
+		<tr>
+			<td  class='bar_left_<?=$plcs[color]?>'>&nbsp;</td>
+			<td class='bar_middle_<?=$plcs[color]?>' style='width:<?=($plcs[prozent_float]*7.3)?>'></td>
+			<td class='bar_right_<?=$plcs[color]?>'>&nbsp;</td>
+			<td class='font2'>&nbsp;</td>
+			
+		</tr>
+		
+	</table></div><div style='position:relative; z-index:1; top:-40px;'><?=$silverbar?></div>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/tactical_overview.php ./bartlby-ui/themes/classic/boxes/tactical_overview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/boxes/tactical_overview.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/boxes/tactical_overview.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,35 @@
+<?
+
+/*
+	$layout->create_box($tac_title, $tac_content, "tactical_overview",array(
+		'host_sum' => $hosts_sum,
+		'hosts_up' => $hosts_up,
+		'hosts_down' => $hosts_down,
+		'services_ok' => $services_ok,
+		'services_warning' => $services_warning,
+		'services_critical' => $services_critical,
+		'services_downtime' => $services_downtime,
+		'acks_outstanding' => $acks_outstanding
+	
+	), "tactical_overview");
+*/
+
+?>
+
+<table class='nopad' width='100%'>
+		<tr>
+			<td colspan=2 class='font1'>Hosts:<font class='font2'><?=$plcs[host_sum]?></font></td>
+			<td colspan=5 align=left class='font1'>Services:<font Fav. Services class='font2'><?=$plcs[services_sum]?></font></td>
+		</tr>
+		<tr>
+			<td class='font1'>Up:<font class='font2'><?=$plcs[hosts_up]?></font></td>
+			<td class='font1'>Down:<font class='font2'><?=$plcs[hosts_down]?></font></td>
+			<td class='font1'><a href='services.php?expect_state=0'><font color=green>OK</font></A>:<font class='font2'><?=$plcs[services_ok]?></font></td>
+			<td class='font1'><a href='services.php?expect_state=1'><font color=orange>Warning</font></A>:<font class='font2'><?=$plcs[services_warning]?></font></td>
+			<td class='font1'><a href='services.php?expect_state=2'><font color=red>Critical</font></A>:<font class='font2'><?=$plcs[services_critical]?></font></td>
+			<td class='font1'><a href='services.php?downtime=true'>Downtime</A>:<font class='font2'><?=$plcs[services_downtime]?></font></td>
+			<td class='font1'><a href='services.php?acks=yes'>Acks</A> outstanding:<font class='font2'><?=$plcs[acks_outstanding]?></font></td>
+			<td class='font1'><a href='services.php?expect_state=0&invert=true'>all failures</A></td>
+		</tr>
+		
+	</table>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/btl.css ./bartlby-ui/themes/classic/btl.css
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/btl.css	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/btl.css	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,132 @@
+body { background-color: #C2CBCF; font-family: tahoma; font-size:12px; }
+input,td,select { font-size:12px; font-family:tahoma; }
+
+.suggest_link {
+				background-color: #FFFFFF;
+				padding: 2px 6px 2px 6px;
+			}
+			.suggest_link_over {
+				background-color: #3366CC;
+				padding: 2px 6px 2px 6px;
+			}
+			#search_suggest {
+				position: absolute; 
+				background-color: #FFFFFF; 
+				text-align: left; 
+				border: 1px solid #000000;			
+			}		
+
+.none { font-size:12px; font-family:tahoma; }
+
+.big_table { font-size: 10px; }
+.nopad {padding: 0; border-collapse: collapse; border-spacing: 0;}
+td.navi { vertical-align:top; font-family: tahoma; font-size: 10pt;  width: 125px;}
+td.content { vertical-align: top; font-family: tahoma; font-size:12px; }
+td.bg_header {  vertical-align: top; background-image: url(images/bg_header.jpg); height:105; background-repeat: no-repeat; padding-left:5px; padding-top:5px;}
+td.bg_body{  vertical-align: top; background-image: url(images/bartlby1-bg.jpg); height:663; background-repeat: no-repeat; }
+
+td.nav_main { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff;  background-image: url(images/btn_main.gif); height:21px; width:121px; background-repeat: no-repeat; }
+td.nav_sub { font-weight: bold; vertical-align: middle; padding-left: 3px; padding-top:0px; font-size:10px; color:#ffffff;  background-image: url(images/btn_sub.gif); height:12px; width:107px; background-repeat: no-repeat; }
+td.nav_place { font-size:1px; height:5px; }
+
+td.header { font-weight: bold; vertical-align: middle; padding-left: 10px; font-size:12px; color:#ffffff; height:21px; width:121px; background-color:#999999; }
+
+a:link.sub { text-decoration:none; font-size:10px; color:#ffffff; }
+a:visited.sub { text-decoration:none; font-size:10px; color:#ffffff; }
+a:hover.sub { text-decoration:underline; font-size:10px; color:#ffffff; }
+
+a:link {font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
+a:visited{font-weight:bold; text-decoration:none; font-size:12px; color:#000000; }
+a:hover{font-weight:bold; text-decoration:underline; font-size:12px; color:#000000; }
+
+td.box_left_corner_top { background-image: url(images/left_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_top_run { width:650px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(images/box_run_up.gif); height:20px;  }
+td.box_right_corner_top { background-image: url(images/right_corner_up.gif); height:20px; width:16px; background-repeat: no-repeat; }
+
+td.box_left_corner_bottom { background-image: url(images/left_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_bottom_run { width:250px; color: #999999; font-weight:bold; font-size:12px; font-family:tahoma; background-image: url(images/box_run_down.gif); background-repeat: repeat-x; height:20px; font-size:1px;  }
+td.box_right_corner_bottom { background-image: url(images/right_corner_down.gif); height:20px; width:16px; background-repeat: no-repeat; }
+td.box_left_run { background-image: url(images/left_corner_run.gif); height:20px; width:16px;  }
+td.box_right_run { background-image: url(images/right_corner_run.gif); height:20px; width:16px;  }
+td.box_content { width:840px; background-image: url(images/box_bg.gif); font-family:tahoma; font-size:12px; color:#010101; }
+
+
+td.header1 { font-size:12px; font-family:tahoma; }
+td.header { font-size:12px; font-family:tahoma; }
+
+
+td.red_img {  padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-red.gif);background-repeat: no-repeat;}
+td.green_img { padding-left:5px;    padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-green.gif);background-repeat: no-repeat;}
+td.orange_img {  padding-left:5px;   padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-yellow.gif);background-repeat: no-repeat;}
+td.silver_img {   padding-left:5px;  padding-top:20px; font-family:tahoma; font-size:10px; height:52px; color:#000000; background-image:url(images/bi-oc-silver.gif);background-repeat: no-repeat;}
+
+
+
+td.red { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:000000; background-color:#F83838}
+td.green { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#33FF00}
+td.orange { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#FFFF00}
+td.blue { padding: 4;   text-valign: middle;  font-family:tahoma; font-size:12px; height:20px; color:#000000; background-color:#ACACAC}
+
+div.reload {z-index:101;visibility:hidden; position: absolute; left: 840px; top:80px;}
+div.ui_performance { position: absolute; left: 5px; top:83px;}
+div.clock {position: absolute; left: 800px; top:110px; color:#000000;z-index:3;}
+div.quick_look {position: absolute; left: 380px; top:81px; color:#000000;z-index:3;}
+
+div.help {position: absolute; left: 1024px; top:0px; color:#000000;z-index:3;}
+
+
+.font1 {font-weight:bold; color:#999999; font-family:tahoma; font-size:12px;}
+.font2 {font-weight:bold; color:#000000; font-family:tahoma; font-size:12px;}
+
+
+
+td.bar_left_yellow {background-image: url(images/bartlby1-bar-yellow_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_yellow {background-image: url(images/bartlby1-bar-yellow_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_yellow {background-image: url(images/bartlby1-bar-yellow_02.gif); height:39px; width:4px; }
+
+td.bar_left_silver {background-image: url(images/bartlby1-bar-silver_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_silver {background-image: url(images/bartlby1-bar-silver_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_silver {background-image: url(images/bartlby1-bar-silver_02.gif); height:39px; width:4px; }
+
+
+
+td.bar_left_green {background-image: url(images/bartlby1-bar-green_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_green {background-image: url(images/bartlby1-bar-green_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_green {background-image: url(images/bartlby1-bar-green_02.gif); height:39px; width:4px; }
+
+td.bar_left_red {background-image: url(images/bartlby1-bar-red_01.gif); height:39px; width:10px; background-repeat: no-repeat;}
+td.bar_right_red {background-image: url(images/bartlby1-bar-red_04.gif); height:39px; width:13px; background-repeat: no-repeat;}
+td.bar_middle_red {background-image: url(images/bartlby1-bar-red_02.gif); height:39px; width:4px; }
+
+
+td.red_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_red.gif);background-repeat: no-repeat;}
+td.green_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_green.gif);background-repeat: no-repeat;}
+td.orange_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_yellow.gif);background-repeat: no-repeat;}
+td.yellow_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_yellow.gif);background-repeat: no-repeat;}
+td.silver_box { padding-left:10px;    padding-top:3px; font-family:tahoma; font-size:10px; height:29px; color:#000000; background-image:url(images/s_silver.gif);background-repeat: no-repeat;}
+
+
+
+
+#dropmenudiv{
+position:absolute;
+border:1px solid black;
+border-bottom-width: 0;
+font:normal 12px Tahoma;
+line-height:18px;
+z-index:100;
+}
+
+#dropmenudiv a{
+width: 100%;
+display: block;
+text-indent: 3px;
+border-bottom: 1px solid black;
+padding: 1px 0;
+text-decoration: none;
+font-weight: bold;
+}
+
+#dropmenudiv a:hover{ /*hover background color*/
+background-color: #C2CBCF;
+}
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/agent_syncer.gif and ./bartlby-ui/themes/classic/images/agent_syncer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/arrow2.gif and ./bartlby-ui/themes/classic/images/arrow2.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/barcode.gif and ./bartlby-ui/themes/classic/images/barcode.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_01.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_01.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_02.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_02.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_04.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-green_04.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-green_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_01.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_01.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_02.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_02.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_04.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-red_04.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-red_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-silver_01.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-silver_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-silver_02.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-silver_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-silver_04.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-silver_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.gif and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.png and ./bartlby-ui/themes/classic/images/bartlby1-bar-yellow_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-bg.jpg and ./bartlby-ui/themes/classic/images/bartlby1-bg.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bartlby1-first-aid.gif and ./bartlby-ui/themes/classic/images/bartlby1-first-aid.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bg_body.gif and ./bartlby-ui/themes/classic/images/bg_body.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bg_body.png and ./bartlby-ui/themes/classic/images/bg_body.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bg_header.gif and ./bartlby-ui/themes/classic/images/bg_header.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bg_header.jpg and ./bartlby-ui/themes/classic/images/bg_header.jpg differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bg_header.png and ./bartlby-ui/themes/classic/images/bg_header.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bi-oc-green.gif and ./bartlby-ui/themes/classic/images/bi-oc-green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bi-oc-red.gif and ./bartlby-ui/themes/classic/images/bi-oc-red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bi-oc-silver.gif and ./bartlby-ui/themes/classic/images/bi-oc-silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/bi-oc-yellow.gif and ./bartlby-ui/themes/classic/images/bi-oc-yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/black.gif and ./bartlby-ui/themes/classic/images/black.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/blue.gif and ./bartlby-ui/themes/classic/images/blue.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_01.png and ./bartlby-ui/themes/classic/images/box_01.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_02.png and ./bartlby-ui/themes/classic/images/box_02.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_04.png and ./bartlby-ui/themes/classic/images/box_04.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_06.png and ./bartlby-ui/themes/classic/images/box_06.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_08.png and ./bartlby-ui/themes/classic/images/box_08.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_09.png and ./bartlby-ui/themes/classic/images/box_09.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_10.png and ./bartlby-ui/themes/classic/images/box_10.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_11.png and ./bartlby-ui/themes/classic/images/box_11.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_15.png and ./bartlby-ui/themes/classic/images/box_15.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_16.png and ./bartlby-ui/themes/classic/images/box_16.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_17.png and ./bartlby-ui/themes/classic/images/box_17.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_21.png and ./bartlby-ui/themes/classic/images/box_21.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_22.png and ./bartlby-ui/themes/classic/images/box_22.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_23.png and ./bartlby-ui/themes/classic/images/box_23.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_bg.gif and ./bartlby-ui/themes/classic/images/box_bg.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_bg.png and ./bartlby-ui/themes/classic/images/box_bg.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_run_down.gif and ./bartlby-ui/themes/classic/images/box_run_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_run_down.png and ./bartlby-ui/themes/classic/images/box_run_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_run_up.gif and ./bartlby-ui/themes/classic/images/box_run_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/box_run_up.png and ./bartlby-ui/themes/classic/images/box_run_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btl-logo.gif and ./bartlby-ui/themes/classic/images/btl-logo.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btl-logo.png and ./bartlby-ui/themes/classic/images/btl-logo.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btn_main.gif and ./bartlby-ui/themes/classic/images/btn_main.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btn_main.png and ./bartlby-ui/themes/classic/images/btn_main.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btn_sub.gif and ./bartlby-ui/themes/classic/images/btn_sub.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/btn_sub.png and ./bartlby-ui/themes/classic/images/btn_sub.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/create_report.gif and ./bartlby-ui/themes/classic/images/create_report.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/critical.gif and ./bartlby-ui/themes/classic/images/critical.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/critical.png and ./bartlby-ui/themes/classic/images/critical.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/diabled.gif and ./bartlby-ui/themes/classic/images/diabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/diabled.png and ./bartlby-ui/themes/classic/images/diabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/Disable-Sirene.gif and ./bartlby-ui/themes/classic/images/Disable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/edit-copy.gif and ./bartlby-ui/themes/classic/images/edit-copy.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/emblem-generic.png and ./bartlby-ui/themes/classic/images/emblem-generic.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/emblem-important.png and ./bartlby-ui/themes/classic/images/emblem-important.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/enabled.gif and ./bartlby-ui/themes/classic/images/enabled.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/enabled.png and ./bartlby-ui/themes/classic/images/enabled.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/Enable-Sirene.gif and ./bartlby-ui/themes/classic/images/Enable-Sirene.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/extension_disable.gif and ./bartlby-ui/themes/classic/images/extension_disable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/extension_enable.gif and ./bartlby-ui/themes/classic/images/extension_enable.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/extensions.gif and ./bartlby-ui/themes/classic/images/extensions.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/force.gif and ./bartlby-ui/themes/classic/images/force.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/green.png and ./bartlby-ui/themes/classic/images/green.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/header_bar.png and ./bartlby-ui/themes/classic/images/header_bar.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_comments.gif and ./bartlby-ui/themes/classic/images/icon_comments.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_comments.png and ./bartlby-ui/themes/classic/images/icon_comments.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_stat.gif and ./bartlby-ui/themes/classic/images/icon_stat.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_view.gif and ./bartlby-ui/themes/classic/images/icon_view.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_view.png and ./bartlby-ui/themes/classic/images/icon_view.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_work1.gif and ./bartlby-ui/themes/classic/images/icon_work1.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_work1.png and ./bartlby-ui/themes/classic/images/icon_work1.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/icon_work.gif and ./bartlby-ui/themes/classic/images/icon_work.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/info.gif and ./bartlby-ui/themes/classic/images/info.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/info.png and ./bartlby-ui/themes/classic/images/info.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/keys.gif and ./bartlby-ui/themes/classic/images/keys.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_down.gif and ./bartlby-ui/themes/classic/images/left_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_down.png and ./bartlby-ui/themes/classic/images/left_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_run.gif and ./bartlby-ui/themes/classic/images/left_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_run.png and ./bartlby-ui/themes/classic/images/left_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_up.gif and ./bartlby-ui/themes/classic/images/left_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/left_corner_up.png and ./bartlby-ui/themes/classic/images/left_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/minus.gif and ./bartlby-ui/themes/classic/images/minus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/modify.gif and ./bartlby-ui/themes/classic/images/modify.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/notrigger.gif and ./bartlby-ui/themes/classic/images/notrigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/notrigger.png and ./bartlby-ui/themes/classic/images/notrigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/ok.gif and ./bartlby-ui/themes/classic/images/ok.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/ok.png and ./bartlby-ui/themes/classic/images/ok.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/plus.gif and ./bartlby-ui/themes/classic/images/plus.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/red.png and ./bartlby-ui/themes/classic/images/red.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_down.gif and ./bartlby-ui/themes/classic/images/right_corner_down.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_down.png and ./bartlby-ui/themes/classic/images/right_corner_down.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_run.gif and ./bartlby-ui/themes/classic/images/right_corner_run.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_run.png and ./bartlby-ui/themes/classic/images/right_corner_run.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_up.gif and ./bartlby-ui/themes/classic/images/right_corner_up.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/right_corner_up.png and ./bartlby-ui/themes/classic/images/right_corner_up.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/s_green.gif and ./bartlby-ui/themes/classic/images/s_green.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/spacer.gif and ./bartlby-ui/themes/classic/images/spacer.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/s_red.gif and ./bartlby-ui/themes/classic/images/s_red.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/s_silver.gif and ./bartlby-ui/themes/classic/images/s_silver.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/s_yellow.gif and ./bartlby-ui/themes/classic/images/s_yellow.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/trigger.gif and ./bartlby-ui/themes/classic/images/trigger.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/trigger.png and ./bartlby-ui/themes/classic/images/trigger.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/warning.gif and ./bartlby-ui/themes/classic/images/warning.gif differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/warning.png and ./bartlby-ui/themes/classic/images/warning.png differ
Binary files /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/images/yellow.png and ./bartlby-ui/themes/classic/images/yellow.png differ
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/bartlby_action.php ./bartlby-ui/themes/classic/lineups/bartlby_action.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/bartlby_action.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/bartlby_action.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,7 @@
+
+
+<?=$this->disp_box("Message")?>
+<?=$this->disp_box("MAIN")?>
+<?=$this->disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/default.php ./bartlby-ui/themes/classic/lineups/default.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/default.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/default.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,27 @@
+<?
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+?>
+
+<?=$this->disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/overview.php ./bartlby-ui/themes/classic/lineups/overview.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/overview.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/overview.php	2008-09-07 14:49:37.000000000 +0200
@@ -0,0 +1,8 @@
+
+<?=$this->disp_box("core_info")?>
+<?=$this->disp_box("tactical_overview")?>
+<?=$this->disp_box("system_health")?>
+<?=$this->disp_box("extension_ServerGroups")?>
+<?=$this->disp_box("UNPLACED")?>
+
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/server_detail.php ./bartlby-ui/themes/classic/lineups/server_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/server_detail.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/server_detail.php	2008-10-13 22:04:01.000000000 +0200
@@ -0,0 +1,4 @@
+<?=$this->disp_box("MAIN")?>
+<?=$this->disp_box("server_detail_server_info")?>
+<?=$this->disp_box("server_detail_services")?>
+<?=$this->disp_box("UNPLACED")?>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/service_detail.php ./bartlby-ui/themes/classic/lineups/service_detail.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/service_detail.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/service_detail.php	2008-10-13 21:28:10.000000000 +0200
@@ -0,0 +1,10 @@
+<?=$this->disp_box("MAIN")?>
+<?=$this->disp_box("service_detail_service_info")?>
+<?=$this->disp_box("service_detail_downtime_notice")?>
+<?=$this->disp_box("service_detail_status_text")?>
+<?=$this->disp_box("service_detail_plugin_info")?>
+<?=$this->disp_box("service_detail_snmp")?>
+<?=$this->disp_box("service_detail_passive")?>
+<?=$this->disp_box("service_detail_group_check")?>
+<?=$this->disp_box("UNPLACED")?>
+
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/services.php ./bartlby-ui/themes/classic/lineups/services.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/lineups/services.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/lineups/services.php	2008-10-09 23:34:49.000000000 +0200
@@ -0,0 +1,3 @@
+<?=$this->disp_box("legend")?>
+<?=$this->disp_box("server_box_.*")?>
+<?=$this->disp_box("UNPLACED")?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/sample.html ./bartlby-ui/themes/classic/sample.html
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/sample.html	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/sample.html	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,77 @@
+<html>
+<head>
+<title>bartlby</title>
+<link rel="stylesheet" id="CSS" type="text/css" href="btl.css"></link>
+</head>
+<body leftmargin=0 topmargin=0>
+	<table width="100%" class="nopad">
+		<tr>
+			<td  class="bg_header"><img src='btl-logo.png'></td>
+			
+		</tr>
+		<tr>
+			<td class="bg_body">
+				<table class="nopad">
+					<tr>
+						<td class="navi">
+							<table class="nopad">
+								<tr>
+									<td class="nav_main">Main<td>
+								</tr>
+								<tr>
+									<td class="nav_place">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="nav_sub"><a href='#' class="sub">Sub</A><td>
+								</tr>
+								<tr>
+									<td class="nav_place">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="nav_sub"><a href='#' class="sub">Sub</A><td>
+								</tr>
+								<tr>
+									<td class="nav_place">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="nav_place">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="nav_main">Main1<td>
+								</tr>
+								<tr>
+									<td class="nav_place">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="nav_sub"><a href='#' class="sub">Sub1</A><td>
+								</tr>
+								
+							</table>
+						</td>
+						<td class="content">
+							<table class="nopad">
+								<tr>
+									<td class="box_left_corner_top">&nbsp;</td>
+									<td class="box_top_run">Title</td>
+									<td class="box_right_corner_top">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="box_left_run">&nbsp;</td>
+									<td class="box_content"><!--BTUICONTENT--></td>
+									<td class="box_right_run">&nbsp;</td>
+								</tr>
+								<tr>
+									<td class="box_left_corner_bottom">&nbsp;</td>
+									<td class="box_bottom_run">&nbsp;</td>
+									<td class="box_right_corner_bottom">&nbsp;</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>			
+			</td>
+			
+		</tr>
+	</table>
+</body>
+</html>
\ No newline at end of file
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/theme.php ./bartlby-ui/themes/classic/theme.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/themes/classic/theme.php	1970-01-01 01:00:00.000000000 +0100
+++ ./bartlby-ui/themes/classic/theme.php	2008-09-07 14:09:01.000000000 +0200
@@ -0,0 +1,110 @@
+<?
+/* $Id: ack.c 16 2008-04-07 19:20:34Z hjanuschka $ */
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2005-2008 Helmut Januschka - All Rights Reserved
+ *   Contact: <helmut@januschka.com>, <contact@bartlby.org>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ *   visit: www.bartlby.org for support
+ * ----------------------------------------------------------------------- */
+/*
+$Revision: 16 $
+$HeadURL: http://bartlby.svn.sourceforge.net/svnroot/bartlby/trunk/bartlby-core/src/ack.c $
+$Date: 2008-04-07 21:20:34 +0200 (Mo, 07 Apr 2008) $
+$Author: hjanuschka $ 
+*/
+?>
+<html>
+<head>
+<title>bartlby</title>
+<link rel="shortcut icon" href="favicon.ico" > 
+<link rel="stylesheet" id="CSS" type="text/css" href="themes/<?=$this->theme?>/btl.css"></link>
+<script type="text/javascript" src="js/btl.js"></script>
+<script>
+	js_theme_name="classic";
+</script>
+<?=$this->XAJAX?>
+
+
+<script>
+	
+	
+
+</script>
+</head>
+
+<body leftmargin=0 topmargin=0>
+	<table width="100%" class="nopad">
+		<tr>
+			<td  class="bg_header"><a href='overview.php'><img border=0 src='themes/<?=$this->theme?>/images/btl-logo.gif'></A>
+			<div class="reload" id="reload"><input type=button style='width:155px' name="reload_button" value="reload" onClick="document.location.href='bartlby_action.php?action=reload';"></div>
+			<div class="ui_performance" id="reload"><font size=1>UI-Version: <font size=1><?=$this->UIVERSION?></font> Page Render:<?=$this->BTUITIME?> secs &nbsp;&nbsp;&nbsp;&nbsp;<?=$this->SERVERTIME?> &nbsp;&nbsp;&nbsp;&nbsp;</div>
+			<div style='position: absolute; left:1050Px;top:80px;'><input type=button value=Logout  style='width:50px; font-size:10px; padding-top:0px; height:18px' onClick='jsLogout()'></div>
+			<div class="quick_look" id="quick_look" style="z-index:100"><font size=1>Auto Reload<input type='checkbox' checked onClick='toggleReload()' style='height:10px'>   Quick look<input onkeyup="buffer_suggest.modified('qlook', 'xajax_QuickLook');" id=qlook autocomplete='off' type=text name="qlook" style="border:solid black 1px;font-size:10px; height:17px"><div id='quick_suggest'></div></div>
+						
+			</td>
+			
+		</tr>
+		<tr>
+			<td class="bg_body">
+				<table class="nopad">
+					<tr>
+						<td class="navi">
+							
+							
+							<?=$this->BTLEXTMENU?>
+							
+							
+							
+							
+							<table class="nopad">
+								<tr>
+									<td><a target='_blank' href='http://wiki.bartlby.org/dokuwiki/doku.php'><img border=0 src='themes/<?=$this->theme?>/images/bartlby1-first-aid.gif'></A></td>
+								</tr>
+								<tr>
+									<td><a href="http://www.spreadfirefox.com/?q=affiliates&amp;id=0&amp;t=85"><img border="0" alt="Get Firefox!" title="Get Firefox!" src="http://sfx-images.mozilla.org/affiliates/Buttons/80x15/firefox_80x15.png"/></a></td>
+								</tr>
+								
+							</table>
+						</td>
+						<td class="content">
+							<table class="nopad">
+								<tr>
+									<td><?=$this->BTUIOUTSIDE?>
+										<center>
+										<table>
+											<tr>
+												<td>
+													
+													<font style='font-family:tahoma; font-size:8pt; color:#ffffff'><a href='http://www.bartlby.org/' target='_blank'>bartlby</A> is a GPLv2 product of <a href='http://www.januschka.com/' target='_blank'>januschka.com</A><?=$this->RELNOT?></font>
+												</td>
+											</tr>
+										</table>
+										</center>									
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>			
+			</td>
+			
+		</tr>
+	</table>
+
+
+
+
+<div id='bartlby_basket' style="position:absolute; left: 1010px; top:110px;"></div>
+
+
+
+</body>
+</html>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/ui-extra.conf ./bartlby-ui/ui-extra.conf
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/ui-extra.conf	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/ui-extra.conf	2008-11-11 17:16:41.000000000 +0100
@@ -1,4 +1,5 @@
 services_per_page=25
+theme=classic
 ajaxed=true
 disable_dropdown_search=false
 
@@ -23,36 +24,8 @@
 new.server.port=9030
 new.server.icon=linux.gif
 
-xml_remote_count=0
-xml_remote[1]=http://h.januschka:gizmo1@bartlby.xxxx.at:80/xml_api.php
-xml_alias[1]=Work
 
 super_user=admin
 
 
-special_addon_ui_2559_cnt=2
-special_addon_ui_2559_[1]_name=Load Graph Last 24 Hours
-special_addon_ui_2559_[1]=<img src^http://dev.januschka.com/rrd/2559_bartlby_load.png >
-special_addon_ui_2559_[2]=<img src^http://dev.januschka.com/rrd/2559_bartlby_load7.png >
-special_addon_ui_2559_[2]_name=Load Graph Last 7 Days
-
-special_addon_ui_2554_cnt=2
-special_addon_ui_2554_[1]_name=Memory Graph last 24 Hours
-special_addon_ui_2554_[1]=<img src^http://dev.januschka.com/rrd/2554_bartlby_swap.sh.png >
-special_addon_ui_2554_[2]_name=Memory Graph last 7 Days
-special_addon_ui_2554_[2]=<img src^http://dev.januschka.com/rrd/2554_bartlby_swap.sh7.png >
 
-
-
-special_addon_ui_3187_cnt=2
-special_addon_ui_3187_[1]_name=Bandwidth Graph last 24 Hours
-special_addon_ui_3187_[1]=<img src^http://dev.januschka.com/rrd/3187_bartlby_if.png >
-special_addon_ui_3187_[2]=<img src^http://dev.januschka.com/rrd/3187_bartlby_if7.png >
-special_addon_ui_3187_[2]_name=Bandwidth Graph last 7 Days
-
-
-special_addon_ui_3457_cnt=2
-special_addon_ui_3457_[1]_name=SNMP Graph last 24 Hours
-special_addon_ui_3457_[1]=<img src^http://dev.januschka.com/rrd/3457_bartlby_snmp.sh_192.168.2.228_hrProcessorLoad.1.rrd.png >
-special_addon_ui_3457_[2]=<img src^http://dev.januschka.com/rrd/3457_bartlby_snmp.sh_192.168.2.228_hrProcessorLoad.1.rrd7.png >
-special_addon_ui_3457_[2]_name=SNMP Graph last 7 Days
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/xajax.common.php ./bartlby-ui/xajax.common.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/xajax.common.php	2008-04-03 11:21:13.000000000 +0200
+++ ./bartlby-ui/xajax.common.php	2008-10-13 21:28:10.000000000 +0200
@@ -38,6 +38,7 @@
 $xajax->registerFunction("group_search");
 $xajax->registerFunction("forceCheck");
 
+$xajax->registerFunction("BulkServiceSearch");
+$xajax->registerFunction("IphoneOverView");
 
-
-?>
\ No newline at end of file
+?>
diff -Nur /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/xajax_dispatcher.php ./bartlby-ui/xajax_dispatcher.php
--- /var/www/htdocs/bartlby.januschka.com/cvs/last_full/bartlby-ui/xajax_dispatcher.php	2008-04-06 22:57:23.000000000 +0200
+++ ./bartlby-ui/xajax_dispatcher.php	2008-10-13 21:28:10.000000000 +0200
@@ -7,31 +7,47 @@
 
 $btl=new BartlbyUi($Bartlby_CONF);
 $layout = new Layout();
-
+$layout->setTheme(bartlby_config("ui-extra.conf", "theme"));
 
 
 $xajax->processRequests();
 
 
-
+function IphoneOverView() {
+	global $btl;
+	$res=new xajaxResponse();
+	$map = $btl->GetSVCMap();
+	
+	
+	$oks=10;
+	
+	$res->AddScript("loadIcon=document.getElementById('activityIndicator'); loadIcon.style.display='none';");
+	
+	$res->AddScript("OKs=10;");
+	$res->AddAssign("text1", "innerHTML", "Welcome: " . $btl->user);
+	
+	return $res;
+}
 function toggle_extension($ext) {
+	global $layout;
 	$res=new xajaxResponse();
 	$fn = "extensions/" . $ext . ".disabled";
 	if(!file_exists($fn)) {
 		@touch($fn);
 		//enable	
-		$res->AddAssign("extension_" . $ext, "src", "images/extension_disable.gif");
-		$res->AddAssign("extension_" . $ext, "title", "enable extension");
+		$res->AddAssign("extension_img_" . $ext, "src", "themes/" . $layout->theme . "/images/extension_disable.gif");
+		$res->AddAssign("extension_img_" . $ext, "title", "enable extension");
 	} else {
 		@unlink($fn);
-		$res->AddAssign("extension_" . $ext, "src", "images/extension_enable.gif");
-		$res->AddAssign("extension_" . $ext, "title", "disable extension");
+		$res->AddAssign("extension_img_" . $ext, "src", "themes/" . $layout->theme . "/images/extension_enable.gif");
+		$res->AddAssign("extension_img_" . $ext, "title", "disable extension");
 		//disable extension_disable.gif
 	}
 	return $res;
 }
 function toggle_server_check($server_id, $service_id) {
 	global $btl;
+	global $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $server_id)) {
 		if($btl->hasServerorServiceRight($server_id, false)) {
@@ -41,11 +57,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("server_" . $server_id, "src", "images/enabled.gif");
+				$res->AddAssign("server_" . $server_id, "src", "themes/" . $layout->theme . "/images/enabled.gif");
 				$res->AddAssign("server_" . $server_id, "title", "Disable Checks");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("server_" . $server_id, "src", "images/diabled.gif");
+				$res->AddAssign("server_" . $server_id, "src", "themes/" . $layout->theme . "/images/diabled.gif");
 				$res->AddAssign("server_" . $server_id, "title", "Enable Checks");
 			}
 			
@@ -67,6 +83,8 @@
 
 function toggle_server_notify_check($server_id, $service_id) {
 	global $btl;
+	global $layout;
+
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $server_id)) {
 		if($btl->hasServerorServiceRight($server_id, false)) {
@@ -76,11 +94,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("trigger_" . $server_id, "src", "images/trigger.gif");
+				$res->AddAssign("trigger_" . $server_id, "src", "themes/" . $layout->theme . "/images/trigger.gif");
 				$res->AddAssign("trigger_" . $server_id, "title", "disable notifications");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("trigger_" . $server_id, "src", "images/notrigger.gif");
+				$res->AddAssign("trigger_" . $server_id, "src", "themes/" . $layout->theme . "/images/notrigger.gif");
 				$res->AddAssign("trigger_" . $server_id, "title", "enable trigger");
 			}
 			
@@ -97,7 +115,7 @@
 	return $res;
 }
 function toggle_service_notify_check($server_id, $service_id) {
-	global $btl;
+	global $btl, $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $service_id)) {
 		if($btl->hasServerorServiceRight($service_id, false)) {
@@ -107,11 +125,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("trigger_" . $service_id, "src", "images/trigger.gif");
+				$res->AddAssign("trigger_" . $service_id, "src", "themes/" . $layout->theme . "/images/trigger.gif");
 				$res->AddAssign("trigger_" . $service_id, "title", "disable notifications");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("trigger_" . $service_id, "src", "images/notrigger.gif");
+				$res->AddAssign("trigger_" . $service_id, "src", "themes/" . $layout->theme . "/images/notrigger.gif");
 				$res->AddAssign("trigger_" . $service_id, "title", "enable trigger");
 			}
 			
@@ -129,7 +147,7 @@
 }
 
 function toggle_service_check($server_id, $service_id) {
-	global $btl;
+	global $btl, $layout;
 	$res = new xajaxresponse();
 	if(!preg_match("/^XML.*$/i", $service_id)) {
 		if($btl->hasServerorServiceRight($service_id, false)) {
@@ -139,11 +157,11 @@
 			
 			if($cur == 1) { //Active
 				//$res->addAlert("Check enabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
-				$res->AddAssign("service_" . $service_id, "src", "images/enabled.gif");
+				$res->AddAssign("service_" . $service_id, "src", "themes/" . $layout->theme . "/images/enabled.gif");
 				$res->AddAssign("service_" . $service_id, "title", "Disable Checks");
 			} else {
 				//$res->addAlert("Check disabled on:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);	
-				$res->AddAssign("service_" . $service_id, "src", "images/diabled.gif");
+				$res->AddAssign("service_" . $service_id, "src", "themes/" . $layout->theme . "/images/diabled.gif");
 				$res->AddAssign("service_" . $service_id, "title", "Enable Checks");
 			}
 			
@@ -198,7 +216,7 @@
 				$gsm=bartlby_get_service_by_id($btl->CFG, $service);
 				$idx=$btl->findSHMPlace($service);
 				$cur=bartlby_check_force($btl->CFG, $idx);
-				$res->addAlert("immediate check scheduled for:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
+				//$res->addAlert("immediate check scheduled for:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
 			} else {
 				$res->addAlert("permission denied to force:" . $gsm[server_name] . ":" . $gsm[client_port] . "/" . $gsm[service_name]);
 			}
@@ -477,6 +495,38 @@
 	$res->addAssign("server_search_suggest", "innerHTML", $output);
 	return $res;	
 }
+
+function BulkServiceSearch($what) {
+	global $btl, $layout, $rq;
+	//compat for extensions
+	$_GET[search] = $what;
+	$servers=$btl->GetSVCMap();	
+	$_GET["servers"]=$servers;
+	$res = new xajaxResponse();
+	$found = 0;
+	while(list($k, $v) = @each($servers)) {
+		
+		
+		
+		for($x=0; $x<count($v); $x++) {
+			if(@preg_match("/" . $what . "/i", $v[$x][server_name] . "/" . $v[$x][service_name])) {
+						
+				$rq .= "<input type=checkbox  name=bulk_services value='" . $v[$x][service_id] . ";" .  $v[$x][server_name] . "/" . $v[$x][service_name] . "'><a href=\"javascript:bulk_service_add(" . $v[$x][service_id] . ", '" . $v[$x][server_name] . "/" . $v[$x][service_name] . "')\"><font size=1>" . $v[$x][server_name] . "/" . $v[$x][service_name] . "</A></font><br>";	
+				$svcfound=true;
+				$found++;
+			}
+		}
+		if($found > 10) break;
+		
+	}	
+	if($svcfound != true) $rq = "No Services found";
+
+	$res->addAssign("service_result", "innerHTML", $rq);
+
+	return $res;
+	
+}
+
 function QuickLook($what) {
 	global $btl, $layout, $rq;
 	//compat for extensions
@@ -512,7 +562,7 @@
 	}
 	
 	$rq .= "</table>";
-	$output .= $layout->create_box("Server", $rq);
+	$output .= $layout->create_box("Server", $rq, "search_servers");
 	$rq = "<table width=100%>";
 	
 	$rq .= "<tr>";
@@ -542,7 +592,7 @@
 	
 	
 	$rq .= "</table>";
-	$output .= $layout->create_box("Services", $rq);
+	$output .= $layout->create_box("Services", $rq, "search_services");
 	$rq = "";
 	
 	@reset($servers);
@@ -557,8 +607,11 @@
 	
 	//Search Workers
 	//Call n get return of Extensions
-	$output .=  $layout->create_box("Extensions", $rq);
-	$output = "<a href='javascript:void(0);' onClick=\"xajax_removeDIV('quick_suggest');\">close</A><br>" . $output;
+	$output .=  $layout->create_box("Extensions", $rq, "search_extensions");
+	$cl_button = "<a href='javascript:void(0);' onClick=\"xajax_removeDIV('quick_suggest');\">close</A><br>";
+	
+	$output = $cl_button . $layout->boxes[search_services] . $layout->boxes[search_servers] . $layout->boxes[search_extensions];
+	
 	$res->addAssign("quick_suggest", "innerHTML", $output);
 	return $res;	
 }
@@ -768,7 +821,12 @@
 	} else {
 		$res->addAssign("error_renotify_interval", "innerHTML", "");
 	}
-	
+	if(!$av["service_server[]"] && !$av["service_server"]) {
+		$res->addAssign("error_service_server[]", "innerHTML", "required field");
+		$al="1";
+	} else {
+		$res->addAssign("error_service_server[]", "innerHTML", "");
+	}
 	
 	switch($av[service_type]) {
 		case 1: