BUILD : 1.7.5 (399) BUGS : 180, 181 NOTES : code tidy up, fixes a few items from bug 180 and 181

git-svn-id: svn://svn.anope.org/anope/trunk@399 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@263 5417fbe8-f217-4b02-8779-1006273d7864

6 files changed, 13 insertions, 9 deletions

diff --git a/src/actions.c b/src/actions.c
index 2db934ff6..c97eb9930 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -167,6 +167,7 @@ void common_svsmode(User * u, char *modes, char *arg)
         av[1] = arg;
         ac++;
     }
+
     anope_cmd_svsmode(u, ac, av);
     anope_set_umode(u, ac, av);
 }
diff --git a/src/channels.c b/src/channels.c
index 93b938098..d2ed718ec 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -285,7 +285,7 @@ void chan_set_user_status(Channel * chan, User * user, int16 status)
 
     if (HelpChannel && status == CUS_OP
         && !stricmp(chan->name, HelpChannel))
-        common_svsmode(user, "+h", NULL);
+        common_svsmode(user, "+h", "1");
 
     for (uc = user->chans; uc; uc = uc->next) {
         if (uc->chan == chan) {
diff --git a/src/chanserv.c b/src/chanserv.c
index 82702cc05..fbbbecd6e 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2660,7 +2660,7 @@ static int do_register(User * u)
         notice_lang(s_ChanServ, u, CHAN_MUST_IDENTIFY_NICK, s_NickServ,
                     s_NickServ);
     } else if (!(c = findchan(chan))) {
-        notice_lang(s_NickServ, u, CHAN_REGISTER_NONE_CHANNEL, chan);
+        notice_lang(s_ChanServ, u, CHAN_REGISTER_NONE_CHANNEL, chan);
     } else if ((ci = cs_findchan(chan)) != NULL) {
         if (ci->flags & CI_VERBOTEN) {
             alog("%s: Attempt to register FORBIDden channel %s by %s!%s@%s", s_ChanServ, ci->name, u->nick, u->username, common_get_vhost(u));
@@ -6284,6 +6284,7 @@ static int do_status(User * u)
     ChannelInfo *ci;
     User *u2;
     char *nick, *chan;
+    char *temp;
 
     chan = strtok(NULL, " ");
     nick = strtok(NULL, " ");
@@ -6292,13 +6293,13 @@ static int do_status(User * u)
         return MOD_CONT;
     }
     if (!(ci = cs_findchan(chan))) {
-        char *temp = chan;
+        temp = chan;
         chan = nick;
         nick = temp;
         ci = cs_findchan(chan);
     }
     if (!ci) {
-        notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, chan);
+        notice_lang(s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp);
     } else if (ci->flags & CI_VERBOTEN) {
         notice_lang(s_ChanServ, u, CHAN_STATUS_FORBIDDEN, chan);
         return MOD_CONT;
diff --git a/src/modules.c b/src/modules.c
index 0cb411905..2bab85f1a 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -900,7 +900,7 @@ int addCommand(CommandHash * cmdTable[], Command * c, int pos)
                 c->next = current->c;
                 current->c = c;
                 if (debug)
-                    alog("existing cmd: (%p), new cmd (0x%p)", c->next, (void *) c);
+                    alog("existing cmd: (0x%p), new cmd (0x%p)", (void *) c->next, (void *) c);
                 return MOD_ERR_OK;
             } else if (pos == 2) {
 
@@ -908,7 +908,7 @@ int addCommand(CommandHash * cmdTable[], Command * c, int pos)
                 while (tail->next)
                     tail = tail->next;
                 if (debug)
-                    alog("existing cmd: (%p), new cmd (0x%p)", tail, (void *) c);
+                    alog("existing cmd: (0x%p), new cmd (0x%p)", (void *) tail, (void *) c);
                 tail->next = c;
                 c->next = NULL;
 
@@ -1122,14 +1122,14 @@ int addMessage(MessageHash * msgTable[], Message * m, int pos)
                 m->next = current->m;
                 current->m = m;
                 if (debug)
-                    alog("existing msg: (%p), new msg (0x%p)", m->next, (void *) m);
+                    alog("existing msg: (0x%p), new msg (0x%p)", (void *) m->next, (void *) m);
                 return MOD_ERR_OK;
             } else if (pos == 2) {
                 tail = current->m;
                 while (tail->next)
                     tail = tail->next;
                 if (debug)
-                    alog("existing msg: (%p), new msg (0x%p)", tail, (void *) m);
+                    alog("existing msg: (0x%p), new msg (0x%p)", (void *) tail, (void *) m);
                 tail->next = m;
                 m->next = NULL;
                 return MOD_ERR_OK;
diff --git a/src/nickserv.c b/src/nickserv.c
index cbc53df58..57973387d 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2664,7 +2664,7 @@ static int do_logout(User * u)
         }
 
         if (ircd->modeonreg) {
-            common_svsmode(u2, ircd->modeonreg, "1");
+            common_svsmode(u2, ircd->modeonunreg, "1");
         }
 
         u->isSuperAdmin = 0;    /* Dont let people logout and remain a SuperAdmin */
diff --git a/src/unreal32.c b/src/unreal32.c
index 758ac8008..c28947428 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -794,6 +794,8 @@ void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
  */
 void anope_cmd_svsmode(User * u, int ac, char **av)
 {
+    alog("ac count %d %s %s", ac, av[0], av[1]);
+
     if (ac > 1) {
         if (!u || !av[0]) {
             return;