tagging ychat-0.5.0ychat-0.5.0

81 files changed, 3582 insertions, 2687 deletions

diff --git a/CVS/Entries b/CVS/Entries
index 9131cd2..9382269 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,10 +1,70 @@
-/CHANGES/1.17/Mon Feb 14 20:09:50 2005//
-/COPYING/1.6/Sun Jun 27 06:32:26 2004//
-/INSTALL/1.7/Fri Jul  9 22:33:20 2004//
-/Makefile/1.31/Sun Feb 13 07:56:58 2005//
-/NEWS/1.34/Thu Feb 17 18:09:41 2005//
-/README/1.101/Thu Feb 17 18:09:42 2005//
-/RELEASES/1.2/Thu Feb 17 18:09:42 2005//
-/TODO/1.68/Mon Feb 14 17:33:09 2005//
-/configure/1.31/Wed Feb  9 22:42:58 2005//
+/COPYING/1.1/Fri Mar 28 00:27:16 2003//
+/Makefile.in/1.7/Sat Apr 19 16:16:14 2003//
+/README/1.4/Sun Sep 14 14:48:45 2003//
+/base.cpp/1.8/Wed Apr  2 10:50:18 2003//
+/base.h/1.5/Wed Apr  2 10:50:18 2003//
+/chat.cpp/1.12/Sat Apr 19 19:39:17 2003//
+/chat.h/1.8/Sat Apr 19 16:16:14 2003//
+/cmnd.cpp/1.3/Tue Mar 25 14:54:07 2003//
+/cmnd.h/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/conf.cpp/1.5/Fri Apr  4 21:35:59 2003//
+/conf.h/1.2/Tue Mar 25 14:54:07 2003//
+/conf.txt/1.19/Sun Sep 14 14:31:49 2003//
+/configure/1.4/Fri Mar 28 02:02:00 2003//
+/configure.in/1.5/Fri Mar 28 02:02:00 2003//
+/cont.cpp/1.3/Tue Mar 25 14:54:07 2003//
+/cont.h/1.2/Sun Mar 30 00:26:42 2003//
+/glob.h/1.6/Sun Sep 14 14:31:49 2003//
+/hmap.cpp/1.8/Mon Apr  7 13:24:09 2003//
+/hmap.h/1.8/Wed Apr  2 10:50:18 2003//
+/html.cpp/1.7/Wed Apr  2 10:50:18 2003//
+/html.h/1.3/Tue Mar 25 14:54:07 2003//
+/incl.h/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/lang.cpp/1.1/Fri Apr  4 22:14:35 2003//
+/lang.h/1.1/Fri Apr  4 22:14:35 2003//
+/logd.cpp/1.2/Thu Apr 10 15:36:10 2003//
+/logd.h/1.1/Fri Apr  4 15:19:11 2003//
+/main.cpp/1.11/Sat Apr 19 16:16:14 2003//
+/modl.cpp/1.2/Wed Apr  2 21:57:34 2003//
+/modl.h/1.1/Wed Apr  2 13:23:09 2003//
+/msgs.h/1.12/Sun Sep 14 14:48:45 2003//
+/mutx.cpp/1.3/Tue Mar 25 14:54:07 2003//
+/mutx.h/1.2/Tue Mar 25 14:54:08 2003//
+/name.cpp/1.3/Tue Mar 25 22:19:51 2003//
+/name.h/1.3/Tue Mar 25 22:21:26 2003//
+/pool.cpp/1.8/Sun Sep  7 12:49:46 2003//
+/pool.h/1.1/Sun Mar 23 04:55:58 2003//
+/reqp.cpp/1.18/Sun Sep 14 14:31:49 2003//
+/reqp.h/1.10/Fri Apr  4 15:19:11 2003//
+/room.cpp/1.2/Sun Mar 23 05:41:19 2003//
+/room.h/1.2/Fri Mar 28 02:51:03 2003//
+/s_chat.cpp/1.1/Tue Mar 25 14:54:08 2003//
+/s_chat.h/1.1/Tue Mar 25 14:54:08 2003//
+/s_conf.cpp/1.1/Tue Mar 25 14:54:08 2003//
+/s_conf.h/1.2/Fri Apr  4 21:35:59 2003//
+/s_html.cpp/1.1/Tue Mar 25 14:54:08 2003//
+/s_html.h/1.1/Tue Mar 25 14:54:08 2003//
+/s_lang.cpp/1.1/Fri Apr  4 22:14:35 2003//
+/s_lang.h/1.1/Fri Apr  4 22:14:35 2003//
+/s_modl.cpp/1.1/Wed Apr  2 23:01:20 2003//
+/s_modl.h/1.1/Wed Apr  2 23:01:20 2003//
+/s_mutx.cpp/1.1/Tue Mar 25 14:54:08 2003//
+/s_mutx.h/1.1/Tue Mar 25 14:54:08 2003//
+/s_sman.cpp/1.1/Sat Apr 19 16:16:15 2003//
+/s_sman.h/1.1/Sat Apr 19 16:17:09 2003//
+/s_sock.cpp/1.1/Tue Mar 25 14:54:08 2003//
+/s_sock.h/1.1/Tue Mar 25 14:54:08 2003//
+/s_tool.cpp/1.4/Fri Apr  4 10:41:12 2003//
+/s_tool.h/1.4/Fri Apr  4 10:41:12 2003//
+/sess.cpp/1.2/Sat Apr 19 19:39:17 2003//
+/sess.h/1.2/Sat Apr 19 19:39:17 2003//
+/sman.cpp/1.1/Sat Apr 19 16:16:15 2003//
+/sman.h/1.2/Sat Apr 19 19:39:17 2003//
+/sock.cpp/1.17/Sun Sep 14 14:31:49 2003//
+/sock.h/1.6/Fri Apr  4 15:19:11 2003//
+/thrd.cpp/1.5/Wed Mar 26 14:57:04 2003//
+/thrd.h/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/todo.txt/1.4/Sun Mar 30 01:48:46 2003//
+/user.cpp/1.7/Fri Apr  4 22:14:35 2003//
+/user.h/1.8/Sat Apr 19 19:39:17 2003//
 D
diff --git a/CVS/Entries.Log b/CVS/Entries.Log
index ebf29e1..c7be84c 100644
--- a/CVS/Entries.Log
+++ b/CVS/Entries.Log
@@ -1,7 +1,5 @@
-A D/bin////
-A D/docs////
-A D/etc////
+A D/cmnd////
+A D/gfx////
 A D/html////
+A D/lang////
 A D/log////
-A D/scripts////
-A D/src////
diff --git a/CVS/Root b/CVS/Root
index 745de68..a82e29e 100644
--- a/CVS/Root
+++ b/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/Makefile.in b/Makefile.in
index 2a9ca34..300d035 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-SRCS=chat.cpp s_chat.cpp conf.cpp s_conf.cpp cont.cpp dir.cpp html.cpp s_html.cpp lang.cpp s_lang.cpp logd.cpp main.cpp modl.cpp s_modl.cpp mutx.cpp s_mutx.cpp name.cpp pool.cpp reqp.cpp room.cpp sock.cpp s_sock.cpp thrd.cpp s_tool.cpp user.cpp sess.cpp sman.cpp s_sman.cpp s_mman.cpp mman.cpp mcon.cpp menu.cpp ncur.cpp s_ncur.cpp
+SRCS=chat.cpp s_chat.cpp cmnd.cpp conf.cpp s_conf.cpp cont.cpp html.cpp s_html.cpp lang.cpp s_lang.cpp logd.cpp main.cpp modl.cpp s_modl.cpp mutx.cpp s_mutx.cpp name.cpp pool.cpp reqp.cpp room.cpp sock.cpp s_sock.cpp thrd.cpp s_tool.cpp user.cpp sess.cpp sman.cpp s_sman.cpp 
 OBJS=$(SRCS:.cpp=.o)
 CC=g++
-LDFLAGS=@LDFLAGS@ -lstdc++ -lmysqlclient -lncurses -g 
+LDFLAGS=@LDFLAGS@ -lstdc++ -g
 LDADD=-pthread -D_THREAD_SAFE
 all: ychat	
 $(SRCS):
diff --git a/README b/README
index 24fe7dc..240c854 100755
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
-yChat; Homepage: www.yChat.org; Version 0.5.5-CURRENT
+yChat++ Basic; Homepage: www.yChat.org; Version 0.5 
 Copyright (C) 2003 Paul C. Buetow, Volker Richter
-Copyright (C) 2005 Paul C. Buetow
 -----------------------------------------------------------------
 
 This program is free software; you can redistribute it and/or
@@ -19,20 +18,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 -----------------------------------------------------------------
 
-0.0.0 LEGACY YCHAT 0.5 TABLE OF CONTENTS 
+0.0.0 YCHAT++ BASIC TABLE OF CONTENTS 
 1.0.0 REQUIREMENTS
 1.1.0 TESTED PLATFORMS
 1.2.0 IMPORTANT NOTES
-1.3.0 HOW TO OBTAIN YCHAT
+1.3.0 HOW TO OBTAIN YCHAT++ 
 1.3.1 INSTALLATION
 1.5.0 CUSTOMIZATION
 1.6.0 FILES
-1.7.0 WRITING BUG REPORTS
 1.8.0 CONTACT
 
 1.0.0 REQUIREMENTS: 
 
-- gcc 3.x
+- gcc 3.2
   The GNU C++ compiler.
 
 1.1.0 TESTED PLATFORMS:
@@ -40,26 +38,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 The following platforms have been tested with success:
 
 - Linux with GCC 3.2.0, GNU make 3.79.1
-- FreeBSD 5.1-RELEASE-p2, GCC 3.2.2, GNU make 3.80 
-- FreeBSD 5.3-RELEASE, GCC 3.4, GNU make 3.80
+- FreeBSD 5.1-RELEASE-p2, GCC 3.2.2, GNU make 3.80 ( standard make does not seem work on FreeBSD ). 
 
 1.2.0 IMPORTANT NOTES:
 
 Before you compile the source you have to be sure to use at least GCC
 version 3.x with pthreads enabled. ( Type gcc -v to check it ).
 GCC 2.95 did not work while testing on linux and WON'T BE SUPPORTED!
-If you like to support yChat please write us an email and tell what 
-you can/like/would help ;-]. Please also take a look at the yChat
+If you like to support yChat++, please write us an email and tell what 
+you can/like/would help ;-]. Please also take a look at the yChat++
 homepage which is located at http://www.yChat.org.
 
-1.3.0 HOW TO OBTAIN YCHAT:
+1.3.0 HOW TO OBTAIN YCHAT++:
 
 yChat can be downloaded as a source package or through CVS. 
 
 The packages are located at http://www.yChat.org -> Sourcecode -> 
 Packages or go to http://programming.buetow.org/CPP-yChat .
 
-For CVS download type also look at the homepage please.
+For CVS download type:
+
+cvs -d:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat login
+( You will be asked for a password. Use "just enter" ).
+
+cvs -z3 -d:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat co \
+ ychat_advanced
+( The sources will be copied into your local folder. However, if you 
+  want to obtain the yChat++ Basic sources then replace "ychat_advanced"
+  "ychat" ).
+
+cvs -d:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat logout
+( Logs your CVS session out ).
+
+Now you may continue with the installation.
 
 1.3.1 INSTALLATION:
 
@@ -70,8 +81,8 @@ Invoke "cd cmnd && ./compile.sh && cd -". All command modules should get
 compiled.
 
 Now its time to run the server with ./ychat.
-Then point your webbrowser to http://yourip:port !
-
+Then point your webbrowser to http://yourip:port/index.html ( ignoring
+the index.html on the end of the url will not work! ). 
 ... have fun :-).
 
 1.5.0 CUSTOMIZATION:
@@ -85,8 +96,6 @@ Dynamic loadable modules can be found in the cmnd/ subdirectory.
 
 conf.txt - The yChat configuration file. ( read by conf.cpp ).
 
-Files in ./src:
-
 base.cpp - Encapsulates vector fields of room's or user ( may be later
            hash_maps ) and provides methods for manipulating data
            objects.
@@ -203,44 +212,6 @@ The basic class structure:
   /      \
 conf     html
 
-1.7 WRITING BUG REPORTS
-
-How to submit a good bug report?
-
-Send them to Bug@yChat.org.
-
-First you should give the following information:
-- yChat version, if CVS (or devel. tarball) then which day?
-- operating system / distribution and it's version
-- when did it crash? did you do something? can you reproduce the crash?
-
-Getting backtrace of the crash also helps a lot, especially if yChat crashes randomly. If after crash you see text:
-
- "segmentation fault (core dumped)" 
-
-It writes a file named "core" or "ychat.core" depending on your OS to directory where you started yChat. If it doesn't print the "(core dumped)" or you can't find the core file, you'll have to raise the limit for max. core file size before running yChat. To do this, say:
-
- ulimit -c unlimited 
-
-So, if you have the core file and GNU debugger (gdb), you can get the backtrace with:
-
- gdb ychat core 
- bt 
-
-Paste all the lines starting from line having #0 at the beginning.
-
-Here's an example session:
-
- in reqp::parse(thrd*, std::string, std::map<std::string, std::string, std::less<std::string>, std::allocator<std::pair<std::string const, std::string> > >&) ()
- (gdb) bt
- #0 0x0805c287 in reqp::parse(thrd*, std::string, std::map<std::string, std::string, std::less<std::string>, std::allocator<std::pair<std::string const, std::string> > >&) ()
- #1 0x0806060f in sock::read_write(thrd*, int) ()
- #2 0x080612ba in thrd::run() ()
- #3 0x0805a3b8 in pool::run_func(void*) ()
- #4 0x0805a375 in pool::tpool_thread(void*) ()
- #5 0x281d44ae in _thread_start () from /usr/lib/libc_r.so.5
- (gdb) 
-
 1.8 CONTACT:
 
 You may contact us through the following addresses:
diff --git a/base.cpp b/base.cpp
index 82b3030..ce585ea 100755
--- a/base.cpp
+++ b/base.cpp
@@ -1,3 +1,13 @@
+/*
+	This file is part of yChat
+
+	$Author: snooper $
+	$Date: 2003/04/02 10:50:18 $
+	
+	$Header: /cvsroot/ychat/ychat/base.cpp,v 1.8 2003/04/02 10:50:18 snooper Exp $
+*/
+// template class data implementation;
+
 #ifndef BASE_CPP
 #define BASE_CPP
 
@@ -6,54 +16,50 @@
 template<class type>
 base<type>::base()
 {
-    map_elem = new hmap<type*,string>(80);
-    pthread_mutex_init (&mut_map_elem, NULL );
+ map_elem = new hmap<type*,string>(80);
+ pthread_mutex_init (&mut_map_elem, NULL ); 
 }
 
 template<class type>
 base<type>::~base( )
 {
-    pthread_mutex_destroy( &mut_map_elem );
+ pthread_mutex_destroy( &mut_map_elem );
 }
 
-template<class type>
-void
+template<class type> void
 base<type>::add_elem( type* p_type )
 {
-    pthread_mutex_lock  ( &mut_map_elem   );
-    map_elem->add_elem  ( p_type, p_type->get_name());
-    pthread_mutex_unlock( &mut_map_elem   );
+ pthread_mutex_lock  ( &mut_map_elem   );
+ map_elem->add_elem  ( p_type, p_type->get_name()); 
+ pthread_mutex_unlock( &mut_map_elem   );
 }
 
-template<class type>
-void
+template<class type> void
 base<type>::del_elem( string &s_name )
 {
-    pthread_mutex_lock  ( &mut_map_elem );
-    map_elem->del_elem  ( s_name	     );
-    pthread_mutex_unlock( &mut_map_elem );
+ pthread_mutex_lock  ( &mut_map_elem );
+ map_elem->del_elem  ( s_name	     ); 
+ pthread_mutex_unlock( &mut_map_elem );
 }
 
-template<class type>
-type*
+template<class type> type*
 base<type>::get_elem( string &s_name, bool &b_found )
 {
-    pthread_mutex_lock  ( &mut_map_elem );
-    type* p_type = map_elem->get_elem( s_name );
-    pthread_mutex_unlock( &mut_map_elem );
+ pthread_mutex_lock  ( &mut_map_elem );
+ type* p_type = map_elem->get_elem( s_name ); 
+ pthread_mutex_unlock( &mut_map_elem );
 
-    b_found = p_type == NULL ?  false : true;
+ b_found = p_type == NULL ?  false : true;
 
-    return p_type;
+ return p_type; 
 }
 
-template<class type>
-void
+template<class type> void
 base<type>::run_func( void (*func)(type*, void*), void* v_arg )
 {
-    pthread_mutex_lock  ( &mut_map_elem );
-    map_elem->run_func( func, v_arg );
-    pthread_mutex_unlock( &mut_map_elem );
+ pthread_mutex_lock  ( &mut_map_elem );
+ map_elem->run_func( func, v_arg ); 
+ pthread_mutex_unlock( &mut_map_elem );
 }
 
 #endif
diff --git a/base.h b/base.h
index 9128ca1..6f06e4b 100755
--- a/base.h
+++ b/base.h
@@ -10,60 +10,60 @@ template<class type>
 class base
 {
 private:
-    hmap<type*,string>* map_elem;
-    pthread_mutex_t mut_map_elem;
+ hmap<type*,string>* map_elem;
+ pthread_mutex_t mut_map_elem; 
 
 public:
-    base();
-    ~base();
+  base();
+ ~base();
 
-    virtual void  add_elem( type*   p_type );                // add a element.
-    virtual void  del_elem( string &s_name );                // delete a alement.
-    virtual type* get_elem( string &s_name, bool &b_found ); // get a element.
+ virtual void  add_elem( type*   p_type );                // add a element.
+ virtual void  del_elem( string &s_name );                // delete a alement.
+ virtual type* get_elem( string &s_name, bool &b_found ); // get a element.
 
-    // execute func on all elements of map_elem. v_pointer is the argument.
-    virtual void  run_func( void (*func)(type*, void*), void* v_arg );
+ // execute func on all elements of map_elem. v_pointer is the argument.
+ virtual void  run_func( void (*func)(type*, void*), void* v_arg );
 
-    // chat::msg_post sends to all users of the system a message.
-    // room::msg_post sends to all users of the room a message.
-    // user::msg_post sends to the user a message.
-    void msg_post( string *s_msg )
-    {
-        run_func( &base<type>::msg_post_ , (void*)s_msg );
-    }
-    static void msg_post_( type* type_obj, void* v_arg )
-    {
-        string *p_msg    = (string*) v_arg;
-        type_obj -> msg_post( p_msg );
-    }
+ // chat::msg_post sends to all users of the system a message.
+ // room::msg_post sends to all users of the room a message.
+ // user::msg_post sends to the user a message.
+ void msg_post( string *s_msg )
+ {
+  run_func( &base<type>::msg_post_ , (void*)s_msg );
+ }
+ static void msg_post_( type* type_obj, void* v_arg )
+ {
+   string *p_msg    = (string*) v_arg;
+   type_obj -> msg_post( p_msg ); 
+ }
 
-    void get_data( map_string *p_map_string )
-    {
-        run_func( &base<type>::get_data_ , (void*)p_map_string );
-    }
-    static void get_data_( type* type_obj, void* v_arg )
-    {
-        map_string *map_params = (map_string*) v_arg;
-        type_obj -> get_data ( map_params );
-    }
+ void get_data( map_string *p_map_string )
+ {
+  run_func( &base<type>::get_data_ , (void*)p_map_string );
+ }
+ static void get_data_( type* type_obj, void* v_arg )
+ {
+   map_string *map_params = (map_string*) v_arg;
+   type_obj -> get_data ( map_params );
+ }
 
-    // chat::get_user_list gets a list of all users of the system.
-    // room::get_user_list gets a list of all users of the room.
-    // user::get_user_list gets a "list" of a user <font color="usercolor">username</font>seperator
-    void get_user_list( string &s_list, string &s_seperator )
-    {
+ // chat::get_user_list gets a list of all users of the system.
+ // room::get_user_list gets a list of all users of the room.
+ // user::get_user_list gets a "list" of a user <font color="usercolor">username</font>seperator
+ void get_user_list( string &s_list, string &s_seperator )
+ {
 
-        container c;
-        c.elem[0] = (void*) &s_list;
-        c.elem[1] = (void*) &s_seperator;
+   container c; 
+   c.elem[0] = (void*) &s_list; 
+   c.elem[1] = (void*) &s_seperator;
 
-        run_func( &base<type>::get_user_list_, (void*)&c );
-    }
-    static void get_user_list_( type* type_obj, void* v_arg )
-    {
-        container *c = (container*) v_arg;
-        type_obj -> get_user_list( *((string*)c->elem[0]), *((string*)c->elem[1]) );
-    }
+   run_func( &base<type>::get_user_list_, (void*)&c );
+ }
+ static void get_user_list_( type* type_obj, void* v_arg )
+ {
+   container *c = (container*) v_arg; 
+   type_obj -> get_user_list( *((string*)c->elem[0]), *((string*)c->elem[1]) ); 
+ } 
 };
 
 #include "base.cpp"
diff --git a/chat.cpp b/chat.cpp
index fa6200c..b845ec3 100755
--- a/chat.cpp
+++ b/chat.cpp
@@ -5,158 +5,143 @@
 
 #include "chat.h"
 #include "s_conf.h"
+#include "s_mutx.h"
 #include "s_tool.h"
-#include "s_ncur.h"
 
 using namespace std;
 
 chat::chat( )
 {
-    if ( s_conf::get
-                ().get_val( "HTML" ) == "OFF" )
-            b_strip_html = true;
-    else
-        b_strip_html = false;
+ if ( s_conf::get().get_val( "HTML" ) == "OFF" )
+  b_strip_html = true;
+ else
+  b_strip_html = false;
+
 }
 
 chat::~chat( )
-{}
+{
+}
 
 user*
 chat::get_user( string &s_user )
 {
-    bool b_flag;
-    return get_user( s_user, b_flag );
+ bool b_flag;
+ return get_user( s_user, b_flag );
 }
 
 user*
 chat::get_user( string &s_user, bool &b_found )
 {
-    container param;
+ container param;
 
-    param.elem[0] = (void*) &s_user ;
-    param.elem[1] = (void*) &b_found;
+ param.elem[0] = (void*) &s_user ;
+ param.elem[1] = (void*) &b_found;
 
-    b_found = false;
+ b_found = false;
 
-    run_func( get_user_, (void*)&param );
+ run_func( get_user_, (void*)&param ); 
 
-    if ( *( (bool*)param.elem[1] ) )
-        return (user*)param.elem[2];
+ if ( *( (bool*)param.elem[1] ) )
+  return (user*)param.elem[2];
 }
 
 void
 chat::get_user_( room *room_obj, void *v_arg )
 {
-    container* param = (container*) v_arg;
-    param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) );
+ container* param = (container*) v_arg;
+ param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) ); 
 }
 
 void
 chat::login( map_string &map_params )
 {
-    string s_user = map_params["nick"];
-
-    // prove if nick is empty:
-    if ( s_user.empty() )
-    {
-        map_params["INFO"]    = E_NONICK;
-        map_params["request"] = s_conf::get
-                                    ().get_val( "STARTMPL" ); // redirect to the startpage.
-        return;
-    }
-
-    // prove if the nick ist alphanumeric:
-    else if ( ! s_tool::is_alpha_numeric( s_user ) )
-    {
-        map_params["INFO"]    = E_ALPNUM;
-        map_params["request"] = s_conf::get
-                                    ().get_val( "STARTMPL" ); // redirect to the startpage.
-        return;
-    }
-
-    bool b_flag;
-
-    // prove if nick is already online / logged in.
-    get_user( s_user, b_flag );
-
-    if ( b_flag )
-    {
-        map_params["INFO"]    = E_ONLINE;
-        map_params["request"] = s_conf::get
-                                    ().get_val( "STARTMPL" );
-        return;
-    }
-
-    string s_room = map_params["room"];
-    room*  p_room = get_room( s_room , b_flag );
-
-    // if room does not exist add room to list!
-    if ( ! b_flag )
-    {
-        p_room = new room( s_room );
-
-#ifdef NCURSES
-
-        string s_tmp( NEWROOM );
-        s_tmp.append( s_room );
-        s_ncur::get
-            ().print( &s_tmp );
+ string s_user = map_params["nick"];
+
+ // prove if nick is empty: 
+ if ( s_user.empty() )
+ {
+  map_params["INFO"]    = E_NONICK; 
+  map_params["request"] = s_conf::get().get_val( "STARTMPL" ); // redirect to the startpage.
+  return;
+ }
+
+ // prove if the nick ist alphanumeric:
+ else if ( ! s_tool::is_alpha_numeric( s_user ) )
+ {
+  map_params["INFO"]    = E_ALPNUM; 
+  map_params["request"] = s_conf::get().get_val( "STARTMPL" ); // redirect to the startpage.
+  return;
+ }
+
+ bool b_flag;
+
+ // prove if nick is already online / logged in.
+ get_user( s_user, b_flag );
+ if ( b_flag ) 
+ {
+  map_params["INFO"]    = E_ONLINE;
+  map_params["request"] = s_conf::get().get_val( "STARTMPL" );
+  return;
+ } 
+
+ string s_room = map_params["room"]; 
+ room*  p_room = get_room( s_room , b_flag );
+
+ // if room does not exist add room to list!
+ if ( ! b_flag )
+ {
+  p_room = new room( s_room );
+
+#ifdef VERBOSE
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cout << NEWROOM << s_room << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
 #endif
-
-        add_elem( p_room );
-    }
-
-    user *p_user = new user( s_user );
-
-    // add user to the room.
-    p_room->add_user( p_user );
-    sess *ns =s_sman::get
-                  ().create_session();
-    ns->setValue(string("nick"), (void *)new string(s_user) );
-    map_params["tmpid"]=ns->get_id();
-
-#ifdef NCURSES
-
-    {
-        string s_tmp( NEWUSER );
-        s_tmp.append( s_user );
-        s_ncur::get
-            ().print(  s_tmp.c_str()  );
-    }
+  
+  add_elem( p_room );
+ }
+
+ user *p_user = new user( s_user );
+
+ // add user to the room.
+ p_room->add_user( p_user );
+ sess *ns =s_sman::get().createSession();
+ ns->setValue(string("nick"), (void *)new string(s_user) );
+ map_params["tmpid"]=ns->getId();
+ // post "username enters the chat" into the room.
+ p_room->msg_post( new string( s_user.append( s_lang::get().get_val( "USERENTR" ) ) ) );  
+
+#ifdef VERBOSE
+ pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+ cout << LOGINPR << s_user << endl;
+ pthread_mutex_unlock( &s_mutx::get().mut_stdout );
 #endif
-
-    // post "username enters the chat" into the room.
-    p_room->msg_post( new string( p_user->get_colored_name().append( s_lang::get
-                                      ().get_val( "USERENTR" ) ) ) );
-
 }
 
