tagging ychat-0.7.8ychat-0.7.8

63 files changed, 540 insertions, 1049 deletions

diff --git a/src/CVS/Entries b/src/CVS/Entries
index 7009aff..4472904 100644
--- a/src/CVS/Entries
+++ b/src/CVS/Entries
@@ -1,21 +1,23 @@
 /Makefile.in/1.22/Tue Sep  7 17:14:39 2004//
-/configure/1.28/Fri Jan  7 21:00:19 2005//
-/glob.h/1.51/Sun Feb 13 03:53:35 2005//
-/html.cpp/1.18/Thu Feb 10 16:07:18 2005//
-/html.h/1.8/Fri Jan  7 21:00:19 2005//
-/incl.h/1.4/Fri Jan  7 21:00:19 2005//
-/logd.cpp/1.9/Sun Feb  6 16:38:36 2005//
-/logd.h/1.7/Sun Feb  6 16:38:36 2005//
-/main.cpp/1.30/Thu Feb 10 19:55:24 2005//
-/modl.cpp/1.16/Fri Jan  7 21:00:19 2005//
-/modl.h/1.8/Thu Nov 18 13:41:47 2004//
-/msgs.h/1.161/Mon Feb 14 20:09:50 2005//
-/name.cpp/1.7/Fri Jan  7 21:00:19 2005//
-/name.h/1.5/Fri Jan  7 21:00:19 2005//
-/reqp.cpp/1.34/Thu Feb 10 16:07:18 2005//
-/reqp.h/1.12/Sun Feb  6 16:38:36 2005//
-/stats.cpp/1.9/Fri Jan  7 21:00:19 2005//
-/stats.h/1.6/Fri Jan  7 21:00:19 2005//
-/wrap.cpp/1.15/Wed Feb  9 22:42:58 2005//
-/wrap.h/1.22/Wed Feb  9 22:42:58 2005//
+/configure/1.38/Sun Feb 27 06:28:53 2005//
+/glob.h/1.70/Fri Mar  4 21:09:34 2005//
+/html.cpp/1.23/Wed Feb 23 20:23:31 2005//
+/html.h/1.11/Wed Feb 23 03:12:05 2005//
+/incl.h/1.7/Wed Feb 23 03:12:05 2005//
+/logd.cpp/1.15/Sun Feb 27 06:28:53 2005//
+/logd.h/1.11/Wed Feb 23 03:12:05 2005//
+/main.cpp/1.37/Fri Mar  4 02:41:30 2005//
+/modl.cpp/1.18/Mon Feb 21 01:55:49 2005//
+/modl.h/1.10/Mon Feb 21 01:55:49 2005//
+/msgs.h/1.200/Sat Mar  5 11:35:09 2005//
+/name.cpp/1.8/Mon Feb 21 01:55:49 2005//
+/name.h/1.6/Mon Feb 21 01:55:49 2005//
+/reqp.cpp/1.41/Tue Mar  1 16:11:03 2005//
+/reqp.h/1.15/Wed Feb 23 03:12:05 2005//
+/sign.cpp/1.2/Fri Mar  4 21:09:34 2005//
+/sign.h/1.1/Fri Mar  4 02:41:30 2005//
+/stats.cpp/1.10/Mon Feb 21 01:55:49 2005//
+/stats.h/1.7/Mon Feb 21 01:55:49 2005//
+/wrap.cpp/1.17/Fri Feb 25 00:15:38 2005//
+/wrap.h/1.24/Fri Feb 25 00:15:38 2005//
 D
diff --git a/src/CVS/Entries.Log b/src/CVS/Entries.Log
index fd574a4..7d9d881 100644
--- a/src/CVS/Entries.Log
+++ b/src/CVS/Entries.Log
@@ -5,6 +5,7 @@ A D/contrib////
 A D/data////
 A D/irc////
 A D/maps////
+A D/memb////
 A D/mods////
 A D/ncur////
 A D/sock////
