tagging ychat-0.7.2ychat-0.7.2

89 files changed, 3341 insertions, 3356 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 262f3a6..0382389 100755
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -6,16 +6,16 @@ LDFLAGS=$(LIBADD) -lstdc++
 LDADD=-pthread -D_THREAD_SAFE -export-dynamic -ldl
 INCLUDES=`cat includes.add`
 CFLAGS=-fno-inline -fno-default-inline -frepo 
-all: yhttpd	
+all: ychat	
 $(SRCS):
 	$(CC) $(INCLUDES) $(CFLAGS) -c $*.cpp 
 infotext:
 	@echo Compiling base
-yhttpd:  infotext $(OBJS) 
+ychat:  infotext $(OBJS) 
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDADD) 
-	@mv yhttpd ../bin
+	@mv ychat ../bin
 	@echo -n "Size of linked executable: " 
-	@du -hc ../bin/yhttpd | tail -n 1
+	@du -hc ../bin/ychat | tail -n 1
 clean: 
 	@echo Cleaning base obj
 	@if test -d ../obj; then rm -Rf ../obj; fi
diff --git a/src/chat/base.h b/src/chat/base.h
index b995c5c..ae2e926 100755
--- a/src/chat/base.h
+++ b/src/chat/base.h
@@ -1,93 +1,89 @@
+// template class data declaration;
 #include "../incl.h"
 
 #ifndef BASE_H
 #define BASE_H
 
-#include <map>
-#include "../maps/nhashmap.h"
+#include "../maps/smap.h"
 
 template<class type>
-class base : public nhashmap<type*>
+class base : public smap<type*,string>
 {
-protected:
-  void dumpit();
-
 public:
-  base();
-  ~base();
-
-  static string 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;
-  }
-
-  virtual type* get_elem( string s_name, bool &b_found ); // get a element.
-  virtual type* get_elem( string s_name );
-  virtual void  add_elem( type*   p_type );                // add a element.
-
-  // 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.
-  virtual void msg_post( string *s_msg )
-  {
-    nhashmap<type*>::run_func( &base<type>::msg_post_ , (void*)s_msg );
-  }
-
-  static void msg_post_( type* type_obj, void* v_arg )
-  {
-    type_obj -> msg_post( (string*) v_arg );
-  }
-
-  virtual void check_timeout( int* i_timeout_settings )
-  {
-    nhashmap<type*>::run_func( &base<type>::check_timeout_ , (void*)i_timeout_settings );
-  }
-
-  static void check_timeout_( type* type_obj, void* v_arg )
-  {
-    type_obj -> check_timeout( (int*) v_arg );
-  }
-
-  virtual void reconf()
-  {
-    nhashmap<type*>::run_func( &base<type>::reconf_ );
-  }
-
-  static void reconf_ ( type* type_obj )
-  {
-    type_obj -> reconf ();
-  }
-
-  void get_data( map<string,string> *p_map_string )
-  {
-    nhashmap<type*>::run_func( &base<type>::get_data_ , (void*)p_map_string );
-  }
-
-  static void get_data_( type* type_obj, void* v_arg )
-  {
-    type_obj -> get_data ( (map<string,string>*) v_arg );
-  }
-
-
-  // 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 )
-  {
-    container c;
-    c.elem[0] = (void*) &s_list;
-
-    nhashmap<type*>::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]) );
-  }
+    base();
+    ~base();
+
+    static string 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;
+    }
+
+    virtual type* get_elem( string s_name, bool &b_found ); // get a element.
+    virtual void  add_elem( type*   p_type );                // add a element.
+
+    // 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.
+    virtual void msg_post( string *s_msg )
+    {
+        smap<type*,string>::run_func( &base<type>::msg_post_ , (void*)s_msg );
+    }
+
+    static void msg_post_( type* type_obj, void* v_arg )
+    {
+        type_obj -> msg_post( (string*) v_arg );
+    }
+
+    virtual void check_timeout( int* i_timeout_settings )
+    {
+        smap<type*,string>::run_func( &base<type>::check_timeout_ , (void*)i_timeout_settings );
+    }
+
+    static void check_timeout_( type* type_obj, void* v_arg )
+    {
+        type_obj -> check_timeout( (int*) v_arg );
+    }
+
+    virtual void reconf()
+    {
+        smap<type*,string>::run_func( &base<type>::reconf_ );
+    }
+
+    static void reconf_ ( type* type_obj )
+    {
+        type_obj -> reconf ();
+    }
+
+    void get_data( map_string *p_map_string )
+    {
+        smap<type*,string>::run_func( &base<type>::get_data_ , (void*)p_map_string );
+    }
+
+    static void get_data_( type* type_obj, void* v_arg )
+    {
+        type_obj -> get_data ( (map_string*) v_arg );
+    }
+
+
+    // 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 )
+    {
+        container c;
+        c.elem[0] = (void*) &s_list;
+
+        smap<type*,string>::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]) );
+    }
 };
 
 #include "base.tmpl"
diff --git a/src/chat/base.tmpl b/src/chat/base.tmpl
index 73d8835..53b609f 100755
--- a/src/chat/base.tmpl
+++ b/src/chat/base.tmpl
@@ -4,61 +4,30 @@
 #include "base.h"
 
 template<class type>
-base<type>::base()
-{}
+base<type>::base() : smap<type*,string>::smap(HMAPOCC)
+{
+}
 
 template<class type>
 base<type>::~base( )
-{}
-
-template<class type>
-type*
-base<type>::get_elem( string s_name, bool &b_found )
 {
-  s_name = to_lower(s_name);
-  type* p_type = nhashmap<type*>::get_elem( s_name );
-  b_found = p_type == NULL ?  false : true;
-  return p_type;
 }
 
 template<class type>
 type*
-base<type>::get_elem( string s_name)
+base<type>::get_elem( string s_name, bool &b_found )
 {
-  bool b;
-  return get_elem(s_name, b);
+ s_name = to_lower(s_name);
+ type* p_type = smap<type*,string>::get_elem( s_name );
+ b_found = p_type == NULL ?  false : true;
+ return p_type;
 }
 
 template<class type>
 void
 base<type>::add_elem( type* p_type )
 {
-  nhashmap<type*>::add_elem(p_type, p_type->get_lowercase_name());
-}
-
-template<class type>
-void
-base<type>::dumpit()
-{
-  dumpable::add
-    ("[base]");
-  vector<string>* p_vec = nhashmap<type*>::get_key_vector();
-
-  vector<string>::iterator iter;
-  for (iter = p_vec->begin(); iter != p_vec->end(); ++iter)
-  {
-    dumpable::add
-      (*iter);
-    type* p_elem = get_elem(*iter);
-    if (p_elem)
-    {
-      dumpable::next_no_newline();
-      dumpable::add
-        (p_elem->dump(dumpable::get_level()));
-    }
-  }
-
-  delete p_vec;
+ smap<type*,string>::add_elem(p_type, p_type->get_lowercase_name());
 }
 
 #endif
diff --git a/src/chat/chat.cpp b/src/chat/chat.cpp
index d890d70..86bc140 100755
--- a/src/chat/chat.cpp
+++ b/src/chat/chat.cpp
@@ -12,370 +12,327 @@ using namespace std;
 
 chat::chat( )
 {
-  { // Set up replace strings;
-    wrap::system_message(CHATREP);
-    vector<string>* p_vec_keys = wrap::CONF->get_key_vector();
-
-    for (vector<string>::iterator iter = p_vec_keys->
-                                         begin();
-         iter != p_vec_keys->end();
-         iter++ )
-    {
-      if ( iter->length() >= 24 && iter->compare( 0, 22, "chat.html.replace.from" ) == 0 )
+    { // Set up replace strings;
+      wrap::system_message(CHATREP);
+      vector<string>* p_vec_keys = wrap::CONF->get_key_vector();
+     	
+      for (vector<string>::iterator iter = p_vec_keys->begin();
+           iter != p_vec_keys->end(); iter++ )
       {
+       if ( iter->length() >= 24 && iter->compare( 0, 22, "chat.html.replace.from" ) == 0 )
+       {
         string s_from = wrap::CONF->get_elem(*iter);
         map_replace_strings[s_from] = "chat.html.replace.into." + s_from;
-        vec_replace_keys.push_back(s_from);
-      }
-    }
+	vec_replace_keys.push_back(s_from);
+       }
+     } 
 
-    sort(vec_replace_keys.begin(), vec_replace_keys.end());
-    delete p_vec_keys;
-  }
+     sort(vec_replace_keys.begin(), vec_replace_keys.end()); 	
+     delete p_vec_keys;
+    }
 }
 
 chat::~chat( )
 {
-  // Delete all room objects!
-  run_func( mtools<room*>::delete_obj );
+    // Delete all room objects!
+    run_func( mtools<room*>::delete_obj );
 }
 
 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;
 
-  base<room>::run_func( get_user_, (void*)&param );
+    smap<room*,string>::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;
-
-  if ( *((bool*)param->elem[1]) )
-    return;
-
-  param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) );
+    container* param = (container*) v_arg;
+    if ( *((bool*)param->elem[1]) )
+     return; 
+    param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) );
 }
 
 void
-chat::login( map<string,string> &map_params )
+chat::login( map_string &map_params )
 {
-  string s_user = map_params["nick"];
-
-  // prove if nick is empty:
-  if ( s_user.empty() )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.nonick" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE0 );
-    return;
-  }
-
-  // prove if the nick is alphanumeric:
-  else if ( ! tool::is_alpha_numeric( s_user ) )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.alpnum" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE1 + s_user  );
-    return;
-  }
-
-  // prove if the nick is too long:
-  else if ( s_user.length()  > tool::string2int( wrap::CONF->get_elem("chat.maxlength.username") ) )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.nicklength" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE2 + s_user  );
-    return;
-  }
-
-  // prove if the room name is too long:
-  else if ( map_params["room"].length() > tool::string2int( wrap::CONF->get_elem("chat.maxlength.roomname") ) )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.roomnamelength" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE3 + s_user + " / " + map_params["room"] );
-    return;
-  }
-
-  // prove if the room name is valid
-  else if ( map_params["room"].length() < 1 )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.noroom" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE3 + s_user + " / " + map_params["room"] );
-    return;
-  }
-
-  // prove if maxpoolsize (threads) allows this login
-  else if ( !wrap::POOL->allow_user_login() )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.maxuserlimit" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-    wrap::system_message( LOGINE5 + s_user);
-    return;
-  }
-
-  bool b_flag;
-
-  // prove if nick is already online / logged in.
-  get_user( s_user, b_flag );
-
-  if ( b_flag )
-  {
-    map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.online" );
-    map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" );
-
-    return;
-  }
-
-  // Prove if user is recycleable from the garbage collector:
-  user *p_user = wrap::GCOL->get_user_from_garbage( s_user );
-
-  if ( p_user != NULL )
-  {
-    // 1. possibility to prove the password at login! (using recycled user)
-    if ( p_user->get_pass() != map_params["password"] )
+    string s_user = map_params["nick"];
+
+    // prove if nick is empty:
+    if ( s_user.empty() )
+    {
+        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.nonick" );
+        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+        wrap::system_message( LOGINE0 );
+        return;
+    }
+
+    // prove if the nick is alphanumeric:
+    else if ( ! tool::is_alpha_numeric( s_user ) )
+    {
+        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.alpnum" );
+        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+        wrap::system_message( LOGINE1 + s_user  );
+        return;
+    }
+
+    // prove if the nick is too long:
+    else if ( s_user.length()  > tool::string2int( wrap::CONF->get_elem("chat.maxlength.username") ) ) 
+    {
+        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.nicklength" );
+        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+        wrap::system_message( LOGINE2 + s_user  );
+        return;
+    }
+
+    // prove if the room name is too long:
+    else if ( map_params["room"].length() > tool::string2int( wrap::CONF->get_elem("chat.maxlength.roomname") ) ) 
     {
+        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.roomnamelength" );
+        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+        wrap::system_message( LOGINE3 + s_user + " / " + map_params["room"] );
+        return;
+    }
+
+    // prove if the room name is valid 
+    else if ( map_params["room"].length() < 1 ) 
+    {
+        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.noroom" );
+        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+        wrap::system_message( LOGINE3 + s_user + " / " + map_params["room"] );
+        return;
+    }
+
+    bool b_flag;
+
+    // prove if nick is already online / logged in.
+    get_user( s_user, b_flag );
+
+    if ( b_flag )
+    {
+	map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.online" ); 
+	map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" );
+			    
+	return;
+    }
+
+    // Prove if user is recycleable from the garbage collector: 
+    user *p_user = wrap::GCOL->get_user_from_garbage( s_user );
+
+    if ( p_user != NULL )
+    {
+     // 1. possibility to prove the password at login! (using recycled user)
+     if ( p_user->get_pass() != map_params["password"] )
+     {
       map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.wrongpassword" );
       map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
       wrap::system_message( LOGINER + s_user );
       return;
-    }
-    if ( p_user->get_has_sess() )
-    {
+     }
+     if ( p_user->get_has_sess() )
+     {
       map_params["tmpid"] = p_user->get_tmpid();
-    }
-    else
-    {
+     }  
+     else
+     { 
       sess* p_sess = wrap::SMAN->create_session();
-      p_sess->set_user(p_user);
-      map_params["tmpid"] = p_sess->get_tmpid();
+      //p_sess->set_value( string("nick"), (void *) new string(s_user) );
+      p_sess->set_name(s_user);
+      map_params["tmpid"] = p_sess->get_id();
       p_user->set_tmpid( map_params["tmpid"] );
       p_user->set_has_sess( true );
-      wrap::system_message("New tmpid: " + map_params["tmpid"] );
+     } 
     }
-  }
-  else //  if ( p_user == NULL ) // If not in garbage create a new user!
-  {
-    p_user = new user( s_user );
 
-    // prove if nick is registered, else create a guest chatter.
-#ifdef DATABASE
+    else //  if ( p_user == NULL ) // If not in garbage create a new user!
+    {
+     p_user = new user( s_user );
 
-    hashmap<string> map_results = wrap::DATA->select_user_data( tool::to_lower(s_user), "selectlogin");
+     // prove if nick is registered
+#ifdef DATABASE
+     map_string map_results = wrap::DATA->select_user_data( tool::to_lower(s_user), "selectlogin");
 
-    if ( map_results["nick"] == tool::to_lower(s_user) )
-    {
-      p_user->set_is_reg( true );
+     if ( map_results["nick"] == tool::to_lower(s_user) )
+     { 
+       p_user->set_is_reg( true );	
       // User exists in database, prove password:
       // 2. possibility to prove the password at login! (using new created user from database)
       if ( map_results["password"] != map_params["password"] )
       {
-        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.wrongpassword" );
-        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-        wrap::system_message( LOGINER + s_user );
-        return;
+       map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.wrongpassword" );
+       map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+       wrap::system_message( LOGINER + s_user );
+       return;
       }
       else
       { // If registered use saved options
-        map_params["registered"] = "yes";
-        map_params["color1"] = map_results["color1"];
-        map_params["color2"] = map_results["color2"];
-        map_params["email"] = map_results["email"];
-        map_params["status"] = map_results["status"];
+       map_params["registered"] = "yes";
+       map_params["color1"] = map_results["color1"];
+       map_params["color2"] = map_results["color2"];
+       map_params["email"] = map_results["email"];
+       map_params["status"] = map_results["status"];
       }
-    }
-    else
+     }
+     else
 #endif
-
-    { // If not registered prove if guest chatting is enabled.
-      if (wrap::CONF->get_elem("chat.enableguest") != "true")
-      {
-        map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.noguest" );
-        map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
-        wrap::system_message( LOGINE4 + s_user );
-        return;
-      }
-
-      // Guest chatter are enabled, use standard font colors
+     { // If not registered use standard font colors
       map_params["color1"] = wrap::CONF->get_elem( "chat.html.user.color1" );
       map_params["color2"] = wrap::CONF->get_elem( "chat.html.user.color2" );
       map_params["status"] = wrap::CONF->get_elem( "chat.defaultrang" );
-    }
-
-    sess* p_sess = wrap::SMAN->create_session();
-    p_sess->set_user(p_user);
-    map_params["tmpid"] = p_sess->get_tmpid();
-    wrap::system_message("New tmpid: " + map_params["tmpid"] );
-    p_user->set_tmpid( map_params["tmpid"] );
-    p_user->set_col1( map_params["color1"] );
-    p_user->set_col2( map_params["color2"] );
-    p_user->set_status( tool::string2int(map_params["status"]));
+     }
+
+     sess* p_sess = wrap::SMAN->create_session();
+     p_sess->set_name(s_user);
+     map_params["tmpid"] = p_sess->get_id();
+     p_user->set_tmpid( map_params["tmpid"] );
+     p_user->set_col1( map_params["color1"] );
+     p_user->set_col2( map_params["color2"] );
+     p_user->set_status( tool::string2int(map_params["status"]));
     // p_user->set_sess( p_sess );
-  }
-
-  // Prove if user is the default operator.
-  if ( tool::to_lower(wrap::CONF->get_elem("chat.defaultop")) == tool::to_lower(s_user) )
-  {
-    wrap::system_message(CHATDOP);
-    p_user->set_status(0);
-  }
+    }
 
-  string s_room = map_params["room"];
-  room*  p_room = get_room( s_room , b_flag );
+    // Prove if user is the default operator.
+    if ( tool::to_lower(wrap::CONF->get_elem("chat.defaultop")) == tool::to_lower(s_user) ) {
+     wrap::system_message(CHATDOP);
+     p_user->set_status(0); 
+    }
 
-  // if room does not exist add room to list!
-  if ( ! b_flag )
-  {
-    p_room = wrap::GCOL->get_room_from_garbage();
+    string s_room = map_params["room"];
+    room*  p_room = get_room( s_room , b_flag );
 
-    if ( p_room )
+    // if room does not exist add room to list!
+    if ( ! b_flag )
     {
+     p_room = wrap::GCOL->get_room_from_garbage();
+
+     if ( p_room )
+     {
       p_room->set_name( s_room );
       wrap::system_message( REUROOM + s_room );
-    }
-    else
-    {
+     }
+
+     else
+     {
       p_room = new room( s_room );
       wrap::system_message( NEWROOM + s_room );
-    }
+     }
 
-    add_elem( p_room );
-  }
+     add_elem( p_room );
+    }
 
-  // add user to the room.
-  p_room->add_user( p_user );
+    // add user to the room.
+    p_room->add_user( p_user );
 
-  wrap::system_message( NEWUSER + s_user );
+    wrap::system_message( NEWUSER + s_user );
 
-  // post "username enters the chat" into the room.
-  string s_msg = wrap::TIMR->get_time() + " " + p_user->get_colored_bold_name() + wrap::CONF->get_elem( "chat.msgs.userenterschat" ) + "<br>\n";
+    // post "username enters the chat" into the room.
+    string s_msg = wrap::TIMR->get_time() + " " + p_user->get_colored_bold_name() + wrap::CONF->get_elem( "chat.msgs.userenterschat" ) + "<br>\n";
 
-  // If created a new user from database while logging on (not a recycled user, they already have this set)
-  if ( map_params["registered"] == "yes" )
-  {
-    p_user->set_email( map_params["email"] );
-    p_user->set_pass( map_params["password"] );
-    // Now we will store all wanted user data into MySQL after logging out! (recycled user already have this set)
-    p_user->set_changed_data_on();
-  }
-  p_room->msg_post( &s_msg );
+    // If created a new user from database while logging on (not a recycled user, they already have this set)
+    if ( map_params["registered"] == "yes" ) 
+    {
+     p_user->set_email( map_params["email"] );
+     p_user->set_pass( map_params["password"] );
+     // Now we will store all wanted user data into MySQL after logging out! (recycled user already have this set)
+     p_user->set_changed_data_on(); 
+    }
+    p_room->msg_post( &s_msg );
 }
 
 void
-chat::post( user* p_user, map<string,string> &map_params )
+chat::post( user* p_user, map_string &map_params )
 {
-  p_user->renew_timeout();
+    p_user->renew_timeout();
 
-  string s_msg( map_params["message"] );
+    string s_msg( map_params["message"] );
 
-  if ( s_msg.empty() )
-    return;
+    if ( s_msg.empty() )
+     return;
 
-  int i_max_message_length = tool::string2int(wrap::CONF->get_elem( "chat.maxlength.message" ));
-  if ( s_msg.length() > i_max_message_length )
-  {
-    s_msg = s_msg.substr( 0, i_max_message_length );
-    string s_private = "<font color=\"" + wrap::CONF->get_elem( "chat.html.errorcolor" ) + "\">"
+    int i_max_message_length = tool::string2int(wrap::CONF->get_elem( "chat.maxlength.message" )); 
+    if ( s_msg.length() > i_max_message_length )
+    {
+     s_msg = s_msg.substr( 0, i_max_message_length );
+     string s_private = "<font color=\"" + wrap::CONF->get_elem( "chat.html.errorcolor" ) + "\">"
                        + wrap::CONF->get_elem( "chat.msgs.err.messagelength" ) + "</font><br>\n";
-    p_user->msg_post( &s_private );
-  }
-
-  int i_max_word_length = tool::string2int(wrap::CONF->get_elem( "chat.maxlength.word" ));
+     p_user->msg_post( &s_private );
+    } 
+  
+    int i_max_word_length = tool::string2int(wrap::CONF->get_elem( "chat.maxlength.word" )); 
 
-  // Check max word length
-  list<string> list_msg = tool::split_string( s_msg, " ");
-  list<string>::iterator iter = list_msg.begin();
+    // Check max word length
+    list<string> list_msg = tool::split_string( s_msg, " "); 
+    list<string>::iterator iter = list_msg.begin();
 
-  for ( s_msg = ""; iter != list_msg.end(); ++iter )
-  {
-    if ( iter->length() > i_max_word_length )
+    for ( s_msg = ""; iter != list_msg.end(); ++iter )
     {
+     if ( iter->length() > i_max_word_length ) 
+     {
       string s_tmp[] = { iter->substr(0, i_max_word_length ), iter->substr(i_max_word_length) };
-      iter = list_msg.erase( iter );
+      iter = list_msg.erase( iter ); 
       iter = list_msg.insert( iter, s_tmp[1] );
       iter = list_msg.insert( iter, s_tmp[0] );
       --iter;
+     }
+     else
+     {
+      s_msg.append(*iter + " "); 
+     }    
     }
-    else
-    {
-      s_msg.append(*iter + " ");
-    }
-  }
-
-  if ( wrap::CONF->get_elem( "chat.html.tagsallow" ) != "true" )
-    tool::strip_html( &s_msg );
-
-  unsigned i_pos = s_msg.find( "/" );
-  if ( i_pos == 0 )
-    return p_user->command( s_msg );
-
-  if (p_user->get_is_gag())
-  {
-     p_user->msg_post(wrap::CONF->colored_error_msg("chat.msgs.err.gagged"));
-     return;
-  }
+  
+    if ( wrap::CONF->get_elem( "chat.html.tagsallow" ) != "true" )
+        tool::strip_html( &s_msg );
 
+    auto unsigned i_pos = s_msg.find( "/" );
+    if ( i_pos == 0 )
+        return p_user->command( s_msg );
 
-  string_replacer(&s_msg);
-  string s_post;
-
-  if ( wrap::CONF->get_elem( "chat.printalwaystime" ) == "true" )
-    s_post.append( wrap::TIMR->get_time() + " " );
-
-  s_post.append( "<font color=\"#" )
-  .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"    );
-
-  p_user->get_room()->msg_post( &s_post );
+    if ( wrap::CONF->get_elem( "chat.html.replace.activate" ) == "true" )
+    {
+     for (vector<string>::iterator iter = vec_replace_keys.end()-1;
+          iter != vec_replace_keys.begin();
+          iter-- )
+      s_msg = tool::replace( s_msg, *iter, wrap::CONF->get_elem(map_replace_strings[*iter]) );
+    }  
+
+    string s_post;
+
+    if ( wrap::CONF->get_elem( "chat.printalwaystime" ) == "true" )
+     s_post.append( wrap::TIMR->get_time() + " " );    
+
+    s_post.append( "<font color=\"#" )
+    .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"    );
+
+    p_user->get_room()->msg_post( &s_post );
 }
 
 void
 chat::reconf()
-{}
-
-void
-chat::string_replacer(string *p_msg)
-{
-  if ( wrap::CONF->get_elem( "chat.html.replace.activate" ) == "true" )
-  {
-    for (vector<string>::iterator iter = vec_replace_keys.end()-1;
-         iter != vec_replace_keys.begin();
-         iter-- )
-      *p_msg = tool::replace( *p_msg, *iter, wrap::CONF->get_elem(map_replace_strings[*iter]) );
-  }
-}
-
-void
-chat::dumpit()
 {
-  dumpable::add
-    ("[chat]");
-  base<room>::dumpit();
 }
 
 #endif
diff --git a/src/chat/chat.h b/src/chat/chat.h
index bb087d5..c37bebc 100755
--- a/src/chat/chat.h
+++ b/src/chat/chat.h
@@ -13,51 +13,49 @@ class chat;
 #include "user.h"
 #include "sess.h"
 #include "../tool/tool.h"
-#include "../maps/hashmap.h"
 
 using namespace std;
 
+
 #undef chat
 class chat : public base<room>, public perm
 {
 private:
-  map<string,string> map_replace_strings;
-  vector<string> vec_replace_keys;
-  void dumpit();
+    map_string map_replace_strings; 
+    vector<string> vec_replace_keys;
 
 public:
-  virtual room* get_room( string s_name )
-  {
-    bool b_bool;
-    return get_room( s_name, b_bool );
-  }
-
-  virtual 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.
-
-  // get the object of a specific user.
-  user* get_user( string &s_nick );
-  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.
-  void login( map<string,string> &map_params );
-
-  // will be called if a user posts a message.
-  void post ( user* u_user, map<string,string> &map_params );
-
-  void del_elem( string s_name )
-  {
-    base<room>::del_elem( s_name );
-  }
-
-  void reconf();
-  void string_replacer(string *p_msg);
+    virtual room* get_room( string s_name )
+    {
+        bool b_bool;
+        return get_room( s_name, b_bool );
+    }
+
+    virtual 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.
+
+    // get the object of a specific user.
+    user* get_user( string &s_nick );
+    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.
+    void login( map_string &map_params );
+
+    // will be called if a user posts a message.
+    void post ( user* u_user, map_string &map_params );
+
+    void del_elem( string s_name )
+    {
+     smap<room*,string>::del_elem( s_name ); 
+    }
+
+    void reconf();	
 };
 #endif
diff --git a/src/chat/gcol.cpp b/src/chat/gcol.cpp
index d4c9416..2500b91 100755
--- a/src/chat/gcol.cpp
+++ b/src/chat/gcol.cpp
@@ -7,141 +7,130 @@ using namespace std;
 
 gcol::gcol()
 {
-  pthread_mutex_init( &mut_vec_rooms  , NULL);
+ pthread_mutex_init( &mut_vec_rooms  , NULL);
 
-  p_map_users = new shashmap<user*>;
-  wrap::system_message( GARBAGE );
+ p_map_users = new smap<user*,string>(HMAPOCC);
+ wrap::system_message( GARBAGE );
 
 #ifdef NCURSES
-
-  print_garbage();
+ print_garbage(); 
 #endif
 }
 
 gcol::~gcol()
 {
-  remove_garbage();
-  pthread_mutex_destroy( &mut_vec_rooms );
-  delete p_map_users;
+ remove_garbage();
+ pthread_mutex_destroy( &mut_vec_rooms );
+ delete p_map_users;
 }
 
 void
 gcol::add_room_to_garbage( room* p_room )
