projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed crash in cmd_neonserv_mode.c
[NeonServV5.git]
/
src
/
modules
/
NeonServ.mod
/
cmd_neonserv_assignrank.c
diff --git
a/src/modules/NeonServ.mod/cmd_neonserv_assignrank.c
b/src/modules/NeonServ.mod/cmd_neonserv_assignrank.c
index 4fedaf85089e5fc508cfefba62991cef49be18c6..19a906a3df20e89898ce279c4ddcf60588d5c21f 100644
(file)
--- a/
src/modules/NeonServ.mod/cmd_neonserv_assignrank.c
+++ b/
src/modules/NeonServ.mod/cmd_neonserv_assignrank.c
@@
-1,4
+1,4
@@
-/* cmd_neonserv_assignrank.c - NeonServ v5.
3
+/* cmd_neonserv_assignrank.c - NeonServ v5.
6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
@@
-42,7
+42,7
@@
CMD_BIND(neonserv_cmd_assignrank) {
printf_mysql_query("SELECT `rank_id`, `rank_name` FROM `support_ranks` WHERE `rank_name` = '%s'", escape_string(name));
res = mysql_use();
if ((row = mysql_fetch_row(res)) == NULL) {
printf_mysql_query("SELECT `rank_id`, `rank_name` FROM `support_ranks` WHERE `rank_name` = '%s'", escape_string(name));
res = mysql_use();
if ((row = mysql_fetch_row(res)) == NULL) {
- reply(
getTextBot()
, user, "NS_DELRANK_NOT_FOUND", name);
+ reply(
textclient
, user, "NS_DELRANK_NOT_FOUND", name);
return;
}
rank_id = atoi(row[0]);
return;
}
rank_id = atoi(row[0]);
@@
-53,48
+53,48
@@
CMD_BIND(neonserv_cmd_assignrank) {
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) {
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_assignrank_async1(client,
getTextBot()
, user, event, argv[0], row[0], rank_id);
+ neonserv_cmd_assignrank_async1(client,
textclient
, user, event, argv[0], row[0], rank_id);
} else {
//we need to create a new user...
//but first lookup the auth to check if it really exists
struct neonserv_cmd_assignrank_cache *cache = malloc(sizeof(*cache));
if (!cache) {
} else {
//we need to create a new user...
//but first lookup the auth to check if it really exists
struct neonserv_cmd_assignrank_cache *cache = malloc(sizeof(*cache));
if (!cache) {
- p
error("malloc() failed"
);
+ p
rintf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return;
}
cache->client = client;
return;
}
cache->client = client;
- cache->textclient =
getTextBot()
;
+ cache->textclient =
textclient
;
cache->user = user;
cache->event = event;
cache->rank_id = rank_id;
cache->nick = strdup(argv[0]);
cache->user = user;
cache->event = event;
cache->rank_id = rank_id;
cache->nick = strdup(argv[0]);
- lookup_authname(argv[0], neonserv_cmd_assignrank_auth_lookup, cache);
+ lookup_authname(argv[0],
module_id,
neonserv_cmd_assignrank_auth_lookup, cache);
}
} else {
struct UserNode *cuser = getUserByNick(argv[0]);
if(!cuser) {
cuser = createTempUser(argv[0]);
if(!cuser) {
}
} else {
struct UserNode *cuser = getUserByNick(argv[0]);
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) {
return;
}
cuser->flags |= USERFLAG_ISTMPUSER;
}
if(cuser->flags & USERFLAG_ISAUTHED) {
- neonserv_cmd_assignrank_async1(client,
getTextBot()
, user, event, argv[0], cuser->auth, rank_id);
+ neonserv_cmd_assignrank_async1(client,
textclient
, user, event, argv[0], cuser->auth, rank_id);
} else {
struct neonserv_cmd_assignrank_cache *cache = malloc(sizeof(*cache));
if (!cache) {
} else {
struct neonserv_cmd_assignrank_cache *cache = malloc(sizeof(*cache));
if (!cache) {
- p
error("malloc() failed"
);
+ p
rintf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__
);
return;
}
cache->client = client;
return;
}
cache->client = client;
- cache->textclient =
getTextBot()
;
+ cache->textclient =
textclient
;
cache->user = user;
cache->event = event;
cache->rank_id = rank_id;
cache->nick = strdup(argv[0]);
cache->user = user;
cache->event = event;
cache->rank_id = rank_id;
cache->nick = strdup(argv[0]);
- get_userauth(cuser, neonserv_cmd_assignrank_nick_lookup, cache);
+ get_userauth(cuser,
module_id,
neonserv_cmd_assignrank_nick_lookup, cache);
}
}
}
}
}
}