-void
+void 
 chat::post( user* p_user, map_string &map_params )
 {
 
-    string s_msg( map_params["message"] );
+ string s_msg( map_params["message"] );
 
-    auto unsigned i_pos = s_msg.find( "/" );
-    if ( i_pos == 0 )
-        return p_user->command( s_msg );
+ auto unsigned i_pos = s_msg.find( "/" );
+ if ( i_pos == 0 )
+  return p_user->command( s_msg ); 
 
-    if ( b_strip_html )
-        s_tool::strip_html( &s_msg );
+ if ( b_strip_html )
+  s_tool::strip_html( &s_msg );
 
-    string s_post( "<font color=\"#"   );
+ string s_post( "<font color=\""   );
 
-    s_post.append( p_user->get_col1() )
-    .append( "\">"              )
-    .append( p_user->get_name() )
-    .append( ":</font> <font color=\"#")
-    .append( p_user->get_col2() )
-    .append( "\">"  )
-    .append( s_msg              )
-    .append( "</font><br>\n"    );
+ s_post.append( p_user->get_col1() )
+       .append( "\">"              )
+       .append( p_user->get_name() ) 
+       .append( ": "               )
+       .append( s_msg              )
+       .append( "</font><br>\n"    );
 
-    p_user->get_room()->msg_post( &s_post );
+ p_user->get_p_room()->msg_post( &s_post ); 
 }
 
 #endif
diff --git a/chat.h b/chat.h
index bd64cb1..60bcf9d 100755
--- a/chat.h
+++ b/chat.h
@@ -17,30 +17,30 @@ using namespace std;
 class chat : public base<room>
 {
 private:
-    bool b_strip_html;
+ bool b_strip_html;
 
 public:
+ 
 
+ room* get_room( string &s_name, bool &b_found )
+ {
+  return static_cast<room*>( get_elem( s_name, b_found ) );
+ }
 
-    room* get_room( string &s_name, bool &b_found )
-    {
-        return static_cast<room*>( get_elem( s_name, b_found ) );
-    }
+ // public methods: 
+ explicit chat();  // a standard constructor.
+ ~chat();          // destructor.
 
-    // public methods:
-    explicit chat();  // a standard constructor.
-    ~chat();          // destructor.
+ // get the object of a specific user.
+ virtual user* get_user( string &s_nick ); 
+ virtual user* get_user( string &s_nick, bool &b_found );
+ static  void get_user_( room* room_obj, void *v_arg   ); 
 
-    // get the object of a specific user.
-    virtual user* get_user( string &s_nick );
-    virtual user* get_user( string &s_nick, bool &b_found );
-    static  void get_user_( room* room_obj, void *v_arg   );
+ // will be called every time a user tries to login.
+ virtual void login( map_string &map_params );
 
-    // will be called every time a user tries to login.
-    virtual void login( map_string &map_params );
-
-    // will be called if a user posts a message.
-    virtual void post ( user* u_user, map_string &map_params );
+ // will be called if a user posts a message.
+ virtual void post ( user* u_user, map_string &map_params );
 };
 
 #endif
diff --git a/cmnd.cpp b/cmnd.cpp
new file mode 100755
index 0000000..28e73a7
--- /dev/null
+++ b/cmnd.cpp
@@ -0,0 +1,19 @@
+// class cmnd implementation.
+
+#ifndef CMND_CXX
+#define CMND_CXX
+
+#include "cmnd.h"
+#include "s_mutx.h"
+
+using namespace std;
+
+cmnd::cmnd( )
+{
+}
+
+cmnd::~cmnd()
+{
+}
+
+#endif
diff --git a/cmnd.h b/cmnd.h
new file mode 100755
index 0000000..2eb1db2
--- /dev/null
+++ b/cmnd.h
@@ -0,0 +1,18 @@
+// class cmnd declaration.
+
+#ifndef CMND_H
+#define CMND_H
+
+#include "incl.h"
+
+using namespace std;
+
+class cmnd 
+{
+public:
+ // public methods: 
+ explicit cmnd( );      	      // a standard constructor.
+         ~cmnd( );
+};
+
+#endif
diff --git a/cmnd/CVS/Entries b/cmnd/CVS/Entries
new file mode 100644
index 0000000..a44a45c
--- /dev/null
+++ b/cmnd/CVS/Entries
@@ -0,0 +1,5 @@
+/compile.sh/1.1/Sun Sep 14 14:31:49 2003//
+/yc_q.cpp/1.2/Wed Apr  2 21:57:34 2003//
+/yc_test.cpp/1.1/Wed Apr  2 10:52:16 2003//
+/yc_version.cpp/1.1/Sun Sep 14 14:55:57 2003//
+D
diff --git a/cmnd/CVS/Repository b/cmnd/CVS/Repository
new file mode 100644
index 0000000..d7cf3ae
--- /dev/null
+++ b/cmnd/CVS/Repository
@@ -0,0 +1 @@
+ychat/cmnd
diff --git a/cmnd/CVS/Root b/cmnd/CVS/Root
new file mode 100644
index 0000000..a82e29e
--- /dev/null
+++ b/cmnd/CVS/Root
@@ -0,0 +1 @@
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/cmnd/compile.sh b/cmnd/compile.sh
new file mode 100755
index 0000000..cee438c
--- /dev/null
+++ b/cmnd/compile.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rm *.so 2> /dev/null
+
+for i in *cpp
+do
+ echo Compiling $i
+ gcc -shared -o $(echo $i | sed s/cpp$/so/) $i
+done
diff --git a/cmnd/yc_q.cpp b/cmnd/yc_q.cpp
new file mode 100644
index 0000000..acc8596
--- /dev/null
+++ b/cmnd/yc_q.cpp
@@ -0,0 +1,21 @@
+#include <iostream>
+#include "../user.h"
+
+/*
+ gcc -shared -o yc_name.so yc_name.cpp
+*/
+
+using namespace std;
+
+
+extern "C" {
+ export int extern_function(void *v_arg);
+
+ int extern_function(void *v_arg)
+ {
+  user *p_user = (user*) v_arg;
+  p_user->msg_post(  new string( "<script language='JavaScript'> window.open( 'index.html', '_top' ); </script>\n  " ) );
+  p_user->set_online( false );
+ }
+}
+
diff --git a/cmnd/yc_test.cpp b/cmnd/yc_test.cpp
new file mode 100644
index 0000000..deb3e54
--- /dev/null
+++ b/cmnd/yc_test.cpp
@@ -0,0 +1,12 @@
+#include <iostream>
+
+using namespace std;
+
+extern "C" {
+ export int function(void *v_arg);
+
+ int function(void *v_arg)
+ {
+  cout << "Hallo " << (char*)v_arg << endl;
+ }
+}
diff --git a/cmnd/yc_version.cpp b/cmnd/yc_version.cpp
new file mode 100644
index 0000000..5e686b7
--- /dev/null
+++ b/cmnd/yc_version.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include "../msgs.h"
+#include "../user.h"
+/*
+ gcc -shared -o yc_name.so yc_name.cpp
+*/
+
+using namespace std;
+
+extern "C" {
+ export int extern_function(void *v_arg);
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+  user *p_user = (user*) v_arg;
+  p_user->msg_post( new string( *new string(VERSION) + "<br>\n") );
+ }
+}
+
diff --git a/conf.cpp b/conf.cpp
index e4fcc0b..3ff71b8 100755
--- a/conf.cpp
+++ b/conf.cpp
@@ -4,84 +4,72 @@
 #define s_conf_CXX
 
 #include <fstream>
-#include "s_ncur.h"
 #include "conf.h"
 
 using namespace std;
 
 conf::conf( string s_conf = CONFILE ) : name( s_conf )
 {
-    parse( ); // parse the config file.
+ parse( ); // parse the config file. 
 }
 
 conf::~conf()
-{}
+{
+}
 
 void
 conf::parse()
 {
 #ifdef VERBOSE
-    cout << CFILEOK << get_name() << endl;
+ cout << CFILEOK << get_name() << endl;
 #endif
 
-    string s_configfile=get_name();
-
-    string homeconfig=string(getenv("HOME"))+string("/.ychat/")+get_name();
-    ifstream homecheck( homeconfig.c_str() );
-    if( homecheck )
-    {
-        homecheck.close();
-        s_configfile=homeconfig;
-    }
-
-    ifstream fs_conf( s_configfile.c_str() );
+ ifstream fs_conf( get_name().c_str() );
 
-    if ( ! fs_conf )
-    {
+ if ( ! fs_conf ) 
+ {
 #ifdef VERBOSE
-        cout << CFILENO << get_name() << endl;
+ cout << CFILENO << get_name() << endl;
 #endif
+  return;
+ }
 
-        return;
-    }
+ char c_buf[READBUF];
 
-    char c_buf[READBUF];
+ while( fs_conf.getline( c_buf, READBUF ) ) 
+ {
+  string s_token( c_buf );
+  unsigned int ui_pos = s_token.find( "#", 0 );
+   
+  // if line is commented out:
+  if ( ui_pos == 0 ) 
+   continue;
 
-    while( fs_conf.getline( c_buf, READBUF ) )
-    {
-        string s_token( c_buf );
-        unsigned int ui_pos = s_token.find( "#", 0 );
+  ui_pos = s_token.find( ";", 0 );
 
-        // if line is commented out:
-        if ( ui_pos == 0 )
-            continue;
+  // if token has not been found.
+  if ( ui_pos == string::npos )
+   continue;
 
-        ui_pos = s_token.find( ";", 0 );
+  s_token = s_token.substr( 0   , --ui_pos );
+  ui_pos  = s_token.find  ( "\"", 0        );   
 
-        // if token has not been found.
-        if ( ui_pos == string::npos )
-            continue;
+  if ( ui_pos == string::npos )
+   continue;
 
-        s_token = s_token.substr( 0   , --ui_pos );
-        ui_pos  = s_token.find  ( "\"", 0        );
-
-        if ( ui_pos == string::npos )
-            continue;
-
-        string s_val = s_token.substr( ui_pos+1, s_token.length() );
-        string s_key = s_token.substr( 0      , --ui_pos          );
+  string s_val = s_token.substr( ui_pos+1, s_token.length() );
+  string s_key = s_token.substr( 0      , --ui_pos          ); 
 
 #ifdef VERBOSE2
-
-        cout << s_key << "=" << s_val << endl;
+   cout << s_key << "=" << s_val << endl;
 #endif
 
-        // fill the map.
-        map_vals[s_key] = s_val;
-    }
+  // fill the map.
+  map_vals[s_key] = s_val;
+ } 
 
-    fs_conf.close();
-    fs_conf.~ifstream();
+ fs_conf.close();
+ fs_conf.~ifstream();
 }
 
 #endif
diff --git a/conf.h b/conf.h
index a47a628..6e2a890 100755
--- a/conf.h
+++ b/conf.h
@@ -14,11 +14,11 @@ class conf : public cont, name
 private:
 
 public:
-    // public methods:
-    conf ( string s_conf ); // standard constructor.
-    ~conf(); 		 // standard destructor.
+ // public methods:
+ conf ( string s_conf ); // standard constructor.
+ ~conf(); 		 // standard destructor.
 
-    virtual void parse( );    // parses the config file.
+ virtual void parse( );    // parses the config file.
 };
 
 #endif
diff --git a/conf.txt b/conf.txt
index 8ff068c..936af92 100755
--- a/conf.txt
+++ b/conf.txt
@@ -11,14 +11,14 @@
 # all lines which do not contain a semicolon and at least two quotes 
 # or start with a # will be ignored.
 #
-# greets, paul c. buetow ( snooper at ychat dot org );
+# greets, paul c. buetow ( snooper@ychat.org );
 #
 
 # server specific configurations ( not allowed to be removed ):
 
 HTMLTEMP="html/";  # directory of the html-template files.
-THRDPOOL="1";      # Initial pool size. 
-THRDPMAX="52";     # Max thread pool size 
+THRDPOOL="50";    # thread pool size. 
+THRDQUEU="50";    # length of the thread pool queue.
 SRVRPORT="3000";   # local port on which the server listens. 
 STRDROOM="Lounge"; # the name of the standard room.
 LANGUAGE="en"; # language of the chat outputs ( CONSOLE OUTPUT IS NOT AFFECTED )
@@ -48,7 +48,7 @@ LOG_LINES="10";
 
 # values which are used by the html-templates and are not sticked within the yC++ core source!
 GRAPHICS="http://paul.buetow.info/yChat"; # url for graphic files etc. 
-PGETITLE="yChat 0.5 - Fast Simple Extensible";
+PGETITLE="yChat++ Basic - Fast Simple Extensible";
 
 # do not edit beyond this line
 
diff --git a/configure b/configure
index 333efb0..8c5f0a7 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,1555 @@
-#!/bin/sh
+#! /bin/sh
 