-{
-  pthread_mutex_lock  ( &mut_vec_rooms );
-  vec_rooms.push_back( p_room );
-  pthread_mutex_unlock( &mut_vec_rooms );
-  wrap::system_message( GARROOM + p_room->get_name() );
+{ 
+ pthread_mutex_lock  ( &mut_vec_rooms ); 
+ vec_rooms.push_back( p_room ); 
+ pthread_mutex_unlock( &mut_vec_rooms );
+ wrap::system_message( GARROOM + p_room->get_name() );
 #ifdef NCURSES
-
-  print_garbage();
+ print_garbage(); 
 #endif
 }
 
 void
 gcol::add_user_to_garbage( user* p_user )
-{
-  p_user->s_mess_delete();
-  p_map_users->add_elem( p_user, tool::to_lower(p_user->get_name()) );
-  wrap::system_message( GARUSER + p_user->get_name() );
-  p_user->destroy_session();
-
+{ 
+ p_user->s_mess_delete();
+ p_map_users->add_elem( p_user, tool::to_lower(p_user->get_name()) ); 
+ wrap::system_message( GARUSER + p_user->get_name() );
 #ifdef NCURSES
-
-  print_garbage();
+ print_garbage(); 
 #endif
 }
 
 bool
 gcol::remove_garbage()
 {
-  bool b_empty;
+ bool b_empty;
 
-  pthread_mutex_lock  ( &mut_vec_rooms );
-  b_empty  = ( vec_rooms.empty() && p_map_users->size() == 0);
-  pthread_mutex_unlock( &mut_vec_rooms );
+ pthread_mutex_lock  ( &mut_vec_rooms );
+ b_empty  = ( vec_rooms.empty() && p_map_users->get_size() == 0);
+ pthread_mutex_unlock( &mut_vec_rooms );
 
-  if ( b_empty )
-    return false;
+ if ( b_empty )
+  return false;
 
-  wrap::system_message( GARBACT );
+ wrap::system_message( GARBACT );
 
-  pthread_mutex_lock  ( &mut_vec_rooms );
-  for ( vector<room*>::iterator iter = vec_rooms.begin();
-        iter != vec_rooms.end(); iter++ )
-  {
-    wrap::system_message( REMROOM + (*iter)->get_name() );
-    delete *iter;
-  }
-  vec_rooms.clear();
-  pthread_mutex_unlock( &mut_vec_rooms );
+ pthread_mutex_lock  ( &mut_vec_rooms );
+ for ( vector<room*>::iterator iter = vec_rooms.begin();
+       iter != vec_rooms.end(); iter++ )
+ {
+  wrap::system_message( REMROOM + (*iter)->get_name() ); 
+  delete *iter;
+ }
+ vec_rooms.clear();
+ pthread_mutex_unlock( &mut_vec_rooms );
 
 
-  p_map_users->run_func( delete_users_ );
-  p_map_users->clear();
+ p_map_users->run_func( delete_users_ );
+ p_map_users->make_empty();
 
 #ifdef NCURSES
-
-  print_garbage();
+ print_garbage(); 
 #endif
-
-  return true;
+ return true;
 }
 
 room*
 gcol::get_room_from_garbage()
 {
-  pthread_mutex_lock  ( &mut_vec_rooms );
+ pthread_mutex_lock  ( &mut_vec_rooms );
 
-  if ( vec_rooms.empty() )
-  {
-    pthread_mutex_unlock( &mut_vec_rooms );
-    return NULL;
-  }
+ if ( vec_rooms.empty() )
+ {
+  pthread_mutex_unlock( &mut_vec_rooms );
+  return NULL;
+ }
 
 
-  room* p_room = vec_rooms.back();
-  vec_rooms.pop_back();
-  pthread_mutex_unlock( &mut_vec_rooms );
+ room* p_room = vec_rooms.back();
+ vec_rooms.pop_back();
+ pthread_mutex_unlock( &mut_vec_rooms );
 
 #ifdef NCURSES
-
-  print_garbage();
+ print_garbage(); 
 #endif
 
-  return p_room;
+ return p_room;
 }
 
 room*
 gcol::get_room_from_garbage_or_new( string s_room )
 {
-  room* p_room = get_room_from_garbage();
-  if ( p_room == NULL )
-    return new room( s_room );
-  p_room->set_name( s_room );
-  return p_room;
+ room* p_room = get_room_from_garbage();
+ if ( p_room == NULL )
+  return new room( s_room );
+ p_room->set_name( s_room );
+ return p_room;
 }
 
 user*
 gcol::get_user_from_garbage( string s_user )
 {
 
-  user* p_user = p_map_users->get_elem( tool::to_lower(s_user) );
-  ;
+  user* p_user = p_map_users->get_elem( tool::to_lower(s_user) );;
 
-  if ( p_user != NULL )
+  if ( p_user != NULL ) 
   {
-    p_map_users->del_elem( tool::to_lower(s_user) );
-    p_user->set_name( s_user );
-    p_user->set_online( true );
-    p_user->set_invisible( false );
-    p_user->renew_timeout();
-    wrap::system_message(GARUSE2 + p_user->get_name() );
+   p_map_users->del_elem( tool::to_lower(s_user) );
+   p_user->set_name( s_user );
+   p_user->set_online( true );
+   p_user->set_invisible( false );
+   p_user->renew_timeout();
+   wrap::system_message(GARUSE2 + p_user->get_name() ); 
 #ifdef NCURSES
-
-    print_garbage();
+   print_garbage(); 
 #endif
-
   }
 
   return p_user;
@@ -150,34 +139,34 @@ gcol::get_user_from_garbage( string s_user )
 void
 gcol::delete_users_( user *user_obj )
 {
-  wrap::system_message( REMUSER + user_obj->get_name() );
-  user_obj->clean();
-  delete user_obj;
+ wrap::system_message( REMUSER + user_obj->get_name() );
+ user_obj->clean(); 
+ delete user_obj;
 }
 
 void
 gcol::lock_mutex()
 {
-  pthread_mutex_lock  ( &mut_vec_rooms );
+ pthread_mutex_lock  ( &mut_vec_rooms ); 
 }
 
 void
 gcol::unlock_mutex()
 {
-  pthread_mutex_unlock ( &mut_vec_rooms );
+ pthread_mutex_unlock ( &mut_vec_rooms ); 
 }
 
 #ifdef NCURSES
 void
 gcol::print_garbage( )
 {
-  if ( wrap::NCUR->is_ready() )
-  {
-    pthread_mutex_lock  ( &mut_vec_rooms );
-    mvprintw( NCUR_GARBAGE_X,NCUR_GARBAGE_Y, "Garbage: %d ", p_map_users->size() + vec_rooms.size() );
-    pthread_mutex_unlock( &mut_vec_rooms );
-    refresh();
-  }
+    if ( wrap::NCUR->is_ready() )
+    {
+     pthread_mutex_lock  ( &mut_vec_rooms );
+     mvprintw( NCUR_GARBAGE_X,NCUR_GARBAGE_Y, "Garbage: %d ", p_map_users->get_size() + vec_rooms.size() );
+     pthread_mutex_unlock( &mut_vec_rooms );
+     refresh();
+    }
 }
 
 #endif
diff --git a/src/chat/gcol.h b/src/chat/gcol.h
index d1fcde3..4936ded 100755
--- a/src/chat/gcol.h
+++ b/src/chat/gcol.h
@@ -1,43 +1,42 @@
-// garbage collector
+// garbage collector 
 #include "../incl.h"
 
 #ifndef GCOL_H
 #define GCOL_H
 
-#include <vector>
+#include <vector> 
 #include "room.h"
 #include "user.h"
-#include "../maps/shashmap.h"
+#include "../maps/smap.h"
 
 using namespace std;
 
 class gcol
 {
-private:
-  vector<room*> vec_rooms;
-  shashmap<user*>* p_map_users;
+ private:
+  vector<room*> vec_rooms; 
+  smap<user*,string>* p_map_users; 
 
   pthread_mutex_t mut_vec_rooms;
 
   static void delete_users_( user* user_obj  );
 
 #ifdef NCURSES
-
   void print_garbage( );
 #endif
 
-public:
+ public:
   gcol();
   ~gcol();
 
-  bool remove_garbage();
-  void add_room_to_garbage( room* p_room );
-  void add_user_to_garbage( user* p_user );
-  virtual room* get_room_from_garbage();
-  virtual room* get_room_from_garbage_or_new( string s_room );
-  user* get_user_from_garbage( string s_user );
-  virtual void lock_mutex();
-  virtual void unlock_mutex();
+ bool remove_garbage();
+ void add_room_to_garbage( room* p_room );
+ void add_user_to_garbage( user* p_user );
+ virtual room* get_room_from_garbage();
+ virtual room* get_room_from_garbage_or_new( string s_room );
+ user* get_user_from_garbage( string s_user );
+ virtual void lock_mutex();
+ virtual void unlock_mutex();
 };
 
 #endif
diff --git a/src/chat/perm.cpp b/src/chat/perm.cpp
index 2de3031..b862d43 100755
--- a/src/chat/perm.cpp
+++ b/src/chat/perm.cpp
@@ -8,76 +8,73 @@ using namespace std;
 
 perm::perm()
 {
-  p_command_status = new shashmap< valwrap<int>* >;
-  p_command_disabled = new shashmap< valwrap<bool>* >;
+ p_command_status = new smap< valwrap<int>*, string>(HMAPOCC);
+ p_command_disabled = new smap< valwrap<bool>*, string>(HMAPOCC);
 
-  set_standard_command_permissions();
+ set_standard_command_permissions();
 }
 
 perm::~perm()
 {
-  p_command_status->run_func( &mtools< valwrap<int>* >::delete_obj );
-  p_command_disabled->run_func( &mtools< valwrap<bool>* >::delete_obj );
+ p_command_status->run_func( &mtools< valwrap<int>* >::delete_obj );
+ p_command_disabled->run_func( &mtools< valwrap<bool>* >::delete_obj );
 
-  delete p_command_status;
-  delete p_command_disabled;
+ delete p_command_status;
+ delete p_command_disabled;
 }
 
 int
 perm::get_command_status( string s_command )
 {
-  if ( p_command_status->exists( s_command ) )
-    return p_command_status->get_elem( s_command )->val;
+ if ( p_command_status->is_avail( s_command ) )
+  return p_command_status->get_elem( s_command )->val; 
 
-  return 0;
+ return 0;
 }
 
 void
 perm::set_command_status( string s_command, int i_int )
 {
-  valwrap<int>* p_val = p_command_status->get_set_elem( new valwrap<int>(i_int), s_command );
+ valwrap<int>* p_val = p_command_status->set_elem( new valwrap<int>(i_int), s_command ); 
 
-  if ( p_val )
-    delete p_val;
+ if ( p_val )
+  delete p_val;
 }
 
 bool
 perm::get_command_disabled( string s_command )
 {
-  if ( p_command_disabled->exists( s_command ) )
-    return p_command_disabled->get_elem( s_command )->val;
-  return 0;
+ if ( p_command_disabled->is_avail( s_command ) )
+  return p_command_disabled->get_elem( s_command )->val; 
+ return 0;
 }
 
 void
 perm::set_command_disabled( string s_command, bool b_bool )
 {
-  valwrap<bool>* p_val = p_command_disabled->get_set_elem( new valwrap<bool>(b_bool), s_command );
+ valwrap<bool>* p_val = p_command_disabled->set_elem( new valwrap<bool>(b_bool), s_command ); 
 
-  if ( p_val )
-    delete p_val;
+ if ( p_val )
+  delete p_val;
 }
 
 void
 perm::set_standard_command_permissions()
 {
-  wrap::system_message(PERMSTD);
-
-  vector<string>* p_vec_keys = wrap::CONF->get_key_vector();
-
-  for (vector<string>::iterator iter = p_vec_keys->
-                                       begin();
-       iter != p_vec_keys->end();
-       iter++ )
-  {
-    if ( iter->length() > 17 && iter->compare( 0, 16, "chat.permissions" ) == 0 )
-    {
-      valwrap<int>* p_val = new valwrap<int>( tool::string2int( wrap::CONF->get_elem(*iter) ) );
-      p_command_status->add_elem( p_val, iter->substr(17) );
-    }
-  }
-
-  delete p_vec_keys;
+ wrap::system_message(PERMSTD);
+
+ vector<string>* p_vec_keys = wrap::CONF->get_key_vector();
+
+ for (vector<string>::iterator iter = p_vec_keys->begin(); iter != p_vec_keys->end(); iter++ )
+ {
+       if ( iter->length() > 17 && iter->compare( 0, 16, "chat.permissions" ) == 0 )
+       {
+	valwrap<int>* p_val = new valwrap<int>( tool::string2int( wrap::CONF->get_elem(*iter) ) );
+        p_command_status->add_elem( p_val, iter->substr(17) ); 
+       }
+ }
+
+ delete p_vec_keys;
 }
 
 #endif
diff --git a/src/chat/perm.h b/src/chat/perm.h
index fca019f..8e08ba2 100755
--- a/src/chat/perm.h
+++ b/src/chat/perm.h
@@ -1,5 +1,5 @@
 #include "../incl.h"
-#include "../maps/shashmap.h"
+#include "../maps/smap.h"
 
 #ifndef PERM_H
 #define PERM_H
@@ -7,36 +7,35 @@
 using namespace std;
 
 template<class type_>
-struct valwrap
-{
-  type_ val;
-  valwrap(type_ i)
-  {
-    val = i;
-  }
-
-  type_ get_val()
-  {
-    return val;
-  }
+struct valwrap 
+{ 
+ type_ val; 
+ valwrap(type_ i) 
+ {
+  val = i;
+ }
+ type_ get_val() 
+ {
+  return val;
+ }
 };
 
 class perm
 {
 private:
-  shashmap< valwrap<int>* >* p_command_status;
-  shashmap< valwrap<bool>* >* p_command_disabled;
-
-  void set_standard_command_permissions();
+ smap< valwrap<int>*, string>* p_command_status;
+ smap< valwrap<bool>*, string>* p_command_disabled;
 
+ void set_standard_command_permissions();
+ 
 public:
-  perm( );
-  ~perm( );
+ perm( );
+ ~perm( );
 
-  virtual int  get_command_status( string s_command );
-  virtual bool get_command_disabled( string s_command );
-  virtual void set_command_status( string s_command, int i_int );
-  virtual void set_command_disabled( string s_command, bool b_bool );
+ virtual int  get_command_status( string s_command );
+ virtual bool get_command_disabled( string s_command );
+ virtual void set_command_status( string s_command, int i_int );
+ virtual void set_command_disabled( string s_command, bool b_bool );
 };
 
 #endif
diff --git a/src/chat/room.cpp b/src/chat/room.cpp
index e1352f4..527e444 100755
--- a/src/chat/room.cpp
+++ b/src/chat/room.cpp
@@ -8,110 +8,86 @@ using namespace std;
 
 room::room( string s_name ) : name( s_name )
 {
-  pthread_mutex_init( &mut_s_topic, NULL );
-#ifdef LOGGING
-
-  p_logd = new logd( wrap::CONF->get_elem("chat.logging.roomlogdir") + get_lowercase_name(),
-                     wrap::CONF->get_elem("chat.logging.roomloglines") );
-#endif
-
-  wrap::STAT->increment_num_rooms();
+ pthread_mutex_init( &mut_s_topic, NULL );
+ p_logd = new logd( wrap::CONF->get_elem("chat.logging.roomlogdir") + get_lowercase_name(),
+                    wrap::CONF->get_elem("chat.logging.roomloglines") );
+ wrap::STAT->increment_num_rooms();
 }
 
 room::~room()
 {
-  wrap::STAT->decrement_num_rooms();
-
-  // Delete all user objects
-  run_func( mtools<user*>::delete_obj );
+ wrap::STAT->decrement_num_rooms();
 
-#ifdef LOGGING
+ // Delete all user objects 
+ run_func( mtools<user*>::delete_obj ); 
 
-  delete p_logd;
-#endif
+ delete p_logd;
 
-  pthread_mutex_destroy( &mut_s_topic );
-  pthread_mutex_destroy( &mut_s_name );
+ pthread_mutex_destroy( &mut_s_topic );
+ pthread_mutex_destroy( &mut_s_name );
 }
 
 string
 room::get_topic()
 {
-  string s_ret;
-  pthread_mutex_lock  ( &mut_s_topic );
-  s_ret = s_topic;
-  pthread_mutex_unlock( &mut_s_topic );
-  return s_ret;
+    string s_ret;
+    pthread_mutex_lock  ( &mut_s_topic );
+    s_ret = s_topic;
+    pthread_mutex_unlock( &mut_s_topic );
+    return s_ret;
 }
 
 void
 room::set_topic( string s_topic )
 {
-  pthread_mutex_lock  ( &mut_s_topic );
-  if ( s_topic == "" )
-    this->s_topic = "";
-  else
-    this->s_topic = s_topic + "<br><br>";
-  pthread_mutex_unlock( &mut_s_topic );
-  reload_onlineframe();
+    pthread_mutex_lock  ( &mut_s_topic );
+    if ( s_topic == "" )
+     this->s_topic = "";
+    else
+     this->s_topic = s_topic + "<br><br>";
+    pthread_mutex_unlock( &mut_s_topic );
+    reload_onlineframe();
 }
 
 void
 room::set_topic( string s_topic, string s_color )
 {
-  set_topic( "<font color=\"#" + s_color + "\">" + s_topic + "</font>");
+    set_topic( "<font color=\"#" + s_color + "\">" + s_topic + "</font>");
 }
 
 void
 room::clean_room()
 {
-  pthread_mutex_lock  ( &mut_s_topic );
-  this->s_topic = "";
-  pthread_mutex_unlock( &mut_s_topic );
-  wrap::CHAT->del_elem( get_lowercase_name() );
-  wrap::GCOL->add_room_to_garbage( this );
+    pthread_mutex_lock  ( &mut_s_topic );
+    this->s_topic = "";
+    pthread_mutex_unlock( &mut_s_topic );
+    wrap::CHAT->del_elem( get_lowercase_name() );
+    wrap::GCOL->add_room_to_garbage( this ); 
 }
 
 void
 room::reload_onlineframe()
 {
-  javascript_post("parent.online.location.reload();");
+    string s_msg = "<script language=\"JavaScript\"> parent.online.location.reload(); </script>\n";
+    msg_post( &s_msg );
 }
 
-void
+void 
 room::set_name( string s_name )
 {
-  if ( tool::to_lower(s_name) == get_lowercase_name() )
-  {
-    name::set_name( s_name );
-    return;
-  }
-
-#ifdef LOGGING
-  p_logd->flush_logs();
-#endif
-
-  if ( s_name == "" )
-    return;
+     if ( tool::to_lower(s_name) == get_lowercase_name() )
+     {
+      name::set_name( s_name ); 
+      return;
+     }
 
-  name::set_name( s_name );
-#ifdef LOGGING
-
-  p_logd->set_logfile( wrap::CONF->get_elem("chat.logging.roomlogdir"), get_lowercase_name() );
-#endif
-}
+     p_logd->flush_logs();
 
-void
-room::dumpit()
-{
-  dumpable::add
-    ("[room]");
-  dumpable::add
-    ("Name: "+get_name());
-  dumpable::add
-    ("Topic: "+get_topic());
-  base<user>::dumpit();
-}
+     if ( s_name == "" )
+      return;
 
+     name::set_name( s_name ); 
+     p_logd->set_logfile( wrap::CONF->get_elem("chat.logging.roomlogdir"), get_lowercase_name() );
+} 
 
 #endif
diff --git a/src/chat/room.h b/src/chat/room.h
index 1e4482f..9d8dd45 100755
--- a/src/chat/room.h
+++ b/src/chat/room.h
@@ -17,76 +17,59 @@ using namespace std;
 class room : public base<user>, public name
 {
 private:
-  string s_topic;
-  pthread_mutex_t mut_s_topic;
-#ifdef LOGGING
-
-  logd* p_logd;
-#endif
-
-  void dumpit();
+    string s_topic;
+    pthread_mutex_t mut_s_topic;
+    logd* p_logd; 
 
 public:
-  room( string s_name );
-  ~room();
-
-  virtual void reload_onlineframe();
-
-  void add_user( user* p_user  )
-  {
-    add_elem( p_user );
-    p_user->set_p_room( this );
-    reload_onlineframe();
-  }
-
-  user* get_user( string &s_name, bool &b_found )
-  {
-    return static_cast<user*>( get_elem( s_name, b_found ) );
-  }
-
-  void del_elem( string &s_name )
-  {
-    base<user>::del_elem( s_name );
-
-    if ( base<user>::size() == 0 )
+    room( string s_name );
+    ~room();  		 
+
+    virtual void reload_onlineframe();
+
+    void add_user( user* p_user  )
+    {
+        add_elem( p_user );
+        p_user->set_p_room( this );
+        reload_onlineframe(); 
+    }
+
+    user* get_user( string &s_name, bool &b_found )
+    {
+        return static_cast<user*>( get_elem( s_name, b_found ) );
+    }
+
+    void del_elem( string &s_name )
+    {
+     smap<user*,string>::del_elem( s_name ); 
+     if ( smap<user*,string>::get_size() == 0 ) 
       clean_room();
-
-    else
-      reload_onlineframe();
-  }
-
-  void msg_post( string s_msg )
-  {
-    msg_post( &s_msg );
-  }
-
-  void msg_post( string *p_msg )
-  {
-#ifdef LOGGING
-    p_logd->log_simple_line( logd::remove_html_tags(*p_msg) );
-#endif
-
-    base<user>::msg_post( p_msg );
-  }
-
-  void javascript_post( string s_msg )
-  {
-    string s_js = "<script language=\"JavaScript\">"+s_msg+"</script>\n";
-    base<user>::msg_post( &s_js );
-  }
-
-  string get_bold_name()
-  {
-    return "<b>" + get_name() + "</b>";
-  }
-
-  virtual void set_name( string s_name );
-  string get_topic();
-  void set_topic( string s_topic );
-  void set_topic( string s_topic, string s_color );
-  void clean_room();
-
-
+     else
+      reload_onlineframe(); 
+    }
+
+    void msg_post( string s_msg )
+    {
+     msg_post( &s_msg );
+    }
+    void msg_post( string *p_msg )
+    {
+     p_logd->log_simple_line( logd::remove_html_tags(*p_msg) );
+     base<user>::msg_post( p_msg );
+    } 
+
+    string get_bold_name()
+    {
+     return "<b>" + get_name() + "</b>";
+    }
+
+    virtual void set_name( string s_name );
+    string get_topic();
+    void set_topic( string s_topic );
+    void set_topic( string s_topic, string s_color );
+    void clean_room();
+
+ 
 
 };
 
diff --git a/src/chat/sess.cpp b/src/chat/sess.cpp
index dc9ba9b..b41c8ce 100755
--- a/src/chat/sess.cpp
+++ b/src/chat/sess.cpp
@@ -3,54 +3,27 @@
 
 #include "sess.h"
 
-sess::sess( string s_tmpid )
+sess::sess( string s_id )
 {
-  this->p_user = NULL;
-  this->s_tmpid = s_tmpid;
+    this->sess_id=s_id;
 }
 
 sess::~sess()
-{}
-
-string
-sess::get_tmpid()
 {
-  return s_tmpid;
+    
 }
 
 string
-sess::get_name()
-{
-  if ( p_user = NULL )
-    return "";
-
-  return p_user->get_name();
-}
-
-void
-sess::set_name(string s_name)
-{
-  if ( p_user != NULL )
-    p_user->set_name(s_name);
-}
-
-user*
-sess::get_user()
-{
-  return p_user;
-}
-
-void
-sess::set_user(user* p_user)
+sess::get_id()
 {
-  this->p_user = p_user;
+    return this->sess_id;
 }
 
 
 void
 sess::invalidate()
 {
-  this->s_tmpid = "0";
+    this->sess_id = "0";
 }
 
 #endif
diff --git a/src/chat/sess.h b/src/chat/sess.h
index 17d9cfe..717564a 100755
--- a/src/chat/sess.h
+++ b/src/chat/sess.h
@@ -3,29 +3,24 @@
 #ifndef SESS_H
 #define SESS_H
 
+#include <map>
 #include <string>
-#include "user.h"
 
 class cont;
 
 using namespace std;
 
-class sess
+class sess : public name
 {
+
 private:
-  string s_tmpid;
-  user  *p_user;
+    string sess_id;
 
 public:
-  sess(string s_tmpid);
-  ~sess();
-
-  string get_tmpid();
+    sess(string s_id);
+    ~sess();
 
-  void set_user(user* p_user);
-  user* get_user();
-  void set_name(string s_name);
-  string get_name();
-  void invalidate();
+    string get_id();
+    void invalidate();
 };
 #endif
diff --git a/src/chat/sman.cpp b/src/chat/sman.cpp
index 8246853..464bf24 100755
--- a/src/chat/sman.cpp
+++ b/src/chat/sman.cpp
@@ -6,123 +6,108 @@
 #include "../maps/mtools.h"
 #include "../contrib/crypt/md5.h"
 
-sman::sman()
+sman::sman() : smap<sess*,string>::smap(HMAPOCC)
 {
-  i_session_count = 0;
-  pthread_mutex_init( &mut_i_session_count, NULL );
+    i_session_count = 0;
+    pthread_mutex_init( &mut_i_session_count, NULL );
 }
 
 sman::~sman()
 {
-  // Delete each session object of the shashmap!
-  shashmap<sess*>::run_func( mtools<sess*>::delete_obj );
-  pthread_mutex_destroy( &mut_i_session_count );
+    // Delete each session object of the smap!
+    smap<sess*,string>::run_func( mtools<sess*>::delete_obj );	
+    pthread_mutex_destroy( &mut_i_session_count );
 }
 
-string sman::generate_id( int i_len )
+string sman::generate_id( int len )
 {
-  string s_valid = wrap::CONF->get_elem("chat.session.validchars");
-  string s_ret = "";
-
-  srand(time(0)+tool::string2int(wrap::CONF->get_elem("chat.session.kloakkey")));
-  int i_char;
-
-
-  for (int i = 0; i < i_len; i++)
-  {
-    i_char = rand() % s_valid.length();
-    s_ret += s_valid[i_char];
-  }
-
-  if ( wrap::CONF->get_elem("chat.session.md5hash") == "true" )
-  {
-    string s_salt = wrap::CONF->get_elem("chat.session.md5salt");
-    string s_hash(md5::MD5Crypt(s_ret.c_str(), s_salt.c_str()));
-    s_ret.append(s_hash.substr(s_ret.find(s_salt) + s_salt.length() + 3));
-  }
-
-  // Prove, if the TempID already exists
-  sess* p_sess = get_elem(s_ret);
-
-  if (p_sess)
-  {
-    wrap::system_message(SESSEXI);
-    return generate_id(i_len);
-  }
-
-  return s_ret;
+    string valid_chars = wrap::CONF->get_elem("chat.session.validchars");
+    string s_ret = "";
+
+    srand(time(0)+tool::string2int(wrap::CONF->get_elem("chat.session.kloakkey")));
+    int i_char;
+
+    for (int i = 0; i < len; i++)
+    {
+     i_char = rand() % 64;
+     s_ret += valid_chars[i_char];
+    }
+
+    if ( wrap::CONF->get_elem("chat.session.md5hash") == "true" )
+    {
+      string s_salt = wrap::CONF->get_elem("chat.session.md5salt");
+      s_ret = string(md5::MD5Crypt(s_ret.c_str(), s_salt.c_str())); 
+      return s_ret.substr(s_ret.find(s_salt) + s_salt.length() + 3);
+    }
+
+    return s_ret;
 }
 
 sess *sman::create_session( )
 {
-  string s_tmpid = generate_id( tool::string2int( wrap::CONF->get_elem( "chat.session.length" ) ) );
+    string s_id = generate_id( tool::string2int( wrap::CONF->get_elem( "chat.session.length" ) ) );
 
-  sess* p_sess = new sess( s_tmpid );
+    sess* p_sess = new sess( s_id );
 
-  pthread_mutex_lock( &mut_i_session_count );
-  i_session_count++;
+    pthread_mutex_lock( &mut_i_session_count );
+    i_session_count++;
 #ifdef NCURSES
-
-  print_sessions();
+    print_sessions();
 #endif
+    pthread_mutex_unlock( &mut_i_session_count );
 
-  pthread_mutex_unlock( &mut_i_session_count );
-
-  //????
-  add_elem( p_sess, s_tmpid );
+    add_elem( p_sess, s_id );
 
-  return p_sess;
+    return p_sess;
 }
 
 sess *sman::get_session( string s_id )
 {
-  return get_elem( s_id );
+    return get_elem( s_id );
 }
 
 void
 sman::destroy_session( string s_id )
 {
-  pthread_mutex_lock( &mut_i_session_count );
-  i_session_count--;
+    pthread_mutex_lock( &mut_i_session_count );
+    i_session_count--;
 #ifdef NCURSES
-
-  print_sessions();
+    print_sessions();
 #endif
+    pthread_mutex_unlock( &mut_i_session_count );
 
-  pthread_mutex_unlock( &mut_i_session_count );
-
-  sess* p_sess = get_elem( s_id );
-  del_elem( s_id );
-  delete p_sess;
+    sess* p_sess = get_elem( s_id );
+    del_elem( s_id );
+    delete p_sess;
 }
 
 #ifdef NCURSES
 void sman::print_sessions()
 {
-  if ( wrap::NCUR->is_ready() )
-  {
-    mvprintw( NCUR_SESSION_X,NCUR_SESSION_Y, "Sessions: %d ", i_session_count);
-    refresh();
-  }
+    if ( wrap::NCUR->is_ready() )
+    {
+     mvprintw( NCUR_SESSION_X,NCUR_SESSION_Y, "Sessions: %d ", i_session_count);
+     refresh();
+    }
 }
 
 #ifdef NCURSES
 void sman::print_init_ncurses()
 {
-  pthread_mutex_lock( &mut_i_session_count );
-  print_sessions();
-  pthread_mutex_unlock( &mut_i_session_count );
+    pthread_mutex_lock( &mut_i_session_count );
+    print_sessions();
+    pthread_mutex_unlock( &mut_i_session_count );
 }
 #endif
 
 int
 sman::get_session_count()
 {
-  int i_ret;
-  pthread_mutex_lock( &mut_i_session_count );
-  i_ret = i_session_count;
-  pthread_mutex_unlock( &mut_i_session_count );
-  return i_ret;
+    int i_ret;
+    pthread_mutex_lock( &mut_i_session_count );
+    i_ret = i_session_count; 
+    pthread_mutex_unlock( &mut_i_session_count );
+    return i_ret;
 }
 
 #endif
diff --git a/src/chat/sman.h b/src/chat/sman.h
index 13fc45a..1843aec 100755
--- a/src/chat/sman.h
+++ b/src/chat/sman.h
@@ -6,35 +6,31 @@
 #include <cstdlib>
 
 #include "sess.h"
-#include "../maps/shashmap.h"
-#include "../monitor/dump.h"
+#include "../maps/smap.h"
 
 using namespace std;
 
-class sman : public shashmap<sess*>
+class sman : private smap<sess*,string>
 {
 private:
-  string generate_id( int i_len );
-  int i_session_count;
+    string generate_id( int len );
+    int i_session_count;
 
-  pthread_mutex_t mut_i_session_count;
+    pthread_mutex_t mut_i_session_count;
 #ifdef NCURSES
-
-  void print_sessions();
+    void print_sessions();
 #endif
 
 public:
-  sman();
-  ~sman();
-  sess *get_session( string s_tmpid );
-  int get_session_count( );
-  sess *create_session( );
-  void destroy_session( string s_tmpid );
+    sman();
+    ~sman();
+    sess *get_session( string s_id );
+    int get_session_count( );
+    sess *create_session( );
+    void destroy_session( string s_id );
 #ifdef NCURSES
-
-  void print_init_ncurses();
+    void print_init_ncurses();
 #endif
-
 };
 
 
diff --git a/src/chat/user.cpp b/src/chat/user.cpp
index eb49f8c..40dbee8 100755
--- a/src/chat/user.cpp
+++ b/src/chat/user.cpp
@@ -8,669 +8,572 @@ using namespace std;
 
 user::user() : name( "" )
 {
-  initialize();
+ initialize();
 }
 
 user::user( string s_name ) : name( s_name )
 {
-  initialize();
+ initialize();
 }
 
 user::~user()
 {
-  //    pthread_mutex_destroy( & mut_map_mods );
-  pthread_mutex_destroy( & mut_away );
-  pthread_mutex_destroy( & mut_b_online );
-  pthread_mutex_destroy( & mut_b_fake );
-  pthread_mutex_destroy( & mut_b_invisible );
-  pthread_mutex_destroy( & mut_b_has_sess );
-  pthread_mutex_destroy( & mut_b_is_reg );
-  pthread_mutex_destroy( & mut_b_is_gag );
-  pthread_mutex_destroy( & mut_s_mess );
-  pthread_mutex_destroy( & mut_s_pass );
-  pthread_mutex_destroy( & mut_p_room );
-  pthread_mutex_destroy( & mut_s_col1 );
-  pthread_mutex_destroy( & mut_s_col2 );
-  pthread_mutex_destroy( & mut_s_email );
-  pthread_mutex_destroy( & mut_s_tmpid );
-  pthread_mutex_destroy( & mut_i_status );
-  pthread_mutex_destroy( & mut_map_changed_data );
-  pthread_cond_destroy ( &cond_message );
-  pthread_mutex_destroy( &mut_message  );
+//    pthread_mutex_destroy( & mut_map_mods );
+    pthread_mutex_destroy( & mut_away );
+    pthread_mutex_destroy( & mut_b_online );
+    pthread_mutex_destroy( & mut_b_fake );
+    pthread_mutex_destroy( & mut_b_invisible );
+    pthread_mutex_destroy( & mut_b_has_sess );
+    pthread_mutex_destroy( & mut_b_is_reg );
+    pthread_mutex_destroy( & mut_s_mess );
+    pthread_mutex_destroy( & mut_s_pass );
+    pthread_mutex_destroy( & mut_p_room );
+    pthread_mutex_destroy( & mut_s_col1 );
+    pthread_mutex_destroy( & mut_s_col2 );
+    pthread_mutex_destroy( & mut_s_email );
+    pthread_mutex_destroy( & mut_s_tmpid );
+    pthread_mutex_destroy( & mut_i_status );
+    pthread_mutex_destroy( & mut_map_changed_data );
+    pthread_cond_destroy ( &cond_message );
+    pthread_mutex_destroy( &mut_message  );
 }
 
 void
 user::initialize()
 {
-  time(&t_flood_time);
-  init_strings(wrap::CONF->get_vector("chat.fields.userstrings"));
-  init_ints(wrap::CONF->get_vector("chat.fields.userints"));
-  init_bools(wrap::CONF->get_vector("chat.fields.userbools"));
-
-  this -> p_room = 0;
-  this -> b_is_reg = false;
-  this -> b_is_gag = false;
-  this -> b_set_changed_data = false;
-  this -> b_away = false;
-  this -> b_fake = false;
-  this -> b_invisible = false;
-  this -> s_col1 = wrap::CONF->get_elem( "chat.html.user.color1" );
-  this -> s_col2 = wrap::CONF->get_elem( "chat.html.user.color2" );
-
-  // pthread_mutex_init( & mut_map_mods , NULL );
-  pthread_mutex_init( & mut_away , NULL );
-  pthread_mutex_init( & mut_b_online , NULL );
-  pthread_mutex_init( & mut_b_fake , NULL );
-  pthread_mutex_init( & mut_b_invisible , NULL );
-  pthread_mutex_init( & mut_b_has_sess , NULL );
-  pthread_mutex_init( & mut_b_is_reg , NULL );
-  pthread_mutex_init( & mut_b_is_gag , NULL );
-  pthread_mutex_init( & mut_s_mess , NULL );
-  pthread_mutex_init( & mut_s_pass , NULL );
-  pthread_mutex_init( & mut_p_room , NULL );
-  pthread_mutex_init( & mut_s_col1 , NULL );
-  pthread_mutex_init( & mut_s_col2 , NULL );
-  pthread_mutex_init( & mut_s_email , NULL );
-  pthread_mutex_init( & mut_s_tmpid , NULL );
-  pthread_mutex_init( & mut_i_status , NULL );
-  pthread_mutex_init( & mut_map_changed_data , NULL );
-  pthread_cond_init ( &cond_message, NULL);
-  pthread_mutex_init( &mut_message , NULL);
-  renew_timeout();
+    this -> b_is_reg = false;
+    this -> b_set_changed_data = false;
+    this -> b_away = false;
+    this -> b_fake = false;
+    this -> b_invisible = false;
+    this -> s_col1 = wrap::CONF->get_elem( "chat.html.user.color1" );
+    this -> s_col2 = wrap::CONF->get_elem( "chat.html.user.color2" );
+    //map_mods = new smap<dynmod*,string>(HMAPOCC);
+
+   // pthread_mutex_init( & mut_map_mods , NULL );
+    pthread_mutex_init( & mut_away , NULL );
+    pthread_mutex_init( & mut_b_online , NULL );
+    pthread_mutex_init( & mut_b_fake , NULL );
+    pthread_mutex_init( & mut_b_invisible , NULL );
+    pthread_mutex_init( & mut_b_has_sess , NULL );
+    pthread_mutex_init( & mut_b_is_reg , NULL );
+    pthread_mutex_init( & mut_s_mess , NULL );
+    pthread_mutex_init( & mut_s_pass , NULL );
+    pthread_mutex_init( & mut_p_room , NULL );
+    pthread_mutex_init( & mut_s_col1 , NULL );
+    pthread_mutex_init( & mut_s_col2 , NULL );
+    pthread_mutex_init( & mut_s_email , NULL );
+    pthread_mutex_init( & mut_s_tmpid , NULL );
+    pthread_mutex_init( & mut_i_status , NULL );
+    pthread_mutex_init( & mut_map_changed_data , NULL );
+    pthread_cond_init ( &cond_message, NULL);
+    pthread_mutex_init( &mut_message , NULL);
+    renew_timeout();
 }
 
 void
 user::clean()
 {
-  destroy_session();
-  set_fake( false );
-  set_invisible( false );
-  set_away( false, "" );
-}
-
-void
-user::destroy_session()
-{
-  if ( !get_has_sess() )
-    return;
-
+   // If this user has a session	
+   if ( get_has_sess() )
+   {
 #ifdef DATABASE
-  // Store all changed data into the mysql table if this user is registered:
-  if ( b_is_reg )
-    wrap::DATA->update_user_data( get_name(), "savechangednick", map_changed_data );
+    // Store all changed data into the mysql table if this user is registered:
+    if ( b_is_reg )
+     wrap::DATA->update_user_data( get_name(), "savechangednick", map_changed_data );    
+    wrap::SMAN->destroy_session( get_tmpid() );
 #endif
+     // wrap::system_message( SESSION + tool::int2string( wrap::SMAN->get_session_count() ) );
+   }
 
-  set_has_sess(false);
-  wrap::SMAN->destroy_session(get_tmpid());
-  set_tmpid("");
+   set_fake( false );
+   set_invisible( false );
 }
 
 string
 user::get_colored_name()
 {
-  return "<font color=\"#" + get_col1() + "\">" + get_name() + "</font>";
+ return "<font color=\"#" + get_col1() + "\">" + get_name() + "</font>";
 }
 
 void
-user::get_data( map<string,string> *p_map_data )
+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;
+    pthread_mutex_lock  ( &mut_s_mess );
+    string s_ret = s_mess;
+    s_mess = "";
+    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;
 }
 bool
 user::get_fake( )
 {
-  bool b_ret;
-  pthread_mutex_lock  ( &mut_b_fake );
-  b_ret = b_fake;
-  pthread_mutex_unlock( &mut_b_fake );
-  return b_ret;
+    bool b_ret;
+    pthread_mutex_lock  ( &mut_b_fake );
+    b_ret = b_fake;
+    pthread_mutex_unlock( &mut_b_fake );
+    return b_ret;
 }
 bool
 user::get_invisible( )
 {
-  bool b_ret;
-  pthread_mutex_lock  ( &mut_b_invisible );
-  b_ret = b_invisible;
-  pthread_mutex_unlock( &mut_b_invisible );
-  return b_ret;
+    bool b_ret;
+    pthread_mutex_lock  ( &mut_b_invisible );
+    b_ret = b_invisible;
+    pthread_mutex_unlock( &mut_b_invisible );
+    return b_ret;
 }
 
 bool
 user::get_has_sess( )
 {
-  bool b_ret;
-  pthread_mutex_lock  ( &mut_b_has_sess );
-  b_ret = b_has_sess;
-  pthread_mutex_unlock( &mut_b_has_sess );
-  return b_ret;
+    bool b_ret;
+    pthread_mutex_lock  ( &mut_b_has_sess );
+    b_ret = b_has_sess;
+    pthread_mutex_unlock( &mut_b_has_sess );
+    return b_ret;
 }
 
 void
 user::set_has_sess( bool b_has_sess )
 {
-  pthread_mutex_lock  ( &mut_b_has_sess );
-  this->b_has_sess = b_has_sess;
-  pthread_mutex_unlock( &mut_b_has_sess );
+    pthread_mutex_lock  ( &mut_b_has_sess );
+    this->b_has_sess = b_has_sess;
+    pthread_mutex_unlock( &mut_b_has_sess );
 }
 
 bool
 user::get_is_reg( )
 {
-  bool b_ret;
-  b_ret = b_is_reg;
-  return b_ret;
-}
-
-bool
-user::get_is_gag( )
-{
-  bool b_ret;
-  pthread_mutex_lock  ( &mut_b_is_gag );
-  b_ret = b_is_gag;
-  pthread_mutex_unlock( &mut_b_is_gag );
-  return b_ret;
+    bool b_ret;
+    b_ret = b_is_reg;
+    return b_ret;
 }
 
 void
 user::set_is_reg( bool b_is_reg )
 {
-  this -> b_is_reg = b_is_reg;
-}
-
-void
-user::set_is_gag( bool b_is_gag )
-{
-  pthread_mutex_lock  ( &mut_b_is_gag );
-  this -> b_is_gag = b_is_gag;
-  pthread_mutex_unlock( &mut_b_is_gag );
+    this -> b_is_reg = b_is_reg;
 }
 
 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 );
 }
 
 void
 user::set_fake( bool b_fake )
 {
-  pthread_mutex_lock  ( &mut_b_fake );
-  this -> b_fake = b_fake;
-  pthread_mutex_unlock( &mut_b_fake );
+    pthread_mutex_lock  ( &mut_b_fake );
+    this -> b_fake = b_fake;
+    pthread_mutex_unlock( &mut_b_fake );
 }
 
 void
 user::set_invisible( bool b_invisible )
 {
-  pthread_mutex_lock  ( &mut_b_invisible );
-  this -> b_invisible = b_invisible;
-  pthread_mutex_unlock( &mut_b_invisible );
+    pthread_mutex_lock  ( &mut_b_invisible );
+    this -> b_invisible = b_invisible;
+    pthread_mutex_unlock( &mut_b_invisible );
 }
 
 bool
 user::get_away()
 {
-  bool b_ret;
-  pthread_mutex_lock  ( &mut_away );
-  b_ret = b_away;
-  pthread_mutex_unlock( &mut_away );
-  return b_ret;
+    bool b_ret;
+    pthread_mutex_lock  ( &mut_away );
+    b_ret = b_away;
+    pthread_mutex_unlock( &mut_away );
+    return b_ret;
 }
 
 string
 user::get_away_msg()
 {
-  string s_ret;
-  pthread_mutex_lock  ( &mut_away );
-  s_ret = s_away;
-  pthread_mutex_unlock( &mut_away );
-  return s_ret;
+    string s_ret;
+    pthread_mutex_lock  ( &mut_away );
+    s_ret = s_away;
+    pthread_mutex_unlock( &mut_away );
+    return s_ret;
 }
 
 void
 user::set_away( bool b_away, string s_away )
 {
-  pthread_mutex_lock  ( &mut_away );
-  this -> b_away = b_away;
-  this -> s_away = s_away;
-  pthread_mutex_unlock( &mut_away );
+    pthread_mutex_lock  ( &mut_away );
+    this -> b_away = b_away;
+    this -> s_away = s_away;
+    pthread_mutex_unlock( &mut_away );
 }
 
 void
 user::set_away( bool b_away )
 {
-  pthread_mutex_lock  ( &mut_away );
-  this -> b_away = b_away;
-  pthread_mutex_unlock( &mut_away );
+    pthread_mutex_lock  ( &mut_away );
+    this -> b_away = b_away;
+    pthread_mutex_unlock( &mut_away );
 }
 
 room*
 user::get_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 );
 }
 
 string
 user::get_pass()
 {
-  string s_ret;
-  pthread_mutex_lock  ( &mut_s_pass );
-  s_ret = s_pass;
-  pthread_mutex_unlock( &mut_s_pass );
-  return s_ret;
+    string s_ret;
+    pthread_mutex_lock  ( &mut_s_pass );
+    s_ret = s_pass;
+    pthread_mutex_unlock( &mut_s_pass );
+    return s_ret;
 }
 
 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 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 s_ret;
