summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/cs_enforce.c2
-rw-r--r--src/modules/hs_request.c4
-rw-r--r--src/modules/ns_maxemail.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 9d752cd36..ae7d44305 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -135,7 +135,7 @@ class CommandCSEnforce : public Command
{
UserContainer *uc = *it++;
- if (!nick_identified(uc->user))
+ if (!uc->user->IsIdentified())
{
get_idealban(ci, uc->user, mask, sizeof(mask));
reason = getstring(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 784fcc59d..84f19806c 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -732,8 +732,8 @@ void my_memo_lang(User *u, const char *name, int z, int number, ...)
u2 = finduser(name);
/* Find the users lang, and use it if we cant */
- if (u2 && u2->nc)
- lang = u2->nc->language;
+ if (u2 && u2->Account())
+ lang = u2->Account()->language;
/* If the users lang isnt supported, drop back to enlgish */
if (!me->lang[lang].argc)
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 4817c5003..4a90b7da6 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -138,7 +138,7 @@ int count_email_in_use(const char *email, User * u)
{
for (nc = nclists[i]; nc; nc = nc->next)
{
- if (!(u->nc && u->nc == nc) && nc->email && !stricmp(nc->email, email))
+ if (!(u->Account() && u->Account() == nc) && nc->email && !stricmp(nc->email, email))
++count;
}
}