-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
/* $ModDesc: Provides support for hiding channels with user mode +I */
/** Handles user mode +I
*/
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
{
public:
- HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
- {
- /* Only opers can change other users modes */
- if (source != dest)
- return MODEACTION_DENY;
-
- if (adding)
- {
- if (!dest->IsModeSet('I'))
- {
- dest->SetMode('I',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (dest->IsModeSet('I'))
- {
- dest->SetMode('I',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
};
class ModuleHideChans : public Module
{
-
- HideChans* hm;
+ bool AffectsOpers;
+ HideChans hm;
public:
- ModuleHideChans(InspIRCd* Me)
- : Module(Me)
+ ModuleHideChans() : hm(this)
{
-
- hm = new HideChans(ServerInstance);
- if (!ServerInstance->AddMode(hm))
+ if (!ServerInstance->Modes->AddMode(&hm))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnWhoisLine };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+ OnRehash(NULL);
}
-
virtual ~ModuleHideChans()
{
- ServerInstance->Modes->DelMode(hm);
- delete hm;
}
-
+
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
+ }
+
+ virtual void OnRehash(User* user)
+ {
+ AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
}
- int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+ ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
{
- /* Dont display channels if they have +I set and the
- * person doing the WHOIS is not an oper
- */
- return ((user != dest) && (!IS_OPER(user)) && (numeric == 319) && dest->IsModeSet('I'));
+ /* always show to self */
+ if (user == dest)
+ return MOD_RES_PASSTHRU;
+
+ /* don't touch anything except 319 */
+ if (numeric != 319)
+ return MOD_RES_PASSTHRU;
+
+ /* don't touch if -I */
+ if (!dest->IsModeSet('I'))
+ return MOD_RES_PASSTHRU;
+
+ /* if it affects opers, we don't care if they are opered */
+ if (AffectsOpers)
+ return MOD_RES_DENY;
+
+ /* doesn't affect opers, sender is opered */
+ if (user->HasPrivPermission("users/auspex"))
+ return MOD_RES_PASSTHRU;
+
+ /* user must be opered, boned. */
+ return MOD_RES_DENY;
}
};