X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_part.cpp;h=10c95661bc75ffc215214ca871dfad711c7a626d;hb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;hp=6cb5a26df7515b135acb2fed8dda4e2b4ffecd50;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 6cb5a26df..10c95661b 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -14,68 +14,29 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_part.h"
+#include "commands/cmd_part.h"
+
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-void cmd_part::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_part::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	if (pcnt > 1)
+	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+		return;
+
+	chanrec* c = ServerInstance->FindChan(parameters[0]);
+	
+	if (c)
 	{
-		if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
-			return;
-		del_channel(user,parameters[0],parameters[1],false);
+		if (!c->PartUser(user, pcnt > 1 ? parameters[0] : NULL))
+			/* Arse, who stole our channel! :/ */
+			delete c;
 	}
 	else
 	{
-		if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
-			return;
-		del_channel(user,parameters[0],NULL,false);
+		user->WriteServ( "401 %s %s :No such channel", user->nick, parameters[0]);
 	}
 }
-
-