BUILD : 1.7.5 (435) BUGS : 203, 204, 205 NOTES : 1. minor fix to CS CLEAR, 2. Added to DrSteins more CS obsecure password, 3. fixed memoserv not using the correct message, 4. fixed botserv info to tell the channel is forbidden

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


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

5 files changed, 19 insertions, 4 deletions

diff --git a/Changes b/Changes
index c4e202787..e2ea718f5 100644
--- a/Changes
+++ b/Changes
@@ -34,6 +34,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2004
 09/07 A Ircd CHANMODE now trapped and stored.                             [ #00]
 08/23 A New protocol independent design (aka anope-capab).                [ #00]
 08/28 A New IRCD document for adding new ircd support to new design.      [ #00]
+10/30 F Fixed MS INFO using the correct message 			  [#205]
 10/29 F Fixed CS CLEAR MODES not resetting the modes			  [#182]
 10/29 F Fixed LogUser message, now normalizes the "realname" for display  [#199]
 10/29 F Fixed BS ACT, if the string contained control character 1	  [#193]
diff --git a/src/botserv.c b/src/botserv.c
index f7507ffef..c903f43d0 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -1612,6 +1612,10 @@ static int do_info(User * u)
             notice_lang(s_BotServ, u, PERMISSION_DENIED);
             return MOD_CONT;
         }
+        if (ci->flags & CI_VERBOTEN) {
+            notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, query);
+            return MOD_CONT;
+        }
 
         notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name);
         if (ci->bi)
diff --git a/src/chanserv.c b/src/chanserv.c
index 5329964e3..46c06b930 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -3118,9 +3118,13 @@ static int do_set_successor(User * u, ChannelInfo * ci, char *param)
 
 static int do_set_password(User * u, ChannelInfo * ci, char *param)
 {
-#ifdef USE_ENCRYPTION
     int len = strlen(param);
 
+    if (stricmp(u->nick, param) == 0 || (StrictPasswords && len < 5)) {
+        notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD);
+        return MOD_CONT;
+    }
+#ifdef USE_ENCRYPTION
     if (len > PASSMAX) {
         len = PASSMAX;
         param[len] = 0;
@@ -5918,7 +5922,7 @@ static int do_clear(User * u)
             /* to prevent the internals from complaining send -k, -L, -f by themselves if we need
                to send them - TSL */
             if (c->key) {
-                anope_cmd_mode(s_ChanServ, c->name, "-k %s", c->key);
+                anope_cmd_mode(whosends(ci), c->name, "-k %s", c->key);
                 argv[0] = sstrdup("-k");
                 argv[1] = c->key;
                 chan_set_modes(whosends(ci), c, 2, argv, 0);
diff --git a/src/memoserv.c b/src/memoserv.c
index e9e86f66c..4c7d40463 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -1093,7 +1093,7 @@ static int do_info(User * u)
             else if (count == 0)
                 notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS, name,
                             mi->memocount);
-            else if (count == 0)
+            else if (count == 1)
                 notice_lang(s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD,
                             name, mi->memocount);
             else
diff --git a/version.log b/version.log
index 843130a49..a981c6e58 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,16 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="5"
-VERSION_BUILD="434"
+VERSION_BUILD="435"
 
 # $Log$
 #
+# BUILD : 1.7.5 (435)
+# BUGS  : 203, 204, 205
+# NOTES :  1. minor fix to CS CLEAR, 2. Added to DrSteins more CS obsecure password, 3. fixed memoserv not using the
+# correct message, 4. fixed botserv info to tell the channel is forbidden
+#  
+#
 # BUILD : 1.7.5 (434)
 # BUGS  : N/A
 # NOTES : 1. fixed typo in the lang files, 2. updated de.l from Crazytoon, 3. UnRestrictSAdmin for Bahamut to allow them