+    pthread_mutex_lock  ( &mut_s_col2 );
+    s_ret = s_col2;
+    pthread_mutex_unlock( &mut_s_col2 );
+    return s_ret;
 }
 
 string
 user::get_email()
 {
-  string s_ret;
-  pthread_mutex_lock  ( &mut_s_email );
-  s_ret = s_email;
-  pthread_mutex_unlock( &mut_s_email );
-  return s_ret;
+    string s_ret;
+    pthread_mutex_lock  ( &mut_s_email );
+    s_ret = s_email;
+    pthread_mutex_unlock( &mut_s_email );
+    return s_ret;
 }
 
 string
 user::get_tmpid()
 {
-  string s_ret;
-  pthread_mutex_lock  ( &mut_s_tmpid );
-  s_ret = s_tmpid;
-  pthread_mutex_unlock( &mut_s_tmpid );
-  return s_ret;
+    string s_ret;
+    pthread_mutex_lock  ( &mut_s_tmpid );
+    s_ret = s_tmpid;
+    pthread_mutex_unlock( &mut_s_tmpid );
+    return s_ret;
 }
 
 void
 user::set_tmpid    ( string s_tmpid   )
 {
-  pthread_mutex_lock  ( &mut_s_tmpid );
-  this -> s_tmpid = s_tmpid;
-  pthread_mutex_unlock( &mut_s_tmpid );
+    pthread_mutex_lock  ( &mut_s_tmpid );
+    this -> s_tmpid = s_tmpid;
+    pthread_mutex_unlock( &mut_s_tmpid );
 }
 
 void
 user::set_pass  ( string s_pass )
 {
-  set_changed_data( "password", s_pass );
-  pthread_mutex_lock  ( &mut_s_pass );
-  this -> s_pass = s_pass;
-  pthread_mutex_unlock( &mut_s_pass );
+    set_changed_data( "password", s_pass );
+    pthread_mutex_lock  ( &mut_s_pass );
+    this -> s_pass = s_pass;
+    pthread_mutex_unlock( &mut_s_pass );
 }
 
 void
 user::set_col1  ( string s_col1 )
 {
-  set_changed_data( "color1", s_col1 );
-  pthread_mutex_lock  ( &mut_s_col1 );
-  this -> s_col1 = s_col1;
-  pthread_mutex_unlock( &mut_s_col1 );
+    set_changed_data( "color1", 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 )
 {
-  set_changed_data( "color2", s_col2 );
-  pthread_mutex_lock  ( &mut_s_col2 );
-  this -> s_col2 = s_col2;
-  pthread_mutex_unlock( &mut_s_col2 );
+    set_changed_data( "color2", s_col2 );
+    pthread_mutex_lock  ( &mut_s_col2 );
+    this -> s_col2 = s_col2;
+    pthread_mutex_unlock( &mut_s_col2 );
 }
 
 void
 user::set_email ( string s_email )
 {
-  set_changed_data( "email", s_email );
-  pthread_mutex_lock  ( &mut_s_email );
-  this -> s_email = s_email;
-  pthread_mutex_unlock( &mut_s_email );
+    set_changed_data( "email", s_email );
+    pthread_mutex_lock  ( &mut_s_email );
+    this -> s_email = s_email;
+    pthread_mutex_unlock( &mut_s_email );
 }
 
 int
 user::get_status  ( )
 {
-  int r_ret;
-  pthread_mutex_lock  ( &mut_i_status );
-  r_ret = i_status;
-  pthread_mutex_unlock(&mut_i_status );
-  return  r_ret;
+    int r_ret;
+    pthread_mutex_lock  ( &mut_i_status );
+    r_ret = i_status;
+    pthread_mutex_unlock(&mut_i_status );
+    return  r_ret;
 }
 
 void
 user::set_status  ( int   i_status )
 {
-  set_changed_data( "status", tool::int2string(i_status));
-  pthread_mutex_lock  ( &mut_i_status );
-  i_old_status = this -> i_status;
-  this -> i_status = i_status;
-  pthread_mutex_unlock( &mut_i_status );
+    set_changed_data( "status", tool::int2string(i_status));
+    pthread_mutex_lock  ( &mut_i_status );
+	    i_old_status = this -> i_status;
+    this -> i_status = i_status;
+    pthread_mutex_unlock( &mut_i_status );
 }
 
 void
 user::set_changed_data( string s_varname, string s_value )
 {
-  if ( b_set_changed_data )
-  {
-    pthread_mutex_lock  ( &mut_map_changed_data );
-    map_changed_data[s_varname] = s_value;
-    pthread_mutex_unlock( &mut_map_changed_data );
-  }
+    if ( b_set_changed_data )
+    { 
+     pthread_mutex_lock  ( &mut_map_changed_data );
+     map_changed_data[s_varname] = s_value; 
+     pthread_mutex_unlock( &mut_map_changed_data );
+    }
 }
 
 bool
 user::new_msgs  ( )
 {
-  pthread_mutex_lock  ( &mut_s_mess );
-  return s_mess.empty();
-  pthread_mutex_unlock( &mut_s_mess );
+    pthread_mutex_lock  ( &mut_s_mess );
+    return s_mess.empty();
+    pthread_mutex_unlock( &mut_s_mess );
 }
 
 void
 user::command( string &s_command )
 {
-  check_restore_away();
-
-  unsigned pos = s_command.find( "/" );
-  unsigned 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( wrap::CONF->get_elem("httpd.modules.commandsdir") + "yc_" );
-  string s_command2 = s_command.substr(0, pos2-1);
-  s_mod.append( s_command2  ).append( ".so" );
-
-  dynmod *mod = wrap::MODL->get_module( s_mod, get_name() );
-
-  if ( mod == NULL ||
-       wrap::CHAT->get_command_disabled( s_command2 ) ||
-       get_status() > wrap::CHAT->get_command_status( s_command2 ) )
-  {
-    string s_msg =  "<font color=\"" + wrap::CONF->get_elem("chat.html.errorcolor") + "\">"
-                    + wrap::CONF->get_elem( "chat.msgs.err.findingcommand" )
-                    + "</font>\n";
-    msg_post( &s_msg );
-    return;
-  }
-
-  vector<string> params;
-
-  // execute the module.
-  if (s_command.find(" ") != string::npos)
-  {
-    s_command = s_command.substr(s_command2.size()+1);
-    pos = s_command.find(" ");
-    pos2 = 0;
-
-    while (pos != string::npos)
+    check_restore_away();
+
+    unsigned pos = s_command.find( "/" );
+    unsigned pos2 = s_command.find( " " );
+    if( pos != string::npos )
     {
-      string sParam = s_command.substr(pos2, pos - pos2);
-      params.push_back(sParam);
-      pos2 = pos + 1;
-      pos = s_command.find(" ", pos2);
+        s_command.replace( pos, 1, "" );
     }
+    else
+        return;
 
-    if (pos2 < s_command.size())
-    {
-      params.push_back(s_command.substr(pos2, s_command.size()-pos2));
+    if (pos2 == string::npos)
+        pos2 = s_command.size() + 1;
+
+    string s_mod( wrap::CONF->get_elem("httpd.modules.commandsdir") + "yc_" );
+    string s_command2 = s_command.substr(0, pos2-1);
+    s_mod.append( s_command2  ).append( ".so" );
+
+    dynmod *mod = wrap::MODL->get_module( s_mod );
+
+    if ( mod == NULL || 
+         wrap::CHAT->get_command_disabled( s_command2 ) ||
+         get_status() > wrap::CHAT->get_command_status( s_command2 ) )
+    { 
+        string s_msg =  "<font color=\"" + wrap::CONF->get_elem("chat.html.errorcolor") + "\">" 
+			+ wrap::CONF->get_elem( "chat.msgs.err.findingcommand" )
+			+ "</font>\n";
+        msg_post( &s_msg );
+        return;
     }
 
-  }
+    vector<string> params;
 
-  container* c = new container;
-  //c->elem[0]=(void*) unreserved
-  c->elem[1] = (void*) this;
-  c->elem[2] = (void*) &params;
-  c->elem[3] = (void*) wrap::WRAP;
+    // execute the module.
+    if (s_command.find(" ") != string::npos)
+    {
+        s_command = s_command.substr(s_command2.size()+1);
+        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));
+        }
+
+    }
+
+    container* c = new container;
+    //c->elem[0]=(void*) unreserved 
+    c->elem[1] = (void*) this;
+    c->elem[2] = (void*) &params;
+    c->elem[3] = (void*) wrap::WRAP;
 
-  ( *(mod->the_func) ) ( static_cast<void*>(c) );
+    ( *(mod->the_func) ) ( (void*) c );
 
-  delete c;
+    delete c;
 }
 
 
 void
 user::s_mess_delete( )
 {
-  pthread_mutex_lock  ( &mut_s_mess );
-  s_mess = "";
-  pthread_mutex_unlock( &mut_s_mess );
+    pthread_mutex_lock  ( &mut_s_mess );
+    s_mess = "";
+    pthread_mutex_unlock( &mut_s_mess );
 }
 
 
 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::post_action_msg(string s_msgkey)
+user::check_timeout( int* i_idle_timeout )
 {
-   get_room()->msg_post(wrap::TIMR->get_time()+" "+get_colored_bold_name()+wrap::CONF->get_elem(s_msgkey)+"<br>\n");
+ int i_user_timeout = (int) get_last_activity();  
+
+ if ( get_away() ? i_idle_timeout[1] <= i_user_timeout : i_idle_timeout[0] <= i_user_timeout )
+ {
+  wrap::system_message( string(TIMERTO) + "(" + get_name() + "," + tool::int2string(i_user_timeout) + ")");
+  string s_quit = "<script language=JavaScript>top.location.href='/"
+                + wrap::CONF->get_elem("httpd.startsite")
+                + "';</script>";
+  msg_post( &s_quit ); 
+  set_online( false );
+ }
+
+ else if ( ! get_away() && i_idle_timeout[2] <= i_user_timeout )
+ {
+  wrap::system_message( string(TIMERAT) + "(" + get_name() + "," + tool::int2string(i_user_timeout) + ")");
+  string s_msg = wrap::CONF->get_elem("chat.msgs.userautoawaytimeout");
+  set_away( true, s_msg );
+  string s_msg2 = wrap::TIMR->get_time() + " <b>" + get_colored_name()+ "</b>" + s_msg + "<br>\n";
+  get_room()->msg_post( &s_msg2 ); 
+  get_room()->reload_onlineframe();
+ }
 }
 
 void
-user::renew_timeout() 
+user::get_user_list( string &s_list  )
 {
-  timo::renew_timeout();
-  double d_time_diff = wrap::TIMR->get_time_diff(t_flood_time);
+    if ( get_invisible() )
+     return;
 
-  if (d_time_diff < static_cast<double>(wrap::CONF->get_int("chat.floodprotection.seconds")))
-  {
-    if (++i_flood_messages > static_cast<double>(wrap::CONF->get_int("chat.floodprotection.messages"))) 
-    { 
-       room* p_room = get_room();
-       if (p_room == 0)
-       {
-         i_flood_messages = 0;
-         return;
-       }
-
-       wrap::system_message(CHATFLO+get_name()+","+p_room->get_name()+","+tool::int2string(i_flood_messages)+")");
-       msg_post(wrap::CONF->colored_error_msg("chat.msgs.err.flooding"));
-       if (!get_is_gag())
-       {
-         set_is_gag(true);
-         post_action_msg("chat.msgs.floodgag"); 
-       }
-    } 
-  }
-
-  else
-  {
-    time(&t_flood_time);
-    i_flood_messages = 0;
-  }
-}  
-
-void
-user::check_timeout( int* i_idle_timeout )
-{
-  double d_user_timeout = get_last_activity();
-  if ( get_away() ? i_idle_timeout[1] <= d_user_timeout : i_idle_timeout[0] <= d_user_timeout )
-  {
-    wrap::system_message( string(TIMERTO) + "(" + get_name() + "," + tool::int2string((int)d_user_timeout) + ")");
-    string s_quit = "<script language=JavaScript>top.location.href='/"
-                    + wrap::CONF->get_elem("httpd.startsite")
-                    + "';</script>";
-    msg_post( &s_quit );
-    set_online( false );
+    s_list.append( wrap::CONF->get_elem("chat.html.onlinebefore") );
+    
+    if ( get_away() )
+    {
+     s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location")+ "away.gif\"" )
+           .append( " alt='" )
+           .append( get_away_msg() )
+           .append( "' title='" )
+           .append( get_away_msg() )
+           .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
+    }
+    else if ( ! get_is_reg() ) 
+    {
+     string s_msgs = wrap::CONF->get_elem("chat.msgs.guest"); 
+     s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location")+ "guest.png\"" )
+           .append( " alt='" )
+           .append( s_msgs )
+           .append( "' title='" )
+           .append( s_msgs )
+           .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
+    }
+    else if ( get_status() != tool::string2int( wrap::CONF->get_elem("chat.defaultrang") ) && ! get_fake() )
+    {
+     string s_status = "RANG" + tool::int2string( get_status() );
+     string s_msgs = wrap::CONF->get_elem( "chat.msgs." + s_status ); 
+     s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location") +  tool::to_lower(s_status) + ".png\"" )
+           .append( " alt='" )
+           .append( s_msgs )
+           .append( "' title='" )
+           .append( s_msgs )
+           .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
+    }
 
-    pthread_cond_signal( &cond_message );
-  }
-  else if ( ! get_away() && i_idle_timeout[2] <= d_user_timeout )
-  {
-    wrap::system_message( string(TIMERAT) + "(" + get_name() + "," + tool::int2string((int)d_user_timeout) + ")");
-    string s_msg = wrap::CONF->get_elem("chat.msgs.userautoawaytimeout");
-    set_away( true, s_msg );
-    string s_msg2 = wrap::TIMR->get_time() + " <b>" + get_colored_name()+ "</b>" + s_msg + "<br>\n";
-    get_room()->msg_post( &s_msg2 );
-    get_room()->reload_onlineframe();
-  }
-}
+    else 
+    {
+     s_list.append("<img src=\"images/blank.gif\"" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> ");
+    }
 
-void
-user::get_user_list( string &s_list  )
-{
-  if ( get_invisible() )
-    return;
-
-  s_list.append( wrap::CONF->get_elem("chat.html.onlinebefore") );
-
-  if ( get_away() )
-  {
-    s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location")+ "away.gif\"" )
-    .append( " alt='" )
-    .append( get_away_msg() )
-    .append( "' title='" )
-    .append( get_away_msg() )
-    .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
-  }
-  else if ( ! get_is_reg() )
-  {
-    string s_msgs = wrap::CONF->get_elem("chat.msgs.guest");
-    s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location")+ "guest.png\"" )
-    .append( " alt='" )
-    .append( s_msgs )
-    .append( "' title='" )
-    .append( s_msgs )
-    .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
-  }
-  else if ( get_status() != tool::string2int( wrap::CONF->get_elem("chat.defaultrang") ) && ! get_fake() )
-  {
-    string s_status = "rang" + tool::int2string( get_status() );
-    string s_msgs = wrap::CONF->get_elem( "chat.msgs." + s_status );
-    s_list.append("<img src=\"" + wrap::CONF->get_elem("chat.html.rangimages.location") +  tool::to_lower(s_status) + ".png\"" )
-    .append( " alt='" )
-    .append( s_msgs )
-    .append( "' title='" )
-    .append( s_msgs )
-    .append( "'" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> " );
-  }
-  else
-  {
-    s_list.append("<img src=\"images/blank.gif\"" + wrap::CONF->get_elem("chat.html.rangimages.options") + "> ");
-  }
-
-  s_list.append( get_colored_name() );
-  s_list.append( wrap::CONF->get_elem("chat.html.onlinebehind") );
-  s_list.append( "\n" );
+    s_list.append( get_colored_name() );
+    s_list.append( wrap::CONF->get_elem("chat.html.onlinebehind") );
+    s_list.append( "\n" );
 }
 
 void
 user::check_restore_away()
 {
-  if ( get_away() )
-  {
-    get_room()->msg_post(
-      new string(
-        wrap::TIMR->get_time()
-        + " <b>" + get_colored_name()
-        + "</b> " + wrap::CONF->get_elem( "chat.msgs.unsetmodeaway" )
-        + "( <font color=" + get_col2() + ">"
-        + get_away_msg() + "</font>)<br>\n"
-      )
-    );
-    set_away( false );
-    get_room()->reload_onlineframe();
-  }
+ if ( get_away() )
+ {
+  get_room()->msg_post( 
+   new string( 
+    wrap::TIMR->get_time()
+    + " <b>" + get_colored_name()
+    + "</b> " + wrap::CONF->get_elem( "chat.msgs.unsetmodeaway" )
+    + "( <font color=" + get_col2() + ">"
+    + get_away_msg() + "</font>)<br>\n" 
+   )
+  );
+  set_away( false ); 
+  get_room()->reload_onlineframe();
+ }
 }
 
 void
 user::reconf()
-{}
-
-void
-user::dumpit()
-{
-  dumpable::add
-    ("[user]");
-  dumpable::add
-    ("Name: " + get_name() +
-        "; Room: " + get_room()->get_name() +
-        "; Status: " + tool::int2string(get_status()));
-  dumpable::add
-    ("TempID: " + get_tmpid());
-}
-
-bool
-user::same_rooms(user *p_user)
-{
-  return p_user->get_room()->get_lowercase_name()
-	.compare(this->get_room()->get_lowercase_name()) == 0;
-}
-
-string
-user::make_colors(string s_msg)
 {
-  return "<font color=\"#" + get_col1() + "\">" + s_msg + "</font>";
 }
 
 #endif
diff --git a/src/chat/user.h b/src/chat/user.h
index 06310ca..a88aea7 100755
--- a/src/chat/user.h
+++ b/src/chat/user.h
@@ -3,152 +3,132 @@
 #ifndef USER_H
 #define USER_H
 
+#include "../maps/smap.h"
 #include "../name.h"
 #include "../time/timo.h"
-#include "../monitor/dump.h"
-#include "../memb/memb.h"
 
 class room;
 
 using namespace std;
 
-class user :
-      public name,
-      public timo,
-      public dumpable,
-      public memb_base
+class user : public name, public timo
 {
 private:
 
-  // private members:
-  string s_mess;   // message string which has to be sent to the user.
-
-  bool b_online; // true if user is online.
-  bool b_has_sess; // true if user already has a session!
-  bool b_is_reg; // true if user is registered
-  bool b_is_gag; // true if user is gagged
-  bool b_away;   // true if user is away.
-  bool b_fake;   // true if user hides his status logo (does not work for guest)
-  bool b_invisible;   // true if user hides his status logo (does not work for guest)
-  bool b_set_changed_data; // Only set change data if required!
-
-  int i_status;   // user's rang ( see enum rang @ globals.h ).
-  int i_old_status;   // user's previous status.
-  int i_flood_messages; // user's message posts (needed for flood protection, does not need to be syncronized)
-  time_t t_flood_time; // user's time count (needed for flood protection, does not need to be syncronized) 
-
-  string s_tmpid;
-  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_email;  // user's email addres
-  string s_pass;   // password
-  room*  p_room;   // pointer to the user's room.
-
-  hashmap<string> map_changed_data; // Needed to tell yChat which data to change after user is removed!
-  pthread_mutex_t mut_map_changed_data;
-  pthread_mutex_t mut_s_mess;
-
-  // Modules which are allowed to be executed by the user.
-
-  pthread_mutex_t mut_away;
-  pthread_mutex_t mut_b_online;
-  pthread_mutex_t mut_b_fake;
-  pthread_mutex_t mut_b_invisible;
-  pthread_mutex_t mut_b_has_sess;
-  pthread_mutex_t mut_b_is_reg;
-  pthread_mutex_t mut_b_is_gag;
-  pthread_mutex_t mut_s_pass;
-  pthread_mutex_t mut_p_room;
-  pthread_mutex_t mut_s_col1;
-  pthread_mutex_t mut_s_col2;
-  pthread_mutex_t mut_s_email;
-  pthread_mutex_t mut_s_tmpid;
-  pthread_mutex_t mut_i_status;
-
-  void initialize();
-  void set_changed_data( string s_varname, string s_value );
-  void dumpit();
-
-public:
-  pthread_cond_t  cond_message;
-  pthread_mutex_t mut_message;
-
-  user();
-  user(string s_name);
-  ~user();
-
-  void clean();
-  void destroy_session();
-
-  // gets specific data of this user und stores it in
-  // (*p_map<string,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.
-  void get_data( map<string,string> *p_map_data );
-
-  string get_colored_name();
-  string get_colored_bold_name()
-  {
-    return "<b>" + get_colored_name() + "</b>";
-  }
-  bool  get_online();
-  bool  get_fake();
-  bool  get_invisible();
-  bool  get_has_sess();
-  bool  get_is_reg();
-  bool  get_is_gag();
-  void  set_online( bool b_online );
-  void  set_fake( bool b_fake );
-  void  set_invisible( bool b_invisible );
-  void  set_has_sess( bool b_has_sess );
-  void  set_is_reg( bool b_is_reg );
-  void  set_is_gag( bool b_is_gag );
-  void  set_changed_data_on() { b_set_changed_data = 1; }
-  bool  get_away( );
-  string  get_away_msg( );
-  void  set_away( bool b_away, string s_away );
-  void  set_away( bool b_away );
-  room* get_room();
-  void  set_p_room( room* p_room );
-  string get_pass();
-  string get_col1();
-  string get_col2();
-  string get_email();
-  string get_tmpid();
-  void   set_tmpid( string s_tmpid );
-  void   set_pass( string s_col1 );
-  void   set_col1( string s_col1 );
-  void   set_col2( string s_col2 );
-  void   set_email( string s_email );
-  int    get_status( );
-  void   set_status( int i_status );
-  bool   new_msgs  ( );
-  void   post_action_msg(string s_msgkey);
-  void   check_timeout( int* i_idle_timeout );
-  void   renew_timeout();
-
-  // executes a command.
-  void command( string &s_command );
-
-  // gets the message and clears s_mess;
-  string get_mess();
-
-
-  // Here are starting methods which are mainly needed by the data<type> class.
-  // appends a string to s_mess including br.
-  void msg_post( string s_msg )
-  {
-    msg_post( &s_msg );
-  }
-  void msg_post( string *p_msg );
-  void s_mess_delete( );
-  void get_user_list( string &s_list );
-  void check_restore_away();
-  void reconf();
-  bool same_rooms(user *p_user);
-  string make_colors(string s_msg);
+    // private members:
+    bool   b_online; // true if user is online.
+    bool   b_has_sess; // true if user already has a session! 
+    bool   b_is_reg; // true if user is registered 
+    bool   b_away;   // true if user is away.
+    bool   b_fake;   // true if user hides his status logo (does not work for guest)
+    bool   b_invisible;   // true if user hides his status logo (does not work for guest)
+    int   i_status;   // user's rang ( see enum rang @ globals.h ).
+    int   i_old_status;   // user's previous status.
+    string s_tmpid;
+    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_email;  // user's email addres 
+    string s_mess;   // message string which has to be sent to the user.
+    string s_pass;   // password
+    room*  p_room;   // pointer to the user's room.
+
+    map_string map_changed_data; // Needed to tell yChat which data to change after user is removed!
+    bool             b_set_changed_data; // Only set change data if required! 
+
+    // Modules which are allowed to be executed by the user.
+
+   // smap<dynmod*,string>* map_mods;
+
+  //  pthread_mutex_t mut_map_mods;
+    pthread_mutex_t mut_away;
+    pthread_mutex_t mut_b_online;
+    pthread_mutex_t mut_b_fake;
+    pthread_mutex_t mut_b_invisible;
+    pthread_mutex_t mut_b_has_sess;
+    pthread_mutex_t mut_b_is_reg;
+    pthread_mutex_t mut_s_mess;
+    pthread_mutex_t mut_s_pass;
+    pthread_mutex_t mut_p_room;
+    pthread_mutex_t mut_s_col1;
+    pthread_mutex_t mut_s_col2;
+    pthread_mutex_t mut_s_email;
+    pthread_mutex_t mut_s_tmpid;
+    pthread_mutex_t mut_i_status;
+    pthread_mutex_t mut_map_changed_data;
+
+    void initialize();
+    void   set_changed_data( string s_varname, string s_value );
+
+ public:
+   pthread_cond_t  cond_message;
+   pthread_mutex_t mut_message;
+
+   user();
+   user(string s_name);
+   ~user();
+
+    void clean();
+
+    // 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.
+    void get_data( map_string *p_map_data );
+
+    string get_colored_name();
+    string get_colored_bold_name()
+    { 
+     return "<b>" + get_colored_name() + "</b>";
+    }
+    bool  get_online();
+    bool  get_fake();
+    bool  get_invisible();
+    bool  get_has_sess();
+    bool  get_is_reg();
+    void  set_online( bool b_online );
+    void  set_fake( bool b_fake );
+    void  set_invisible( bool b_invisible );
+    void  set_has_sess( bool b_has_sess );
+    void  set_is_reg( bool b_is_reg );
+    void  set_changed_data_on() { b_set_changed_data = 1; }
+    bool  get_away( );
+    string  get_away_msg( );
+    void  set_away( bool b_away, string s_away );
+    void  set_away( bool b_away );
+    room* get_room();
+    void  set_p_room( room* p_room );
+    string get_pass();
+    string get_col1();
+    string get_col2();
+    string get_email();
+    string get_tmpid();
+    void   set_tmpid( string s_tmpid );
+    void   set_pass( string s_col1 );
+    void   set_col1( string s_col1 );
+    void   set_col2( string s_col2 );
+    void   set_email( string s_email );
+    int    get_status( );
+    void   set_status( int i_status );
+    bool   new_msgs  ( );
+    void   check_timeout( int* i_idle_timeout );
+
+    // executes a command.
+    void command( string &s_command );
+
+    // gets the message and clears s_mess;
+    string get_mess();
+
+
+    // Here are starting methods which are mainly needed by the data<type> class.
+    // appends a string to s_mess including br.
+    void msg_post( string s_msg ) { msg_post( &s_msg ); }
+    void msg_post( string *p_msg );
+    void s_mess_delete( );
+    void get_user_list( string &s_list );
+    void check_restore_away();
+    void reconf();
 };
 
 #endif
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index dd70b4c..2b110db 100755
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -38,13 +38,13 @@ cli::parse_input( string s_input )
   cout << CLIPRMO << " (ex)it        - Quits CLI mode and respawns ncurses mode" << endl;
 #endif
   cout << CLIPRMO << " (h)elp        - Prints out this help!" << endl
-       << CLIPRMO << " (m)ysql       - Runs MySQL client on yhttpd DB" << endl;
+       << CLIPRMO << " (m)ysql       - Runs MySQL client on yChat DB" << endl;
   cout << CLIPRMO << " (rel)oad      - Reloads all modules" << endl;
 #ifdef EXPERIM
   cout << CLIPRMO << " (re)conf      - Reloads configuration (EXPERIMENTAL)" << endl;
 #endif
   cout << CLIPRMO << " (r)usage      - Shows current resource usage" << endl
-       << CLIPRMO << " (ru)sageh     - Shows resource usage history (yhttpd needs to run > 1 day)" << endl
+       << CLIPRMO << " (ru)sageh     - Shows resource usage history (yChat needs to run > 1 day)" << endl
        << CLIPRMO << " (set) VAR VAL - Sets configuration value VAR to VAL" << endl
        << CLIPRMO << " (sh)ell       - Runs a system shell" << endl
        << CLIPRMO << " (s)hutdown    - Shuts down the whole server" << endl
