From ddaa001dafb5122e6e363e4acbbe6ce045b7b104 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 21 Jan 2013 22:31:16 -0500 Subject: Merge usefulness of Flags and Extensible classes into Extensible, made most flags we have juse strings instead of defines/enums --- modules/commands/cs_list.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/commands/cs_list.cpp') diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index 7c34c4c36..09e89c219 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -78,11 +78,11 @@ class CommandCSList : public Command { const ChannelInfo *ci = it->second; - if (!is_servadmin && (ci->HasFlag(CI_PRIVATE) || ci->HasFlag(CI_SUSPENDED))) + if (!is_servadmin && (ci->HasExt("PRIVATE") || ci->HasExt("SUSPENDED"))) continue; - else if (suspended && !ci->HasFlag(CI_SUSPENDED)) + else if (suspended && !ci->HasExt("SUSPENDED")) continue; - else if (channoexpire && !ci->HasFlag(CI_NO_EXPIRE)) + else if (channoexpire && !ci->HasExt("NO_EXPIRE")) continue; if (pattern.equals_ci(ci->name) || ci->name.equals_ci(spattern) || Anope::Match(ci->name, pattern, false, true) || Anope::Match(ci->name, spattern, false, true)) @@ -90,12 +90,12 @@ class CommandCSList : public Command if (((count + 1 >= from && count + 1 <= to) || (!from && !to)) && ++nchans <= Config->CSListMax) { bool isnoexpire = false; - if (is_servadmin && (ci->HasFlag(CI_NO_EXPIRE))) + if (is_servadmin && (ci->HasExt("NO_EXPIRE"))) isnoexpire = true; ListFormatter::ListEntry entry; entry["Name"] = (isnoexpire ? "!" : "") + ci->name; - if (ci->HasFlag(CI_SUSPENDED)) + if (ci->HasExt("SUSPENDED")) entry["Description"] = "[Suspended]"; else entry["Description"] = ci->desc; -- cgit