X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/19fe6b99408a97e6a79b2a79b405bf7923c08e80..1d9574827a360322e344883a477c8f52f35ede2e:/src/chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index 7f75737..b664ac3 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1,7 +1,7 @@
 /* chanserv.c - Channel service bot
  * Copyright 2000-2004 srvx Development Team
  *
- * This file is part of srvx.
+ * This file is part of x3.
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,9 +56,13 @@
 #define KEY_GIVEOWNERSHIP_PERIOD "giveownership_timeout"
 
 /* ChanServ database */
+#define KEY_VERSION_CONTROL     "version_control"
 #define KEY_CHANNELS		"channels"
 #define KEY_NOTE_TYPES          "note_types"
 
+/* version control paramiter */
+#define KEY_VERSION_NUMBER      "version_number"
+
 /* Note type parameters */
 #define KEY_NOTE_OPSERV_ACCESS  "opserv_access"
 #define KEY_NOTE_CHANNEL_ACCESS "channel_access"
@@ -95,7 +99,7 @@
 #define KEY_FLAGS		"flags"
 #define KEY_OPTIONS             "options"
 #define KEY_USERS		"users"
-#define KEY_BANS		"bans"
+#define KEY_BANS		"bans" /* for lamers */
 #define KEY_MAX			"max"
 #define KEY_NOTES               "notes"
 #define KEY_TOPIC_MASK          "topic_mask"