@@ -112,7 +112,7 @@ cli::parse_input( string s_input )
 #ifdef EXPERIM
  else if( s_input.compare("reconf") == 0 || s_input.compare("re") == 0 )
  {
-  wrap::HTTPD->reconf();
+  wrap::CHAT->reconf();
   cout << CLIPRMI;
  }
 #endif
@@ -188,7 +188,7 @@ cli::parse_input( string s_input )
  }
  else if( s_input.compare("v") == 0 || s_input.compare("version") == 0 )
  {
-  cout << CLIPRMO  << tool::yhttpd_version() << " " << UNAME << endl; 
+  cout << CLIPRMO  << tool::ychat_version() << " " << UNAME << endl; 
   cout << CLIPRMI;
  }
  else
diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index 99347e9..67849ef 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -12,7 +12,7 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : nmap<string,st
 {
     string s_check[] = { 
      get_name(),
-     string(getenv("HOME"))+string("/.yhttpd/") + get_name(),
+     string(getenv("HOME"))+string("/.ychat/") + get_name(),
      string("./etc/") + get_name(),
      string("/etc/") + get_name(),
      string(PREFIX+string("etc/")+get_name()) };
@@ -56,9 +56,9 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : nmap<string,st
     vector<string> vec_string; 
     parse_xml(p_xml, &vec_string);
 
-    nmap<string,string>::add_elem_insecure(tool::yhttpd_version(), "yhttpd.version");
+    nmap<string,string>::add_elem_insecure(tool::ychat_version(), "ychat.version");
   
-    // Overrides yhttpd.conf values with command line options (yhttpd -o key1 value1 -o key2 value2 ...)
+    // Overrides ychat.conf values with command line options (ychat -o key1 value1 -o key2 value2 ...)
     map<string,string>::iterator iter; 
     for ( iter = p_start_params->begin(); iter != p_start_params->end(); iter++ )
     {
@@ -152,4 +152,12 @@ conf::exit_if_xml_error() const
     }
 }
 
+//<<*
+string
+conf::colored_error_msg(string s_key)
+{
+	return "<font color=\"#" + nmap<string,string>::get_elem("chat.html.errorcolor") + "\">" + nmap<string,string>::get_elem(s_key) + "</font><br>\n"; 	
+}
+//*>>
+
 #endif
diff --git a/src/conf/conf.h b/src/conf/conf.h
index 7508872..7ff69ac 100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -19,9 +19,10 @@ private:
     void exit_if_xml_error() const;
     void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
 public:
-    //conf ( string s_conf );
     conf ( string s_conf, map<string,string>* p_start_params );
     ~conf();
+
+    string colored_error_msg( string s_key );  //<<
 };
 
 #endif
diff --git a/src/configure b/src/configure
index c68183c..f1bd2d5 100755
--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# The yhttpd Project (2003 - 2004)
+# The yChat Project (2003 - 2004)
 #
 
 if ! which perl >/dev/null
@@ -26,12 +26,14 @@ perl -e '
  my @headers = (
    "dlfcn.h",
    "pthread.h",
+   "mysql/mysql.h", #//<< Not needed for yhttpd
    "netinet/in.h",
    "time.h",
    "ncurses.h"
  );
 
  my @libs = (
+   "libmysqlclient.so", #//<< Not needed for yhttpd
    "libncurses.so"
  );
 
@@ -89,14 +91,14 @@ perl -e '
    "/opt/local/lib"
  );
 
- if ( defined $ENV{YHTTPDHEADERPATHS} ) {
+ if ( defined $ENV{YCHATHEADERPATHS} ) {
    map { print "Adding $_...\n";
-         unshift @headerpaths, $_ } split /:/, $ENV{YHTTPDHEADERPATHS};
+         unshift @headerpaths, $_ } split /:/, $ENV{YCHATHEADERPATHS};
  }
 
- if ( defined $ENV{YHTTPDLIBPATHS} ) {
+ if ( defined $ENV{YCHATLIBPATHS} ) {
    map { print "Adding $_...\n";
-        unshift @libpaths, $_ } split /:/, $ENV{YHTTPDLIBPATHS};
+        unshift @libpaths, $_ } split /:/, $ENV{YCHATLIBPATHS};
  }
 
  sub check {
@@ -138,8 +140,8 @@ perl -e '
     print "NOT OK\n";
     print "Please make sure that you have the needed software installed!\n";
     print "If you have a special path for your includes then edit src/configure!\n";
-    print "Or set the environment variables YHTTPDHEADERPATHS and YHTTPDLIBPATHS.\n";
-    print " Example: setenv YHTTPDHEADERPATHS \"/your/header/includes:/a/includes\"\n";
+    print "Or set the environment variables YCHATHEADERPATHS and YCHATLIBPATHS.\n";
+    print " Example: setenv YCHATHEADERPATHS \"/your/header/includes:/a/includes\"\n";
     print "(The environment variables have to be seperated by an :)\n"; 
     exit(1);
   }
@@ -188,7 +190,9 @@ perl -e '
  my $compiler = `tail -n 1 ../g++.version`;
  my $version  = `tail -n 2 ../g++.version | head -n 1`;
  my $uname    = `uname -srm`;
+ my $compopt  = join "; ", split /\n/, `cat ../g++.version`;
  chomp $uname;
+ chomp $compopt;
  print "Configuring for $uname...\n";
  chomp $cpp;
  chomp $version;
@@ -230,6 +234,7 @@ perl -e '
  open F, ">msgs.h" or die "msgs.h: $!\n";
  foreach (@msgs) {
    s/(UNAME)(.+)$/UNAME "$uname"/;
+   s/(COMPOPT)(.+)$/COMPOPT "$compopt"/;
    print F; 
  }
  close F;
diff --git a/src/contrib/README b/src/contrib/README
index 105f25d..873f114 100644
--- a/src/contrib/README
+++ b/src/contrib/README
@@ -1,5 +1,5 @@
-This directory includes source code which has been included directly into yhttpd but is not
-programmed by the yhttpd project explicitly which means the source code here is from extern.
+This directory includes source code which has been included directly into yChat but is not
+programmed by the yChat project explicitly which means the source code here is from extern.
 
 Used versions:
 tinyxml 2.3.2
diff --git a/src/contrib/crypt/md5.cpp b/src/contrib/crypt/md5.cpp
index 9dd1f08..7023956 100644
--- a/src/contrib/crypt/md5.cpp
+++ b/src/contrib/crypt/md5.cpp
@@ -18,8 +18,7 @@
 #include <string.h>		/* for memcpy() */
 #include "md5.h"
 
-namespace md5
-{
+namespace md5 {
 
 #ifndef HIGHFIRST
 #define byteReverse(buf, len)	/* Nothing */
@@ -28,20 +27,18 @@ void byteReverse(unsigned char *buf, unsigned longs);
 
 #ifndef ASM_MD5
 /*
-* Note: this code is harmless on little-endian machines.
-*/
+ * Note: this code is harmless on little-endian machines.
+ */
 void
 byteReverse(unsigned char *buf, unsigned longs)
 {
-  uint32 t;
-  do
-  {
-    t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
-        ((unsigned) buf[1] << 8 | buf[0]);
-    *(uint32 *) buf = t;
-    buf += 4;
-  }
-  while (--longs);
+    uint32 t;
+    do {
+	t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
+	    ((unsigned) buf[1] << 8 | buf[0]);
+	*(uint32 *) buf = t;
+	buf += 4;
+    } while (--longs);
 }
 #endif
 #endif
@@ -53,13 +50,13 @@ byteReverse(unsigned char *buf, unsigned longs)
 void
 MD5Init(struct MD5Context *ctx)
 {
-  ctx->buf[0] = 0x67452301;
-  ctx->buf[1] = 0xefcdab89;
-  ctx->buf[2] = 0x98badcfe;
-  ctx->buf[3] = 0x10325476;
+    ctx->buf[0] = 0x67452301;
+    ctx->buf[1] = 0xefcdab89;
+    ctx->buf[2] = 0x98badcfe;
+    ctx->buf[3] = 0x10325476;
 
-  ctx->bits[0] = 0;
-  ctx->bits[1] = 0;
+    ctx->bits[0] = 0;
+    ctx->bits[1] = 0;
 }
 
 /*
@@ -69,49 +66,46 @@ MD5Init(struct MD5Context *ctx)
 void
 MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
 {
-  uint32 t;
+    uint32 t;
 
-  /* Update bitcount */
+    /* Update bitcount */
 
-  t = ctx->bits[0];
-  if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
-    ctx->bits[1]++;		/* Carry from low to high */
-  ctx->bits[1] += len >> 29;
+    t = ctx->bits[0];
+    if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
+	ctx->bits[1]++;		/* Carry from low to high */
+    ctx->bits[1] += len >> 29;
 
-  t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
+    t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
 
-  /* Handle any leading odd-sized chunks */
+    /* Handle any leading odd-sized chunks */
 
-  if (t)
-  {
-    unsigned char *p = (unsigned char *) ctx->in + t;
+    if (t) {
+	unsigned char *p = (unsigned char *) ctx->in + t;
 
-    t = 64 - t;
-    if (len < t)
-    {
-      memcpy(p, buf, len);
-      return;
+	t = 64 - t;
+	if (len < t) {
+	    memcpy(p, buf, len);
+	    return;
+	}
+	memcpy(p, buf, t);
+	byteReverse(ctx->in, 16);
+	MD5Transform(ctx->buf, (uint32 *) ctx->in);
+	buf += t;
+	len -= t;
+    }
+    /* Process data in 64-byte chunks */
+
+    while (len >= 64) {
+	memcpy(ctx->in, buf, 64);
+	byteReverse(ctx->in, 16);
+	MD5Transform(ctx->buf, (uint32 *) ctx->in);
+	buf += 64;
+	len -= 64;
     }
-    memcpy(p, buf, t);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32 *) ctx->in);
-    buf += t;
-    len -= t;
-  }
-  /* Process data in 64-byte chunks */
-
-  while (len >= 64)
-  {
-    memcpy(ctx->in, buf, 64);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32 *) ctx->in);
-    buf += 64;
-    len -= 64;
-  }
 
-  /* Handle any remaining bytes of data. */
+    /* Handle any remaining bytes of data. */
 
-  memcpy(ctx->in, buf, len);
+    memcpy(ctx->in, buf, len);
 }
 
 /*
@@ -121,46 +115,43 @@ MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
 void
 MD5Final(unsigned char digest[16], struct MD5Context *ctx)
 {
-  unsigned count;
-  unsigned char *p;
-
-  /* Compute number of bytes mod 64 */
-  count = (ctx->bits[0] >> 3) & 0x3F;
-
-  /* Set the first char of padding to 0x80.  This is safe since there is
-     always at least one byte free */
-  p = ctx->in + count;
-  *p++ = 0x80;
-
-  /* Bytes of padding needed to make 64 bytes */
-  count = 64 - 1 - count;
-
-  /* Pad out to 56 mod 64 */
-  if (count < 8)
-  {
-    /* Two lots of padding:  Pad the first block to 64 bytes */
-    memset(p, 0, count);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (uint32 *) ctx->in);
+    unsigned count;
+    unsigned char *p;
+
+    /* Compute number of bytes mod 64 */
+    count = (ctx->bits[0] >> 3) & 0x3F;
+
+    /* Set the first char of padding to 0x80.  This is safe since there is
+       always at least one byte free */
+    p = ctx->in + count;
+    *p++ = 0x80;
+
+    /* Bytes of padding needed to make 64 bytes */
+    count = 64 - 1 - count;
+
+    /* Pad out to 56 mod 64 */
+    if (count < 8) {
+	/* Two lots of padding:  Pad the first block to 64 bytes */
+	memset(p, 0, count);
+	byteReverse(ctx->in, 16);
+	MD5Transform(ctx->buf, (uint32 *) ctx->in);
+
+	/* Now fill the next block with 56 bytes */
+	memset(ctx->in, 0, 56);
+    } else {
+	/* Pad block to 56 bytes */
+	memset(p, 0, count - 8);
+    }
+    byteReverse(ctx->in, 14);
 
-    /* Now fill the next block with 56 bytes */
-    memset(ctx->in, 0, 56);
-  }
-  else
-  {
-    /* Pad block to 56 bytes */
-    memset(p, 0, count - 8);
-  }
-  byteReverse(ctx->in, 14);
-
-  /* Append length in bits and transform */
-  ((uint32 *) ctx->in)[14] = ctx->bits[0];
-  ((uint32 *) ctx->in)[15] = ctx->bits[1];
-
-  MD5Transform(ctx->buf, (uint32 *) ctx->in);
-  byteReverse((unsigned char *) ctx->buf, 4);
-  memcpy(digest, ctx->buf, 16);
-  memset((char *) ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    /* Append length in bits and transform */
+    ((uint32 *) ctx->in)[14] = ctx->bits[0];
+    ((uint32 *) ctx->in)[15] = ctx->bits[1];
+
+    MD5Transform(ctx->buf, (uint32 *) ctx->in);
+    byteReverse((unsigned char *) ctx->buf, 4);
+    memcpy(digest, ctx->buf, 16);
+    memset((char *) ctx, 0, sizeof(ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5
@@ -185,85 +176,85 @@ MD5Final(unsigned char digest[16], struct MD5Context *ctx)
 void
 MD5Transform(uint32 buf[4], uint32 const in[16])
 {
-  register uint32 a, b, c, d;
-
-  a = buf[0];
-  b = buf[1];
-  c = buf[2];
-  d = buf[3];
-
-  MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-  MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-  MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-  MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-  MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-  MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-  MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-  MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-  MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-  MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-  MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-  MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-  MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-  MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-  MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-  MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-  MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-  MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-  MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-  MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-  MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-  MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-  MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-  MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-  MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-  MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-  MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-  MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-  MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-  MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-  MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-  MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
-  MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-  MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-  MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-  MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-  MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-  MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-  MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-  MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-  MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-  MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-  MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-  MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-  MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-  MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-  MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-  MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
-  MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-  MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-  MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-  MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-  MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-  MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-  MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-  MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-  MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-  MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-  MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-  MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-  MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-  MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-  MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-  MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
-  buf[0] += a;
-  buf[1] += b;
-  buf[2] += c;
-  buf[3] += d;
+    register uint32 a, b, c, d;
+
+    a = buf[0];
+    b = buf[1];
+    c = buf[2];
+    d = buf[3];
+
+    MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+    MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+    MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+    MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+    MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+    MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+    MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+    MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+    MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+    MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+    MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+    MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+    MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+    MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+    MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+    MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+    MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+    MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+    MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+    MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+    MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+    MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+    MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+    MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+    MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+    MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+    MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+    MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+    MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+    MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+    MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+    MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+    MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+    MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+    MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+    MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+    MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+    MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+    MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+    MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+    MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+    MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+    MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+    MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+    MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+    MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+    MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+    MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+    MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+    MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+    MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+    MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+    MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+    MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+    MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+    MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+    MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+    MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+    MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+    MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+    MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+    MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+    MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+    MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+
+    buf[0] += a;
+    buf[1] += b;
+    buf[2] += c;
+    buf[3] += d;
 }
 
 #endif
diff --git a/src/contrib/crypt/md5.h b/src/contrib/crypt/md5.h
index 19c782c..0b9d532 100644
--- a/src/contrib/crypt/md5.h
+++ b/src/contrib/crypt/md5.h
@@ -1,25 +1,22 @@
 #ifndef MD5_H
 #define MD5_H
 
-namespace md5
-{
+namespace md5 {
 #ifdef __alpha
 typedef unsigned int uint32;
 #else
-
 typedef unsigned long uint32;
 #endif
 
-struct MD5Context
-{
-  uint32 buf[4];
-  uint32 bits[2];
-  unsigned char in[64];
+struct MD5Context {
+	uint32 buf[4];
+	uint32 bits[2];
+	unsigned char in[64];
 };
 
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, unsigned char const *buf,
-               unsigned len);
+	       unsigned len);
 void MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32 buf[4], uint32 const in[16]);
 
diff --git a/src/contrib/crypt/md5crypt.cpp b/src/contrib/crypt/md5crypt.cpp
index 933519d..16b0235 100644
--- a/src/contrib/crypt/md5crypt.cpp
+++ b/src/contrib/crypt/md5crypt.cpp
@@ -16,20 +16,18 @@
 #include <string.h>
 #include "md5.h"
 
-namespace md5
-{
+namespace md5 {
 
 static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
-  "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 static void
 to64(char *s, unsigned long v, int n)
 {
-  while (--n >= 0)
-  {
-    *s++ = itoa64[v&0x3f];
-    v >>= 6;
-  }
+	while (--n >= 0) {
+		*s++ = itoa64[v&0x3f];
+		v >>= 6;
+	}
 }
 
 /*
@@ -41,122 +39,109 @@ to64(char *s, unsigned long v, int n)
 char *
 MD5Crypt(const char *pw, const char *salt)
 {
-  static char	*magic = "$1$";	/*
-                        						 * This string is magic for
-                        						 * this algorithm.  Having
-                        						 * it this way, we can get
-                        						 * get better later on
-                        						 */
-  static char     passwd[120], *p;
-  static const char *sp,*ep;
-  unsigned char	final[16];
-  int sl,pl,i,j;
-  MD5_CTX	ctx,ctx1;
-  unsigned long l;
-
-  /* Refine the Salt first */
-  sp = salt;
-
-  /* If it starts with the magic string, then skip that */
-  if(!strncmp(sp,magic,strlen(magic)))
-    sp += strlen(magic);
-
-  /* It stops at the first '$', max 8 chars */
-  for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
-    continue;
-
-  /* get the length of the true salt */
-  sl = ep - sp;
-
-  MD5Init(&ctx);
-
-  /* The password first, since that is what is most unknown */
-  MD5Update(&ctx,(const unsigned char*)pw,strlen(pw));
-
-  /* Then our magic string */
-  MD5Update(&ctx,(const unsigned char*)magic,strlen(magic));
-
-  /* Then the raw salt */
-  MD5Update(&ctx,(const unsigned char*)sp,sl);
-
-  /* Then just as many characters of the MD5(pw,salt,pw) */
-  MD5Init(&ctx1);
-  MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
-  MD5Update(&ctx1,(const unsigned char*)sp,sl);
-  MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
-  MD5Final(final,&ctx1);
-  for(pl = strlen(pw); pl > 0; pl -= 16)
-    MD5Update(&ctx,final,pl>16 ? 16 : pl);
-
-  /* Don't leave anything around in vm they could use. */
-  memset(final,0,sizeof final);
-
-  /* Then something really weird... */
-  for (j=0,i = strlen(pw); i ; i >>= 1)
-    if(i&1)
-      MD5Update(&ctx, final+j, 1);
-    else
-      MD5Update(&ctx, (const unsigned char*)pw+j, 1);
-
-  /* Now make the output string */
-  strcpy(passwd,magic);
-  strncat(passwd,sp,sl);
-  strcat(passwd,"$");
-
-  MD5Final(final,&ctx);
-
-  /*
-   * and now, just to make sure things don't run too fast
-   * On a 60 Mhz Pentium this takes 34 msec, so you would
-   * need 30 seconds to build a 1000 entry dictionary...
-   */
-  for(i=0;i<1000;i++)
-  {
-    MD5Init(&ctx1);
-    if(i & 1)
-      MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
-    else
-      MD5Update(&ctx1,final,16);
-
-    if(i % 3)
-      MD5Update(&ctx1,(const unsigned char*)sp,sl);
-
-    if(i % 7)
-      MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
-
-    if(i & 1)
-      MD5Update(&ctx1,final,16);
-    else
-      MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
-    MD5Final(final,&ctx1);
-  }
-
-  p = passwd + strlen(passwd);
-
-  l = (final[ 0]<<16) | (final[ 6]<<8) | final[12];
-  to64(p,l,4);
-  p += 4;
-  l = (final[ 1]<<16) | (final[ 7]<<8) | final[13];
-  to64(p,l,4);
-  p += 4;
-  l = (final[ 2]<<16) | (final[ 8]<<8) | final[14];
-  to64(p,l,4);
-  p += 4;
-  l = (final[ 3]<<16) | (final[ 9]<<8) | final[15];
-  to64(p,l,4);
-  p += 4;
-  l = (final[ 4]<<16) | (final[10]<<8) | final[ 5];
-  to64(p,l,4);
-  p += 4;
-  l =                    final[11]                ;
-  to64(p,l,2);
-  p += 2;
-  *p = '\0';
-
-  /* Don't leave anything around in vm they could use. */
-  memset(final,0,sizeof final);
-
-  return passwd;
+	static char	*magic = "$1$";	/*
+						 * This string is magic for
+						 * this algorithm.  Having
+						 * it this way, we can get
+						 * get better later on
+						 */
+	static char     passwd[120], *p;
+	static const char *sp,*ep;
+	unsigned char	final[16];
+	int sl,pl,i,j;
+	MD5_CTX	ctx,ctx1;
+	unsigned long l;
+
+	/* Refine the Salt first */
+	sp = salt;
+
+	/* If it starts with the magic string, then skip that */
+	if(!strncmp(sp,magic,strlen(magic)))
+		sp += strlen(magic);
+
+	/* It stops at the first '$', max 8 chars */
+	for(ep=sp;*ep && *ep != '$' && ep < (sp+8);ep++)
+		continue;
+
+	/* get the length of the true salt */
+	sl = ep - sp;
+
+	MD5Init(&ctx);
+
+	/* The password first, since that is what is most unknown */
+	MD5Update(&ctx,(const unsigned char*)pw,strlen(pw));
+
+	/* Then our magic string */
+	MD5Update(&ctx,(const unsigned char*)magic,strlen(magic));
+
+	/* Then the raw salt */
+	MD5Update(&ctx,(const unsigned char*)sp,sl);
+
+	/* Then just as many characters of the MD5(pw,salt,pw) */
+	MD5Init(&ctx1);
+	MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
+	MD5Update(&ctx1,(const unsigned char*)sp,sl);
+	MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
+	MD5Final(final,&ctx1);
+	for(pl = strlen(pw); pl > 0; pl -= 16)
+		MD5Update(&ctx,final,pl>16 ? 16 : pl);
+
+	/* Don't leave anything around in vm they could use. */
+	memset(final,0,sizeof final);
+
+	/* Then something really weird... */
+	for (j=0,i = strlen(pw); i ; i >>= 1)
+		if(i&1)
+		    MD5Update(&ctx, final+j, 1);
+		else
+		    MD5Update(&ctx, (const unsigned char*)pw+j, 1);
+
+	/* Now make the output string */
+	strcpy(passwd,magic);
+	strncat(passwd,sp,sl);
+	strcat(passwd,"$");
+
+	MD5Final(final,&ctx);
+
+	/*
+	 * and now, just to make sure things don't run too fast
+	 * On a 60 Mhz Pentium this takes 34 msec, so you would
+	 * need 30 seconds to build a 1000 entry dictionary...
+	 */
+	for(i=0;i<1000;i++) {
+		MD5Init(&ctx1);
+		if(i & 1)
+			MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
+		else
+			MD5Update(&ctx1,final,16);
+
+		if(i % 3)
+			MD5Update(&ctx1,(const unsigned char*)sp,sl);
+
+		if(i % 7)
+			MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
+
+		if(i & 1)
+			MD5Update(&ctx1,final,16);
+		else
+			MD5Update(&ctx1,(const unsigned char*)pw,strlen(pw));
+		MD5Final(final,&ctx1);
+	}
+
+	p = passwd + strlen(passwd);
+
+	l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4;
+	l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4;
+	l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4;
+	l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4;
+	l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4;
+	l =                    final[11]                ; to64(p,l,2); p += 2;
+	*p = '\0';
+
+	/* Don't leave anything around in vm they could use. */
+	memset(final,0,sizeof final);
+
+	return passwd;
 }
 
 }
diff --git a/src/contrib/xml/README b/src/contrib/xml/README
index 7da9dfd..c03aaad 100644
--- a/src/contrib/xml/README
+++ b/src/contrib/xml/README
@@ -1,7 +1,7 @@
 ATTENTION:
 
 This version of TinyXML has ben very little modified by 
-Paul C. Buetow in 2004 to fit the yhttpd project.
+Paul C. Buetow in 2004 to fit the yChat project.
 
 To get the original source go to 
 http://www.sourceforge.net/projects/tinyxml
diff --git a/src/data/con.cpp b/src/data/con.cpp
index b3aebcc..b381232 100755
--- a/src/data/con.cpp
+++ b/src/data/con.cpp
@@ -8,36 +8,36 @@ using namespace std;
 
 con::con()
 {
-  p_mysql = mysql_init(NULL);
+ p_mysql = mysql_init(NULL); 
 
-  while ( !p_mysql )
-  {
-    wrap::system_message( MYSQLE1 );
-    usleep( 30000000 );
-    mysql_init(p_mysql);
-  }
+ while ( !p_mysql )
+ {
+  wrap::system_message( MYSQLE1 ); 
+  usleep( 30000000 ); 	
+  mysql_init(p_mysql); 
+ }
 
-  while ( mysql_real_connect(
-            p_mysql,
-            (const char*)wrap::CONF->get_elem("chat.database.serverhost").c_str(),
-            (const char*)wrap::CONF->get_elem("chat.database.user").c_str(),
-            (const char*)wrap::CONF->get_elem("chat.database.password").c_str(),
-            (const char*)wrap::CONF->get_elem("chat.database.dbname").c_str(),
-            tool::string2int(wrap::CONF->get_elem("chat.database.port")),
-            NULL, 0 ) == NULL )
-  {
-    wrap::system_message( MYSQLQU + string( mysql_error(p_mysql) ) );
-    usleep( 30000000 );
-  }
+ while ( mysql_real_connect( 
+  p_mysql, 
+  (const char*)wrap::CONF->get_elem("chat.database.serverhost").c_str(), 
+  (const char*)wrap::CONF->get_elem("chat.database.user").c_str(), 
+  (const char*)wrap::CONF->get_elem("chat.database.password").c_str(), 
+  (const char*)wrap::CONF->get_elem("chat.database.dbname").c_str(), 
+  tool::string2int(wrap::CONF->get_elem("chat.database.port")), 
+  NULL, 0 ) == NULL )
+ {
+  wrap::system_message( MYSQLQU + string( mysql_error(p_mysql) ) ); 
+  usleep( 30000000 ); 	
+ } 
 }
 
 con::~con()
 {
-  if ( p_mysql )
-  {
-    if (mysql_ping( p_mysql ) != 0)
-      mysql_close( p_mysql );
-  }
+ if ( p_mysql )
+ {
+  if (mysql_ping( p_mysql ) != 0)
+   mysql_close( p_mysql );
+ }
 }
 
 #endif
diff --git a/src/data/con.h b/src/data/con.h
index 9fda07b..bc54341 100755
--- a/src/data/con.h
+++ b/src/data/con.h
@@ -4,7 +4,7 @@
 #ifndef CON_H
 #define CON_H
 
-#include <mysql/mysql.h>
+#include <mysql/mysql.h> 
 #include <iostream>
 #include "con_base.h"
 
@@ -13,9 +13,9 @@ using namespace std;
 class con : public con_base
 {
 public:
-  MYSQL* p_mysql;
-  con( );
-  ~con( );
+ MYSQL* p_mysql;
+ con( );
+ ~con( );
 };
 
 #endif
diff --git a/src/data/con_base.cpp b/src/data/con_base.cpp
index 003a376..24bbbc9 100755
--- a/src/data/con_base.cpp
+++ b/src/data/con_base.cpp
@@ -8,11 +8,12 @@ using namespace std;
 
 con_base::con_base()
 {
-  renew_timeout( );
+ renew_timeout( );
 }
 
 con_base::~con_base()
-{}
+{
+}
 
 
 #endif
diff --git a/src/data/con_base.h b/src/data/con_base.h
index 9ebb89e..60b12c2 100755
--- a/src/data/con_base.h
+++ b/src/data/con_base.h
@@ -11,8 +11,8 @@ using namespace std;
 class con_base : public timo
 {
 public:
-  con_base( );
-  ~con_base( );
+    con_base( );
+    ~con_base( );
 };
 
 #endif
diff --git a/src/data/data.cpp b/src/data/data.cpp
index fa509dd..e8f309c 100644
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@@ -7,196 +7,194 @@
 using namespace std;
 
 data::data()
-{}
+{
+}
 
 data::~data()
-{}
+{
+}
 
-hashmap<string>
+map_string
 data::select_user_data( string s_user, string s_query)
 {
-  string s_where_rule = " WHERE nick = \"" + s_user + "\"";
-  vector<string> vec_elements;
-  MYSQL_RES* p_result = select_query( s_query, s_where_rule, vec_elements );
-  return parse_result( p_result, vec_elements );
+ string s_where_rule = " WHERE nick = \"" + s_user + "\"";
+ vector<string> vec_elements;
+ MYSQL_RES* p_result = select_query( s_query, s_where_rule, vec_elements );
+ return parse_result( p_result, vec_elements );
 }
 
-MYSQL_RES*
+MYSQL_RES* 
 data::select_query( string s_query, string s_where_rule, vector<string>& vec_elements )
 {
-  con* p_con = get_con();
+ con* p_con = get_con();
 
-  vec_elements = map_queries[s_query];
-  string s_mysql_query = "SELECT ";
-  vector<string>::iterator iter = vec_elements.begin();
+ vec_elements = map_queries[s_query];
+ string s_mysql_query = "SELECT ";
+ vector<string>::iterator iter = vec_elements.begin();
 
-  string s_table = *iter;
-  iter++;
+ string s_table = *iter; iter++;
 
-  while ( iter != vec_elements.end() )
-  {
-    s_mysql_query.append( secure_query(*iter) );
-    if ( ++iter != vec_elements.end() )
-      s_mysql_query.append( ", " );
-  }
+ while ( iter != vec_elements.end() )
+ {
+  s_mysql_query.append( secure_query(*iter) );
+  if ( ++iter != vec_elements.end() )
+   s_mysql_query.append( ", " );
+ }
 
-  s_mysql_query.append(" FROM " + s_table + s_where_rule );
-  print_query( MYSQLQU + s_mysql_query );
+ s_mysql_query.append(" FROM " + s_table + s_where_rule );
+ print_query( MYSQLQU + s_mysql_query );
 
-  MYSQL_RES* p_result = NULL;
+ MYSQL_RES* p_result = NULL;
 
-  if ( 0 == mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) )
-  {
-    p_result = mysql_store_result( p_con->p_mysql );
-    push_con( p_con );
-  }
-  else
-  {
-    wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
-    if (p_con != NULL)
-      delete p_con;
-  }
+ if ( 0 == mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) )
+ {
+  p_result = mysql_store_result( p_con->p_mysql ); 
+  push_con( p_con );
+ }
+
+ else
+ {
+  wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
+  if (p_con != NULL)
+   delete p_con;
+ }
 
-  return p_result;
+ return p_result;
 }
 
-hashmap<string>
+map_string
 data::parse_result( MYSQL_RES* p_result, vector<string>& vec_elements )
 {
-  hashmap<string> map_ret;
-  if ( p_result != NULL )
-  {
-    MYSQL_ROW row;
-    vector<string>::iterator vec_iter = vec_elements.begin();
-    vec_iter++;
-
-    while( (row = mysql_fetch_row(p_result)) )
-      for ( int i=0; i < mysql_num_fields(p_result); i++, vec_iter++ )
-        map_ret[*vec_iter] = string(row[i]);
-
-    mysql_free_result( p_result );
-  }
-  return map_ret;
+ map_string map_ret;
+ if ( p_result != NULL )
+ {
+   MYSQL_ROW row;
+   vector<string>::iterator vec_iter = vec_elements.begin(); vec_iter++;
+
+   while( (row = mysql_fetch_row(p_result)) )
+    for ( int i=0; i < mysql_num_fields(p_result); i++, vec_iter++ )
+     map_ret[*vec_iter] = string(row[i]);
+
+   mysql_free_result( p_result ); 
+ }
+ return map_ret;
 }
 
 void
-data::insert_user_data( string s_user, string s_query, map<string,string> insert_map )
+data::insert_user_data( string s_user, string s_query, map_string insert_map )
 {
-  insert_query( s_query, insert_map );
+ insert_query( s_query, insert_map ); 
 }
 
 void
-data::insert_query( string s_query, map<string,string> map_insert )
+data::insert_query( string s_query, map_string map_insert )
 {
-  vector<string> vec_elements = map_queries[s_query];
-  vector<string>::iterator iter = vec_elements.begin();
-
-  string s_table = *iter;
-  iter++;
-  string s_mysql_query = "INSERT INTO " + s_table + " (";
-
-  while ( iter != vec_elements.end() )
-  {
-    s_mysql_query.append( *iter );
-
-    if ( ++iter != vec_elements.end() )
-      s_mysql_query.append( ", " );
-    else
-      s_mysql_query.append( ") VALUES(" );
-  }
+ vector<string> vec_elements = map_queries[s_query];
+ vector<string>::iterator iter = vec_elements.begin();
+
+ string s_table = *iter; iter++;
+ string s_mysql_query = "INSERT INTO " + s_table + " (";
+ 
+ while ( iter != vec_elements.end() )
+ {
+  s_mysql_query.append( *iter );
+
+  if ( ++iter != vec_elements.end() )
+   s_mysql_query.append( ", " );
+  else
+   s_mysql_query.append( ") VALUES(" );
+ }
 
-  iter = vec_elements.begin();
-  iter++;
+ iter = vec_elements.begin(); iter++;
 
-  while ( iter != vec_elements.end() )
-  {
-    s_mysql_query.append( "\"" + secure_query(map_insert[*iter]) + "\"" );
-    if ( ++iter != vec_elements.end() )
-      s_mysql_query.append( ", " );
-    else
-      s_mysql_query.append( ")" );
-  }
+ while ( iter != vec_elements.end() )
+ {
+  s_mysql_query.append( "\"" + secure_query(map_insert[*iter]) + "\"" );
+  if ( ++iter != vec_elements.end() )
+   s_mysql_query.append( ", " );
+  else
+   s_mysql_query.append( ")" );
+ }
 
-  print_query( MYSQLQU + s_mysql_query );
+ print_query( MYSQLQU + s_mysql_query );
 
-  con* p_con = get_con();
+ con* p_con = get_con();
 
-  if ( 0 != mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) )
-    wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
+ if ( 0 != mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) )
+  wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
 