diff --git a/src/chat/CVS/Entries b/src/chat/CVS/Entries
index 8d2fcbd..26360be 100644
--- a/src/chat/CVS/Entries
+++ b/src/chat/CVS/Entries
@@ -1,17 +1,17 @@
-/base.h/1.5/Fri Jan  7 21:00:19 2005//
-/base.tmpl/1.4/Thu Nov 18 13:41:47 2004//
-/chat.cpp/1.14/Fri Jan  7 21:00:19 2005//
-/chat.h/1.8/Fri Jan  7 21:00:19 2005//
-/gcol.cpp/1.4/Thu Nov 18 13:41:47 2004//
-/gcol.h/1.3/Thu Nov 18 13:41:47 2004//
-/perm.cpp/1.7/Thu Nov 18 13:41:47 2004//
-/perm.h/1.5/Thu Nov 18 13:41:47 2004//
-/room.cpp/1.9/Sun Feb  6 16:38:36 2005//
-/room.h/1.5/Sun Feb  6 16:38:36 2005//
-/sess.cpp/1.5/Tue Jan  4 18:31:35 2005//
-/sess.h/1.5/Tue Jan  4 18:31:35 2005//
-/sman.cpp/1.9/Tue Jan  4 18:31:35 2005//
-/sman.h/1.4/Tue Jan  4 18:31:35 2005//
-/user.cpp/1.13/Mon Feb 14 20:09:50 2005//
-/user.h/1.6/Fri Jan  7 21:00:19 2005//
+/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//
+/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//
+/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.17/Wed Feb 23 20:23:31 2005//
+/user.h/1.11/Mon Feb 21 01:55:49 2005//
 D
diff --git a/src/chat/base.h b/src/chat/base.h
index b995c5c..9da4304 100755
--- a/src/chat/base.h
+++ b/src/chat/base.h
@@ -9,9 +9,6 @@
 template<class type>
 class base : public nhashmap<type*>
 {
-protected:
-  void dumpit();
-
 public:
   base();
   ~base();
@@ -25,7 +22,6 @@ public:
   }
 
   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.
diff --git a/src/chat/base.tmpl b/src/chat/base.tmpl
index 5b0fceb..0be21aa 100755
--- a/src/chat/base.tmpl
+++ b/src/chat/base.tmpl
@@ -22,40 +22,10 @@ base<type>::get_elem( string s_name, bool &b_found )
 }
 
 template<class type>
-type*
-base<type>::get_elem( string s_name)
-{
-  bool b;
-  return get_elem(s_name, b); 
-}
-
-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;
-}
-
 #endif
diff --git a/src/chat/chat.cpp b/src/chat/chat.cpp
index e4cbaac..0839261 100755
--- a/src/chat/chat.cpp
+++ b/src/chat/chat.cpp
@@ -165,6 +165,7 @@ chat::login( map<string,string> &map_params )
     else
     {
       sess* p_sess = wrap::SMAN->create_session();
+      //p_sess->set_value( string("nick"), (void *) new string(s_user) );
       p_sess->set_user(p_user);
       map_params["tmpid"] = p_sess->get_tmpid();
       p_user->set_tmpid( map_params["tmpid"] );
@@ -360,11 +361,4 @@ chat::string_replacer(string *p_msg)
   }
 }
 
-void
-chat::dumpit()
-{
-  dumpable::add("[chat]");
-  base<room>::dumpit();
-}
-
 #endif
diff --git a/src/chat/chat.h b/src/chat/chat.h
index bb087d5..47645c3 100755
--- a/src/chat/chat.h
+++ b/src/chat/chat.h
@@ -23,7 +23,6 @@ class chat : public base<room>, public perm
 private:
   map<string,string> map_replace_strings;
   vector<string> vec_replace_keys;
-  void dumpit();
 
 public:
   virtual room* get_room( string s_name )
diff --git a/src/chat/gcol.cpp b/src/chat/gcol.cpp
index d4c9416..7df111d 100755
--- a/src/chat/gcol.cpp
+++ b/src/chat/gcol.cpp
@@ -44,8 +44,6 @@ 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();
-
 #ifdef NCURSES
 
   print_garbage();
diff --git a/src/chat/room.cpp b/src/chat/room.cpp
index 0e28c84..b927d40 100755
--- a/src/chat/room.cpp
+++ b/src/chat/room.cpp
@@ -101,14 +101,4 @@ room::set_name( string s_name )
 #endif
 }
 
-void
-room::dumpit()
-{
-  dumpable::add("[room]");
-  dumpable::add("Name: "+get_name());
-  dumpable::add("Topic: "+get_topic());
-  base<user>::dumpit();
-}
-
-
 #endif
diff --git a/src/chat/room.h b/src/chat/room.h
index 4c5fac6..06b0a9a 100755
--- a/src/chat/room.h
+++ b/src/chat/room.h
@@ -23,8 +23,6 @@ private:
 
   logd* p_logd;
 #endif
-  
-  void dumpit();
 
 public:
   room( string s_name );