@@ -131,9 +135,9 @@ static const struct message_entry msgtab[] = {
 
 /* Do-not-register channels */
     { "CSMSG_NOT_DNR", "$b%s$b is not a valid channel name or *account." },
-    { "CSMSG_DNR_SEARCH_RESULTS", "The following do-not-registers were found:" },
-    { "CSMSG_DNR_INFO", "$b%s$b is do-not-register (by $b%s$b): %s" },
-    { "CSMSG_DNR_INFO_SET", "$b%s$b is do-not-register (set %s by $b%s$b): %s" },
+    { "CSMSG_DNR_SEARCH_RESULTS", "$bDo-Not-Register Channels$b" },
+    { "CSMSG_DNR_INFO", "$b%s$b (set by $b%s$b): %s" },
+    { "CSMSG_DNR_INFO_SET", "$b%s$b (set %s ago by $b%s$b): %s" },
     { "CSMSG_MORE_DNRS", "%d more do-not-register entries skipped." },
     { "CSMSG_DNR_CHANNEL", "Only network staff may register $b%s$b." },
     { "CSMSG_DNR_CHANNEL_MOVE", "Only network staff may move $b%s$b." },
@@ -167,7 +171,7 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_NO_CHAN_USER", "%s lacks access to $b%s$b." },
     { "CSMSG_NO_ACCESS", "You lack sufficient access to use this command." },
     { "CSMSG_NOT_REGISTERED", "$b%s$b has not been registered with $b$C$b." },
-    { "CSMSG_MAXIMUM_BANS", "This channel has reached the ban count limit of $b%d$b." },
+    { "CSMSG_MAXIMUM_LAMERS", "This channel has reached the lamer count limit of $b%d$b." },
     { "CSMSG_MAXIMUM_USERS", "This channel has reached the user count limit of $b%d$b." },
     { "CSMSG_ILLEGAL_CHANNEL", "$b%s$b is an illegal channel, and cannot be registered." },
     { "CSMSG_GODMODE_UP", "You may not use $b%s$b to op yourself unless you are on the user list.  Use the $bop$b command instead." },
@@ -184,13 +188,20 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_DELETED_YOU", "Your $b%d$b access has been deleted from $b%s$b." },
 
 /* User management */
-    { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %d." },
+    { "CSMSG_ADDED_USER", "Added %s to the %s user list with access %s (%d)." },
     { "CSMSG_DELETED_USER", "Deleted %s (with access %d) from the %s user list." },
     { "CSMSG_BAD_RANGE", "Invalid access range; minimum (%d) must be greater than maximum (%d)." },
     { "CSMSG_DELETED_USERS", "Deleted accounts matching $b%s$b with access from $b%d$b to $b%d$b from the %s user list." },
     { "CSMSG_TRIMMED_USERS", "Trimmed $b%d users$b with access from %d to %d from the %s user list who were inactive for at least %s." },
-    { "CSMSG_INCORRECT_ACCESS", "%s has access $b%d$b, not %s." },
-    { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with access %d)." },
+    { "CSMSG_INCORRECT_ACCESS", "%s has access $b%s$b, not %s." },
+    { "CSMSG_USER_EXISTS", "%s is already on the $b%s$b user list (with %s access)." },
+    { "CSMSG_ADDUSER_PENDING", "I have sent him/her a message letting them know, and if they auth or register soon, i will finish adding them automatically." },
+    { "CSMSG_ADDUSER_PENDING_ALREADY", "He or she is already pending addition to %s once he/she auths with $b$N$b." },
+    { "CSMSG_ADDUSER_PENDING_HEADER", "Users to add to channels pending logins:" }, /* Remove after testing? */
+    { "CSMSG_ADDUSER_PENDING_LIST", "Channel %s user %s" },             /* Remove after testing? */
+    { "CSMSG_ADDUSER_PENDING_HEADER", "--------- End of pending list ----------" }, /* Remove after testing? */
+    /*{ "CSMSG_ADDUSER_PENDING_NOTINCHAN", "That user is not in %s, and is not auth'd." }, */
+    { "CSMSG_ADDUSER_PENDING_TARGET", "Channel Services bot here, %s would like to add you to my userlist in channel %s, but you are not auth'd to $b$N$b. Please auth now, and you will be added. If you do not have an accont, type /msg $N help register" },
     { "CSMSG_CANNOT_TRIM", "You must include a minimum inactivity duration of at least 60 seconds to trim." },
 
     { "CSMSG_NO_SELF_CLVL", "You cannot change your own access." },
@@ -201,21 +212,22 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_OWNERSHIP_GIVEN", "Ownership of $b%s$b has been transferred to account $b%s$b." },
 
 /* Ban management */
-    { "CSMSG_BAN_ADDED", "Permanently banned $b%s$b from %s." },
-    { "CSMSG_TIMED_BAN_ADDED", "Banned $b%s$b from %s for %s." },
+    { "CSMSG_LAMER_ADDED", "Added $b%s$b to %s LAMERs." },
+    { "CSMSG_TIMED_LAMER_ADDED", "LAMERed $b%s$b on %s for %s." },
     { "CSMSG_KICK_BAN_DONE", "Kickbanned $b%s$b from %s." },
     { "CSMSG_BAN_DONE", "Banned $b%s$b from %s." },
-    { "CSMSG_REASON_CHANGE", "Reason for ban $b%s$b changed." },
-    { "CSMSG_BAN_EXTENDED", "Extended ban for $b%s$b expires in %s." },
-    { "CSMSG_BAN_REMOVED", "Matching ban(s) for $b%s$b removed." },
-    { "CSMSG_TRIMMED_BANS", "Trimmed $b%d bans$b from the %s ban list that were inactive for at least %s." },
+    { "CSMSG_REASON_CHANGE", "Reason for LAMER $b%s$b changed." },
+    { "CSMSG_LAMER_EXTENDED", "Extended LAMER for $b%s$b, now expires in %s." },
+    { "CSMSG_BAN_REMOVED", "Matching ban(s) and LAMER(s) in $b%s$b were removed." },
+    { "CSMSG_TRIMMED_LAMERS", "Trimmed $b%d LAMERs$b from the %s LAMER list that were inactive for at least %s." },
     { "CSMSG_REDUNDANT_BAN", "$b%s$b is already banned in %s." },
+    { "CSMSG_REDUNDANT_LAMER", "$b%s$b is already LAMER'd in %s." },
     { "CSMSG_DURATION_TOO_LOW", "Timed bans must last for at least 15 seconds." },
     { "CSMSG_DURATION_TOO_HIGH", "Timed bans must last for less than 2 years." },
     { "CSMSG_LAME_MASK", "$b%s$b is a little too general. Try making it more specific." },
     { "CSMSG_MASK_PROTECTED", "Sorry, ban for $b%s$b conflicts with a protected user's hostmask." },
     { "CSMSG_NO_MATCHING_USERS", "No one in $b%s$b has a hostmask matching $b%s$b." },
-    { "CSMSG_BAN_NOT_FOUND", "Sorry, no ban found for $b%s$b." },
+    { "CSMSG_BAN_NOT_FOUND", "Sorry, no ban or LAMER found: $b%s$b." },
     { "CSMSG_BANLIST_FULL", "The $b%s$b channel ban list is $bfull$b." },
 
     { "CSMSG_INVALID_TRIM", "$b%s$b isn't a valid trim target." },
@@ -228,7 +240,7 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_TOPIC_SET", "Topic is now '%s'." },
     { "CSMSG_NO_TOPIC", "$b%s$b does not have a default topic." },
     { "CSMSG_TOPICMASK_CONFLICT1", "I do not know how to make that topic work with the current topic mask in $b%s$b, which is: %s" },
-    { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic at most %d characters and matches the topic mask pattern." },
+    { "CSMSG_TOPICMASK_CONFLICT2", "Please make sure your topic is at most %d characters and matches the topic mask pattern." },
     { "CSMSG_TOPIC_LOCKED", "The %s topic is locked." },
     { "CSMSG_MASK_BUT_NO_TOPIC", "Warning: $b%s$b does not have a default topic, but you just set the topic mask." },
     { "CSMSG_TOPIC_MISMATCH", "Warning: The default topic for $b%s$b does not match the topic mask; changing it anyway." },
@@ -242,9 +254,11 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_CONFIRM_DEFAULTS", "To reset %s's settings to the defaults, you must use 'set defaults %s'." },
     { "CSMSG_SETTINGS_DEFAULTED", "All settings for %s have been reset to default values." },
     { "CSMSG_BAD_SETLEVEL", "You cannot change any setting to above your level." },
+    /*
     { "CSMSG_BAD_GIVEVOICE", "You cannot change GiveVoice to above GiveHalfOps (%d)." },
     { "CSMSG_BAD_GIVEHOPS", "You cannot change GiveHalfOps to below GiveOps (%d)." },
     { "CSMSG_BAD_GIVEOPS", "You cannot change GiveOps to below GiveVoice (%d)." },
+    */
     { "CSMSG_BAD_SETTERS", "You cannot change Setters to above your level." },
     { "CSMSG_INVALID_MODE_LOCK", "$b%s$b is an invalid mode lock." },
     { "CSMSG_INVALID_NUMERIC",   "$b%d$b is not a valid choice.  Choose one:" },
@@ -257,24 +271,29 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_SET_DYNLIMIT",      "$bDynLimit    $b %s" },
     { "CSMSG_SET_OFFCHANNEL",    "$bOffChannel  $b %s" },
     { "CSMSG_SET_USERINFO",      "$bUserInfo    $b %d" },
+    /*
     { "CSMSG_SET_GIVE_VOICE",    "$bGiveVoice   $b %d" },
     { "CSMSG_SET_GIVE_HALFOPS",  "$bGiveHalfOps $b %d" },
+    */
     { "CSMSG_SET_TOPICSNARF",    "$bTopicSnarf  $b %d" },
     { "CSMSG_SET_INVITEME",      "$bInviteMe    $b %d" },
     { "CSMSG_SET_ENFOPS",        "$bEnfOps      $b %d" },
     { "CSMSG_SET_ENFHALFOPS",    "$bEnfHalfOps  $b %d" },
+    /*
     { "CSMSG_SET_GIVE_OPS",      "$bGiveOps     $b %d" },
+    */
     { "CSMSG_SET_ENFMODES",      "$bEnfModes    $b %d" },
     { "CSMSG_SET_ENFTOPIC",      "$bEnfTopic    $b %d" },
     { "CSMSG_SET_PUBCMD",        "$bPubCmd      $b %d" },
     { "CSMSG_SET_SETTERS",       "$bSetters     $b %d" },
     { "CSMSG_SET_CTCPUSERS",     "$bCTCPUsers   $b %d" },
+    { "CSMSG_SET_VOICE",         "$bvoice       $b %d - %s" },
     { "CSMSG_SET_PROTECT",       "$bProtect     $b %d - %s" },
     { "CSMSG_SET_TOYS",          "$bToys        $b %d - %s" },
     { "CSMSG_SET_CTCPREACTION",  "$bCTCPReaction$b %d - %s" },
     { "CSMSG_SET_TOPICREFRESH",  "$bTopicRefresh$b %d - %s" },
-    { "CSMSG_USET_NOAUTOOP",     "$bNoAutoOp    $b %s" },
-    { "CSMSG_USET_NOAUTOVOICE",  "$bNoAutoVoice $b %s" },
+    { "CSMSG_USET_AUTOOP",       "$bAutoOp      $b %s" },
+    { "CSMSG_USET_AUTOVOICE",    "$bAutoVoice   $b %s" },
     { "CSMSG_USET_AUTOINVITE",   "$bAutoInvite  $b %s" },
     { "CSMSG_USET_INFO",         "$bInfo        $b %s" },
 
@@ -288,6 +307,9 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_DEHALFOPPED_USERS", "DeHalfopped users in $b%s$b." },
     { "CSMSG_VOICED_USERS", "Voiced users in $b%s$b." },
     { "CSMSG_DEVOICED_USERS", "Devoiced users in $b%s$b." },
+    { "CSMSG_VOICE_NONE", "Noone will be auto-voiced" },
+    { "CSMSG_VOICE_PEON", "PEONs will be auto-voiced" },
+    { "CSMSG_VOICE_ALL", "Everyone will be auto-voiced" },
     { "CSMSG_PROTECT_ALL", "Non-users and users will be protected from those of equal or lower access." },
     { "CSMSG_PROTECT_EQUAL", "Users will be protected from those of equal or lower access." },
     { "CSMSG_PROTECT_LOWER", "Users will be protected from those of lower access." },
@@ -315,14 +337,15 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_BAD_INFOLINE", "You may not use the character \\%03o in your infoline." },
 
     { "CSMSG_KICK_DONE", "Kicked $b%s$b from %s." },
-    { "CSMSG_NO_BANS", "No channel bans found on $b%s$b." },
+    { "CSMSG_NO_BANS", "No bans found on $b%s$b." },
     { "CSMSG_BANS_REMOVED", "Removed all channel bans from $b%s$b." },
 
 /* Channel userlist */
-    { "CSMSG_ACCESS_ALL_HEADER", "%s users from level %d to %d:" },
-    { "CSMSG_ACCESS_SEARCH_HEADER", "%s users from level %d to %d matching %s:" },
+    { "CSMSG_ACCESS_ALL_HEADER", "$b%s Users From Level %s To %s$b" },
+    { "CSMSG_ACCESS_SEARCH_HEADER", "$b%s Users From Level %s To %s Matching %s$b" },
     { "CSMSG_INVALID_ACCESS", "$b%s$b is an invalid access level." },
-    { "CSMSG_CHANGED_ACCESS", "%s now has access $b%d$b in %s." },
+    { "CSMSG_CHANGED_ACCESS", "%s now has access $b%s$b (%u) in %s." },
+    { "CSMSG_LAMERS_HEADER", "$bLamers in %s$b" },
 
 /* Channel note list */
     { "CSMSG_NOTELIST_HEADER", "Notes for $b%s$b:" },
@@ -356,9 +379,9 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_SQUAT_ACCESS", "$b%s$b does not have access to any channels." },
     { "CSMSG_INFOLINE_LIST", "Showing all channel entries for account $b%s$b:" },
     { "CSMSG_USER_NO_ACCESS", "%s lacks access to %s." },
-    { "CSMSG_USER_HAS_ACCESS", "%s has access $b%d$b in %s." },
+    { "CSMSG_USER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s." },
     { "CSMSG_HELPER_NO_ACCESS", "%s lacks access to %s but has $bsecurity override$b enabled." },
-    { "CSMSG_HELPER_HAS_ACCESS", "%s has access $b%d$b in %s and has $bsecurity override$b enabled." },
+    { "CSMSG_HELPER_HAS_ACCESS", "%s has $b%s$b access (%d) in %s and has $bsecurity override$b enabled." },
     { "CSMSG_LAZY_SMURF_TARGET", "%s is %s ($bIRCOp$b; not logged in)." },
     { "CSMSG_SMURF_TARGET", "%s is %s ($b%s$b)." },
     { "CSMSG_LAME_SMURF_TARGET", "%s is an IRC operator." },
@@ -374,13 +397,14 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_END_NAMES", "End of names in $b%s$b" },
 
 /* Channel information */
-    { "CSMSG_CHANNEL_INFO", "$b%s$b Information:" },
+    { "CSMSG_CHANNEL_INFO", "$bInformation About %s$b" },
+    { "CSMSG_BAR",  "----------------------------------------"},
     { "CSMSG_CHANNEL_TOPIC", "$bDefault Topic:       $b%s" },
     { "CSMSG_CHANNEL_MODES", "$bMode Lock:           $b%s" },
     { "CSMSG_CHANNEL_NOTE", "$b%s:%*s$b%s" },
     { "CSMSG_CHANNEL_MAX", "$bRecord Visitors:     $b%i" },
-    { "CSMSG_CHANNEL_OWNER", "$bOwner:               $b%s" },
-    { "CSMSG_CHANNEL_BANS", "$bBan Count:           $b%i" },
+    { "CSMSG_CHANNEL_OWNER",  "$bOwner:               $b%s" },
+    { "CSMSG_CHANNEL_LAMERS", "$bLamer Count:         $b%i" },
     { "CSMSG_CHANNEL_USERS", "$bTotal User Count:    $b%i" },
     { "CSMSG_CHANNEL_REGISTRAR", "$bRegistrar:           $b%s" },
     { "CSMSG_CHANNEL_SUSPENDED", "$b%s$b is suspended:" },
@@ -395,19 +419,21 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_CHANNEL_SUSPENDED_7", " %s ago by %s; revoked %s ago: %s" },
     { "CSMSG_CHANNEL_REGISTERED", "$bRegistered:          $b%s ago." },
     { "CSMSG_CHANNEL_VISITED", "$bVisited:             $b%s ago." },
+    { "CSMSG_CHANNEL_END",  "---------------End of Info--------------"},
 
-    { "CSMSG_PEEK_INFO", "$b%s$b Status:" },
+    { "CSMSG_PEEK_INFO", "$bStatus of %s$b" },
     { "CSMSG_PEEK_TOPIC", "$bTopic:          $b%s" },
     { "CSMSG_PEEK_MODES", "$bModes:          $b%s" },
     { "CSMSG_PEEK_USERS", "$bTotal users:    $b%d" },
     { "CSMSG_PEEK_OPS", "$bOps:$b" },
     { "CSMSG_PEEK_NO_OPS", "$bOps:            $bNone present" },
+    { "CSMSG_PEEK_END", "-------------End of Status--------------" },
 
 /* Network information */
     { "CSMSG_NETWORK_INFO", "Network Information:" },
     { "CSMSG_NETWORK_SERVERS", "$bServers:             $b%i" },
     { "CSMSG_NETWORK_USERS",   "$bTotal Users:         $b%i" },
-    { "CSMSG_NETWORK_BANS",    "$bTotal Ban Count:     $b%i" },
+    { "CSMSG_NETWORK_LAMERS",  "$bTotal Lamer Count:   $b%i" },
     { "CSMSG_NETWORK_CHANUSERS", "$bTotal User Count:    $b%i" },
     { "CSMSG_NETWORK_OPERS",   "$bIRC Operators:       $b%i" },
     { "CSMSG_NETWORK_CHANNELS","$bRegistered Channels: $b%i" },
@@ -423,11 +449,12 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_ACTION_INVALID", "$b%s$b is not a recognized search action." },
     { "CSMSG_UNVISITED_HEADER", "Showing a maximum of %d channels unvisited for $b%s$b:" },
     { "CSMSG_UNVISITED_DATA", "%s: $b%s$b" },
-    { "CSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" },
+    { "CSMSG_CHANNEL_SEARCH_RESULTS", "$bChannels Found Matching Search$b" },
 
 /* Channel configuration */
     { "CSMSG_INVALID_OPTION", "$b%s$b is not a valid %s option." },
-    { "CSMSG_CHANNEL_OPTIONS", "Channel Options:" },
+    { "CSMSG_CHANNEL_OPTIONS", "$bChannel Options for %s$b" },
+    { "CSMSG_CHANNEL_OPTIONS_END", "-------------End of Options-------------" },
     { "CSMSG_GREETING_TOO_LONG", "Your greeting ($b%d$b characters) must be shorter than $b%d$b characters." },
 
 /* User settings */
@@ -447,17 +474,17 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_HUGGLES_YOU", "\001ACTION huggles you\001" },
 
 /* Other things */
-    { "CSMSG_EVENT_SEARCH_RESULTS", "The following channel events were found:" },
+    { "CSMSG_EVENT_SEARCH_RESULTS", "$bChannel Events for %s$b" },
     { NULL, NULL }
 };
 
 /* eject_user and unban_user flags */
 #define ACTION_KICK		0x0001
 #define ACTION_BAN		0x0002
-#define ACTION_ADD_BAN		0x0004
-#define ACTION_ADD_TIMED_BAN   	0x0008
+#define ACTION_ADD_LAMER	0x0004
+#define ACTION_ADD_TIMED_LAMER 	0x0008
 #define ACTION_UNBAN		0x0010
-#define ACTION_DEL_BAN		0x0020
+#define ACTION_DEL_LAMER	0x0020
 
 /* The 40 allows for [+-ntlksimprD] and lots of fudge factor. */
 #define MODELEN			40 + KEYLEN
@@ -467,7 +494,7 @@ static const struct message_entry msgtab[] = {
 #define CSFUNC_ARGS		user, channel, argc, argv, cmd
 
 #define CHANSERV_FUNC(NAME) MODCMD_FUNC(NAME)
-#define CHANSERV_SYNTAX() 	svccmd_send_help(user, chanserv, cmd)
+#define CHANSERV_SYNTAX() 	svccmd_send_help_brief(user, chanserv, cmd)
 #define REQUIRE_PARAMS(N)	if(argc < (N)) {            \
 	reply("MSG_MISSING_PARAMS", argv[0]); \
 	CHANSERV_SYNTAX(); \
@@ -483,6 +510,8 @@ dict_t note_types;
 int off_channel;
 static dict_t plain_dnrs, mask_dnrs, handle_dnrs;
 static struct log_type *CS_LOG;
+struct adduserPending* adduser_pendings = NULL;
+unsigned int adduser_pendings_count = 0;
 
 static struct
 {
@@ -506,11 +535,9 @@ static struct
 
     unsigned int        max_owned;
     unsigned int 	max_chan_users;
-    unsigned int 	max_chan_bans;
+    unsigned int 	max_chan_bans; /* lamers */
     unsigned int        max_userinfo_length;
 
-    unsigned int	use_registered_mode;
-
     struct string_list  *set_shows;
     struct string_list  *eightball;
     struct string_list  *old_ban_names;
@@ -577,7 +604,7 @@ static const struct {
     char *title;
     unsigned short level;
     char ch;
-} accessLevels[] = {
+} accessLevels[] = { /* MUST be orderd less to most! */
     { "peon", "Peon", UL_PEON, '+' },
     { "halfop", "HalfOp", UL_HALFOP, '%' },
     { "op", "Op", UL_OP, '@' },
@@ -613,7 +640,11 @@ static const struct {
 struct charOptionValues {
     char value;
     char *format_name;
-} protectValues[] = {
+} voiceValues[] = {
+    { 'n', "CSMSG_VOICE_NONE" },
+    { 'p', "CSMSG_VOICE_PEON" },
+    { 'a', "CSMSG_VOICE_ALL" }
+}, protectValues[] = {
     { 'a', "CSMSG_PROTECT_ALL" },
     { 'e', "CSMSG_PROTECT_EQUAL" },
     { 'l', "CSMSG_PROTECT_LOWER" },
@@ -643,8 +674,9 @@ static const struct {
     unsigned char count;
     struct charOptionValues *values;
 } charOptions[] = {
-    { "CSMSG_SET_PROTECT", "protect", 'l', 0, ArrayLength(protectValues), protectValues },
-    { "CSMSG_SET_TOYS", "toys", 'p', 6, ArrayLength(toysValues), toysValues },
+    { "CSMSG_SET_VOICE",        "voice",        'p', 99, ArrayLength(voiceValues), voiceValues },
+    { "CSMSG_SET_PROTECT",      "protect",      'l', 0, ArrayLength(protectValues), protectValues },
+    { "CSMSG_SET_TOYS",         "toys",         'p', 6, ArrayLength(toysValues), toysValues },
     { "CSMSG_SET_TOPICREFRESH", "topicrefresh", 'n', 8, ArrayLength(topicRefreshValues), topicRefreshValues },
     { "CSMSG_SET_CTCPREACTION", "ctcpreaction", 't', 10, ArrayLength(ctcpReactionValues), ctcpReactionValues }
 };
@@ -653,6 +685,9 @@ struct userData *helperList;
 struct chanData *channelList;
 static struct module *chanserv_module;
 static unsigned int userCount;
+unsigned int chanserv_read_version = 0; /* db version control */
+
+#define CHANSERV_DB_VERSION 2
 
 #define GetChannelUser(channel, handle) _GetChannelUser(channel, handle, 1, 0)
 #define GetChannelAccess(channel, handle) _GetChannelUser(channel, handle, 0, 0)
@@ -672,6 +707,22 @@ user_level_from_name(const char *name, unsigned short clamp_level)
     return level;
 }
 
+char *
+user_level_name_from_level(int level)
+{
+    unsigned int ii;
+    char* highest;
+
+    highest = "None";
+    if(level >= 1)
+        highest = "Peon";
+    for(ii = 0; (ii < ArrayLength(accessLevels)); ii++)
+        if(level >= accessLevels[ii].level)
+            highest = accessLevels[ii].title;
+    return(highest);
+}
+
+
 int
 parse_level_range(unsigned short *minl, unsigned short *maxl, const char *arg)
 {
@@ -826,11 +877,11 @@ chanserv_ctcp_check(struct userNode *user, struct chanNode *channel, char *text,
         eflags |= ACTION_BAN;
         break;
     case 't':
-        eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
+        eflags |= ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER;
         argv[argc++] = (char*)chanserv_conf.ctcp_short_ban_duration;
         break;
     case 'T':
-        eflags |= ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN;
+        eflags |= ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER;
         argv[argc++] = (char*)chanserv_conf.ctcp_long_ban_duration;
         break;
     }
@@ -1144,6 +1195,7 @@ add_channel_user(struct chanData *channel, struct handle_info *handle, unsigned
         ud->u_next->u_prev = ud;
     ud->handle->channels = ud;
 
+    ud->flags = USER_FLAGS_DEFAULT;
     return ud;
 }
 
@@ -1177,6 +1229,112 @@ del_channel_user(struct userData *user, int do_gc)
         unregister_channel(channel, "lost all users.");
 }
 
+static struct adduserPending* 
+add_adduser_pending(struct chanNode *channel, struct userNode *user, int level)
+{
+    struct adduserPending *ap;
+    ap = calloc(1,sizeof(struct adduserPending));
+    ap->channel = channel;
+    ap->user = user;
+    ap->level = level;
+    ap->created = time(NULL);
+
+    /* ap->prev defaults to NULL already..  */
+    ap->next = adduser_pendings;
+    if(adduser_pendings)
+        adduser_pendings->prev = ap;
+    adduser_pendings = ap;
+    adduser_pendings_count++;
+    return(ap);
+}
+
+static void 
+del_adduser_pending(struct adduserPending *ap)
+{
+    if(ap->prev)
+        ap->prev->next = ap->next;
+    else
+        adduser_pendings = ap->next;
+
+    if(ap->next)
+        ap->next->prev = ap->prev;
+    free(ap);
+}
+
+static void expire_adduser_pending();
+
+/* find_adduser_pending(channel, user) will find an arbitrary record
+ * from user, channel, or user and channel.
+ * if user or channel are NULL, they will match any records.
+ */
+static struct adduserPending* 
+find_adduser_pending(struct chanNode *channel, struct userNode *user)
+{
+    struct adduserPending *ap;
+
+    expire_adduser_pending(); /* why not here.. */
+
+    if(!channel && !user) /* 2 nulls matches all */
+        return(adduser_pendings);
+    for(ap = adduser_pendings;ap;ap = ap->next)
+    {
+        if((channel == ap->channel && (user == NULL || user == ap->user)) || (user==ap->user && channel==NULL))
+            return ap;
+    }
+    return NULL;
+}
+
+
+/* Remove all pendings for a user or channel 
+ *
+ * called in nickserv.c DelUser() and proto-* unregister_channel()
+ */
+void
+wipe_adduser_pending(struct chanNode *channel, struct userNode *user)
+{
+    struct adduserPending *ap;
+
+    /* So this is a bit wastefull, i hate dealing with linked lists.
+     * if its a problem we'll rewrite it right */
+    while((ap = find_adduser_pending(channel, user))) {
+        del_adduser_pending(ap);
+    }
+}
+
+/* Called from nickserv.c cmd_auth after someone auths */
+void
+process_adduser_pending(struct userNode *user)
+{
+    struct adduserPending *ap;
+    if(!user->handle_info)
+        return; /* not associated with an account */
+    while((ap = find_adduser_pending(NULL, user)))
+    {
+        struct userData *actee;
+        actee = add_channel_user(ap->channel->channel_info, ap->user->handle_info, ap->level, 0, NULL);
+        scan_user_presence(actee, NULL);
+        del_adduser_pending(ap);
+    }
+}
+
+static void
+expire_adduser_pending()
+{
+    struct adduserPending *ap, *ap_next;
+    ap = adduser_pendings;
+    while(ap)
+    {
+        if((ap->created + ADDUSER_PENDING_EXPIRE) < time(NULL))
+        {  /* expire it */
+            ap_next = ap->next; /* save next */
+            del_adduser_pending(ap); /* free and relink */
+            ap = ap_next; /* advance */
+        }
+        else
+            ap = ap->next;
+    }
+}
+
 static void expire_ban(void *data);
 
 static struct banData*
@@ -1214,13 +1372,13 @@ add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t
     safestrncpy(bd->mask, mask, sizeof(bd->mask));
     if(owner)
         safestrncpy(bd->owner, owner, sizeof(bd->owner));
-    bd->reason = reason ? strdup(reason) : NULL;
+    bd->reason = strdup(reason);
 
     if(expires)
 	timeq_add(expires, expire_ban, bd);
 
     bd->prev = NULL;
-    bd->next = channel->bans;
+    bd->next = channel->bans; /* lamers */
     if(channel->bans)
 	channel->bans->prev = bd;
     channel->bans = bd;
@@ -1254,7 +1412,7 @@ del_channel_ban(struct banData *ban)
 }
 
 static void
-expire_ban(void *data)
+expire_ban(void *data) /* lamer.. */
 {
     struct banData *bd = data;
     if(!IsSuspended(bd->channel))
@@ -1292,8 +1450,9 @@ unregister_channel(struct chanData *channel, const char *reason)
        up:
        - Channel information.
        - Channel users.
-       - Channel bans.
+       - Channel bans. (lamers)
        - Channel suspension data.
+       - adduser_pending data.
        - Timeq entries. (Except timed bans, which are handled elsewhere.)
     */
 
@@ -1302,13 +1461,15 @@ unregister_channel(struct chanData *channel, const char *reason)
 
     timeq_del(0, NULL, channel, TIMEQ_IGNORE_FUNC | TIMEQ_IGNORE_WHEN);
 
-    if(chanserv_conf.use_registered_mode)
+    if(off_channel > 0)
     {
       mod_chanmode_init(&change);
       change.modes_clear |= MODE_REGISTERED;
       mod_chanmode_announce(chanserv, channel->channel, &change);
     }
 
+    wipe_adduser_pending(channel->channel, NULL);
+
     while(channel->users)
 	del_channel_user(channel->users, 0);
 
@@ -1402,7 +1563,7 @@ protect_user(const struct userNode *victim, const struct userNode *aggressor, st
 
     /* Don't protect if no one is to be protected, someone is attacking
        himself, or if the aggressor is an IRC Operator. */
-    if(protect == 'n' || victim == aggressor || IsOper(aggressor))
+    if(protect == 'n' || victim == aggressor /* Opers dont get special treatment :/  || IsOper(aggressor) */)
 	return 0;
 
     /* Don't protect if the victim isn't authenticated (because they
@@ -1445,7 +1606,7 @@ validate_op(struct userNode *user, struct chanNode *channel, struct userNode *vi
     struct userData *cs_victim;
 
     if((!(cs_victim = GetChannelUser(cData, victim->handle_info))
-        || (cs_victim->access < cData->lvlOpts[lvlGiveOps]))
+        || (cs_victim->access < UL_OP /* cData->lvlOpts[lvlGiveOps]*/))
        && !check_user_level(channel, user, lvlEnfOps, 0, 0))
     {
 	send_message(user, chanserv, "CSMSG_OPBY_LOCKED");
@@ -1462,7 +1623,7 @@ validate_halfop(struct userNode *user, struct chanNode *channel, struct userNode
     struct userData *cs_victim;
 
     if((!(cs_victim = GetChannelUser(cData, victim->handle_info))
-        || (cs_victim->access < cData->lvlOpts[lvlGiveHalfOps]))
+        || (cs_victim->access < UL_HALFOP /* cData->lvlOpts[lvlGiveHalfOps] */))
        && !check_user_level(channel, user, lvlEnfHalfOps, 0, 0))
     {
         send_message(user, chanserv, "CSMSG_HOPBY_LOCKED");
@@ -1527,14 +1688,14 @@ chanserv_add_dnr(const char *chan_name, const char *setter, const char *reason)
 }
 
 static struct dnrList
-chanserv_find_dnrs(const char *chan_name, struct handle_info *handle)
+chanserv_find_dnrs(const char *chan_name, const char *handle)
 {
     struct dnrList list;
     dict_iterator_t it;
     struct do_not_register *dnr;
 
     dnrList_init(&list);
-    if(handle && (dnr = dict_find(handle_dnrs, handle->handle, NULL)))
+    if(handle && (dnr = dict_find(handle_dnrs, handle, NULL)))
         dnrList_append(&list, dnr);
     if(chan_name && (dnr = dict_find(plain_dnrs, chan_name, NULL)))
         dnrList_append(&list, dnr);
@@ -1546,7 +1707,7 @@ chanserv_find_dnrs(const char *chan_name, struct handle_info *handle)
 }
 
 static unsigned int
-chanserv_show_dnrs(struct userNode *user, struct svccmd *cmd, const char *chan_name, struct handle_info *handle)
+chanserv_show_dnrs(struct userNode *user, struct svccmd *cmd, const char *chan_name, const char *handle)
 {
     struct dnrList list;
     struct do_not_register *dnr;
@@ -1602,6 +1763,7 @@ static CHANSERV_FUNC(cmd_noregister)
         dict_iterator_t it;
 
         reply("CSMSG_DNR_SEARCH_RESULTS");
+        reply("CSMSG_BAR");
         matches = 0;
         for(it = dict_first(handle_dnrs); it; it = iter_next(it))
         {
@@ -1660,8 +1822,9 @@ static CHANSERV_FUNC(cmd_noregister)
     }
 
     reply("CSMSG_DNR_SEARCH_RESULTS");
+    reply("CSMSG_BAR");
     if(*target == '*')
-        matches = chanserv_show_dnrs(user, cmd, NULL, get_handle_info(target + 1));
+        matches = chanserv_show_dnrs(user, cmd, NULL, target + 1);
     else
         matches = chanserv_show_dnrs(user, cmd, target, NULL);
     if(!matches)
@@ -1710,7 +1873,6 @@ chanserv_get_owned_count(struct handle_info *hi)
 
 static CHANSERV_FUNC(cmd_register)
 {
-    struct mod_chanmode *change;
     struct handle_info *handle;
     struct chanData *cData;
     struct modeNode *mn;
@@ -1733,7 +1895,8 @@ static CHANSERV_FUNC(cmd_register)
             return 0;
         }
 
-        if(!IsHelping(user) && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP)))
+        if(!IsHelping(user)
+           && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP)))
         {
             reply("CSMSG_MUST_BE_OPPED", channel->name);
             return 0;
@@ -1744,7 +1907,13 @@ static CHANSERV_FUNC(cmd_register)
     }
     else
     {
-        if((argc < 2) || !IsChannelName(argv[1]))
+        if(argc < 2)
+        {
+          reply("MSG_MISSING_PARAMS", cmd->name);
+          svccmd_send_help_brief(user, chanserv, cmd);
+          return 0;
+        }
+        if(!IsChannelName(argv[1]))
         {
             reply("MSG_NOT_CHANNEL_NAME");
             return 0;
@@ -1783,7 +1952,7 @@ static CHANSERV_FUNC(cmd_register)
         if(!IsHelping(user))
             reply("CSMSG_DNR_CHANNEL", chan_name);
         else
-            chanserv_show_dnrs(user, cmd, chan_name, handle);
+            chanserv_show_dnrs(user, cmd, chan_name, handle->handle);
         return 0;
     }
 
@@ -1799,14 +1968,21 @@ static CHANSERV_FUNC(cmd_register)
     cData = register_channel(channel, user->handle_info->handle);
     scan_user_presence(add_channel_user(cData, handle, UL_OWNER, 0, NULL), NULL);
     cData->modes = chanserv_conf.default_modes;
-    if(chanserv_conf.use_registered_mode)
+    if(off_channel > 0)
       cData->modes.modes_set |= MODE_REGISTERED;
-    change = mod_chanmode_dup(&cData->modes, 1);
-    change->args[change->argc].mode = MODE_CHANOP;
-    change->args[change->argc].u.member = AddChannelUser(chanserv, channel);
-    change->argc++;
-    mod_chanmode_announce(chanserv, channel, change);
-    mod_chanmode_free(change);
+    if (IsOffChannel(cData))
+    {
+        mod_chanmode_announce(chanserv, channel, &cData->modes);
+    }
+    else
+    {
+        struct mod_chanmode *change = mod_chanmode_dup(&cData->modes, 1);
+        change->args[change->argc].mode = MODE_CHANOP;
+        change->args[change->argc].u.member = AddChannelUser(chanserv, channel);
+        change->argc++;
+        mod_chanmode_announce(chanserv, channel, change);
+        mod_chanmode_free(change);
+    }
 
     /* Initialize the channel's max user record. */
     cData->max = channel->members.used;
@@ -1891,6 +2067,7 @@ static CHANSERV_FUNC(cmd_unregister)
 
 static CHANSERV_FUNC(cmd_move)
 {
+    struct mod_chanmode change;
     struct chanNode *target;
     struct modeNode *mn;
     struct userData *uData;
@@ -1926,12 +2103,13 @@ static CHANSERV_FUNC(cmd_move)
                 if(!IsHelping(user))
                     reply("CSMSG_DNR_CHANNEL_MOVE", argv[1]);
                 else
-                    chanserv_show_dnrs(user, cmd, argv[1], uData->handle);
+                    chanserv_show_dnrs(user, cmd, argv[1], uData->handle->handle);
                 return 0;
             }
         }
     }
 
+    mod_chanmode_init(&change);
     if(!(target = GetChannel(argv[1])))
     {
         target = AddChannel(argv[1], now, NULL, NULL, NULL);
@@ -1951,14 +2129,23 @@ static CHANSERV_FUNC(cmd_move)
     }
     else if(!IsSuspended(channel->channel_info))
     {
-        struct mod_chanmode change;
-        mod_chanmode_init(&change);
         change.argc = 1;
         change.args[0].mode = MODE_CHANOP;
         change.args[0].u.member = AddChannelUser(chanserv, target);
         mod_chanmode_announce(chanserv, target, &change);
     }
 
+    if(off_channel > 0)
+    {
+        /* Clear MODE_REGISTERED from old channel, add it to new. */
+        change.argc = 0;
+        change.modes_clear = MODE_REGISTERED;
+        mod_chanmode_announce(chanserv, channel, &change);
+        change.modes_clear = 0;
+        change.modes_set = MODE_REGISTERED;
+        mod_chanmode_announce(chanserv, target, &change);
+    }
+
     /* Move the channel_info to the target channel; it
        shouldn't be necessary to clear timeq callbacks
        for the old channel. */
@@ -2253,17 +2440,40 @@ static CHANSERV_FUNC(cmd_adduser)
     }
 
     if(!(handle = modcmd_get_handle_info(user, argv[1])))