-  push_con( p_con );
+ push_con( p_con );
 
-  return;
+ return;
 }
 
-void
-data::update_user_data( string s_user, string s_query, hashmap<string> update_map )
+void 
+data::update_user_data( string s_user, string s_query, map_string update_map )
 {
-  vector<string> vec_elements = map_queries[s_query];
+ vector<string> vec_elements = map_queries[s_query];
 
-  if ( vec_elements.size() == 0 )
-    return;
+ if ( vec_elements.size() == 0 )
+  return;
 
-  vector<string>::iterator iter = vec_elements.begin();
-  vector<string>::iterator iter_second = vec_elements.begin();
-  iter_second++;
+ vector<string>::iterator iter = vec_elements.begin();
+ vector<string>::iterator iter_second = vec_elements.begin();
+ iter_second++;
 
-  string s_table = *iter;
-  iter++;
-  string s_mysql_query = "UPDATE " + s_table + " SET ";
-  bool b_flag = 0;
+ string s_table = *iter; iter++;
+ string s_mysql_query = "UPDATE " + s_table + " SET ";
+ bool b_flag = 0;
 
-  while ( iter != vec_elements.end() )
+ while ( iter != vec_elements.end() )
+ {
+  if ( update_map[*iter] == "" ) // Dont update data if it has not been changed / if its empty!
   {
-    if ( update_map[*iter] == "" ) // Dont update data if it has not been changed / if its empty!
-    {
-      iter++;
-      continue;
-    }
+   iter++; 
+   continue;
+  } 
 
-    if ( iter != iter_second && b_flag )
-      s_mysql_query.append( ", " );
+  if ( iter != iter_second && b_flag )
+   s_mysql_query.append( ", " );
 
-    s_mysql_query.append( *iter + "=\"" + secure_query(update_map[*iter]) + "\"" );
-    b_flag = 1;
-    iter++;
-  }
+  s_mysql_query.append( *iter + "=\"" + secure_query(update_map[*iter]) + "\"" );
+  b_flag = 1;
+  iter++;
+ }
 
-  if ( b_flag )
-  {
-    s_mysql_query.append( " WHERE nick=\"" + tool::to_lower(s_user) + "\"" );
+ if ( b_flag )
+ {
+  s_mysql_query.append( " WHERE nick=\"" + tool::to_lower(s_user) + "\"" );
 
-    con* p_con = get_con();
-    print_query( MYSQLQU + s_mysql_query );
+  con* p_con = get_con();
+  print_query( MYSQLQU + s_mysql_query );
 
-    if ( 0 != mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) )
-      wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
+  if ( 0 != mysql_query( p_con->p_mysql, (const char*)s_mysql_query.c_str() ) ) 
+   wrap::system_message( MYSQLQU + string( mysql_error(p_con->p_mysql) ) );
 
-    push_con( p_con );
-  }
+  push_con( p_con );
+ }
 }
 
 string
 data::secure_query( string s_mysql_query )
 {
-  // Prevent from MySQL injection attacks (escaping " and \)
-  unsigned i_pos = s_mysql_query.find("\\");
+ // Prevent from MySQL injection attacks (escaping " and \)
+ unsigned i_pos = s_mysql_query.find("\\");
 
-  while ( i_pos != string::npos )
-  {
-    s_mysql_query.replace( i_pos, 1, "/" );
-    i_pos = s_mysql_query.find("\\");
-  }
+ while ( i_pos != string::npos )
+ {
+  s_mysql_query.replace( i_pos, 1, "/" );
+  i_pos = s_mysql_query.find("\\");
+ }
 
-  i_pos = s_mysql_query.find("\"");
+ i_pos = s_mysql_query.find("\"");
 
-  while ( i_pos != string::npos )
-  {
-    s_mysql_query.replace( i_pos, 1, "'" );
-    i_pos = s_mysql_query.find("\"");
-  }
+ while ( i_pos != string::npos )
+ {
+  s_mysql_query.replace( i_pos, 1, "'" );
+  i_pos = s_mysql_query.find("\"");
+ }
 
-  return s_mysql_query;
+ return s_mysql_query;
 }
 
 #endif
diff --git a/src/data/data.h b/src/data/data.h
index a6ca90f..fa21763 100644
--- a/src/data/data.h
+++ b/src/data/data.h
@@ -12,17 +12,17 @@ using namespace std;
 class data : public data_base // data implementation used in data.h
 {
 private:
-  MYSQL_RES* select_query( string s_query, string s_where_rule, vector<string>& vec_elements );
-  hashmap<string> parse_result( MYSQL_RES* p_result, vector<string>& vec_elements );
-  void insert_query( string s_query, map<string,string> map_insert );
-  string secure_query( string s_mysql_query );
+ MYSQL_RES* select_query( string s_query, string s_where_rule, vector<string>& vec_elements );
+ map_string parse_result( MYSQL_RES* p_result, vector<string>& vec_elements );
+ void insert_query( string s_query, map_string map_insert );
+ string secure_query( string s_mysql_query );
 public:
-  data( );
-  ~data( );
+    data( );
+   ~data( );
 
-  hashmap<string> select_user_data( string s_user, string s_query );
-  void insert_user_data( string s_user, string s_query, map<string,string> insert_map );
-  void update_user_data( string s_user, string s_query, hashmap<string> update_map );
+ map_string select_user_data( string s_user, string s_query );
+ void insert_user_data( string s_user, string s_query, map_string insert_map );
+ void update_user_data( string s_user, string s_query, map_string update_map );
 };
 
 #endif
diff --git a/src/data/data_base.cpp b/src/data/data_base.cpp
index 8150608..c8bf033 100644
--- a/src/data/data_base.cpp
+++ b/src/data/data_base.cpp
@@ -8,93 +8,92 @@ using namespace std;
 
 data_base::data_base( )
 {
-  pthread_mutex_init ( &mut_con, NULL );
+ pthread_mutex_init ( &mut_con, NULL );
 
-  vector<string> vec_keys = *wrap::CONF->get_key_vector();
-  vector<string>::iterator iter;
+ vector<string> vec_keys = *wrap::CONF->get_key_vector();
+ vector<string>::iterator iter;
 
-  // Reads all DATA_ elements of conf.txt!
-  for ( iter = vec_keys.begin(); iter != vec_keys.end(); iter++ )
+ // Reads all DATA_ elements of conf.txt!
+ for ( iter = vec_keys.begin(); iter != vec_keys.end(); iter++ )
+ {
+  if ( iter->length() > 20 
+	&& iter->compare(0, 19, "chat.database.mysql") == 0 
+	&& iter->find(".descr") == string::npos ) 
   {
-    if ( iter->length() > 20
-         && iter->compare(0, 19, "chat.database.mysql") == 0
-         && iter->find(".descr") == string::npos )
+   vector<string> vec_tokens;
+   string s_element = wrap::CONF->get_elem(*iter); 
+   unsigned i_pos = 0;  
+  
+   for ( bool b_find = 1; b_find; ) 
+   {
+    i_pos = s_element.find_first_of( " ", 0 );   
+
+    if ( i_pos != string::npos )
     {
-      vector<string> vec_tokens;
-      string s_element = wrap::CONF->get_elem(*iter);
-      unsigned i_pos = 0;
-
-      for ( bool b_find = 1; b_find; )
-      {
-        i_pos = s_element.find_first_of( " ", 0 );
-
-        if ( i_pos != string::npos )
-        {
-          vec_tokens.push_back( s_element.substr(0, i_pos) );
-          s_element = s_element.substr( i_pos+1 );
-        }
-        else
-        {
-          vec_tokens.push_back( s_element );
-          b_find = 0;
-        }
-      }
-
-      string s_mysqlquery = iter->substr(20);
-      wrap::system_message(MYSQLQ2 + s_mysqlquery);
-      map_queries[s_mysqlquery] = vec_tokens;
+     vec_tokens.push_back( s_element.substr(0, i_pos) );
+     s_element = s_element.substr( i_pos+1 );
     }
+
+    else
+    {
+     vec_tokens.push_back( s_element );
+     b_find = 0;
+    }
+   }
+
+   string s_mysqlquery = iter->substr(20);
+   wrap::system_message(MYSQLQ2 + s_mysqlquery);
+   map_queries[s_mysqlquery] = vec_tokens;
   }
+ }
 }
 
-void data_base::init_connections()
-{
-  int i_min_con = tool::string2int( wrap::CONF->get_elem("chat.database.mincon") ),
-                  i_max_con = tool::string2int( wrap::CONF->get_elem("chat.database.maxcon") );
+void data_base::initialize_connections() {
+ int i_min_con = tool::string2int( wrap::CONF->get_elem("chat.database.mincon") ),
+     i_max_con = tool::string2int( wrap::CONF->get_elem("chat.database.maxcon") );
 
-  wrap::system_message(DATAIN0 + tool::int2string(i_max_con));
-  wrap::system_message(DATAIN1 + tool::int2string(i_min_con));
+ wrap::system_message(DATAIN0 + tool::int2string(i_max_con));
+ wrap::system_message(DATAIN1 + tool::int2string(i_min_con));
 
-  for ( int i = 0; i < i_min_con && i < i_max_con; i++ )
-    push_back( new con() );
+ for ( int i = 0; i < i_min_con && i < i_max_con; i++ )
+  push_back( new con() );
 
 #ifdef NCURSES
-
-  print_queue_size();
+ print_queue_size();
 #endif
 }
 
 data_base::~data_base()
 {
-  pthread_mutex_destroy ( &mut_con );
+ pthread_mutex_destroy ( &mut_con );
 }
 
-hashmap<string>
+map_string
 data_base::select_user_data( string s_user, string s_query)
 {
-  print_query( DATAQUE + s_query );
-  hashmap<string> map_ret;
-  return map_ret;
+ print_query( DATAQUE + s_query );
+ map_string map_ret;
+ return map_ret;
 }
 
 void
-data_base::insert_user_data( string s_user, string s_query, hashmap<string> insert_map )
+data_base::insert_user_data( string s_user, string s_query, map_string insert_map )
 {
-  print_query( DATAQUE + s_query );
+ print_query( DATAQUE + s_query );
 }
 
 
 void
-data_base::update_user_data( string s_user, string s_query, hashmap<string> update_map )
+data_base::update_user_data( string s_user, string s_query, map_string update_map )
 {
-  print_query( DATAQUE + s_query );
+ print_query( DATAQUE + s_query );
 }
 
 void
 data_base::print_query( string s_query )
 {
 #ifdef DATA_PRINT_QUERIES
-  print_query_( s_query );
+ print_query_( s_query );
 #endif
 }
 
@@ -102,124 +101,119 @@ data_base::print_query( string s_query )
 void
 data_base::print_query_( string s_query )
 {
-  wrap::system_message( s_query );
+ wrap::system_message( s_query );
 }
 #endif
 
 con*
 data_base::get_con()
 {
-  pthread_mutex_lock( &mut_con );
+ pthread_mutex_lock( &mut_con );
 
-  if ( empty() )
-  {
-    wrap::system_message( DATANEW + string("(") + tool::int2string(size()+1) + ")" );
-    pthread_mutex_unlock( &mut_con );
-    return new con;
-  }
-  else if ( size() > i_max_con-1 )
-  {
-    wrap::system_message( DATAMAX + string("(") + tool::int2string(i_max_con) + ")" );
-    usleep( 5000000 );
-    pthread_mutex_unlock( &mut_con );
-    return get_con();
-  }
+ if ( empty() )
+ {
+  wrap::system_message( DATANEW + string("(") + tool::int2string(size()+1) + ")" );
+  pthread_mutex_unlock( &mut_con );
+  return new con;
+ }
 
+ else if ( size() > i_max_con-1 )
+ {
+  wrap::system_message( DATAMAX + string("(") + tool::int2string(i_max_con) + ")" );
+  usleep( 5000000 ); 	
+  pthread_mutex_unlock( &mut_con );
+  return get_con();
+ }
 
-  con* p_con = *begin();
-  pop_front();
 
-#ifdef NCURSES
+ con* p_con = *begin();
+ pop_front();
 
-  print_queue_size();
+#ifdef NCURSES
+ print_queue_size();
 #endif
 
-  pthread_mutex_unlock( &mut_con );
-  wrap::system_message( DATAGET  );
+ pthread_mutex_unlock( &mut_con );
+ wrap::system_message( DATAGET  );
 
-  p_con->renew_timeout();
-  return p_con;
+ p_con->renew_timeout();
+ return p_con; 
 }
 
 void
-data_base::push_con( con* p_con )
+data_base::push_con( con* p_con ) 
 {
-  pthread_mutex_lock( &mut_con );
-  push_front( p_con );
+ pthread_mutex_lock( &mut_con );
+ push_front( p_con );
 #ifdef NCURSES
-
-  print_queue_size();
+ print_queue_size();
 #endif
-
-  pthread_mutex_unlock( &mut_con );
-  wrap::system_message( DATAADD );
+ pthread_mutex_unlock( &mut_con );
+ wrap::system_message( DATAADD );
 }
 
 #ifdef NCURSES
 void
 data_base::print_queue_size()
 {
-  if ( wrap::NCUR->is_ready() )
-  {
-    mvprintw( NCUR_CON_QUEUE_X,NCUR_CON_QUEUE_Y, "Con. queue: %d ", size());
-    refresh();
-  }
+   if ( wrap::NCUR->is_ready() )
+    {
+     mvprintw( NCUR_CON_QUEUE_X,NCUR_CON_QUEUE_Y, "Con. queue: %d ", size());
+     refresh();
+   }
 }
 #endif
 
 void
 data_base::disconnect_all_connections()
 {
-  wrap::system_message( DATADIS );
-  pthread_mutex_lock( &mut_con );
+ wrap::system_message( DATADIS );
+ pthread_mutex_lock( &mut_con );
 
-  while ( !empty() )
-  {
-    con* p_con = *begin();
-    pop_front();
-    delete p_con;
-  }
-
-  pthread_mutex_unlock( &mut_con );
+ while ( !empty() )
+ {
+  con* p_con = *begin();
+  pop_front();
+  delete p_con;
+ }
+      
+ pthread_mutex_unlock( &mut_con );
 #ifdef NCURSES
-
-  print_queue_size();
+ print_queue_size();
 #endif
 }
 
 void
 data_base::check_data_con_timeout()
 {
-  int i_timeout_time = tool::string2int(wrap::CONF->get_elem("chat.database.contimeout"));
-  int i_last_activity;
+ int i_timeout_time = tool::string2int(wrap::CONF->get_elem("chat.database.contimeout"));
+ int i_last_activity;
 
-  pthread_mutex_lock( &mut_con );
-
-  list< list<con*>::iterator > erase_list;
-  for ( list<con*>::iterator iter = begin();
+ pthread_mutex_lock( &mut_con );
+ 
+ list< list<con*>::iterator > erase_list;
+ for ( list<con*>::iterator iter = begin();
         iter != end(); iter++ )
   {
-    i_last_activity = (int) (*iter)->get_last_activity();
-    if ( i_timeout_time <= i_last_activity )
-    {
-      con* p_con = *iter;
-      erase_list.push_back(iter);
-      delete p_con;
-      wrap::system_message(DATADI2 + tool::int2string(size()-erase_list.size()+1) + ","
-                           + tool::int2string(i_timeout_time) + ","
-                           + tool::int2string(i_last_activity) + ")");
-    }
+   i_last_activity = (int) (*iter)->get_last_activity(); 
+   if ( i_timeout_time <= i_last_activity )
+   {
+    con* p_con = *iter;
+    erase_list.push_back(iter);
+    delete p_con;
+    wrap::system_message(DATADI2 + tool::int2string(size()-erase_list.size()+1) + "," 
+                                 + tool::int2string(i_timeout_time) + ","
+                                 + tool::int2string(i_last_activity) + ")");
+   }
   }
   for ( list< list<con*>::iterator >::iterator erase_iter = erase_list.begin();
         erase_iter != erase_list.end(); erase_iter++ )
-    erase( *erase_iter );
+   erase( *erase_iter );
 
 #ifdef NCURSES
-
   print_queue_size();
 #endif
-
-  pthread_mutex_unlock( &mut_con );
+ pthread_mutex_unlock( &mut_con );
 }
 
 
diff --git a/src/data/data_base.h b/src/data/data_base.h
index 79f5630..b38d978 100644
--- a/src/data/data_base.h
+++ b/src/data/data_base.h
@@ -12,36 +12,33 @@ using namespace std;
 
 class data_base : protected list<con*>
 {
-private:
+ private:
   pthread_mutex_t mut_con;
   int i_max_con;
 
 #ifdef NCURSES
-
   void print_queue_size();
 #endif
 
-protected:
-  hashmap< vector<string> > map_queries;
+ protected:
+  map< string, vector<string> > map_queries;
   void print_query( string s_query );
 #ifdef DATA_PRINT_QUERIES
-
   virtual void print_query_( string s_query );
 #endif
-
   con* get_con();
   void push_con( con* p_con );
 
-public:
+ public:
   data_base();
   ~data_base();
 
-  void init_connections();
-  virtual hashmap<string> select_user_data( string s_user, string s_query );
-  virtual void insert_user_data( string s_user, string s_query, hashmap<string> insert_map );
-  virtual void update_user_data( string s_user, string s_query, hashmap<string> update_map );
-  void disconnect_all_connections();
-  void check_data_con_timeout();
+ void initialize_connections();
+ virtual map_string select_user_data( string s_user, string s_query );
+ virtual void insert_user_data( string s_user, string s_query, map_string insert_map );
+ virtual void update_user_data( string s_user, string s_query, map_string update_map );
+ void disconnect_all_connections();
+ void check_data_con_timeout();
 };
 
 #endif
diff --git a/src/glob.h b/src/glob.h
index c134df5..1ff4cbf 100755
--- a/src/glob.h
+++ b/src/glob.h
@@ -19,18 +19,36 @@
 /* - CONFIG -
  What should be the name of the config file?
 */
-#define CONFILE "yhttpd.conf"
+#define CONFILE "ychat.conf"
 
 /* - CONFIG -
- In which prefix should yhttpd be installed if typing gmake inst-
+ In which prefix should yChat be installed if typing gmake inst-
  all? 
 */
 #define PREFIX "/usr/local"
 
+//<<*
+/* - CONFIG - 
+ Should yChat get compiled with database support? Currently MyS-
+ QL only is a supported database. 
+*/
+#define DATABASE
+
+#ifdef DATABASE
+/* - CONFIG - 
+ Should all database queries printed out at the admin interface? 
+ (This option wont take action if database support has not been 
+ chosen) 
+*/
+#define DATA_PRINT_QUERIES
+
+#define USE_MYSQL 
+#endif
+//*>>
 
 /* - CONFIG -
  Please enter the highest networking port which is allowed to be 
- used. If yhttpd is unable to create the server socket on a cert-
+ used. If yChat is unable to create the server socket on a cert-
  ain port, it will increment the port number and retries to cre-
  ate another socket on the incremented port number. This proced-
  ure will continue until MAXPORT has been reached.
@@ -63,7 +81,7 @@
 /* - CONFIG - 
  Please chose if you want to use verbose server outputs or not. 
  The verbose messages will appear in the ncurses menu if ncurses
- is enabled or in the server-window if yhttpd has been compiled 
+ is enabled or in the server-window if yChat has been compiled 
  without ncurses support. This option shows you all incoming
  requests with the client IP and port numbers. You probably want
  this to be turned of if you have heavy server load.
@@ -73,17 +91,17 @@
 /* - CONFIG - 
  If you want to enable EXPERIMENTAL features, then set this val-
  ue to true. Else use false which is recommended! All experimen-
- al features are marked inside of the running yhttpd!
+ al features are marked inside of the running yChat!
 */
 //#define EXPERIM
 
 /* - CONFIG -
- Should yhttpd get compiled with ncurses support?
+ Should yChat get compiled with ncurses support?
 */ 
 #define NCURSES
 
 /* - CONFIG -
- Should yhttpd get compiled with comand line interface support?
+ Should yChat get compiled with comand line interface support?
 */
 #define CLI
 
@@ -99,6 +117,14 @@
 // Enables debugging options 
 //#define DEBUG
 
+//<<*
+/* - CONFIG -
+ Defines the amount of newlines which have to be sent to the clie-
+ nt's chat stream after the first log-in. It prevents a white scr-
+ een because of browser buffers or proxies.
+*/
+#define PUSHSTR 500
+//*>>
 
 
 // The following values define the positions of the data stats in the NCURSES interface.
@@ -124,8 +150,8 @@
 #define NCUR_CON_QUEUE_X 23 
 #define NCUR_CON_QUEUE_Y 35
 
-#define NCUR_HTTPD_HEADER_X 21
-#define NCUR_HTTPD_HEADER_Y 52
+#define NCUR_CHAT_HEADER_X 21
+#define NCUR_CHAT_HEADER_Y 52
 #define NCUR_NUM_ROOMS_X 22
 #define NCUR_NUM_ROOMS_Y 52 
 #define NCUR_SESSION_X 23
diff --git a/src/html.cpp b/src/html.cpp
index 7f1440d..1f839bb 100755
--- a/src/html.cpp
+++ b/src/html.cpp
@@ -112,6 +112,22 @@ html::parse( map_string &map_params )
     return s_templ;
 }
 
+//<<*
+void
+html::online_list( user *p_user, map_string &map_params )
+{
+    // prepare user_list.
+    string s_list;
+
+    room* p_room = p_user->get_room();
+
+    p_room->get_user_list( s_list );
+
+    map_params["ROOMNAME"] = p_room->get_name();
+    map_params["ROOMTOPIC"] = p_room->get_topic();
+    map_params["USERLIST"] = s_list;
+}
+//*>>
 
 #ifdef NCURSES
 void
diff --git a/src/html.h b/src/html.h
index d8d2a16..70d91d3 100755
--- a/src/html.h
+++ b/src/html.h
@@ -5,6 +5,7 @@
 #define HTML_H
 
 #include "maps/smap.h"
+#include "chat/user.h"
 #include "name.h"
 
 using namespace std;
@@ -31,6 +32,7 @@ public:
     // used for string substituation.
     string parse( map_string &map_params );
 
+    void online_list( user *p_user, map_string &map_params ); //<<
 #ifdef NCURSES
     void print_cached( int i_docs );
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 0948e63..c4330d8 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * yhttpd++; Contact: www.yhttpd.org; Mail@yhttpd.org
+ * yChat++; Contact: www.yChat.org; Mail@yChat.org
  * Copyright (C) 2003 Paul C. Buetow, Volker Richter 
  * Copyright (C) 2004 Paul C. Buetow
  * -----------------------------------------------------------------
@@ -39,7 +39,7 @@ parse_argc( int argc, char* argv[] )
 
  string s_output = "";
 
- // Set to 1 if a config option key has to be read ( ./yhttpd -o key1 value1 -o key2 value2 ... );
+ // Set to 1 if a config option key has to be read ( ./ychat -o key1 value1 -o key2 value2 ... );
  bool b_conf = 0;
 
  // Will store the key of an additional option value (see also b_conf)
@@ -62,9 +62,9 @@ parse_argc( int argc, char* argv[] )
   else
   {
    if ( string(argv[i]).find("v") != string::npos )
-    s_output.append(tool::yhttpd_version()+"\n");
+    s_output.append(tool::ychat_version()+"\n");
    if ( string(argv[i]).find("h") != string::npos )
-    s_output.append( "Usage: ./yhttpd {h|v}|{o confkey confvalue}\n" );
+    s_output.append( "Usage: ./ychat {h|v}|{o confkey confvalue}\n" );
    if ( string(argv[i]).find("o") != string::npos )
     b_conf = 1;
   }
@@ -85,7 +85,7 @@ main(int argc, char* argv[])
 {
  map<string,string>* p_start_params = parse_argc( argc, argv );
 
-    cout << tool::yhttpd_version() << endl 
+    cout << tool::ychat_version() << endl 
          << DESCRIP << endl
     	 << DESCRI2 << endl
          << CONTACT << endl
@@ -118,6 +118,10 @@ main(int argc, char* argv[])
     // init the system message logd 
     wrap::WRAP->LOGD = wrap::LOGD = new logd( wrap::CONF->get_elem("httpd.logging.systemfile"),
                                               wrap::CONF->get_elem("httpd.logging.systemlines") );
+    //<<*
+    // init the session manager.
+    wrap::WRAP->SMAN = wrap::SMAN = new sman; 
+    //*>>
     
 
     // init the socket manager.
@@ -132,6 +136,10 @@ main(int argc, char* argv[])
      usleep(1000);
 #endif
 
+    //<<*
+    // init the chat manager.
+    wrap::WRAP->CHAT = wrap::CHAT = new chat; 
+    //*>>
 
     // init the system timer.
     wrap::WRAP->TIMR = wrap::TIMR = new timr; 
@@ -140,6 +148,15 @@ main(int argc, char* argv[])
     // init the module-loader manager.
     wrap::WRAP->MODL = wrap::MODL = new modl; 
 
+    //<<*
+    // init the garbage collector 
+    wrap::WRAP->GCOL = wrap::GCOL = new gcol; 
+
+    // init the data manager. 
+#ifdef DATABASE
+    wrap::WRAP->DATA = wrap::DATA = new data; 
+#endif
+    //*>>
 
 #ifndef NCURSES
 #ifdef CLI
@@ -148,6 +165,12 @@ main(int argc, char* argv[])
 #endif
 #endif
 
+    //<<*	
+    // Initialize database connection queue
+#ifdef DATABASE
+    wrap::DATA->initialize_connections();
+#endif
+    //*>>
 
     // 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.
diff --git a/src/modl.cpp b/src/modl.cpp
index ca620ce..f95b90f 100755
--- a/src/modl.cpp
+++ b/src/modl.cpp
@@ -17,7 +17,6 @@ modl::modl(  ) : smap<dynmod*,string>(HMAPOCC)
 #ifdef NCURSES
     print_cached( 0 );
 #endif
-    
     if ( wrap::CONF->get_elem( "httpd.modules.preloadcommands" ).compare( "true" ) == 0 )
      preload_modules( wrap::CONF->get_elem("httpd.modules.commandsdir") );
 
@@ -51,7 +50,7 @@ modl::preload_modules( string s_path )
   do
   {
    if ( iter->length() >= 3 && iter->compare( iter->length()-3, 3, ".so" ) == 0 )
-    cache_module( s_path + *iter );
+    cache_module( s_path + *iter, false );
   }
   while ( ++iter != dir_vec.end() );
  }
@@ -70,7 +69,7 @@ modl::dlclose_( dynmod* mod )
 }
 
 dynmod*
-modl::cache_module( string s_name )
+modl::cache_module( string s_name, bool b_print_sys_msg )
 {
     void     *the_module = NULL;
     function *the_func   = NULL;
@@ -92,8 +91,8 @@ modl::cache_module( string s_name )
         return NULL;
     }
 
-    wrap::system_message( MODULEC + s_name.substr( s_name.find_last_of("/")+1 ) ); 
-
+    if ( b_print_sys_msg )
+     wrap::system_message( MODULEC + s_name.substr( s_name.find_last_of("/")+1 ) ); 
 
     dynmod *mod     = new dynmod; // encapsulates the function and module handler.
     mod->the_func   = the_func  ; // the function to execute
@@ -117,7 +116,7 @@ modl::get_module( string s_name )
 {
     wrap::system_message( MODULER + s_name.substr( s_name.find_last_of("/")+1 ) ); 
     dynmod* mod = get_elem( s_name );
-    return ! mod ? cache_module( s_name ) : mod;
+    return ! mod ? cache_module( s_name, true ) : mod;
 }
 
 void
