Where others charge, we give for free. Have fun and use wisely. With great power comes great responsbility.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6867 e03df62e-2008-0410-955e-edbf42e46eb7

5 files changed, 39 insertions, 4 deletions

diff --git a/src/channels.cpp b/src/channels.cpp
index 23aeb32a1..00f8dbce6 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -838,6 +838,9 @@ void chanrec::UserList(userrec *user)
 			continue;
 		}
 
+		if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+			continue;
+
 		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
 
 		curlen += ptrlen;
diff --git a/src/mode.cpp b/src/mode.cpp
index 7a31038a6..8f74f92bf 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -490,6 +490,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 								
 								for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
 								{
+									ServerInstance->Log(DEBUG,"Call mode watcher");
 									if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
 									{
 										abort = true;
@@ -506,13 +507,28 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 								if (abort)
 									continue;
 							}
+							else
+							{
+								/* Fix by brain: mode watchers not being called for parameterless modes */
+								for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++)
+								{
+									if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type) == false)
+									{
+										abort = true;
+										break;
+									}
+								}
+
+								if (abort)
+									continue;
+							}
 
 							/* It's an oper only mode, check if theyre an oper. If they arent,
 							 * eat any parameter that  came with the mode, and continue to next
 							 */
 							if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
 							{
-								user->WriteServ("481 %s :Permission Denied- Only IRC operators may %sset %s mode %c", user->nick,
+								user->WriteServ("481 %s :Permission Denied - Only IRC operators may %sset %s mode %c", user->nick,
 										adding ? "" : "un", type == MODETYPE_CHANNEL ? "channel" : "user",
 										modehandlers[handler_id]->GetModeChar());
 								continue;
@@ -925,6 +941,7 @@ bool ModeParser::AddModeWatcher(ModeWatcher* mw)
 	pos = (mw->GetModeChar()-65) | mask;
 
 	modewatchers[pos].push_back(mw);
+
 	return true;
 }
 
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 43bfef445..364771398 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -23,7 +23,7 @@
 class HideOper : public ModeHandler
 {
  public:
-	HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
+	HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 'o', false, MODETYPE_USER, true) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 8aa15f965..badbae074 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -81,9 +81,11 @@ class ModuleNamesX : public Module
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{
 				if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
-				{
 					continue;
-				}
+
+				if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+					continue;
+
 				size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->second), i->second->nick);
 				curlen += ptrlen;
 				ptr += ptrlen;
diff --git a/src/users.cpp b/src/users.cpp
index f75a2cf9f..59d19adff 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -338,6 +338,7 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
 	sendq = "";
 	WriteError = "";
 	res_forward = res_reverse = NULL;
+	Visibility = NULL;
 	ip = NULL;
 	chans.clear();
 	invites.clear();
@@ -1952,4 +1953,16 @@ const char* userrec::GetOperQuit()
 	return operquit ? operquit : "";
 }
 
+VisData::VisData()
+{
+}
+
+VisData::~VisData()
+{
+}
+
+bool VisData::VisibleTo(userrec* user)
+{
+	return true;
+}