+    {
+        // 'kevin must first authenticate with AuthServ.' is sent to user
+        struct userNode *unode;
+        unode = GetUserH(argv[1]); /* find user struct by nick */
+        if(unode)
+        {
+            if(find_adduser_pending(channel, unode)) {
+                reply("CSMSG_ADDUSER_PENDING_ALREADY", channel->name);
+            }
+            else {
+                if(IsInChannel(channel, unode)) {
+                   reply("CSMSG_ADDUSER_PENDING");
+                   add_adduser_pending(channel, unode, access);
+                   send_message_type(1,unode, chanserv, "CSMSG_ADDUSER_PENDING_TARGET", user->nick, channel->name);
+                }
+                /* this results in user must auth AND not in chan errors. too confusing..
+                else {
+                    reply("CSMSG_ADDUSER_PENDING_NOTINCHAN", channel->name);
+                }
+                */
+            }
+        }
         return 0;
+    }
 
     if((actee = GetTrueChannelAccess(channel->channel_info, handle)))
     {
-	reply("CSMSG_USER_EXISTS", handle->handle, channel->name, actee->access);
+	reply("CSMSG_USER_EXISTS", handle->handle, channel->name, user_level_name_from_level(actee->access));
 	return 0;
     }
 
     actee = add_channel_user(channel->channel_info, handle, access, 0, NULL);
     scan_user_presence(actee, NULL);
