From ae4e87df37ed8904de92c7cf2f3a11128cda2a21 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:41 +0200 Subject: tagging ychat-0.7.4.1 --- src/Makefile.in | 54 +- src/chat/base.h | 182 +- src/chat/base.tmpl | 73 +- src/chat/chat.cpp | 543 ++- src/chat/chat.h | 103 +- src/chat/gcol.cpp | 184 +- src/chat/gcol.h | 58 +- src/chat/perm.cpp | 93 +- src/chat/perm.h | 69 +- src/chat/room.cpp | 124 +- src/chat/room.h | 131 +- src/chat/sess.cpp | 63 +- src/chat/sess.h | 50 +- src/chat/sman.cpp | 165 +- src/chat/sman.h | 56 +- src/chat/user.cpp | 796 ++--- src/chat/user.h | 283 +- src/cli/cli.cpp | 579 ++-- src/cli/cli.h | 52 +- src/conf/conf.cpp | 242 +- src/conf/conf.h | 43 +- src/configure | 6641 ++---------------------------------- src/contrib/crypt/md5.cpp | 357 +- src/contrib/crypt/md5.h | 39 +- src/contrib/crypt/md5crypt.cpp | 257 +- src/contrib/xml/tinyxml.cpp | 1703 +++++---- src/contrib/xml/tinyxml.h | 2266 ++++++------ src/contrib/xml/tinyxmlerror.cpp | 68 +- src/contrib/xml/tinyxmlparser.cpp | 2708 +++++++-------- src/data/con.cpp | 26 +- src/data/con.h | 12 +- src/data/con_base.cpp | 0 src/data/con_base.h | 10 +- src/data/data.cpp | 137 +- src/data/data.h | 26 +- src/data/data_base.cpp | 151 +- src/data/data_base.h | 47 +- src/glob.h | 230 +- src/html.cpp | 187 +- src/html.h | 65 +- src/incl.h | 29 +- src/logd.cpp | 205 +- src/logd.h | 58 +- src/main.cpp | 237 +- src/maps/hmap.h | 96 + src/maps/hmap.tmpl | 289 ++ src/maps/mtools.h | 26 +- src/maps/mtools.tmpl | 29 +- src/maps/nmap.h | 22 + src/maps/nmap.tmpl | 31 + src/maps/smap.h | 55 + src/maps/smap.tmpl | 215 ++ src/modl.cpp | 188 +- src/modl.h | 59 +- src/mods/Makefile | 12 +- src/mods/commands/Makefile.in | 18 + src/mods/commands/yc_about.cpp | 98 +- src/mods/commands/yc_all.cpp | 101 +- src/mods/commands/yc_away.cpp | 150 +- src/mods/commands/yc_col.cpp | 167 +- src/mods/commands/yc_compopt.cpp | 45 +- src/mods/commands/yc_exec.cpp | 108 +- src/mods/commands/yc_fake.cpp | 67 +- src/mods/commands/yc_getroom.cpp | 94 +- src/mods/commands/yc_getrusage.cpp | 93 +- src/mods/commands/yc_help.cpp | 106 +- src/mods/commands/yc_invisible.cpp | 69 +- src/mods/commands/yc_j.cpp | 203 +- src/mods/commands/yc_ko.cpp | 112 +- src/mods/commands/yc_m.cpp | 89 +- src/mods/commands/yc_md5.cpp | 108 +- src/mods/commands/yc_me.cpp | 77 +- src/mods/commands/yc_morph.cpp | 101 +- src/mods/commands/yc_msg.cpp | 128 +- src/mods/commands/yc_q.cpp | 51 +- src/mods/commands/yc_reload.cpp | 57 +- src/mods/commands/yc_ren.cpp | 134 +- src/mods/commands/yc_s.cpp | 105 +- src/mods/commands/yc_set.cpp | 199 +- src/mods/commands/yc_template.cpp | 24 + src/mods/commands/yc_time.cpp | 55 +- src/mods/commands/yc_topic.cpp | 162 +- src/mods/commands/yc_uptime.cpp | 55 +- src/mods/commands/yc_version.cpp | 45 +- src/mods/configure | 40 +- src/mods/html/Makefile.in | 18 + src/mods/html/yc_admin.cpp | 143 +- src/mods/html/yc_colors.cpp | 76 +- src/mods/html/yc_help.cpp | 100 +- src/mods/html/yc_options.cpp | 103 +- src/mods/html/yc_register.cpp | 189 +- src/msgs.h | 95 +- src/name.cpp | 54 +- src/name.h | 40 +- src/ncur/menu.cpp | 119 + src/ncur/menu.h | 39 + src/ncur/ncur.cpp | 284 ++ src/ncur/ncur.h | 50 + src/reqp.cpp | 532 ++- src/reqp.h | 77 +- src/sock/sock.cpp | 629 +--- src/sock/sock.h | 102 +- src/stats.cpp | 149 + src/stats.h | 48 + src/thrd/pool.cpp | 306 +- src/thrd/pool.h | 98 +- src/thrd/thro.cpp | 47 +- src/thrd/thro.h | 48 +- src/time/timo.cpp | 44 +- src/time/timo.h | 36 +- src/time/timr.cpp | 193 +- src/time/timr.h | 104 +- src/tool/dir.cpp | 68 +- src/tool/dir.h | 48 +- src/tool/tool.cpp | 277 +- src/tool/tool.h | 52 +- src/wrap.cpp | 133 +- src/wrap.h | 147 +- 118 files changed, 10108 insertions(+), 17625 deletions(-) mode change 100644 => 100755 src/Makefile.in mode change 100644 => 100755 src/chat/base.h mode change 100644 => 100755 src/chat/base.tmpl mode change 100644 => 100755 src/chat/chat.cpp mode change 100644 => 100755 src/chat/chat.h mode change 100644 => 100755 src/chat/gcol.cpp mode change 100644 => 100755 src/chat/gcol.h mode change 100644 => 100755 src/chat/perm.cpp mode change 100644 => 100755 src/chat/perm.h mode change 100644 => 100755 src/chat/room.cpp mode change 100644 => 100755 src/chat/room.h mode change 100644 => 100755 src/chat/sess.cpp mode change 100644 => 100755 src/chat/sess.h mode change 100644 => 100755 src/chat/sman.cpp mode change 100644 => 100755 src/chat/sman.h mode change 100644 => 100755 src/chat/user.cpp mode change 100644 => 100755 src/chat/user.h mode change 100644 => 100755 src/cli/cli.cpp mode change 100644 => 100755 src/cli/cli.h mode change 100644 => 100755 src/conf/conf.cpp mode change 100644 => 100755 src/conf/conf.h mode change 100644 => 100755 src/data/con.cpp mode change 100644 => 100755 src/data/con.h mode change 100644 => 100755 src/data/con_base.cpp mode change 100644 => 100755 src/data/con_base.h mode change 100644 => 100755 src/glob.h mode change 100644 => 100755 src/html.cpp mode change 100644 => 100755 src/html.h mode change 100644 => 100755 src/incl.h mode change 100644 => 100755 src/logd.cpp mode change 100644 => 100755 src/logd.h mode change 100644 => 100755 src/main.cpp create mode 100644 src/maps/hmap.h create mode 100644 src/maps/hmap.tmpl create mode 100644 src/maps/nmap.h create mode 100644 src/maps/nmap.tmpl create mode 100644 src/maps/smap.h create mode 100644 src/maps/smap.tmpl mode change 100644 => 100755 src/modl.cpp mode change 100644 => 100755 src/modl.h mode change 100644 => 100755 src/mods/Makefile create mode 100755 src/mods/commands/Makefile.in mode change 100644 => 100755 src/mods/commands/yc_all.cpp mode change 100644 => 100755 src/mods/commands/yc_away.cpp mode change 100644 => 100755 src/mods/commands/yc_col.cpp mode change 100644 => 100755 src/mods/commands/yc_compopt.cpp mode change 100644 => 100755 src/mods/commands/yc_exec.cpp mode change 100644 => 100755 src/mods/commands/yc_fake.cpp mode change 100644 => 100755 src/mods/commands/yc_getroom.cpp mode change 100644 => 100755 src/mods/commands/yc_getrusage.cpp mode change 100644 => 100755 src/mods/commands/yc_help.cpp mode change 100644 => 100755 src/mods/commands/yc_invisible.cpp mode change 100644 => 100755 src/mods/commands/yc_j.cpp mode change 100644 => 100755 src/mods/commands/yc_ko.cpp mode change 100644 => 100755 src/mods/commands/yc_m.cpp mode change 100644 => 100755 src/mods/commands/yc_md5.cpp mode change 100644 => 100755 src/mods/commands/yc_me.cpp mode change 100644 => 100755 src/mods/commands/yc_morph.cpp mode change 100644 => 100755 src/mods/commands/yc_msg.cpp mode change 100644 => 100755 src/mods/commands/yc_q.cpp mode change 100644 => 100755 src/mods/commands/yc_reload.cpp mode change 100644 => 100755 src/mods/commands/yc_ren.cpp mode change 100644 => 100755 src/mods/commands/yc_s.cpp mode change 100644 => 100755 src/mods/commands/yc_set.cpp create mode 100755 src/mods/commands/yc_template.cpp mode change 100644 => 100755 src/mods/commands/yc_time.cpp mode change 100644 => 100755 src/mods/commands/yc_topic.cpp mode change 100644 => 100755 src/mods/commands/yc_uptime.cpp mode change 100644 => 100755 src/mods/commands/yc_version.cpp create mode 100755 src/mods/html/Makefile.in mode change 100644 => 100755 src/mods/html/yc_colors.cpp mode change 100644 => 100755 src/mods/html/yc_help.cpp mode change 100644 => 100755 src/mods/html/yc_options.cpp mode change 100644 => 100755 src/mods/html/yc_register.cpp mode change 100644 => 100755 src/name.cpp mode change 100644 => 100755 src/name.h create mode 100755 src/ncur/menu.cpp create mode 100755 src/ncur/menu.h create mode 100755 src/ncur/ncur.cpp create mode 100755 src/ncur/ncur.h mode change 100644 => 100755 src/reqp.cpp mode change 100644 => 100755 src/reqp.h mode change 100644 => 100755 src/sock/sock.cpp mode change 100644 => 100755 src/sock/sock.h create mode 100644 src/stats.cpp create mode 100644 src/stats.h mode change 100644 => 100755 src/thrd/pool.cpp mode change 100644 => 100755 src/thrd/pool.h mode change 100644 => 100755 src/time/timo.cpp mode change 100644 => 100755 src/time/timo.h mode change 100644 => 100755 src/time/timr.cpp mode change 100644 => 100755 src/time/timr.h mode change 100644 => 100755 src/wrap.cpp mode change 100644 => 100755 src/wrap.h (limited to 'src') diff --git a/src/Makefile.in b/src/Makefile.in old mode 100644 new mode 100755 index 66ab5be..0382389 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,33 +1,21 @@ -BIN=../bin/ychat -CXX=@CXX@ -#EFLAGS=-frepo -CXXFLAGS=-fno-inline -fno-default-inline @CXXFLAGS@ ${EFLAGS} ${BOOST_CPPFLAGS} -LDADD+=@LIBS@-lstdc++ -D_THREAD_SAVE -export-dynamic -PREFIX=@prefix@ -all: message ${OBJS} - @dirname=`dirname ${BIN}`; if ! test -d $$dirname; then mkdir -p $$dirname; fi - @echo; echo "===> Linking base sources" - @${CXX} -o ${BIN} ${OBJS} ${LDADD} - @echo "===> LDADD : ${LDADD}" - @echo "===> CXXFLAGS : ${CXXFLAGS}" - @echo "===> CXX : ${CXX}" - @echo "===> Binary size : `du -hs ${BIN} | sed 's/\.\.\/bin\///'`" - @echo "===> `cd ..; ./scripts/version.sh`" - @echo -${OBJS}: - @dirname=`dirname $@`; if ! test -d $$dirname; then mkdir -p $$dirname; fi - @${CXX} ${CXXFLAGS} -c -o $@ `echo $@ | \ - sed 's/\.\.\/obj\/\.\/\(.*\)\.o/\.\/\1.cpp/'` - @echo "base:`echo $@ | sed 's/\.\.\/obj\/\.\/\(.*\)\.o$$/\1/'` (`du \ - -hs $@ | awk '{ print $$1 }'`) " -message: - @echo "===> Building base sources" -clean: - @echo "===> Cleaning base" - @find ../obj -name '*.o' | grep -v mods | xargs rm -f - @if [ -f ${BIN} ]; then rm -f ${BIN}; fi -mrproper: clean - @for i in autom4te.cache; \ - do if [ -d $$i ]; then rm -Rf $$i; fi; done - @for i in Makefile config.h config.log config.status; \ - do if [ -f $$i ]; then rm -f $$i; fi; done +SRCS=WILLBEADDEDBYCONFIGURE +OBJS=$(addprefix ../obj/,$(SRCS:.cpp=.o)) +CC=WILLBEADDEDBYCONFIGURE +LIBADD=`cat libs.add` +LDFLAGS=$(LIBADD) -lstdc++ +LDADD=-pthread -D_THREAD_SAFE -export-dynamic -ldl +INCLUDES=`cat includes.add` +CFLAGS=-fno-inline -fno-default-inline -frepo +all: ychat +$(SRCS): + $(CC) $(INCLUDES) $(CFLAGS) -c $*.cpp +infotext: + @echo Compiling base +ychat: infotext $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDADD) + @mv ychat ../bin + @echo -n "Size of linked executable: " + @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 old mode 100644 new mode 100755 index 145fb6c..dc44c69 --- a/src/chat/base.h +++ b/src/chat/base.h @@ -1,117 +1,89 @@ -/*:* - *: File: ./src/chat/base.h - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - +// template class data declaration; #include "../incl.h" #ifndef BASE_H #define BASE_H -#include -#include "../maps/nhashmap.h" +#include "../maps/smap.h" template -class base : public nhashmap +class base : public smap { -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::run_func( &base::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::run_func( &base::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::run_func( &base::reconf_ ); - } - - static void reconf_ ( type* type_obj ) - { - type_obj -> reconf (); - } - - void get_data( map *p_map_string ) - { - nhashmap::run_func( &base::get_data_ , (void*)p_map_string ); - } - - static void get_data_( type* type_obj, void* v_arg ) - { - type_obj -> get_data ( (map*) 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 usernameseperator - void get_user_list( string &s_list ) - { - container c; - c.elem[0] = (void*) &s_list; - - nhashmap::run_func( &base::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::run_func( &base::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::run_func( &base::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::run_func( &base::reconf_ ); + } + + static void reconf_ ( type* type_obj ) + { + type_obj -> reconf (); + } + + void get_data( map *p_map_string ) + { + smap::run_func( &base::get_data_ , (void*)p_map_string ); + } + + static void get_data_( type* type_obj, void* v_arg ) + { + type_obj -> get_data ( (map*) 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 usernameseperator + void get_user_list( string &s_list ) + { + container c; + c.elem[0] = (void*) &s_list; + + smap::run_func( &base::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 old mode 100644 new mode 100755 index a8db1a0..53b609f --- a/src/chat/base.tmpl +++ b/src/chat/base.tmpl @@ -1,88 +1,33 @@ -/*:* - *: File: ./src/chat/base.tmpl - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - #ifndef BASE_CPP #define BASE_CPP #include "base.h" template -base::base() -{} +base::base() : smap::smap(HMAPOCC) +{ +} template base::~base( ) -{} - -template -type* -base::get_elem( string s_name, bool &b_found ) { - s_name = to_lower(s_name); - type* p_type = nhashmap::get_elem( s_name ); - b_found = p_type == NULL ? false : true; - return p_type; } template type* -base::get_elem( string s_name) +base::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::get_elem( s_name ); + b_found = p_type == NULL ? false : true; + return p_type; } template void base::add_elem( type* p_type ) { - nhashmap::add_elem(p_type, p_type->get_lowercase_name()); -} - -template -void -base::dumpit() -{ - dumpable::add - ("[base]"); - vector* p_vec = nhashmap::get_key_vector(); - - vector::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::add_elem(p_type, p_type->get_lowercase_name()); } #endif diff --git a/src/chat/chat.cpp b/src/chat/chat.cpp old mode 100644 new mode 100755 index 066bfbc..493c2a5 --- a/src/chat/chat.cpp +++ b/src/chat/chat.cpp @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/chat/chat.cpp - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - // class chat implementation. #ifndef CHAT_CPP @@ -36,208 +12,190 @@ using namespace std; chat::chat( ) { - { // Set up replace strings; - wrap::system_message(CHATREP); - vector* p_vec_keys = wrap::CONF->get_key_vector(); - - for (vector::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* p_vec_keys = wrap::CONF->get_key_vector(); + + for (vector::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::delete_obj ); + // Delete all room objects! + run_func( mtools::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::run_func( get_user_, (void*)¶m ); + smap::run_func( get_user_, (void*)¶m ); - 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; + container* param = (container*) v_arg; - if ( *((bool*)param->elem[1]) ) - return; + if ( *((bool*)param->elem[1]) ) + return; - param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) ); + param->elem[2] = (void*)room_obj->get_elem( *((string*)param->elem[0]), *((bool*)param->elem[1]) ); } void chat::login( map &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 ( !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; - } - - // prove if nick is banned from chat - if (map_banned_nicks.exists(tool::to_lower(s_user))) { - map_params["INFO"] = wrap::CONF->get_elem( "chat.msgs.err.banned" ); - map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); - 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.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.nonick" ); + map_params["request"] = wrap::CONF->get_elem( "httpd.startsite" ); // redirect to the startpage. + wrap::system_message( LOGINE0 ); + return; } - if ( p_user->get_has_sess() ) + // prove if the nick is alphanumeric: + else if ( ! tool::is_alpha_numeric( s_user ) ) { - map_params["tmpid"] = p_user->get_tmpid(); + 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; } - else + // 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() ) + { + map_params["tmpid"] = p_user->get_tmpid(); + } + 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"] ); p_user->set_has_sess( true ); + } } - } - 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 map_results = wrap::DATA->select_user_data( tool::to_lower(s_user), "selectlogin"); + // prove if nick is registered, else create a guest chatter. +#ifdef DATABASE + map 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") - { + { // 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 ); @@ -248,190 +206,147 @@ chat::login( map &map_params ) 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(); + 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 ); } - sess* p_sess = wrap::SMAN->create_session(); - p_sess->set_user(p_user); - map_params["tmpid"] = p_sess->get_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"])); - } - - // 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 ); - - // if room does not exist add room to list! - if ( ! b_flag ) - { - p_room = wrap::GCOL->get_room_from_garbage(); - - if ( p_room ) + // 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 ); + + // 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" ) + "
\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" ) + "
\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 &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 = "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 = "get_elem( "chat.html.errorcolor" ) + "\">" + wrap::CONF->get_elem( "chat.msgs.err.messagelength" ) + "
\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 list_msg = tool::split_string( s_msg, " "); - list::iterator iter = list_msg.begin(); + // Check max word length + list list_msg = tool::split_string( s_msg, " "); + list::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; - } - - - 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( "get_col1() ) - .append( "\">" ) - .append( p_user->get_name() ) - .append( ": get_col2() ) - .append( "\">" ) - .append( s_msg ) - .append( "
\n" ); - - p_user->get_room()->msg_post( &s_post ); + + 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 ); + + 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( "get_col1() ) + .append( "\">" ) + .append( p_user->get_name() ) + .append( ": get_col2() ) + .append( "\">" ) + .append( s_msg ) + .append( "
\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::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::dumpit(); -} - -string -chat::ban_nick(string &s_nick, string s_reason) { - string s_lower_nick(tool::to_lower(s_nick)); - - if (map_banned_nicks.exists(s_lower_nick)) - return map_banned_nicks.get_elem(s_lower_nick); - - map_banned_nicks.add_elem(s_reason, s_lower_nick); - return ""; -} - -string -chat::unban_nick(string &s_nick) { - string s_lower_nick(tool::to_lower(s_nick)); - - if (!map_banned_nicks.exists(s_lower_nick)) - return ""; - - string s_ret(map_banned_nicks.get_elem(s_lower_nick)); - map_banned_nicks.del_elem(s_lower_nick); - - return s_ret; -} - -shashmap* -chat::get_map_banned_nicks() { - return &map_banned_nicks; +chat::string_replacer(string *p_msg) { + if ( wrap::CONF->get_elem( "chat.html.replace.activate" ) == "true" ) + { + for (vector::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]) ); + } } #endif diff --git a/src/chat/chat.h b/src/chat/chat.h old mode 100644 new mode 100755 index 9da40e7..86b7c0b --- a/src/chat/chat.h +++ b/src/chat/chat.h @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/chat/chat.h - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - // class chat declaration. class chat; @@ -37,57 +13,50 @@ class chat; #include "user.h" #include "sess.h" #include "../tool/tool.h" -#include "../maps/shashmap.h" using namespace std; + #undef chat class chat : public base, public perm { private: - map map_replace_strings; - vector vec_replace_keys; - shashmap map_banned_nicks; - shashmap, equals_allocator > map_banned_ips; - - void dumpit(); + map map_replace_strings; + vector 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( get_elem( s_name, b_found ) ); - } - - void del_elem( string s_name ) - { - base::del_elem( s_name ); - } - - // 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 &map_params ); - - // will be called if a user posts a message. - void post ( user* u_user, map &map_params ); - - void reconf(); - void string_replacer(string *p_msg); - string ban_nick(string &s_nick, string s_reason); - string unban_nick(string &s_nick); - shashmap* get_map_banned_nicks(); + 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( 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 &map_params ); + + // will be called if a user posts a message. + void post ( user* u_user, map &map_params ); + + void del_elem( string s_name ) + { + smap::del_elem( s_name ); + } + + void reconf(); + void string_replacer(string *p_msg); }; #endif diff --git a/src/chat/gcol.cpp b/src/chat/gcol.cpp old mode 100644 new mode 100755 index ffdb8e5..2500b91 --- a/src/chat/gcol.cpp +++ b/src/chat/gcol.cpp @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/chat/gcol.cpp - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - #ifndef GCOL_CPP #define GCOL_CPP @@ -31,113 +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; - wrap::system_message( GARBAGE ); + p_map_users = new smap(HMAPOCC); + wrap::system_message( GARBAGE ); +#ifdef NCURSES + 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(); +#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(); +#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::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::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(); - return true; +#ifdef NCURSES + print_garbage(); +#endif + 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 ); - return p_room; +#ifdef NCURSES + print_garbage(); +#endif + + 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(); +#endif } return p_user; @@ -146,21 +139,36 @@ 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->get_size() + vec_rooms.size() ); + pthread_mutex_unlock( &mut_vec_rooms ); + refresh(); + } +} + +#endif + #endif diff --git a/src/chat/gcol.h b/src/chat/gcol.h old mode 100644 new mode 100755 index bce0db0..4936ded --- a/src/chat/gcol.h +++ b/src/chat/gcol.h @@ -1,62 +1,42 @@ -/*:* - *: File: ./src/chat/gcol.h - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - -// garbage collector +// garbage collector #include "../incl.h" #ifndef GCOL_H #define GCOL_H -#include +#include #include "room.h" #include "user.h" -#include "../maps/shashmap.h" +#include "../maps/smap.h" using namespace std; class gcol { -private: - vector vec_rooms; - shashmap* p_map_users; + private: + vector vec_rooms; + smap* p_map_users; pthread_mutex_t mut_vec_rooms; static void delete_users_( user* user_obj ); -public: +#ifdef NCURSES + void print_garbage( ); +#endif + + 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 old mode 100644 new mode 100755 index 544d2c0..b862d43 --- a/src/chat/perm.cpp +++ b/src/chat/perm.cpp @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/chat/perm.cpp - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - #ifndef PERM_CPP #define PERM_CPP @@ -32,76 +8,73 @@ using namespace std; perm::perm() { - p_command_status = new shashmap< valwrap* >; - p_command_disabled = new shashmap< valwrap* >; + p_command_status = new smap< valwrap*, string>(HMAPOCC); + p_command_disabled = new smap< valwrap*, string>(HMAPOCC); - set_standard_command_permissions(); + set_standard_command_permissions(); } perm::~perm() { - p_command_status->run_func( &mtools< valwrap* >::delete_obj ); - p_command_disabled->run_func( &mtools< valwrap* >::delete_obj ); + p_command_status->run_func( &mtools< valwrap* >::delete_obj ); + p_command_disabled->run_func( &mtools< valwrap* >::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* p_val = p_command_status->get_set_elem( new valwrap(i_int), s_command ); + valwrap* p_val = p_command_status->set_elem( new valwrap(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* p_val = p_command_disabled->get_set_elem( new valwrap(b_bool), s_command ); + valwrap* p_val = p_command_disabled->set_elem( new valwrap(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* p_vec_keys = wrap::CONF->get_key_vector(); - - for (vector::iterator iter = p_vec_keys-> - begin(); - iter != p_vec_keys->end(); - iter++ ) - { - if ( iter->length() > 17 && iter->compare( 0, 16, "chat.permissions" ) == 0 ) - { - valwrap* p_val = new valwrap( 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* p_vec_keys = wrap::CONF->get_key_vector(); + + for (vector::iterator iter = p_vec_keys->begin(); iter != p_vec_keys->end(); iter++ ) + { + if ( iter->length() > 17 && iter->compare( 0, 16, "chat.permissions" ) == 0 ) + { + valwrap* p_val = new valwrap( 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 old mode 100644 new mode 100755 index 709b60e..8e08ba2 --- a/src/chat/perm.h +++ b/src/chat/perm.h @@ -1,29 +1,5 @@ -/*:* - *: File: ./src/chat/perm.h - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - #include "../incl.h" -#include "../maps/shashmap.h" +#include "../maps/smap.h" #ifndef PERM_H #define PERM_H @@ -31,36 +7,35 @@ using namespace std; template -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* >* p_command_status; - shashmap< valwrap* >* p_command_disabled; - - void set_standard_command_permissions(); + smap< valwrap*, string>* p_command_status; + smap< valwrap*, 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 old mode 100644 new mode 100755 index a4d6549..c21639a --- a/src/chat/room.cpp +++ b/src/chat/room.cpp @@ -1,27 +1,3 @@ -/*:* - *: File: ./src/chat/room.cpp - *: - *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT - *: - *: Copyright (C) 2003 Paul C. Buetow, Volker Richter - *: Copyright (C) 2004 Paul C. Buetow - *: Copyright (C) 2005 EXA Digital Solutions GbR - *: - *: This program is free software; you can redistribute it and/or - *: modify it under the terms of the GNU General Public License - *: as published by the Free Software Foundation; either version 2 - *: of the License, or (at your option) any later version. - *: - *: This program is distributed in the hope that it will be useful, - *: but WITHOUT ANY WARRANTY; without even the implied warranty of - *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - *: GNU General Public License for more details. - *: - *: You should have received a copy of the GNU General Public License - *: along with this program; if not, write to the Free Software - *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *:*/ - #ifndef ROOM_CPP #define ROOM_CPP @@ -32,110 +8,94 @@ using namespace std; room::room( string s_name ) : name( s_name ) { - pthread_mutex_init( &mut_s_topic, NULL ); + 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") ); + 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(); + wrap::STAT->increment_num_rooms(); } room::~room() { - wrap::STAT->decreme