-cd ./src
-./configure
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=s_chat.h
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+#AC_INIT_AUTOMAKE(yChat, 0.2)
+
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:528: checking for Cygwin environment" >&5
+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 533 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_cygwin" 1>&6
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes
+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+echo "configure:561: checking for mingw32 environment" >&5
+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 566 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:590: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 605 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 622 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 639 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:674: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CXX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CXX="$ac_cv_prog_CXX"
+if test -n "$CXX"; then
+  echo "$ac_t""$CXX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CXX" && break
+done
+test -n "$CXX" || CXX="gcc"
+
+
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:706: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 717 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cxx_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cxx_cross=no
+  else
+    ac_cv_prog_cxx_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cxx_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+if test $ac_cv_prog_cxx_works = no; then
+  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:748: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+echo "configure:753: checking whether we are using GNU C++" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gxx=yes
+else
+  ac_cv_prog_gxx=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:781: checking whether ${CXX-g++} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.cc
+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+  ac_cv_prog_cxx_g=yes
+else
+  ac_cv_prog_cxx_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+
+
+
+echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6
+echo "configure:815: checking for library containing dlopen" >&5
+if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_dlopen="no"
+cat > conftest.$ac_ext <<EOF
+#line 822 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_dlopen="none required"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_dlopen" = "no" && for i in dl; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 844 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_dlopen="-l$i"
+break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+
+echo "$ac_t""$ac_cv_search_dlopen" 1>&6
+if test "$ac_cv_search_dlopen" != "no"; then
+  test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS"
+  
+else :
+  
+fi
+if test "$ac_cv_search_dlopen" = "-ldl"; then
+LDFLAGS="$ac_cv_search_dlopen"
+fi
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+echo "configure:883: checking for $ac_hdr that defines DIR" >&5
+if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 888 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <$ac_hdr>
+int main() {
+DIR *dirp = 0;
+; return 0; }
+EOF
+if { (eval echo configure:896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_dirent_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ ac_header_dirent=$ac_hdr; break
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+echo "configure:921: checking for opendir in -ldir" >&5
+ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldir  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 929 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char opendir();
+
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -ldir"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+echo "configure:962: checking for opendir in -lx" >&5
+ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lx  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 970 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char opendir();
+
+int main() {
+opendir()
+; return 0; }
+EOF
+if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lx"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:1004: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1009 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1034 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 1052 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1073 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:1084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+for ac_hdr in unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1111: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1116 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in string.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1151: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1156 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:1188: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1193 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:1242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
+
+fi
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:1263: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 1270 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:1277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
+
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@CPP@%$CPP%g
+s%@CXX@%$CXX%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
diff --git a/configure.in b/configure.in
index da45484..7512df7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,28 @@
-AC_INIT(Makefile.in)
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(s_chat.h)
+#AC_INIT_AUTOMAKE(yChat, 0.2)
+dnl Checks for programs.
+
+AC_CYGWIN
+AC_MINGW32
 AC_PROG_CPP
 AC_PROG_CXX
 
-AC_CHECK_EXTRA
+dnl Checks for libraries.
+dnl Replace `main' with a function in -lstdc:
 AC_SEARCH_LIBS(dlopen, dl)
 if test "$ac_cv_search_dlopen" = "-ldl"; then
 LDFLAGS="$ac_cv_search_dlopen"
 fi
-
-
+dnl Checks for header files.
+AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(string.h)
-AC_CHECK_HEADERS(pthread.h,,echo "-> Error: pthread.h could not be found. Try --with-extra-includes=<dirs>"; exit 1;)
-AC_CHECK_HEADERS(mysql/mysql.h,,echo "-> Error: mysql.h could not be found. Try --with-extra-includes=<dirs>"; exit 1;)
-AC_CHECK_LIB(mysqlclient,mysql_init,,"-> Error: libmysqlclient could not be found. Try --with-extra-libs=<dirs>"; exit 1;)
-AC_CHECK_HEADERS(netinet/in.h,,echo "-> Error: netinet/in.h could not be found. Try --with-extra-includes=<dirs>"; exit 1;)
-AC_CHECK_HEADERS(sys/time.h,,echo "-> Error: sys/time.h could not be found. Try --with-extra-includes=<dirs>"; exit 1;)
-AC_CHECK_LIB(ncurses,newwin,,"-> Error: libncurses could not be found. Try --with-extra-libs=<dirs>";exit 1;)
-AC_CHECK_HEADERS(ncurses.h,,echo "-> Error ncurses.h could not be found. Try --with-extra-includes=<dirs"; exit1;)
+dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
+
+dnl Checks for library functions.
+
 AC_OUTPUT(Makefile)
-echo "You are now ready to compile. Type make"
diff --git a/cont.cpp b/cont.cpp
index 891c2fa..a437543 100755
--- a/cont.cpp
+++ b/cont.cpp
@@ -11,14 +11,14 @@ using namespace std;
 string
 cont::get_val( string s_key )
 {
-    if ( map_vals.find( s_key ) != map_vals.end() )
-        return map_vals[ s_key ];
-    return string();
+ if ( map_vals.find( s_key ) != map_vals.end() )
+  return map_vals[ s_key ];
+ return string();
 }
 
 cont::~cont()
 {
-    map_vals.~map_string();
+ map_vals.~map_string();
 }
 
 #endif
diff --git a/cont.h b/cont.h
index cc3f606..90cbd7b 100755
--- a/cont.h
+++ b/cont.h
@@ -1,6 +1,6 @@
 // class cont declaration. defines a simple data container class.
 
-#ifndef CONT_H
+#ifndef CONT_H 
 #define CONT_H
 
 #include "incl.h"
@@ -8,22 +8,19 @@
 
 using namespace std;
 
-class cont
+class cont 
 {
 protected:
-    map_string map_vals;
+ map_string map_vals;
 
 public:
-    cont::~cont();
+ cont::~cont();
 
-    // small inline methods:
-    void clear_vals()
-    {
-        map_vals.clear();
-    } // removes all values.
+ // small inline methods:
+ void clear_vals() { map_vals.clear(); } // removes all values.
 
-    // public methods:
-    virtual string get_val( string s_key ); // get a specific map_vals value.
+ // public methods:
+ virtual string get_val( string s_key ); // get a specific map_vals value.
 };
 
 #endif
diff --git a/gfx/CVS/Entries b/gfx/CVS/Entries
new file mode 100644
index 0000000..1784810
--- /dev/null
+++ b/gfx/CVS/Entries
@@ -0,0 +1 @@
+D
diff --git a/gfx/CVS/Repository b/gfx/CVS/Repository
new file mode 100644
index 0000000..6d97963
--- /dev/null
+++ b/gfx/CVS/Repository
@@ -0,0 +1 @@
+ychat/gfx
diff --git a/gfx/CVS/Root b/gfx/CVS/Root
new file mode 100644
index 0000000..a82e29e
--- /dev/null
+++ b/gfx/CVS/Root
@@ -0,0 +1 @@
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/glob.h b/glob.h
index bb7ea3b..6f89ef1 100755
--- a/glob.h
+++ b/glob.h
@@ -10,18 +10,9 @@
 #define true   1
 #define false  0
 
-// config filename. ( will be searched in ~/.ychat/ and if not found in the working 
-// directory of ychat ).
+// config filename.
 #define CONFILE "conf.txt"
 
-// the hard limit of mysql connections at the samte time in the mysql connection
-// manager.
-#define MAXMSQL 20
-
-// defines the standard value of the init method of the mysql connection manager
-// for the mysql server port. 
-#define PRTMSQL 3306
-
 // the highest port which is allowed to use. if ychat is unable to create the server
 // socket it will increment the port number and tries to create another socket.
 // this procedure will go on until MAXPORT is reached.
@@ -30,42 +21,16 @@
 // max length of a line read from a socket or a file ( config-file, html-template ).
 #define READBUF 1024
 
-// max length of a char buffer
-#define CHARBUF 100
-
-// definition for verbosity level ( normal outputs ). see vmsg.h for custumizing all
+// definition for verbosity level 0 ( normal outputs ). see vmsg.h for custumizing all 
 // the messages. this messages will only printed out by the master thread.
-// dont use this until NCURSES is defined! all messages will appear in the
-// ncurses interface anyways.
-//#define VERBOSE
-
-// displays important server messages such as socket or fatal errors!
-// dont use this until NCURSES is defined! all messages will appear in the
-// ncurses interface anyways.
-//#define SERVMSG
-
-// is used for interaction with the ncurses admin interface at stdout.
-#define NCURSES
-
-// The following values define the positions of the data stats in the NCURSES interface.
-#ifdef NCURSES
-#define NCUR_HITS_X 21
-#define NCUR_HITS_Y 35
-#define NCUR_MYSQL_X 22
-#define NCUR_MYSQL_Y 2
-#define NCUR_PORT_X 21
-#define NCUR_PORT_Y 2
-#define NCUR_SESSION_X 22
-#define NCUR_SESSION_Y 18 
-#define NCUR_THREADS_X 21
-#define NCUR_THREADS_Y 18 
-#endif
+#define VERBOSE
 
 // Defines the amount of newlines which have to send to the client's
 // chat stream the first log-in. ( prevents white screen because of buffers
 // or proxies ).
 #define PUSHSTR 1000
 
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // DO NOT CHANGE ANYTHING BEHIND THIS LINE!
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -74,16 +39,16 @@ using namespace std;
 
 // internal rang descriptors ( their external names may be specified different )
 enum rang
-{
-    CODER ,  // programmer.
-    ADMIN ,  // administrator.
-    MAGIC ,  // super user with special privileges.
-    SUPER ,  // temporary super user.
-    BASIC ,  // normal user without special privileges.
-    GUEST ,  // guest user, has almost no privileges.
-    RESTR ,  // a very restrivted user.
-    OUTBN    // banned out of the system.
-};
+{ 
+ CODER ,  // programmer.
+ ADMIN ,  // administrator.
+ MAGIC ,  // super user with special privileges. 
+ SUPER ,  // temporary super user. 
+ BASIC ,  // normal user without special privileges.
+ GUEST ,  // guest user, has almost no privileges. 
+ RESTR ,  // a very restrivted user.
+ OUTBN    // banned out of the system. 
+};	
 
 // some custom typedefs for datatypes which are needed often.
 typedef map<string, string> map_string;
@@ -91,13 +56,13 @@ typedef int function( void *v_arg );
 
 struct container
 {
-    void* elem[4];
+ void* elem[3];
 };
 
 struct dynmod
 {
-    function *the_func  ;
-    void     *the_module;
+ function *the_func  ;
+ void     *the_module;
 };
 
 #endif
diff --git a/hmap.cpp b/hmap.cpp
index 37c9019..662a203 100644
--- a/hmap.cpp
+++ b/hmap.cpp
@@ -6,16 +6,17 @@
 
 using namespace std;
 
-bool  is_prime( int n );
-int next_prime( int n );
+bool  isPrime( int n );
+int nextPrime( int n );
 
 // Construct the hash table.
 template <class obj_type, class key_type>
 hmap<obj_type, key_type>::hmap( double mop )
-        : i_max_occupied_percentage(mop), array( next_prime( 101 ) )
+              : maxOccupiedPercentage(mop), array( nextPrime( 101 ) )
 {
-    lookups = 0;
-    make_empty( );
+ cout << "hmap Constructor" << endl;
+ lookups = 0;
+ make_empty( );
 }
 
 // Insert item x into the hash table. If the item is
@@ -23,80 +24,81 @@ hmap<obj_type, key_type>::hmap( double mop )
 template <class obj_type, class key_type>
 void hmap<obj_type, key_type>::add_elem( const obj_type &x, const key_type &k  )
 {
-    // Insert x as active
-    int i_current_pos = find_pos( k );
-    if( is_active( i_current_pos ) )
-        return;
-
-    array[ i_current_pos ] = hash_entry( x, k, ACTIVE );
-    if( ++occupied > array.size( ) * i_max_occupied_percentage )
-        rehash( );
+ // Insert x as active
+ int currentPos = findPos( k );
+ if( isActive( currentPos ) )
+  return;
+
+ array[ currentPos ] = hash_entry( x, k, ACTIVE );
+ //	cout << "Inserted=" << x << "= at " << currentPos << endl;
+ if( ++occupied > array.size( ) * maxOccupiedPercentage )
+  rehash( );
 }
 
 // Expand the hash table.
 template <class obj_type, class key_type>
 void hmap<obj_type, key_type>::rehash( )
 {
-    vector<hash_entry> old_array = array;
-
-    // Create new double-sized, empty table
-    array.resize( next_prime( 2 * old_array.size( ) ) );
-    for( int j = 0; j < array.size( ); j++ )
-        array[ j ].info = EMPTY;
-
-    // Copy table over
-    make_empty( );
-    for( int i = 0; i < old_array.size( ); i++ )
-        if( old_array[ i ].info == ACTIVE )
-            add_elem( old_array[ i ].element, old_array[ i ].key );
+ vector<hash_entry> oldArray = array;
+
+ // Create new double-sized, empty table
+ array.resize( nextPrime( 2 * oldArray.size( ) ) );
+ for( int j = 0; j < array.size( ); j++ )
+  array[ j ].info = EMPTY;
+
+ // Copy table over
+ make_empty( );
+ for( int i = 0; i < oldArray.size( ); i++ )
+  if( oldArray[ i ].info == ACTIVE )
+   add_elem( oldArray[ i ].element, oldArray[ i ].key );
 }
 
 // Hash function, can only handle strings.
-// If you want to hash other objects you will have to
+// If you want to hash other objects you will have to 
 // create a hash table for them
 template <class obj_type, class key_type>
 unsigned int hmap<obj_type, key_type>::hash( const string & key ) const
 {
-    unsigned int hash_value = 0;
-    //	cout << key << "%";
+ unsigned int hashVal = 0;
+ //	cout << key << "%";
 
-    for( size_t i = 0; i < key.size(); i++ )
-        hash_value =  ( hash_value << 5 ) ^ key[ i ] ^ hash_value;
+ for( size_t i = 0; i < key.size(); i++ )
+  hashVal =  ( hashVal << 5 ) ^ key[ i ] ^ hashVal;
 
-    return hash_value;
+ return hashVal;
 }
 
 // Method that performs quadratic probing resolution.
 // Return the position where the search for x terminates.
 template <class obj_type, class key_type>
-int hmap<obj_type, key_type>::find_pos( const key_type &k )
+int hmap<obj_type, key_type>::findPos( const key_type &k )
 {
-    int i_collision_num = 0;
-    int i_current_pos = hash( k ) % array.size( );
-    lookups++;
-
-    while( array[ i_current_pos ].info != EMPTY &&
-            array[ i_current_pos ].key != k )
-    {
-        //		cout <<  array[ i_current_pos ].element << "!=" << x << endl;
-        lookups++;
-        i_current_pos += 2 * ++i_collision_num - 1;  // Compute ith probe
-
-        if( i_current_pos >= array.size( ) )
-            i_current_pos -= array.size( );
-    }
-
-    //	cout << i_current_pos << " ";
-    return i_current_pos;
+ int collisionNum = 0;
+ int currentPos = hash( k ) % array.size( );
+ lookups++;
+
+ while( array[ currentPos ].info != EMPTY &&
+        array[ currentPos ].key != k )
+ {
+ //		cout <<  array[ currentPos ].element << "!=" << x << endl;
+  lookups++;
+  currentPos += 2 * ++collisionNum - 1;  // Compute ith probe
+
+  if( currentPos >= array.size( ) )
+   currentPos -= array.size( );
+ }
+
+ //	cout << currentPos << " ";
+ return currentPos;
 }
 
 // Remove item x from the hash table.
 template <class obj_type, class key_type>
 void hmap<obj_type, key_type>::del_elem( const key_type & k )
 {
-    int i_current_pos = find_pos( k );
-    if( is_active( i_current_pos ) )
-        array[ i_current_pos ].info = DELETED;
+    int currentPos = findPos( k );
+    if( isActive( currentPos ) )
+        array[ currentPos ].info = DELETED;
 }
 
 // Find item x in the hash table.
@@ -104,92 +106,75 @@ void hmap<obj_type, key_type>::del_elem( const key_type & k )
 template <class obj_type, class key_type>
 obj_type hmap<obj_type, key_type>::get_elem( const key_type &k )
 {
-    int i_current_pos = find_pos( k );
-    if( is_active( i_current_pos ) )
-        return array[ i_current_pos ].element;
-    else
-        return 0;
+ int currentPos = findPos( k );
+ if( isActive( currentPos ) )
+  return array[ currentPos ].element;
+ else
+  return 0;
 }
 
 // Make the hash table logically empty.
 template <class obj_type, class key_type>
 void hmap<obj_type, key_type>::make_empty( )
 {
-    occupied = 0;
-    for( int i = 0; i < array.size( ); i++ )
-        array[ i ].info = EMPTY;
+ occupied = 0;
+ for( int i = 0; i < array.size( ); i++ )
+  array[ i ].info = EMPTY;
 }
 
-// Return true if i_current_pos exists and is active.
+// Return true if currentPos exists and is active.
 template <class obj_type, class key_type>
-bool hmap<obj_type, key_type>::is_active( int i_current_pos ) const
+bool hmap<obj_type, key_type>::isActive( int currentPos ) const
 {
-    return array[ i_current_pos ].info == ACTIVE;
+ return array[ currentPos ].info == ACTIVE;
 }
 
 
 // Internal method to test if a positive number is prime.
 // Not an efficient algorithm.
 template <class obj_type, class key_type>
-bool hmap<obj_type, key_type>::is_prime( int n ) const
+bool hmap<obj_type, key_type>::isPrime( int n ) const 
 {
-    if( n == 2 || n == 3 )
-        return true;
+ if( n == 2 || n == 3 )
+  return true;
 
-    else if( n == 1 || n % 2 == 0 )
-        return false;
+ else if( n == 1 || n % 2 == 0 )
+  return false;
 
-    for( int i = 3; i * i <= n; i += 2 )
-        if( n % i == 0 )
-            return false;
+ for( int i = 3; i * i <= n; i += 2 )
+  if( n % i == 0 )
+   return false;
 
-    return true;
+ return true;
 }
 
 // Internal method to return a prime number at least as large as n.
 // Assumes n > 0.
 template <class obj_type, class key_type>
-int hmap<obj_type, key_type>::next_prime( int n ) const
+int hmap<obj_type, key_type>::nextPrime( int n ) const
 {
-    if( n % 2 == 0 )
-        n++;
+ if( n % 2 == 0 )
+  n++;
 
-    for( ; !is_prime( n ); n += 2 )
-        ;
+ for( ; !isPrime( n ); n += 2 );
 
-    return n;
+ return n;
 }
-template<class obj_type, class key_type>
-void
+template<class obj_type, class key_type> void
 hmap<obj_type, key_type>::run_func( void (*func)(obj_type) )
 {
-    for( int i = 0; i < array.size( ); i++ )
-        if ( array[i].info == ACTIVE )
-            ( *func ) ( array[i].element );
+ for( int i = 0; i < array.size( ); i++ )
+  if ( array[i].info == ACTIVE )
+   ( *func ) ( array[i].element );
 }
 
-template<class obj_type, class key_type>
-void
+template<class obj_type, class key_type> void
 hmap<obj_type, key_type>::run_func( void (*func)(obj_type, void*), void* v_arg )
 {
-    for( int i = 0; i < array.size( ); i++ )
-        if ( array[i].info == ACTIVE )
-            ( *func ) ( array[i].element, v_arg );
+ for( int i = 0; i < array.size( ); i++ )
+  if ( array[i].info == ACTIVE )
+   ( *func ) ( array[i].element, v_arg );
 }
 
-template<class obj_type, class key_type>
-vector<key_type>*
-hmap<obj_type, key_type>::get_key_vector()
-{
-    vector<key_type>* p_vec = new vector<key_type>;
-    for( int i = 0; i < array.size( ); i++ )
-        if ( array[i].info == ACTIVE )
- 	    p_vec->push_back( array[i].key );	 	
-
-    return p_vec;
-}
-
-
-
 #endif
 
diff --git a/hmap.h b/hmap.h
index d8aeda6..2392133 100644
--- a/hmap.h
+++ b/hmap.h
@@ -1,4 +1,4 @@
-#pragma warning(disable:4786)
+#pragma warning(disable:4786) 
 
 #ifndef hmap_h
 #define hmap_h
@@ -17,107 +17,100 @@ template <class obj_type, class key_type>
 class hmap
 {
 private:
-    enum entry_type
-    {
-        ACTIVE, EMPTY, DELETED
-    };
-
-    struct hash_entry
-    {
-        obj_type   element;
-        key_type   key;
-        entry_type info;
-
-        hash_entry( const obj_type &e = obj_type( ), const key_type &k = key_type( ), entry_type i = EMPTY ) : element( e ), key( k ), info( i )
-        { }
-    }
-    ;
-
-    int occupied;
-
-    virtual bool is_active( int i_current_pos ) const;
-    virtual void rehash( );
-    virtual bool is_prime  ( int n ) const;
-    virtual int  next_prime( int n ) const;
-    double       i_max_occupied_percentage;
+ enum entry_type 
+ { 
+  ACTIVE, EMPTY, DELETED
+ };
+
+ struct hash_entry
+ {
+  obj_type   element;
+  key_type   key;
+  entry_type info;
+
+  hash_entry( const obj_type &e = obj_type( ), const key_type &k = key_type( ), entry_type i = EMPTY ) : element( e ), key( k ), info( i ) { }
+ };
+    
+ int occupied;
+	
+ virtual bool isActive( int currentPos ) const;
+ virtual void rehash( );
+ virtual bool isPrime  ( int n ) const;
+ virtual int  nextPrime( int n ) const;
+ double       maxOccupiedPercentage; 
 
 protected:
-    int lookups;
-    unsigned int hash( const string &key ) const;
-    vector<hash_entry> array;
+ int lookups;
+ unsigned int hash( const string &key ) const;
+ vector<hash_entry> array;
 
 public:
-    hmap( double moc );
-
-    virtual int  find_pos  ( const key_type &k );
-    virtual void make_empty( );
-    virtual void add_elem ( const obj_type &x, const key_type &k );
-    virtual void del_elem ( const key_type &k );
-    virtual obj_type get_elem ( const key_type &k );
-
-    virtual void  run_func( void (*func)(obj_type) );
-    virtual void  run_func( void (*func)(obj_type, void*), void* v_arg );
-
-    virtual vector<key_type>*  get_key_vector( );
-    
-    // inline:
-    void get_size()
-    {
-        int size = 0;
-        for( int j = 0; j < array.size( ); j++ )
-            if (array[ j ].info == ACTIVE)
-                size++;
-        return size;
-    };
-
-    int get_lookups()
-    {
-        return lookups;
-    };
-
-    int get_capacity()
-    {
-        return array.size();
-    };
-
-    double get_lambda()
-    {
-        return static_cast<double>(get_size())/static_cast<double>(get_capacity());
-    }
-
-    obj_type& operator[]( key_type &k )
-    {
-        return get_elem( k );
-    }
+ hmap( double moc );
+
+ virtual int  findPos  ( const key_type &k );
+ virtual void make_empty( );
+ virtual void add_elem ( const obj_type &x, const key_type &k );
+ virtual void del_elem ( const key_type &k );
+ virtual obj_type get_elem ( const key_type &k );
+
+ virtual void  run_func( void (*func)(obj_type) );
+ virtual void  run_func( void (*func)(obj_type, void*), void* v_arg );
+
+ // inline:
+ void getSize() 
+ {
+  int size = 0;
+  for( int j = 0; j < array.size( ); j++ )
+   if (array[ j ].info == ACTIVE)
+    size++;
+   return size;	
+ };
+
+ int getLookups()
+ {
+  return lookups;
+ };
+
+ int getCapacity()
+ {
+  return array.size();
+ };
+
+ double getLambda()
+ {
+  return static_cast<double>(getSize())/static_cast<double>(getCapacity());
+ }
+
+ obj_type& operator[]( key_type &k )
+ {
+  return get_elem( k );
+ }
 
 };
 
 template <class obj_type, class key_type>
-class linearhmap : public hmap<obj_type, key_type>
-{
+class linearhmap : public hmap<obj_type, key_type> {
 public:
-    linearhmap(double moc) : hmap<obj_type, key_type>(moc)
-    {}
-    ;
-
-    virtual int find_pos( const key_type &k )
-    {
-        int i_collision_num = 0;
-        int i_current_pos = hash( k ) % array.size( );
-        lookups++;
-
-        while( array[ i_current_pos ].info != EMPTY &&
-                array[ i_current_pos ].key  !=  k )
-        {
-            lookups   ++;
-            i_current_pos++;
-
-            if( i_current_pos >= array.size( ) )
-                i_current_pos -= array.size( );
-        }
-
-        return i_current_pos;
-    }
+ linearhmap(double moc) : hmap<obj_type, key_type>(moc) {};
+
+ virtual int findPos( const key_type &k )
+ {
+  int collisionNum = 0;
+  int currentPos = hash( k ) % array.size( );
+  lookups++;
+
+  while( array[ currentPos ].info != EMPTY &&
+         array[ currentPos ].key  !=  k )
+  {	
+   lookups   ++;
+   currentPos++; 
+
+   if( currentPos >= array.size( ) )
+    currentPos -= array.size( );
+  }
+
+  return currentPos;
+ }
 };
 
 #include "hmap.cpp"
diff --git a/html.cpp b/html.cpp
index 3051212..f40e466 100755
--- a/html.cpp
+++ b/html.cpp
@@ -7,163 +7,133 @@
 #include "html.h"
 #include "s_chat.h"
 #include "s_mutx.h"
-#include "s_ncur.h"
 
 using namespace std;
 
 html::html( )
 {
-    set_name( s_conf::get
-                  ().get_val( "HTMLTEMP" ) );
-    pthread_mutex_init( &mut_map_vals, NULL );
+ set_name( s_conf::get().get_val( "HTMLTEMP" ) );
+ pthread_mutex_init( &mut_map_vals, NULL );
 }
 
 html::~html( )
 {
-    pthread_mutex_destroy( &mut_map_vals );
+ pthread_mutex_destroy( &mut_map_vals );
 }
 
 void
-html::clear_cache( )
-{
-    pthread_mutex_lock  ( &mut_map_vals );
-    clear_vals();
-    pthread_mutex_unlock( &mut_map_vals );
+html::clear_cache( ) 
+{ 
+ pthread_mutex_lock  ( &mut_map_vals );
+ clear_vals(); 
+ pthread_mutex_unlock( &mut_map_vals );
 }
 
 string
-html::parse( map_string &map_params )
+html::parse( map_string &map_params ) 
 {
-    string s_file = map_params["request"];
-
-    // check if s_file is in the container.
-    pthread_mutex_lock  ( &mut_map_vals );
-    string s_templ = get_val( s_file );
-    pthread_mutex_unlock( &mut_map_vals );
-
-    // if not, read file.
-    if ( s_templ.empty() )
-    {
-        auto string   s_path  = get_name();
-        auto ifstream fs_templ( s_path.append( s_file ).c_str(), ios::binary );
-
-        if ( ! fs_templ )
-        {
+ string s_file = map_params["request"];
+
+ // check if s_file is in the container.
+ pthread_mutex_lock  ( &mut_map_vals );
+ string s_templ = get_val( s_file );
+ pthread_mutex_unlock( &mut_map_vals );
+
+ // if not, read file. 
+ if ( s_templ.empty() )
+ {
+  auto string   s_path  = get_name();
+  auto ifstream fs_templ( s_path.append( s_file ).c_str(), ios::binary );
+
+  if ( ! fs_templ ) 
+  {
+  
+   cerr << "File not found: " << s_file << endl;
+   if(map_params["request"]==s_conf::get().get_val( "NOTFOUND"  ))
+	return "";
+   
+   map_params["request"] = s_conf::get().get_val( "NOTFOUND" );
+   return parse( map_params );
+ 
+  }
+
+  auto char c_buf;
+  while( !fs_templ.eof() )
+  {
+  	fs_templ.get( c_buf );
+  	s_templ+=c_buf;	
+  }
+  
+  fs_templ.close();
 
 #ifdef VERBOSE
-            cerr << NOFOUND << s_path << endl;
-#endif
-#ifdef NCURSES
-
-            {
-                string s_tmp( NOFOUND );
-                s_tmp.append( s_path );
-                s_ncur::get
-                    ().print( s_tmp );
-            }
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cout << TECACHE << s_path << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
 #endif
-            if(map_params["request"]==s_conf::get
-                        ().get_val( "NOTFOUND"  ))
-                    return "";
-
-            map_params["request"] = s_conf::get
-                                        ().get_val( "NOTFOUND" );
-            return parse( map_params );
-
-        }
-
-        auto char c_buf;
-        while( !fs_templ.eof() )
-        {
-            fs_templ.get( c_buf );
-            s_templ+=c_buf;
-        }
-
-        fs_templ.close();
-
-#ifdef VERBOSE
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cout << TECACHE << s_path << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-#endif
-#ifdef NCURSES
-
-        {
-            string s_tmp( TECACHE );
-            s_tmp.append( s_path );
-            s_ncur::get
-                ().print( s_tmp.c_str() );
-        }
-#endif
-
-
-
-        // cache file.
-        pthread_mutex_lock  ( &mut_map_vals );
-        map_vals[ s_file ] = s_templ;
-        pthread_mutex_unlock( &mut_map_vals );
-    }
 
-    // find %%KEY%% token and substituate those.
-    auto unsigned int pos[2];
-    pos[0] = pos[1] = 0;
+  // cache file. 
+  pthread_mutex_lock  ( &mut_map_vals );
+  map_vals[ s_file ] = s_templ; 
+  pthread_mutex_unlock( &mut_map_vals );
+ }
 
-    do
-    {
-        pos[0] = s_templ.find( "%%", pos[1] );
+ // find %%KEY%% token and substituate those.
+ auto unsigned int pos[2]; 
+ pos[0] = pos[1] = 0;
 
-        if ( pos[0] == string::npos )
-            break;
+ do 
+ {
+  pos[0] = s_templ.find( "%%", pos[1] );
 
-        pos[0] += 2;
-        pos[1]  = s_templ.find( "%%", pos[0] );
+  if ( pos[0] == string::npos )
+   break;
 
-        if ( pos[0] == string::npos )
-            break;
+  pos[0] += 2;	
+  pos[1]  = s_templ.find( "%%", pos[0] );
 
-        // get key and val.
-        auto string s_key = s_templ.substr( pos[0], pos[1]-pos[0] );
-        auto string s_val = s_conf::get
-                                ().get_val( s_key );
+  if ( pos[0] == string::npos )
+   break;
 
-        // if s_val is empty use map_params.
-        if ( s_val.empty() )
-            s_val = map_params[ s_key ];
-        
-        // substituate key with val.
-        s_templ.replace( pos[0]-2, pos[1]-pos[0]+4, s_val );
+  // get key and val.
+  auto string s_key = s_templ.substr( pos[0], pos[1]-pos[0] );
+  auto string s_val = s_conf::get().get_val( s_key );
 
-        // calculate the string displacement.
-        auto int i_dif = s_val.length() - ( pos[1] - pos[0] + 4);
+  // if s_val is empty use map_params.
+  if ( s_val.empty() )
+   s_val = map_params[ s_key ];
 
-        pos[1] += 2 + i_dif;
+  // substituate key with val.
+  s_templ.replace( pos[0]-2, pos[1]-pos[0]+4, s_val );
 
-    }
-    while( true );
+  // calculate the string displacement.
+  auto int i_dif = s_val.length() - ( pos[1] - pos[0] + 4);
+ 
+  pos[1] += 2 + i_dif;
+   
+ } 
+ while( true );
 
-    return s_templ;
+ return s_templ; 
 }
 
 void
 html::online_list( user *p_user, map_string &map_params )
 {
-    // prepare user_list.
-    string s_list     ( ""     );
-    string s_seperator( "<br>" );
+ // prepare user_list.
+ string s_list     ( ""     );
+ string s_seperator( "<br>" );
 
-    p_user->get_room()->get_user_list( s_list, s_seperator );
+ p_user->get_p_room()->get_user_list( s_list, s_seperator );
 
-    // use the collected data as a message in html-templates.
-    map_params["MESSAGE"] = s_list;
+ // use the collected data as a message in html-templates.
+ map_params["MESSAGE"] = s_list;
 
-    // renew the timestamp.
-    p_user->renew_stamp();
+ // renew the timestamp.
+ p_user->renew_stamp();
 
-    // send a ping to the client chat stream.
-    p_user->msg_post( new string("\n") );
+ // send a ping to the client chat stream.
+ p_user->msg_post( new string("\n") );
 }
 
 #endif
diff --git a/html.h b/html.h
index 40c5887..b43f0d2 100755
--- a/html.h
+++ b/html.h
@@ -15,28 +15,28 @@ using namespace std;
 class html : public cont, name
 {
 private:
-    // needed for synchronizing the map_vals.
-    pthread_mutex_t mut_map_vals;
+// needed for synchronizing the map_vals. 
+ pthread_mutex_t mut_map_vals;
 
 public:
-    // public methods.
-    explicit html( ); // simple constructor.
-    ~html( );
-
-    // clears the template cache so that new html templates will be read
-    // from hard disk. this method is needed after changeing s.t. on
-    // the html-template files.
-    void clear_cache( );
-
-    // returns a parsed html-template. this method will check first if the
-    // required html-template exists inside the classes template cache. if not
-    // then the file will be read from file and added to the cache.
-    // afterwards the html-template will be parsed and returned.
-    // map_params contains the client request parameters which also will be
-    // used for string substituation.
-    string parse( map_string &map_params );
-
-    void online_list( user *p_user, map_string &map_params );
+ // public methods.
+ explicit html( ); // simple constructor.
+         ~html( );
+
+ // clears the template cache so that new html templates will be read
+ // from hard disk. this method is needed after changeing s.t. on
+ // the html-template files.
+ void clear_cache( ); 
+
+ // returns a parsed html-template. this method will check first if the
+ // required html-template exists inside the classes template cache. if not
+ // then the file will be read from file and added to the cache.
+ // afterwards the html-template will be parsed and returned.
+ // map_params contains the client request parameters which also will be
+ // used for string substituation. 
+ virtual string parse( map_string &map_params ); 
+
+ virtual void online_list( user *p_user, map_string &map_params );
 };
 
 #endif
diff --git a/html/CVS/Entries b/html/CVS/Entries
index b9ef70c..e14ddfa 100644
--- a/html/CVS/Entries
+++ b/html/CVS/Entries
@@ -1,20 +1,12 @@
-/admin.html/1.3/Sun Nov  7 02:24:57 2004//
-/blank.html/1.1.1.1/Fri Jan  2 03:15:10 2004//
-/colors.html/1.8/Sun Nov  7 02:24:57 2004//
-/demo.html/1.4/Sun Nov  7 02:24:57 2004//
-/favicon.ico/1.1.1.1/Fri Jan  2 03:15:10 2004//
-/frameset.html/1.5/Sun Nov  7 02:24:57 2004//
-/help.html/1.8/Mon Feb 14 20:09:50 2005//
-/index.html/1.11/Sun Nov  7 02:37:57 2004//
-/input.html/1.12/Mon Feb 14 18:01:22 2005//
-/loggedin.html/1.1/Mon Feb 14 18:01:22 2005//
-/notfound.html/1.2/Sat Mar 20 21:58:14 2004//
-/online.html/1.6/Mon Feb 14 18:01:22 2005//
-/options.html/1.6/Sun Nov  7 02:24:57 2004//
-/register.html/1.10/Sun Nov  7 02:37:57 2004//
-/robots.txt/1.1.1.1/Fri Jan  2 03:15:10 2004//
-/stream.html/1.5/Sat Feb 12 16:15:30 2005//
-/style.css/1.3/Sun Nov  7 02:24:57 2004//
-/test.cgi/1.2/Sat Sep 25 04:12:43 2004//
-/urlredirect.html/1.1/Sun Nov  7 00:33:14 2004//
+/blank.html/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/favicon.ico/1.1/Sat Sep 13 18:52:49 2003//
+/frameset.html/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/index.html/1.4/Sun Mar 30 00:34:08 2003//
+/input.html/1.2/Sun Mar 30 00:34:08 2003//
+/notfound.html/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/online.html/1.2/Sun Mar 30 00:34:08 2003//
+/stream.html/1.2/Sun Mar 30 00:34:08 2003//
+/style.css/1.1/Sun Mar 30 11:12:49 2003//
+/y_ani.gif/1.1.1.1/Fri Mar 21 15:54:56 2003//
+/y_black.gif/1.1/Sun Mar 30 11:12:49 2003/-kb/
 D
diff --git a/html/CVS/Root b/html/CVS/Root
index 745de68..a82e29e 100644
--- a/html/CVS/Root
+++ b/html/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/html/index.html b/html/index.html
index e8de35c..7bc01b0 100755
--- a/html/index.html
+++ b/html/index.html
@@ -8,8 +8,8 @@
 <body bgcolor=#000000 text=#ffff00>
 <table align=center width=500>
 <tr>
-<td align=center class=header>%%PGETITLE%%</td>
-<td align=center class=header>%%INFO%%</td>
+<td align=center><img src="y_black.gif" alt="ychat"></td>
+<td align=center class=header>%%PGETITLE%%<br>%%INFO%%</td>
 </tr>
 <tr>
 	<td colspan=2>&nbsp;</td>
diff --git a/incl.h b/incl.h
index 6f2f708..f8e483f 100755
--- a/incl.h
+++ b/incl.h
@@ -1,18 +1,16 @@
 // contains header files which are included by all classes.
 
-// include some std headers.
+// include some std headers. 
 #include <iostream>
 
 // since thread synchronization is a big issue this header needs
 // to be included  by every other file too.
 #include <pthread.h>
 
-#include <ncurses.h>
-
 // std::string.
 #include <string>
 
 // include all the custom global variables.
 #include "glob.h"
-// include all the custom messages.
+// include all the custom messages. 
 #include "msgs.h"
diff --git a/lang.cpp b/lang.cpp
index be73354..b5b33ec 100755
--- a/lang.cpp
+++ b/lang.cpp
@@ -10,70 +10,69 @@ using namespace std;
 
 lang::lang( string s_lang = "en" ) : name( s_lang )
 {
-    parse( ); // parse the config file.
+ parse( ); // parse the config file. 
 }
 
 lang::~lang()
-{}
+{
+}
 
 void
 lang::parse()
 {
 #ifdef VERBOSE
-    cout << CFILEOK << get_name() << endl;
+ cout << CFILEOK << get_name() << endl;
 #endif
 
-    string filename("lang/");
-    filename.append(get_name());
+ string filename("lang/");
+	filename.append(get_name());
 
-    ifstream fs_conf( filename.c_str() );
+ ifstream fs_conf( filename.c_str() );
 
-    if ( ! fs_conf )
-    {
+ if ( ! fs_conf ) 
+ {
 #ifdef VERBOSE
-        cout << CFILENO << get_name() << endl;
+ cout << CFILENO << get_name() << endl;
 #endif
+  return;
+ }
 
-        return;
-    }
-
-    char c_buf[READBUF];
+ char c_buf[READBUF];
 
-    while( fs_conf.getline( c_buf, READBUF ) )
-    {
-        string s_token( c_buf );
-        unsigned int ui_pos = s_token.find( "#", 0 );
+ while( fs_conf.getline( c_buf, READBUF ) ) 
+ {
+  string s_token( c_buf );
+  unsigned int ui_pos = s_token.find( "#", 0 );
+   
+  // if line is commented out:
+  if ( ui_pos == 0 ) 
+   continue;
 
-        // if line is commented out:
-        if ( ui_pos == 0 )
-            continue;
+  ui_pos = s_token.find( ";", 0 );
 
-        ui_pos = s_token.find( ";", 0 );
+  // if token has not been found.
+  if ( ui_pos == string::npos )
+   continue;
 
-        // if token has not been found.
-        if ( ui_pos == string::npos )
-            continue;
+  s_token = s_token.substr( 0   , --ui_pos );
+  ui_pos  = s_token.find  ( "\"", 0        );   
 
-        s_token = s_token.substr( 0   , --ui_pos );
-        ui_pos  = s_token.find  ( "\"", 0        );
+  if ( ui_pos == string::npos )
+   continue;
 
-        if ( ui_pos == string::npos )
-            continue;
-
-        string s_val = s_token.substr( ui_pos+1, s_token.length() );
-        string s_key = s_token.substr( 0      , --ui_pos          );
+  string s_val = s_token.substr( ui_pos+1, s_token.length() );
+  string s_key = s_token.substr( 0      , --ui_pos          ); 
 
 #ifdef VERBOSE2
-
-        cout << s_key << "=" << s_val << endl;
+   cout << s_key << "=" << s_val << endl;
 #endif
 
-        // fill the map.
-        map_vals[s_key] = s_val;
-    }
+  // fill the map.
+  map_vals[s_key] = s_val;
+ } 
 
-    fs_conf.close();
-    fs_conf.~ifstream();
+ fs_conf.close();
+ fs_conf.~ifstream();
 }
 
 #endif
diff --git a/lang.h b/lang.h
index fb9081a..6745a93 100755
--- a/lang.h
+++ b/lang.h
@@ -14,11 +14,11 @@ class lang : public cont, name
 private:
 
 public:
-    // public methods:
-    lang ( string s_lang ); // standard constructor.
-    ~lang(); 		 // standard destructor.
+ // public methods:
+ lang ( string s_lang ); // standard constructor.
+ ~lang(); 		 // standard destructor.
 
-    virtual void parse( );    // parses the config file.
+ virtual void parse( );    // parses the config file.
 };
 
 #endif
diff --git a/lang/CVS/Entries b/lang/CVS/Entries
new file mode 100644
index 0000000..609d13c
--- /dev/null
+++ b/lang/CVS/Entries
@@ -0,0 +1,3 @@
+/de/1.1/Fri Apr  4 22:14:35 2003//
+/en/1.1/Fri Apr  4 22:14:35 2003//
+D
diff --git a/lang/CVS/Repository b/lang/CVS/Repository
new file mode 100644
index 0000000..9dd3b40
--- /dev/null
+++ b/lang/CVS/Repository
@@ -0,0 +1 @@
+ychat/lang
diff --git a/lang/CVS/Root b/lang/CVS/Root
new file mode 100644
index 0000000..a82e29e
--- /dev/null
+++ b/lang/CVS/Root
@@ -0,0 +1 @@
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/log/CVS/Entries b/log/CVS/Entries
index fc0a98f..1784810 100644
--- a/log/CVS/Entries
+++ b/log/CVS/Entries
@@ -1,2 +1 @@
-/.keepme/1.1.1.1/Fri Jan  2 03:15:10 2004//
 D
diff --git a/log/CVS/Root b/log/CVS/Root
index 745de68..a82e29e 100644
--- a/log/CVS/Root
+++ b/log/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@buetow.org:/usr/home/cvs/cvsroot
+:pserver:anonymous@cvs.ychat.berlios.de:/cvsroot/ychat
diff --git a/logd.cpp b/logd.cpp
index 5a7fa82..cfdc7c6 100644
--- a/logd.cpp
+++ b/logd.cpp
@@ -1,78 +1,61 @@
 #ifndef LOGD_CXX
 #define LOGD_CXX
 
-#include "s_ncur.h"
-#include "glob.h"
 #include "logd.h"
 
 logd::logd( string filename )
 {
-    if(filename.empty())
-    {
-#ifdef NCURSES
-    s_ncur::get
-          ().print( LOGERR2 );
-#endif
-#ifdef SERVMSG
-        cerr << LOGERR2 << endl;
-#endif
-        exit(1);
-    }
-
-    s_logfile=filename;
+	if(filename.empty())
+	{
+		cerr << "ycLog: No filename specified" << endl;
+		exit(1);
+	}
+  
+	s_logfile=filename;
 
-    i_lines=s_tool::string2int( s_conf::get
-                                    ().get_val("LOG_LINES"));
+	i_lines=s_tool::string2int( s_conf::get().get_val("LOG_LINES"));	
 
 }
 void logd::flush()
 {
-    s_output.open(s_logfile.c_str(), ios::app);
-
-    if(s_output==NULL)
-    {
-#ifdef NCURSES
-        string s_tmp( LOGERR1 );
-        s_tmp.append( s_logfile );
-        s_ncur::get
-            ().print( s_tmp.c_str() );
-#endif
-#ifdef SERVMSG
-        cerr << LOGERR1 << s_logfile << endl;
-#endif
-        exit(1);
-    }
+	 s_output.open(s_logfile.c_str(), ios::app);
+
+        if(s_output==NULL)
+        {
+                cerr << "ycLog: Could not open file: " << s_logfile << endl;
+                exit(1);
+        }
 
 
-    while(!s_queue.empty())
-    {
-        string s_l=s_queue.front();
-        s_queue.pop();
-        s_output.write(s_l.c_str(), s_l.size());
+	while(!s_queue.empty())
+	{
+		string s_l=s_queue.front();
+		s_queue.pop();
+		s_output.write(s_l.c_str(), s_l.size());
 
-    }
-    s_output.close();
+	}
+	s_output.close();
 }
 void logd::log( map_string request )
 {
-    struct tm *t_m;
-    time_t t_cur=time(NULL);
-    t_m=gmtime(&t_cur);
+	struct tm *t_m;
+	time_t t_cur=time(NULL);
+	t_m=gmtime(&t_cur);
 
-    char buffer[100];
-    strftime(buffer, 100, "[%d/%b/%Y:%H:%M:%S %z]", t_m);
-    string s_time=buffer;
-    string s_logstr = request["REMOTE_ADDR"] + " - - "+s_time+" \"" + request["QUERY_STRING"]+"\" 200 0 \""+request["request"]+"\" \""+request["User-Agent"]+"\"\n";
+	char buffer[100];
+	strftime(buffer, 100, "[%d/%b/%Y:%H:%M:%S %z]", t_m);
+	string s_time=buffer;
+	string s_logstr = request["REMOTE_ADDR"] + " - - "+s_time+" \"" + request["QUERY_STRING"]+"\" 200 0 \""+request["request"]+"\" \""+request["User-Agent"]+"\"\n";
 
-    s_queue.push(s_logstr);
+	s_queue.push(s_logstr);	
 
-    if(s_queue.size()>=i_lines)
-        flush();
+	if(s_queue.size()>=i_lines)
+		flush();
 }
 
 logd::~logd()
 {
-    flush();
+	flush();
 }
 
 
diff --git a/logd.h b/logd.h
index e5f8e08..5d79d9d 100644
--- a/logd.h
+++ b/logd.h
@@ -7,19 +7,18 @@
 #include <fstream>
 #include <queue>
 #include <time.h>
-class logd
-{
+class logd {
 
-private:
-    string s_logfile;
-    queue<string> s_queue;
-    ofstream s_output;
-    int i_lines;
-public:
-    logd( string filename );
-    ~logd();
-
-    void flush();
-    void log( map_string request );
+	private:
+		string s_logfile;
+		queue<string> s_queue;
+		ofstream s_output;
+		int i_lines;
+	public: 
+		logd( string filename );
+		~logd();
+		
+		void flush();
+		void log( map_string request );
 };
 #endif
diff --git a/main.cpp b/main.cpp
index b59b628..08f89f8 100755
--- a/main.cpp
+++ b/main.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include <unistd.h>
-
 // needed for ignoring SIGPIPE.
 #include <signal.h>
 
@@ -45,80 +43,56 @@
 // include the socket manager.
 #include "s_sock.h"
 
-// include the language manager.
+// include the language manager
 #include "s_lang.h"
 
-// include the ncurses admin menu.
-#include "s_ncur.h"
-
-// include the session manager.
+// include the session manager
 #include "s_sman.h"
 
-// include the MySQL Connection Manager.
-#include "s_mman.h"
-
 using namespace std;
 
 int main()
 {
 #ifdef VERBOSE
-    cout  <<  "         ___ _           _   "     << endl
-    <<  " _   _  / __\\ |__   __ _| |_ "    << endl
-    <<  "| | | |/ /  | '_ \\ / _` | __|"    << endl
-    <<  "| |_| / /___| | | | (_| | |_ "     << endl
-    <<  " \\__, \\____/|_| |_|\\__,_|\\__|" << endl
-    <<  " |___/ 			"     << endl << endl
-
-    << DESCRIP << endl
-    << VERSION << ", "
-    << CONTACT << endl
-    << SEPERAT << endl
-    << STARTMS << endl ;
-#endif
 
-    // ignore SIGPIPE. otherwise the server will shut down with "Broken pipe" if
-    // a client unexpected disconnects himself from a SOCK_STREAM.
-    signal( SIGPIPE, SIG_IGN );
-
-    // all the static data classes have to be initialized once. otherwise they will
-    // contain only empty pointers and the chat server won't work correctly.
-    // the order of the initializations is very importand. for example the s_html::init()
-    // invokations assumes an initialized s_conf class.
-    s_mutx::init(); // init the mutex manager.
-    s_conf::init(); // init the config manager.
-    s_html::init(); // init the html-template manager.
-    s_lang::init(); // init the language manager
-    s_sman::init(); // init the session manager.
-    s_mman::init(); // init the mysql connection manager.
-    s_sock::init(); // init the socket manager.
-    s_chat::init(); // init the chat manager.
-
-    // begin to draw the ncurses amdin interface in a new pthread.
-#ifdef NCURSES
-
-    s_ncur::init(); // init the ncurses admin interface.
-    pthread_t admin_thread;
-    pthread_create( &admin_thread,
-                    NULL,
-                    s_ncur::get().start, (void*) &s_ncur::get() );
-
-    // wait until ncurses interface has been initialized.
-     while ( ! s_ncur::get().is_ready() )
-      usleep(100);
+cout  <<  "         ___ _           _   "     << endl
+      <<  " _   _  / __\\ |__   __ _| |_ "    << endl
+      <<  "| | | |/ /  | '_ \\ / _` | __|"    << endl
+      <<  "| |_| / /___| | | | (_| | |_ "     << endl
+      <<  " \\__, \\____/|_| |_|\\__,_|\\__|" << endl
+      <<  " |___/ 			"     << endl << endl 
+
+      << DESCRIP << endl 
+      << VERSION << ", " 
+      << CONTACT << endl 
+      << SEPERAT << endl 
+      << STARTMS << endl ;
 #endif
 
-
-
-    s_modl::init(); // init the module-loader manager.
-
-    // start the socket manager. this one will listen for incoming http requests and will
-    // forward them to the specified routines which will generate a http response.
-    s_sock::get().start();
-        
+ // ignore SIGPIPE. otherwise the server will shut down with "Broken pipe" if
+ // a client unexpected disconnects himself from a SOCK_STREAM.
+ signal( SIGPIPE, SIG_IGN );
+
+ // all the static data classes have to be initialized once. otherwise they will
+ // contain only empty pointers and the chat server won't work correctly. 
+ // the order of the initializations is very importand. for example the s_html::init()
+ // invokations assumes an initialized s_conf class.
+ s_mutx::init(); // init the mutex manager.
+ s_conf::init(); // init the config manager.
+ s_html::init(); // init the html-template manager. 
+ s_lang::init(); // init the language manager
+ s_sman::init(); // init the session manager.
+ s_modl::init(); // init the module-loader manager. 
+ s_sock::init(); // init the socket manager. 
+ s_chat::init(); // init the chat manager.
+ 
+ // start the socket manager. this one will listen for incoming http requests and will
+ // forward them to the specified routines which will generate a http response.
+ s_sock::get().start();
 
 #ifdef VERBOSE
-    cout << DOWNMSG << endl;
+ cout << DOWNMSG << endl;
 #endif
 
-    return 0;
+ return 0;
 }
diff --git a/modl.cpp b/modl.cpp
index 9ca0f86..17c7b49 100755
--- a/modl.cpp
+++ b/modl.cpp
@@ -1,178 +1,98 @@
 // class modl implementation.
 
-#ifndef MODL_CPP
-#define MODL_CPP
+#ifndef MODL_CXX
+#define MODL_CXX
 
 #include <limits.h>
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <stdio.h>
 
-#include "s_conf.h"
 #include "s_mutx.h"
-#include "s_ncur.h"
 #include "modl.h"
-#include "dir.h"
 
 using namespace std;
 
 modl::modl(  )
 {
-    map_mods = new hmap<dynmod*,string>(80);
-    pthread_mutex_init( &mut_map_mods, NULL );
-
-    if ( s_conf::get().get_val( "PRE_MODS_COMMANDS" ).compare( "ON" ) == 0 )
-     preload_modules( new string("mods/commands/") );
-
-    if ( s_conf::get().get_val( "PRE_MODS_HTML" ).compare( "ON" ) == 0 )
-     preload_modules( new string("mods/html/") );
+ map_mods = new hmap<dynmod*,string>(80);
+ pthread_mutex_init( &mut_map_mods, NULL );
 }
 
 modl::~modl()
 {
-    pthread_mutex_lock   ( &mut_map_mods );
+ pthread_mutex_lock   ( &mut_map_mods );
 
-    // dlclose all the_module's first!
-    map_mods->run_func   ( &modl::dlclose_ );
+ // dlclose all the_module's first! 
+ map_mods->run_func   ( &modl::dlclose_ ); 
 
-    // then clean the hash map.
-    map_mods->make_empty (               );
+ // then clean the hash map.
+ map_mods->make_empty (               );
 
-    pthread_mutex_unlock ( &mut_map_mods );
-    pthread_mutex_destroy( &mut_map_mods );
-}
-
-void
-modl::preload_modules( string *p_path )
-{
- dir* p_dir = new dir();
- p_dir->open_dir( *p_path );
- p_dir->read_dir();
-
- vector<string>* p_dir_vec = p_dir->get_dir_vec();
-
- if ( ! p_dir_vec->empty() ) 
- {
-  vector<string>::iterator iter = p_dir_vec->begin();
-
-  do
-  {
-   if ( iter->length() >= 3 && iter->compare( iter->length()-3, 3, ".so" ) == 0 )
-    cache_module( *p_path + *iter );
-  }
-  while ( ++iter != p_dir_vec->end() );
- }
- p_dir->close_dir();
- p_dir->~dir();
+ pthread_mutex_unlock ( &mut_map_mods );
+ pthread_mutex_destroy( &mut_map_mods );
 }
 
 void
 modl::dlclose_( dynmod* mod )
 {
-    dlclose( mod->the_module );
+ dlclose( mod->the_module ); 
 }
 
 dynmod*
 modl::cache_module( string s_name )
 {
-    void     *the_module = NULL;
-    function *the_func   = NULL;
-
-    the_module = dlopen( s_name.c_str(), RTLD_NOW );
-
-    if ( the_module == NULL )
-    {
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-#ifdef NCURSES
-
-        s_ncur::get
-            ().print( dlerror() );
-#else
+ void     *the_module = NULL;
+ function *the_func   = NULL;
 
-        cerr << "dlerror: " << dlerror() << endl;
-#endif
-
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        return NULL;
-    }
-
-    the_func = (function*) dlsym( the_module, "extern_function" );
-
-    if ( the_func == NULL )
-    {
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-#ifdef NCURSES
+ the_module = dlopen( s_name.c_str(), RTLD_NOW );
 
-        s_ncur::get
-            ().print( dlerror() );
-#else
+ if ( the_module == NULL )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "dlerror: " << dlerror() << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  return NULL;
+ }
 
-        cerr << "dlerror: " << dlerror() << endl;
-#endif
+ the_func = (function*) dlsym( the_module, "extern_function" );
 
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        return NULL;
-    }
+ if ( the_func == NULL )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "dlerror: " << dlerror() << endl; 
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  return NULL;
+ }
 
 #ifdef VERBOSE