-    reply("CSMSG_ADDED_USER", handle->handle, channel->name, access);
+    reply("CSMSG_ADDED_USER", handle->handle, channel->name, user_level_name_from_level(access), access);
     return 1;
 }
 
@@ -2315,7 +2525,7 @@ static CHANSERV_FUNC(cmd_clvl)
     }
 
     victim->access = new_access;
-    reply("CSMSG_CHANGED_ACCESS", handle->handle, new_access, channel->name);
+    reply("CSMSG_CHANGED_ACCESS", handle->handle, user_level_name_from_level(new_access), new_access, channel->name);
     return 1;
 }
 
@@ -2350,7 +2560,7 @@ static CHANSERV_FUNC(cmd_deluser)
         }
 	if(access != victim->access)
 	{
-	    reply("CSMSG_INCORRECT_ACCESS", handle->handle, victim->access, argv[1]);
+	    reply("CSMSG_INCORRECT_ACCESS", handle->handle, user_level_name_from_level(victim->access), argv[1]);
 	    return 0;
 	}
     }
@@ -2436,6 +2646,7 @@ static CHANSERV_FUNC(cmd_mdelhalfop)
 }
 
 
+/* trim_lamers.. */
 static int
 cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long duration)
 {
@@ -2458,7 +2669,7 @@ cmd_trim_bans(struct userNode *user, struct chanNode *channel, unsigned long dur
     }
 
     intervalString(interval, duration, user->handle_info);
-    send_message(user, chanserv, "CSMSG_TRIMMED_BANS", count, channel->name, interval);
+    send_message(user, chanserv, "CSMSG_TRIMMED_LAMERS", count, channel->name, interval);
     return 1;
 }
 
@@ -2523,9 +2734,9 @@ static CHANSERV_FUNC(cmd_trim)
 	return 0;
     }
 
-    if(!irccasecmp(argv[1], "bans"))
+    if(!irccasecmp(argv[1], "lamers"))
     {
-	cmd_trim_bans(user, channel, duration);
+	cmd_trim_bans(user, channel, duration); /* trim_lamers.. */
 	return 1;
     }
     else if(!irccasecmp(argv[1], "users"))
@@ -2575,17 +2786,17 @@ static CHANSERV_FUNC(cmd_up)
             reply("CSMSG_GODMODE_UP", argv[0]);
         return 0;
     }
-    else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveOps])
+    else if(uData->access >= UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
     {
         change.args[0].mode = MODE_CHANOP;
         errmsg = "CSMSG_ALREADY_OPPED";
     }
-    else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveHalfOps])
+    else if(uData->access >= UL_HALFOP /*channel->channel_info->lvlOpts[lvlGiveHalfOps]*/)
     {
         change.args[0].mode = MODE_HALFOP;
         errmsg = "CSMSG_ALREADY_HALFOPPED";
     }
-    else if(uData->access >= channel->channel_info->lvlOpts[lvlGiveVoice])
+    else if(uData->access >= UL_PEON && (channel->channel_info->chOpts[chVoice] == 'p' || channel->channel_info->chOpts[chVoice] == 'a'))
     {
         change.args[0].mode = MODE_VOICE;
         errmsg = "CSMSG_ALREADY_VOICED";
@@ -2762,7 +2973,7 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
     char *reason = "Bye.", *ban, *name;
     char interval[INTERVALLEN];
 
-    offset = (action & ACTION_ADD_TIMED_BAN) ? 3 : 2;
+    offset = (action & ACTION_ADD_TIMED_LAMER) ? 3 : 2;
     REQUIRE_PARAMS(offset);
     if(argc > offset)
     {
@@ -2848,18 +3059,18 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
        that 'ban' is a valid ban mask before sanitizing it. */
     sanitize_ircmask(ban);
 
-    if(action & ACTION_ADD_BAN)
+    if(action & ACTION_ADD_LAMER)
     {
 	struct banData *bData, *next;
 
-	if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans)
+	if(channel->channel_info->banCount >= chanserv_conf.max_chan_bans) /* ..lamers.. */
 	{
-	    reply("CSMSG_MAXIMUM_BANS", chanserv_conf.max_chan_bans);
+	    reply("CSMSG_MAXIMUM_LAMERS", chanserv_conf.max_chan_bans); /* ..lamers.. */
 	    free(ban);
 	    return 0;
 	}
 
-	if(action & ACTION_ADD_TIMED_BAN)
+	if(action & ACTION_ADD_TIMED_LAMER)
 	{
 	    duration = ParseInterval(argv[2]);
 
@@ -2877,6 +3088,7 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
 	    }
 	}
 
+        /* lamers... */
 	for(bData = channel->channel_info->bans; bData; bData = next)
 	{
 	    if(match_ircglobs(bData->mask, ban))
@@ -2928,15 +3140,15 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
                             /* automated kickban */
                         }
 			else if(duration)
-			    reply("CSMSG_BAN_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
+			    reply("CSMSG_LAMER_EXTENDED", ban, intervalString(interval, duration, user->handle_info));
 			else
-			    reply("CSMSG_BAN_ADDED", name, channel->name);
+			    reply("CSMSG_LAMER_ADDED", name, channel->name);
 
 			goto post_add_ban;
 		    }
 		}
                 if(cmd)
-                    reply("CSMSG_REDUNDANT_BAN", name, channel->name);
+                    reply("CSMSG_REDUNDANT_LAMER", name, channel->name);
 
 		free(ban);
 		return 0;
@@ -3033,12 +3245,12 @@ eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
     {
         /* No response, since it was automated. */
     }
-    else if(action & ACTION_ADD_BAN)
+    else if(action & ACTION_ADD_LAMER)
     {
 	if(duration)
-	    reply("CSMSG_TIMED_BAN_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
+	    reply("CSMSG_TIMED_LAMER_ADDED", name, channel->name, intervalString(interval, duration, user->handle_info));
 	else
-	    reply("CSMSG_BAN_ADDED", name, channel->name);
+	    reply("CSMSG_LAMER_ADDED", name, channel->name);
     }
     else if((action & (ACTION_BAN | ACTION_KICK)) == (ACTION_BAN | ACTION_KICK))
 	reply("CSMSG_KICK_BAN_DONE", name, channel->name);
@@ -3066,14 +3278,14 @@ static CHANSERV_FUNC(cmd_ban)
     return eject_user(CSFUNC_ARGS, ACTION_BAN);
 }
 
