pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-27 19:46:38 +02:00
Code Activity

Remove now unneeded checks for identified nick, patch by Adam.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2305 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
cyberbotx
2009-05-30 00:44:21 +00:00
parent deeec4fbf1
commit 08b3ef7d4e
10 changed files with 5 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/cs_identify.c
-6
View File
@@ -36,12 +36,6 @@ class CommandCSIdentify : public Command
return MOD_CONT;
}
if (!nick_identified(u))
{
notice_lang(s_ChanServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
return MOD_CONT;
}
if (is_founder(u, ci))
{
notice_lang(s_ChanServ, u, NICK_ALREADY_IDENTIFIED);
src/core/ms_del.c
-5
View File
@@ -56,11 +56,6 @@ class CommandMSDel : public Command
}
else
{
if (!nick_identified(u))
{
notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
return MOD_CONT;
}
mi = &u->nc->memos;
}
if (!numstr || (!isdigit(*numstr) && stricmp(numstr, "ALL") && stricmp(numstr, "LAST")))
src/core/ms_info.c
+1 -6
View File
@@ -67,13 +67,8 @@ class CommandMSInfo : public Command
notice_lang(s_MemoServ, u, ACCESS_DENIED);
return MOD_CONT;
}
else /* !name */
else
{
if (!nick_identified(u))
{
notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
return MOD_CONT;
}
mi = &u->nc->memos;
hardmax = u->nc->flags & NI_MEMO_HARDMAX ? 1 : 0;
}
src/core/ms_list.c
-5
View File
@@ -51,11 +51,6 @@ class CommandMSList : public Command
}
else
{
if (!nick_identified(u))
{
notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
return MOD_CONT;
}
mi = &u->nc->memos;
}
if (param && !isdigit(*param) && stricmp(param, "NEW"))
src/core/ms_read.c
-5
View File
@@ -51,11 +51,6 @@ class CommandMSRead : public Command
}
else
{
if (!nick_identified(u))
{
notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
return MOD_CONT;
}
mi = &u->nc->memos;
}
num = numstr ? atoi(numstr) : -1;
src/core/ms_set.c
-2
View File
@@ -214,8 +214,6 @@ class CommandMSSet : public Command
notice_lang(s_MemoServ, u, MEMO_SET_DISABLED);
return MOD_CONT;
}
if (!nick_identified(u))
notice_lang(s_MemoServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
else if (!stricmp(cmd, "NOTIFY"))
return this->DoNotify(u, params, mi);
else if (!stricmp(cmd, "LIMIT")) {
src/core/ns_drop.c
+1 -3
View File
@@ -60,9 +60,7 @@ class CommandNSDrop : public Command
if (is_mine && !nick)
my_nick = sstrdup(na->nick);
if (is_mine && !nick_identified(u))
notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
else if (!is_mine && !u->nc->IsServicesOper())
if (!is_mine && !u->nc->IsServicesOper())
notice_lang(s_NickServ, u, ACCESS_DENIED);
else if (NSSecureAdmins && !is_mine && na->nc->IsServicesOper())
notice_lang(s_NickServ, u, ACCESS_DENIED);
src/core/ns_group.c
+2 -3
View File
@@ -206,11 +206,10 @@ class CommandNSGList : public Command
const char *nick = params.size() ? params[0].c_str() : NULL;
NickCore *nc = u->nc;
int nick_ided = nick_identified(u);
int i;
if (nick ? (stricmp(nick, u->nick) ? !u->nc->IsServicesOper() : !nick_ided) : !nick_ided)
notice_lang(s_NickServ, u, nick_ided ? ACCESS_DENIED : NICK_IDENTIFY_REQUIRED, s_NickServ);
if (nick && (stricmp(nick, u->nick) && !u->nc->IsServicesOper()))
notice_lang(s_NickServ, u, ACCESS_DENIED, s_NickServ);
else if (nick && (!findnick(nick) || !(nc = findnick(nick)->nc)))
notice_lang(s_NickServ, u, !nick ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick);
/* else if (na->status & NS_FORBIDDEN)
src/core/ns_logout.c
-2
View File
@@ -43,8 +43,6 @@ class CommandNSLogout : public Command
else
notice_lang(s_NickServ, u, NICK_NOT_REGISTERED);
}
else if (!nick && !nick_identified(u))
notice_lang(s_NickServ, u, NICK_IDENTIFY_REQUIRED, s_NickServ);
else if (nick && !u2->nc->IsServicesOper())
notice_lang(s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick);
else
src/memoserv.c
+1 -5
View File
@@ -65,11 +65,7 @@ void memoserv(User * u, char *buf)
}
ircdproto->SendCTCP(findbot(s_MemoServ), u->nick, "PING %s", s);
} else {
if (!u->nc && stricmp(cmd, "HELP") != 0)
notice_lang(s_MemoServ, u, NICK_NOT_REGISTERED_HELP,
s_NickServ);
else
mod_run_cmd(s_MemoServ, u, MEMOSERV, cmd);
mod_run_cmd(s_MemoServ, u, MEMOSERV, cmd);
}
}