Changeset 806 for trunk/ithildin/modules/ircd/usermodes/registered.c

Timestamp:

06/01/07 11:09:07 (5 years ago)

Author:

wd

Message:

Wow, a fully building ircd mode (so far). Some changes:

• Updated LOTS of copyright notices.
• Completed the split of channel and user modes
• That core 'addon' is completely gone
• Using hard/soft/post dependencies in what seems to me to be a good way.

File:

• trunk/ithildin/modules/ircd/usermodes/registered.c (moved) (moved from trunk/ithildin/modules/ircd/addons/umode_reg.c) (8 diffs)

trunk/ithildin/modules/ircd/usermodes/registered.c

@@ -1 +1 @@
 /*
- * umode_reg.c: Flag mode for registered nicknames.
+ * registered.c: Flag mode for registered nicknames.
  * 
- * Copyright 2002 the Ithildin Project.
+ * Copyright 2002-2007 the Ithildin Project.
  * See the COPYING file for more information on licensing and use.
  * 
@@ -9 +9 @@
  */
 
-#include <ithildin/stand.h>
+#include <ithildin/ithildin.h>
 
 #include "ircd.h"
-#include "addons/umode_reg.h"
+#include "usermodes/registered.h"
 #include "commands/mode.h"
 #include "commands/whois.h"
@@ -19 +19 @@
 
 MODULE_REGISTER("$Rev$");
-const char **mdepends = [
-    "ircd",
-    "ircd.command.mode",
-    "ircd.command.whois",
-    NULL
-]
+const char *mdepends[] = MDEPENDS;
 
-unsigned char reg_umode;
+unsigned char usermode_registered;
 
-USERMODE_FUNC(usermode_reg);
-HOOK_FUNCTION(umode_reg_nick_hook);
-HOOK_FUNCTION(umode_reg_whois_hook);
+USERMODE_FUNC(usermode_registered_handler);
+HOOK_FUNCTION(usermode_registered_nick_hook);
+HOOK_FUNCTION(usermode_registered_whois_hook);
 
 MODULE_LOADER(umode_reg) {
 
-    if (!get_module_savedata(savelist, "reg_umode", &reg_umode)) {
-        EXPORT_SYM(usermode_reg);
-        usermode_request('r', &reg_umode, USERMODE_FL_GLOBAL, -1,
-                "usermode_reg");
-    }
+    if (!get_module_savedata(savelist, "usermode_registered",
+                &usermode_registered))
+        usermode_request('r', &usermode_registered, USERMODE_FL_GLOBAL, -1,
+                usermode_registered_handler);
+    else
+        usermode_update_func(usermode_registered,
+                usermode_registered_handler);
 
-    add_hook(ircd.events.client_nick, umode_reg_nick_hook);
-    add_hook(whois_event, umode_reg_whois_hook);
+    add_hook(ircd.events.client_nick, usermode_registered_nick_hook);
+    add_hook(whois_event, usermode_registered_whois_hook);
 
 #define RPL_WHOISREGNICK 307
@@ -52 +49 @@
     
     if (reload)
-        add_module_savedata(savelist, "reg_umode", sizeof(reg_umode),
-                &reg_umode);
+        add_module_savedata(savelist, "usermode_registered",
+                sizeof(usermode_registered), &usermode_registered);
     else
-        usermode_release(reg_umode);
+        usermode_release(usermode_registered);
 
-    remove_hook(ircd.events.client_nick, umode_reg_nick_hook);
-    remove_hook(whois_event, umode_reg_whois_hook);
+    remove_hook(ircd.events.client_nick, usermode_registered_nick_hook);
+    remove_hook(whois_event, usermode_registered_whois_hook);
 
     DMSG(RPL_WHOISREGNICK);
@@ -64 +61 @@
 
 /* Don't let users change their registered/non-registered setting. */
-USERMODE_FUNC(usermode_reg) {
+USERMODE_FUNC(usermode_registered_handler) {
     /* clients cannot modify the +r mode themselves.  note however that
      * this will *not* cause the mode to fail for remote clients
@@ -75 +72 @@
 }
 
-HOOK_FUNCTION(umode_reg_nick_hook) {
+HOOK_FUNCTION(usermode_registered_nick_hook) {
     client_t *cli = (client_t *)data;
     char *fakeargv[1];
@@ -82 +79 @@
     if (ISREGNICK(cli)) {
         fakeargv[0] = xxx;
-        xxx[0] = reg_umode;
+        xxx[0] = usermode_registered;
         xxx[1] = '\0';
         user_mode(cli, cli, 1, fakeargv, 1);
@@ -90 +87 @@
 }
 
-HOOK_FUNCTION(umode_reg_whois_hook) {
+HOOK_FUNCTION(usermode_registered_whois_hook) {
     client_t *target = (client_t *)data;
     client_t *cli = cptr.cli;