-static CHANSERV_FUNC(cmd_addban)
+static CHANSERV_FUNC(cmd_addlamer)
 {
-    return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_BAN);
+    return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_LAMER);
 }
 
-static CHANSERV_FUNC(cmd_addtimedban)
+static CHANSERV_FUNC(cmd_addtimedlamer)
 {
-    return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_BAN | ACTION_ADD_TIMED_BAN);
+    return eject_user(CSFUNC_ARGS, ACTION_KICK | ACTION_BAN | ACTION_ADD_LAMER | ACTION_ADD_TIMED_LAMER);
 }
 
 static struct mod_chanmode *
@@ -3110,8 +3322,9 @@ find_matching_bans(struct banList *bans, struct userNode *actee, const char *mas
         if(!match[ii])
             continue;
         change->args[count].mode = MODE_REMOVE | MODE_BAN;
-        change->args[count++].u.hostmask = bans->list[ii]->ban;
+        change->args[count++].u.hostmask = strdup(bans->list[ii]->ban);
     }
+    assert(count == change->argc);
     return change;
 }
 
@@ -3144,17 +3357,21 @@ unban_user(struct userNode *user, struct chanNode *channel, unsigned int argc, c
         change = find_matching_bans(&channel->banlist, actee, mask);
         if(change)
         {
+            unsigned int ii;
+
             modcmd_chanmode_announce(change);
+            for(ii = 0; ii < change->argc; ++ii)
+                free((char*)change->args[ii].u.hostmask);
             mod_chanmode_free(change);
             acted = 1;
         }
     }
 
-    if(action & ACTION_DEL_BAN)
+    if(action & ACTION_DEL_LAMER)
     {
 	struct banData *ban, *next;
 
-	ban = channel->channel_info->bans;
+	ban = channel->channel_info->bans; /* lamers */
 	while(ban)
 	{
 	    if(actee)
@@ -3186,11 +3403,11 @@ static CHANSERV_FUNC(cmd_unban)
     return unban_user(CSFUNC_ARGS, ACTION_UNBAN);
 }
 
-static CHANSERV_FUNC(cmd_delban)
+static CHANSERV_FUNC(cmd_dellamer)
 {
     /* it doesn't necessarily have to remove the channel ban - may want
        to make that an option. */
-    return unban_user(CSFUNC_ARGS, ACTION_UNBAN | ACTION_DEL_BAN);
+    return unban_user(CSFUNC_ARGS, ACTION_UNBAN | ACTION_DEL_LAMER);
 }
 
 static CHANSERV_FUNC(cmd_unbanme)
@@ -3200,7 +3417,7 @@ static CHANSERV_FUNC(cmd_unbanme)
 
     /* remove permanent bans if the user has the proper access. */
     if(uData->access >= UL_MANAGER)
-	flags |= ACTION_DEL_BAN;
+	flags |= ACTION_DEL_LAMER;
 
     argv[1] = user->nick;
     return unban_user(user, channel, 2, argv, cmd, flags);
@@ -3221,9 +3438,11 @@ static CHANSERV_FUNC(cmd_unbanall)
     for(ii=0; ii<channel->banlist.used; ii++)
     {
         change->args[ii].mode = MODE_REMOVE | MODE_BAN;
-        change->args[ii].u.hostmask = channel->banlist.list[ii]->ban;
+        change->args[ii].u.hostmask = strdup(channel->banlist.list[ii]->ban);
     }
     modcmd_chanmode_announce(change);
+    for(ii = 0; ii < change->argc; ++ii)
+        free((char*)change->args[ii].u.hostmask);
     mod_chanmode_free(change);
     reply("CSMSG_BANS_REMOVED", channel->name);
     return 1;
@@ -3232,6 +3451,7 @@ static CHANSERV_FUNC(cmd_unbanall)
 static CHANSERV_FUNC(cmd_open)
 {
     struct mod_chanmode *change;
+    unsigned int ii;
 
     change = find_matching_bans(&channel->banlist, user, NULL);
     if(!change)
@@ -3242,6 +3462,8 @@ static CHANSERV_FUNC(cmd_open)
         change->modes_clear &= ~channel->channel_info->modes.modes_set;
     modcmd_chanmode_announce(change);
     reply("CSMSG_CHANNEL_OPENED", channel->name);
+    for(ii = 0; ii < change->argc; ++ii)
+        free((char*)change->args[ii].u.hostmask);
     mod_chanmode_free(change);
     return 1;
 }
@@ -3281,17 +3503,17 @@ static CHANSERV_FUNC(cmd_myaccess)
             continue;
         sbuf.used = 0;
         string_buffer_append_printf(&sbuf, "[%s (%d", cData->channel->name, uData->access);
-        if(uData->flags != USER_AUTO_OP)
+        if(uData->flags == USER_AUTO_OP)
             string_buffer_append(&sbuf, ',');
         if(IsUserSuspended(uData))
             string_buffer_append(&sbuf, 's');
         if(IsUserAutoOp(uData))
         {
-            if(uData->access >= cData->lvlOpts[lvlGiveOps])
+            if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/)
                 string_buffer_append(&sbuf, 'o');
-            else if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+            else if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
                 string_buffer_append(&sbuf, 'h');
-            else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
+            else if(uData->access >= UL_PEON /*cData->lvlOpts[lvlGiveVoice]*/)
                 string_buffer_append(&sbuf, 'v');
         }
         if(IsUserAutoInvite(uData) && (uData->access >= cData->lvlOpts[lvlInviteMe]))
@@ -3404,7 +3626,7 @@ static CHANSERV_FUNC(cmd_access)
         && ((target_handle->opserv_level >= chanserv_conf.nodelete_level) || !IsProtected(channel->channel_info));
     if((uData = GetTrueChannelAccess(channel->channel_info, target_handle)))
     {
-        reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, uData->access, channel->name);
+        reply((helping ? "CSMSG_HELPER_HAS_ACCESS" : "CSMSG_USER_HAS_ACCESS"), prefix, user_level_name_from_level(uData->access), uData->access, channel->name);
         /* To prevent possible information leaks, only show infolines
          * if the requestor is in the channel or it's their own
          * handle. */
@@ -3429,6 +3651,7 @@ static CHANSERV_FUNC(cmd_access)
     return 1;
 }
 
+/* This is never used... */
 static void
 zoot_list(struct listData *list)
 {
@@ -3440,9 +3663,9 @@ zoot_list(struct listData *list)
     if(list->table.length == 1)
     {
         if(list->search)
-            send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search);
+            send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search);
         else
-            send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest);
+            send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest));
         msg = user_find_message(list->user, "MSG_NONE");
         send_message_type(4, list->user, list->bot, "  %s", msg);
     }
@@ -3463,9 +3686,9 @@ zoot_list(struct listData *list)
         if((curr == list->table.length) || (list->users[curr-1]->access < lowest))
         {
             if(list->search)
-                send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, lowest, highest, list->search);
+                send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest), list->search);
             else
-                send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, lowest, highest);
+                send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(lowest), user_level_name_from_level(highest));
             temp = list->table.contents[--start];
             list->table.contents[start] = list->table.contents[0];
             tmp_table.contents = list->table.contents + start;
@@ -3484,9 +3707,9 @@ def_list(struct listData *list)
 {
     const char *msg;
     if(list->search)
-        send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, list->lowest, list->highest, list->search);
+        send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search);
     else
-        send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, list->lowest, list->highest);
+        send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest));
     table_send(list->bot, list->user->nick, 0, NULL, list->table);
     if(list->table.length == 1)
     {
@@ -3524,8 +3747,10 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
     lData.highest = highest;
     lData.search = (argc > 1) ? argv[1] : NULL;
     send_list = def_list;
+    /* What does the following line do exactly?? */
     (void)zoot_list; /* since it doesn't show user levels */
 
+    /* this does nothing!! -rubin
     if(user->handle_info)
     {
 	switch(user->handle_info->userlist_style)
@@ -3534,6 +3759,7 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
         case HI_STYLE_ZOOT: send_list = def_list; break;
 	}
     }
+    */
 
     lData.users = alloca(channel->channel_info->userCount * sizeof(struct userData *));
     matches = 0;
@@ -3548,15 +3774,16 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
     qsort(lData.users, matches, sizeof(lData.users[0]), userData_access_comp);
 
     lData.table.length = matches+1;
-    lData.table.width = 4;
+    lData.table.width = 5;
     lData.table.flags = TABLE_NO_FREE;
     lData.table.contents = malloc(lData.table.length*sizeof(*lData.table.contents));
     ary = malloc(lData.table.width*sizeof(**lData.table.contents));
     lData.table.contents[0] = ary;
     ary[0] = "Access";
-    ary[1] = "Account";
-    ary[2] = "Last Seen";
-    ary[3] = "Status";
+    ary[1] = "Level";
+    ary[2] = "Account";
+    ary[3] = "Last Seen";
+    ary[4] = "Status";
     for(matches = 1; matches < lData.table.length; ++matches)
     {
         struct userData *uData = lData.users[matches-1];
@@ -3564,26 +3791,28 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
 
         ary = malloc(lData.table.width*sizeof(**lData.table.contents));
         lData.table.contents[matches] = ary;
-        ary[0] = strtab(uData->access);
-        ary[1] = uData->handle->handle;
+        /* ary[0] = strtab(uData->access);*/
+        ary[0] = user_level_name_from_level(uData->access);
+        ary[1] = strtab(uData->access);
+        ary[2] = uData->handle->handle;
         if(uData->present)
-            ary[2] = "Here";
+            ary[3] = "Here";
         else if(!uData->seen)
-            ary[2] = "Never";
+            ary[3] = "Never";
         else
-            ary[2] = intervalString(seen, now - uData->seen, user->handle_info);
-        ary[2] = strdup(ary[2]);
+            ary[3] = intervalString(seen, now - uData->seen, user->handle_info);
+        ary[3] = strdup(ary[3]);
         if(IsUserSuspended(uData))
-            ary[3] = "Suspended";
+            ary[4] = "Suspended";
         else if(HANDLE_FLAGGED(uData->handle, FROZEN))
-            ary[3] = "Vacation";
+            ary[4] = "Vacation";
         else
-            ary[3] = "Normal";
+            ary[4] = "Normal";
     }
     send_list(&lData);
     for(matches = 1; matches < lData.table.length; ++matches)
     {
-        free((char*)lData.table.contents[matches][2]);
+        free((char*)lData.table.contents[matches][3]);
         free(lData.table.contents[matches]);
     }
     free(lData.table.contents[0]);
@@ -3591,6 +3820,19 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
     return 1;
 }
 
+/* Remove this now that debugging is over? or improve it for
+ * users? Would it be better tied into USERS somehow? -Rubin */
+static CHANSERV_FUNC(cmd_pending)
+{
+    struct adduserPending *ap;
+    reply("CSMSG_ADDUSER_PENDING_HEADER");
+    reply("CSMSG_BAR");
+    for(ap = adduser_pendings;ap;ap = ap->next)
+        reply("CSMSG_ADDUSER_PENDING_LIST", ap->channel->name, ap->user->nick);
+    reply("CSMSG_ADDUSER_PENDING_FOOTER");
+    return 1;
+}
+
 static CHANSERV_FUNC(cmd_users)
 {
     return cmd_list_users(CSFUNC_ARGS, 1, UL_OWNER);
@@ -3626,21 +3868,23 @@ static CHANSERV_FUNC(cmd_plist)
     return cmd_list_users(CSFUNC_ARGS, 1, UL_HALFOP-1);
 }
 