diff --git a/src/chat/sman.cpp b/src/chat/sman.cpp
index 530aa17..d80d421 100755
--- a/src/chat/sman.cpp
+++ b/src/chat/sman.cpp
@@ -21,33 +21,23 @@ sman::~sman()
 
 string sman::generate_id( int i_len )
 {
-  string s_valid = wrap::CONF->get_elem("chat.session.validchars");
+  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 < i_len; i++)
   {
-    i_char = rand() % s_valid.length();
-    s_ret += s_valid[i_char];
+    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");
-    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);
+    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;
diff --git a/src/chat/sman.h b/src/chat/sman.h
index 13fc45a..992fc64 100755
--- a/src/chat/sman.h
+++ b/src/chat/sman.h
@@ -7,11 +7,10 @@
 
 #include "sess.h"
 #include "../maps/shashmap.h"
-#include "../monitor/dump.h"
 
 using namespace std;
 
-class sman : public shashmap<sess*>
+class sman : private shashmap<sess*>
 {
 private:
   string generate_id( int i_len );
diff --git a/src/chat/user.cpp b/src/chat/user.cpp
index bac8b7e..4f1646b 100755
--- a/src/chat/user.cpp
+++ b/src/chat/user.cpp
@@ -73,27 +73,23 @@ user::initialize()
 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 );
 #endif
 
-  set_has_sess(false);
-  wrap::SMAN->destroy_session(get_tmpid());
-  set_tmpid("");
+    wrap::SMAN->destroy_session( get_tmpid() );
+    // wrap::system_message( SESSION + tool::int2string( wrap::SMAN->get_session_count() ) );
+  }
+
+  set_fake( false );
+  set_invisible( false );
+  set_away( false, "" );
 }
 
 string
@@ -415,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 ) ||
@@ -581,15 +577,4 @@ 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());
-}
-
-
 #endif
diff --git a/src/chat/user.h b/src/chat/user.h
index 4632e07..443eef6 100755
--- a/src/chat/user.h
+++ b/src/chat/user.h
@@ -5,13 +5,13 @@
 
 #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 
+class user : public name, public timo//, public memb<string>
 {
 private:
 
@@ -56,8 +56,7 @@ private:
   pthread_mutex_t mut_map_changed_data;
 
   void initialize();
-  void set_changed_data( string s_varname, string s_value );
-  void dumpit();
+  void   set_changed_data( string s_varname, string s_value );
 
 public:
   pthread_cond_t  cond_message;
@@ -68,7 +67,6 @@ public:
   ~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
diff --git a/src/cli/CVS/Entries b/src/cli/CVS/Entries
index 7d01982..10c9656 100644
--- a/src/cli/CVS/Entries
+++ b/src/cli/CVS/Entries
@@ -1,3 +1,3 @@
-/cli.cpp/1.25/Wed Feb  9 22:42:58 2005//
-/cli.h/1.11/Fri Jan  7 21:00:19 2005//
+/cli.cpp/1.28/Mon Feb 28 18:03:02 2005//
+/cli.h/1.13/Mon Feb 21 02:14:23 2005//
 D
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index cc0f5e5..96a0010 100755
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -37,8 +37,6 @@ cli::parse_input( string s_input )
     cout << CLIPRMO << " (d)ebug       - Starts debug routine (cli.cpp)" << endl;
 #endif
 
-    cout << CLIPRMO << " (du)mp [part] - Prints out a dump of the data structure" << endl;
-    cout << CLIPRMO << "		    (Run without part to list all possibilities)" << endl;
     cout << CLIPRMO << " (e)cho VAR    - Prints out configuration value of VAR" << endl;
     cout << CLIPRMO << "                 Wildcards can be used too, example: echo http*" << endl;
 #ifdef NCURSES
@@ -80,11 +78,6 @@ cli::parse_input( string s_input )
     cout << CLIPRMI;
   }
 #endif
-  else if ( s_input.compare("du") == 0 || s_input.compare("dump") == 0 )
-  {
-    dump d(vectorize(s_param));
-    cout << CLIPRMI;
-  }
   else if( s_input.compare("echo") == 0 || s_input.compare("e") == 0 )
   {
     string s_val;
@@ -141,7 +134,6 @@ cli::parse_input( string s_input )
   {
     cout << CLIPRMO;
     wrap::MODL->reload_modules();
-    cout << MODRELO << endl;
     cout << CLIPRMI;
   }
   //*>>
@@ -215,7 +207,6 @@ cli::parse_input( string s_input )
   {
     cout << CLIPRMO;
     wrap::MODL->unload_modules();
-    cout << MODUNLO << endl;
     cout << CLIPRMI;
   }
   //*>>
@@ -294,26 +285,6 @@ cli::print_rusage()
   delete p_rusage;
 }
 
