Removed a whole lot of strchr's looking for mode +o where we can do if *user->oper

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

7 files changed, 8 insertions, 8 deletions

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 7c13d678a..5f7be1580 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -71,7 +71,7 @@ class ModuleNoNickChange : public Module
 					chanrec* curr = user->chans[i].channel;
 					if (curr->IsCustomModeSet('N'))
 					{
-						if (!strchr(user->modes,'o'))
+						if (!*user->oper)
 						{
 							// don't allow the nickchange, theyre on at least one channel with +N set
 							// and theyre not an oper
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 1ec4b4fc7..fb181d1f5 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -49,7 +49,7 @@ class ModuleOperChans : public Module
 		{
 			chanrec* chan = (chanrec*)target;
 			
-			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (strchr(user->modes,'o')))
+			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
 			{
 				log(DEBUG,"Allowing mode +O");
 				return 1;
@@ -75,7 +75,7 @@ class ModuleOperChans : public Module
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
-		if (!strchr(user->modes,'o'))
+		if (!*user->oper)
 		{
 			if (chan)
 			{
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index da3ab18b3..bf5596330 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -52,7 +52,7 @@ class ModuleOperLevels : public Module
 		{
 			long dest_level = 0,source_level = 0;
 			// oper killing an oper?
-			if (strchr(dest->modes,'o'))
+			if (*dest->oper)
 			{
 				for (int j =0; j < conf->Enumerate("type"); j++)
 				{
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index b6cafbc77..8dfc5dd6f 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -174,7 +174,7 @@ class ModuleOverride : public Module
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
-		if (strchr(user->modes,'o'))
+		if (*user->oper)
 		{
 			if (chan)
 			{
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 0ca0dd921..d4fbdfbb5 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -68,7 +68,7 @@ class ModuleRestrictChans : public Module
 	{
 		irc::string x = cname;
 		// user is not an oper and its not in the allow list
-		if ((!strchr(user->modes,'o')) && (allowchans.find(x) == allowchans.end()))
+		if ((!*user->oper) && (allowchans.find(x) == allowchans.end()))
 		{
 			// channel does not yet exist (record is null, about to be created IF we were to allow it)
 			if (!chan)
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index f960c65c8..c51ea4850 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -48,7 +48,7 @@ class ModuleRestrictMsg : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
+			if (*u->oper || *user->oper)
 			{
 				// message allowed if:
 				// (1) the sender is opered
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 48befe370..4ffeca3d5 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -44,7 +44,7 @@ class cmd_userip : public command_t
 	                userrec *u = Find(parameters[i]);
 	                if (u)
 	                {
-	                        snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,strchr(u->modes,'o') ? "*" : "",u->ident,(char*)inet_ntoa(u->ip4));
+	                        snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,(char*)inet_ntoa(u->ip4));
 	                        strlcat(Return,junk,MAXBUF);
 	                }
 	        }