-static CHANSERV_FUNC(cmd_bans)
+static CHANSERV_FUNC(cmd_lamers)
 {
     struct helpfile_table tbl;
     unsigned int matches = 0, timed = 0, ii;
     char t_buffer[INTERVALLEN], e_buffer[INTERVALLEN], *search;
     const char *msg_never, *triggered, *expires;
-    struct banData *ban, **bans;
+    struct banData *ban, **bans; /* lamers */
 
     if(argc > 1)
 	search = argv[1];
     else
         search = NULL;
 
-    bans = alloca(channel->channel_info->banCount * sizeof(struct banData *));
+    reply("CSMSG_LAMERS_HEADER", channel->name);
+    bans = alloca(channel->channel_info->banCount * sizeof(struct banData *)); /* lamers */
 
+    /* lamers */
     for(ban = channel->channel_info->bans; ban; ban = ban->next)
     {
 	if(search && !match_ircglobs(search, ban->mask))
@@ -3705,7 +3949,7 @@ static CHANSERV_FUNC(cmd_bans)
             tbl.contents[ii][3] = ban->reason;
     }
     table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
-    reply("MSG_MATCH_COUNT", matches);
+    /* reply("MSG_MATCH_COUNT", matches); */
     for(ii = 1; ii < tbl.length; ++ii)
     {
         free((char*)tbl.contents[ii][2]);
@@ -3718,20 +3962,71 @@ static CHANSERV_FUNC(cmd_bans)
     return 1;
 }
 
+/* bad_topic
+ *
+ * return + if the user does NOT have the right to set the topic, and
+ * the topic is changed.
+ */
 static int
 bad_topic(struct chanNode *channel, struct userNode *user, const char *new_topic)
 {
     struct chanData *cData = channel->channel_info;
     if(check_user_level(channel, user, lvlEnfTopic, 1, 0))
         return 0;
-    if(cData->topic_mask)
-        return !match_ircglob(new_topic, cData->topic_mask);
     else if(cData->topic)
         return irccasecmp(new_topic, cData->topic);
     else
         return 0;
 }
 
+/* conform_topic
+ *
+ * Makes a givin topic fit into a givin topic mask and returns
+ * the results.
+ *
+ * topic_mask - the mask to conform to
+ * topic - the topic to make conform
+ * new_topic - the pre-allocated char* to put the new topic into
+ *
+ * modifies: new_topic
+ */
+void
+conform_topic(char* topic_mask, char* topic, char *new_topic)
+{
+    //char *topic_mask = cData->topic_mask;
+    char tchar;
+    int pos=0, starpos=-1, dpos=0, len;
+
+    while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
+    {
+        switch(tchar)
+        {
+        case '*':
+            if(starpos != -1)
+            {
+                strcpy(new_topic, "");
+                return;
+            }
+            len = strlen(topic);
+            if((dpos + len) > TOPICLEN)
+                len = TOPICLEN + 1 - dpos;
+            memcpy(new_topic+dpos, topic, len);
+            dpos += len;
+            starpos = pos;
+            break;
+        case '\\': tchar = topic_mask[pos++]; /* and fall through */
+        default: new_topic[dpos++] = tchar; break;
+        }
+    }
+    if((dpos > TOPICLEN) || tchar)
+    {
+        strcpy(new_topic, "");
+        return;
+    }
+    new_topic[dpos] = 0;
+    return;
+}
+
 static CHANSERV_FUNC(cmd_topic)
 {
     struct chanData *cData;
@@ -3740,12 +4035,12 @@ static CHANSERV_FUNC(cmd_topic)
     cData = channel->channel_info;
     if(argc < 2)
     {
-	if(cData->topic)
-	{
-	    SetChannelTopic(channel, chanserv, cData->topic, 1);
-	    reply("CSMSG_TOPIC_SET", cData->topic);
+        if(cData->topic)
+        {
+            SetChannelTopic(channel, chanserv, cData->topic, 1);
+            reply("CSMSG_TOPIC_SET", cData->topic);
             return 1;
-	}
+        }
 
         reply("CSMSG_NO_TOPIC", channel->name);
         return 0;
@@ -3755,48 +4050,34 @@ static CHANSERV_FUNC(cmd_topic)
     /* If they say "!topic *", use an empty topic. */
     if((topic[0] == '*') && (topic[1] == 0))
         topic[0] = 0;
+
     if(bad_topic(channel, user, topic))
     {
-        char *topic_mask = cData->topic_mask;
-        if(topic_mask)
+        reply("CSMSG_TOPIC_LOCKED", channel->name);
+        return 0;
+    }
+    else
+    {
+        /* If there is a topicmask set, and the new topic doesnt match, make it */
+        if(cData->topic_mask && !match_ircglob(topic, cData->topic_mask))
         {
-            char new_topic[TOPICLEN+1], tchar;
-            int pos=0, starpos=-1, dpos=0, len;
+            char *topic_mask = cData->topic_mask;
+            char new_topic[TOPICLEN+1];
 
-            while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
-            {
-                switch(tchar)
-                {
-                case '*':
-                    if(starpos != -1)
-                        goto bad_mask;
-                    len = strlen(topic);
-                    if((dpos + len) > TOPICLEN)
-                        len = TOPICLEN + 1 - dpos;
-                    memcpy(new_topic+dpos, topic, len);
-                    dpos += len;
-                    starpos = pos;
-                    break;
-                case '\\': tchar = topic_mask[pos++]; /* and fall through */
-                default: new_topic[dpos++] = tchar; break;
-                }
-            }
-            if((dpos > TOPICLEN) || tchar)
+            /* make a new topic fitting mask */
+            conform_topic(topic_mask, topic, new_topic);
+            if(!*new_topic)
             {
-            bad_mask:
+                /* Topic couldnt fit into mask, was too long */
                 reply("CSMSG_TOPICMASK_CONFLICT1", channel->name, topic_mask);
                 reply("CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
                 return 0;
             }
-            new_topic[dpos] = 0;
             SetChannelTopic(channel, chanserv, new_topic, 1);
-        } else {
-            reply("CSMSG_TOPIC_LOCKED", channel->name);
-            return 0;
         }
+        else /* No mask set, just set the topic */
+            SetChannelTopic(channel, chanserv, topic, 1);
     }
-    else
-        SetChannelTopic(channel, chanserv, topic, 1);
 
     if(check_user_level(channel, user, lvlTopicSnarf, 1, 0))
     {
@@ -3970,9 +4251,10 @@ static CHANSERV_FUNC(cmd_info)
 
     cData = channel->channel_info;
     reply("CSMSG_CHANNEL_INFO", channel->name);
+    reply("CSMSG_BAR");
 
     uData = GetChannelUser(cData, user->handle_info);
-    if(uData && (uData->access >= cData->lvlOpts[lvlGiveOps]))
+    if(uData && (uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/))
     {
         mod_chanmode_format(&cData->modes, modes);
 	reply("CSMSG_CHANNEL_TOPIC", cData->topic);
@@ -3996,7 +4278,7 @@ static CHANSERV_FUNC(cmd_info)
         if(owner->access == UL_OWNER)
             reply("CSMSG_CHANNEL_OWNER", owner->handle->handle);
     reply("CSMSG_CHANNEL_USERS", cData->userCount);
-    reply("CSMSG_CHANNEL_BANS", cData->banCount);
+    reply("CSMSG_CHANNEL_LAMERS", cData->banCount);
     reply("CSMSG_CHANNEL_VISITED", intervalString(buffer, now - cData->visited, user->handle_info));
     reply("CSMSG_CHANNEL_REGISTERED", intervalString(buffer, now - cData->registered, user->handle_info));
 
@@ -4019,6 +4301,7 @@ static CHANSERV_FUNC(cmd_info)
         reply("CSMSG_CHANNEL_SUSPENDED", channel->name);
         show_suspension_info(cmd, user, cData->suspended);
     }
+    reply("CSMSG_CHANNEL_END");
     return 1;
 }
 
@@ -4033,7 +4316,7 @@ static CHANSERV_FUNC(cmd_netinfo)
     reply("CSMSG_NETWORK_USERS", dict_size(clients));
     reply("CSMSG_NETWORK_OPERS", curr_opers.used);
     reply("CSMSG_NETWORK_CHANNELS", registered_channels);
-    reply("CSMSG_NETWORK_BANS", banCount);
+    reply("CSMSG_NETWORK_LAMERS", banCount);
     reply("CSMSG_NETWORK_CHANUSERS", userCount);
     reply("CSMSG_SERVICES_UPTIME", intervalString(interval, time(NULL) - boot_time, user->handle_info));
     reply("CSMSG_BURST_LENGTH", intervalString(interval, burst_length, user->handle_info));
@@ -4105,6 +4388,7 @@ static CHANSERV_FUNC(cmd_peek)
     irc_make_chanmode(channel, modes);
 
     reply("CSMSG_PEEK_INFO", channel->name);
+    reply("CSMSG_BAR");
     reply("CSMSG_PEEK_TOPIC", channel->topic);
     reply("CSMSG_PEEK_MODES", modes);
     reply("CSMSG_PEEK_USERS", channel->members.used);
@@ -4129,6 +4413,7 @@ static CHANSERV_FUNC(cmd_peek)
     }
     else
         reply("CSMSG_PEEK_NO_OPS");
+    reply("CSMSG_PEEK_END");
     return 1;
 }
 
@@ -4174,8 +4459,7 @@ static CHANSERV_FUNC(cmd_resync)
             continue;
 
         uData = GetChannelAccess(cData, mn->user->handle_info);
-        if(!cData->lvlOpts[lvlGiveOps]
-           || (uData && uData->access >= cData->lvlOpts[lvlGiveOps]))
+        if(uData && uData->access >= UL_OP /* cData->lvlOpts[lvlGiveOps]*/)
         {
             if(!(mn->modes & MODE_CHANOP))
             {
@@ -4183,8 +4467,7 @@ static CHANSERV_FUNC(cmd_resync)
                 changes->args[used++].u.member = mn;
             }
         }
-        else if(!cData->lvlOpts[lvlGiveHalfOps]
-                || (uData && uData->access >= cData->lvlOpts[lvlGiveHalfOps]))
+        else if(uData && uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
         {
             if(!(mn->modes & MODE_HALFOP))
             {
@@ -4202,8 +4485,7 @@ static CHANSERV_FUNC(cmd_resync)
                 changes->args[used++].u.member = mn;
             }
         }
-        else if(!cData->lvlOpts[lvlGiveVoice]
-                || (uData && uData->access >= cData->lvlOpts[lvlGiveVoice]))
+        else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/)
         {
             if(mn->modes & MODE_CHANOP)
             {
@@ -4461,7 +4743,8 @@ static CHANSERV_FUNC(cmd_events)
     discrim.severities = 1 << LOG_COMMAND;
     report.reporter = chanserv;
     report.user = user;
-    reply("CSMSG_EVENT_SEARCH_RESULTS");
+    reply("CSMSG_EVENT_SEARCH_RESULTS", channel->name);
+    reply("CSMSG_BAR");
     matches = log_entry_search(&discrim, log_report_entry, &report);
     if(matches)
 	reply("MSG_MATCH_COUNT", matches);
@@ -4535,18 +4818,21 @@ chanserv_expire_suspension(void *data)
 {
     struct suspended *suspended = data;
     struct chanNode *channel;
-    struct mod_chanmode change;
 
     if(!suspended->expires || (now < suspended->expires))
         suspended->revoked = now;
     channel = suspended->cData->channel;
     suspended->cData->channel = channel;
     suspended->cData->flags &= ~CHANNEL_SUSPENDED;
-    mod_chanmode_init(&change);
-    change.argc = 1;
-    change.args[0].mode = MODE_CHANOP;
-    change.args[0].u.member = AddChannelUser(chanserv, channel);
-    mod_chanmode_announce(chanserv, channel, &change);
+    if(!IsOffChannel(suspended->cData))
+    {
+        struct mod_chanmode change;
+        mod_chanmode_init(&change);
+        change.argc = 1;
+        change.args[0].mode = MODE_CHANOP;
+        change.args[0].u.member = AddChannelUser(chanserv, channel);
+        mod_chanmode_announce(chanserv, channel, &change);
+    }
 }
 
 static CHANSERV_FUNC(cmd_csuspend)
@@ -4793,7 +5079,10 @@ static CHANSERV_FUNC(cmd_search)
 	search->limit = INT_MAX;
 
     if(action == search_print)
+    {
 	reply("CSMSG_CHANNEL_SEARCH_RESULTS");
+        reply("CSMSG_BAR");
+    }
 
     matches = chanserv_channel_search(search, action, user);
 
@@ -5156,6 +5445,7 @@ channel_level_option(enum levelOption option, struct userNode *user, struct chan
         }
         switch(option)
         {
+            /* removing these level sets..
         case lvlGiveVoice:
             if(value > cData->lvlOpts[lvlGiveOps])
             {
@@ -5177,6 +5467,7 @@ channel_level_option(enum levelOption option, struct userNode *user, struct chan
                 return 0;
             }
             break;
+            */
         case lvlSetters:
             /* This test only applies to owners, since non-owners
              * trying to set an option to above their level get caught
@@ -5206,7 +5497,7 @@ static MODCMD_FUNC(chan_opt_enfhalfops)
 {
     return channel_level_option(lvlEnfHalfOps, CSFUNC_ARGS);
 }
-
+/*
 static MODCMD_FUNC(chan_opt_giveops)
 {
     return channel_level_option(lvlGiveOps, CSFUNC_ARGS);
@@ -5216,7 +5507,7 @@ static MODCMD_FUNC(chan_opt_givehalfops)
 {
     return channel_level_option(lvlGiveHalfOps, CSFUNC_ARGS);
 }
-
+*/
 static MODCMD_FUNC(chan_opt_enfmodes)
 {
     return channel_level_option(lvlEnfModes, CSFUNC_ARGS);
@@ -5247,10 +5538,12 @@ static MODCMD_FUNC(chan_opt_userinfo)
     return channel_level_option(lvlUserInfo, CSFUNC_ARGS);
 }
 
+/*
 static MODCMD_FUNC(chan_opt_givevoice)
 {
     return channel_level_option(lvlGiveVoice, CSFUNC_ARGS);
 }
+*/
 
 static MODCMD_FUNC(chan_opt_topicsnarf)
 {
@@ -5302,6 +5595,11 @@ channel_multiple_option(enum charOption option, struct userNode *user, struct ch
     return 1;
 }
 
+static MODCMD_FUNC(chan_opt_voice)
+{
+    return channel_multiple_option(chVoice, CSFUNC_ARGS);
+}
+
 static MODCMD_FUNC(chan_opt_protect)
 {
     return channel_multiple_option(chProtect, CSFUNC_ARGS);
@@ -5362,12 +5660,14 @@ static CHANSERV_FUNC(cmd_set)
 
     if(argc < 2)
     {
-	reply("CSMSG_CHANNEL_OPTIONS");
+	reply("CSMSG_CHANNEL_OPTIONS", channel->name);
+        reply("CSMSG_BAR");
         for(ii = 0; ii < set_shows_list.used; ii++)
         {
             subcmd = set_shows_list.list[ii];
             subcmd->command->func(user, channel, 1, argv+1, subcmd);
         }
+        reply("CSMSG_CHANNEL_OPTIONS_END");
 	return 1;
     }
 
@@ -5421,7 +5721,7 @@ user_binary_option(char *name, unsigned long mask, struct userNode *user, struct
     return 1;
 }
 
-static MODCMD_FUNC(user_opt_noautoop)
+static MODCMD_FUNC(user_opt_autoop)
 {
     struct userData *uData;
 
@@ -5431,10 +5731,11 @@ static MODCMD_FUNC(user_opt_noautoop)
         reply("CSMSG_NOT_USER", channel->name);
         return 0;
     }
-    if(uData->access < channel->channel_info->lvlOpts[lvlGiveOps])
-        return user_binary_option("CSMSG_USET_NOAUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS);
+    if(uData->access < UL_OP /*channel->channel_info->lvlOpts[lvlGiveOps]*/)
+        return user_binary_option("CSMSG_USET_AUTOVOICE", USER_AUTO_OP, CSFUNC_ARGS);
     else
-        return user_binary_option("CSMSG_USET_NOAUTOOP", USER_AUTO_OP, CSFUNC_ARGS);
+        return user_binary_option("CSMSG_USET_AUTOOP", USER_AUTO_OP, CSFUNC_ARGS);
+    /* TODO: add halfops error message? or is the op one generic enough? */
 }
 
 static MODCMD_FUNC(user_opt_autoinvite)
@@ -5500,7 +5801,7 @@ static CHANSERV_FUNC(cmd_uset)
     {
         char *options[] =
         {
-            "NoAutoOp", "AutoInvite", "Info"
+            "AutoOp", "AutoInvite", "Info"
         };
 
         if(!uset_shows_list.size)
@@ -5590,8 +5891,15 @@ static CHANSERV_FUNC(cmd_giveownership)
     new_owner = GetChannelAccess(cData, new_owner_hi);
     if(!new_owner)
     {
-        reply("CSMSG_NO_CHAN_USER", new_owner_hi->handle, channel->name);
-        return 0;
+        if(force)
+        {
+            new_owner = add_channel_user(cData, new_owner_hi, UL_COOWNER, 0, NULL);
+        }
+        else
+        {
+            reply("CSMSG_NO_CHAN_USER", new_owner_hi->handle, channel->name);
+            return 0;
+        }
     }
     if((chanserv_get_owned_count(new_owner_hi) >= chanserv_conf.max_owned) && !force)
     {
@@ -5602,7 +5910,7 @@ static CHANSERV_FUNC(cmd_giveownership)
         if(!IsHelping(user))
             reply("CSMSG_DNR_ACCOUNT", new_owner_hi->handle);
         else
-            chanserv_show_dnrs(user, cmd, NULL, new_owner_hi);
+            chanserv_show_dnrs(user, cmd, NULL, new_owner_hi->handle);
         return 0;
     }
     if(new_owner->access >= UL_COOWNER)
@@ -6038,13 +6346,10 @@ handle_join(struct modeNode *mNode)
 
     if(channel->join_flooded)
     {
-        /* don't automatically give ops or voice during a join flood */
+        /* don't automatically give non users ops or voice during a join flood */
     }
-    else if(cData->lvlOpts[lvlGiveOps] == 0)
-        modes |= MODE_CHANOP;
-    else if(cData->lvlOpts[lvlGiveHalfOps] == 0)
-        modes |= MODE_HALFOP;
-    else if(cData->lvlOpts[lvlGiveVoice] == 0)
+    /* EVERYONE is to get voice */
+    else if(cData->chOpts[chVoice] == 'a')
         modes |= MODE_VOICE;
 
     greeting = cData->greeting;
@@ -6068,14 +6373,14 @@ handle_join(struct modeNode *mNode)
         uData = GetTrueChannelAccess(cData, handle);
         if(uData && !IsUserSuspended(uData))
         {
-            /* Ops and above were handled by the above case. */
+            /* non users getting voice are handled above. */
             if(IsUserAutoOp(uData))
             {
-                if(uData->access >= cData->lvlOpts[lvlGiveOps])
+                if(uData->access >= UL_OP /*cData->lvlOpts[lvlGiveOps]*/)
                     modes |= MODE_CHANOP;
-                if(uData->access >= cData->lvlOpts[lvlGiveHalfOps])
+                if(uData->access >= UL_HALFOP /*cData->lvlOpts[lvlGiveHalfOps]*/)
                     modes |= MODE_HALFOP;
-                else if(uData->access >= cData->lvlOpts[lvlGiveVoice])
+                else if(uData->access >= UL_PEON && cData->chOpts[chVoice] == 'p')
                     modes |= MODE_VOICE;
             }
             if(uData->access >= UL_PRESENT)
@@ -6149,11 +6454,11 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
 
         if(IsUserAutoOp(channel))
         {
-            if(channel->access >= cn->channel_info->lvlOpts[lvlGiveOps])
+            if(channel->access >= UL_OP /* cn->channel_info->lvlOpts[lvlGiveOps] */)
                 change.args[0].mode = MODE_CHANOP;
-            else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveHalfOps])
+            else if(channel->access >= UL_HALFOP /* cn->channel_info->lvlOpts[lvlGiveHalfOps]*/)
                 change.args[0].mode = MODE_HALFOP;
-            else if(channel->access >= cn->channel_info->lvlOpts[lvlGiveVoice])
+            else if(channel->access >= UL_PEON /* cn->channel_info->lvlOpts[lvlGiveVoice]*/)
                 change.args[0].mode = MODE_VOICE;
             else
                 change.args[0].mode = 0;
@@ -6172,7 +6477,8 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
         struct banData *ban;
 
         if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_HALFOP|MODE_VOICE))
-           || !channel->channel_info)
+           || !channel->channel_info
+           || IsSuspended(channel->channel_info))
             continue;
         for(jj = 0; jj < channel->banlist.used; ++jj)
             if(user_matches_glob(user, channel->banlist.list[jj]->ban, 1))
@@ -6280,14 +6586,30 @@ handle_topic(struct userNode *user, struct chanNode *channel, const char *old_to
 
     cData = channel->channel_info;
     if(bad_topic(channel, user, channel->topic))
-    {
+    {   /* User doesnt have privs to set topics. Undo it */
         send_message(user, chanserv, "CSMSG_TOPIC_LOCKED", channel->name);
-        if(cData->topic_mask && match_ircglob(old_topic, cData->topic_mask))
-            SetChannelTopic(channel, chanserv, old_topic, 1);
-        else if(cData->topic)
-            SetChannelTopic(channel, chanserv, cData->topic, 1);
+        SetChannelTopic(channel, chanserv, old_topic, 1);
         return 1;
     }
+    /* If there is a topic mask set, and the new topic doesnt match,
+     * set the topic to mask + new_topic */
+    if(cData->topic_mask && !match_ircglob(channel->topic, cData->topic_mask))
+    {
+        char new_topic[TOPICLEN+1];
+        conform_topic(cData->topic_mask, channel->topic, new_topic);
+        if(*new_topic)
+        {
+           SetChannelTopic(channel, chanserv, new_topic, 1);
+           /* and fall through to topicsnarf code below.. */
+        }
+        else /* Topic couldnt fit into mask, was too long */
+        {
+            SetChannelTopic(channel, chanserv, old_topic, 1);
+            send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT1", channel->name, cData->topic_mask);
+            send_message(user, chanserv, "CSMSG_TOPICMASK_CONFLICT2", TOPICLEN);
+            return 1;
+        }
+    }
     /* With topicsnarf, grab the topic and save it as the default topic. */
     if(check_user_level(channel, user, lvlTopicSnarf, 0, 0))
     {
@@ -6356,7 +6678,7 @@ handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_ch
             if(!bounce)
                 bounce = mod_chanmode_alloc(change->argc + 1 - ii);
             bounce->args[bnc].mode = MODE_REMOVE | MODE_BAN;
-            bounce->args[bnc].u.hostmask = ban;
+            bounce->args[bnc].u.hostmask = strdup(ban);
             bnc++;
             send_message(user, chanserv, "CSMSG_MASK_PROTECTED", ban);
         }
@@ -6365,6 +6687,9 @@ handle_mode(struct chanNode *channel, struct userNode *user, const struct mod_ch
     {
         if((bounce->argc = bnc) || bounce->modes_set || bounce->modes_clear)
             mod_chanmode_announce(chanserv, channel, bounce);
+        for(ii = 0; ii < change->argc; ++ii)
+            if(bounce->args[ii].mode == (MODE_REMOVE | MODE_BAN))
+                free((char*)bounce->args[ii].u.hostmask);
         mod_chanmode_free(bounce);
     }
 }
@@ -6505,7 +6830,7 @@ chanserv_conf_read(void)
     str = database_get_data(conf_node, KEY_INFO_DELAY, RECDB_QSTRING);
     chanserv_conf.info_delay = str ? ParseInterval(str) : 180;
     str = database_get_data(conf_node, KEY_MAX_GREETLEN, RECDB_QSTRING);
-    chanserv_conf.greeting_length = str ? atoi(str) : 120;
+    chanserv_conf.greeting_length = str ? atoi(str) : 200;
     str = database_get_data(conf_node, KEY_ADJUST_THRESHOLD, RECDB_QSTRING);
     chanserv_conf.adjust_threshold = str ? atoi(str) : 15;
     str = database_get_data(conf_node, KEY_ADJUST_DELAY, RECDB_QSTRING);
@@ -6561,7 +6886,7 @@ chanserv_conf_read(void)
             /* free form text */
             "DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes",
             /* options based on user level */
-            "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveHalfOps", "GiveOps", "EnfOps",
+            "PubCmd", "InviteMe", "UserInfo",/* "GiveVoice", "GiveHalfOps", "GiveOps", */ "EnfOps",
             "EnfHalfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUsers",
             /* multiple choice options */
             "CtcpReaction", "Protect", "Toys", "TopicRefresh",
@@ -6602,12 +6927,8 @@ chanserv_conf_read(void)
     else
         strlist = alloc_string_list(2);
     chanserv_conf.old_ban_names = strlist;
-    /* the variable itself is actually declared in proto-common.c; this is equally 
-     * parse issue. */
     str = database_get_data(conf_node, "off_channel", RECDB_QSTRING);
-    off_channel = (str && enabled_string(str)) ? 1 : 0;
-    str = database_get_data(conf_node, "use_registered_mode", RECDB_QSTRING);
-    chanserv_conf.use_registered_mode = (str && enabled_string(str)) ? 1 : 0;
+    off_channel = str ? atoi(str) : 0;
 }
 
 static void
@@ -6701,6 +7022,18 @@ user_read_helper(const char *key, struct record_data *rd, struct chanData *chan)
 
     uData = add_channel_user(chan, handle, access, last_seen, inf);
     uData->flags = flags ? strtoul(flags, NULL, 0) : 0;
+
+    /* Upgrade: set autoop to the inverse of noautoop */
+    if(chanserv_read_version < 2)
+    {
+        /* if noautoop is true, set autoop false, and vice versa */
+        if(uData->flags & USER_NOAUTO_OP)
+            uData->flags = uData->flags & ~USER_AUTO_OP;
+        else
+            uData->flags = uData->flags | USER_AUTO_OP;
+        log_module(CS_LOG, LOG_INFO, "UPGRADE: to db version 2 from %u. Changing flag to %d for %s in %s.", chanserv_read_version, uData->flags, key, chan->channel->name);
+    }
+    
 }
 
 static void
@@ -6722,6 +7055,8 @@ ban_read_helper(const char *key, struct record_data *rd, struct chanData *chan)
     s_expires = database_get_data(rd->d.object, KEY_EXPIRES, RECDB_QSTRING);
     owner = database_get_data(rd->d.object, KEY_OWNER, RECDB_QSTRING);
     reason = database_get_data(rd->d.object, KEY_REASON, RECDB_QSTRING);
+    if (!reason || !owner)
+        return;
 
     set_time = set ? (time_t)strtoul(set, NULL, 0) : now;
     triggered_time = triggered ? (time_t)strtoul(triggered, NULL, 0) : 0;
@@ -6732,7 +7067,7 @@ ban_read_helper(const char *key, struct record_data *rd, struct chanData *chan)
     else
         expires_time = 0;
 
-    if(expires_time && (expires_time < now))
+    if(!reason || (expires_time && (expires_time < now)))
         return;
 
     bData = add_channel_ban(chan, key, owner, set_time, triggered_time, expires_time, reason);
@@ -6918,7 +7253,7 @@ chanserv_channel_read(const char *key, struct record_data *hir)
        && (argc = split_line(str, 0, ArrayLength(argv), argv))
        && (modes = mod_chanmode_parse(cNode, argv, argc, MCP_KEY_FREE))) {
         cData->modes = *modes;
-	if(chanserv_conf.use_registered_mode)
+	if(off_channel > 0)
           cData->modes.modes_set |= MODE_REGISTERED;
         if(cData->modes.argc > 1)
             cData->modes.argc = 1;
@@ -6999,12 +7334,26 @@ chanserv_dnr_read(const char *key, struct record_data *hir)
         dnr->set = 0;
 }
 
+static void
+chanserv_version_read(struct dict *section)
+{
+    /* global var.. */
+    char *str;
+    str = database_get_data(section, KEY_VERSION_NUMBER, RECDB_QSTRING);
+    if(str)
+       chanserv_read_version = atoi(str);
+    log_module(CS_LOG, LOG_DEBUG, "Chanserv db version is %d.", chanserv_read_version);
+}
+
 static int
 chanserv_saxdb_read(struct dict *database)
 {
     struct dict *section;
     dict_iterator_t it;
 
+    if((section = database_get_data(database, KEY_VERSION_CONTROL, RECDB_OBJECT)))
+        chanserv_version_read(section);
+
     if((section = database_get_data(database, KEY_NOTE_TYPES, RECDB_OBJECT)))
         for(it = dict_first(section); it; it = iter_next(it))
             chanserv_note_type_read(iter_key(it), iter_data(it));
@@ -7203,6 +7552,11 @@ chanserv_saxdb_write(struct saxdb_context *ctx)
     dict_iterator_t it;
     struct chanData *channel;
 
+    /* Version Control*/
+    saxdb_start_record(ctx, KEY_VERSION_CONTROL, 1);
+      saxdb_write_int(ctx, KEY_VERSION_NUMBER, CHANSERV_DB_VERSION);
+    saxdb_end_record(ctx);
+
     /* Notes */
     saxdb_start_record(ctx, KEY_NOTE_TYPES, 1);
     for(it = dict_first(note_types); it; it = iter_next(it))
@@ -7293,6 +7647,8 @@ init_chanserv(const char *nick)
     DEFINE_COMMAND(createnote, 5, 0, "level", "800", NULL);
     DEFINE_COMMAND(removenote, 2, 0, "level", "800", NULL);
 
+    DEFINE_COMMAND(pending, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
+
     DEFINE_COMMAND(unregister, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+loghostmask", NULL);
     DEFINE_COMMAND(merge, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "access", "owner", NULL);
 
@@ -7325,14 +7681,14 @@ init_chanserv(const char *nick)
     DEFINE_COMMAND(voice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
     DEFINE_COMMAND(devoice, 2, MODCMD_REQUIRE_CHANNEL, "template", "op", NULL);
 
-    DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
-    DEFINE_COMMAND(kick, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
-    DEFINE_COMMAND(ban, 2, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
-    DEFINE_COMMAND(unban, 2, 0, "template", "op", NULL);
-    DEFINE_COMMAND(unbanall, 1, 0, "template", "op", NULL);
-    DEFINE_COMMAND(unbanme, 1, MODCMD_REQUIRE_CHANUSER, "template", "op", NULL);
+    DEFINE_COMMAND(kickban, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+    DEFINE_COMMAND(kick, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+    DEFINE_COMMAND(ban, 2, MODCMD_REQUIRE_REGCHAN, "template", "hop", NULL);
+    DEFINE_COMMAND(unban, 2, 0, "template", "hop", NULL);
+    DEFINE_COMMAND(unbanall, 1, 0, "template", "hop", NULL);
+    DEFINE_COMMAND(unbanme, 1, MODCMD_REQUIRE_CHANUSER, "template", "hop", NULL);
     DEFINE_COMMAND(open, 1, MODCMD_REQUIRE_CHANUSER, "template", "op", NULL);
-    DEFINE_COMMAND(topic, 1, MODCMD_REQUIRE_REGCHAN, "template", "op", "flags", "+never_csuspend", NULL);
+    DEFINE_COMMAND(topic, 1, MODCMD_REQUIRE_REGCHAN, "template", "hop", "flags", "+never_csuspend", NULL);
     DEFINE_COMMAND(mode, 1, MODCMD_REQUIRE_REGCHAN, "template", "op", NULL);
     DEFINE_COMMAND(inviteme, 1, MODCMD_REQUIRE_CHANNEL, "access", "1", NULL);
     DEFINE_COMMAND(invite, 1, MODCMD_REQUIRE_CHANNEL, "access", "manager", NULL);
@@ -7340,13 +7696,17 @@ init_chanserv(const char *nick)
     DEFINE_COMMAND(wipeinfo, 2, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
     DEFINE_COMMAND(resync, 1, MODCMD_REQUIRE_CHANUSER, "access", "manager", NULL);
 
-    DEFINE_COMMAND(events, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog", "access", "350", NULL);
-    DEFINE_COMMAND(addban, 2, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
-    DEFINE_COMMAND(addtimedban, 3, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
-    DEFINE_COMMAND(delban, 2, MODCMD_REQUIRE_REGCHAN, "access", "250", NULL);
+    DEFINE_COMMAND(events, 1, MODCMD_REQUIRE_REGCHAN, "flags", "+nolog", "access", "manager", NULL);
+    DEFINE_COMMAND(addlamer, 2, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
+    DEFINE_COMMAND(addtimedlamer, 3, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
+
+    /* if you change dellamer access, see also places
+     * like unbanme which have manager hardcoded. */
+    DEFINE_COMMAND(dellamer, 2, MODCMD_REQUIRE_REGCHAN, "access", "manager", NULL);
     DEFINE_COMMAND(uset, 1, MODCMD_REQUIRE_CHANUSER, "access", "1", NULL);
 
-    DEFINE_COMMAND(bans, 1, MODCMD_REQUIRE_REGCHAN, "access", "1", "flags", "+nolog", NULL);
+    DEFINE_COMMAND(lamers, 1, MODCMD_REQUIRE_REGCHAN, "access", "1", "flags", "+nolog", NULL);
+
     DEFINE_COMMAND(peek, 1, MODCMD_REQUIRE_REGCHAN, "access", "op", "flags", "+nolog", NULL);
 
     DEFINE_COMMAND(myaccess, 1, MODCMD_REQUIRE_AUTHED, NULL);
@@ -7392,13 +7752,16 @@ init_chanserv(const char *nick)
     DEFINE_CHANNEL_OPTION(modes);
     DEFINE_CHANNEL_OPTION(enfops);
     DEFINE_CHANNEL_OPTION(enfhalfops);
-    DEFINE_CHANNEL_OPTION(giveops);
+    /*DEFINE_CHANNEL_OPTION(giveops);
     DEFINE_CHANNEL_OPTION(givehalfops);
+    */
+    DEFINE_CHANNEL_OPTION(voice);
     DEFINE_CHANNEL_OPTION(protect);
     DEFINE_CHANNEL_OPTION(enfmodes);
     DEFINE_CHANNEL_OPTION(enftopic);
     DEFINE_CHANNEL_OPTION(pubcmd);
-    DEFINE_CHANNEL_OPTION(givevoice);
+    /*DEFINE_CHANNEL_OPTION(givevoice);
+     */
     DEFINE_CHANNEL_OPTION(userinfo);
     DEFINE_CHANNEL_OPTION(dynlimit);
     DEFINE_CHANNEL_OPTION(topicsnarf);
@@ -7409,7 +7772,7 @@ init_chanserv(const char *nick)
     DEFINE_CHANNEL_OPTION(ctcpusers);
     DEFINE_CHANNEL_OPTION(ctcpreaction);
     DEFINE_CHANNEL_OPTION(inviteme);
-    if(off_channel)
+    if(off_channel > 1)
         DEFINE_CHANNEL_OPTION(offchannel);
     modcmd_register(chanserv_module, "set defaults", chan_opt_defaults, 1, 0, "access", "owner", NULL);
 
@@ -7417,12 +7780,12 @@ init_chanserv(const char *nick)
     modcmd_register(chanserv_module, "set topic", chan_opt_defaulttopic, 1, 0, NULL);
 
     /* User options */
-    DEFINE_USER_OPTION(noautoop);
     DEFINE_USER_OPTION(autoinvite);
     DEFINE_USER_OPTION(info);
+    DEFINE_USER_OPTION(autoop);
 
     /* Alias uset autovoice to uset autoop. */
-    modcmd_register(chanserv_module, "uset noautovoice", user_opt_noautoop, 1, 0, NULL);
+    modcmd_register(chanserv_module, "uset autovoice", user_opt_autoop, 1, 0, NULL);
 
     note_types = dict_new();
     dict_set_free_data(note_types, chanserv_deref_note_type);
@@ -7433,6 +7796,7 @@ init_chanserv(const char *nick)
         service_register(chanserv)->trigger = '!';
         reg_chanmsg_func('\001', chanserv, chanserv_ctcp_check);
     }
+
     saxdb_register("ChanServ", chanserv_saxdb_read, chanserv_saxdb_write);
 
     if(chanserv_conf.channel_expire_frequency)
@@ -7444,7 +7808,7 @@ init_chanserv(const char *nick)
         next_refresh = (now + chanserv_conf.refresh_period - 1) / chanserv_conf.refresh_period * chanserv_conf.refresh_period;
         timeq_add(next_refresh, chanserv_refresh_topics, NULL);
     }
-    
+
     reg_exit_func(chanserv_db_cleanup);
     message_register_table(msgtab);
 }