-    pthread_mutex_lock  ( &s_mutx::get
-                              ().mut_stdout );
-    cout << MODULEC << s_name << endl;
-    pthread_mutex_unlock( &s_mutx::get
-                              ().mut_stdout );
-#endif
-#ifdef NCURSES
-
-    {
-        string s_tmp( MODULEC );
-        s_tmp.append( s_name );
-        s_ncur::get
-            ().print( s_tmp.c_str() );
-    }
+ pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+ cout << MODULEC << s_name << endl;
+ pthread_mutex_unlock( &s_mutx::get().mut_stdout );
 #endif
 
-    dynmod *mod     = new dynmod; // encapsulates the function and module handler.
-    mod->the_func   = the_func  ; // the function to execute
-    mod->the_module = the_module; // the module handler to close if function
-    // is not needed anymore.
-    pthread_mutex_lock  ( &mut_map_mods );
-    map_mods->add_elem  ( mod, s_name  );
-    pthread_mutex_unlock( &mut_map_mods );
+ dynmod *mod     = new dynmod; // encapsulates the function and module handler.
+ mod->the_func   = the_func  ; // the function to execute
+ mod->the_module = the_module; // the module handler to close if function 
+                               // is not needed anymore. 
+ pthread_mutex_lock  ( &mut_map_mods );
+ map_mods->add_elem  ( mod, s_name  );
+ pthread_mutex_unlock( &mut_map_mods );
 
-    // DO NOT CLOSE AS LONG THERE EXIST A POINTER TO THE FUNCTION
-    // dlclose( module );
+// DO NOT CLOSE AS LONG THERE EXIST A POINTER TO THE FUNCTION 
+// dlclose( module );
 
-    return mod;
+ return mod; 
 }
 
 dynmod*
 modl::get_module( string s_name )
 {
-#ifdef VERBOSE
-    pthread_mutex_lock  ( &s_mutx::get
-                              ().mut_stdout );
-    cout << MODULER << s_name << endl;
-    pthread_mutex_unlock( &s_mutx::get
-                              ().mut_stdout );
-#endif
-#ifdef NCURSES
-
-    {
-        string s_tmp( MODULER );
-        s_tmp.append( s_name );
-        s_ncur::get
-            ().print( s_tmp.c_str() );
-    }
-#endif
-    pthread_mutex_lock  ( &mut_map_mods );
-    dynmod* mod = map_mods->get_elem( s_name );
-    pthread_mutex_unlock( &mut_map_mods );
+ pthread_mutex_lock  ( &mut_map_mods );
+ dynmod* mod = map_mods->get_elem( s_name );
+ pthread_mutex_unlock( &mut_map_mods );
 
-    return ! mod ? cache_module( s_name ) : mod;
+ return ! mod ? cache_module( s_name ) : mod;
 }
 
 #endif
diff --git a/modl.h b/modl.h
index fec4f2e..10f93ba 100755
--- a/modl.h
+++ b/modl.h
@@ -9,24 +9,21 @@
 using namespace std;
 
 
-class modl
+class modl 
 {
 private:
-    hmap<dynmod*,string>* map_mods;
-    pthread_mutex_t mut_map_mods;
+ hmap<dynmod*,string>* map_mods;
+ pthread_mutex_t mut_map_mods;
 
-    static  void dlclose_( dynmod* mod   );
-    dynmod* cache_module ( string s_name );
-    void preload_modules( string *p_path );
+ static  void dlclose_( dynmod* mod   );
+ dynmod* cache_module ( string s_name );
 
 public:
-    modl();
-    ~modl();
+ modl();
+ ~modl();
 
-    dynmod* get_module  ( string s_name );
+ dynmod* get_module  ( string s_name );
 
-    hmap<dynmod*,string>* 
-    get_map_mods() { return map_mods; }
 };
 
 #endif
