tagging ychat-0.7.7.1ychat-0.7.7.1

1 files changed, 91 insertions, 92 deletions

diff --git a/src/mods/commands/yc_j.cpp b/src/mods/commands/yc_j.cpp
index 903e49b..178a388 100755
--- a/src/mods/commands/yc_j.cpp
+++ b/src/mods/commands/yc_j.cpp
@@ -7,99 +7,98 @@
 
 using namespace std;
 
-extern "C" {
- int extern_function(void *v_arg)
- {
-
-	container *c=(container *)v_arg;
-	
-	user *p_user = (user*) c->elem[1];		// the corresponding user
-	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; 
-        gcol* p_gcol = (gcol*) ((dynamic_wrap*)c->elem[3])->GCOL; 
-
-        if ( ! params->empty() )
+extern "C"
+{
+  int extern_function(void *v_arg)
+  {
+
+    container *c=(container *)v_arg;
+
+    user *p_user = (user*) c->elem[1];		// the corresponding user
+    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;
+    gcol* p_gcol = (gcol*) ((dynamic_wrap*)c->elem[3])->GCOL;
+
+    if ( ! params->empty() )
+    {
+      vector<string> ::iterator iter;
+
+      string s_room;
+
+      for ( iter = params->begin(); iter != params->end(); iter++ )
+      {
+        s_room.append( *iter );
+        if ( iter+1 != params->end() )
+          s_room.append(" ");
+      }
+
+      int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") );
+      if ( i_max_room_len < s_room.length() )
+        s_room = s_room.substr(0, i_max_room_len );
+
+      if ( tool::to_lower(s_room) == p_user->get_room()->get_lowercase_name() )
+      {
+        string s_msg = "<font color=\"" + p_conf->get_elem("chat.html.errorcolor") + "\">"
+                       + p_conf->get_elem("chat.msgs.err.alreadyinroom") + "<b>"
+                       + p_user->get_room()->get_name() + "</b></font><br>\n";
+        p_user->msg_post( &s_msg );
+      }
+      else
+      {
+        string s_user = p_timr->get_time() + " " + p_user->get_colored_bold_name();
+        string s_msg = s_user + p_conf->get_elem( "chat.msgs.userleavesroom" ) + "<b>";
+        string s_msg2 = s_user + p_conf->get_elem( "chat.msgs.userentersroom" ) + "<b>";
+
+        bool b_flag;
+        room*  p_room = p_chat->get_room( s_room , b_flag );
+
+        // if room does not exist add room to list!
+        if ( p_room == NULL )
         {
-         vector<string> ::iterator iter; 
-
-         string s_room;
-
-         for ( iter = params->begin(); iter != params->end(); iter++ )
-         {
-          s_room.append( *iter ); 
-          if ( iter+1 != params->end() )
-           s_room.append(" ");
-         }
-
-         int i_max_room_len = tool::string2int( p_conf->get_elem("chat.maxlength.roomname") ); 
-         if ( i_max_room_len < s_room.length() )
-          s_room = s_room.substr(0, i_max_room_len );         
-
-         if ( tool::to_lower(s_room) == p_user->get_room()->get_lowercase_name() )
-         {
-          string s_msg = "<font color=\"" + p_conf->get_elem("chat.html.errorcolor") + "\">"
-		       + p_conf->get_elem("chat.msgs.err.alreadyinroom") + "<b>"
-                       + p_user->get_room()->get_name() + "</b></font><br>\n";	
-          p_user->msg_post( &s_msg );
-         }
-
-         else
-         {
-          string s_user = p_timr->get_time() + " " + p_user->get_colored_bold_name(); 
-          string s_msg = s_user + p_conf->get_elem( "chat.msgs.userleavesroom" ) + "<b>";
-          string s_msg2 = s_user + p_conf->get_elem( "chat.msgs.userentersroom" ) + "<b>";
-
-	  bool b_flag;
-          room*  p_room = p_chat->get_room( s_room , b_flag );
-
-          // if room does not exist add room to list!
-          if ( p_room == NULL )
-          {
-           p_room = p_gcol->get_room_from_garbage_or_new( s_room );
-
-           s_msg.append( s_room + "</b><br>\n" );
-           s_msg2.append( s_room + "</b><br>\n" );
-
-           room* p_room_old = p_user->get_room();
-
-           string s_name_lowercase = p_user->get_lowercase_name();
-           p_user->get_room()->del_elem( s_name_lowercase );
-
-           p_gcol->lock_mutex();
-           if ( p_room_old != NULL )
- 	    p_room_old->msg_post( &s_msg ); 
-           p_gcol->unlock_mutex();
-
-           p_room->add_user( p_user );
-           p_chat->add_elem( p_room );
-           p_room->msg_post( &s_msg2 );
-          }
-
-          else // p_room != NULL
-          {
-           s_msg.append( p_room->get_name() + "</b><br>\n" );
-           s_msg2.append( p_room->get_name() + "</b><br>\n" );
-
-           room* p_room_old = p_user->get_room();
-
-           string s_name_lowercase = p_user->get_lowercase_name();
-           p_user->get_room()->del_elem( s_name_lowercase );
-
-           p_gcol->lock_mutex();
-           if ( p_room_old != NULL )
- 	    p_room_old->msg_post( &s_msg ); 
-           p_gcol->unlock_mutex();
-
-           p_room->add_user( p_user );
-           p_room->msg_post( &s_msg2 );
-	  }
-         }
-	}
-
-	return 0;
- }
+          p_room = p_gcol->get_room_from_garbage_or_new( s_room );
+
+          s_msg.append( s_room + "</b><br>\n" );
+          s_msg2.append( s_room + "</b><br>\n" );
+
+          room* p_room_old = p_user->get_room();
+
+          string s_name_lowercase = p_user->get_lowercase_name();
+          p_user->get_room()->del_elem( s_name_lowercase );
+
+          p_gcol->lock_mutex();
+          if ( p_room_old != NULL )
+            p_room_old->msg_post( &s_msg );
+          p_gcol->unlock_mutex();
+
+          p_room->add_user( p_user );
+          p_chat->add_elem( p_room );
+          p_room->msg_post( &s_msg2 );
+        }
+        else // p_room != NULL
+        {
+          s_msg.append( p_room->get_name() + "</b><br>\n" );
+          s_msg2.append( p_room->get_name() + "</b><br>\n" );
+
+          room* p_room_old = p_user->get_room();
+
+          string s_name_lowercase = p_user->get_lowercase_name();
+          p_user->get_room()->del_elem( s_name_lowercase );
+
+          p_gcol->lock_mutex();
+          if ( p_room_old != NULL )
+            p_room_old->msg_post( &s_msg );
+          p_gcol->unlock_mutex();
+
+          p_room->add_user( p_user );
+          p_room->msg_post( &s_msg2 );
+        }
+      }
+    }
+
+    return 0;
+  }
 
 }