diff --git a/src/modl.h b/src/modl.h
index 50587cd..a65077d 100755
--- a/src/modl.h
+++ b/src/modl.h
@@ -11,7 +11,7 @@ class modl : private smap<dynmod*,string>
 {
 private:
     static  void dlclose_( dynmod* mod   );
-    dynmod* cache_module ( string s_name );
+    dynmod* cache_module ( string s_name, bool b_print_sys_msg );
     void preload_modules( string s_path );
 
 #ifdef NCURSES
diff --git a/src/mods/Makefile b/src/mods/Makefile
index 1b0712b..36ab1f0 100755
--- a/src/mods/Makefile
+++ b/src/mods/Makefile
@@ -1,9 +1,8 @@
-MAKE=`tail -n 1 ../../make.version`
 all: mods
 mods:
-	@${MAKE} -C ./commands #//<<
-	@${MAKE} -C ./html
+	gmake -C ./commands #//<<
+	gmake -C ./html
 clean:
-	@${MAKE} -C ./commands clean #//<<	
-	@${MAKE} -C ./html clean	
+	gmake -C ./commands clean #//<<	
+	gmake -C ./html clean	
 	@if test -d ../../mods; then rm -Rf ../../mods; fi
diff --git a/src/mods/commands/Makefile b/src/mods/commands/Makefile
index 6aec38d..27da7a3 100644
--- a/src/mods/commands/Makefile
+++ b/src/mods/commands/Makefile
@@ -1,4 +1,4 @@
-SRCS=yc_about.cpp yc_all.cpp yc_away.cpp yc_col.cpp yc_compopt.cpp yc_exec.cpp yc_fake.cpp yc_getroom.cpp yc_getrusage.cpp yc_help.cpp yc_invisible.cpp yc_j.cpp yc_ko.cpp yc_m.cpp yc_md5.cpp yc_me.cpp yc_morph.cpp yc_msg.cpp yc_q.cpp yc_reload.cpp yc_ren.cpp yc_s.cpp yc_set.cpp yc_template.cpp yc_time.cpp yc_topic.cpp yc_uptime.cpp yc_users.cpp yc_version.cpp
+SRCS=yc_away.cpp yc_col.cpp yc_compopt.cpp yc_exec.cpp yc_fake.cpp yc_getroom.cpp yc_getrusage.cpp yc_getstatus.cpp yc_help.cpp yc_invisible.cpp yc_j.cpp yc_ko.cpp yc_m.cpp yc_md5.cpp yc_me.cpp yc_morph.cpp yc_msg.cpp yc_q.cpp yc_reload.cpp yc_ren.cpp yc_s.cpp yc_set.cpp yc_template.cpp yc_time.cpp yc_topic.cpp yc_uptime.cpp yc_version.cpp
 MODS=$(addprefix ../../../mods/commands/, $(SRCS:.cpp=.so))
 CC=g++
 INCLUDES=`cat ../../includes.add`
@@ -17,8 +17,6 @@ mods:	infotext $(MODS)
 clean:
 	@echo Cleaning command modules
 	@if test -d ../../../mods/commands; then rm -Rf ../../../mods/commands; fi
-../../../mods/commands/yc_about.so: yc_about.cpp
-../../../mods/commands/yc_all.so: yc_all.cpp
 ../../../mods/commands/yc_away.so: yc_away.cpp
 ../../../mods/commands/yc_col.so: yc_col.cpp
 ../../../mods/commands/yc_compopt.so: yc_compopt.cpp
@@ -26,6 +24,7 @@ clean:
 ../../../mods/commands/yc_fake.so: yc_fake.cpp
 ../../../mods/commands/yc_getroom.so: yc_getroom.cpp
 ../../../mods/commands/yc_getrusage.so: yc_getrusage.cpp
+../../../mods/commands/yc_getstatus.so: yc_getstatus.cpp
 ../../../mods/commands/yc_help.so: yc_help.cpp
 ../../../mods/commands/yc_invisible.so: yc_invisible.cpp
 ../../../mods/commands/yc_j.so: yc_j.cpp
@@ -44,5 +43,4 @@ clean:
 ../../../mods/commands/yc_time.so: yc_time.cpp
 ../../../mods/commands/yc_topic.so: yc_topic.cpp
 ../../../mods/commands/yc_uptime.so: yc_uptime.cpp
-../../../mods/commands/yc_users.so: yc_users.cpp
 ../../../mods/commands/yc_version.so: yc_version.cpp
diff --git a/src/mods/commands/Makefile.in b/src/mods/commands/Makefile.in
index 42884b6..ce8c00f 100755
--- a/src/mods/commands/Makefile.in
+++ b/src/mods/commands/Makefile.in
@@ -4,9 +4,9 @@ INCLUDES=`cat ../../includes.add`
 CFLAGS=`cat ../cflags.add`
 all: mods
 $(MODS): 
+	@echo -n "Compiling command module `basename $@` " 
 	@if ! test -d `dirname $@`; then mkdir -p `dirname $@`; fi
 	@$(CC) $(CFLAGS) $(INCLUDES) -shared -s -o $@ `echo $(notdir $@) | sed s/.so/.cpp/`
-	@echo -n "Command module `basename $@ | sed s/\.so// | sed s/yc_//` " 
 	@du -hc $@ | tail -n 1 | sed s/total// | sed "s/ //g"
 infotext:
 	@echo Compiling command modules
diff --git a/src/mods/commands/yc_away.cpp b/src/mods/commands/yc_away.cpp
index 81a2089..af4a4a5 100755
--- a/src/mods/commands/yc_away.cpp
+++ b/src/mods/commands/yc_away.cpp
@@ -4,69 +4,67 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-
-    string s_msg;
-    string s_away;
-    string s_col;
-
-    vector<string>::iterator iter;
-
-    string s_time = p_timr->get_time();
-
-    s_away.append( s_time ).append( " " );
-
-    s_msg = s_time
-            + " "
-            + p_user->get_colored_bold_name()
-            + " "
-            + p_conf->get_elem("chat.msgs.setmodeaway")
-            + "<font color=" + p_user->get_col2() + ">";
-
-    if ( params->size() > 0 )
-    {
-      s_msg.append(": ");
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-      {
-        s_msg.append( " " + *iter );
-        s_away.append( *iter + " " );
-      }
-    }
-    else
-    {
-      s_msg.append(".");
-    }
-
-    s_msg.append( "</font><br>\n" );
-
-    room* p_room = p_user->get_room();
-
-    // Remove ' from away message:
-    auto unsigned int pos;
-
-    do
-    {
-      pos = s_away.find_first_of( "'" );
-      if ( pos == string::npos )
-        break;
-      s_away.replace( pos, 1, "\"" );
-    }
-    while (true);
-
-    p_user->set_away( true, s_away );
-    p_room->reload_onlineframe();
-    p_room->msg_post ( &s_msg  );
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        
+        string s_msg;
+        string s_away;
+        string s_col;
+
+        vector<string>::iterator iter;
+
+        string s_time = p_timr->get_time();
+
+        s_away.append( s_time ).append( " " );
+
+        s_msg = s_time
+              + " "
+              + p_user->get_colored_bold_name()
+              + " "
+              + p_conf->get_elem("chat.msgs.setmodeaway")
+              + "<font color=" + p_user->get_col2() + ">"; 
+
+	if ( params->size() > 0 )
+        {
+         s_msg.append(": ");
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+         {
+          s_msg.append( " " + *iter );
+          s_away.append( *iter + " " );
+         }
+        }
+
+        else
+	{
+	 s_msg.append(".");
+	}
+
+        s_msg.append( "</font><br>\n" );
+
+        room* p_room = p_user->get_room();
+
+        // Remove ' from away message:
+        auto unsigned int pos;
+
+        do {
+         pos = s_away.find_first_of( "'" );
+         if ( pos == string::npos )
+          break;
+         s_away.replace( pos, 1, "\"" );
+         } while (true);
+
+        p_user->set_away( true, s_away );
+        p_room->reload_onlineframe();
+        p_room->msg_post ( &s_msg  );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_col.cpp b/src/mods/commands/yc_col.cpp
index 3e1f591..4449278 100755
--- a/src/mods/commands/yc_col.cpp
+++ b/src/mods/commands/yc_col.cpp
@@ -10,79 +10,76 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
 
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+	
+	user *p_user = (user*)c->elem[1];		// the corresponding user
+	vector<string> *params= (vector<string>*) c->elem[2];	// param array
 
+        string s_color;
+        string s_color2;
 
-    user *p_user = (user*)c->elem[1];		// the corresponding user
-    vector<string> *params= (vector<string>*) c->elem[2];	// param array
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        if ( params->empty() )
+        {
+	 s_color  = p_conf->get_elem( "chat.html.user.color1" );
+         s_color2 = p_conf->get_elem( "chat.html.user.color2" );
+        }
 
-    string s_color;
-    string s_color2;
+        else
+        {
+	 s_color = (string) params->front();
+         params->erase( params->begin() );
+         if ( ! params->empty() )
+          s_color2 = (string) params->front();
+         else
+          s_color2 = p_conf->get_elem( "chat.html.user.color1" );
+        }
 
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    if ( params->empty() )
-    {
-      s_color  = p_conf->get_elem( "chat.html.user.color1" );
-      s_color2 = p_conf->get_elem( "chat.html.user.color2" );
-    }
-    else
-    {
-      s_color = (string) params->front();
-      params->erase( params->begin() );
-      if ( ! params->empty() )
-        s_color2 = (string) params->front();
-      else
-        s_color2 = p_conf->get_elem( "chat.html.user.color1" );
-    }
+	s_color  = tool::to_lower( s_color  );
+	s_color2 = tool::to_lower( s_color2 );
 
-    s_color  = tool::to_lower( s_color  );
-    s_color2 = tool::to_lower( s_color2 );
+	if( valid_color(s_color) != 1  )	
+	{
+		string *answerstring=new string(s_color + " is not a valid color.<br>\n");
+		p_user->msg_post( answerstring );
+	}
+	else if( valid_color(s_color2) != 1  )	
+	{
+		string *answerstring=new string( s_color2 + " is not a valid color.<br>\n");
+		p_user->msg_post( answerstring );
+	}
+        else  
+	{  	
+		string *answerstring=new string(p_timr->get_time() + " " + p_user->get_colored_bold_name()+ " changes color to <font color=\"#" 
+                       + s_color + "\">" + s_color + "</font> <font color=\"#" 
+                       + s_color2 + "\">" + s_color2 + "</font><br>\n");
+		p_user->get_room()->msg_post( answerstring );
+		p_user->set_col1(s_color);
+		p_user->set_col2(s_color2);
+	}
 
-    if( valid_color(s_color) != 1  )
-    {
-      string *answerstring=new string(s_color + " is not a valid color.<br>\n");
-      p_user->msg_post( answerstring );
-    }
-    else if( valid_color(s_color2) != 1  )
-    {
-      string *answerstring=new string( s_color2 + " is not a valid color.<br>\n");
-      p_user->msg_post( answerstring );
-    }
-    else
-    {
-      string *answerstring=new string(p_timr->get_time() + " " + p_user->get_colored_bold_name()+ " changes color to <font color=\"#"
-                                      + s_color + "\">" + s_color + "</font> <font color=\"#"
-                                      + s_color2 + "\">" + s_color2 + "</font><br>\n");
-      p_user->get_room()->msg_post( answerstring );
-      p_user->set_col1(s_color);
-      p_user->set_col2(s_color2);
-      p_user->get_room()->reload_onlineframe();
-    }
+	return 0;
+ }
+ int valid_color( string s_color ){
+	
+	if(s_color.size()!=6) return 0;
+	string valid="abcdef0123456789";
+	for(int i=0;i<s_color.size();i++)
+	{
+		string s_char=s_color.substr(i,1);
+		if(valid.find(s_char)==string::npos)
+		return 0;
+	}	
 
-    return 0;
-  }
-  int valid_color( string s_color )
-  {
-
-    if(s_color.size()!=6)
-      return 0;
-    string valid="abcdef0123456789";
-    for(int i=0;i<s_color.size();i++)
-    {
-      string s_char=s_color.substr(i,1);
-      if(valid.find(s_char)==string::npos)
-        return 0;
-    }
-
-    return 1;
-  }
+	return 1;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_compopt.cpp b/src/mods/commands/yc_compopt.cpp
index cd21f6f..ad6ae99 100755
--- a/src/mods/commands/yc_compopt.cpp
+++ b/src/mods/commands/yc_compopt.cpp
@@ -7,17 +7,16 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	user *p_user = (user*)c->elem[1];		// the corresponding user
+ 	p_user->msg_post( tool::ychat_version() + " " + UNAME + "<br>\n" + COMPOPT + "<br>\n");
 
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-    user *p_user = (user*)c->elem[1];		// the corresponding user
-    p_user->msg_post( tool::ychat_version() + " " + UNAME + "<br>\n" + COMPOPT + "<br>\n");
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_exec.cpp b/src/mods/commands/yc_exec.cpp
index 119942d..f912c20 100755
--- a/src/mods/commands/yc_exec.cpp
+++ b/src/mods/commands/yc_exec.cpp
@@ -9,58 +9,58 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
 
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        string s_command;
+        string s_msg = p_timr->get_time();
+        string s_output;
 
-    string s_command;
-    string s_msg = p_timr->get_time();
-    string s_output;
+        vector<string>::iterator iter;
+        for ( iter = params->begin(); iter != params->end(); iter++ )
+         s_command.append( " " + *iter );
 
-    vector<string>::iterator iter;
-    for ( iter = params->begin(); iter != params->end(); iter++ )
-      s_command.append( " " + *iter );
+        s_command.append(" 2>error.log");
 
-    s_command.append(" 2>error.log");
+        s_msg.append( " " + s_command + "<br>\n" );
 
-    s_msg.append( " " + s_command + "<br>\n" );
+        p_user->msg_post( &s_msg );
 
-    p_user->msg_post( &s_msg );
+        FILE *file;
+        char buffer[READBUF];
 
-    FILE *file;
-    char buffer[READBUF];
+        if( (file=popen(s_command.c_str(), "r")) == NULL )
+        {
+          s_output = "<font color=\"#" 
+                   + p_conf->get_elem("chat.html.errorcolor")
+                   + p_conf->get_elem("chat.msgs.err.execcommand")
+                   + "</font><br>\n";
+         p_user->msg_post( &s_output );
+        }
 
-    if( (file=popen(s_command.c_str(), "r")) == NULL )
-    {
-      s_output = "<font color=\"#"
-                 + p_conf->get_elem("chat.html.errorcolor")
-                 + p_conf->get_elem("chat.msgs.err.execcommand")
-                 + "</font><br>\n";
-      p_user->msg_post( &s_output );
-    }
-    else
-    {
-      s_output.append("<hr>\n");
-      while(true)
-      {
-        if(fgets(buffer, READBUF, file) == NULL)
-          break;
+        else
+        { 
+         s_output.append("<hr>\n");
+         while(true)
+         {
+          if(fgets(buffer, READBUF, file) == NULL)
+           break;
 
-        s_output.append( string(buffer) + "<br>\n" );
-      }
+           s_output.append( string(buffer) + "<br>\n" );
+         }
 
-      p_user->msg_post( &s_output );
-      pclose(file);
-    }
+         p_user->msg_post( &s_output );
+         pclose(file);
+       }
 
-    return 0;
-  }
+       return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_fake.cpp b/src/mods/commands/yc_fake.cpp
index cfc22c0..c708841 100755
--- a/src/mods/commands/yc_fake.cpp
+++ b/src/mods/commands/yc_fake.cpp
@@ -4,27 +4,26 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    bool b_fake = p_user->get_fake();
-
-    string s_msg = (b_fake == 1
-                    ? p_conf->get_elem("chat.msgs.unsetmodefake") + "<br>\n"
-                    : p_conf->get_elem("chat.msgs.setmodefake") + "<br>\n");
-
-
-    p_user->set_fake( !b_fake );
-    p_user->get_room()->reload_onlineframe();
-    p_user->msg_post ( &s_msg  );
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+       
+        bool b_fake = p_user->get_fake(); 
+ 
+        string s_msg = (b_fake == 1
+                        ? p_conf->get_elem("chat.msgs.unsetmodefake") + "<br>\n" 
+                        : p_conf->get_elem("chat.msgs.setmodefake") + "<br>\n"); 
+                     
+
+        p_user->set_fake( !b_fake );
+        p_user->get_room()->reload_onlineframe();
+        p_user->msg_post ( &s_msg  );
+	
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_getroom.cpp b/src/mods/commands/yc_getroom.cpp
index e27c468..87e2d25 100755
--- a/src/mods/commands/yc_getroom.cpp
+++ b/src/mods/commands/yc_getroom.cpp
@@ -6,48 +6,48 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      string s_searched_user( *iter );
-      bool b_found;
-      user* p_searched_user = p_chat->get_user( s_searched_user, b_found );
-
-      if ( b_found )
-      {
-        string s_msg         = "<b>" + p_searched_user->get_colored_name() + "</b>"
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         string s_searched_user( *iter );
+         bool b_found;
+         user* p_searched_user = p_chat->get_user( s_searched_user, b_found );
+       
+         if ( b_found )
+         {
+          string s_msg         = "<b>" + p_searched_user->get_colored_name() + "</b>"
                                + p_conf->get_elem("chat.msgs.userinroom") + "<b>"
-                               + p_searched_user->get_room()->get_name()
-                               + "</b><br>\n";
-        p_user->msg_post( &s_msg );
-      }
-      else
-      {
-        string s_msg = "<font color=\"#"
+                               + p_searched_user->get_room()->get_name() 
+          		       + "</b><br>\n";
+          p_user->msg_post( &s_msg ); 
+         }
+      
+         else
+         {
+          string s_msg = "<font color=\"#" 
                        + p_conf->get_elem("chat.html.errorcolor")
-                       + "\"><b>"
+                       + "\"><b>" 
                        + s_searched_user + "</b> "
                        + p_conf->get_elem("chat.msgs.err.notavailable")
                        + "</font><br>\n";
-        p_user->msg_post( &s_msg );
+          p_user->msg_post( &s_msg ); 
 
-      }
-    }
+         }
+        }
 
-    return 0;
-  }
+	return 0;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_getrusage.cpp b/src/mods/commands/yc_getrusage.cpp
index 42faa67..83dcbb9 100755
--- a/src/mods/commands/yc_getrusage.cpp
+++ b/src/mods/commands/yc_getrusage.cpp
@@ -18,40 +18,39 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    rusage* p_rusage = new rusage;
-    getrusage( RUSAGE_SELF, p_rusage );
-    char c_msg[1024];
-
-    /* see man getrusage  */
-
-    sprintf(c_msg, "getrusage:<br>\nmaxrss: %D (max resident set size)<br>\nixrss: %D (integral shared text memory size)<br>\nidrss: %D (integral unshared data size)<br>\nisrss %D (integral unshared stack size)<br>\nminflt: %D (page reclaims)<br>\nmajflt: %D (page faults)<br>\nnswap: %D (swaps)<br>\ninblock: %D (block input operations)<br>\noublock: %D (block output operations)<br>\nmsgsnd: %D (messages sent)<br>\nmsgrcv: %D (messages received)<br>\nnsignals: %D (signals received)<br>\nnvcsw: %D (voluntary context switches)<br>\nnivcsw: %D (involuntary context switches)<br>\n",
-            p_rusage->ru_maxrss,
-            p_rusage->ru_ixrss,
-            p_rusage->ru_idrss,
-            p_rusage->ru_isrss,
-            p_rusage->ru_minflt,
-            p_rusage->ru_majflt,
-            p_rusage->ru_nswap,
-            p_rusage->ru_inblock,
-            p_rusage->ru_oublock,
-            p_rusage->ru_msgsnd,
-            p_rusage->ru_msgrcv,
-            p_rusage->ru_nsignals,
-            p_rusage->ru_nvcsw,
-            p_rusage->ru_nivcsw
-           );
-
-    p_user->msg_post( new string( c_msg ) );
-
-    return 0;
-  }
+extern "C" {
+ int valid_color( string );
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+        rusage* p_rusage = new rusage;
+        getrusage( RUSAGE_SELF, p_rusage );       
+        char c_msg[1024];
+
+        /* see man getrusage  */
+
+        sprintf(c_msg, "getrusage:<br>\nmaxrss: %D (max resident set size)<br>\nixrss: %D (integral shared text memory size)<br>\nidrss: %D (integral unshared data size)<br>\nisrss %D (integral unshared stack size)<br>\nminflt: %D (page reclaims)<br>\nmajflt: %D (page faults)<br>\nnswap: %D (swaps)<br>\ninblock: %D (block input operations)<br>\noublock: %D (block output operations)<br>\nmsgsnd: %D (messages sent)<br>\nmsgrcv: %D (messages received)<br>\nnsignals: %D (signals received)<br>\nnvcsw: %D (voluntary context switches)<br>\nnivcsw: %D (involuntary context switches)<br>\n",
+                p_rusage->ru_maxrss,
+                p_rusage->ru_ixrss,
+                p_rusage->ru_idrss,
+                p_rusage->ru_isrss,
+                p_rusage->ru_minflt,
+                p_rusage->ru_majflt,
+                p_rusage->ru_nswap,
+                p_rusage->ru_inblock,
+                p_rusage->ru_oublock,
+                p_rusage->ru_msgsnd,
+                p_rusage->ru_msgrcv,
+                p_rusage->ru_nsignals,
+                p_rusage->ru_nvcsw,
+                p_rusage->ru_nivcsw
+                       );  
+
+        p_user->msg_post( new string( c_msg ) );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_getstatus.cpp b/src/mods/commands/yc_getstatus.cpp
index ee4f922..086e126 100644
--- a/src/mods/commands/yc_getstatus.cpp
+++ b/src/mods/commands/yc_getstatus.cpp
@@ -51,6 +51,8 @@ extern "C" {
 
          }
         }
+
+	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_help.cpp b/src/mods/commands/yc_help.cpp
index cdeb1be..41899c3 100755
--- a/src/mods/commands/yc_help.cpp
+++ b/src/mods/commands/yc_help.cpp
@@ -7,46 +7,45 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    string s_msg = "";
-
-    if (params->size() >= 1)
-    {
-      vector<string>::iterator iter = params->begin();
-
-      string s_help = p_conf->get_elem("chat.msgs.help." + *iter);
-
-      if ( s_help != "" )
-      {
-        s_msg.append("<b>" + *iter + ":</b> " + s_help + "<br>\n");
-        p_user->msg_post( &s_msg );
-        return 0;
-      }
-
-      s_msg.append(*iter + " " + p_conf->get_elem("chat.msgs.err.notavailable"));
-    }
-    else
-    {
-      s_msg.append(p_conf->get_elem("chat.msgs.err.wrongcommandusage"));
-    }
-
-    s_msg = "<font color=\"#"
-            + p_conf->get_elem("chat.html.errorcolor")
-            + "\"> "
-            + s_msg
-            + "</font><br>\n";
-
-    p_user->msg_post( &s_msg );
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+	string s_msg = "";	
+
+        if (params->size() >= 1)
+        {
+	  vector<string>::iterator iter = params->begin();
+
+	  string s_help = p_conf->get_elem("chat.msgs.help." + *iter);
+
+          if ( s_help != "" ) {
+           s_msg.append("<b>" + *iter + ":</b> " + s_help + "<br>\n");
+           p_user->msg_post( &s_msg ); 
+	   return 0;
+          }
+
+	  s_msg.append(*iter + " " + p_conf->get_elem("chat.msgs.err.notavailable"));
+         }
+ 
+         else
+         {
+          s_msg.append(p_conf->get_elem("chat.msgs.err.wrongcommandusage"));
+         }
+
+         s_msg = "<font color=\"#" 
+                       + p_conf->get_elem("chat.html.errorcolor")
+                       + "\"> "
+                       + s_msg
+                       + "</font><br>\n";
+
+         p_user->msg_post( &s_msg ); 
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_invisible.cpp b/src/mods/commands/yc_invisible.cpp
index 58a8912..b78d934 100755
--- a/src/mods/commands/yc_invisible.cpp
+++ b/src/mods/commands/yc_invisible.cpp
@@ -4,28 +4,27 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    bool b_invisible = p_user->get_invisible();
-
-    string s_msg = b_invisible
-                   ? p_conf->get_elem("chat.msgs.setmodeinvisible")
-                   + "<br>\n"
-                   : p_conf->get_elem("chat.msgs.unsetmodeinvisible")
-                   + "<br>\n";
-
-    p_user->set_invisible( !b_invisible );
-    p_user->get_room()->reload_onlineframe();
-    p_user->msg_post ( &s_msg  );
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+       
+        bool b_invisible = p_user->get_invisible(); 
+ 
+        string s_msg = b_invisible
+                     ? p_conf->get_elem("chat.msgs.setmodeinvisible") 
+                     + "<br>\n"
+                     : p_conf->get_elem("chat.msgs.unsetmodeinvisible") 
+                     + "<br>\n"; 
+
+        p_user->set_invisible( !b_invisible );
+        p_user->get_room()->reload_onlineframe();
+        p_user->msg_post ( &s_msg  );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_j.cpp b/src/mods/commands/yc_j.cpp
index 178a388..903e49b 100755
--- a/src/mods/commands/yc_j.cpp
+++ b/src/mods/commands/yc_j.cpp
@@ -7,98 +7,99 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string>  *params = (vector<string> *) c->elem[2];	// param array
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    gcol* p_gcol = (gcol*) ((dynamic_wrap*)c->elem[3])->GCOL;
-
-    if ( ! params->empty() )
-    {
-      vector<string> ::iterator iter;
-
-      string s_room;
-
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-      {
-        s_room.append( *iter );
-        if ( iter+1 != params->end() )
-          s_room.append(" ");
-      }
-
-      int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") );
-      if ( i_max_room_len < s_room.length() )
-        s_room = s_room.substr(0, i_max_room_len );
-
-      if ( tool::to_lower(s_room) == p_user->get_room()->get_lowercase_name() )
-      {
-        string s_msg = "<font color=\"" + p_conf->get_elem("chat.html.errorcolor") + "\">"
-                       + p_conf->get_elem("chat.msgs.err.alreadyinroom") + "<b>"
-                       + p_user->get_room()->get_name() + "</b></font><br>\n";
-        p_user->msg_post( &s_msg );
-      }
-      else
-      {
-        string s_user = p_timr->get_time() + " " + p_user->get_colored_bold_name();
-        string s_msg = s_user + p_conf->get_elem( "chat.msgs.userleavesroom" ) + "<b>";
-        string s_msg2 = s_user + p_conf->get_elem( "chat.msgs.userentersroom" ) + "<b>";
-
-        bool b_flag;
-        room*  p_room = p_chat->get_room( s_room , b_flag );
-
-        // if room does not exist add room to list!
-        if ( p_room == NULL )
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string>  *params = (vector<string> *) c->elem[2];	// param array
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        gcol* p_gcol = (gcol*) ((dynamic_wrap*)c->elem[3])->GCOL; 
+
+        if ( ! params->empty() )
         {
-          p_room = p_gcol->get_room_from_garbage_or_new( s_room );
-
-          s_msg.append( s_room + "</b><br>\n" );
-          s_msg2.append( s_room + "</b><br>\n" );
-
-          room* p_room_old = p_user->get_room();
-
-          string s_name_lowercase = p_user->get_lowercase_name();
-          p_user->get_room()->del_elem( s_name_lowercase );
-
-          p_gcol->lock_mutex();
-          if ( p_room_old != NULL )
-            p_room_old->msg_post( &s_msg );
-          p_gcol->unlock_mutex();
-
-          p_room->add_user( p_user );
-          p_chat->add_elem( p_room );
-          p_room->msg_post( &s_msg2 );
-        }
-        else // p_room != NULL
-        {
-          s_msg.append( p_room->get_name() + "</b><br>\n" );
-          s_msg2.append( p_room->get_name() + "</b><br>\n" );
-
-          room* p_room_old = p_user->get_room();
-
-          string s_name_lowercase = p_user->get_lowercase_name();
-          p_user->get_room()->del_elem( s_name_lowercase );
-
-          p_gcol->lock_mutex();
-          if ( p_room_old != NULL )
-            p_room_old->msg_post( &s_msg );
-          p_gcol->unlock_mutex();
-
-          p_room->add_user( p_user );
-          p_room->msg_post( &s_msg2 );
-        }
-      }
-    }
-
-    return 0;
-  }
+         vector<string> ::iterator iter; 
+
+         string s_room;
+
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+         {
+          s_room.append( *iter ); 
+          if ( iter+1 != params->end() )
+           s_room.append(" ");
+         }
+
+         int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") ); 
+         if ( i_max_room_len < s_room.length() )
+          s_room = s_room.substr(0, i_max_room_len );         
+
+         if ( tool::to_lower(s_room) == p_user->get_room()->get_lowercase_name() )
+         {
+          string s_msg = "<font color=\"" + p_conf->get_elem("chat.html.errorcolor") + "\">"
+		       + p_conf->get_elem("chat.msgs.err.alreadyinroom") + "<b>"
+                       + p_user->get_room()->get_name() + "</b></font><br>\n";	
+          p_user->msg_post( &s_msg );
+         }
+
+         else
+         {
+          string s_user = p_timr->get_time() + " " + p_user->get_colored_bold_name(); 
+          string s_msg = s_user + p_conf->get_elem( "chat.msgs.userleavesroom" ) + "<b>";
+          string s_msg2 = s_user + p_conf->get_elem( "chat.msgs.userentersroom" ) + "<b>";
+
+	  bool b_flag;
+          room*  p_room = p_chat->get_room( s_room , b_flag );
+
+          // if room does not exist add room to list!
+          if ( p_room == NULL )
+          {
+           p_room = p_gcol->get_room_from_garbage_or_new( s_room );
+
+           s_msg.append( s_room + "</b><br>\n" );
+           s_msg2.append( s_room + "</b><br>\n" );
+
+           room* p_room_old = p_user->get_room();
+
+           string s_name_lowercase = p_user->get_lowercase_name();
+           p_user->get_room()->del_elem( s_name_lowercase );
+
+           p_gcol->lock_mutex();
+           if ( p_room_old != NULL )
+ 	    p_room_old->msg_post( &s_msg ); 
+           p_gcol->unlock_mutex();
+
+           p_room->add_user( p_user );
+           p_chat->add_elem( p_room );
+           p_room->msg_post( &s_msg2 );
+          }
+
+          else // p_room != NULL
+          {
+           s_msg.append( p_room->get_name() + "</b><br>\n" );
+           s_msg2.append( p_room->get_name() + "</b><br>\n" );
+
+           room* p_room_old = p_user->get_room();
+
+           string s_name_lowercase = p_user->get_lowercase_name();
+           p_user->get_room()->del_elem( s_name_lowercase );
+
+           p_gcol->lock_mutex();
+           if ( p_room_old != NULL )
+ 	    p_room_old->msg_post( &s_msg ); 
+           p_gcol->unlock_mutex();
+
+           p_room->add_user( p_user );
+           p_room->msg_post( &s_msg2 );
+	  }
+         }
+	}
+
+	return 0;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_ko.cpp b/src/mods/commands/yc_ko.cpp
index 36b2fa0..ac32ac7 100755
--- a/src/mods/commands/yc_ko.cpp
+++ b/src/mods/commands/yc_ko.cpp
@@ -6,67 +6,67 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      string s_searched_user( *iter );
-      bool b_found;
-      user* p_searched_user = p_chat->get_user( s_searched_user, b_found );
-
-      if ( b_found )
-      {
-
-        string s_msg = p_timr->get_time() + " "
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         string s_searched_user( *iter );
+         bool b_found;
+         user* p_searched_user = p_chat->get_user( s_searched_user, b_found );
+       
+         if ( b_found )
+         {
+
+          string s_msg = p_timr->get_time() + " "
                        + p_user->get_colored_bold_name()
                        + p_conf->get_elem( "chat.msgs.userkicksout1" )
                        + p_searched_user->get_colored_bold_name()
                        + p_conf->get_elem( "chat.msgs.userkicksout2" )
                        + p_searched_user->get_room()->get_bold_name()
-                       + "<br>\n";
+	               + "<br>\n";
 
-        room* p_room1 = p_user->get_room();
-        room* p_room2 = p_searched_user->get_room();
+          room* p_room1 = p_user->get_room();
+          room* p_room2 = p_searched_user->get_room();
 
-        p_room1->msg_post( &s_msg );
+          p_room1->msg_post( &s_msg );
 
-        if ( p_room1->get_lowercase_name() !=
-             p_room2->get_lowercase_name() )
-          p_room2->msg_post( &s_msg );
+          if ( p_room1->get_lowercase_name() != 
+               p_room2->get_lowercase_name() )
+           p_room2->msg_post( &s_msg );
 
-        string s_kick = "<script confuage=JavaScript>top.location.href='/"
+  	  string s_kick = "<script confuage=JavaScript>top.location.href='/"
                         + p_conf->get_elem("httpd.startsite")
                         + "';</script>";
 
-        p_searched_user->msg_post( &s_kick );
-        p_searched_user->set_online(false);
-      }
-      else
-      {
-        string s_msg = "<font color=\"#"
+          p_searched_user->msg_post( &s_kick );
+          p_searched_user->set_online(false);
+         }
+      
+         else
+         {
+          string s_msg = "<font color=\"#" 
                        + p_conf->get_elem("chat.html.errorcolor")
-                       + "\"><b>"
+                       + "\"><b>" 
                        + s_searched_user + "</b> "
                        + p_conf->get_elem("chat.msgs.err.notavailable")
                        + "</font><br>\n";
-        p_user->msg_post( &s_msg );
-      }
-    }
+          p_user->msg_post( &s_msg ); 
+         }
+        }
 
-    return 0;
-  }
+	return 0;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_m.cpp b/src/mods/commands/yc_m.cpp
index 4a57727..a93cc3b 100755
--- a/src/mods/commands/yc_m.cpp
+++ b/src/mods/commands/yc_m.cpp
@@ -7,38 +7,37 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
-
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params= (vector<string>*) c->elem[2];	// param array
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    string s_msg = "";
-
-    if ( p_conf->get_elem("chat.printalwaystime") == "true" )
-      s_msg = p_timr->get_time() + " ";
-
-    s_msg.append(  "<i>" + p_user->get_colored_name()
-                   + " <font color=\"#" + p_user->get_col2()
-                   + "\">" );
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-        s_msg.append( *iter + " " );
-    }
-
-    s_msg.append( "</font></i><br>\n" );
-    p_user->get_room()->msg_post( &s_msg );
-
-    return 0;
-  }
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params= (vector<string>*) c->elem[2];	// param array
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+
+	string s_msg = "";
+
+        if ( p_conf->get_elem("chat.printalwaystime") == "true" )
+         s_msg = p_timr->get_time() + " ";
+
+        s_msg.append(  "<i>" + p_user->get_colored_name() 
+                       + " <font color=\"#" + p_user->get_col2() 
+                       + "\">" );
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+          s_msg.append( *iter + " " );
+        }
+
+        s_msg.append( "</font></i><br>\n" );
+        p_user->get_room()->msg_post( &s_msg );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_md5.cpp b/src/mods/commands/yc_md5.cpp
index 13bfc3b..d79d952 100755
--- a/src/mods/commands/yc_md5.cpp
+++ b/src/mods/commands/yc_md5.cpp
@@ -8,47 +8,47 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    if (params->size() >= 2)
-    {
-      vector<string>::iterator iter;
-      string s_string = "";
-      string s_salt   = "";
-
-      for (iter = params->begin(); iter+1 != params->end(); ++iter)
-      {
-        s_string.append(*iter);
-      }
-
-      s_salt = *iter;
-
-      string s_msg = "Crypt: <b>" + s_string + "</b>, Salt: <b>"
-                     + s_salt + "</b> = <b>" +
-                     + md5::MD5Crypt(s_string.c_str(), s_salt.c_str())
-                     + "</b><br>\n";
-      p_user->msg_post( &s_msg );
-    }
-    else
-    {
-      string s_msg = "<font color=\"#"
-                     + p_conf->get_elem("chat.html.errorcolor")
-                     + "\"> "
-                     + p_conf->get_elem("ERR_WRONG_COMMAND_USAGE")
-                     + "</font><br>\n";
-      p_user->msg_post( &s_msg );
-
-    }
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+
+        if (params->size() >= 2)
+        {
+	  vector<string>::iterator iter;
+	  string s_string = "";
+          string s_salt   = "";
+
+          for (iter = params->begin(); iter+1 != params->end(); ++iter)
+          { 
+            s_string.append(*iter); 
+          }
+         
+          s_salt = *iter; 
+ 
+          string s_msg = "Crypt: <b>" + s_string + "</b>, Salt: <b>" 
+                       + s_salt + "</b> = <b>" +
+                       + md5::MD5Crypt(s_string.c_str(), s_salt.c_str())  
+          	       + "</b><br>\n";
+          p_user->msg_post( &s_msg ); 
+         }
+ 
+         else
+         {
+          string s_msg = "<font color=\"#" 
+                       + p_conf->get_elem("chat.html.errorcolor")
+                       + "\"> "
+                       + p_conf->get_elem("ERR_WRONG_COMMAND_USAGE")
+                       + "</font><br>\n";
+          p_user->msg_post( &s_msg ); 
+
+         }
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_me.cpp b/src/mods/commands/yc_me.cpp
index d9de98c..66d54da 100755
--- a/src/mods/commands/yc_me.cpp
+++ b/src/mods/commands/yc_me.cpp
@@ -7,39 +7,38 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
-
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params= (vector<string>*) c->elem[2];	// param array
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-
-    string s_msg = "";
-
-    if ( p_conf->get_elem("chat.printalwaystime") == "true" )
-      s_msg = p_timr->get_time() + " ";
-
-    s_msg.append(  "<i><font color=\"#" +p_user->get_col1() + "\">"
-                   + p_user->get_name() + " ");
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-        s_msg.append( *iter + " " );
-    }
-
-    s_msg.append( "</font></i><br>\n" );
-    p_user->get_room()->msg_post( &s_msg );
-
-    return 0;
-
-  }
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params= (vector<string>*) c->elem[2];	// param array
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+
+	string s_msg = "";
+
+        if ( p_conf->get_elem("chat.printalwaystime") == "true" )
+         s_msg = p_timr->get_time() + " ";
+
+        s_msg.append(  "<i><font color=\"#" +p_user->get_col1() + "\">"
+                       + p_user->get_name() + " ");
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+          s_msg.append( *iter + " " );
+        }
+
+        s_msg.append( "</font></i><br>\n" );
+        p_user->get_room()->msg_post( &s_msg );
+
+	return 0;
+
+ }
 }
 