diff --git a/msgs.h b/msgs.h
index f9e4adb..0cf634f 100755
--- a/msgs.h
+++ b/msgs.h
@@ -3,47 +3,34 @@
 
 
 // several error messages which will apear by the clients.
-#define E_ALPNUM "The nick you have specified is not alphanumeric, please change that.<br><br>\0"
-#define E_NONICK "You need to specify a nick name.<br><br>\0"
-#define E_NOTONL "An error occured. Your nick is not online.<br><br>\0"
-#define E_ONLINE "The nick you have specified is already online. Try another nick.<br><br>\0"
+#define E_ALPNUM "The nick you have specified is not alphanumeric, please change that.<br><br>"
+#define E_NONICK "You need to specify a nick name.<br><br>"
+#define E_NOTONL "An error occured. Your nick is not online.<br><br>"
+#define E_ONLINE "The nick you have specified is already online. Try another nick.<br><br>"
 
-// alphabetical ordered:
-#define ACCPERR "Sock accept error \0"
-#define BINDERR "Sock bind error \0"
-#define CFILEOK "Parsing config file \0"
-#define CFILENO "Failed opening config file \0"
-#define CONTACT "Contact: http://www.yChat.org, Mail@yChat.org, ICQ: 11655527\0"
-#define DESCRIP "yChat++: Copyright (C) 2003 Paul C. Buetow, Volker Richter\0"
-#define DOWNMSG "Shutting down \0"
-#define LISTERR "Sock listen error \0"
-#define LOGERR1 "Logging: Could not open logfile \0"
-#define LOGERR2 "Logging: No filename specified \0"
-#define MODULEC "Caching \0"
-#define MODULER "Requesting \0"
-#define MYMANAG "MySQL: \0" 
-#define MYLIMIT "MySQL reached hardlimit of connections: \0"
-#define MYINITC "MySQL initial connections: \0" 
-#define MYINITM "MySQL max. connections: \0" 
-#define MYERROR "MySQL error: no suitable connection found \0"
-#define MYERRO1 "MySQL error: init failed \0"
-#define MYERRO2 "MySQL error: reached connection limit \0"
-#define NEWREQU "New request \0"
-#define NEWROOM "New room \0"
-#define NEWUSER "New user \0"
-#define NOFOUND "File not found \0"
-#define POOLERR "Thread pool malloc error \0"
-#define READERR "Sock read error \0"
-#define REMUSER "Removing user \0"
-#define REQUEST "Request string \0"
-#define SELCERR "Sock select error \0"
-#define SEPERAT "-----------------------\0"
-#define SESSION "Session count \0"
-#define SOCKCRT "Created server socket on \0"
-#define SOCKERR "Couldn't create socket, trying next port \0"
-#define SOCKRDY "Server socket is ready \0"
-#define STARTMS "Starting up \0"
-#define TECACHE "Caching template \0"
-#define VERSION "yChat 0.6-RELEASE \0"
+// all the custom messages for verbosity outputs. this messages may not
+// be used for html-template value substituation except the CONTACT and
+// DESCRIP variables. the verbosity output will appear in the standard
+// output of the server.
+// alphabetical ordered.
+#define CFILEOK "Parsing config file "
+#define CFILENO "Failed opening config file "
+#define CONNECT "Receiving connection "
+#define CONTACT "Contact: www.yChat.org, Mail@yChat.org "
+#define DESCRIP "yChat++ Copyright (C) 2003 Paul C. Buetow, Volker Richer " 
+#define DOWNMSG "Shutting down "
+#define LOGINPR "Login procedure succeeded for nick " 
+#define MODULEC "Caching module "
+#define NEWROOM "Adding room "
+#define REQUEST "Request string "
+#define SEPERAT "----------------------------------------- "
+#define SOCKCRT "Creating server socket "
+#define SOCKERR "Could not create socket. Trying next port "
+#define SOCKRDY "Server socket is ready. See port above "
+#define STARTMS "Starting up "
+#define TECACHE "Caching template "
+#define THREADS "Starting thread job "
+#define THREADE "Exiting thread job "
+#define VERSION "Version: yChat++ Basic 0.5" 
 
 #endif
diff --git a/mutx.cpp b/mutx.cpp
index a0176f5..eb75e90 100755
--- a/mutx.cpp
+++ b/mutx.cpp
@@ -1,4 +1,4 @@
-// class mutx implementation.
+// class mutx implementation. 
 
 #ifndef s_mutx_CXX
 #define s_mutx_CXX
@@ -9,12 +9,12 @@ using namespace std;
 
 mutx::mutx()
 {
-    pthread_mutex_init( &mut_stdout, NULL );
+ pthread_mutex_init( &mut_stdout, NULL );
 }
 
 mutx::~mutx()
 {
-    pthread_mutex_destroy( &mut_stdout );
+ pthread_mutex_destroy( &mut_stdout );
 }
 
 #endif
diff --git a/mutx.h b/mutx.h
index 592f351..0438cb9 100755
--- a/mutx.h
+++ b/mutx.h
@@ -7,15 +7,15 @@
 
 using namespace std;
 
-class mutx
+class mutx 
 {
 public:
-    // this mutex is needed for sync stdout and sdterr of different threads.
-    pthread_mutex_t mut_stdout;
+ // this mutex is needed for sync stdout and sdterr of different threads.
+ pthread_mutex_t mut_stdout;
 
-    // public methods.
-    explicit mutx( ); // simple constructor.
-    ~mutx( ); // simple constructor.
+ // public methods.
+ explicit mutx( ); // simple constructor.
+ ~mutx( ); // simple constructor.
 };
 
 #endif
diff --git a/name.cpp b/name.cpp
index d575c37..28033ff 100755
--- a/name.cpp
+++ b/name.cpp
@@ -9,22 +9,23 @@ using namespace std;
 
 name::name( string s_name )
 {
-    set_name( s_name );
+ set_name( s_name );
 }
 
 name::~name()
-{}
+{
+}
 
 string
 name::get_name() const
 {
-    return s_name;
+ return s_name;
 }
 
 void
 name::set_name( string s_name )
 {
-    this->s_name = s_name;
+ this->s_name = s_name;
 }
 
 
diff --git a/name.h b/name.h
index 38561cf..b895389 100755
--- a/name.h
+++ b/name.h
@@ -7,23 +7,21 @@
 
 using namespace std;
 
-class name
+class name 
 {
 protected:
-    // private members:
-    string s_name; // object's name.
-
+ // private members:
+ string s_name; // object's name. 
+ 
 public:
-    virtual string get_name  ( ) const;
-    virtual void   set_name  ( string s_name );
+ virtual string get_name  ( ) const;
+ virtual void   set_name  ( string s_name );
 
 
-    // public methods:
-    explicit name( )
-    { }
-    ;      	      // a standard constructor.
-    explicit name( string s_name );      // a standard constructor.
-    ~name( );
+ // public methods: 
+ explicit name( ) { };      	      // a standard constructor.
+ explicit name( string s_name );      // a standard constructor.
+         ~name( );
 
 };
 
diff --git a/pool.cpp b/pool.cpp
index b6e5dec..a8c1556 100755
--- a/pool.cpp
+++ b/pool.cpp
@@ -8,254 +8,207 @@
 #include "s_conf.h"
 #include "s_mutx.h"
 #include "s_tool.h"
-#include "s_ncur.h"
-#include "s_sock.h"
 #include "thrd.h"
 
 using namespace std;
 
 pool::pool()
 {
-    i_thrd_pool_size  = s_tool::string2int( s_conf::get
-                                                ().get_val( "THRDPOOL" ) );
-    i_thrd_pool_queue = s_tool::string2int( s_conf::get
-                                                ().get_val( "THRDQUEU" ) );
-    tpool_init( &thread_pool, i_thrd_pool_size, i_thrd_pool_queue, 0 );
+ i_thrd_pool_size  = s_tool::string2int( s_conf::get().get_val( "THRDPOOL" ) );
+ i_thrd_pool_queue = s_tool::string2int( s_conf::get().get_val( "THRDQUEU" ) );
+
+ tpool_init( &thread_pool, i_thrd_pool_size, i_thrd_pool_queue, 0 );
 }
 
 pool::~pool()
 {
-    // tpool_destroy ...
+ // tpool_destroy ...
 }
 
 void
 pool::tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full )
 {
-    int i, rtn;
-    tpool_t tpool;
-
-    // allocate a pool data structure
-    if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == NULL )
-    {
-#ifdef NCURSES
-        s_ncur::get
-            ().print( POOLERR );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << POOLERR << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-
-    // initialize th fields
-    tpool->num_threads    = num_worker_threads;
-    tpool->max_queue_size = max_queue_size;
-    tpool->do_not_block_when_full = do_not_block_when_full;
-
-    if ( ( tpool->threads = (pthread_t*) malloc( sizeof( pthread_t ) *num_worker_threads ) ) == NULL )
-    {
-#ifdef NCURSES
-        s_ncur::get
-            ().print( POOLERR );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << POOLERR << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-
-    tpool->cur_queue_size = 0;
-    tpool->queue_head     = NULL;
-    tpool->queue_tail     = NULL;
-    tpool->queue_closed   = 0;
-    tpool->shutdown       = 0;
-
-    if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), NULL ) ) != 0 )
-    {
-        string s_err( "pthread_mutex_init " );
-        s_err.append( strerror( rtn ) );
-#ifdef NCURSES
-
-        s_ncur::get
-            ().print( s_err );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << s_err << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), NULL ) ) != 0 )
-    {
-        string s_err( "pthread_mutex_init " );
-        s_err.append( strerror( rtn ) );
-#ifdef NCURSES
-
-        s_ncur::get
-            ().print( s_err );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << s_err << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), NULL ) ) != 0 )
-    {
-        string s_err( "pthread_mutex_init " );
-        s_err.append( strerror( rtn ) );
-#ifdef NCURSES
-
-        s_ncur::get
-            ().print( s_err );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << s_err << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-    else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), NULL ) ) != 0 )
-    {
-        string s_err( "pthread_mutex_init " );
-        s_err.append( strerror( rtn ) );
-#ifdef NCURSES
-
-        s_ncur::get
-            ().print( s_err );
-#endif
-
-        pthread_mutex_lock  ( &s_mutx::get
-                                  ().mut_stdout );
-        cerr << s_err << endl;
-        pthread_mutex_unlock( &s_mutx::get
-                                  ().mut_stdout );
-        exit(-1);
-    }
-    // create threads
-    for ( i = 0; i < num_worker_threads; i++ )
-        pthread_create( &(tpool->threads[i]) , NULL, tpool_thread, (void*)tpool );
-
-    *tpoolp = tpool;
+ int i, rtn;
+ tpool_t tpool;
+
+ // allocate a pool data structure
+ if (( tpool = (tpool_t) malloc( sizeof( struct tpool ) ) ) == NULL )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "malloc" << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+
+ // initialize th fields
+ tpool->num_threads    = num_worker_threads;
+ tpool->max_queue_size = max_queue_size;
+ tpool->do_not_block_when_full = do_not_block_when_full;
+
+ if ( ( tpool->threads = (pthread_t*) malloc( sizeof( pthread_t ) *num_worker_threads ) ) == NULL )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "malloc" << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+
+ tpool->cur_queue_size = 0;
+ tpool->queue_head     = NULL;
+ tpool->queue_tail     = NULL;
+ tpool->queue_closed   = 0;
+ tpool->shutdown       = 0;
+
+ if ( ( rtn = pthread_mutex_init( &(tpool->queue_lock), NULL ) ) != 0 )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "pthread_mutex_init " << strerror( rtn ) << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+
+ else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_empty), NULL ) ) != 0 )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "pthread_cond_init " << strerror( rtn ) << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+
+ else if ( ( rtn = pthread_cond_init( &(tpool->queue_not_full), NULL ) ) != 0 )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "pthread_cond_init " << strerror( rtn ) << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+
+ else if ( ( rtn = pthread_cond_init( &(tpool->queue_empty), NULL ) ) != 0 )
+ {
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cerr << "pthread_cond_init " << strerror( rtn ) << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+  exit(-1);
+ }
+ // create threads
+ for ( i = 0; i < num_worker_threads; i++ )
+  pthread_create( &(tpool->threads[i]) , NULL, tpool_thread, (void*)tpool );
+
+ *tpoolp = tpool;
 }
 
 void*
 pool::tpool_thread( void* arg )
 {
-    tpool_t tpool = (tpool_t) arg;
-    tpool_work_t *my_workp;
+ tpool_t tpool = (tpool_t) arg;
+ tpool_work_t *my_workp;
 
-    while( true )
-    {
-        pthread_mutex_lock( &(tpool->queue_lock) );
+ while( true )
+ {
+  pthread_mutex_lock( &(tpool->queue_lock) );
 
-        while ( (tpool->cur_queue_size == 0) && (!tpool->shutdown) )
-            pthread_cond_wait( &(tpool->queue_not_empty), &(tpool->queue_lock) );
+  while ( (tpool->cur_queue_size == 0) && (!tpool->shutdown) )
+   pthread_cond_wait( &(tpool->queue_not_empty), &(tpool->queue_lock) );
 
-        if (tpool->shutdown)
-        {
-            pthread_mutex_unlock( &(tpool->queue_lock) );
-            pthread_exit( NULL );
-        }
+  if (tpool->shutdown)
+  {
+   pthread_mutex_unlock( &(tpool->queue_lock) );
+   pthread_exit( NULL );
+  }
 
-        my_workp = tpool->queue_head;
-        tpool->cur_queue_size--;
+  my_workp = tpool->queue_head;
+  tpool->cur_queue_size--;
 
-        if ( tpool->cur_queue_size == 0)
-            tpool->queue_head = tpool->queue_tail = NULL;
+  if ( tpool->cur_queue_size == 0)
+   tpool->queue_head = tpool->queue_tail = NULL;
 
-        else
-            tpool->queue_head = my_workp->next;
+  else
+   tpool->queue_head = my_workp->next;
 
-        if ( ( ! tpool->do_not_block_when_full ) &&
-                (   tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) ) )
-            pthread_cond_signal( &(tpool->queue_not_full) );
+  if ( ( ! tpool->do_not_block_when_full ) &&
+       (   tpool->cur_queue_size == ( tpool->max_queue_size - 1 ) ) )
+   pthread_cond_signal( &(tpool->queue_not_full) ); 
 
-        if ( tpool->cur_queue_size == 0 )
-            pthread_cond_signal( &(tpool->queue_empty) );
+  if ( tpool->cur_queue_size == 0 )
+   pthread_cond_signal( &(tpool->queue_empty) );
 
-        pthread_mutex_unlock( &(tpool->queue_lock) );
-        (*(my_workp->routine))(my_workp->arg);
-        free((void*)my_workp);
-    }
+  pthread_mutex_unlock( &(tpool->queue_lock) );
+  (*(my_workp->routine))(my_workp->arg);
+  free((void*)my_workp);
+ }
 }
 
 void pool::run_func( void *v_pointer )
 {
-    s_sock::get
-        ().increase_num_threads();
+#ifdef VERBOSE
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cout << THREADS << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+#endif
 
-    // recasting the client thread object.
-    thrd *t = (thrd*) v_pointer;
+  // recasting the client thread object.
+  thrd *t = (thrd*) v_pointer;
 
-    // start parsing the client request and sending response's back.
-    t-> run ();
+  // start parsing the client request and sending response's back.
+  t-> run ();
 
-    // close the client socket.
-    t->~thrd();
+  // close the client socket.
+  t->~thrd();
 
-    s_sock::get
-        ().decrease_num_threads();
+  free(v_pointer);
 
-    free(v_pointer);
+#ifdef VERBOSE
+  pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+  cout << THREADE << endl;
+  pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+#endif
 }
 
 int
 pool::tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg ) ///
 {
-    tpool_work_t *workp;
-    pthread_mutex_lock( &(tpool->queue_lock) );
-
-    if( ( tpool->cur_queue_size == tpool->max_queue_size ) &&
-            tpool->do_not_block_when_full )
-    {
-        pthread_mutex_unlock( &(tpool->queue_lock) );
-        return -1;
-    }
-
-    while( (     tpool->cur_queue_size == tpool->max_queue_size ) &&
-            ( ! ( tpool->shutdown       || tpool->queue_closed   ) ) )
-        pthread_cond_wait( &(tpool->queue_not_full), &(tpool->queue_lock) );
-
-    if( tpool->shutdown || tpool->queue_closed )
-    {
-        pthread_mutex_unlock( &tpool->queue_lock );
-        return -1;
-    }
-
-    // allocate work structure:
-    workp = (tpool_work_t*) malloc( sizeof( tpool_work_t ) );
-
-    workp->routine = routine;
-    workp->arg     = arg;
-    workp->next    = NULL;
-
-    if( tpool->cur_queue_size == 0 )
-    {
-        tpool->queue_tail = tpool->queue_head = workp;
-    }
-    else
-    {
-        (tpool->queue_tail)->next = workp;
-        tpool->queue_tail         = workp;
-    }
-
-    pthread_cond_signal( &tpool->queue_not_empty );
-    tpool->cur_queue_size++;
-    pthread_mutex_unlock( &(tpool->queue_lock) );
-    return 1;
+ tpool_work_t *workp;
+ pthread_mutex_lock( &(tpool->queue_lock) );
+
+ if( ( tpool->cur_queue_size == tpool->max_queue_size ) &&
+       tpool->do_not_block_when_full )
+ {
+  pthread_mutex_unlock( &(tpool->queue_lock) );
+  return -1;
+ }
+
+ while( (     tpool->cur_queue_size == tpool->max_queue_size ) &&
+        ( ! ( tpool->shutdown       || tpool->queue_closed   ) ) )
+  pthread_cond_wait( &(tpool->queue_not_full), &(tpool->queue_lock) );
+
+ if( tpool->shutdown || tpool->queue_closed )
+ {
+  pthread_mutex_unlock( &tpool->queue_lock );
+  return -1;
+ }
+
+ // allocate work structure:
+ workp = (tpool_work_t*) malloc( sizeof( tpool_work_t ) );
+
+ workp->routine = routine;
+ workp->arg     = arg;
+ workp->next    = NULL;
+  
+ if( tpool->cur_queue_size == 0 )
+ {
+  tpool->queue_tail = tpool->queue_head = workp;
+ } 
+
+ else
+ {
+  tpool->queue_tail->next = workp;
+  tpool->queue_tail       = workp;
+ } 
+
+ tpool->cur_queue_size++;
+ pthread_cond_signal( &(tpool->queue_not_empty) );
+ pthread_mutex_unlock( &(tpool->queue_lock) );
+ return 1;
 }
 
 #endif
diff --git a/pool.h b/pool.h
index 7230760..358b79f 100755
--- a/pool.h
+++ b/pool.h
@@ -7,71 +7,71 @@
 
 using namespace std;
 
-class pool
+class pool 
 {
 private:
-    typedef struct tpool_work
-    {
-        void (*routine)(void*); ///
-        void *arg;
-        struct tpool_work *next;
-    }
-    tpool_work_t;
+ typedef struct tpool_work
+ {
+  void (*routine)(void*); ///
+  void *arg;
+  struct tpool_work *next;
+ } 
+ tpool_work_t;
 
-    typedef struct tpool
-    {
-        // pool characteristics:
-        int num_threads;
-        int max_queue_size;
-        int do_not_block_when_full;
+ typedef struct tpool
+ {
+  // pool characteristics:
+  int num_threads;
+  int max_queue_size;
+  int do_not_block_when_full;
 
-        // pool state
-        pthread_t *threads;
-        int cur_queue_size;
+  // pool state
+  pthread_t *threads;
+  int cur_queue_size;
 
-        tpool_work_t *queue_head;
-        tpool_work_t *queue_tail;
+  tpool_work_t *queue_head;
+  tpool_work_t *queue_tail;
 
-        pthread_mutex_t queue_lock;
-        pthread_cond_t  queue_not_empty;
-        pthread_cond_t  queue_not_full;
-        pthread_cond_t  queue_empty;
+  pthread_mutex_t queue_lock;
+  pthread_cond_t  queue_not_empty;
+  pthread_cond_t  queue_not_full;
+  pthread_cond_t  queue_empty;
 
-        int queue_closed;
-        int shutdown;
-    }
-    *tpool_t;
+  int queue_closed;
+  int shutdown;
+ } 
+ *tpool_t;
 
-    int i_thrd_pool_size;
-    int i_thrd_pool_queue;
+ int i_thrd_pool_size;
+ int i_thrd_pool_queue;
 
-    tpool_t thread_pool;
+ tpool_t thread_pool;
 
-    virtual void
-    tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full );
+ virtual void
+ tpool_init( tpool_t *tpoolp, int num_worker_threads, int max_queue_size, int do_not_block_when_full );
 
-    virtual int
-    tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg );
+ virtual int
+ tpool_add_work( tpool_t tpool, void(*routine)(void*), void* arg );
 
-    // virtual void
-    // tpool_destroy( tpool_t tpoolp, int finish );
+// virtual void
+// tpool_destroy( tpool_t tpoolp, int finish );
 
-    static void*
-    tpool_thread( void* arg);
+ static void*
+ tpool_thread( void* arg);
 
-    static void
-    run_func( void *v_pointer );
+ static void
+ run_func( void *v_pointer );
 
-    // public methods:
+ // public methods: 
 public:
-    explicit pool( );
-    ~pool();
-
-    // inline (speed)!
-    void run( void *arg )
-    {
-        tpool_add_work( thread_pool, run_func, arg );
-    }
+ explicit pool( );     
+ ~pool();
+
+ // inline (speed)!
+ void run( void *arg )
+ {
+  tpool_add_work( thread_pool, run_func, arg ); 
+ }
 };
 
 #endif
diff --git a/reqp.cpp b/reqp.cpp
index f2062d8..894e81c 100755
--- a/reqp.cpp
+++ b/reqp.cpp
@@ -6,9 +6,7 @@
 #include "reqp.h"
 #include "s_chat.h"
 #include "s_html.h"
-#include "s_modl.h"
 #include "s_mutx.h"
-#include "s_ncur.h"
 #include "s_sock.h"
 #include "s_tool.h"
 using namespace std;
@@ -17,144 +15,137 @@ using namespace std;
 string reqp::HTTP_CODEOK = "HTTP/1.1 200 OK\n";
 string reqp::HTTP_SERVER = "Server: yChat (Unix)\n";
 string reqp::HTTP_CONTAC = "Contact: www.yChat.org\n";
-string reqp::HTTP_EXPIRE = "Expires: 0\n";
-string reqp::HTTP_CACHEC = "Cache-control: no-cache\nPragma: no-cache\n";
+string reqp::HTTP_CACHEC = "Expires: 0\nCache-control: no-cache\nPragma: no-cache\n";
 string reqp::HTTP_CONNEC = "Connection: keep-alive\n";
 string reqp::HTTP_COTYPE = "Content-Type: ";
 
 reqp::reqp( )
