6 files changed, 13 insertions, 28 deletions
diff --git a/src/chat/CVS/Entries b/src/chat/CVS/Entries
index 1eaa9f0..7eb1a75 100644
--- a/src/chat/CVS/Entries
+++ b/src/chat/CVS/Entries
@@ -1,17 +1,17 @@
 /base.h/1.8/Mon Feb 21 01:55:49 2005//
 /base.tmpl/1.6/Mon Feb 21 01:55:49 2005//
-/chat.cpp/1.20/Fri Feb 25 00:15:38 2005//
-/chat.h/1.12/Wed Feb 23 03:12:05 2005//
+/chat.cpp/1.18/Mon Feb 21 01:55:49 2005//
+/chat.h/1.11/Mon Feb 21 01:55:49 2005//
 /gcol.cpp/1.7/Mon Feb 21 01:55:49 2005//
 /gcol.h/1.5/Mon Feb 21 01:55:49 2005//
 /perm.cpp/1.10/Mon Feb 21 01:55:49 2005//
 /perm.h/1.8/Mon Feb 21 01:55:49 2005//
-/room.cpp/1.11/Fri Mar  4 00:34:29 2005//
-/room.h/1.8/Fri Mar  4 00:34:29 2005//
+/room.cpp/1.10/Mon Feb 21 01:55:49 2005//
+/room.h/1.7/Mon Feb 21 01:55:49 2005//
 /sess.cpp/1.6/Mon Feb 21 01:55:49 2005//
 /sess.h/1.6/Mon Feb 21 01:55:49 2005//
 /sman.cpp/1.11/Mon Feb 21 01:55:49 2005//
 /sman.h/1.6/Mon Feb 21 01:55:49 2005//
-/user.cpp/1.18/Sun Mar  6 20:44:47 2005//
+/user.cpp/1.16/Mon Feb 21 01:55:49 2005//
 /user.h/1.11/Mon Feb 21 01:55:49 2005//
 D
diff --git a/src/chat/chat.cpp b/src/chat/chat.cpp
index 0839261..019f939 100755
--- a/src/chat/chat.cpp
+++ b/src/chat/chat.cpp
@@ -74,7 +74,7 @@ chat::get_user_( room *room_obj, void *v_arg )
 }
 
 void
-chat::login( map<string,string> &map_params )
+chat::login( hashmap<string> &map_params )
 {
   string s_user = map_params["nick"];
 
@@ -123,15 +123,6 @@ chat::login( map<string,string> &map_params )
     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.
@@ -279,7 +270,7 @@ chat::login( map<string,string> &map_params )
 }
 
 void
-chat::post( user* p_user, map<string,string> &map_params )
+chat::post( user* p_user, hashmap<string> &map_params )
 {
   p_user->renew_timeout();
 
diff --git a/src/chat/chat.h b/src/chat/chat.h
index 47645c3..8508508 100755
--- a/src/chat/chat.h
+++ b/src/chat/chat.h
@@ -46,10 +46,10 @@ public:
   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 );
+  void login( hashmap<string> &map_params );
 
   // will be called if a user posts a message.
-  void post ( user* u_user, map<string,string> &map_params );
+  void post ( user* u_user, hashmap<string> &map_params );
 
   void del_elem( string s_name )
   {
diff --git a/src/chat/room.cpp b/src/chat/room.cpp
index b927d40..00dc463 100755
--- a/src/chat/room.cpp
+++ b/src/chat/room.cpp
@@ -75,7 +75,8 @@ room::clean_room()
 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
diff --git a/src/chat/room.h b/src/chat/room.h
index 06b0a9a..572e68b 100755
--- a/src/chat/room.h
+++ b/src/chat/room.h
@@ -57,7 +57,6 @@ public:
   {
     msg_post( &s_msg );
   }
-
   void msg_post( string *p_msg )
   {
 #ifdef LOGGING
@@ -67,12 +66,6 @@ public:
     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>";
diff --git a/src/chat/user.cpp b/src/chat/user.cpp
index d46f853..c5699e2 100755
--- a/src/chat/user.cpp
+++ b/src/chat/user.cpp
@@ -411,7 +411,7 @@ user::command( string &s_command )
   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() );
+  dynmod *mod = wrap::MODL->get_module( s_mod );
 
   if ( mod == NULL ||
        wrap::CHAT->get_command_disabled( s_command2 ) ||
@@ -454,7 +454,7 @@ user::command( string &s_command )
   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;
 }