BUILD : 1.7.19 (1267) BUGS : 662 NOTES : akick counts are now properly decressed. os_info now really uses status var. some module clean ups.

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


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

5 files changed, 54 insertions, 22 deletions

diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index a752893d9..e67c84fa6 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -468,6 +468,7 @@ int do_akick(User * u)
                     }
                 }
             }
+            ci->akickcount--;
         }
     } else if (stricmp(cmd, "LIST") == 0) {
         int sent_header = 0;
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 8d3120d37..0967462c9 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -1,14 +1,22 @@
-#include "module.h"
-
-/* Original module: cs_appendtopic by SGR
+/* cs_appendtopic.c - Add text to a channels topic
  *
- * Included in the Anope module pack since 1.7.9
+ * (C) 2003-2007 Anope Team
+ * Contact us at info@anope.org
+ *
+ * Based on the original module by SGR <Alex_SGR@ntlworld.com>
+ * Included in the Anope module pack since Anope 1.7.9
  * Anope Coder: GeniusDex <geniusdex@anope.org>
  *
+ * Please read COPYING and README for further details.
+ *
  * Send bug reports to the Anope Coder instead of the module
  * author, because any changes since the inclusion into anope
  * are not supported by the original author.
+ *
  */
+/*************************************************************************/
+
+#include "module.h"
 
 #define AUTHOR "SGR"
 #define VERSION "$Id$"
@@ -34,11 +42,11 @@
 /* DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING         */
 /* ---------------------------------------------------------------------- */
 
-#define LNG_NUM_STRINGS		3
+#define LNG_NUM_STRINGS	          3
 
-#define LNG_CHAN_HELP				0
-#define LNG_CHAN_HELP_APPENDTOPIC	1
-#define LNG_APPENDTOPIC_SYNTAX		2
+#define LNG_CHAN_HELP             0
+#define LNG_CHAN_HELP_APPENDTOPIC 1
+#define LNG_APPENDTOPIC_SYNTAX    2
 
 int my_cs_appendtopic(User * u);
 void my_cs_help(User * u);
@@ -221,7 +229,7 @@ void my_add_languages(void)
     moduleInsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl);
     moduleInsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de);
     moduleInsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt);
-	moduleInsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
+    moduleInsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
 }
 
 /* EOF */
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 815c3d5b0..f299f08d6 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -1,3 +1,21 @@
+/* cs_tban.c - Bans the user for a given length of time
+ *
+ * (C) 2003-2007 Anope Team
+ * Contact us at info@anope.org
+ *
+ * Based on the original module by Rob <rob@anope.org>
+ * Included in the Anope module pack since Anope 1.7.8
+ * Anope Coder: Rob <rob@anope.org>
+ *
+ * Please read COPYING and README for further details.
+ *
+ * Send bug reports to the Anope Coder instead of the module
+ * author, because any changes since the inclusion into anope
+ * are not supported by the original author.
+ *
+ */
+/*************************************************************************/
+
 #include "module.h"
 
 #define AUTHOR "Rob"
@@ -217,7 +235,7 @@ void mAddLanguages(void)
     moduleInsertLanguage(LANG_NL, LANG_NUM_STRINGS, langtable_nl);
     moduleInsertLanguage(LANG_DE, LANG_NUM_STRINGS, langtable_de);
     moduleInsertLanguage(LANG_PT, LANG_NUM_STRINGS, langtable_pt);
-	moduleInsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it);
+    moduleInsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it);
 }
 
 
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 19504784c..f3221c7e2 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -214,7 +214,7 @@ void my_add_languages(void)
     moduleInsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl);
     moduleInsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de);
     moduleInsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt);
-	moduleInsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
+    moduleInsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
 }
 
 /* EOF */
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 0d0301a75..1127f6c3e 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -72,7 +72,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
     EvtHook *hook = NULL;
 
-    int status;
+    int status = 0;
 
     moduleAddAuthor(AUTHOR);
     moduleAddVersion(VERSION);
@@ -85,26 +85,31 @@ int AnopeInit(int argc, char **argv)
 
     c = createCommand("oInfo", myAddNickInfo, is_oper, -1, -1, -1, -1, -1);
     moduleAddHelp(c, mNickHelp);
-    status = moduleAddCommand(NICKSERV, c, MOD_HEAD);
+    status += moduleAddCommand(NICKSERV, c, MOD_HEAD);
 
     c = createCommand("Info", myNickInfo, NULL, -1, -1, -1, -1, -1);
-    status = moduleAddCommand(NICKSERV, c, MOD_TAIL);
+    status += moduleAddCommand(NICKSERV, c, MOD_TAIL);
 
     c = createCommand("oInfo", myAddChanInfo, is_oper, -1, -1, -1, -1, -1);
     moduleAddHelp(c, mChanHelp);
-    status = moduleAddCommand(CHANSERV, c, MOD_HEAD);
+    status += moduleAddCommand(CHANSERV, c, MOD_HEAD);
 
     c = createCommand("Info", myChanInfo, NULL, -1, -1, -1, -1, -1);
-    status = moduleAddCommand(CHANSERV, c, MOD_TAIL);
+    status += moduleAddCommand(CHANSERV, c, MOD_TAIL);
 
     hook = createEventHook(EVENT_DB_SAVING, mSaveData);
-    status = moduleAddEventHook(hook);
+    status += moduleAddEventHook(hook);
 
     hook = createEventHook(EVENT_DB_BACKUP, mBackupData);
-    status = moduleAddEventHook(hook);
+    status += moduleAddEventHook(hook);
 
     hook = createEventHook(EVENT_RELOAD, mEventReload);
-    status = moduleAddEventHook(hook);
+    status += moduleAddEventHook(hook);
+
+    if (status != MOD_ERR_OK) {
+            alog("os_info: ERROR when trying to create module commands. Unloading...");
+        return MOD_STOP;
+    }
 
     moduleSetNickHelp(mMainNickHelp);
     moduleSetChanHelp(mMainChanHelp);
@@ -547,9 +552,9 @@ void m_AddLanguages(void)
             "This will show up when any oper /cs info's the channel.\n"
             "and can be used for 'tagging' channels etc....",
         /* OINFO_HELP_CMD */
-        "    OINFO         Add / Del an OperInfo line to a nick",
+        "    OINFO      Add / Del an OperInfo line to a nick",
         /* OCINFO_HELP_CMD */
-        "    OINFO         Add / Del an OperInfo line to a channel"
+        "    OINFO      Add / Del an OperInfo line to a channel"
     };
 
     char *langtable_es[] = {
@@ -704,7 +709,7 @@ void m_AddLanguages(void)
     moduleInsertLanguage(LANG_NL, LANG_NUM_STRINGS, langtable_nl);
     moduleInsertLanguage(LANG_DE, LANG_NUM_STRINGS, langtable_de);
     moduleInsertLanguage(LANG_PT, LANG_NUM_STRINGS, langtable_pt);
-	moduleInsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it);
+    moduleInsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it);
 }
 
 /*************************************************************************/