-{}
+{
+}
 
 string
 reqp::get_url( thrd* p_thrd, string s_req, map_string &map_params )
 {
-    auto unsigned int pos;
-    string s_ret ( "" );
-    string s_vars( "" );
-    auto int i_request;
-
-    i_request= ( s_req.find("GET",0) != string::npos ) ? RQ_GET : RQ_POST;
-
-    pos = s_req.find( "HTTP", 0 );
-
-    if( i_request == RQ_GET )
-        s_ret.append( s_req.substr( 5, pos-6 ) );
-    else
-        s_ret.append( s_req.substr( 6, pos-7 ) );
-
-    // remove ".." from the request.
-    do
-    {
-        pos = s_ret.find( "../", 0 );
-
-        if ( pos == string::npos )
-            break;
-
-        s_ret.replace( pos, pos+2, "" );
-    }
-    while( true );
-
-    // do not add the string behind "?" tp s_ret and add all params behind "?" to map_params.
-    if( i_request == RQ_GET )
-        pos = s_ret.find( "?", 0 );
-    else
-        pos = s_req.find("\r\n\r\n", 0);
-
-    auto string s_params( "" );
-    if ( pos != string::npos )
-    {
-        if( i_request == RQ_GET )
-            s_params.append( s_ret.substr( pos+1, s_ret.length() -pos-1 ) );
-
-        else
-            s_params = s_req.substr( pos+4, s_req.length() -pos-1 );
-
-        s_ret = s_ret.substr( 0, pos );
-    }
-
-    if ( i_request == RQ_POST && s_params.empty() )
-    {
-        char c_req[READBUF];
-
-        if ( read ( p_thrd->get_sock() , c_req, READBUF ) <= 0 )
-         return "NOBYTE";
-
-        s_params = string( strstr( c_req, "event" ) );
-
-    }
-
-    auto unsigned int pos2;
-    do
-    {
-        pos  = s_params.find( "=", 0 );
-        if ( pos == string::npos )
-            break;
-
-        pos2 = s_params.find( "&", 0 );
-        if ( pos2 == string::npos )
-        {
-            auto string sValue( s_params.substr(pos+1, s_params.length()-pos-1) );
-            auto string tmpstr( url_decode(sValue) );
-            map_params[ s_params.substr( 0, pos ) ] = tmpstr;
-            break;
-        }
-
-        auto string s_temp= s_params.substr( pos+1, pos2-pos-1 );
-        map_params[ s_params.substr( 0, pos ) ] = url_decode(s_temp);
-
-        s_params = s_params.substr( pos2+1, s_params.length()-pos2-1 );
-    }
-    while( true );
+ auto unsigned int pos;
+ string s_ret ( "" );
+ string s_vars( "" );
+ auto int i_request;
+
+ i_request= ( s_req.find("GET",0) != string::npos ) ? RQ_GET : RQ_POST;
+
+ pos = s_req.find( "HTTP", 0 );
+
+ if( i_request == RQ_GET )
+ 	s_ret.append( s_req.substr( 5, pos-6 ) );
+ else
+ 	s_ret.append( s_req.substr( 6, pos-7 ) );
+
+ // remove ".." from the request.
+ do
+ {
+  pos = s_ret.find( "../", 0 );
+
+  if ( pos == string::npos )
+   break; 
+
+  s_ret.replace( pos, pos+2, "" );
+ }
+ while( true );
+
+ // do not add the string behind "?" tp s_ret and add all params behind "?" to map_params. 
+ if( i_request == RQ_GET )
+  	pos = s_ret.find( "?", 0 );
+ else
+  	pos = s_req.find("\r\n\r\n", 0);
+
+ auto string s_params( "" );
+ if ( pos != string::npos )
+ {
+  if( i_request == RQ_GET )
+   s_params.append( s_ret.substr( pos+1, s_ret.length() -pos-1 ) ); 
+
+  else
+   s_params = s_req.substr( pos+4, s_req.length() -pos-1 ); 
+
+  s_ret = s_ret.substr( 0, pos );
+ }
+
+ if ( i_request == RQ_POST && s_params.empty() )
+ {
+  char c_req[READBUF];
+
+  if ( read ( p_thrd->get_sock() , c_req, READBUF ) <= 0 )
+   return "NOBYTE";
+
+  s_params = string( strstr( c_req, "event" ) ); 
+ }
+
+ auto unsigned int pos2;
+ do
+ {
+  pos  = s_params.find( "=", 0 );
+  if ( pos == string::npos )
+   break;
+
+  pos2 = s_params.find( "&", 0 );
+  if ( pos2 == string::npos )
+  {
+   auto string sValue( s_params.substr(pos+1, s_params.length()-pos-1) );
+   auto string tmpstr( url_decode(sValue) );
+   map_params[ s_params.substr( 0, pos ) ] = tmpstr;
+   break;
+  }
+
+  auto string s_temp= s_params.substr( pos+1, pos2-pos-1 );
+  map_params[ s_params.substr( 0, pos ) ] = url_decode(s_temp);
+   
+  s_params = s_params.substr( pos2+1, s_params.length()-pos2-1 );
+ }
+ while( true );
 
 #ifdef VERBOSE
-
-    pthread_mutex_lock  ( &s_mutx::get
-                              ().mut_stdout );
-    cout << REQUEST << s_ret << endl;
-    pthread_mutex_unlock( &s_mutx::get
-                              ().mut_stdout );
+ pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
+ cout << REQUEST << s_ret << endl;
+ pthread_mutex_unlock( &s_mutx::get().mut_stdout );
 #endif
 
-    map_params["request"] = s_ret;
+ map_params["request"] = s_ret;
 
-    return s_ret;
+ return s_ret;
 }
 
 string
 reqp::get_content_type( string s_file )
 {
-    string s_ext=s_tool::getExtension( s_file );
+	string s_ext=s_tool::getExtension( s_file );
 
-    if(s_ext=="")
-        s_ext="DEFAULT";
+	if(s_ext=="")
+		s_ext="DEFAULT";	
 
-    return s_conf::get
-               ().get_val( "CT_"+s_ext );
+	return s_conf::get().get_val( "CT_"+s_ext );	
 }
 void
 reqp::parse_headers( string s_req, map_string &map_params )
 {
 
-    int pos = s_req.find("\n");
-
-    map_params["QUERY_STRING"] = s_tool::trim(s_req.substr(0,pos-1));
-
-    while( pos != string::npos)
-    {
-        auto string s_line=s_req.substr(0,pos);
-        auto int pos2=s_line.find(":");
-
-        if(pos2!=string::npos)
+        int pos = s_req.find("\n");
+	map_params["QUERY_STRING"]=s_tool::trim(s_req.substr(0,pos-1));
+        while(pos!=string::npos)
         {
-            auto string key=s_tool::trim(s_line.substr(0, pos2));
-            auto string value=s_tool::trim(s_line.substr(pos2+1));
+                auto string s_line=s_req.substr(0,pos);
+                auto int pos2=s_line.find(":");
+                if(pos2!=string::npos)
+                {
+                        auto string key=s_tool::trim(s_line.substr(0, pos2));
+                        auto string value=s_tool::trim(s_line.substr(pos2+1));
+
+                        map_params[key]=value;
 
-            map_params[key]=value;
 
+                }
+                s_req=s_req.substr(s_line.size()+1);
+                pos=s_req.find("\n");
         }
-        s_req=s_req.substr(s_line.size()+1);
-        pos=s_req.find("\n");
-    }
 
 }
 
@@ -162,165 +153,135 @@ reqp::parse_headers( string s_req, map_string &map_params )
 int
 reqp::htoi(string *s)
 {
-    int value;
-    int c;
-
-    c=s->c_str()[0];
-    if(isupper(c))
-        c=tolower(c);
+	int value;
+	int c;
+	
+	c=s->c_str()[0];
+	if(isupper(c))
+		c=tolower(c);
 
-    value=(c>='0' && c<='9'?c-'0':c-'a'+10)*16;
+	value=(c>='0' && c<='9'?c-'0':c-'a'+10)*16;
 
-    c=s->c_str()[1];
-    if(isupper(c))
-        c=tolower(c);
+	c=s->c_str()[1];
+	if(isupper(c))
+		c=tolower(c);
 
-    value+=c>='0' && c<='9'?c-'0':c-'a'+10;
-    return value;
+	value+=c>='0' && c<='9'?c-'0':c-'a'+10;
+	return value;
 }
 
 string
 reqp::url_decode( string s_str )
 {
-    auto string sDest="";
-    int len = s_str.size();
-
-    for(int i=0;i<len;i++)
-    {
-        char ch = s_str.at(i);
-        if(ch=='+')
-        {
-            sDest+=" ";
-        }
-        else if(ch=='%')
-        {
-            auto string sTmp=s_str.substr(i+1,2);
-            ch=(char)htoi(&sTmp);
-            sDest+=ch;
-            i+=2;
-
-        }
-        else
-
-            sDest+=ch;
-    }
-    return sDest;
+	auto string sDest="";
+	int len = s_str.size();
+
+	for(int i=0;i<len;i++)
+	{
+		char ch = s_str.at(i);
+		if(ch=='+')
+		{
+			sDest+=" ";
+		}
+		else if(ch=='%')
+		{
+			auto string sTmp=s_str.substr(i+1,2);
+			ch=(char)htoi(&sTmp);
+			sDest+=ch;
+			i+=2;
+		
+		}
+		else
+
+		sDest+=ch;
+	}
+	return sDest;
 }
 
 string
 reqp::get_from_header( string s_req, string s_hdr )
 {
-    auto unsigned int pos[2];
-    pos[0] = s_req.find( s_hdr, 0 );
-    pos[1] = s_req.find( "\n", pos[0] );
+ auto unsigned int pos[2];
+ pos[0] = s_req.find( s_hdr, 0 );
+ pos[1] = s_req.find( "\n", pos[0] );
 
-    auto int i_length = s_hdr.length();
-    return s_req.substr( pos[0]+i_length, pos[1]-pos[0]-i_length-1 );
+ auto int i_length = s_hdr.length();
+ return s_req.substr( pos[0]+i_length, pos[1]-pos[0]-i_length-1 );
 }
 
 string
 reqp::parse( thrd* p_thrd, string s_req, map_string &map_params )
 {
-    // store all request informations in map_params. store the url in
-    // map_params["request"].
-    if ( get_url( p_thrd, s_req, map_params ).compare("NOBYTE") == 0 )
-     map_params["request"] = s_conf::get().get_val("NOTFOUND");
-
-    parse_headers( s_req, map_params );
-
-    // create the http header.
-    string s_rep( HTTP_CODEOK );
-    s_rep.append( HTTP_SERVER );
-    s_rep.append( HTTP_CONTAC );
-    s_rep.append( HTTP_EXPIRE );
-    s_rep.append( HTTP_CACHEC );
-    s_rep.append( HTTP_CONNEC );
-    s_rep.append( HTTP_COTYPE );
-    s_rep.append( get_content_type( map_params["request"] ) );
-    s_rep.append("\r\n\r\n");
-
-    // check the event variable.
-
-    string s_event( map_params["event"] );
-
-    if ( ! s_event.empty() )
-    {
-        // login procedure.
-        if ( s_event == "login" )
-        {
-            s_chat::get
-                ().login( map_params );
-        }
-        else
-        {
-            bool b_found;
-
-            //   user* p_user = s_chat::get().get_user( map_params["nick"], b_found );
-            sess *sess_temp=s_sman::get
-                                ().get_session( map_params["tmpid"] );
-
-            user *p_user;
-            if( sess_temp != NULL )
-            {
-                string *s_nick = static_cast<string*>(sess_temp->get_elem(string("nick")));
-                p_user = s_chat::get
-                             ().get_user( *s_nick, b_found);
-
-                map_params["nick"] = p_user->get_name().c_str();
-
-            }
-            else
-                return s_rep;
-
-            if ( ! b_found )
-            {
-                map_params["INFO"]    = E_NOTONL;
-                map_params["request"] = s_conf::get
-                                            ().get_val( "STARTMPL" ); // redirect to the startpage.
-            }
-            // if a message post.
-            else if ( s_event == "post" )
-                s_chat::get
-                    ().post( p_user, map_params );
-
-
-            // if a chat stream
-            else if ( s_event == "stream" )
-            {
-                string s_msg(s_html::get
-                                 ().parse( map_params ) );
-                p_user->msg_post( &s_msg);
-                s_sock::get
-                    ().chat_stream( p_thrd->get_sock(), p_user, map_params );
-            }
-
-            // if a request for the online list of the active room.
-            else if ( s_event == "online" )
-                s_html::get
-                    ().online_list( p_user, map_params );
-
-            else if ( s_event != "input" ) 
-            {
-             container *c = new container;
-             c->elem[0] = (void*) &s_lang::get();
-             c->elem[1] = (void*) s_modl::get().get_map_mods();
-             c->elem[2] = (void*) &map_params;
-
-             string s_mod = "mods/html/yc_" + s_event + ".so";
-    	     ( *(s_modl::get().
-                 get_module( s_mod )->the_func
-                 ) 
-             ) ( (void*) c );
-            }
-        }
-    }
-    // parse and get the requested html-template and also use
-    // the values stored in map_params for %%KEY%% substituations.
-    s_rep.append( s_html::get
-                      ().parse( map_params ) );
-
-    // return the parsed html-template.
-    return  s_rep;
+
+ // store all request informations in map_params. store the url in 
+ // map_params["request"].
+
+ if ( get_url( p_thrd, s_req, map_params ).compare("NOBYTE") == 0 )
+   map_params["request"] = s_conf::get().get_val("NOTFOUND");
+
+ parse_headers( s_req, map_params );
+ // create the http header.
+ string s_rep( HTTP_CODEOK ); s_rep.append( HTTP_SERVER );
+ s_rep.append( HTTP_CONTAC ); s_rep.append( HTTP_CACHEC );
+ s_rep.append( HTTP_CONNEC ); s_rep.append( HTTP_COTYPE );
+ s_rep.append( get_content_type( map_params["request"] ) ); 
+ s_rep.append("\r\n\r\n");
+
+ // check the event variable.
+
+ string s_event( map_params["event"] );
+ if ( ! s_event.empty() )
+ {
+  // login procedure.
+  if ( s_event == "login" )
+  {
+   s_chat::get().login( map_params ); 
+  }
+
+  else
+  {
+   bool b_found;
+   
+//   user* p_user = s_chat::get().get_user( map_params["nick"], b_found );
+	sess *sess_temp=s_sman::get().getSession( map_params["tmpid"] );
+	user *p_user;
+	if(sess_temp!=NULL)
+	{
+		string *s_nick=static_cast<string*>(sess_temp->getValue(string("nick")));
+		p_user = s_chat::get().get_user( *s_nick, b_found);
+	}
+	else
+		return s_rep;
+   if ( ! b_found )
+   {
+     map_params["INFO"]    = E_NOTONL;
+     map_params["request"] = s_conf::get().get_val( "STARTMPL" ); // redirect to the startpage.
+   }
+   // if a message post.
+   else if ( s_event == "post" )
+    s_chat::get().post( p_user, map_params );
+
+
+   // if a chat stream 
+   else if ( s_event == "stream" )
+   {
+    string s_msg(s_html::get().parse( map_params ) ); 
+    p_user->msg_post( &s_msg);
+    s_sock::get().chat_stream( p_thrd->get_sock(), p_user, map_params );
+   }
+
+   // if a request for the online list of the active room.
+   else if ( s_event == "online" )
+    s_html::get().online_list( p_user, map_params );
+  }
+ }
+
+ // parse and get the requested html-template and also use
+ // the values stored in map_params for %%KEY%% substituations. 
+ s_rep.append( s_html::get().parse( map_params ) );
+
+ // return the parsed html-template.
+ return  s_rep;
 }
 
 #endif
diff --git a/reqp.h b/reqp.h
index a3ab4ff..399c751 100755
--- a/reqp.h
+++ b/reqp.h
@@ -1,4 +1,4 @@
-// class reqp declaration. this class parses the client requests.
+// class reqp declaration. this class parses the client requests. 
 
 #ifndef REQP_H
 #define REQP_H
@@ -6,7 +6,7 @@
 #define RQ_GET  1
 #define RQ_POST 2
 
-#include <map>
+#include <map> 
 #include "incl.h"
 #include "thrd.h"
 
@@ -14,35 +14,34 @@ using namespace std;
 
 typedef map<string, string, less<string> > map_string;
 
-class reqp
+class reqp 
 {
 private:
-    static string  HTTP_CODEOK,
-    HTTP_CODENF,
-    HTTP_EXPIRE,
-    HTTP_SERVER,
-    HTTP_CONTAC,
-    HTTP_CACHEC,
-    HTTP_CONNEC,
-    HTTP_COTYPE;
-
-    // returns the request url from thr client's http request header
-    // until the first "?" and stores all request parameter values
-    // ( behind "?" ) into map_params.
-    virtual string get_url( thrd* p_thrd, string s_req, map_string &map_params );
-    // returns a specific value of the client's http request header.
-    // ( s.t. like the User-Agent, Referer etc... ).
-    virtual string get_from_header( string s_req, string s_hdr );
-
-    virtual int htoi( string *s );
+ static string  HTTP_CODEOK,
+ 		HTTP_CODENF,
+ 		HTTP_SERVER,
+ 		HTTP_CONTAC,
+		HTTP_CACHEC,
+ 		HTTP_CONNEC,
+ 		HTTP_COTYPE;
+ 
+ // returns the request url from thr client's http request header
+ // until the first "?" and stores all request parameter values
+ // ( behind "?" ) into map_params. 
+ virtual string get_url( thrd* p_thrd, string s_req, map_string &map_params );
+ // returns a specific value of the client's http request header.
+ // ( s.t. like the User-Agent, Referer etc... ). 
+ virtual string get_from_header( string s_req, string s_hdr ); 
+
+ virtual int htoi( string *s );
 
 public:
-    // public methods.
-    explicit reqp( ); // simple constructor.
-    virtual string parse( thrd* p_thrd, string s_req, map_string &map_params );
-    virtual string url_decode ( string );
-    virtual string get_content_type( string );
-    virtual void parse_headers( string s_req, map_string &map_params );
+ // public methods.
+ explicit reqp( ); // simple constructor.
+ virtual string parse( thrd* p_thrd, string s_req, map_string &map_params ); 
+ virtual string url_decode ( string );
+ virtual string get_content_type( string );
+ virtual void parse_headers( string s_req, map_string &map_params );
 };
 
 #endif
diff --git a/room.cpp b/room.cpp
index 9ded3ac..0e905e6 100755
--- a/room.cpp
+++ b/room.cpp
@@ -8,9 +8,11 @@
 using namespace std;
 
 room::room( string s_name ) : name( s_name )
-{}
+{
+}
 
 room::~room()
-{}
+{
+}
 
 #endif
diff --git a/room.h b/room.h
index 25e94c7..f351b9a 100755
--- a/room.h
+++ b/room.h
@@ -13,22 +13,22 @@ using namespace std;
 class room : public base<user>, public name
 {
 private:
-
+ 
 public:
-    void add_user( user* p_user  )
-    {
-        p_user->set_p_room( this );
-        add_elem( p_user );
-    }
-
-    user* get_user( string &s_name, bool &b_found )
-    {
-        return static_cast<user*>( get_elem( s_name, b_found ) );
-    }
-
-    // public methods:
-    explicit room( string s_name );      // a constructor.
-    ~room();  			       // room destructor.
+ void add_user( user* p_user  )
+ {
+  p_user->set_p_room( this );
+  add_elem( p_user );
+ }
+
+ user* get_user( string &s_name, bool &b_found )
+ {
+  return static_cast<user*>( get_elem( s_name, b_found ) );
+ }
+
+ // public methods: 
+  explicit room( string s_name );      // a constructor.
+ ~room();  			       // room destructor.	
 };
 
 #endif