diff --git a/src/mods/commands/yc_morph.cpp b/src/mods/commands/yc_morph.cpp
index 1a7db27..cf1f448 100755
--- a/src/mods/commands/yc_morph.cpp
+++ b/src/mods/commands/yc_morph.cpp
@@ -8,44 +8,45 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c = (container*) v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *p_params = (vector<string>*) c->elem[2];	// param array
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-
-    if ( p_params->empty() )
-    {
-      string s_msg = p_conf->colored_error_msg("chat.msgs.err.wrongcommandusage");
-      p_user->msg_post(s_msg);
-    }
-    else
-    {
-      string s_morphed_name = p_params->at(0);
-
-      if ( tool::to_lower(s_morphed_name) != p_user->get_lowercase_name() )
-      {
-        string s_msg = p_conf->colored_error_msg("chat.msgs.err.morphnick");
-        p_user->msg_post(s_msg);
-      }
-      else
-      {
-        string s_msg = p_timr->get_time() + " " + p_user->get_colored_bold_name() + p_conf->get_elem( "chat.msgs.usermorphs" ) + "<font color=\"#" + p_user->get_col1() + "\"><b>" + s_morphed_name + "</b></font><br>\n";
-
-        room* p_room = p_user->get_room();
-        p_room->msg_post( &s_msg );
-        p_user->set_name( s_morphed_name );
-        p_room->reload_onlineframe();
-      }
-    }
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c = (container*) v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *p_params = (vector<string>*) c->elem[2];	// param array
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+
+        if ( p_params->empty() )
+        {
+	  string s_msg = p_conf->colored_error_msg("chat.msgs.err.wrongcommandusage");
+	  p_user->msg_post(s_msg);
+        }
+
+        else
+        { 
+	  string s_morphed_name = p_params->at(0);
+
+	  if ( tool::to_lower(s_morphed_name) != p_user->get_lowercase_name() ) 
+          {
+	   string s_msg = p_conf->colored_error_msg("chat.msgs.err.morphnick");
+	   p_user->msg_post(s_msg);
+	  }		
+
+	  else
+	  {
+           string s_msg = p_timr->get_time() + " " + p_user->get_colored_bold_name() + p_conf->get_elem( "chat.msgs.usermorphs" ) + "<font color=\"#" + p_user->get_col1() + "\"><b>" + s_morphed_name + "</b></font><br>\n";
+
+	   room* p_room = p_user->get_room();
+           p_room->msg_post( &s_msg ); 
+	   p_user->set_name( s_morphed_name );
+           p_room->reload_onlineframe();
+	  }
+ 	}
+
+	return 0;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_msg.cpp b/src/mods/commands/yc_msg.cpp
index 8d8f2cf..0189ee0 100755
--- a/src/mods/commands/yc_msg.cpp
+++ b/src/mods/commands/yc_msg.cpp
@@ -6,63 +6,63 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
 
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         string s_whisper_user( *iter );
+         bool b_found;
+         user* p_whisper_user = p_chat->get_user( s_whisper_user, b_found );
+       
+         if ( b_found )
+         {
+          string s_time = "";
+          if ( p_conf->get_elem("chat.printalwaystime") == "true" )
+           s_time = p_timr->get_time() + " ";
+         
+          string s_msg = s_time + "<i> " + p_conf->get_elem("chat.msgs.whisperto") + " " + p_whisper_user->get_colored_name() + ": <font color=\"#" + p_user->get_col2() + "\">";
 
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
+          string s_whisper_msg = s_time + "<i>" + p_user->get_colored_name() + " " + p_conf->get_elem("chat.msgs.whisper") + ": <font color=\"#" + p_user->get_col2() + "\">";
 
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      string s_whisper_user( *iter );
-      bool b_found;
-      user* p_whisper_user = p_chat->get_user( s_whisper_user, b_found );
+          for ( iter++; iter != params->end(); iter++ )
+          {
+           s_msg        .append( *iter + " " );
+           s_whisper_msg.append( *iter + " " );
+          }
 
-      if ( b_found )
-      {
-        string s_time = "";
-        if ( p_conf->get_elem("chat.printalwaystime") == "true" )
-          s_time = p_timr->get_time() + " ";
-
-        string s_msg = s_time + "<i> " + p_conf->get_elem("chat.msgs.whisperto") + " " + p_whisper_user->get_colored_name() + ": <font color=\"#" + p_user->get_col2() + "\">";
-
-        string s_whisper_msg = s_time + "<i>" + p_user->get_colored_name() + " " + p_conf->get_elem("chat.msgs.whisper") + ": <font color=\"#" + p_user->get_col2() + "\">";
-
-        string s_tmp = "";
-        for ( iter++; iter != params->end(); iter++ )
-          s_tmp.append( *iter + " " );
-
-        p_chat->string_replacer(&s_tmp);
-
-        s_msg        .append( s_tmp + "</font></i><br>\n" );
-        s_whisper_msg.append( s_tmp + "</font></i><br>\n" );
-
-        p_user        ->msg_post( &s_msg         );
-        p_whisper_user->msg_post( &s_whisper_msg );
-      }
-      else
-      {
-        string s_msg = "<font color=\"#"
+          s_msg        .append( "</font></i><br>\n" );
+          s_whisper_msg.append( "</font></i><br>\n" );
+           
+          p_user        ->msg_post( &s_msg         );
+          p_whisper_user->msg_post( &s_whisper_msg );
+         }
+      
+         else
+         {
+          string s_msg = "<font color=\"#" 
                        + p_conf->get_elem("chat.html.errorcolor")
-                       + "\"><b>"
+                       + "\"><b>" 
                        + s_whisper_user + "</b> "
                        + p_conf->get_elem("chat.msgs.err.notavailable")
                        + "</font><br>\n";
 
-        p_user->msg_post( &s_msg );
-      }
-    }
+          p_user->msg_post( &s_msg ); 
+         }
+        }
 
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_q.cpp b/src/mods/commands/yc_q.cpp
index a250f72..4c9584d 100755
--- a/src/mods/commands/yc_q.cpp
+++ b/src/mods/commands/yc_q.cpp
@@ -8,23 +8,22 @@
 using namespace std;
 
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container* c = (container*) v_arg;
-    user* p_user = (user*)c->elem[1];
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container* c = (container*) v_arg;
+	user* p_user = (user*)c->elem[1];
 
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
 
-    string s_quit = "<script language='JavaScript'>top.location.href='/"
-                    + p_conf->get_elem("httpd.startsite")
-                    + "';</script>";
+  	string s_quit = "<script confuage=JavaScript>top.location.href='/"
+                      + p_conf->get_elem("httpd.startsite")
+                      + "';</script>";
 
-    p_user->msg_post( &s_quit );
-    p_user->set_online(false);
+	p_user->msg_post( &s_quit );
+        p_user->set_online(false);
 
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_reload.cpp b/src/mods/commands/yc_reload.cpp
index 9d613fc..8b9cd0a 100755
--- a/src/mods/commands/yc_reload.cpp
+++ b/src/mods/commands/yc_reload.cpp
@@ -4,22 +4,21 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+       
+        string s_msg = p_conf->get_elem("chat.msgs.reloadonlineframe") 
+                     + "<br>\n"; 
 
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
+        p_user->get_room()->reload_onlineframe();
+        p_user->msg_post ( &s_msg  );
 
-    string s_msg = p_conf->get_elem("chat.msgs.reloadonlineframe")
-                   + "<br>\n";
-
-    p_user->get_room()->reload_onlineframe();
-    p_user->msg_post ( &s_msg  );
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_ren.cpp b/src/mods/commands/yc_ren.cpp
index c1d1f78..9735d8e 100755
--- a/src/mods/commands/yc_ren.cpp
+++ b/src/mods/commands/yc_ren.cpp
@@ -7,68 +7,68 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c = (container*) v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter;
-
-      string s_room;
-
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-      {
-        s_room.append( *iter );
-        if ( iter+1 != params->end() )
-          s_room.append(" ");
-      }
-
-      int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") );
-      if ( i_max_room_len < s_room.length() )
-        s_room = s_room.substr(0, i_max_room_len );
-
-      bool b_found;
-      string s_room_lower = tool::to_lower(s_room);
-      room* p_room = p_user->get_room();
-
-      if ( s_room_lower != p_room->get_lowercase_name() &&
-           NULL != p_chat->get_room( s_room_lower , b_found ) )
-      {
-        string s_msg = "<font color=\"#"
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c = (container*) v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter; 
+
+         string s_room;
+
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+         {
+          s_room.append( *iter ); 
+          if ( iter+1 != params->end() )
+           s_room.append(" ");
+         }
+
+         int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") ); 
+         if ( i_max_room_len < s_room.length() )
+          s_room = s_room.substr(0, i_max_room_len );         
+
+         bool b_found;
+         string s_room_lower = tool::to_lower(s_room);
+         room* p_room = p_user->get_room();
+         
+         if ( s_room_lower != p_room->get_lowercase_name() && 
+              NULL != p_chat->get_room( s_room_lower , b_found ) )
+         {
+          string s_msg = "<font color=\"#" 
                        + p_conf->get_elem("chat.html.errorcolor")
-                       + "\">"
+                       + "\">" 
                        + p_conf->get_elem("chat.msgs.err.roomexists")
                        + "</font><br>\n";
 
-        p_user->msg_post( &s_msg );
-      }
-      else
-      {
-        string s_msg = p_timr->get_time() + " "
-                       + p_user->get_colored_bold_name()
-                       + p_conf->get_elem( "chat.msgs.us_errorenamesroom" )
+          p_user->msg_post( &s_msg ); 
+         }
+
+         else
+         { 
+          string s_msg = p_timr->get_time() + " "
+                       + p_user->get_colored_bold_name() 
+                       + p_conf->get_elem( "chat.msgs.userrenamesroom" )
                        + "<b>" + s_room + "</b><br>\n";
 
-        p_chat->del_elem( p_room->get_lowercase_name() );
-        p_room->set_name( s_room );
-        p_chat->add_elem( p_room );
-        p_room->msg_post( &s_msg );
-        p_room->reload_onlineframe();
-      }
-    }
+          p_chat->del_elem( p_room->get_lowercase_name() ); 
+          p_room->set_name( s_room );
+          p_chat->add_elem( p_room ); 
+          p_room->msg_post( &s_msg ); 
+          p_room->reload_onlineframe();
+         }
+	}
 
-    return 0;
-  }
+	return 0;
+ }
 
 }
 
diff --git a/src/mods/commands/yc_s.cpp b/src/mods/commands/yc_s.cpp
index 011d21e..30a6892 100755
--- a/src/mods/commands/yc_s.cpp
+++ b/src/mods/commands/yc_s.cpp
@@ -3,46 +3,45 @@
 
 using namespace std;
 
-extern "C"
-{
-  string to_upper( string &s_msg )
-  {
-    char* c_msg = (char*) s_msg.c_str();
-
-    for ( int i = 0; i < strlen( c_msg ); i++ )
-      c_msg[i] = toupper( c_msg[i] );
-
-    return string( c_msg );
-  };
-
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    vector<string> *params= (vector<string>*) c->elem[2];	// param array
-
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-
-    string s_time = "";
-    if ( p_conf->get_elem("chat.printalwaystime") == "true" )
-      s_time = p_timr->get_time() + " ";
-
-    string s_msg = s_time + "<i>" + p_user->get_colored_name() + " " + p_conf->get_elem("chat.msgs.scream") + " <font color=\"#" + p_user->get_col2() + "\"><b>";
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter = params->begin();
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-        s_msg.append( to_upper(*iter) + " " );
-    }
-
-    s_msg.append( "</b></font></i><br>\n" );
-    p_user->get_room()->msg_post( &s_msg );
-
-    return 0;
-
-  }
+extern "C" {
+ string to_upper( string &s_msg )
+ {
+  char* c_msg = (char*) s_msg.c_str();
+  
+  for ( int i = 0; i < strlen( c_msg ); i++ )
+   c_msg[i] = toupper( c_msg[i] );
+ 
+  return string( c_msg ); 
+ };
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+	vector<string> *params= (vector<string>*) c->elem[2];	// param array
+
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+
+        string s_time = "";
+        if ( p_conf->get_elem("chat.printalwaystime") == "true" )
+         s_time = p_timr->get_time() + " ";
+
+        string s_msg = s_time + "<i>" + p_user->get_colored_name() + " " + p_conf->get_elem("chat.msgs.scream") + " <font color=\"#" + p_user->get_col2() + "\"><b>";
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter = params->begin();
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+          s_msg.append( to_upper(*iter) + " " );
+        }
+
+        s_msg.append( "</b></font></i><br>\n" );
+        p_user->get_room()->msg_post( &s_msg );
+
+	return 0;
+
+ }
 }
 
diff --git a/src/mods/commands/yc_set.cpp b/src/mods/commands/yc_set.cpp
index 3a1afb0..a18b5e9 100755
--- a/src/mods/commands/yc_set.cpp
+++ b/src/mods/commands/yc_set.cpp
@@ -4,97 +4,98 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user* p_user = (user*) c->elem[1];
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT;
-
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-
-    bool b_invalid_syntax = 0;
-
-    if ( params->size() >= 3 )
-    {
-      string s_msg;
-      string s_command_name = params->at(0);
-      string s_option = params->at(1);
-      string s_newval = params->at(2);
-
-      if ( s_option == "status" )
-      {
-        const char* c_newval = s_newval.c_str();
-        if ( isdigit( c_newval[0] ) )
-        {
-          int i_newval = c_newval[0] - '0';
-
-          s_msg = p_timr->get_time()
-                  + " "
-                  + p_user->get_colored_bold_name()
-                  + " "
-                  + p_conf->get_elem("chat.msgs.setcommandstatus")
-                  + " ("
-                  + s_command_name + "," + s_newval + ","
-                  + tool::int2string( p_chat->get_command_disabled(s_command_name))
-                  + ")<br>\n";
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];	
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        chat* p_chat = (chat*) ((dynamic_wrap*)c->elem[3])->CHAT; 
+
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+      
+        bool b_invalid_syntax = 0;
+ 
+        if ( params->size() >= 3 )
+        { 
+         string s_msg;
+         string s_command_name = params->at(0);
+         string s_option = params->at(1);
+         string s_newval = params->at(2);
+
+         if ( s_option == "status" )
+         {
+          const char* c_newval = s_newval.c_str();
+          if ( isdigit( c_newval[0] ) )
+          {
+           int i_newval = c_newval[0] - '0';
+
+           s_msg = p_timr->get_time()
+              + " "
+              + p_user->get_colored_bold_name()
+              + " "
+              + p_conf->get_elem("chat.msgs.setcommandstatus")
+              + " (" 
+              + s_command_name + "," + s_newval + ","
+              + tool::int2string( p_chat->get_command_disabled(s_command_name)) 
+              + ")<br>\n";
+
+           p_user->get_room()->msg_post(&s_msg);
+           p_chat->set_command_status( s_command_name, i_newval );
+          } 
+         }
+         else if ( s_option == "disable" )
+         {
+          const char* c_newval = s_newval.c_str();
+          if ( isdigit( c_newval[0] ) )
+          {
+           int i_newval = c_newval[0] - '0';
+
+           if ( i_newval != 0 )
+            i_newval = 1;
 
-          p_user->get_room()->msg_post(&s_msg);
-          p_chat->set_command_status( s_command_name, i_newval );
+           s_newval = tool::int2string(i_newval);
+
+           s_msg = p_timr->get_time()
+              + " "
+              + p_user->get_colored_bold_name()
+              + " "
+              + p_conf->get_elem("chat.msgs.setcommandstatus")
+              + " (" 
+              + s_command_name + "," 
+              + tool::int2string( p_chat->get_command_status(s_command_name)) 
+              + "," + s_newval + ")<br>\n";
+
+           p_user->get_room()->msg_post(&s_msg);
+           p_chat->set_command_disabled( s_command_name, (bool)i_newval );
+          } 
+         }
+
+         else 
+         {
+          b_invalid_syntax = 1;
+         }  
+ 
         }
-      }
-      else if ( s_option == "disable" )
-      {
-        const char* c_newval = s_newval.c_str();
-        if ( isdigit( c_newval[0] ) )
+       
+        else
         {
-          int i_newval = c_newval[0] - '0';
-
-          if ( i_newval != 0 )
-            i_newval = 1;
-
-          s_newval = tool::int2string(i_newval);
-
-          s_msg = p_timr->get_time()
-                  + " "
-                  + p_user->get_colored_bold_name()
-                  + " "
-                  + p_conf->get_elem("chat.msgs.setcommandstatus")
-                  + " ("
-                  + s_command_name + ","
-                  + tool::int2string( p_chat->get_command_status(s_command_name))
-                  + "," + s_newval + ")<br>\n";
-
-          p_user->get_room()->msg_post(&s_msg);
-          p_chat->set_command_disabled( s_command_name, (bool)i_newval );
+         b_invalid_syntax = 1;
+        }  
+         
+        if ( b_invalid_syntax )
+        {
+          string s_msg = "<font color=\"#" 
+                       + p_conf->get_elem("chat.html.errorcolor")
+                       + "\">" 
+                       + p_conf->get_elem("chat.msgs.err.wrongcommandusage")
+                       + "</font><br>\n";
+          p_user->msg_post( &s_msg ); 
         }
-      }
-      else
-      {
-        b_invalid_syntax = 1;
-      }
-
-    }
-    else
-    {
-      b_invalid_syntax = 1;
-    }
-
-    if ( b_invalid_syntax )
-    {
-      string s_msg = "<font color=\"#"
-                     + p_conf->get_elem("chat.html.errorcolor")
-                     + "\">"
-                     + p_conf->get_elem("chat.msgs.err.wrongcommandusage")
-                     + "</font><br>\n";
-      p_user->msg_post( &s_msg );
-    }
 
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_template.cpp b/src/mods/commands/yc_template.cpp
index 9273fff..e0aa009 100755
--- a/src/mods/commands/yc_template.cpp
+++ b/src/mods/commands/yc_template.cpp
@@ -7,19 +7,18 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*)c->elem[1];		// the corresponding user
+	vector<string> *params=(vector<string>*)c->elem[2];	// param array
+	
+  	string *quitstring=new string("Text to send<br>");
+	p_user->msg_post( quitstring );
 
-    user *p_user = (user*)c->elem[1];		// the corresponding user
-    vector<string> *params=(vector<string>*)c->elem[2];	// param array
-
-    string *quitstring=new string("Text to send<br>");
-    p_user->msg_post( quitstring );
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_time.cpp b/src/mods/commands/yc_time.cpp
index 86a93ec..c22e542 100755
--- a/src/mods/commands/yc_time.cpp
+++ b/src/mods/commands/yc_time.cpp
@@ -2,21 +2,20 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        
+        string s_msg = p_conf->get_elem("chat.msgs.servertime") + p_timr->get_time() + "<br>\n"; 
 
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
+        p_user->msg_post( &s_msg );
 
-    string s_msg = p_conf->get_elem("chat.msgs.servertime") + p_timr->get_time() + "<br>\n";
-
-    p_user->msg_post( &s_msg );
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_topic.cpp b/src/mods/commands/yc_topic.cpp
index bf650b2..0fd01e9 100755
--- a/src/mods/commands/yc_topic.cpp
+++ b/src/mods/commands/yc_topic.cpp
@@ -5,74 +5,74 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-
-    user* p_user = (user*) c->elem[1];		// the corresponding user
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    vector<string> *params = (vector<string>*) c->elem[2];	// param array
-
-    string s_msg;
-    string s_topic;
-    string s_col;
-
-    room* p_room = p_user->get_room();
-
-    if ( ! params->empty() )
-    {
-      vector<string>::iterator iter;
-
-      s_col = "<font color=\"" + p_user->get_col1() + "\">";
-
-      s_msg = p_timr->get_time()
-              + " "
-              + p_user->get_colored_bold_name()
-              + " "
-              + p_conf->get_elem("chat.msgs.topic")
-              + s_col;
-
-      for ( iter = params->begin(); iter != params->end(); iter++ )
-      {
-        s_msg.append( " " + *iter );
-        s_topic.append( *iter + " " );
-      }
-      s_msg.append( "</font>" );
-
-      int i_topic_length = tool::string2int(p_conf->get_elem("chat.maxlength.topic"));
-      if ( s_topic.length() > i_topic_length )
-      {
-        s_topic = s_topic.substr(0, i_topic_length );
-        s_topic.append(" ... ");
-
-        string s_private_msg = "<font color=#" + p_conf->get_elem("chat.html.errorcolor")
-                               + ">" + p_conf->get_elem( "chat.msgs.topiccut" ) + "</font><br>";
-
-        p_user->msg_post ( &s_private_msg );
-      }
-
-      s_topic = "( " + s_topic + ")";
-      p_room->set_topic( s_topic, p_user->get_col1() );
-    }
-    else
-    {
-      s_msg = p_timr->get_time()
-              + " "
-              + p_user->get_colored_bold_name()
-              + " "
-              + p_conf->get_elem("chat.msgs.topicdelete");
-
-      p_room->set_topic( "" );
-    }
-
-    s_msg.append( "<script confuage='JavaScript'>parent.online.location.reload();</script><br>\n" );
-
-    p_room->msg_post ( &s_msg  );
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user* p_user = (user*) c->elem[1];		// the corresponding user
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+	vector<string> *params = (vector<string>*) c->elem[2];	// param array
+        
+        string s_msg;
+        string s_topic;
+        string s_col;
+
+        room* p_room = p_user->get_room();
+
+        if ( ! params->empty() )
+        {
+         vector<string>::iterator iter;
+
+         s_col = "<font color=\"" + p_user->get_col1() + "\">"; 
+
+         s_msg = p_timr->get_time()
+               + " "
+               + p_user->get_colored_bold_name()
+               + " "
+               + p_conf->get_elem("chat.msgs.topic")
+               + s_col;
+
+         for ( iter = params->begin(); iter != params->end(); iter++ )
+         {
+          s_msg.append( " " + *iter );
+          s_topic.append( *iter + " " );
+         }
+         s_msg.append( "</font>" );
+
+         int i_topic_length = tool::string2int(p_conf->get_elem("chat.maxlength.topic"));
+         if ( s_topic.length() > i_topic_length )
+         {
+          s_topic = s_topic.substr(0, i_topic_length );
+          s_topic.append(" ... ");
+
+          string s_private_msg = "<font color=#" + p_conf->get_elem("chat.html.errorcolor") 
+           + ">" + p_conf->get_elem( "chat.msgs.topiccut" ) + "</font><br>";
+
+          p_user->msg_post ( &s_private_msg ); 
+         }
+
+         s_topic = "( " + s_topic + ")";
+         p_room->set_topic( s_topic, p_user->get_col1() );
+        } 
+
+        else
+        {
+         s_msg = p_timr->get_time()
+               + " "
+               + p_user->get_colored_name()
+               + " "
+               + p_conf->get_elem("chat.msgs.topicdelete");
+
+         p_room->set_topic( "" );
+        }
+
+        s_msg.append( "<script confuage='JavaScript'>parent.online.location.reload();</script><br>\n" );
+
+        p_room->msg_post ( &s_msg  );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_uptime.cpp b/src/mods/commands/yc_uptime.cpp
index 163629b..5fe0929 100755
--- a/src/mods/commands/yc_uptime.cpp
+++ b/src/mods/commands/yc_uptime.cpp
@@ -2,21 +2,20 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	
+	user *p_user = (user*) c->elem[1];		// the corresponding user
+        conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF; 
+        timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR; 
+        
+        string s_msg = p_conf->get_elem("chat.msgs.uptime") + p_timr->get_uptime() + "<br>\n"; 
 
-    user *p_user = (user*) c->elem[1];		// the corresponding user
-    conf* p_conf = (conf*) ((dynamic_wrap*)c->elem[3])->CONF;
-    timr* p_timr = (timr*) ((dynamic_wrap*)c->elem[3])->TIMR;
+        p_user->msg_post( &s_msg );
 
-    string s_msg = p_conf->get_elem("chat.msgs.uptime") + p_timr->get_uptime() + "<br>\n";
-
-    p_user->msg_post( &s_msg );
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/commands/yc_version.cpp b/src/mods/commands/yc_version.cpp
index cb4831e..d64fabd 100755
--- a/src/mods/commands/yc_version.cpp
+++ b/src/mods/commands/yc_version.cpp
@@ -7,17 +7,16 @@
 
 using namespace std;
 
