Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 47 insertions, 58 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 08954eaa6..6dc40991a 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -56,17 +56,14 @@ service
  *
  * Provides essential functionality for ChanServ.
  */
-module { name = "chanserv" }
-
-/*
- * Configuration for ChanServ provided by cs_main.
- */
-chanserv
+module
 {
+	name = "chanserv"
+
 	/*
 	 * The name of the client that should be ChanServ.
 	 */
-	name = "ChanServ"
+	client = "ChanServ"
 
 	/*
 	 * The default options for newly registered channels. Note that changing these options
@@ -95,7 +92,7 @@ chanserv
 	 * This directive is optional, if left blank, the options will default to keeptopic, secure, securefounder,
 	 * and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults="keeptopic peace secure securefounder signkick"
+	defaults = "keeptopic peace secure securefounder signkick"
 
 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
@@ -114,23 +111,7 @@ chanserv
 	expire = 14d
 
 	/*
-	 * The length of time before a suspended channel becomes unsuspended.
-	 *
-	 * This directive is optional.
-	 * If not set, the default is never.
-	 */
-	#suspendexpire = 90d
-
-	/*
-	 * The lenth of time before a forbidden channel drops.
-	 *
-	 * This directive is optional.
-	 * If not set, the default is never.
-	 */
-	#forbidexpire = 90d
-
-	/*
-	 * The default ban type for newly registered channels (and when importing old databases).
+	 * The default ban type for newly registered channels.
 	 *
 	 * defbantype can be:
 	 *
@@ -147,27 +128,12 @@ chanserv
 	accessmax = 1024
 
 	/*
-	 * The maximum number of entries on a channel's autokick list.
-	 */
-	autokickmax = 32
-
-	/*
-	 * The default reason for an autokick if none is given.
-	 */
-	autokickreason = "User has been banned from the channel"
-
-	/*
 	 * The length of time ChanServ stays in a channel after kicking a user from a channel they are not
 	 * permitted to be in. This only occurs when the user is the only one in the channel.
 	 */
 	inhabit = 15s
 
 	/*
-	 * The maximum number of channels to be returned for a ChanServ LIST command.
-	 */
-	listmax = 50
-
-	/*
 	 * Allow only IRC Operators to use ChanServ.
 	 *
 	 * This directive is optional.
@@ -195,18 +161,6 @@ chanserv
 	require = "r"
 
 	/*
-	 * Some IRCds can enforce mode locks server-side. This reduces the spam caused by
-	 * services immediately reversing mode changes for locked modes.
-	 */
-	use_server_side_mlock = yes
-
-	/*
-	 * Some IRCds can enforce topic locks server-side. This reduces the spam caused by
-	 * services immediately reversing topic changes.
-	 */
-	use_server_side_topiclock = yes
-
-	/*
 	 * The maximum length of the reason field for user commands such as chanserv/kick
 	 * and chanserv/ban.
 	 */
@@ -902,7 +856,21 @@ command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; gr
  *
  * Used for preventing users from joining channels.
  */
-module { name = "cs_akick" }
+module
+{
+	name = "cs_akick"
+
+	/*
+	 * The maximum number of entries on a channel's autokick list.
+	 */
+	autokickmax = 32
+
+	/*
+	 * The default reason for an autokick if none is given.
+	 */
+	autokickreason = "User has been banned from the channel"
+}
+
 command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management"; }
 
 /*
@@ -952,13 +920,14 @@ command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce";
  *
  * Used to configure entry messages sent to users when they join a channel.
  */
-module { name = "cs_entrymsg" }
-command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"; group = "chanserv/management"; }
-cs_entrymsg
+module
 {
+	name = "cs_entrymsg"
+
 	/* The maximum number of entrymsgs allowed per channel. If not set, defaults to 5. */
 	maxentries = 5
 }
+command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"; group = "chanserv/management"; }
 
 /*
  * cs_flags
@@ -1018,7 +987,16 @@ command { service = "ChanServ"; name = "KICK"; command = "chanserv/kick"; }
  *
  * Used for retrieving and searching the registered channel list.
  */
-module { name = "cs_list" }
+module
+{
+	name = "cs_list"
+
+	/*
+	 * The maximum number of channels to be returned for a ChanServ LIST command.
+	 */
+	listmax = 50
+}
+
 command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin"; }
 
 /*
@@ -1143,7 +1121,18 @@ command { service = "ChanServ"; name = "STATUS"; command = "chanserv/status"; }
  *
  * Used for suspending and unsuspending channels. Suspended channels can not be used but their settings are stored.
  */
-module { name = "cs_suspend" }
+module
+{
+	name = "cs_suspend"
+
+	/*
+	 * The length of time before a suspended channel expires.
+	 *
+	 * This directive is optional.
+	 * If not set, the default is never.
+	 */
+	expire = 90d
+}
 command { service = "ChanServ"; name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend"; group = "chanserv/admin"; }
 command { service = "ChanServ"; name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; group = "chanserv/admin"; }