X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fchanserv.c;h=19a5c5776587b121248a86ecef4aab8b5bfe9030;hb=c7c06b7fb90b2596050dbb60d3c8d567bbf49239;hp=44f6d9d5f1488f88c0b24d06260e0fce960e1eb9;hpb=58d823d306b690515fbc6f671636d4ec152b867a;p=srvx.git

diff --git a/src/chanserv.c b/src/chanserv.c
index 44f6d9d..19a5c57 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -141,7 +141,7 @@
 #define KEY_EXPIRES     "expires"
 #define KEY_TRIGGERED   "triggered"
 
-#define CHANNEL_DEFAULT_FLAGS   (CHANNEL_OFFCHANNEL | CHANNEL_UNREVIEWED)
+#define CHANNEL_DEFAULT_FLAGS   (CHANNEL_UNREVIEWED)
 #define CHANNEL_PRESERVED_FLAGS (CHANNEL_UNREVIEWED)
 #define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnat"
 
@@ -156,7 +156,6 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_MUST_BE_OPPED", "You must be a channel operator in $b%s$b to register it." },
     { "CSMSG_PROXY_FORBIDDEN", "You may not register a channel for someone else." },
     { "CSMSG_OWN_TOO_MANY", "%s already owns enough channels (at least %d); use FORCE to override." },
-    { "CMSG_ALERT_REGISTERED" "%s registered to %s by %s." },
 
 /* Do-not-register channels */
     { "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." },
@@ -179,7 +178,6 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_UNREG_NODELETE", "$b%s$b is protected from unregistration." },
     { "CSMSG_CHAN_SUSPENDED", "$b$C$b access to $b%s$b has been temporarily suspended (%s)." },
     { "CSMSG_CONFIRM_UNREG", "To confirm this unregistration, you must use 'unregister %s'." },
-    { "CMSG_ALERT_UNREGISTERED" "%s %s" },
 
 /* Channel moving */
     { "CSMSG_MOVE_SUCCESS", "Channel registration has been moved to $b%s$b." },
@@ -525,6 +523,9 @@ static const struct message_entry msgtab[] = {
     { NULL, NULL }
 };
 
+#define CSMSG_ALERT_REGISTERED "%s registered to %s by %s."
+#define CSMSG_ALERT_UNREGISTERED "%s %s"
+
 /* eject_user and unban_user flags */
 #define ACTION_KICK             0x0001
 #define ACTION_BAN              0x0002
@@ -1526,7 +1527,8 @@ unregister_channel(struct chanData *channel, const char *reason)
     dict_delete(channel->notes);
     if(!IsSuspended(channel))
         DelChannelUser(chanserv, channel->channel, msgbuf, 0);
-    chanserv_oper_message(CSMSGL_CHANNEL_UNREGISTERED, channel->channel->name, reason);
+
+    chanserv_oper_message(CSMSG_ALERT_UNREGISTERED, channel->channel->name, reason);
     UnlockChannel(channel->channel);
     free(channel);
     registered_channels--;