1 files changed, 40 insertions, 148 deletions
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index c570e9185..5734fe8a0 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -1089,212 +1089,92 @@ cs_seen
 /*
  * cs_set
  *
- * Provides the command chanserv/set.
+ * Provides the commands:
+ *   chanserv/set and chanserv/saset - Dummy help wrappers for the SET and SASET commands.
+ *   chanserv/set/autoop - Used for configuring whether or not ChanServ automatically gives channel status to users.
+ *   chanserv/set/bantype - Used for controlling what format bans are placed on channels.
+ *   chanserv/set/description - Used for changing channels descriptions.
+ *   chanserv/set/founder - Used for changing a channels founder.
+ *   chanserv/set/keeptopic -  Used for configuring if ChanServ is to restore the channel topic when a channel is created.
+ *   chanserv/set/peace - Used for configuring if users are able to kick other users with higher access than them.
+ *   chanserv/set/persist - Used for setting whether ChanServ should stay in channels after the last user leaves.
+ *   chanserv/set/private - Used for setting whether channels should show up in chanserv/list.
+ *   chanserv/set/restricted - Used for setting whether users not on a channel's access list can join.
+ *   chanserv/set/secure - Used for setting whether users who are recognized for accounts should have their access in channels.
+ *   chanserv/set/securefounder - Used for setting whether users with founder level access in channels have true founder or not.
+ *   chanserv/set/secureops - Used for restricting who can have channel op privilege in a channel to those whom have access in the channel.
+ *   chanserv/set/signkick - Used for setting signkick, which appends the kicker's name to kicks sent through ChanServ.
+ *   chanserv/set/successor - Used for setting channel successors, which become channel founders if the founders account expires.
+ *   chanserv/set/topiclock - Used for setting topiclock, which prevents channel topics from being modified.
+ *   chanserv/saset/topiclock - Used for setting noexpire, which prevents channels from expiring.
  *
  * Is a dummy command to provide a help wrapper for the various SET commands.
  */
 module { name = "cs_set" }
-command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; }
 
-/*
- * cs_saset
- *
- * Provides the command chanserv/saset.
- *
- * Is a dummy command to provide a help wrapper for the various SASET commands.
- */
-module { name = "cs_saset" }
+command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; }
 command { service = "ChanServ"; name = "SASET"; command = "chanserv/saset"; permission = "chanserv/saset/"; }
 
-/*
- * cs_set_autoop
- *
- * Provides the command chanserv/set/autoop.
- *
- * Used for controlling whether or not ChanServ automatically gives channel status to users.
- */
-module { name = "cs_set_autoop" }
 command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
 command { service = "ChanServ"; name = "SASET AUTOOP"; command = "chanserv/set/autoop"; permission = "chanserv/saset/autoop"; }
 
-/*
- * cs_set_bantype
- *
- * Provides the command chanserv/set/bantype.
- *
- * Used for controlling what format bans are placed on channels.
- */
-module { name = "cs_set_bantype" }
 command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; }
 command { service = "ChanServ"; name = "SASET BANTYPE"; command = "chanserv/set/bantype"; permission = "chanserv/saset/bantype"; }
 
-/*
- * cs_set_description
- *
- * Provides the command chanserv/set/description.
- *
- * Used for changing channels descriptions.
- */
-module { name = "cs_set_description" }
 command { service = "ChanServ"; name = "SET DESCRIPTION"; command = "chanserv/set/description"; }
 command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; }
+
 command { service = "ChanServ"; name = "SASET DESCRIPTION"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; }
 command { service = "ChanServ"; name = "SASET DESC"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; }
 
-/*
- * cs_set_founder
- *
- * Provides the command chanserv/set/founder.
- *
- * Used for changing channel founders.
- */
-module { name = "cs_set_founder" }
 command { service = "ChanServ"; name = "SET FOUNDER"; command = "chanserv/set/founder"; }
 command { service = "ChanServ"; name = "SASET FOUNDER"; command = "chanserv/set/founder"; permission = "chanserv/saset/founder"; }
 
-/*
- * cs_set_keeptopic
- *
- * Provides the command chanserv/set/keeptopic.
- *
- * Used for enabling keeptopic on channels, which causes ChanServ to restore the channel topic
- * when a channel is created.
- */
-module { name = "cs_set_keeptopic" }
 command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; }
 command { service = "ChanServ"; name = "SASET KEEPTOPIC"; command = "chanserv/set/keeptopic"; permission = "chanserv/saset/keeptopic"; }
 
-/*
- * cs_set_misc
- *
- * Provides the command chanserv/set/misc.
- *
- * Allows you to create arbitrary commands to set data, and have that data show up in chanserv/info.
- */
-module { name = "cs_set_misc" }
-command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; }
-command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; }
-
-/*
- * cs_set_peace
- *
- * Provides the command chanserv/set/peace.
- *
- * Used for setting the peace option, which prevents users from kicking other users with
- * higher level access than them.
- */
-module { name = "cs_set_peace" }
 command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; }
 command { service = "ChanServ"; name = "SASET PEACE"; command = "chanserv/set/peace"; permission = "chanserv/saset/peace"; }
 
-/*
- * cs_set_persist
- *
- * Provides the command chanserv/set/persist.
- *
- * Used for setting whether ChanServ should stay in channels after the last user leaves.
- */
-module { name = "cs_set_persist" }
 command { service = "ChanServ"; name = "SET PERSIST"; command = "chanserv/set/persist"; }
 command { service = "ChanServ"; name = "SASET PERSIST"; command = "chanserv/set/persist"; permission = "chanserv/saset/persist"; }
 
