diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 22:29:18 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-15 22:29:18 +0000 |
| commit | d1611b640bcd27e1a91a99ef32127bc722e50a36 (patch) | |
| tree | b18c77b07b74b70f5613b106aa2a81baa6227f35 /src/modules | |
| parent | 0e5b71923b25d908167e7ef9d07c6c217827e901 (diff) | |
Remove User::na, use User::nc everywhere. Will probably break everything, but opens the door to decoupling NC from NA, and means commands can now be run without bothering about changinc nick :)
More tweaking for na/nc usage.
It compiles, but it's still a work in progress.
Again, this compiles, but I *bet* there's no chance in hell it'll work. :)
Slightly better.
Set User::nc correctly.
Fix crash with unregistered nicks in core and ns_access.
Fix glist to work when you're not on that particular nick.
Fix ns_set to not crash and burn horribly.
Fix ns_set and ns_logout to not do bad things.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2076 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/cs_enforce.c | 4 | ||||
| -rw-r--r-- | src/modules/hs_request.c | 6 | ||||
| -rw-r--r-- | src/modules/ns_maxemail.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 8335b1758..cdb610ecd 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -116,7 +116,7 @@ class CommandCSEnforce : public Command if (check_access(u, c->ci, CA_NOJOIN)) { get_idealban(ci, u, mask, sizeof(mask)); - reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); + reason = getstring(u, CHAN_NOT_ALLOWED_TO_JOIN); ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); av[0] = ci->name; @@ -155,7 +155,7 @@ class CommandCSEnforce : public Command if (!nick_identified(u)) { get_idealban(ci, u, mask, sizeof(mask)); - reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN); + reason = getstring(u, CHAN_NOT_ALLOWED_TO_JOIN); if (!(cbm = &cbmodes[static_cast<int>('R')])->flag || !(c->mode & cbm->flag)) ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask, time(NULL)); ircdproto->SendKick(whosends(ci), ci->name, u->nick, "%s", reason); diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index a57e09282..d9c992a0d 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -345,7 +345,7 @@ class HSListBase : public Command { ++display_counter; tm = localtime(¤t->time); - strftime(buf, sizeof(buf), getstring(NULL, STRFTIME_DATE_TIME_FORMAT), tm); + strftime(buf, sizeof(buf), getstring(u, STRFTIME_DATE_TIME_FORMAT), tm); if (current->vIdent) notice_lang(s_HostServ, u, HOST_IDENT_ENTRY, counter, current->nick, current->vIdent, current->vHost, current->creator, buf); else @@ -751,8 +751,8 @@ void my_memo_lang(User *u, char *name, int z, int number, ...) u2 = finduser(name); /* Find the users lang, and use it if we cant */ - if (u2 && u2->na && u2->na->nc) - lang = u2->na->nc->language; + if (u2 && u2->nc) + lang = u2->nc->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 1539c81c5..38215dd60 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -161,7 +161,7 @@ int count_email_in_use(const char *email, User * u) { for (nc = nclists[i]; nc; nc = nc->next) { - if (!(u->na && u->na->nc && u->na->nc == nc) && nc->email && !stricmp(nc->email, email)) + if (!(u->nc && u->nc == nc) && nc->email && !stricmp(nc->email, email)) ++count; } } |