-extern "C"
-{
-  int valid_color( string );
+extern "C" {
+ int valid_color( string );
+ 
+ int extern_function(void *v_arg)
+ {
+	container *c=(container *)v_arg;
+	user *p_user = (user*)c->elem[1];		// the corresponding user
+ 	p_user->msg_post( tool::ychat_version() + "<br>\n");
 
-  int extern_function(void *v_arg)
-  {
-    container *c=(container *)v_arg;
-    user *p_user = (user*)c->elem[1];		// the corresponding user
-    p_user->msg_post( tool::ychat_version() + "<br>\n");
-
-    return 0;
-  }
+	return 0;
+ }
 }
 
diff --git a/src/mods/html/Makefile b/src/mods/html/Makefile
index 98deaf7..6fc4cc5 100644
--- a/src/mods/html/Makefile
+++ b/src/mods/html/Makefile
@@ -1,4 +1,4 @@
-SRCS=yc_admin.cpp yc_colors.cpp yc_help.cpp yc_loggedin.cpp yc_options.cpp yc_register.cpp
+SRCS=yc_admin.cpp yc_colors.cpp yc_help.cpp yc_options.cpp yc_register.cpp
 MODS=$(addprefix ../../../mods/html/, $(SRCS:.cpp=.so))
 CC=g++
 INCLUDES=`cat ../../includes.add`
@@ -20,6 +20,5 @@ clean:
 ../../../mods/html/yc_admin.so: yc_admin.cpp
 ../../../mods/html/yc_colors.so: yc_colors.cpp
 ../../../mods/html/yc_help.so: yc_help.cpp
-../../../mods/html/yc_loggedin.so: yc_loggedin.cpp
 ../../../mods/html/yc_options.so: yc_options.cpp
 ../../../mods/html/yc_register.so: yc_register.cpp
diff --git a/src/mods/html/Makefile.in b/src/mods/html/Makefile.in
index 4b7c728..30f1782 100755
--- a/src/mods/html/Makefile.in
+++ b/src/mods/html/Makefile.in
@@ -4,12 +4,12 @@ INCLUDES=`cat ../../includes.add`
 CFLAGS=`cat ../cflags.add`
 all: mods
 $(MODS): 
+	@echo -n "Compiling html module `basename $@` " 
 	@if ! test -d `dirname $@`; then mkdir -p `dirname $@`; fi
 	@$(CC) $(CFLAGS) $(INCLUDES) -shared -s -o $@ `echo $(notdir $@) | sed s/.so/.cpp/`
-	@echo -n "HTML module `basename $@ | sed s/\.so// | sed s/yc_//` " 
 	@du -hc $@ | tail -n 1 | sed s/total// | sed "s/ //g"
 infotext:
-	@echo Compiling HTML modules
+	@echo Compiling html modules
 mods:	infotext $(MODS) 
 	@echo "Num of html modules: "
 	@ls ../../../mods/html/*.so | wc -l
diff --git a/src/mods/html/yc_admin.cpp b/src/mods/html/yc_admin.cpp
index cbee80a..d93de4f 100644
--- a/src/mods/html/yc_admin.cpp
+++ b/src/mods/html/yc_admin.cpp
@@ -7,66 +7,63 @@
 
 using namespace std;
 
-extern "C"
-{
-  string replace_chars(string s_string)
-  {
-    s_string = tool::replace(s_string, "<", "&lt;");
-    s_string = tool::replace(s_string, ">", "&gt;");
-    s_string = tool::replace(s_string, "\n", "<br>");
-    return s_string;
-  }
-
-  int extern_function(void *v_arg)
-  {
-    container* c         = (container*) v_arg;
-    dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
-    user* 	   p_user    = (user*) c->elem[2];
-    conf*      p_conf    = (conf*) p_wrap->CONF;
-    string*    p_content = &(*((map<string,string>*) c->elem[1]))["content"];
-
-    vector<string>* p_vec_keys = p_conf->get_key_vector();
-    sort(p_vec_keys->begin(), p_vec_keys->end());
-    vector<string>::iterator p_vec_keys_iter = p_vec_keys->begin();
-
-    p_content->append( "Currently are " + tool::int2string(p_vec_keys->size()) + " options available!<br><br>\n");
-    p_content->append( "<table bordercolor=\"1\">\n" );
-
-    for( ;p_vec_keys_iter != p_vec_keys->end(); ++p_vec_keys_iter )
-    {
-
-      if ( p_vec_keys_iter->find(".descr") != string::npos )
-        continue;
-
-      p_content->append( "<tr><td>\n<font color=\"#FFFFFF\"><b>" + *p_vec_keys_iter + "\n</b></font></td></tr>\n" );
-
-      string s_descr = p_conf->get_elem(*p_vec_keys_iter + ".descr");
-      if ( s_descr.length()
-           > 0 )
-      {
-        p_content->append( "<tr><td><font color=\"#CCCCCC\">\n" );
-        p_content->append( replace_chars(p_conf->get_elem(*p_vec_keys_iter + ".descr")) );
-        p_content->append( "\n</font></td></tr>\n" );
-      }
-
-      p_content->append( "<tr><td>\n" );
-
-      // Hide some fields!
-      if ( p_vec_keys_iter->find(".password")
-           != string::npos
-           || p_vec_keys_iter->find("base.user") != string::npos
-           || p_vec_keys_iter->find(".dbname") != string::npos )
-        p_content->append( "X X X X X X X X X X" );
-
-      else
-        p_content->append( replace_chars(p_conf->get_elem(*p_vec_keys_iter)) );
-
-      p_content->append( "<br><br></td></tr>\n" );
-    } // while
-
-    p_content->append( "</table>\n<br>\n" );
-
-    return 0;
-  }
+extern "C" {
+ string replace_chars(string s_string) {
+  s_string = tool::replace(s_string, "<", "&lt;");
+  s_string = tool::replace(s_string, ">", "&gt;");
+  s_string = tool::replace(s_string, "\n", "<br>");
+  return s_string;
+ }
+
+ int extern_function(void *v_arg)
+ {
+	container* c         = (container*) v_arg;
+        dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
+        user* 	   p_user    = (user*) c->elem[2];
+        conf*      p_conf    = (conf*) p_wrap->CONF; 
+        string*    p_content = &(*((map_string*) c->elem[1]))["content"];
+
+         vector<string>* p_vec_keys = p_conf->get_key_vector();
+	 sort(p_vec_keys->begin(), p_vec_keys->end());
+ 	 vector<string>::iterator p_vec_keys_iter = p_vec_keys->begin();
+
+
+         p_content->append( "Currently are " + tool::int2string(p_vec_keys->size()) + " options available!<br><br>\n");
+
+         p_content->append( "<table bordercolor=\"1\">\n" );
+
+         for( ;p_vec_keys_iter != p_vec_keys->end(); ++p_vec_keys_iter ) {
+
+          if ( p_vec_keys_iter->find(".descr") != string::npos )
+           continue;
+
+          p_content->append( "<tr><td>\n<font color=\"#FFFFFF\"><b>" + *p_vec_keys_iter + "\n</b></font></td></tr>\n" );
+
+          string s_descr = p_conf->get_elem(*p_vec_keys_iter + ".descr");
+	  if ( s_descr.length() > 0 ) 
+          {    
+           p_content->append( "<tr><td><font color=\"#CCCCCC\">\n" );
+           p_content->append( replace_chars(p_conf->get_elem(*p_vec_keys_iter + ".descr")) );
+           p_content->append( "\n</font></td></tr>\n" );
+          }
+
+          p_content->append( "<tr><td>\n" );
+
+	  // Hide some fields!
+          if ( p_vec_keys_iter->find(".password") != string::npos
+		|| p_vec_keys_iter->find("base.user") != string::npos 
+		|| p_vec_keys_iter->find(".dbname") != string::npos )
+           p_content->append( "X X X X X X X X X X" );
+
+          else
+           p_content->append( replace_chars(p_conf->get_elem(*p_vec_keys_iter)) );
+
+          p_content->append( "<br><br></td></tr>\n" );
+         } // while
+
+         p_content->append( "</table>\n<br>\n" );
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/html/yc_colors.cpp b/src/mods/html/yc_colors.cpp
index 1f12f60..4bd20bf 100755
--- a/src/mods/html/yc_colors.cpp
+++ b/src/mods/html/yc_colors.cpp
@@ -6,32 +6,30 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container* c          = (container*) v_arg;
-    dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
-    conf*      p_conf    = (conf*) p_wrap->CONF;
-    string*    p_col1     = &(*((map<string,string>*) c->elem[1]))["col1"];
-    string*    p_col2     = &(*((map<string,string>*) c->elem[1]))["col2"];
-    string*    p_flag     = &(*((map<string,string>*) c->elem[1]))["flag"];
-    user*      p_user     = (user*) c->elem[2];
-
-    p_col1->erase(0);
-    p_col2->erase(0);
-
-    p_col1->append( p_user->get_col1() );
-    p_col2->append( p_user->get_col2() );
-
-    if ( *p_flag == "submit" )
-    {
-      string*  p_msgs  = &(*((map<string,string>*) c->elem[1])
-                          )["msgs"];
-      p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) );
-    }
-
-    return 0;
-  }
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container* c          = (container*) v_arg;
+        dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
+        conf*      p_conf    = (conf*) p_wrap->CONF; 
+        string*    p_col1     = &(*((map_string*) c->elem[1]))["col1"];
+        string*    p_col2     = &(*((map_string*) c->elem[1]))["col2"];
+        string*    p_flag     = &(*((map_string*) c->elem[1]))["flag"];
+        user*      p_user     = (user*) c->elem[2];
+
+        p_col1->erase(0);
+        p_col2->erase(0);
+
+        p_col1->append( p_user->get_col1() );
+        p_col2->append( p_user->get_col2() );
+
+        if ( *p_flag == "submit" )
+        {
+         string*  p_msgs  = &(*((map_string*) c->elem[1]))["msgs"];
+         p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) );
+        }
+
+	return 0;
+ } 
 }
 
diff --git a/src/mods/html/yc_help.cpp b/src/mods/html/yc_help.cpp
index da58be8..5612a50 100755
--- a/src/mods/html/yc_help.cpp
+++ b/src/mods/html/yc_help.cpp
@@ -6,45 +6,43 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container* c         = (container*) v_arg;
-    dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
-    user* 	   p_user    = (user*) c->elem[2];
-
-    modl*      p_modl    = (modl*) p_wrap->MODL;
-    conf*      p_conf    = (conf*) p_wrap->CONF;
-    chat*      p_chat    = (chat*) p_wrap->CHAT;
-    string*    s_content = &(*((map<string,string>*) c->elem[1]))["content"];
-
-    vector<string>* p_vec_keys = p_modl->get_mod_vector();
-
-    sort(p_vec_keys->begin(), p_vec_keys->end());
-    vector<string>::iterator p_vec_keys_iter = p_vec_keys->begin();
-
-    while( p_vec_keys_iter != p_vec_keys->end() )
-    {
-
-      if ( p_vec_keys_iter->find( "mods/commands/", 0 ) != string::npos )
-      {
-
-        string s_command_name = p_vec_keys_iter->substr(17);
-        s_command_name.erase( s_command_name.find( ".so" ) );
-
-        if ( !p_chat->get_command_disabled( s_command_name ) &&
-             p_chat->get_command_status( s_command_name ) >= p_user->get_status())
-        {
-          s_content->append( "<table bordercolor=\"1\">\n" );
-          s_content->append( "<tr><td><font color=\"#FFFFFF\"><b>/" + s_command_name + "</b></font></td></tr>\n" );
-          s_content->append( "<tr><td>" + p_conf->get_elem("chat.msgs.help." + s_command_name) + "</td></tr>\n" );
-          s_content->append( "</table>\n<br>\n" );
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container* c         = (container*) v_arg;
+        dynamic_wrap* p_wrap = (dynamic_wrap*) c->elem[0];
+        user* 	   p_user    = (user*) c->elem[2];
+        modl*      p_modl    = (modl*) p_wrap->MODL; 
+        conf*      p_conf    = (conf*) p_wrap->CONF; 
+        chat*      p_chat    = (chat*) p_wrap->CHAT; 
+        string*    s_content = &(*((map_string*) c->elem[1]))["content"];
+
+        vector<string>* p_vec_keys = p_modl->get_mod_vector();
+          
+	sort(p_vec_keys->begin(), p_vec_keys->end());
+	vector<string>::iterator p_vec_keys_iter = p_vec_keys->begin();
+
+        while( p_vec_keys_iter != p_vec_keys->end() ) {
+
+         if ( p_vec_keys_iter->find( "mods/commands/", 0 ) != string::npos )
+         {
+
+          string s_command_name = p_vec_keys_iter->substr(17);
+          s_command_name.erase( s_command_name.find( ".so" ) );
+
+          if ( !p_chat->get_command_disabled( s_command_name ) && 
+                p_chat->get_command_status( s_command_name ) >= p_user->get_status())
+          { 
+           s_content->append( "<table bordercolor=\"1\">\n" );
+           s_content->append( "<tr><td><font color=\"#FFFFFF\"><b>/" + s_command_name + "</b></font></td></tr>\n" );
+           s_content->append( "<tr><td>" + p_conf->get_elem("chat.msgs.help." + s_command_name) + "</td></tr>\n" );
+           s_content->append( "</table>\n<br>\n" );
+          }
+         }
+         p_vec_keys_iter++;
         }
-      }
-      p_vec_keys_iter++;
-    }
-    return 0;
-  }
+
+	return 0;
+ }
 }
 
diff --git a/src/mods/html/yc_options.cpp b/src/mods/html/yc_options.cpp
index ec9ab5e..c209b93 100755
--- a/src/mods/html/yc_options.cpp
+++ b/src/mods/html/yc_options.cpp
@@ -6,51 +6,50 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
-    container* c          = (container*) v_arg;
-    dynamic_wrap* p_wrap  = (dynamic_wrap*) c->elem[0];
-    conf*      p_conf     = (conf*) p_wrap->CONF;
-    string*    p_flag     = &(*((map<string,string>*) c->elem[1]))["flag"];
-    string*    p_email    = &(*((map<string,string>*) c->elem[1]))["email"];
-    string*    p_pass     = &(*((map<string,string>*) c->elem[1]))["pass"];
-    string*    p_newpass  = &(*((map<string,string>*) c->elem[1]))["newpass"];
-    string*    p_newpass2 = &(*((map<string,string>*) c->elem[1]))["newpass2"];
-    user*      p_user     = (user*) c->elem[2];
-
-    if ( *p_flag == "submit" )
-    {
-      string*  p_msgs  = &(*((map<string,string>*) c->elem[1])
-                          )["msgs"];
-
-      // If the password has to be changed:
-      if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" )
-      {
-        if ( p_user->get_pass() != *p_pass )
+extern "C" {
+ int extern_function(void *v_arg)
+ {
+	container* c          = (container*) v_arg;
+        dynamic_wrap* p_wrap  = (dynamic_wrap*) c->elem[0];
+        conf*      p_conf     = (conf*) p_wrap->CONF; 
+        string*    p_flag     = &(*((map_string*) c->elem[1]))["flag"];
+        string*    p_email    = &(*((map_string*) c->elem[1]))["email"];
+        string*    p_pass     = &(*((map_string*) c->elem[1]))["pass"];
+        string*    p_newpass  = &(*((map_string*) c->elem[1]))["newpass"];
+        string*    p_newpass2 = &(*((map_string*) c->elem[1]))["newpass2"];
+        user*      p_user     = (user*) c->elem[2];
+
+        if ( *p_flag == "submit" )
         {
-          p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword" ) );
-          return 0;
+         string*  p_msgs  = &(*((map_string*) c->elem[1]))["msgs"];
+
+         // If the password has to be changed:
+         if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" ) 
+         {
+          if ( p_user->get_pass() != *p_pass )
+          {
+           p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword" ) );
+           return 0;
+          }
+
+          if ( *p_newpass != *p_newpass2 )
+          {
+           p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword2" ) );
+           return 0;
+          }
+          p_user->set_pass( *p_newpass );
+	 }
+
+         p_user->set_email( *p_email );
+         p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) );
         }
 
-        if ( *p_newpass != *p_newpass2 )
+        else
         {
-          p_msgs->append( p_conf->get_elem( "chat.msgs.err.changepassword2" ) );
-          return 0;
+          p_email->append( p_user->get_email() );
         }
-        p_user->set_pass( *p_newpass );
-      }
-
-      p_user->set_email( *p_email );
-      p_msgs->append( p_conf->get_elem( "chat.msgs.optionschanged" ) );
-    }
-    else
-    {
-      p_email->append( p_user->get_email() );
-    }
-
-    return 0;
-  }
+
+	return 0;
+ } 
 }
 
diff --git a/src/mods/html/yc_register.cpp b/src/mods/html/yc_register.cpp
index d0bcc8f..016c932 100755
--- a/src/mods/html/yc_register.cpp
+++ b/src/mods/html/yc_register.cpp
@@ -6,91 +6,88 @@
 
 using namespace std;
 
-extern "C"
-{
-  int extern_function(void *v_arg)
-  {
+extern "C" {
+ int extern_function(void *v_arg)
+ {
 #ifdef DATABASE
-    container* c          = (container*) v_arg;
-    dynamic_wrap* p_wrap  = (dynamic_wrap*) c->elem[0];
-    conf*      p_conf     = (conf*) p_wrap->CONF;
-    data*      p_data     = (data*) p_wrap->DATA;
-    string*    p_msgs     = &(*((map<string,string>*) c->elem[1]))["INFO"];
-    string*    p_nick     = &(*((map<string,string>*) c->elem[1]))["nick"];
-    string*    p_email    = &(*((map<string,string>*) c->elem[1]))["email"];
-    string*    p_pass     = &(*((map<string,string>*) c->elem[1]))["pass"];
-    string*    p_pass2    = &(*((map<string,string>*) c->elem[1]))["pass2"];
-    string*    p_request  = &(*((map<string,string>*) c->elem[1]))["request"];
-    user*      p_user     = (user*) c->elem[2];
-    string     s_nick     = *p_nick;
-
-
-    p_user->set_name( "!" + s_nick );
-    p_user->set_has_sess( false );
-    *p_nick = tool::to_lower(*p_nick);
-
-    if ( *p_pass != *p_pass2 )
-    {
-      p_msgs->append( p_conf->get_elem( "chat.msgs.err.registerpassword" ) )
-      ;
-    }
-
-    // prove if the nick is alphanumeric:
-    else if ( ! tool::is_alpha_numeric( *p_nick ) )
-    {
-      p_msgs->append( p_conf->get_elem( "chat.msgs.err.alpnum" ) )
-      ;
-    }
-
-    // prove if the nick is too long:
-    else if ( p_nick->length() > tool::string2int( p_conf->get_elem("chat.maxlength.username")
-                                                 ) )
-    {
-      p_msgs->append( p_conf->get_elem( "chat.msgs.err.nicklength" ) );
-    }
-    else if ( p_pass->length() > tool::string2int( p_conf->get_elem("chat.maxlength.password")
-                                                 ) )
-    {
-      p_msgs->append( p_conf->get_elem( "chat.msgs.err.passlength" ) );
-    }
-    else if ( p_email->length() > tool::string2int( p_conf->get_elem("chat.maxlength.emailaddress")
-                                                  ) )
-    {
-      p_msgs->append( p_conf->get_elem( "chat.msgs.err.emaillength" ) );
-    }
-    else
-    {
-      hashmap<string> result_map = p_data->select_user_data( *p_nick, "selectnick" );
-      if (result_map["nick"] == *p_nick)
-      {
-        p_msgs->append( p_conf->get_elem( "chat.msgs.err.registerexists" ) );
-      }
-      else
-      {
-        p_user->set_name( s_nick );
-        p_msgs->append( p_conf->get_elem( "chat.msgs.registernick" ) );
-        p_request->replace( 0, p_request->length(), p_conf->get_elem("httpd.startsite") );
-
-        map<string,string> map_insert = *((map<string,string>*) c->elem[1]);
-        map_insert["password"] = *p_pass;
-        map_insert["color1"] = p_conf->get_elem("chat.html.user.color1");
-        map_insert["color2"] = p_conf->get_elem("chat.html.user.color2");
-        map_insert["registerdate"] = tool::int2string((int)tool::unixtime());
-
-        p_user->set_pass( map_insert["password"] );
-        p_user->set_email( map_insert["email"] );
-        p_user->set_col1( map_insert["color1"] );
-        p_user->set_col2( map_insert["color2"] );
-        p_user->set_is_reg( 1 );
-        p_user->set_status( tool::string2int(p_conf->get_elem("chat.defaultrang") ) );
-
-        p_data->insert_user_data( *p_nick, "registernick", map_insert );
-      }
-    }
-
-    return 0;
-#endif
+	container* c          = (container*) v_arg;
+        dynamic_wrap* p_wrap  = (dynamic_wrap*) c->elem[0];
+        conf*      p_conf     = (conf*) p_wrap->CONF; 
+        data*      p_data     = (data*) p_wrap->DATA; 
+        string*    p_msgs     = &(*((map_string*) c->elem[1]))["INFO"];
+        string*    p_nick     = &(*((map_string*) c->elem[1]))["nick"];
+        string*    p_email    = &(*((map_string*) c->elem[1]))["email"];
+        string*    p_pass     = &(*((map_string*) c->elem[1]))["pass"];
+        string*    p_pass2    = &(*((map_string*) c->elem[1]))["pass2"];
+        string*    p_request  = &(*((map_string*) c->elem[1]))["request"];
+        user*      p_user     = (user*) c->elem[2];
+        string     s_nick     = *p_nick;
+
+
+  	 p_user->set_name( "!" + s_nick );
+         p_user->set_has_sess( false );
+        *p_nick = tool::to_lower(*p_nick);
+
+        if ( *p_pass != *p_pass2 )
+        {
+         p_msgs->append( p_conf->get_elem( "chat.msgs.err.registerpassword" ) );
+        }
+
+        // prove if the nick is alphanumeric:
+        else if ( ! tool::is_alpha_numeric( *p_nick ) )
+        {
+         p_msgs->append( p_conf->get_elem( "chat.msgs.err.alpnum" ) );
+        }
+
+        // prove if the nick is too long:
+        else if ( p_nick->length() > tool::string2int( p_conf->get_elem("chat.maxlength.username") ) )
+        {
+         p_msgs->append( p_conf->get_elem( "chat.msgs.err.nicklength" ) );
+        }
+
+        else if ( p_pass->length() > tool::string2int( p_conf->get_elem("chat.maxlength.password") ) )
+        {
+         p_msgs->append( p_conf->get_elem( "chat.msgs.err.passlength" ) );
+        }
 
-  }
+        else if ( p_email->length() > tool::string2int( p_conf->get_elem("chat.maxlength.emailaddress") ) )
+        {
+         p_msgs->append( p_conf->get_elem( "chat.msgs.err.emaillength" ) );
+        }
+
+	else
+	{
+	 map_string result_map = p_data->select_user_data( *p_nick, "selectnick" ); 
+	 if (result_map["nick"] == *p_nick)
+         {
+          p_msgs->append( p_conf->get_elem( "chat.msgs.err.registerexists" ) );
+         }
+	  
+	 else
+	 {
+  	  p_user->set_name( s_nick );
+          p_msgs->append( p_conf->get_elem( "chat.msgs.registernick" ) );
+          p_request->replace( 0, p_request->length(), p_conf->get_elem("httpd.startsite") );
+
+          map_string map_insert = *((map_string*) c->elem[1]);
+          map_insert["password"] = *p_pass;
+          map_insert["color1"] = p_conf->get_elem("chat.html.user.color1");
+          map_insert["color2"] = p_conf->get_elem("chat.html.user.color2");
+          map_insert["registerdate"] = tool::int2string((int)tool::unixtime()); 
+
+  	  p_user->set_pass( map_insert["password"] );
+  	  p_user->set_email( map_insert["email"] );
+  	  p_user->set_col1( map_insert["color1"] );
+  	  p_user->set_col2( map_insert["color2"] );
+  	  p_user->set_is_reg( 1 );
+  	  p_user->set_status( tool::string2int(p_conf->get_elem("chat.defaultrang") ) );
+
+          p_data->insert_user_data( *p_nick, "registernick", map_insert );
+         }
+	}	
+
+	return 0;
+#endif
+ } 
 }
 
diff --git a/src/msgs.h b/src/msgs.h
index eb8ec80..9f9ec3b 100644..100755
--- a/src/msgs.h
+++ b/src/msgs.h
@@ -4,11 +4,11 @@
 // alphabetical ordered:
 #define ACCPERR "Sock: Accept error "
 #define BINDERR "Sock: Bind error "
-#define HTTPDREP "Chat: Using replacement strings"
-#define HTTPDDOP "Chat: Default operator login "
+#define CHATREP "Chat: Using replacement strings"
+#define CHATDOP "Chat: Default operator login "
 #define CFILEOK "Parsing config file"
 #define CFILEFA "Failed opening config file!"
-#define CONTACT "Contact: http://www.yhttpd.org, Mail@yhttpd.org, ICQ: 11655527"
+#define CONTACT "Contact: http://www.yChat.org, Mail@yChat.org, ICQ: 11655527"
 #define CLRHTML "HTML: Cleared the template cache "
 #define CLIWELC "Command Line Interface (type help for a list of all commands)"
 #define CLIPRMO ">> "
@@ -93,9 +93,10 @@
 #define XMLREAD "XML: Reading "
 #define XMLERR "XML Error: "
 #define XMLER1 "XML Error: Unable to load file "
-#define VERSION "yhttpd 0.7.1"
+#define VERSION "yChat 0.7.2"
 #define BRANCH "RELEASE"
-#define BUILDNR 2885
+#define BUILDNR 2912
 #define UNAME "FreeBSD 5.2.1-RELEASE-p10 i386"
+#define COMPOPT "Using built-in specs.; Configured with: FreeBSD/i386 system compiler; Thread model: posix; gcc version 3.3.3 [FreeBSD] 20031106; 3.3; g++"
 
 #endif
diff --git a/src/ncur/ncur.cpp b/src/ncur/ncur.cpp
index e9e7753..fa91a74 100755
--- a/src/ncur/ncur.cpp
+++ b/src/ncur/ncur.cpp
@@ -38,17 +38,20 @@ ncur::start( void *p_void )
                           "Unload all modules      ",
                           "Reload all modules      ",
                           "Clear template cache    ",
-               		  "                        ", 
+                          "Run garbage collector   ", //<<
+               		  //>>"                        ", 
                           "Show max res. set size  ",
                           "Compile changed sources ",
                           "Recompile all sources   ",
                           "Show source stats       ",
                           "Command Line Interface  ",
 #ifdef DATABASE
+                          "Disconnect from DB      ", //<<
 #else
+                          "			   ", //<<
 #endif
 
-               		  "                        ", 
+               		  //>>"                        ", 
                           "Shut down server"
                       };
 
@@ -67,11 +70,15 @@ ncur::start( void *p_void )
     mvprintw( NCUR_SERVER_HEADER_X,NCUR_SERVER_HEADER_Y, "HTTP server:");
     mvprintw( NCUR_POOL_HEADER_X,NCUR_POOL_HEADER_Y, "Thread pool:");
 #ifdef DATABASE
+    mvprintw( NCUR_DATA_HEADER_X,NCUR_DATA_HEADER_Y, "Data stats:"); //<<
 #endif
+    mvprintw( NCUR_CHAT_HEADER_X,NCUR_CHAT_HEADER_Y, "Chat stats:"); //<<
     mvprintw( NCUR_CACHED_HEADER_X,NCUR_CACHED_HEADER_Y, "Caching:"); 
     wrap::HTML->print_cached(0);
 
     is_ready( true );
+    wrap::SMAN->print_init_ncurses(); //<<
+    wrap::STAT->print_num_rooms();    //<<
 
     p_menu->start( &switch_main_menu_ );
 
@@ -166,6 +173,11 @@ ncur::switch_main_menu_( int i_choice )
             refresh();
             break;
         case 4:
+            //<<*
+            if ( ! wrap::GCOL->remove_garbage() )
+             wrap::NCUR->print( GAROFFNE );
+            mvprintw( 20,2, "Garbage collector activated                                  ");
+            //*>>
             refresh();
             break;
         case 5:
@@ -203,10 +215,13 @@ ncur::switch_main_menu_( int i_choice )
             break;
         case 10:
 #ifdef DATABASE
+            wrap::DATA->disconnect_all_connections(); 	//<<
 #endif
             break;
 
         case 11: // Shut down server
+            if ( ! wrap::GCOL->remove_garbage() ) 	//<<
+             wrap::NCUR->print( GAROFFNE );		//<<
             mvprintw( 21,2, "Good bye !");
             close_ncurses();
             exit(0);
@@ -229,7 +244,7 @@ ncur::init_ncurses()
     noecho();
     cbreak();       // Line buffering disabled. pass on everything
     init_pair(1, COLOR_WHITE, COLOR_BLUE);
-    mvprintw( 0,2, (char*)(tool::yhttpd_version()).c_str());
+    mvprintw( 0,2, (char*)(tool::ychat_version()).c_str());
     refresh();
 }
 
diff --git a/src/reqp.cpp b/src/reqp.cpp
index 630e34c..8c59c3a 100755
--- a/src/reqp.cpp
+++ b/src/reqp.cpp
@@ -7,8 +7,8 @@
 using namespace std;
 
 string reqp::HTTP_CODEOK = "HTTP/1.1 200 OK\r\n";
-string reqp::HTTP_SERVER = "Server: yhttpd (Unix)\r\n";
-string reqp::HTTP_CONTAC = "Contact: www.yhttpd.org\r\n";
+string reqp::HTTP_SERVER = "Server: yChat (Unix)\r\n";
+string reqp::HTTP_CONTAC = "Contact: www.yChat.org\r\n";
 string reqp::HTTP_EXPIRE = "Expires: 0\r\n";
 string reqp::HTTP_CACHEC = "Cache-control: no-cache\r\nPragma: no-cache\r\n";
 string reqp::HTTP_CONNEC = "Connection: keep-alive\r\n";
@@ -261,6 +261,85 @@ reqp::parse( thrd* p_thrd, string s_req, map_string &map_params )
     s_rep.append( get_content_type( map_params["request"] ) );
     s_rep.append("\r\n\r\n");
 
+    //<<*
+    // check the event variable.
+    if ( ! s_event.empty() )
+      {
+        // login procedure.
+        if ( s_event == "login" )
+        {
+            wrap::CHAT->login( map_params );
+        }
+
+        else if ( s_event == "register" )
+        {
+          user* p_user = new user;
+          map_params["INFO"] = "";
+          run_html_mod( s_event, map_params, p_user );
+          wrap::GCOL->add_user_to_garbage( p_user );
+        }
+
+        else
+        {
+            bool b_found;
+
+            //   user* p_user = s_chat::get().get_user( map_params["nick"], b_found );
+            sess *sess_temp = wrap::SMAN->get_session( map_params["tmpid"] );
+
+            user *p_user;
+            if( sess_temp != NULL )
+            {
+                string s_nick = sess_temp->get_name();
+                p_user = wrap::CHAT->get_user( s_nick, b_found);
+            }
+
+            else
+            {
+                return s_rep;
+            }
+
+            if ( ! b_found )
+            {
+                map_params["INFO"]    = wrap::CONF->get_elem( "chat.msgs.err.notonline" );
+                map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage.
+            }
+
+            else
+            {
+             map_params["nick"] = p_user->get_name().c_str();
+
+             // if a message input.
+             if ( s_event == "input" )
+             {
+                if ( p_user )
+                {
+                 p_user->check_restore_away();
+                 wrap::CHAT->post( p_user, map_params );
+                }
+             }
+
+             // if a chat stream
+             else if ( s_event == "stream" )
+             {
+                string s_msg ( wrap::HTML->parse( map_params ) );
+                p_user->msg_post( &s_msg);
+                wrap::SOCK-> 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" )
+             {
+                wrap::HTML->online_list( p_user, map_params );
+             }
+
+             else if ( s_event != "input" ) 
+             {
+	      run_html_mod( s_event, map_params, p_user );  
+             }
+            }
+        }
+    } 
+    //*>>
  
     if ( wrap::CONF->get_elem("httpd.enablecgi").compare("true") == 0 && 
          string::npos != map_params["request"].find(".cgi") )
@@ -281,6 +360,26 @@ reqp::parse( thrd* p_thrd, string s_req, map_string &map_params )
     return  s_rep;
 }
 
+//<<*
+void 
+reqp::run_html_mod( string s_event, map_string &map_params, user* p_user )
+{
+    container *c = new container;
+
+    c->elem[0] = (void*) wrap::WRAP;
+    c->elem[1] = (void*) &map_params;
+    c->elem[2] = (void*) p_user;
+
+    string s_mod = wrap::CONF->get_elem("httpd.modules.htmldir") + "yc_" + s_event + ".so";
+
+    dynmod* p_module = wrap::MODL->get_module( s_mod );
+    
+    if ( p_module != NULL )
+      ( *( p_module->the_func ) ) ( (void*) c ); 
+
+    delete c;
+}
+//*>>
 
 string
 reqp::remove_dots( string s_ret )
diff --git a/src/reqp.h b/src/reqp.h
index 3a998b9..519100e 100755
--- a/src/reqp.h
+++ b/src/reqp.h
@@ -32,6 +32,7 @@ private:
     virtual string get_from_header( string s_req, string s_hdr );
 
     virtual int htoi( string *s );
+    virtual void run_html_mod( string s_event, map_string &map_params, user* p_user ); //<<
     // Removes double dots ".." 
     string remove_dots( string s_req );
 
diff --git a/src/sock/sock.cpp b/src/sock/sock.cpp
index 7dba4b7..531ccb9 100755
--- a/src/sock/sock.cpp
+++ b/src/sock/sock.cpp
@@ -6,6 +6,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "sock.h"
+#include "../chat/chat.h"
+#include "../chat/user.h"
 
 using namespace std;
 
@@ -27,6 +29,56 @@ sock::~sock()
     pthread_mutex_destroy( &mut_threads );
 }
 
+//<<*
+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 );
+
+    pthread_mutex_t mutex;
+    pthread_mutex_init( &mutex, NULL ); 
+    pthread_mutex_lock( &mutex );
+
+    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), &mutex );
+    }
+    while( p_user->get_online() );
+
+    pthread_mutex_destroy( &mutex );
+ 
+    // 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 );
+
+    // remove the user from its room.
+    string s_user( p_user->get_name() );
+    string s_user_lowercase( p_user->get_lowercase_name() );
+    p_user->get_room()->del_elem( s_user_lowercase );
+
+    // post the room that the user has left the chat.
+    s_msg = wrap::TIMR->get_time() + " " 
+          + p_user->get_colored_bold_name()
+          + wrap::CONF->get_elem( "chat.msgs.userleaveschat" )
+          + "<br>\n";
+
+    p_user->get_room()->msg_post( &s_msg );
+    p_user->get_room()->reload_onlineframe();
+
+#ifdef VERBOSE
+    cout << REMUSER << s_user << endl;
+#endif
+
+    wrap::GCOL->add_user_to_garbage( p_user );
+}
+//*>>
 
 int
 sock::make_server_socket( int i_port )
diff --git a/src/sock/sock.h b/src/sock/sock.h
index 079dfd8..6f3419e 100755
--- a/src/sock/sock.h
+++ b/src/sock/sock.h
@@ -13,6 +13,7 @@
 #include "../thrd/pool.h"
 #include "../thrd/thrd.h"
 #include "../reqp.h"
+#include "../chat/user.h"
 #include "../logd.h"
 
 using namespace std;
@@ -55,6 +56,7 @@ public:
     virtual int  start();
 
     // 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 ); //<<
 
     void increase_num_threads();
     void decrease_num_threads();
diff --git a/src/stats.cpp b/src/stats.cpp
index 63757b6..7fba04d 100644
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -11,14 +11,17 @@ stats::stats()
  i_rusage_vec_size = tool::string2int(
   wrap::CONF->get_elem("httpd.stats.rusagehistory")); 
 
+ i_num_rooms = 0; //<<
 
  pthread_mutex_init( &mut_vec_rusage, NULL );
+ pthread_mutex_init( &mut_num_rooms, NULL ); //<<
 
 }
 
 stats::~stats()
 {
  pthread_mutex_destroy( &mut_vec_rusage ); 
+ pthread_mutex_destroy( &mut_num_rooms ); //<<
 }
 
 void
@@ -99,4 +102,47 @@ stats::get_rusage_history( string s_type, string s_seperator )
  return s_ret;
 }
 
+//<<*
+int 
+stats::get_num_rooms()
+{
+ pthread_mutex_lock  ( &mut_num_rooms ); 
+ int i_ret = i_num_rooms;
+ pthread_mutex_unlock( &mut_num_rooms );
+ return i_ret;
+}
+
+void 
+stats::increment_num_rooms()
+{
+ pthread_mutex_lock  ( &mut_num_rooms ); 
+ ++i_num_rooms;
+ pthread_mutex_unlock( &mut_num_rooms );
+#ifdef NCURSES
+ print_num_rooms();
+#endif
+}
+void 
+stats::decrement_num_rooms()
+{
+ pthread_mutex_lock  ( &mut_num_rooms ); 
+ --i_num_rooms;
+ pthread_mutex_unlock( &mut_num_rooms );
+#ifdef NCURSES
+ print_num_rooms();
+#endif
+}
+
+#ifdef NCURSES
+void
+stats::print_num_rooms()
+{
+    if ( !wrap::NCUR->is_ready() )
+      return;
+
+    mvprintw( NCUR_NUM_ROOMS_X, NCUR_NUM_ROOMS_Y, "Rooms: %d", get_num_rooms());
+    refresh();
+}
+#endif
+//*>>
 #endif
diff --git a/src/stats.h b/src/stats.h
index 0ef60a2..647f504 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -21,6 +21,8 @@ private:
  vector< map<string,long> > vec_rusage_history;
  pthread_mutex_t mut_vec_rusage;
 
+ int i_num_rooms; //<<
+ pthread_mutex_t mut_num_rooms; //<<
  
  void set_rusage_vec_size( int i_rusage_vec_size );
 
@@ -28,9 +30,19 @@ public:
    stats( );
   ~stats( );
 
+  //<<*
+  int get_num_rooms();
+  void increment_num_rooms();
+  void decrement_num_rooms();
+  //*>>
   void update_rusage_history();
   string get_rusage_history( string s_type, string s_seperator );
   long get_ru_maxrss();
+  //<<*
+#ifdef NCURSES
+  void print_num_rooms();
+#endif
+  //*>>
 };
 
 #endif
diff --git a/src/time/timr.cpp b/src/time/timr.cpp
index 91dc7f7..fa308d3 100755
--- a/src/time/timr.cpp
+++ b/src/time/timr.cpp
@@ -68,7 +68,7 @@ timr::start( void *v_pointer )
 
      time_now = *localtime( &clock_now );
 
-     // set the current time && the current yhttpd uptime!
+     // set the current time && the current ychat uptime!
      set_time( difftime( clock_now, clock_start ),
                         time_now.tm_sec, time_now.tm_min, time_now.tm_hour );
 #ifdef NCURSES
@@ -81,10 +81,27 @@ timr::start( void *v_pointer )
 #ifdef SERVMSG
       cout << TIMERUP << get_uptime() << endl;
 #endif
+      //<<*
+      int* i_timeout_settings = new int[3];
+      i_timeout_settings[0] = tool::string2int(wrap::CONF->get_elem("chat.idle.timeout"));
+      i_timeout_settings[1] = tool::string2int(wrap::CONF->get_elem("chat.idle.awaytimeout"));
+      i_timeout_settings[2] = tool::string2int(wrap::CONF->get_elem("chat.idle.autoawaytimeout"));
+      wrap::CHAT->check_timeout( i_timeout_settings );
+      delete i_timeout_settings;
+
+      string s_ping = "<!-- PING! //-->\n"; 
+      wrap::CHAT->msg_post( &s_ping );
+
+#ifdef DATABASE
+      // Disconnecting idle database conenction
+      wrap::DATA->check_data_con_timeout();
+#endif
+      //*>>   
  
       // run every ten minutes: 
       if ( time_now.tm_min % 10 == 0 )
       {
+       wrap::GCOL->remove_garbage(); //<<
 
        // run every hour
        if ( time_now.tm_hour % 60 == 0 )
diff --git a/src/tool/tool.h b/src/tool/tool.h
index 8185325..7352772 100644
--- a/src/tool/tool.h
+++ b/src/tool/tool.h
@@ -88,7 +88,7 @@ public:
 
    static string shell_command( string s_command, method m_method );
 
-   static string yhttpd_version()
+   static string ychat_version()
    {
     return string(VERSION) + "-" + string(BRANCH) + " Build " + int2string(BUILDNR);
    }
diff --git a/src/wrap.cpp b/src/wrap.cpp
index 81c6679..b6c8358 100755
--- a/src/wrap.cpp
+++ b/src/wrap.cpp
@@ -5,6 +5,14 @@
 
 using namespace std;
 
+//<<*
+chat* wrap::CHAT;
+#ifdef DATABASE
+data* wrap::DATA;
+#endif
+gcol* wrap::GCOL;
+sman* wrap::SMAN;
+//*>>
 
 conf* wrap::CONF;
 html* wrap::HTML;
diff --git a/src/wrap.h b/src/wrap.h
index 1207f03..afc45b1 100755
--- a/src/wrap.h
+++ b/src/wrap.h
@@ -4,14 +4,18 @@
 #include "incl.h"
 
 #ifdef DATABASE
+#include "data/data.h"
 #endif
+#include "chat/chat.h"
 #include "conf/conf.h"
+#include "chat/gcol.h"
 #include "html.h"
 #include "logd.h"
 #include "modl.h"
 #ifdef NCURSES
 #include "ncur/ncur.h"
 #endif
+#include "chat/sman.h"
 #include "sock/sock.h"
 #include "stats.h"
 #include "time/timr.h"
@@ -21,6 +25,14 @@ using namespace std;
 class dynamic_wrap 
 {
  public: 
+    //<<*
+    chat* CHAT;
+#ifdef DATABASE
+    data* DATA;
+#endif
+    gcol* GCOL;
+    sman* SMAN;
+    //*>>
 
     conf* CONF;
     html* HTML;
@@ -49,6 +61,17 @@ public:
 
     static void system_message( string s_message );
 
+    //<<*
+    static chat* CHAT;
+#ifdef DATABASE
+    static data* DATA;
+#endif
+    static gcol* GCOL;
+    static sman* SMAN;
+#ifdef IRCBOT
+    static ybot* YBOT;
+#endif
+    //*>>
 
     static conf* CONF;
     static html* HTML;