-vector<string>
-cli::vectorize(string s_param) 
-{
-  vector<string> vec_ret;
-  unsigned i_pos;
-
-  for (i_pos = s_param.find(" ");
-       i_pos != string::npos;
-       i_pos = s_param.find(" "))
-  {
-    vec_ret.push_back(s_param.substr(0, i_pos));
-    s_param = s_param.substr(i_pos+1);
-  }
-
-  if (!s_param.empty())
-    vec_ret.push_back(s_param);
-
-  return vec_ret;
-}
-
 #ifdef DEBUG
 void
 cli::debug_routine()
diff --git a/src/cli/cli.h b/src/cli/cli.h
index 7d51e3f..23e1d1c 100755
--- a/src/cli/cli.h
+++ b/src/cli/cli.h
@@ -22,8 +22,6 @@
 #include "../thrd/thro.h"
 #endif
 
-#include "../monitor/dump.h"
-
 using namespace std;
 
 #ifndef NCURSES
@@ -34,9 +32,8 @@ class cli
 {
 #endif
 private:
-  int parse_input(string s_input);
-  vector<string> vectorize(string s_param);
-    
+      int parse_input(string s_input);
+
 public:
 cli( );
 ~cli( );
@@ -55,6 +52,7 @@ void start(void* p_void);
 
 void start();
 #endif
+
 };
 
 #endif
diff --git a/src/conf/CVS/Entries b/src/conf/CVS/Entries
index 68ec4ab..cfb51ed 100644
--- a/src/conf/CVS/Entries
+++ b/src/conf/CVS/Entries
@@ -1,3 +1,3 @@
-/conf.cpp/1.11/Fri Jan  7 21:00:19 2005//
-/conf.h/1.7/Fri Jan  7 21:00:19 2005//
+/conf.cpp/1.14/Sun Feb 27 06:28:53 2005//
+/conf.h/1.11/Sun Feb 27 06:28:53 2005//
 D
diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index 38c29c4..2e5893b 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -36,7 +36,6 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : name::name( s_
     cout << CFILEFA << endl;
     exit(1);
   }
-
   else
   {
     cout << CFILEOK << "..." << endl;
@@ -77,18 +76,12 @@ conf::parse_xml(TiXmlNode* p_node, vector<string>* p_vec)
   {
     //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl;
 
-    if ( strcmp(p_child->Value(),"config") == 0 )
-    {
-      parse_xml(p_child, p_vec);
-    }
-
-    else if ( strcmp(p_child->Value(),"category") == 0 )
+    if ( strcmp(p_child->Value(),"category") == 0 )
     {
       p_vec->push_back(p_child->ToElement()->Attribute("name"));
       parse_xml(p_child, p_vec);
       p_vec->pop_back();
     }
-
     else if ( strcmp(p_child->Value(),"option") == 0 )
     {
       string s_option_name = "";
diff --git a/src/configure b/src/configure
index 125890c..eb54cce 100755
--- a/src/configure
+++ b/src/configure
@@ -70,7 +70,7 @@ perl -e '
    remove_from_array("libmysqlclient.so",\@libs);
   }
 
-  if ( /\/\/#define NCURSES/ )
+  elsif ( /\/\/#define NCURSES/ )
   {
    remove_from_array("ncurses.h",\@headers);
    remove_from_array("libncurses.so",\@libs);
@@ -156,23 +156,19 @@ perl -e '
    $ofile =~ s/\.cpp/\.o/;
    print Fout "../obj/$ofile: $cppfile\n";
    print Fout "\t\@if ! test -d `dirname ../obj/$ofile`; then mkdir -p `dirname ../obj/$ofile`; fi\n";
-   my $class = $ofile;
-   $class =~ s/\.o//; 
-
-   my $text;
-   if ( $class =~ /contrib\/.+/ )
+   if ( $ofile =~ /contrib\/.+/ )
    {
-    my $dirname = `dirname $class`;
-    $text = "\t\@echo -n \"Contributed class $class  \"\n";
+    my $dirname = `dirname $ofile`;
+     print Fout "\t\@echo -n \"Compiling contributed class $ofile \"\n";
    }
 
    else
    {
-    $text = "\t\@echo -n \"Base class $class  \"\n";	
+    print Fout "\t\@echo -n \"Compiling base class $ofile \"\n";	
    }
 
    print Fout "\t\@\$(CC) \$(CFLAGS) \$(INCLUDES) $args -c -o ../obj/$ofile $cppfile\n";
-   print Fout $text."\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/total// | sed \"s/ //g\"\n";
+   print Fout "\t\@du -hc ../obj/$ofile | tail -n 1 | sed s/to