Merge pull request #8 from Robby-/1.9

Some more typo and help text fixes, missing privileges, settings corrections, and cs_enforce changes

86 files changed, 579 insertions, 526 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 93d9a9d16..9f13850cb 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the BotServ client
+	 * The name of the BotServ client.
 	 */
 	nick = "BotServ"
 
@@ -149,7 +149,7 @@ botserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index e885fd8fe..aec506c8e 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the ChanServ client
+	 * The name of the ChanServ client.
 	 */
 	nick = "ChanServ"
 
@@ -873,7 +873,7 @@ command_group
 	description = "Services Operator commands"
 }
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/chanstats.example.conf b/data/chanstats.example.conf
index 3244ce751..0f131a85a 100644
--- a/data/chanstats.example.conf
+++ b/data/chanstats.example.conf
@@ -1,5 +1,5 @@
 /*
- * Example configuration file for chanstats
+ * Example configuration file for Chanstats.
  * Make sure BotServ, ChanServ and NickServ are running.
  */
 
diff --git a/data/example.conf b/data/example.conf
index ae6ead694..d0b02593e 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -737,7 +737,7 @@ log
  *
  * Available privileges:
  *  botserv/administration        - Can view and assign private BotServ bots
- *  chanserv/access/modify        - Can modify channel access and akick lists
+ *  chanserv/access/modify        - Can modify channel access and akick lists, and use /chanserv enforce
  *  chanserv/auspex               - Can see any information with /chanserv info
  *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
  *  chanserv/set                  - Can modify the settings of any channel (incl. changing of the owner!)
@@ -778,9 +778,9 @@ log
  *   global/global
  *
  *   operserv/news         operserv/stats        operserv/kick       operserv/exception    operserv/seen
- *   operserv/mode         operserv/session      operserv/modinfo    operserv/ignore
- *   operserv/chankill     operserv/akill        operserv/sqline     operserv/snline
- *   operserv/global       operserv/oper         operserv/config     operserv/umode
+ *   operserv/mode         operserv/session      operserv/modinfo    operserv/ignore       operserv/chanlist
+ *   operserv/chankill     operserv/akill        operserv/sqline     operserv/snline       operserv/userlist
+ *   operserv/global       operserv/oper         operserv/config     operserv/umode        operserv/logsearch
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
  *   operserv/shutdown     operserv/svs          operserv/oline      operserv/kill
@@ -1178,7 +1178,8 @@ module { name = "enc_sha256" }
  */
 #module { name = "enc_old" }
 
-/* Extra (optional) modules */
+
+/* Extra (optional) modules. */
 include
 {
 	type = "file"
@@ -1186,10 +1187,9 @@ include
 }
 
 /*
- * Chanstats Modules
- * Requires a MySQL Database
+ * Chanstats module.
+ * Requires a MySQL Database.
  */
-
 #include
 #{
 #	type = "file"
diff --git a/data/global.example.conf b/data/global.example.conf
index dfc7ad163..2ae7cdc99 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the Global client
+	 * The name of the Global client.
 	 */
 	nick = "Global"
 
@@ -109,7 +109,7 @@ global
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "Global"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 6b1b471c4..1d406ef5b 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the HostServ client
+	 * The name of the HostServ client.
 	 */
 	nick = "HostServ"
 
@@ -108,7 +108,7 @@ hostserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index 84ad32f06..40678bf53 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the MemoServ client
+	 * The name of the MemoServ client.
 	 */
 	nick = "MemoServ"
 
@@ -111,7 +111,7 @@ memoserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 350c85193..fea868c02 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -9,7 +9,7 @@
 /*
  * help
  *
- * Provides commands generic/help
+ * Provides the command generic/help.
  *
  * This is a generic help command that can be used with any client.
  */
