tagging ychat-0.7.0ychat-0.7.0

31 files changed, 63 insertions, 131 deletions

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/yc_away.cpp b/src/mods/commands/yc_away.cpp
index af4a4a5..e78121e 100755
--- a/src/mods/commands/yc_away.cpp
+++ b/src/mods/commands/yc_away.cpp
@@ -31,21 +31,11 @@ extern "C" {
               + p_conf->get_elem("chat.msgs.setmodeaway")
               + "<font color=" + p_user->get_col2() + ">"; 
 
-	if ( params->size() > 0 )
+        for ( iter = params->begin(); iter != params->end(); iter++ )
         {
-         s_msg.append(": ");
-         for ( iter = params->begin(); iter != params->end(); iter++ )
-         {
-          s_msg.append( " " + *iter );
-          s_away.append( *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();
@@ -63,8 +53,6 @@ extern "C" {
         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 4449278..00d86e2 100755
--- a/src/mods/commands/yc_col.cpp
+++ b/src/mods/commands/yc_col.cpp
@@ -64,8 +64,6 @@ extern "C" {
 		p_user->set_col1(s_color);
 		p_user->set_col2(s_color2);
 	}
-
-	return 0;
  }
  int valid_color( string s_color ){
 	
diff --git a/src/mods/commands/yc_exec.cpp b/src/mods/commands/yc_exec.cpp
index f912c20..b8377b3 100755
--- a/src/mods/commands/yc_exec.cpp
+++ b/src/mods/commands/yc_exec.cpp
@@ -59,8 +59,6 @@ extern "C" {
          p_user->msg_post( &s_output );
          pclose(file);
        }
-
-       return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_fake.cpp b/src/mods/commands/yc_fake.cpp
index c708841..820f35e 100755
--- a/src/mods/commands/yc_fake.cpp
+++ b/src/mods/commands/yc_fake.cpp
@@ -15,15 +15,13 @@ extern "C" {
         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_conf->get_elem("chat.msgs.setmodefake") + "<br>\n" 
+                        : p_conf->get_elem("chat.msgs.unsetmodefake") + "<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 87e2d25..91de447 100755
--- a/src/mods/commands/yc_getroom.cpp
+++ b/src/mods/commands/yc_getroom.cpp
@@ -45,8 +45,6 @@ extern "C" {
 
          }
         }
-
-	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_getrusage.cpp b/src/mods/commands/yc_getrusage.cpp
index 83dcbb9..9eb74ee 100755
--- a/src/mods/commands/yc_getrusage.cpp
+++ b/src/mods/commands/yc_getrusage.cpp
@@ -49,8 +49,6 @@ extern "C" {
                        );  
 
         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 086e126..ee4f922 100644
--- a/src/mods/commands/yc_getstatus.cpp
+++ b/src/mods/commands/yc_getstatus.cpp
@@ -51,8 +51,6 @@ extern "C" {
 
          }
         }
-
-	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_help.cpp b/src/mods/commands/yc_help.cpp
index 41899c3..3e7d821 100755
--- a/src/mods/commands/yc_help.cpp
+++ b/src/mods/commands/yc_help.cpp
@@ -44,8 +44,6 @@ extern "C" {
                        + "</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 b78d934..dcc2498 100755
--- a/src/mods/commands/yc_invisible.cpp
+++ b/src/mods/commands/yc_invisible.cpp
@@ -15,16 +15,14 @@ extern "C" {
         bool b_invisible = p_user->get_invisible(); 
  
         string s_msg = b_invisible
-                     ? p_conf->get_elem("chat.msgs.setmodeinvisible") 
+                     ? p_conf->get_elem("chat.msgs.setmodeaway") 
                      + "<br>\n"
-                     : p_conf->get_elem("chat.msgs.unsetmodeinvisible") 
+                     : p_conf->get_elem("chat.msgs.unsetmodeaway") 
                      + "<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 903e49b..46d2cd9 100755
--- a/src/mods/commands/yc_j.cpp
+++ b/src/mods/commands/yc_j.cpp
@@ -97,8 +97,6 @@ extern "C" {
 	  }
          }
 	}
-
-	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_ko.cpp b/src/mods/commands/yc_ko.cpp
index ac32ac7..4084242 100755
--- a/src/mods/commands/yc_ko.cpp
+++ b/src/mods/commands/yc_ko.cpp
@@ -33,7 +33,7 @@ extern "C" {
                        + 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()
+                       + p_user->get_room()->get_bold_name()
 	               + "<br>\n";
 
           room* p_room1 = p_user->get_room();
@@ -64,8 +64,6 @@ extern "C" {
           p_user->msg_post( &s_msg ); 
          }
         }
-
-	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_m.cpp b/src/mods/commands/yc_m.cpp
index a93cc3b..3c607a9 100755
--- a/src/mods/commands/yc_m.cpp
+++ b/src/mods/commands/yc_m.cpp
@@ -37,7 +37,6 @@ extern "C" {
         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 d79d952..055d964 100755
--- a/src/mods/commands/yc_md5.cpp
+++ b/src/mods/commands/yc_md5.cpp
@@ -47,8 +47,6 @@ extern "C" {
           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 66d54da..12c733e 100755
--- a/src/mods/commands/yc_me.cpp
+++ b/src/mods/commands/yc_me.cpp
@@ -37,8 +37,6 @@ extern "C" {
         s_msg.append( "</font></i><br>\n" );
         p_user->get_room()->msg_post( &s_msg );
 
-	return 0;
-
  }
 }
 
diff --git a/src/mods/commands/yc_msg.cpp b/src/mods/commands/yc_msg.cpp
index 33beee4..dda26b3 100755
--- a/src/mods/commands/yc_msg.cpp
+++ b/src/mods/commands/yc_msg.cpp
@@ -17,7 +17,6 @@ extern "C" {
 	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() )
         {
@@ -28,22 +27,30 @@ extern "C" {
        
          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_msg         = "<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_whisper_msg = "<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 + " " );	
+          {
+           s_msg        .append( *iter + " " );
+           s_whisper_msg.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" );
+          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 );
@@ -61,8 +68,6 @@ extern "C" {
           p_user->msg_post( &s_msg ); 
          }
         }
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_q.cpp b/src/mods/commands/yc_q.cpp
index 4c9584d..3c614f7 100755
--- a/src/mods/commands/yc_q.cpp
+++ b/src/mods/commands/yc_q.cpp
@@ -22,8 +22,6 @@ extern "C" {
 
 	p_user->msg_post( &s_quit );
         p_user->set_online(false);
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_reload.cpp b/src/mods/commands/yc_reload.cpp
index 8b9cd0a..7050a36 100755
--- a/src/mods/commands/yc_reload.cpp
+++ b/src/mods/commands/yc_reload.cpp
@@ -17,8 +17,6 @@ extern "C" {
 
         p_user->get_room()->reload_onlineframe();
         p_user->msg_post ( &s_msg  );
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_ren.cpp b/src/mods/commands/yc_ren.cpp
index 9735d8e..c6fa984 100755
--- a/src/mods/commands/yc_ren.cpp
+++ b/src/mods/commands/yc_ren.cpp
@@ -66,8 +66,6 @@ extern "C" {
           p_room->reload_onlineframe();
          }
 	}
-
-	return 0;
  }
 
 }
diff --git a/src/mods/commands/yc_s.cpp b/src/mods/commands/yc_s.cpp
index 30a6892..4effccb 100755
--- a/src/mods/commands/yc_s.cpp
+++ b/src/mods/commands/yc_s.cpp
@@ -22,14 +22,11 @@ extern "C" {
 	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>";
 
+        string s_msg = "<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();
@@ -40,8 +37,6 @@ extern "C" {
         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 a18b5e9..9adb907 100755
--- a/src/mods/commands/yc_set.cpp
+++ b/src/mods/commands/yc_set.cpp
@@ -94,8 +94,6 @@ extern "C" {
                        + "</font><br>\n";
           p_user->msg_post( &s_msg ); 
         }
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_template.cpp b/src/mods/commands/yc_template.cpp
index e0aa009..8100f42 100755
--- a/src/mods/commands/yc_template.cpp
+++ b/src/mods/commands/yc_template.cpp
@@ -17,8 +17,6 @@ extern "C" {
 	
   	string *quitstring=new string("Text to send<br>");
 	p_user->msg_post( quitstring );
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_time.cpp b/src/mods/commands/yc_time.cpp
index c22e542..2b1950a 100755
--- a/src/mods/commands/yc_time.cpp
+++ b/src/mods/commands/yc_time.cpp
@@ -14,8 +14,6 @@ extern "C" {
         string s_msg = p_conf->get_elem("chat.msgs.servertime") + p_timr->get_time() + "<br>\n"; 
 
         p_user->msg_post( &s_msg );
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_topic.cpp b/src/mods/commands/yc_topic.cpp
index 5541dc4..1f5587e 100755
--- a/src/mods/commands/yc_topic.cpp
+++ b/src/mods/commands/yc_topic.cpp
@@ -19,13 +19,11 @@ extern "C" {
         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_col = "<font color=" + p_user->get_col2() + ">"; 
 
          s_msg = p_timr->get_time()
                + " "
@@ -53,26 +51,24 @@ extern "C" {
           p_user->msg_post ( &s_private_msg ); 
          }
 
-         s_topic = "( " + s_topic + ")";
-         p_room->set_topic( s_topic, p_user->get_col1() );
+         s_topic = "( " + s_col + s_topic + "</font>)<br><br>";
         } 
 
         else
         {
          s_msg = p_timr->get_time()
                + " "
-               + p_user->get_colored_bold_name()
+               + 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  );
+        room* p_room = p_user->get_room();
 
-	return 0;
+        p_room->set_topic( s_topic );
+        p_room->msg_post ( &s_msg  );
  }
 }
 
diff --git a/src/mods/commands/yc_uptime.cpp b/src/mods/commands/yc_uptime.cpp
index 5fe0929..d19a622 100755
--- a/src/mods/commands/yc_uptime.cpp
+++ b/src/mods/commands/yc_uptime.cpp
@@ -14,8 +14,6 @@ extern "C" {
         string s_msg = p_conf->get_elem("chat.msgs.uptime") + p_timr->get_uptime() + "<br>\n"; 
 
         p_user->msg_post( &s_msg );
-
-	return 0;
  }
 }
 
diff --git a/src/mods/commands/yc_version.cpp b/src/mods/commands/yc_version.cpp
index d64fabd..0586a12 100755
--- a/src/mods/commands/yc_version.cpp
+++ b/src/mods/commands/yc_version.cpp
@@ -14,9 +14,7 @@ extern "C" {
  {
 	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;
+ 	p_user->msg_post( tool::ychat_version() + " " + UNAME + "<br>\n");
  }
 }
 
diff --git a/src/mods/html/yc_admin.cpp b/src/mods/html/yc_admin.cpp
index b6b979e..1709c6b 100644
--- a/src/mods/html/yc_admin.cpp
+++ b/src/mods/html/yc_admin.cpp
@@ -21,7 +21,7 @@ extern "C" {
         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"];
+        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());
@@ -62,8 +62,6 @@ extern "C" {
          } // 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 6d2c5ab..6b2f11b 100755
--- a/src/mods/html/yc_colors.cpp
+++ b/src/mods/html/yc_colors.cpp
@@ -12,9 +12,9 @@ extern "C" {
 	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"];
+        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);
@@ -25,11 +25,9 @@ extern "C" {
 
         if ( *p_flag == "submit" )
         {
-         string*  p_msgs  = &(*((map<string,string>*) c->elem[1]))["msgs"];
+         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 4d6db03..acb10c2 100755
--- a/src/mods/html/yc_help.cpp
+++ b/src/mods/html/yc_help.cpp
@@ -15,7 +15,7 @@ extern "C" {
         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"];
+        string*    s_content = &(*((map_string*) c->elem[1]))["content"];
 
         vector<string>* p_vec_keys = p_modl->get_mod_vector();
           
@@ -41,8 +41,6 @@ extern "C" {
          }
          p_vec_keys_iter++;
         }
-
-	return 0;
  }
 }
 
diff --git a/src/mods/html/yc_options.cpp b/src/mods/html/yc_options.cpp
index 47c3153..86aa8b9 100755
--- a/src/mods/html/yc_options.cpp
+++ b/src/mods/html/yc_options.cpp
@@ -12,16 +12,16 @@ extern "C" {
 	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"];
+        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" )
         {
-         string*  p_msgs  = &(*((map<string,string>*) c->elem[1]))["msgs"];
+         string*  p_msgs  = &(*((map_string*) c->elem[1]))["msgs"];
 
          // If the password has to be changed:
          if ( *p_pass != "" || *p_newpass != "" || *p_newpass2 != "" ) 
@@ -48,8 +48,6 @@ extern "C" {
         {
           p_email->append( p_user->get_email() );
         }
-
-	return 0;
  } 
 }
 
diff --git a/src/mods/html/yc_register.cpp b/src/mods/html/yc_register.cpp
index 5d65b50..98f2b85 100755
--- a/src/mods/html/yc_register.cpp
+++ b/src/mods/html/yc_register.cpp
@@ -14,12 +14,12 @@ extern "C" {
         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"];
+        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;
 
@@ -57,7 +57,7 @@ extern "C" {
 
 	else
 	{
-	 map<string,string> result_map = p_data->select_user_data( *p_nick, "selectnick" ); 
+	 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" ) );
@@ -69,7 +69,7 @@ extern "C" {
           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_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");
@@ -85,8 +85,6 @@ extern "C" {
           p_data->insert_user_data( *p_nick, "registernick", map_insert );
          }
 	}	
-
-	return 0;
 #endif
  } 
 }