X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_myaccess.c;h=6fa063b2508736ce087f704068445dd6fe6d05f4;hb=ee39770362f69ced5b52104b622582e882af0b77;hp=f21b233ec81de1dbb698eb8bd6c38d4278bad05f;hpb=689da1db7e2517c187ce76c6c553e20d630a7f36;p=NeonServV5.git diff --git a/src/modules/NeonServ.mod/cmd_neonserv_myaccess.c b/src/modules/NeonServ.mod/cmd_neonserv_myaccess.c index f21b233..6fa063b 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_myaccess.c +++ b/src/modules/NeonServ.mod/cmd_neonserv_myaccess.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_myaccess.c - NeonServ v5.4 +/* cmd_neonserv_myaccess.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -40,18 +40,18 @@ CMD_BIND(neonserv_cmd_myaccess) { if(!(user->flags & USERFLAG_ISAUTHED)) { struct neonserv_cmd_myaccess_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->nick = strdup(argv[0]); cache->chanmatch = (chanmatch ? strdup(chanmatch) : NULL); get_userauth(user, module_id, neonserv_cmd_myaccess_nick_lookup, cache); } else - neonserv_cmd_myaccess_async1(client, getTextBot(), user, chan, user->nick, user->auth, chanmatch); + neonserv_cmd_myaccess_async1(client, textclient, user, chan, user->nick, user->auth, chanmatch); } else if(argv[0][0] == '*') { //we've got an auth @@ -59,7 +59,7 @@ CMD_BIND(neonserv_cmd_myaccess) { chanmatch = argv[1]; } argv[0]++; - neonserv_cmd_myaccess_async1(client, getTextBot(), user, chan, NULL, argv[0], chanmatch); + neonserv_cmd_myaccess_async1(client, textclient, user, chan, NULL, argv[0], chanmatch); } else { if(argc > 1 && argv[1][0] == '#') { chanmatch = argv[1]; @@ -68,21 +68,21 @@ CMD_BIND(neonserv_cmd_myaccess) { 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_myaccess_async1(client, getTextBot(), user, chan, argv[0], cuser->auth, chanmatch); + neonserv_cmd_myaccess_async1(client, textclient, user, chan, argv[0], cuser->auth, chanmatch); } else { struct neonserv_cmd_myaccess_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->nick = strdup(argv[0]);