@@ -153,16 +153,16 @@ m_helpchan
 #module { name = "m_httpd" }
 httpd
 {
-	/* Name of this service */
+	/* Name of this service. */
 	name = "httpd/main"
 
-	/* IP to listen on */
+	/* IP to listen on. */
 	ip = "0.0.0.0"
 
-	/* Port to listen on */
+	/* Port to listen on. */
 	port = 8080
 
-	/* Time before connections to this server are timed out */
+	/* Time before connections to this server are timed out. */
 	timeout = 30
 
 	/* Listen using SSL. Requires m_ssl. */
@@ -242,12 +242,12 @@ m_ldap_authentication
 	password_attribute = "userPassword"
 
 	/*
-	 * Enable to have this module disable /nickserv register.
+	 * Enable this to have this module disable "/msg NickServ REGISTER".
 	 */
 	disable_ns_register = false
 
 	/*
-	 * The reason to give the users who try to /ns register if
+	 * The reason to give the users who try to "/msg NickServ REGISTER" if
 	 * disable_ns_register is enabled.
 	 */
 	#disable_reason = "To register on this network, visit http://some.misconfigured.site/register"
@@ -301,7 +301,7 @@ m_ldap_oper
 #module { name = "m_mysql" }
 mysql
 {
-	/* The name of this service */
+	/* The name of this service. */
 	name = "mysql/main"
 	database = "anope"
 	server = "127.0.0.1"
@@ -377,13 +377,13 @@ m_proxyscan
  */
 proxyscan
 {
-	/* The type of proxy to check for. A comma separated list is allowed */
+	/* The type of proxy to check for. A comma separated list is allowed. */
 	type = "HTTP"
 
-	/* The ports to check */
+	/* The ports to check. */
 	port = "80,8080"
 
-	/* How long to set the ban for */
+	/* How long to set the ban for. */
 	time = 4h
 
 	/*
@@ -433,12 +433,12 @@ m_sql_authentication
 	query = "SELECT `email_addr` AS `email` FROM `my_users` WHERE `username` = @a@ AND `password` = MD5(CONCAT('salt', @p@))"
 
 	/*
-	 * Enable to have this module disable /nickserv register.
+	 * Enable this to have this module disable "/msg NickServ REGISTER".
 	 */
 	disable_ns_register = false
 
 	/*
-	 * The reason to give the users who try to /ns register if
+	 * The reason to give the users who try to "/msg NickServ REGISTER" if
 	 * disable_ns_register is enabled.
 	 */
 	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
@@ -477,7 +477,7 @@ m_sql_oper
 #module { name = "m_sqlite" }
 sqlite
 {
-	/* The name of this service */
+	/* The name of this service. */
 	name = "sqlite/main"
 
 	/* The database name, it will be created if it does not exist. */
@@ -516,7 +516,7 @@ module { name = "m_rewrite" }
 #{
 #	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
 #
-#	/* Enable m_rewrite */
+#	/* Enable m_rewrite. */
 #	rewrite = true
 #
 #	/* Source message to match. A $ can be used to match anything. */
@@ -589,15 +589,15 @@ m_xmlrpc
 #module { name = "webcpanel" }
 webcpanel
 {
-	/* Web server to use */
+	/* Web server to use. */
 	server = "httpd/main";
 
-	/* Template to use */
+	/* Template to use. */
 	template = "default";
 
-	/* Page title */
+	/* Page title. */
 	title = "Anope IRC Services";
 
-	/* Whether or not to use https on redirecting URLS */
+	/* Whether or not to use https on redirecting URLs. */
 	ssl = no
 }
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 1030f08f5..be36e0e4a 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the NickServ client
+	 * The name of the NickServ client.
 	 */
 	nick = "NickServ"
 
@@ -317,7 +317,7 @@ command_group
 	description = "Services Operator commands"
 }
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "NickServ"; name = "HELP"; command = "generic/help"; }
 
 /*
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 5ffc015a4..8e2afbc0a 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -9,7 +9,7 @@
 service
 {
 	/*
-	 * The name of the OperServ client
+	 * The name of the OperServ client.
 	 */
 	nick = "OperServ"
 
@@ -185,7 +185,7 @@ operserv
 
 	/*
 	 * Sets the CIDR value used to determine which IP addresses represent the same person.
-	 * By default this would limit 3 connections per IPv4 IP and 3 conenctions per IPv6 IP.
+	 * By default this would limit 3 connections per IPv4 IP and 3 connections per IPv6 IP.
 	 */
 	session_ipv4_cidr = 32
 	session_ipv6_cidr = 128
@@ -223,7 +223,7 @@ operserv
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
-/* Give it a help command */
+/* Give it a help command. */
 command { service = "OperServ"; name = "HELP"; command = "generic/help"; }
 
 /*
@@ -350,7 +350,7 @@ defcon
 	 * Defines the reason to use when clients are KILLed or AKILLed from the network while the proper
 	 * DefCon operation is in effect.
 	 */
-	#akillreason = "This network is currently not accepting connections, please try again later"
+	#akillreason = "This network is currently not accepting connections, please try again later."
 }
 
 /*
@@ -481,8 +481,8 @@ command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permis
  * Used to list and search the channels and users currently on the network.
  */
 module { name = "os_list" }
-command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; }
-command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; }
+command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; permission = "operserv/chanlist"; }
+command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; permission = "operserv/userlist"; }
 
 /*
  * os_login
@@ -503,7 +503,7 @@ command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout"; }
  * Used to search services log files.
  */
 module { name = "os_logsearch" }
-command { service = "OperServ"; name = "LOGSEARCH"; command = "operserv/logsearch"; }
+command { service = "OperServ"; name = "LOGSEARCH"; command = "operserv/logsearch"; permission = "operserv/logsearch"; }
 logsearch
 {
 	/* The log file name to search. There should be a log{} block configured to log
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index 65977cf04..147b23b95 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -110,18 +110,18 @@ class CommandBSBadwords : public Command
 		}