A few small fixes

16 files changed, 17 insertions, 17 deletions

diff --git a/modules/core/cs_set_bantype.cpp b/modules/core/cs_set_bantype.cpp
index 3dcecfd69..e126ae275 100644
--- a/modules/core/cs_set_bantype.cpp
+++ b/modules/core/cs_set_bantype.cpp
@@ -19,7 +19,7 @@ class CommandCSSetBanType : public Command
 	CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Set how Services make bans on the channel"));
-		this->SetSyntax(_("\037channel\037 BANTYPE \037bantype\037"));
+		this->SetSyntax(_("\037channel\037 \037bantype\037"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_description.cpp b/modules/core/cs_set_description.cpp
index 726ea5655..b6e65ca5a 100644
--- a/modules/core/cs_set_description.cpp
+++ b/modules/core/cs_set_description.cpp
@@ -19,7 +19,7 @@ class CommandCSSetDescription : public Command
 	CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description", const Anope::string &cpermission = "") : Command(creator, cname, 1, 2, cpermission)
 	{
 		this->SetDesc(_("Set the channel description"));
-		this->SetSyntax(_("\037channel\037 DESC [\037description\037]"));
+		this->SetSyntax(_("\037channel\037 [\037description\037]"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_founder.cpp b/modules/core/cs_set_founder.cpp
index 97eec8500..aeb29cada 100644
--- a/modules/core/cs_set_founder.cpp
+++ b/modules/core/cs_set_founder.cpp
@@ -16,10 +16,10 @@
 class CommandCSSetFounder : public Command
 {
  public:
-	CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder", const Anope::string &cpermission = "") : Command(creator, "chanserv/founder", 2, 2, cpermission)
+	CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Set the founder of a channel"));
-		this->SetSyntax(_("\037channel\037 FOUNDER \037nick\037"));
+		this->SetSyntax(_("\037channel\037 \037nick\037"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp
index 497509753..4ff3b6f92 100644
--- a/modules/core/cs_set_keeptopic.cpp
+++ b/modules/core/cs_set_keeptopic.cpp
@@ -19,7 +19,7 @@ class CommandCSSetKeepTopic : public Command
 	CommandCSSetKeepTopic(Module *creator, const Anope::string &cname = "chanserv/set/keeptopic", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Retain topic when channel is not in use"));
-		this->SetSyntax(_("\037channel\037 KEEPTOPIC {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp
index 558bab5c3..e73bd21ce 100644
--- a/modules/core/cs_set_opnotice.cpp
+++ b/modules/core/cs_set_opnotice.cpp
@@ -19,7 +19,7 @@ class CommandCSSetOpNotice : public Command
 	CommandCSSetOpNotice(Module *creator, const Anope::string &cname = "chanserv/set/notice", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Send a notice when OP/DEOP commands are used"));
-		this->SetSyntax(_("\037channel\037 OPNOTICE {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp
index e51f9e81b..76e95e55d 100644
--- a/modules/core/cs_set_peace.cpp
+++ b/modules/core/cs_set_peace.cpp
@@ -19,7 +19,7 @@ class CommandCSSetPeace : public Command
 	CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Regulate the use of critical commands"));
-		this->SetSyntax(_("\037channel\037 PEACE {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_persist.cpp b/modules/core/cs_set_persist.cpp
index 86d5ef2ca..5625c6c76 100644
--- a/modules/core/cs_set_persist.cpp
+++ b/modules/core/cs_set_persist.cpp
@@ -19,7 +19,7 @@ class CommandCSSetPersist : public Command
 	CommandCSSetPersist(Module *creator, const Anope::string &cname = "chanserv/set/persist", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Set the channel as permanent"));
-		this->SetSyntax(_("\037channel\037 PERSIST {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp
index 0aaa04d91..358a98718 100644
--- a/modules/core/cs_set_private.cpp
+++ b/modules/core/cs_set_private.cpp
@@ -19,7 +19,7 @@ class CommandCSSetPrivate : public Command
 	CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Hide channel from LIST command"));
-		this->SetSyntax(_("\037channel\037 PRIVATE {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_restricted.cpp b/modules/core/cs_set_restricted.cpp
index 6bbdb5299..4178af110 100644
--- a/modules/core/cs_set_restricted.cpp
+++ b/modules/core/cs_set_restricted.cpp
@@ -18,7 +18,7 @@ class CommandCSSetRestricted : public Command
 	CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Restrict access to the channel"));
-		this->SetSyntax(_("\037channel\037 RESTRICTED {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp
index 73013be32..99085611e 100644
--- a/modules/core/cs_set_secure.cpp
+++ b/modules/core/cs_set_secure.cpp
@@ -19,7 +19,7 @@ class CommandCSSetSecure : public Command
 	CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Activate security features"));
-		this->SetSyntax(_("\037channel\037 SECURE {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_securefounder.cpp b/modules/core/cs_set_securefounder.cpp
index f620a128b..aceb120a3 100644
--- a/modules/core/cs_set_securefounder.cpp
+++ b/modules/core/cs_set_securefounder.cpp
@@ -19,7 +19,7 @@ class CommandCSSetSecureFounder : public Command
 	CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Stricter control of channel founder status"));
-		this->SetDesc(_("\037channel\037 SECUREFOUNDER {ON | OFF}"));
+		this->SetDesc(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_successor.cpp b/modules/core/cs_set_successor.cpp
index be10a4b63..9807b44d3 100644
--- a/modules/core/cs_set_successor.cpp
+++ b/modules/core/cs_set_successor.cpp
@@ -19,7 +19,7 @@ class CommandCSSetSuccessor : public Command
 	CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor", const Anope::string &cpermission = "") : Command(creator, cname, 1, 2, cpermission)
 	{
 		this->SetDesc(_("Set the successor for a channel"));
-		this->SetSyntax(_("\037channel\037 SUCCESSOR \037nick\037"));
+		this->SetSyntax(_("\037channel\037 \037nick\037"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp
index 5e7e4447b..a6f88460d 100644
--- a/modules/core/cs_set_topiclock.cpp
+++ b/modules/core/cs_set_topiclock.cpp
@@ -19,7 +19,7 @@ class CommandCSSetTopicLock : public Command
 	CommandCSSetTopicLock(Module *creator, const Anope::string &cname = "chanserv/set/topiclock", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Topic can only be changed with TOPIC"));
-		this->SetSyntax(_("\037channel\037 TOPICLOCK {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp
index 256fca0bf..00b945fe2 100644
--- a/modules/core/cs_set_xop.cpp
+++ b/modules/core/cs_set_xop.cpp
@@ -20,7 +20,7 @@ class CommandCSSetXOP : public Command
 	CommandCSSetXOP(Module *creator, const Anope::string &cname = "chanserv/set/xop", const Anope::string &cpermission = "") : Command(creator, cname, 2, 2, cpermission)
 	{
 		this->SetDesc(_("Toggle the user privilege system"));
-		this->SetSyntax(_("\037channel\037 XOP {ON | OFF}"));
+		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp
index f3444a4ca..2e23e1f51 100644
--- a/modules/core/ns_group.cpp
+++ b/modules/core/ns_group.cpp
@@ -255,7 +255,7 @@ class CommandNSGList : public Command
 			{
 				NickAlias *na2 = *it;
 
-				source.Reply(na2->HasFlag(NS_NO_EXPIRE) ? _("   %s (does not expire)") : _("   %s (expires in %s)"), na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
+				source.Reply(na2->HasFlag(NS_NO_EXPIRE) || !Config->NSExpire ? _("   %s (does not expire)") : _("   %s (expires in %s)"), na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
 			}
 			source.Reply(_("%d nicknames in the group."), nc->aliases.size());
 		}
diff --git a/modules/core/ns_info.cpp b/modules/core/ns_info.cpp
index 5c8fd1fcd..5a1c4520b 100644
--- a/modules/core/ns_info.cpp
+++ b/modules/core/ns_info.cpp
@@ -125,7 +125,7 @@ class CommandNSInfo : public Command
 
 				if (na->nc->HasFlag(NI_UNCONFIRMED) == false)
 				{
-					if (na->HasFlag(NS_NO_EXPIRE))
+					if (na->HasFlag(NS_NO_EXPIRE) || !Config->NSExpire)
 						source.Reply(_("This nickname will not expire."));
 					else
 						source.Reply(_("Expires on: %s"), do_strftime(na->last_seen + Config->NSExpire).c_str());