-/*
- * cs_set_private
- *
- * Provides the command chanserv/set/private.
- *
- * Used for setting whether channels should show up in chanserv/list.
- */
-module { name = "cs_set_private" }
 command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; }
 command { service = "ChanServ"; name = "SASET PRIVATE"; command = "chanserv/set/private"; permission = "chanserv/saset/private"; }
 
-/*
- * cs_set_restricted
- *
- * Provides the command chanserv/set/restricted.
- *
- * Used for setting whether users not on a channel's access list can join.
- */
-module { name = "cs_set_restricted" }
 command { service = "ChanServ"; name = "SET RESTRICTED"; command = "chanserv/set/restricted"; }
 command { service = "ChanServ"; name = "SASET RESTRICTED"; command = "chanserv/set/restricted"; permission = "chanserv/saset/restricted"; }
 
-/*
- * cs_set_secure
- *
- * Provides the command chanserv/set/secure.
- *
- * Used for setting whether users who are recognized for accounts should have their access in channels.
- */
-module { name = "cs_set_secure" }
 command { service = "ChanServ"; name = "SET SECURE"; command = "chanserv/set/secure"; }
 command { service = "ChanServ"; name = "SASET SECURE"; command = "chanserv/set/secure"; permission = "chanserv/saset/secure"; }
 
-/*
- * cs_set_securefounder
- *
- * Provides the command chanserv/set/securefounder.
- *
- * Used for setting whether users with founder level access in channels have true founder or not.
- */
-module { name = "cs_set_securefounder" }
 command { service = "ChanServ"; name = "SET SECUREFOUNDER"; command = "chanserv/set/securefounder"; }
 command { service = "ChanServ"; name = "SASET SECUREFOUNDER"; command = "chanserv/set/securefounder"; permission = "chanserv/saset/securefounder"; }
 
-/*
- * cs_set_secureops
- *
- * Provides the command chanserv/set/secureops.
- *
- * Used for restricting who can have channel op privilege in a channel to those whom have access in the channel.
- */
-module { name = "cs_set_secureops" }
 command { service = "ChanServ"; name = "SET SECUREOPS"; command = "chanserv/set/secureops"; }
 command { service = "ChanServ"; name = "SASET SECUREOPS"; command = "chanserv/set/secureops"; permission = "chanserv/saset/secureops"; }
 
-/*
- * cs_set_signkick
- *
- * Provides the command chanserv/set/signkick.
- *
- * Used for setting signkick, which appends the kicker's name to kicks sent through ChanServ.
- */
-module { name = "cs_set_signkick" }
 command { service = "ChanServ"; name = "SET SIGNKICK"; command = "chanserv/set/signkick"; }
 command { service = "ChanServ"; name = "SASET SIGNKICK"; command = "chanserv/set/signkick"; permission = "chanserv/saset/signkick"; }
 
-/*
- * cs_set_successor
- * 
- * Provides the command chanserv/set/successor.
- *
- * Used for setting channel successors, which become channel founders if the founders account expires.
- */
-module { name = "cs_set_successor" }
 command { service = "ChanServ"; name = "SET SUCCESSOR"; command = "chanserv/set/successor"; }
 command { service = "ChanServ"; name = "SASET SUCCESSOR"; command = "chanserv/set/successor"; permission = "chanserv/saset/successor"; }
 
-/*
- * cs_set_topiclock
- *
- * Provides the command chanserv/set/topiclock.
- *
- * Used for setting topiclock, which prevents channel topics from being modified.
- */
-module { name = "cs_set_topiclock" }
 command { service = "ChanServ"; name = "SET TOPICLOCK"; command = "chanserv/set/topiclock"; }
 command { service = "ChanServ"; name = "SASET TOPICLOCK"; command = "chanserv/set/topiclock"; permission = "chanserv/saset/topiclock"; }
 
+command { service = "ChanServ"; name = "SASET NOEXPIRE"; command = "chanserv/saset/noexpire"; permission = "chanserv/saset/noexpire"; }
+
 /*
- * cs_set_noexpire
+ * cs_set_misc
  *
- * Provides the command chanserv/saset/noexpire.
+ * Provides the command chanserv/set/misc.
  *
- * Used for setting noexpire, which prevents channels from expiring.
+ * Allows you to create arbitrary commands to set data, and have that data show up in chanserv/info.
  */
-module { name = "cs_saset_noexpire" } 
-command { service = "ChanServ"; name = "SASET NOEXPIRE"; command = "chanserv/saset/noexpire"; permission = "chanserv/saset/noexpire"; }
+module { name = "cs_set_misc" }
+command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; }
+command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; }
 
 /*
  * cs_status
@@ -1374,3 +1254,15 @@ command { service = "ChanServ"; name = "AOP"; command = "chanserv/aop"; }
 command { service = "ChanServ"; name = "HOP"; command = "chanserv/hop"; }
 command { service = "ChanServ"; name = "VOP"; command = "chanserv/vop"; }
 
+/*
+ * Extra ChanServ related modules.
+ */
+
+/*
+ * cs_statusupdate
+ *
+ * This module automatically updates users status on channels when the
+ * channel's access list is modified.
+ */
+module { name = "cs_statusupdate" }
+