diff --git a/s_chat.h b/s_chat.h
index fb88a94..4162180 100644
--- a/s_chat.h
+++ b/s_chat.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_chat
+class s_chat 
 {
 private:
-    static chat* obj;
+ static chat* obj; 
 
 public:
-    static void init()
-    {
-        obj = new chat();
-    }
+ static void init()
+ {
+   obj = new chat();
+ }
 
-    static chat& get
-        ()
-    {
-        return *obj;
-    }
+ static chat& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_conf.h b/s_conf.h
index fa252dd..09c4ea7 100644
--- a/s_conf.h
+++ b/s_conf.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_conf
+class s_conf 
 {
 private:
-    static conf* obj;
+ static conf* obj; 
 
 public:
-    static void init()
-    {
-        obj = new conf( CONFILE );
-    }
+ static void init()
+ {
+   obj = new conf( CONFILE );
+ }
 
-    static conf& get
-        ()
-    {
-        return *obj;
-    }
+ static conf& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_html.h b/s_html.h
index 1386f3b..af8297b 100644
--- a/s_html.h
+++ b/s_html.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_html
+class s_html 
 {
 private:
-    static html* obj;
+ static html* obj; 
 
 public:
-    static void init()
-    {
-        obj = new html();
-    }
+ static void init()
+ {
+   obj = new html();
+ }
 
-    static html& get
-        ()
-    {
-        return *obj;
-    }
+ static html& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_lang.h b/s_lang.h
index 3247662..03851b9 100644
--- a/s_lang.h
+++ b/s_lang.h
@@ -5,23 +5,21 @@
 #include "s_conf.h"
 using namespace std;
 
-class s_lang
+class s_lang 
 {
 private:
-    static lang* obj;
+ static lang* obj; 
 
 public:
-    static void init()
-    {
-        obj = new lang( s_conf::get
-                            ().get_val( "LANGUAGE" ) );
-    }
+ static void init()
+ {
+   obj = new lang( s_conf::get().get_val( "LANGUAGE" ) );
+ }
 
-    static lang& get
-        ()
-    {
-        return *obj;
-    }
+ static lang& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_modl.h b/s_modl.h
index e08181c..b5267dd 100644
--- a/s_modl.h
+++ b/s_modl.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_modl
+class s_modl 
 {
 private:
-    static modl* obj;
+ static modl* obj; 
 
 public:
-    static void init()
-    {
-        obj = new modl();
-    }
+ static void init()
+ {
+   obj = new modl();
+ }
 
-    static modl& get
-        ()
-    {
-        return *obj;
-    }
+ static modl& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_mutx.h b/s_mutx.h
index c379bcb..24c0f97 100644
--- a/s_mutx.h
+++ b/s_mutx.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_mutx
+class s_mutx 
 {
 private:
-    static mutx* obj;
+ static mutx* obj; 
 
 public:
-    static void init()
-    {
-        obj = new mutx();
-    }
+ static void init()
+ {
+   obj = new mutx();
+ }
 
-    static mutx& get
-        ()
-    {
-        return *obj;
-    }
+ static mutx& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_sman.h b/s_sman.h
index 9ef5dcc..ff3a7c5 100644
--- a/s_sman.h
+++ b/s_sman.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_sman
+class s_sman 
 {
 private:
-    static sman* obj;
+ static sman* obj; 
 
 public:
-    static void init()
-    {
-        obj = new sman();
-    }
+ static void init()
+ {
+   obj = new sman();
+ }
 
-    static sman& get
-        ()
-    {
-        return *obj;
-    }
+ static sman& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_sock.h b/s_sock.h
index ec32ec3..d570e0c 100644
--- a/s_sock.h
+++ b/s_sock.h
@@ -5,22 +5,21 @@
 
 using namespace std;
 
-class s_sock
+class s_sock 
 {
 private:
-    static sock* obj;
+ static sock* obj; 
 
 public:
-    static void init()
-    {
-        obj = new sock();
-    }
+ static void init()
+ {
+   obj = new sock();
+ }
 
-    static sock& get
-        ()
-    {
-        return *obj;
-    }
+ static sock& get()
+ {
+  return *obj;
+ }
 };
 
 
diff --git a/s_tool.cpp b/s_tool.cpp
index 4400d16..ae6357a 100644
--- a/s_tool.cpp
+++ b/s_tool.cpp
@@ -1,131 +1,111 @@
 #ifndef s_tool_CXX
 #define s_tool_CXX
 
-#include <ctype.h>
+#include <ctype.h> 
 #include <time.h>
 #include "s_tool.h"
 
 bool
 s_tool::is_alpha_numeric( string &s_digit )
 {
-    auto const char *digit = s_digit.c_str();
-    auto int   i_len = strlen( digit );
+ auto const char *digit = s_digit.c_str();
+ auto int   i_len = strlen( digit );
 
-    for( int i=0; i<i_len; i++ )
-    {
-        if ( ! isalnum( *digit ) )
-            return false;
-        digit++;
-    }
+ for( int i=0; i<i_len; i++ )
+ {
+  if ( ! isalnum( *digit ) )
+   return false;
+  digit++;
+ }
 
-    return true;
+ return true;
 }
 string
 s_tool::trim( string s_str )
 {
-    if(s_str.empty())
-        return "";
-    char c_cur=s_str[0];
-    auto int pos=0;
-    // left trim
-    while(c_cur==' ' || c_cur == '\n' || c_cur == '\r')
-    {
-        s_str.erase(pos,1);
-
-        c_cur=s_str[++pos];
-
-    }
-    // right trim
-
-    pos=s_str.size();
-    c_cur=s_str[s_str.size()];
-
-    while(c_cur==' ' || c_cur == '\n' || c_cur == '\0' || c_cur == '\r')
-    {
-        s_str.erase(pos,1);
-        c_cur=s_str[--pos];
-
-    }
-    return s_str;
+        if(s_str.empty())return "";
+        char c_cur=s_str[0];
+        auto int pos=0;
+// left trim
+        while(c_cur==' ' || c_cur == '\n' || c_cur == '\r')
+        {
+                s_str.erase(pos,1);
+
+                c_cur=s_str[++pos];
+
+        }
+// right trim
+
+        pos=s_str.size();
+        c_cur=s_str[s_str.size()];
+
+        while(c_cur==' ' || c_cur == '\n' || c_cur == '\0' || c_cur == '\r')
+        {
+                s_str.erase(pos,1);
+                c_cur=s_str[--pos];
+
+        }
+        return s_str;
 }
 
-string
+string 
 s_tool::getExtension( string s_file )
 {
-    int pos = s_file.find_last_of(".");
-    if(pos != string::npos)
-    {
-        string s_ext=s_file.substr(pos+1, s_file.size()-(pos+1));
-        for(int i = 0;i<s_ext.size();i++)
-            s_ext[i]=toupper(s_ext[i]);
-        return s_ext;
-    }
-    return "";
+	int pos = s_file.find_last_of(".");
+	if(pos != string::npos)
+	{	
+		string s_ext=s_file.substr(pos+1, s_file.size()-(pos+1));
+		for(int i = 0;i<s_ext.size();i++)
+			s_ext[i]=toupper(s_ext[i]);
+		return s_ext;
+	}
+	return "";
 }
 
 int
 s_tool::string2int( string s_digit )
 {
-    auto const char *digit = s_digit.c_str();
-    int result = 0;
-
-    // Convert each digit char and add into result.
-    while (*digit >= '0' && *digit <='9')
-    {
-        result = (result * 10) + (*digit - '0');
-        digit++;
-    }
-
-    // Check that there were no non-digits at end.
-    if (*digit != 0)
-    {
-        return -1;
-    }
-
-    return result;
-}
+ auto const char *digit = s_digit.c_str();
+ int result = 0;
 
-char*
-s_tool::int2string( int i_int )
-{
-    char *buffer = new char[64];
-    sprintf(buffer, "%d", i_int);
-    return buffer;
+ // Convert each digit char and add into result.
+ while (*digit >= '0' && *digit <='9') {
+  result = (result * 10) + (*digit - '0');
+  digit++;
+ }
+
+ // Check that there were no non-digits at end.
+ if (*digit != 0) {
+  return -1;
+ }
+
+ return result;
 }
 
 long
 s_tool::unixtime()
 {
-    return (long) time( NULL );
+ return (long) time( NULL );
 }
 
 
 void
 s_tool::strip_html( string *s_str )
 {
-    auto int i_pos;
-
-    if((i_pos=s_str->find("<",0))==string::npos)
-        return;
-    while(true)
-    {
-
-        s_str->replace(i_pos,1,"&lt;");
-
-        if((i_pos=s_str->find("<",0))==string::npos)
-            return;
-
-    }
-
-
-}
-string
-s_tool::to_lower( string s )
-{
-	string s_tmp("");
-	for(int i=0;i < s.size() ;i++)
-		s_tmp=s_tmp+(char)tolower(s.at(i));
-
-	return s_tmp;
+ auto int i_pos;
+ 
+ if((i_pos=s_str->find("<",0))==string::npos)
+ 	return;
+ while(true)
+ {
+ 	
+	s_str->replace(i_pos,1,"&lt;");
+ 	
+ 	if((i_pos=s_str->find("<",0))==string::npos)
+ 	return;
+ 	 		
+ }  
+
+ 	
 }
 #endif
diff --git a/s_tool.h b/s_tool.h
index 9e336f6..f778c37 100644
--- a/s_tool.h
+++ b/s_tool.h
@@ -1,21 +1,19 @@
 #ifndef s_tool_H
 #define s_tool_H
 
-#include "incl.h"
+#include "incl.h" 
 
 using namespace std;
 
 class s_tool
 {
 public:
-    static bool is_alpha_numeric( string &s_digit );
-    static int  string2int( string s_digit );
-    static char* int2string( int i_int );
-    static string trim( string s_str );
-    static long unixtime();
-    static void strip_html( string *s_str);
-    static string getExtension( string s_file );
-    static string to_lower( string s );
+ static bool is_alpha_numeric( string &s_digit ); 
+ static int  string2int( string s_digit ); 
+ static string trim( string s_str );
+ static long unixtime();
+ static void strip_html( string *s_str);
+ static string getExtension( string s_file );
 };
 
 #endif
diff --git a/sess.cpp b/sess.cpp
index 642d2d0..10c4c8f 100644
--- a/sess.cpp
+++ b/sess.cpp
@@ -4,36 +4,32 @@
 #include "sess.h"
 
 sess::sess( string s_id )
-{
-    this->sess_id=s_id;
+{ 
+	this->sess_id=s_id;
 }
 
-string sess::get_id()
-{
-    return this->sess_id;
-}
+string sess::getId(){ return this->sess_id; }
 
 
-void sess::invalidate()
-{
-    this->sess_id="0";
-    this->sess_values.clear();
+void sess::invalidate() {
+	this->sess_id="0";
+	this->sess_values.clear();
 }
 
 void sess::setValue( string s_key, void *lpvalue )
 {
-    this->sess_values[s_key]=lpvalue;
+	this->sess_values[s_key]=lpvalue;
 }
-void *sess::get_elem( string s_key )
+void *sess::getValue( string s_key )
 {
-    return this->sess_values[s_key];
+	return this->sess_values[s_key];
 }
 string sess::dump()
 {
-    string s_ret=string("Session Dump of Session ") + this->get_id();
-    map<string, void*>::const_iterator it;
-    for(it=this->sess_values.begin();it!=this->sess_values.end();it++)
-        s_ret=s_ret + "\nkey: " + it->first;
-    return s_ret;
+	string s_ret=string("Session Dump of Session ") + this->getId();
+	map<string, void*>::const_iterator it;
+	for(it=this->sess_values.begin();it!=this->sess_values.end();it++)
+		s_ret=s_ret + "\nkey: " + it->first;
+	return s_ret;
 }
 #endif
diff --git a/sess.h b/sess.h
index 684d733..8d7b08e 100644
--- a/sess.h
+++ b/sess.h
@@ -14,15 +14,15 @@ typedef map<string, void *> sess_map;
 class sess : public cont, name
 {
 
-private:
-    sess_map sess_values;
-    string sess_id;
-public:
-    sess(string s_id);
-    string get_id();
-    void setValue(string s_key, void *lpvalue);
-    void *get_elem( string s_key );
-    void invalidate();
-    string dump();
+	private:	
+		sess_map sess_values;
+		string sess_id;
+	public:
+		sess(string s_id);
+		string getId(); 
+		void setValue(string s_key, void *lpvalue);
+		void *getValue( string s_key );
+		void invalidate();
+		string dump();
 };
 #endif
diff --git a/sman.cpp b/sman.cpp
index ab3468a..4c95b32 100644
--- a/sman.cpp
+++ b/sman.cpp
@@ -5,89 +5,44 @@
 
 sman::sman()
 {
-    this->sessions=new hmap<sess *, string>(80);
-    this->session_count=0;
-    pthread_mutex_init( &mut_sessions, NULL );
-    pthread_mutex_init( &mut_session_count, NULL );
+	this->sessions=new hmap<sess *, string>(80);
+	this->sessioncount=0;
 }
 sman::~sman()
 {
-    pthread_mutex_lock( &mut_sessions );
-    delete this->sessions;
-    pthread_mutex_unlock( &mut_sessions );
-
-    pthread_mutex_destroy( &mut_sessions );
-    pthread_mutex_destroy( &mut_session_count );
-}
-string sman::generate_id( int len )
-{
-    string valid_chars=".abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
-    string s_ret="";
-    srand(time(0)+160682);
-    for(int i=0;i<len;i++)
-    {
-        int i_char=rand() % 64;
-        s_ret+=valid_chars[i_char];
-    }
-    return s_ret;
+	delete this->sessions;
 }
-sess *sman::create_session( )
+string sman::generateId( int len )
 {
-    string new_id=this->generate_id( s_tool::string2int( s_conf::get
-                                         ().get_val( "SESSION_LENGTH" ) ) );
-
-    sess *new_sess= new sess( new_id  );
-
-    pthread_mutex_lock( &mut_session_count );
-    this->session_count++;
-#ifdef NCURSES
-    print_sessions();
-#endif
-    pthread_mutex_unlock( &mut_session_count );
-
-    pthread_mutex_lock( &mut_sessions );
-    this->sessions->add_elem( new_sess, new_id );
-    pthread_mutex_unlock( &mut_sessions );
-
-
-    return new_sess;
+	string valid_chars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
+	string s_ret="";
+	srand(time(0)+160682);
+	for(int i=0;i<len;i++)
+	{
+		int i_char=rand() % 64;
+		s_ret+=valid_chars[i_char];
+	}
+	return s_ret;
 }
-
-sess *sman::get_session( string s_id )
+sess *sman::createSession( )
 {
-    pthread_mutex_lock( &mut_sessions );
-    sess *ret_sess = this->sessions->get_elem( s_id );
-    pthread_mutex_unlock( &mut_sessions );
+	string new_id=this->generateId(s_tool::string2int( s_conf::get().get_val( "SESSION_LENGTH" ) ) ); 
 
-    return ret_sess;
-}
-void sman::destroy_session( string s_id )
-{
-    pthread_mutex_lock( &mut_session_count );
-    this->session_count--;
-#ifdef NCURSES
-    print_sessions();
-#endif
-    pthread_mutex_unlock( &mut_session_count );
+	sess *new_sess= new sess( new_id  );
 
-    this->sessions->del_elem( s_id );
+	this->sessioncount++;
+	this->sessions->add_elem( new_sess, new_id );
+	
+	return new_sess;
 }
 
-#ifdef NCURSES
-void sman::print_sessions()
+sess *sman::getSession( string s_id )
 {
-    pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
-    mvprintw( NCUR_SESSION_X,NCUR_SESSION_Y, "Sessions: %d ", session_count);
-    refresh();
-    pthread_mutex_unlock( &s_mutx::get().mut_stdout );
+	return this->sessions->get_elem( s_id );
 }
-
-void sman::print_init_ncurses()
+void sman::destroySession( string s_id )
 {
-    pthread_mutex_lock( &mut_session_count );
-    print_sessions();
-    pthread_mutex_unlock( &mut_session_count );
+	this->sessioncount--;
+	this->sessions->del_elem( s_id );
 }
-
-#endif
 #endif
diff --git a/sman.h b/sman.h
index 5d32248..336bdf1 100644
--- a/sman.h
+++ b/sman.h
@@ -4,40 +4,27 @@
 #include "incl.h"
 #include "hmap.h"
 #include "sess.h"
-#include "s_mutx.h"
-#include "s_ncur.h"
 #include "s_tool.h"
 #include "s_conf.h"
 #include <cstdlib>
 
 using namespace std;
 
-class sman
-{
-private:
-    hmap<sess *, string> *sessions;
-    string generate_id( int len );
-    int session_count;
-
-    pthread_mutex_t mut_sessions;
-    pthread_mutex_t mut_session_count;
-#ifdef NCURSES
-    void print_sessions();
-#endif
+class sman{
+
+	private:
+		hmap<sess *, string> *sessions;
+		string generateId( int len );
+		int sessioncount;	
+	public:
+		sman();
+		~sman();
+		sess *getSession( string s_id );
+		int getSessionCount( ) { return this->sessioncount; }
+		sess *createSession( );
+		void destroySession( string s_id );
+
 
-public:
-    sman();
-    ~sman();
-    sess *get_session( string s_id );
-    int get_session_count( )
-    {
-        return this->session_count;
-    }
-    sess *create_session( );
-    void destroy_session( string s_id );
-#ifdef NCURSES
-    void print_init_ncurses();
-#endif
 };
 
 
diff --git a/sock.cpp b/sock.cpp
index 5d64367..fb041fb 100755
--- a/sock.cpp
+++ b/sock.cpp
@@ -9,12 +9,10 @@
 #include "sock.h"
 #include "s_chat.h"
 #include "s_conf.h"
+#include "s_mutx.h"
 #include "s_tool.h"
 #include "s_lang.h"
 #include "s_sman.h"
-#include "s_mman.h"
-#include "s_mutx.h"
-#include "s_ncur.h"
 #include "chat.h"
 #include "user.h"
 
@@ -22,373 +20,219 @@ using namespace std;
 
 sock::sock()
 {
-    this->b_run      = true;
-    this->i_req      = 0;
-    this->i_threads  = 2; // currently there are 2 threads running ( admin interface + server listening );
-    this->req_parser = new reqp();
-    this->thrd_pool  = new pool();
-    this->log_daemon = new logd(s_conf::get
-                                    ().get_val( "ACCESS_LOG" ));
-
-
-    pthread_mutex_init( &mut_threads, NULL );
-}
-
-sock::~sock()
-{
-    pthread_mutex_destroy( &mut_threads );
+ this->b_run      = true;
+ this->i_req      = 0;
+ this->req_parser = new reqp();
+ this->thrd_pool  = new pool();
+ this->log_daemon = new logd(s_conf::get().get_val( "ACCESS_LOG" ));
 }
 
 void
 sock::chat_stream( int i_sock, user* p_user, map_string &map_params )
 {
-    string s_msg( "\n" );
-
-
-    for ( int i = 0; i < PUSHSTR; i++ )
-        send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
+ string s_msg( "\n" );
 
-    do
-    {
-        pthread_mutex_lock  ( &(p_user->mut_message) );
-        s_msg = p_user->get_mess( );
-        if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) )
-            p_user->set_online( false );
-        pthread_cond_wait( &(p_user->cond_message), &(p_user->mut_message) );
-    }
-    while( p_user->get_online() );
+ pthread_mutex_lock  ( &(p_user->mut_message) );
 
-    // if there is still a message to send:
-    s_msg = p_user->get_mess( );
-    if ( ! s_msg.empty() )
-        send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
+ for ( int i = 0; i < PUSHSTR; i++ )
+  send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
 
-    pthread_mutex_unlock( &(p_user->mut_message) );
+ do
+ {
+  s_msg = p_user->get_mess( );
+  if ( 0 > send( i_sock, s_msg.c_str(), s_msg.size(), 0 ) )
+   p_user->set_online( false );
+  pthread_cond_wait( &(p_user->cond_message), &(p_user->mut_message) );
+ } 
+ while( p_user->get_online() );
 
-    // remove the user from its room.
-    string s_user( p_user->get_name() );
-    p_user->get_room()->del_elem( s_user );
+ // if there is still a message to send: 
+ s_msg = p_user->get_mess( );
+ if ( ! s_msg.empty() )
+  send( i_sock, s_msg.c_str(), s_msg.size(), 0 );
 
-#ifdef NCURSES
+ pthread_mutex_unlock( &(p_user->mut_message) );
 
-    {
-        string s_tmp( REMUSER );
-        s_tmp.append( s_user );
-        s_ncur::get
-            ().print( s_tmp.c_str() );
-    }
-#endif
-    // post the room that the user has left the chat.
-    p_user->get_room()->msg_post( new string( p_user->get_colored_name().append( s_lang::get
-                                      ().get_val( "USERLEAV" ) ) ) );
-    s_sman::get
-        ().destroy_session( p_user->get_id() );
+ // remove the user from its room.
+ string s_user( p_user->get_name() );
+ p_user->get_p_room()->del_elem( s_user );
 
-#ifdef NCURSES
-    {
-        string s_tmp( SESSION );
-        s_tmp.append( s_tool::int2string( s_sman::get
-                                              ().get_session_count() ) );
-        s_ncur::get
-            ().print( s_tmp );
-    }
-#endif
-#ifdef VERBOSE
-  //  cout << REMUSER << s_user << endl
-  //       << SESSION << s_man::get().get_session_count() << endl;
-        
-#endif
+ // post the room that the user has left the chat.
+ p_user->get_p_room()->msg_post( new string( p_user->get_name().append( s_lang::get().get_val( "USERLEAV" ) ) ) );  
+ s_sman::get().destroySession( p_user->get_id() );
+ #ifdef VERBOSE
+	cout << s_user << " left | SessionCount: " << s_sman::get().getSessionCount() << endl;
+ #endif
 
-    p_user->~user();
+ p_user->~user();
 }
 
 int
 sock::make_socket( uint16_t i_port )
 {
-    int sock;
-    struct sockaddr_in name;
-
-    // create the server socket.
-    sock = socket (PF_INET, SOCK_STREAM, 0);
-    if (sock < 0)
-    {
-
-#ifdef NCURSES
-        s_ncur::get
-            ().print( SOCKERR );
-#endif
-
-        if ( ++i_port > MAXPORT )
-            exit(-1);
+ int sock;
+ struct sockaddr_in name;
 
-#ifdef NCURSES
+ // create the server socket.
+ sock = socket (PF_INET, SOCK_STREAM, 0);
+ if (sock < 0)
+ {
+  cerr << "Sock: socket error" << endl;
 
-        s_ncur::get
-            ().print( SOCKERR );
-#endif
-
-        return make_socket( i_port );
-    }
-
-    // give the server socket a name.
-    name.sin_family = AF_INET;
-    name.sin_port = htons (i_port);
-    name.sin_addr.s_addr = htonl (INADDR_ANY);
-    int optval=1;
-
-    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(int));
-
-    if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0)
-    {
-
-#ifdef NCURSES
-        s_ncur::get
-            ().print( BINDERR );
-#endif
+  if ( ++i_port > MAXPORT )
+   exit(-1);
 
-        if ( ++i_port > MAXPORT )
-            exit(-1);
+  cerr << SOCKERR << i_port << endl;
+  return make_socket( i_port );
+ }
 
-#ifdef SERVMSG
+ // give the server socket a name.
+ name.sin_family = AF_INET;
+ name.sin_port = htons (i_port);
+ name.sin_addr.s_addr = htonl (INADDR_ANY);
+ int optval=1;
 
-        cout << SOCKERR << i_port << endl;
-#endif
-#ifdef NCURSES
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(int));
 
-        s_ncur::get
-            ().print( SOCKERR );
-#endif
+ if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0)
+ {
+  cerr << "Sock: bind error" << endl;
 
-        return make_socket( i_port );
-    }
+  if ( ++i_port > MAXPORT )
+   exit(-1);
 
-#ifdef VERBOSE
-    cout << SOCKCRT << "localhost:" << i_port << endl;
-#endif
-#ifdef NCURSES
-
-    string s_tmp( SOCKCRT );
-    s_tmp.append( "localhost:" );
-    s_tmp.append( s_tool::int2string(i_port) );
-    s_ncur::get
-        ().print( s_tmp );
-    mvprintw( NCUR_PORT_X,NCUR_PORT_Y, "Port: %d ", i_port);
-    refresh();
-#endif
+  cout << SOCKERR << i_port << endl;
+  return make_socket( i_port );
+ }
 
-    return sock;
+ return sock;
 }
 
 int
 sock::read_write( thrd* p_thrd, int i_sock )
 {
-    char c_req[2048];
-
-    int i_bytes;
-    i_bytes = read (i_sock, c_req, 2048);
-
-    if (i_bytes < 0)
-    {
-#ifdef NCURSES
-        s_ncur::get
-            ().print( new string( READERR ) );
-#endif
+ char c_req[2048];
 
-    }
-    else
-    {
-        // stores the request params.
-        map_string map_params;
+ int i_bytes;
+ i_bytes = read (i_sock, c_req, 2048);
 
-        // get the s_rep ( s_html response which will be send imediatly to the client
-        // and fill map_params with request values.
-        auto string s_temp=(string)c_req;
-        struct sockaddr_in client;
-        size_t size=sizeof(client);
+ if (i_bytes < 0)
+ {
+  cerr << "Sock: read error " << endl;
+ }
 
-        getpeername( i_sock, (struct sockaddr *)&client, &size);
+ else
+ {
+  // stores the request params.
+  map_string map_params; 
 
-        map_params["REMOTE_ADDR"]=inet_ntoa(client.sin_addr);
-        map_params["REMOTE_PORT"]=ntohs( client.sin_port);
+  // get the s_rep ( s_html response which will be send imediatly to the client
+  // and fill map_params with request values. 
+  auto string s_temp=(string)c_req;
+  struct sockaddr_in client;
+  size_t size=sizeof(client);
 
+  getpeername( i_sock, (struct sockaddr *)&client, &size);
+  
+  map_params["REMOTE_ADDR"]=inet_ntoa(client.sin_addr);
+  map_params["REMOTE_PORT"]=ntohs( client.sin_port);
 
-        string s_rep = req_parser->parse( p_thrd, string( c_req ), map_params );
-        // send s_rep to the client.
-        log_daemon->log(map_params);
 
-        send( i_sock, s_rep.c_str(), s_rep.size(), 0 );
+  string s_rep = req_parser->parse( p_thrd, string( c_req ), map_params );
+  // send s_rep to the client.
+  log_daemon->log(map_params);
 
-        // dont need those vals anymore.
-        map_params.clear();
+  send( i_sock, s_rep.c_str(), s_rep.size(), 0 );
 
-        return 0;
-    }
+  // dont need those vals anymore. 
+  map_params.clear();
 
-    return -1;
+  return 0;
+ }
+ 
+ return -1;
 }
 
 int
 sock::start()
 {
-#ifdef NCURSES
-    s_ncur::get
-        ().print( STARTMS );
-    print_hits();
-    print_threads();
-#endif
+ auto int i_port   = s_tool::string2int( s_conf::get().get_val( "SRVRPORT" ) );
 
-    auto int i_port = s_tool::string2int( s_conf::get
-                                              ().get_val( "SRVRPORT" ) );
-
-    int sock;
-    fd_set active_fd_set, read_fd_set;
-    int i;
-    struct sockaddr_in clientname;
-    size_t size;
-
-
-    // create the server socket and set it up to accept connections.
-    sock = make_socket ( i_port );
-
-    if (listen (sock, 1) < 0)
-    {
-#ifdef NCURSES
-        s_ncur::get
-            ().print( LISTERR );
-#endif
-
-        exit( EXIT_FAILURE );
-    }
+ int sock;
+ fd_set active_fd_set, read_fd_set;
+ int i;
+ struct sockaddr_in clientname;
+ size_t size;
 
 #ifdef VERBOSE
-    cout << SOCKRDY << endl;
+ cout << SOCKCRT << "localhost:" << i_port << endl;
 #endif
-#ifdef NCURSES
 
-    s_ncur::get
-        ().print( SOCKRDY );
-#endif
+ // create the server socket and set it up to accept connections.
+ sock = make_socket ( i_port );
 
-    // initialize the set of active sockets.
-    FD_ZERO (&active_fd_set);
-    FD_SET  (sock, &active_fd_set);
+ if (listen (sock, 1) < 0)
+ {
+  cerr << "Sock: listen error" << endl;
+  exit( EXIT_FAILURE );
+ }
 
-    while( b_run )
+#ifdef VERBOSE
+ cout << SOCKRDY << endl;
+#endif
+
+ // initialize the set of active sockets. 
+ FD_ZERO (&active_fd_set);
+ FD_SET  (sock, &active_fd_set);
+
+ while( b_run )
+ {
+  // block until input arrives on one or more active sockets.
+  read_fd_set = active_fd_set;
+  if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0)
+  {
+   cerr << "Sock: select error" << endl;
+   exit( EXIT_FAILURE );
+  }
+
+  // service all the sockets with input pending. 
+  for ( i = 0; i < FD_SETSIZE; i++ )
+   if ( FD_ISSET (i, &read_fd_set) )
+   {
+    if ( i == sock )
     {
-        // block until input arrives on one or more active sockets.
-        read_fd_set = active_fd_set;
-        if (select (FD_SETSIZE, &read_fd_set, NULL, NULL, NULL) < 0)
-        {
-
-#ifdef NCURSES
-            s_ncur::get
-                ().print( SELCERR );
-#endif
-
-            exit( EXIT_FAILURE );
-        }
+     // connection request on original socket.
+     i_req++;
+     int new_sock;
+     size = sizeof (clientname);
+     new_sock = accept (sock,
+                        (struct sockaddr *) &clientname,
+                        &size);
+
+     if (new_sock < 0)
+     {
+      cerr << "Sock: accept error" << endl;
+      close ( new_sock );
+     }
 
-        // service all the sockets with input pending.
-        for ( i = 0; i < FD_SETSIZE; i++ )
-            if ( FD_ISSET (i, &read_fd_set) )
-            {
-                if ( i == sock )
-                {
-                    // connection request on original socket.
-                    i_req++;
-#ifdef NCURSES
-
-                    print_hits();
-#endif
-
-                    int new_sock;
-                    size = sizeof (clientname);
-                    new_sock = accept (sock,
-                                       (struct sockaddr *) &clientname,
-                                       &size);
-
-                    if (new_sock < 0)
-                    {
-
-#ifdef NCURSES
-                        s_ncur::get
-                            ().print( ACCPERR);
-#endif
-
-                        close ( new_sock );
-			
-                    }
-		
-                    else	
-		    {
 #ifdef VERBOSE
-                     cout << NEWREQU << i_req << " "
-                     << inet_ntoa( clientname.sin_addr )
-                     << ":"
-                     << ntohs    ( clientname.sin_port )
-                     << endl;
-#endif
-                     FD_SET (new_sock, &active_fd_set);
-                    }
-                }
-
-                else
-                {
-
-#ifdef NCURSES
-                    ///  s_ncur::get().print( NEWREQU );
-#endif
-
-                    thrd_pool->run( (void*) new thrd( i ) );
-                    FD_CLR( i, &active_fd_set );
-                }
-            }
+     cout << CONNECT << i_req << " "  
+          << inet_ntoa( clientname.sin_addr )
+          << ":"
+          << ntohs    ( clientname.sin_port )
+          << endl;
+#endif
+ 
+      FD_SET (new_sock, &active_fd_set);
     }
-}
-
-void
-sock::increase_num_threads()
-{
-    pthread_mutex_lock( &mut_threads );
-    i_threads++;
-    pthread_mutex_unlock( &mut_threads );
-#ifdef NCURSES
-    print_threads();
-#endif
-
-}
-
-void
-sock::decrease_num_threads()
-{
-    pthread_mutex_lock( &mut_threads );
-    i_threads--;
-    pthread_mutex_unlock( &mut_threads );
-
-#ifdef NCURSES
-    print_threads();
-#endif
 
+    else
+    {
+      thrd_pool->run( (void*) new thrd( i ) );
+      FD_CLR( i, &active_fd_set );
+    }
+   }
+ }
 }
 
-#ifdef NCURSES
-void
-sock::print_threads()
-{
-    pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
-    mvprintw( NCUR_THREADS_X,NCUR_THREADS_Y, "Threads: %d ", i_threads);
-    refresh();
-    pthread_mutex_unlock( &s_mutx::get().mut_stdout );
-}
-
-void
-sock::print_hits()
-{
-    pthread_mutex_lock  ( &s_mutx::get().mut_stdout );
-    mvprintw( NCUR_HITS_X,NCUR_HITS_Y, "Hits: %d ", i_req);
-    refresh();
-    pthread_mutex_unlock( &s_mutx::get().mut_stdout );
-}
-#endif
-
 #endif
diff --git a/sock.h b/sock.h
index 73656aa..ea695c4 100755
--- a/sock.h
+++ b/sock.h
@@ -22,52 +22,31 @@
 #include "logd.h"
 using namespace std;
 
-class sock
+class sock 
 {
 private:
-    // total number of server requests.
-    unsigned long long int i_req;
+ // total number of server requests. 
+ unsigned long long int i_req; 
 
-    bool  b_run;      // true while socket manager is running.
-    reqp* req_parser; // parses the http requests from clients.
-    pool* thrd_pool;  // the thread pool.
-    logd* log_daemon; // the log daemon
-    char* c_buffer;   // char buffer!
-
-    int   i_threads;     // total amount of threads inside the thread pool.
-    pthread_mutex_t mut_threads;
-    pthread_mutex_t mut_hits;
-
-    // creates a server socket.
-    virtual int make_socket( uint16_t port );
+ bool  b_run;      // true while socket manager is running.
+ reqp* req_parser; // parses the http requests from clients.
+ pool* thrd_pool;  // the thread pool.
+ logd* log_daemon; // the log daemon
+ // creates a server socket.
+ virtual int make_socket( uint16_t port );
 
 public:
-    // small inline methods:
-    bool get_run() const
-    {
-        return b_run;
-    }
-    bool set_run( bool b_run )
-    {
-        this->b_run = b_run;
-    }
-
-    // public methods.
-    explicit sock( ); // simple constructor.
-    ~sock( );
-    virtual int  read_write( thrd* p_thrd, int filedes   );
-    virtual int  start();
+ // small inline methods:
+ bool get_run() const { return b_run; }
+ bool set_run( bool b_run ) { this->b_run = b_run; }
 
-    // the chat stream there all the chat messages will sent through.
-    static void chat_stream( int i_sock, user* p_user, map_string &map_params );
+ // public methods.
+ explicit sock( ); // simple constructor.
+ virtual int  read_write( thrd* p_thrd, int filedes   );
+ virtual int  start();
 
-    void increase_num_threads();
-    void decrease_num_threads();
-#ifdef NCURSES
-
-    void print_threads();
-    void print_hits();
-#endif
+ // the chat stream there all the chat messages will sent through.
+ static void chat_stream( int i_sock, user* p_user, map_string &map_params );
 
 };
 
diff --git a/thrd.cpp b/thrd.cpp
index b36099c..4bac39e 100755
--- a/thrd.cpp
+++ b/thrd.cpp
@@ -10,20 +10,19 @@ using namespace std;
 
 thrd::thrd( int i_sock )
 {
-    this->i_sock = i_sock;
+ this->i_sock = i_sock;
 }
 
 thrd::~thrd()
 {
-    shutdown ( get_sock() , 2 );
-    close    ( get_sock()     );
+  shutdown ( get_sock() , 2 );
+  close    ( get_sock()     );
 }
 
 void
 thrd::run()
 {
-    s_sock::get
-        ().read_write( this, i_sock );
+ s_sock::get().read_write( this, i_sock );
 }
 
 #endif
diff --git a/thrd.h b/thrd.h
index a01ed86..fecdb49 100755
--- a/thrd.h
+++ b/thrd.h
@@ -7,23 +7,20 @@
 
 using namespace std;
 
-class thrd
+class thrd 
 {
 private:
-    int       i_sock;
+ int       i_sock;
 
 public:
 
-    // small inline methods:
-    int get_sock()
-    {
-        return i_sock;
-    }
+ // small inline methods:
+ int get_sock() { return i_sock; }
 
-    // public methods:
-    explicit thrd( int i_sock );
-    ~thrd();                     // destructor.
-    virtual void run();
+ // public methods: 
+ explicit thrd( int i_sock );
+ ~thrd();                     // destructor. 
+ virtual void run();
 };
 
 #endif
diff --git a/todo.txt b/todo.txt
index a91db42..7e43eb2 100755
--- a/todo.txt
+++ b/todo.txt
@@ -1,39 +1,11 @@
 BRAIN-STORMING:
 
-bugfixes ( see known bugs ).
-rewrite html::online_list as a dynmod mods/html/yc_online_list.so
-add password nick protection
-add superuser privileges
-add libmysqlclient and ncurses test to the configure script
-completion of the admin ncurses interface.
-user profiles
-security: crypto
-more modules: commands etc..
-irc support
-icq support
+mysql
+security: tempid and crypto
+commands
 hash_map []-operator
 hash_map in cont
-several different html templates
-each user should be able to select his favourite html style
-each user should be able to select his favourite system language
-makefile as a replacement of mods/compile.sh
-kqueue @ freebsd
-dynamic thread pool
-offline messages ( memos )
-The sanction of  HTML tags from the list of the superuser
-
-
-
+several different html templatetes
 
 10: bugfixes
 20: goto 10
-
-Linux bugs:
-- No bugs which only appear on Linux.
-
-FreeBSD bugs:
-- No bugs which only appear on FreeBSD.
-
-Bugs wich appear on both, Linux and FreeBSD:
-- some user do not log out automaticaly ( we have to implement an activity counter ).
-- Segmentation fault if another room is created. multi room usage has not been tested yet but should work without big modifications. 
diff --git a/user.cpp b/user.cpp
index 94d4496..4cda685 100755
--- a/user.cpp
+++ b/user.cpp
@@ -12,301 +12,159 @@ using namespace std;
 
 user::user( string s_name ) : name( s_name )
 {
-    this -> b_online = true;
-    this -> l_time   = s_tool::unixtime();
-    this -> s_col1   = s_conf::get
-                           ().get_val( "USERCOL1" );
-    this -> s_col2   = s_conf::get
-                           ().get_val( "USERCOL2" );
-    map_mods = new hmap<dynmod*,string>(80);
+ this -> b_online = true; 
+ this -> l_time   = s_tool::unixtime();
+ this -> s_col1   = s_conf::get().get_val( "USERCOL1" );
 
-    pthread_mutex_init( &mut_b_online, NULL);
-    pthread_mutex_init( &mut_i_sock  , NULL);
-    pthread_mutex_init( &mut_l_time  , NULL);
-    pthread_mutex_init( &mut_p_room  , NULL);
-    pthread_mutex_init( &mut_s_mess  , NULL);
-    pthread_cond_init ( &cond_message, NULL);
-    pthread_mutex_init( &mut_message , NULL);
-    pthread_mutex_init( &mut_map_mods, NULL );
-    pthread_mutex_init( &mut_s_col1, NULL );
-    pthread_mutex_init( &mut_s_col2, NULL );
-    pthread_mutex_init( &mut_s_id, NULL );
-    pthread_mutex_init( &mut_r_rang, NULL );
+ pthread_mutex_init( &mut_b_online, NULL);
+ pthread_mutex_init( &mut_i_sock  , NULL);
+ pthread_mutex_init( &mut_l_time  , NULL);
+ pthread_mutex_init( &mut_p_room  , NULL);
+ pthread_mutex_init( &mut_s_mess  , NULL);
+ pthread_cond_init ( &cond_message, NULL);
+ pthread_mutex_init( &mut_message , NULL);
 }
 
 user::~user()
 {
-    pthread_mutex_destroy( &mut_b_online );
-    pthread_mutex_destroy( &mut_i_sock   );
-    pthread_mutex_destroy( &mut_l_time   );
-    pthread_mutex_destroy( &mut_p_room   );
-    pthread_mutex_destroy( &mut_s_mess   );
-    pthread_cond_destroy ( &cond_message );
-    pthread_mutex_destroy( &mut_message  );
-    pthread_mutex_destroy( &mut_s_col1   );
-    pthread_mutex_destroy( &mut_s_col2   );
-    pthread_mutex_destroy( &mut_s_id     );
-    pthread_mutex_destroy( &mut_r_rang   );
-}
-
-string
-user::get_colored_name()
-{
- return "<font color=\"#" + get_col1() + "\">" + get_name() + "</font>";
+ pthread_mutex_destroy( &mut_b_online );
+ pthread_mutex_destroy( &mut_i_sock   );
+ pthread_mutex_destroy( &mut_l_time   );
+ pthread_mutex_destroy( &mut_p_room   );
+ pthread_mutex_destroy( &mut_s_mess   );
+ pthread_cond_destroy ( &cond_message );
+ pthread_mutex_destroy( &mut_message  );
 }
 
 void
 user::get_data( map_string *p_map_data )
 {
-    string s_req = (*p_map_data)["!get"];
+ string s_req = (*p_map_data)["!get"];
 
-    // get the nick and the color of the user.
-    if ( s_req == "nick" )
-        (*p_map_data)[get_name()] = get_col1();
+ // get the nick and the color of the user.
+ if ( s_req == "nick" )
+  (*p_map_data)[get_name()] = get_col1();
 }
 
 string
 user::get_mess( )
 {
-    pthread_mutex_lock  ( &mut_s_mess );
-    string s_ret = s_mess;
-    s_mess = "";
-    pthread_mutex_unlock( &mut_s_mess );
-    return s_ret;
+ string s_ret( "" );
+ pthread_mutex_lock  ( &mut_s_mess );
+ s_ret.append( s_mess );
+ s_mess = *new string("");
+ pthread_mutex_unlock( &mut_s_mess );
+
+ return s_ret;
 }
 
 bool
 user::get_online( )
 {
-    bool b_ret;
-    pthread_mutex_lock  ( &mut_b_online );
-    b_ret = b_online;
-    pthread_mutex_unlock( &mut_b_online );
-    return b_ret;
+ bool b_ret; 
+ pthread_mutex_lock  ( &mut_b_online );
+ b_ret = b_online; 
+ pthread_mutex_unlock( &mut_b_online );
+ return b_ret;
 }
 
 void
 user::set_online( bool b_online )
 {
-    pthread_mutex_lock  ( &mut_b_online );
-    this -> b_online = b_online;
-    pthread_mutex_unlock( &mut_b_online );
+ pthread_mutex_lock  ( &mut_b_online );
+ this -> b_online = b_online; 
+ pthread_mutex_unlock( &mut_b_online );
 }
 
 room*
-user::get_room( )
+user::get_p_room( )
 {
-    room* p_return;
-    pthread_mutex_lock  ( &mut_p_room );
-    p_return = p_room;
-    pthread_mutex_unlock( &mut_p_room );
-    return p_return;
+ room* p_return;
+ pthread_mutex_lock  ( &mut_p_room );
+ p_return = p_room;
+ pthread_mutex_unlock( &mut_p_room );
+ return p_return;
 }
 
 void
 user::set_p_room( room* p_room )
 {
-    pthread_mutex_lock  ( &mut_p_room );
-    this -> p_room = p_room;
-    pthread_mutex_unlock( &mut_p_room );
+ pthread_mutex_lock  ( &mut_p_room );
+ this -> p_room = p_room;
+ pthread_mutex_unlock( &mut_p_room );
 }
 
 int
 user::get_sock( )
 {
-    int i_ret;
-    pthread_mutex_lock  ( &mut_i_sock );
-    i_ret = i_sock;
-    pthread_mutex_unlock( &mut_i_sock );
-    return i_ret;
+ int i_ret;
+ pthread_mutex_lock  ( &mut_i_sock );
+ i_ret = i_sock;
+ pthread_mutex_unlock( &mut_i_sock );
+ return i_ret;
 }
 
 void
 user::set_sock( int i_sock )
 {
-    pthread_mutex_lock  ( &mut_i_sock );
-    this -> i_sock = i_sock;
-    pthread_mutex_unlock( &mut_i_sock );
-}
-
-string
-user::get_col1()
-{
-    string s_ret;
-    pthread_mutex_lock  ( &mut_s_col1 );
-    s_ret = s_col1;
-    pthread_mutex_unlock( &mut_s_col1 );
-    return s_ret;
-}
-
-string
-user::get_col2()
-{
-    string s_ret;
-    pthread_mutex_lock  ( &mut_s_col2 );
-    s_ret = s_col2;
-    pthread_mutex_unlock( &mut_s_col2 );
-    return s_ret;
-}
-
-string
-user::get_id()
-{
-    string s_ret;
-    pthread_mutex_lock  ( &mut_s_id );
-    s_ret = s_id;
-    pthread_mutex_unlock( &mut_s_id );
-    return s_ret;
-}
-
-void
-user::set_id    ( string s_id   )
-{
-    pthread_mutex_lock  ( &mut_s_id );
-    this -> s_id = s_id;
-    pthread_mutex_unlock( &mut_s_id );
-}
-
-void
-user::set_col1  ( string s_col1 )
-{
-    pthread_mutex_lock  ( &mut_s_col1 );
-    this -> s_col1 = s_col1;
-    pthread_mutex_unlock( &mut_s_col1 );
-}
-
-void
-user::set_col2  ( string s_col2 )
-{
-    pthread_mutex_lock  ( &mut_s_col2 );
-    this -> s_col2 = s_col2;
-    pthread_mutex_unlock( &mut_s_col2 );
-}
-
-rang
-user::get_rang  ( )
-{
-    rang r_ret;
-    pthread_mutex_lock  ( &mut_r_rang );
-    r_ret = r_rang;
-    pthread_mutex_unlock(&mut_r_rang );
-    return  r_ret;
-}
-
-void
-user::set_rang  ( rang   r_rang )
-{
-    pthread_mutex_lock  ( &mut_r_rang );
-    r_oldr = this -> r_rang;
-    this -> r_rang = r_rang;
-    pthread_mutex_unlock( &mut_r_rang );
-}
-
-bool
-user::new_msgs  ( )
-{
-    pthread_mutex_lock  ( &mut_s_mess );
-    return s_mess.empty();
-    pthread_mutex_unlock( &mut_s_mess );
+ pthread_mutex_lock  ( &mut_i_sock );
+ this -> i_sock = i_sock;
+ pthread_mutex_unlock( &mut_i_sock );
 }
 
 void
 user::command( string &s_command )
 {
 
-    auto unsigned int pos = s_command.find( "/" );
-    auto unsigned int pos2 = s_command.find( " " );
-    if( pos != string::npos )
-    {
-        s_command.replace( pos, 1, "" );
-    }
-    else
-        return;
-
-
-    if(pos2==string::npos)
-        pos2=s_command.size()+1;
-
-    string s_mod( "mods/commands/yc_" );
-    string s_command2=s_command.substr(0, pos2-1);
-    s_mod.append( s_command2  ).append( ".so" );
-
-    dynmod *mod = s_modl::get
-                      ().get_module( s_mod );
-
-    if ( mod == NULL )
-    {
-        msg_post( new string( s_lang::get
-                                  ().get_val( "ERRORCMD" ) ) );
-        return;
-    }
-
-    vector<string> params;
-    string *ptr_command;
+ auto unsigned int pos = s_command.find( "/" );
+ while( pos != string::npos )
+ {
+  s_command.replace( pos, 1, "" );
+  pos = s_command.find( "/" ); 
+ }
+ 
+ string s_mod( "cmnd/yc_" );
+ s_mod.append( s_command  ).append( ".so" );
 
-    // execute the module.
-    if(s_command.find(" ")!=string::npos)
-    {
-        s_command=s_command.substr(s_command2.size()+1);
-        ptr_command=new string(s_command);
+ dynmod *mod = s_modl::get().get_module( s_mod );
 
-        pos=s_command.find(" ");
-        pos2=0;
-
-        while(pos != string::npos)
-        {
-            string sParam=s_command.substr(pos2,pos - pos2);
-            params.push_back(sParam);
-            pos2=pos+1;
-            pos=s_command.find(" ", pos2);
-        }
-
-        if(pos2<s_command.size())
-            params.push_back(s_command.substr(pos2, s_command.size()-pos2));
-
-    }
-    else
-    {
-        ptr_command=new string("");
-    }
-
-    container *c = new container;
-    c->elem[0]=(void*) ptr_command;
-    c->elem[1]=(void*) this;
-    c->elem[2]=(void*) &params;
-    c->elem[3]=(void*) &s_conf::get();
-
-    ( *(mod->the_func) ) ( (void*) c );
+ if ( mod == NULL ) 
+ {
+  msg_post( new string( s_lang::get().get_val( "ERRORCMD" ) ) ); 
+  return;
+ }
 
+ // execute the module.
+ ( *(mod->the_func) ) ( (void*) this );
 }
 
 void
 user::renew_stamp( )
 {
-    pthread_mutex_lock  ( &mut_l_time );
-    l_time = s_tool::unixtime();
-    pthread_mutex_unlock( &mut_l_time );
+ pthread_mutex_lock  ( &mut_l_time );
+ l_time = s_tool::unixtime();
+ pthread_mutex_unlock( &mut_l_time );
 }
 
 void
 user::msg_post( string *p_msg )
 {
-    pthread_mutex_lock  ( &mut_s_mess );
-    s_mess.append( *p_msg );
-    pthread_mutex_unlock( &mut_s_mess );
+ pthread_mutex_lock  ( &mut_s_mess );
+ s_mess.append( *p_msg );
+ pthread_mutex_unlock( &mut_s_mess );
 
-    pthread_cond_signal( &cond_message );
+ pthread_cond_signal( &cond_message );
 }
 
 void
 user::get_user_list( string &s_list, string &s_seperator )
 {
-    s_list.append( "<font color=\"" )
-    .append( get_col1()       )
-    .append( "\">"            )
-    .append( get_name()       )
-    .append( "</font>\n"      )
-    .append( s_seperator      );
-
+ s_list.append( "<font color=\"" )
+       .append( get_col1()       )
+       .append( "\">"            )
+       .append( get_name()       )
+       .append( "</font>\n"      )
+       .append( s_seperator      );
+   
 }
 #endif
diff --git a/user.h b/user.h
index 54f4690..75be662 100755
--- a/user.h
+++ b/user.h
@@ -13,80 +13,72 @@ class room;
 class user : public name
 {
 private:
-    // private members:
-    bool   b_away;   // true if user is away.
-    bool   b_online; // true if user is online.
-    int    i_sock;   // user's stream socket descriptor.
-    long   l_time;   // user's last activity time.
-    rang   r_rang;   // user's rang ( see enum rang @ globals.h ).
-    rang   r_oldr;   // user's previous rang.
-    string s_id;
-    string s_agnt;   // user's http user agent.
-    string s_away;   // user's last away message.
-    string s_col1;   // user's nick color.
-    string s_col2;   // user's text color.
-    string s_mess;   // message string which has to be sent to the user.
-    room*  p_room;   // pointer to the user's room.
+ // private members:
+ bool   b_away;   // true if user is away.
+ bool   b_online; // true if user is online.
+ int    i_sock;   // user's stream socket descriptor.
+ long   l_time;   // user's last activity time. 
+ rang   r_rang;   // user's rang ( see enum rang @ globals.h ).
+ rang   r_oldr;   // user's previous rang.
+ string s_id;
+ string s_agnt;   // user's http user agent. 
+ string s_away;   // user's last away message.
+ string s_col1;   // user's nick color. 
+ string s_mess;   // message string which has to be sent to the user.
+ room*  p_room;   // pointer to the user's room.
 
-    // Modules which are allowed to be executed by the user.
-    hmap<dynmod*,string>* map_mods;
+ pthread_mutex_t mut_b_online;
+ pthread_mutex_t mut_i_sock;
+ pthread_mutex_t mut_l_time;
+ pthread_mutex_t mut_s_mess;
+ pthread_mutex_t mut_p_room;
+ 
+public:
+ pthread_cond_t  cond_message;
+ pthread_mutex_t mut_message;
 
-    pthread_mutex_t mut_map_mods;
-    pthread_mutex_t mut_b_online;
-    pthread_mutex_t mut_i_sock;
-    pthread_mutex_t mut_l_time;
-    pthread_mutex_t mut_s_mess;
-    pthread_mutex_t mut_p_room;
-    pthread_mutex_t mut_s_col1;
-    pthread_mutex_t mut_s_col2;
-    pthread_mutex_t mut_s_id;
-    pthread_mutex_t mut_r_rang;
+ // small inline methods:
+ string get_col1()         const    { return  s_col1;	       }
+ string get_id()	   const    { return  s_id;	       }
+ void   set_id    ( string s_id   ) { this -> s_id = s_id;     }
+ void   set_col1  ( string s_col1 ) { this -> s_col1 = s_col1; }
 
-public:
-    pthread_cond_t  cond_message;
-    pthread_mutex_t mut_message;
+ rang   get_rang  ( )      const    { return  r_rang;	       }
+ void   set_rang  ( rang   r_rang ) { r_oldr = this -> r_rang;   
+				      this -> r_rang = r_rang; } 
 
-    // public methods:
-    explicit user( string s_name );      // a standard constructor.
-    ~user();			      // user destructor.
+ bool   new_msgs  ( )               { return s_mess.empty(); }
+ // public methods: 
+ explicit user( string s_name );      // a standard constructor.
+ ~user();			      // user destructor.	
 
-    // gets specific data of this user und stores it in
-    // (*p_map_string)["nick"]. this method will be used
-    // every time data has to be got from every user of a room
-    // or even of the system.
-    virtual void get_data( map_string *p_map_data );
+ // gets specific data of this user und stores it in
+ // (*p_map_string)["nick"]. this method will be used 
+ // every time data has to be got from every user of a room
+ // or even of the system.
+ virtual void get_data( map_string *p_map_data );
 
-    virtual string get_colored_name();
-    virtual bool  get_online();
-    virtual void  set_online( bool b_online );
-    virtual room* get_room();
-    virtual void  set_p_room( room* p_room );
-    virtual int   get_sock  ( );
-    virtual void  set_sock  ( int i_sock );
-    virtual string get_col1();
-    virtual string get_col2();
-    virtual string get_id();
-    virtual void   set_id( string s_id );
-    virtual void   set_col1( string s_col1 );
-    virtual void   set_col2( string s_col2 );
-    virtual rang   get_rang( );
-    virtual void   set_rang( rang   r_rang );
-    virtual bool   new_msgs  ( );
+ virtual bool  get_online();
+ virtual void  set_online( bool b_online );
+ virtual room* get_p_room();
+ virtual void  set_p_room( room* p_room );
+ virtual int   get_sock  ( );
+ virtual void  set_sock  ( int i_sock );
 
-    // executes a command.
-    virtual void command( string &s_command );
+ // executes a command.
+ virtual void command( string &s_command );
 
-    // gets the message and clears s_mess;
-    virtual string get_mess();
+ // gets the message and clears s_mess;
+ virtual string get_mess();
 
-    // actualizes the user's timestamp.
-    virtual void  renew_stamp();
+ // actualizes the user's timestamp.
+ virtual void  renew_stamp();
 
-    // Here are starting methods which are mainly needed by the data<type> class.
+ // Here are starting methods which are mainly needed by the data<type> class.
 
-    // appends a string to s_mess including br.
-    virtual void msg_post( string *p_msg );
-    virtual void get_user_list( string &s_list, string &s_seperator );
+ // appends a string to s_mess including br.
+ virtual void msg_post( string *p_msg );
+ virtual void get_user_list( string &s_list, string &s_seperator ); 
 };
 
 #endif