X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_adduser.c;h=e8b14bd98619aebc836807bec3685b85ba2f5e2c;hb=ee39770362f69ced5b52104b622582e882af0b77;hp=65f021af016c32676384e124f14c7ada47d078a5;hpb=902ebfe5551be2daa3edf8141bcee91f62c0a5e0;p=NeonServV5.git diff --git a/src/modules/NeonServ.mod/cmd_neonserv_adduser.c b/src/modules/NeonServ.mod/cmd_neonserv_adduser.c index 65f021a..e8b14bd 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_adduser.c +++ b/src/modules/NeonServ.mod/cmd_neonserv_adduser.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_adduser.c - NeonServ v5.3 +/* cmd_neonserv_adduser.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -40,14 +40,14 @@ CMD_BIND(neonserv_cmd_adduser) { MYSQL_ROW row; caccess = atoi(argv[1]); if(caccess <= 0 || caccess > 500) { - reply(getTextBot(), user, "NS_INVALID_ACCESS", caccess); + reply(textclient, user, "NS_INVALID_ACCESS", caccess); return; } if(caccess >= getChannelAccess(user, chan)) { if(isGodMode(user)) { event->flags |= CMDFLAG_OPLOG; } else { - reply(getTextBot(), user, "NS_ACCESS_OUTRANKED"); + reply(textclient, user, "NS_ACCESS_OUTRANKED"); return; } } @@ -58,17 +58,17 @@ CMD_BIND(neonserv_cmd_adduser) { printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[0])); res = mysql_use(); if ((row = mysql_fetch_row(res)) != NULL) { - neonserv_cmd_adduser_async1(client, getTextBot(), user, chan, event, argv[0], row[0], caccess); + neonserv_cmd_adduser_async1(client, textclient, user, chan, event, argv[0], row[0], caccess); } else { //we need to create a new user... //but first lookup the auth to check if it really exists struct neonserv_cmd_adduser_cache *cache = malloc(sizeof(*cache)); if (!cache) { - perror("malloc() failed"); + printf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return; } cache->client = client; - cache->textclient = getTextBot(); + cache->textclient = textclient; cache->user = user; cache->chan = chan; cache->event = event; @@ -81,21 +81,21 @@ CMD_BIND(neonserv_cmd_adduser) { if(!cuser) { cuser = createTempUser(argv[0]); if(!cuser) { - reply(getTextBot(), user, "NS_USER_UNKNOWN", argv[0]); + reply(textclient, user, "NS_USER_UNKNOWN", argv[0]); return; } cuser->flags |= USERFLAG_ISTMPUSER; } if(cuser->flags & USERFLAG_ISAUTHED) { - neonserv_cmd_adduser_async1(client, getTextBot(), user, chan, event, argv[0], cuser->auth, caccess); + neonserv_cmd_adduser_async1(client, textclient, user, chan, event, argv[0], cuser->auth, caccess); } else { struct neonserv_cmd_adduser_cache *cache = malloc(sizeof(*cache)); if (!cache) { - perror("malloc() failed"); + printf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return; } cache->client = client; - cache->textclient = getTextBot(); + cache->textclient = textclient; cache->user = user; cache->chan = chan; cache->event = event;