summaryrefslogtreecommitdiff
path: root/src/chat/room.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/chat/room.cpp')
-rwxr-xr-xsrc/chat/room.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/chat/room.cpp b/src/chat/room.cpp
index c21639a..b2f17f8 100755
--- a/src/chat/room.cpp
+++ b/src/chat/room.cpp
@@ -9,10 +9,8 @@ using namespace std;
room::room( string s_name ) : name( s_name )
{
pthread_mutex_init( &mut_s_topic, NULL );
-#ifdef LOGGING
p_logd = new logd( wrap::CONF->get_elem("chat.logging.roomlogdir") + get_lowercase_name(),
wrap::CONF->get_elem("chat.logging.roomloglines") );
-#endif
wrap::STAT->increment_num_rooms();
}
@@ -23,9 +21,7 @@ room::~room()
// Delete all user objects
run_func( mtools<user*>::delete_obj );
-#ifdef LOGGING
delete p_logd;
-#endif
pthread_mutex_destroy( &mut_s_topic );
pthread_mutex_destroy( &mut_s_name );
@@ -42,24 +38,15 @@ room::get_topic()
}
void
-room::set_topic( string s_topic )
+room::set_topic( string s_topic)
{
pthread_mutex_lock ( &mut_s_topic );
- if ( s_topic == "" )
- this->s_topic = "";
- else
- this->s_topic = s_topic + "<br><br>";
+ this->s_topic = s_topic;
pthread_mutex_unlock( &mut_s_topic );
reload_onlineframe();
}
void
-room::set_topic( string s_topic, string s_color )
-{
- set_topic( "<font color=\"#" + s_color + "\">" + s_topic + "</font>");
-}
-
-void
room::clean_room()
{
pthread_mutex_lock ( &mut_s_topic );
@@ -85,17 +72,13 @@ room::set_name( string s_name )
return;
}
-#ifdef LOGGING
p_logd->flush_logs();
-#endif
if ( s_name == "" )
return;
name::set_name( s_name );
-#ifdef LOGGING
p_logd->set_logfile( wrap::CONF->get_elem("chat.logging.roomlogdir"), get_lowercase_name() );
-#endif
}
#endif