Removed super admin requirement for operserv/umode operserv/oline and operserv/svsnick, and replaced with opertype command strings

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2502 5417fbe8-f217-4b02-8779-1006273d7864

16 files changed, 27 insertions, 65 deletions

diff --git a/data/example.conf b/data/example.conf
index b430ed3b5..8440625c9 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -532,7 +532,7 @@ options
  *   operserv/szline       operserv/clearmodes   operserv/staff      operserv/defcon
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
- *   operserv/shutdown
+ *   operserv/shutdown     operserv/svsnick      operserv/oline      operserv/umode
  *
  * First, we define 'opertypes', which are named whatever we want ('Network Administrator', etc).
  * These can contain commands for oper-only strings (see above) which grants access to that specific command,
@@ -563,8 +563,8 @@ opertype
 
 opertype
 {
-	name ="Helper"
-	privs ="hostserv/set"
+	name = "Helper"
+	privs = "hostserv/set"
 }
 
 /*
diff --git a/lang/cat.l b/lang/cat.l
index dd446f223..ef689444d 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -5583,14 +5583,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntax: UMODE user modes
 	
-	Allows Super Admins to set user modes for any user.
+	Allows Services Operators to set user modes for any user.
 	Parameters are the same as for the standard /MODE
 	command.
 
 OPER_HELP_OLINE
 	Syntax: OLINE user flags
 	
-	Allows Super Admins to give Operflags to any user.
+	Allows Services Operators to give Operflags to any user.
 	Flags have to be prefixed with a "+" or a "-". To
 	remove all flags simply type a "-" instead of any flags.
 
@@ -5619,7 +5619,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick newnick
 	
 	Forcefully changes a user's nickname from nick to newnick.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Sintŕxi: AKILL ADD [+expiració] mascara raó
diff --git a/lang/de.l b/lang/de.l
index d1aacc76b..e296acae6 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -5627,14 +5627,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntax: UMODE User Modi
 	
-	Erlaubt es Super Adminstratoren die Usermodi eines 
+	Erlaubt es Services Operators die Usermodi eines 
 	beliebigen Users zu ändern. Der Paramater hat das gleiche 
 	Format wie der normale /MODE Befehl.
 
 OPER_HELP_OLINE
 	Syntax: OLINE User Flags
 	
-	Erlaubt es Super Adminstratoren einem User Operflags 
+	Erlaubt es Services Operators einem User Operflags 
 	zu setzen.Den Flags muss ein "+" oder ein "-" vorangestellt 
 	werden. Um alle Operflags zu entfernen, nutze einfach ein 
 	"-" ohne Operflags.
@@ -5661,7 +5661,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK Nickname Neuer-Nickname
 	
 	Erzwingt die Änderung des Nicknamens eines User zu dem neuen Nicknamen.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Syntax: AKILL ADD [+Zeit] Maske Grund
diff --git a/lang/en_us.l b/lang/en_us.l
index 678f57e9b..07f89e1e8 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -5347,14 +5347,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntax: UMODE user modes
 	
-	Allows Super Admins to set user modes for any user.
+	Allows Services Opers to set user modes for any user.
 	Parameters are the same as for the standard /MODE
 	command.
 
 OPER_HELP_OLINE
 	Syntax: OLINE user flags
 	
-	Allows Super Admins to give Operflags to any user.
+	Allows Services Opers to give Operflags to any user.
 	Flags have to be prefixed with a "+" or a "-". To
 	remove all flags simply type a "-" instead of any flags.
 
@@ -5379,7 +5379,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick newnick
 	
 	Forcefully changes a user's nickname from nick to newnick.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Syntax: AKILL ADD [+expiry] mask reason
diff --git a/lang/es.l b/lang/es.l
index 8d0823c9d..0f711e7ea 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -5552,14 +5552,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Sintaxis: UMODE usuario modos
 	
-	Permite a Super Admins a setear modos de
+	Permite a Services Operators a setear modos de
 	usuarios para cualquier usuario. Los parametros son los
 	mismos que para el comando /MODE.
 
 OPER_HELP_OLINE
 	Sintaxis: OLINE usuario opciones
 	
-	Permite a Super Admins a dar permisos de
+	Permite a Services Operators a dar permisos de
 	operador a cualquier usuario. Las opciones deben estar
 	antepuestas con un "+" o un "-". Para remover todas las
 	opciones simplemente tipear un "-" en vez de cualquier
@@ -5590,7 +5590,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick nuevonick
 	
 	Cambia, a la fuerza, el nick del usuario from nick a nuevonick.
-	Limitado a Super Admins.
 
 OPER_HELP_AKILL
 	Sintaxis: AKILL ADD [+expiracion] mascara razon
diff --git a/lang/fr.l b/lang/fr.l
index 3d3c1f29d..618ae2563 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -5621,7 +5621,7 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntaxe: UMODE pseudo modes
 	
-	Permet aux Super Admins de changer un mode d'un utilisateur.
+	Permet aux Services Operators de changer un mode d'un utilisateur.
 
 OPER_HELP_OLINE
 	Syntaxe: OLINE pseudo flags
@@ -5629,8 +5629,6 @@ OPER_HELP_OLINE
 	Permet de mettre un OperFlag ŕ un utilisateur.
 	Préfixes: "+" et "-". Pour tout supprimer, spécifiez "-"
 
-	Limité aux Super Admins.
-
 OPER_HELP_CLEARMODES
 	Syntaxe: CLEARMODES canal [ALL]
 	
@@ -5656,7 +5654,6 @@ OPER_HELP_SVSNICK
 	Syntaxe: SVSNICK pseudo nouveau-pseudo
 	
 	Force le changement de pseudo d'un pseudo.
-	Limité aux Super Admins.
 
 OPER_HELP_AKILL
 	Syntaxe: AKILL ADD [+échéance] masque raison
diff --git a/lang/gr.l b/lang/gr.l
index 19cf9f574..b03acdbd7 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -5512,14 +5512,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntax: UMODE user modes
 	
-	Allows Super Admins to set user modes for any user.
+	Allows Services Operators to set user modes for any user.
 	Parameters are the same as for the standard /MODE
 	command.
 
 OPER_HELP_OLINE
 	Syntax: OLINE user flags
 	
-	Allows Super Admins to give Operflags to any user.
+	Allows Services Operators to give Operflags to any user.
 	Flags have to be prefixed with a "+" or a "-". To
 	remove all flags simply type a "-" instead of any flags.
 
@@ -5548,7 +5548,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick newnick
 	
 	Forcefully changes a user's nickname from nick to newnick.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Óýíôáîç: AKILL ADD [+expiry] ěÜóęá ëüăďň
diff --git a/lang/hun.l b/lang/hun.l
index edfd55a59..325b1c327 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -5432,8 +5432,6 @@ OPER_HELP_UMODE
 	Megengedi a szervíz adminoknak, hogy egy user felhasználói
 	módjait megváltoztassa. Parameterek ugyanazok mint a
 	szabvány /MODE parancsnál.
-		
-	Korlátozva Szuper adminnak.
 	
 OPER_HELP_OLINE
 	Syntax: OLINE user flagek
@@ -5442,8 +5440,6 @@ OPER_HELP_OLINE
 	operflaget adjon. Előjelként "+" vagy "-" adható meg.
 	Ha csak a "-" paraméter adod meg akkor mindent eltávolít.
 	
-	Korlátozva Szuper adminnak.
-	
 OPER_HELP_CLEARMODES
 	Syntax: CLEARMODES szoba [ALL]
 	
@@ -5469,7 +5465,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick újnick
 	
 	Erőszakkal meváltóztatja a user nickevét újnicknévre.
-	Limited to Super Admins.
 	
 OPER_HELP_AKILL
 	Syntax: AKILL  ADD [ +lejárat] maszk indok
diff --git a/lang/it.l b/lang/it.l
index 57a1aaf07..52ed1a5e2 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -5428,14 +5428,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Sintassi: UMODE nick modi
 	
-	Permette ai Super Admins di impostare i modi per
+	Permette ai Services Operators di impostare i modi per
 	qualsiasi utente. I parametri sono gli stessi del
 	comando /MODE standard.
 
 OPER_HELP_OLINE
 	Sintassi: OLINE nick flag
 	
-	Permette ai Super Admins di impostare le Operflag
+	Permette ai Services Operators di impostare le Operflag
 	per qualsiasi utente. Le flag devono essere introdotte
 	da "+" o "-". Per rimuovere tutte le flag, č sufficiente
 	usare "-" senza altri parametri.
@@ -5461,7 +5461,6 @@ OPER_HELP_SVSNICK
 	Sintassi: SVSNICK nick nuovonick
 	
 	Forza il cambio del nickname di un utente da nick a newnick.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Sintassi: AKILL ADD [+durata] mask motivo
diff --git a/lang/nl.l b/lang/nl.l
index 34a788a44..b2232cad1 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -5503,14 +5503,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Gebruik: UMODE gebruiker modes
 	
-	Stelt Super Admins in staat gebruikersmodes van
+	Stelt Services Operators in staat gebruikersmodes van
 	elke willekeurige gebruiker in te stellen. De paramenters
 	zijn hetzelfde als van een standaard /MODE commando.
 
 OPER_HELP_OLINE
 	Gebruik: OLINE gebruiker flags
 	
-	Stelt Super Admins in staat om Operflags te geven
+	Stelt Services Operators in staat om Operflags te geven
 	aan elke willekeurig gebruiker. Flags moeten worden vooraf
 	gegeaan door een "+" of een "-". Om alle flags te verwijderen
 	kun je simpelweg een "-" typen in plaats van de flags.
@@ -5537,7 +5537,6 @@ OPER_HELP_SVSNICK
 	Gebruik: SVSNICK nick nieuwe nick
 
 	Veranderd een gebruiker's nick van nick naar nieuwe nick.
-	Gelimiteerd tot Super Admins.
 
 OPER_HELP_AKILL
 	Gebruik: AKILL ADD [+verlooptijd] mask reden
diff --git a/lang/pl.l b/lang/pl.l
index b21342758..fb7198f86 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -6544,14 +6544,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Składnia: UMODE użytkownik flagi
 	
-	Pozwala super-administratorom zmieniać flagi
+	Pozwala Services Operators zmieniać flagi
 	innym użytkownikom. Parametry s± identyczne jak
 	dla komendy /MODE.
 
 OPER_HELP_OLINE
 	Składnia: OLINE nick flagi
 	
-	Pozwala super-administratorom na nadanie wskazanemu
+	Pozwala Services Operators na nadanie wskazanemu
 	użytkownikowi uprawnień irc operatora z okre¶lonymi
 	flagami. Flagi powinny być poprzedzone znakami "+" lub "-". 
 	Aby usun±ć wszystkie flagi wystarczy podać "-".
diff --git a/lang/pt.l b/lang/pt.l
index c7ed2e5a8..0e5b0ab4a 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -5380,14 +5380,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Sintaxe: UMODE usuário modos
 	
-	Permite aos Super Admins ajustar os
+	Permite aos Services Operators ajustar os
 	modos de usuário para qualquer usuário. Os parâmetros
 	săo os mesmos do comando /MODE padrăo.
 
 OPER_HELP_OLINE
 	Sintaxe: OLINE usuário flags
 	
-	Permite aos Super Admins dar flags de Oper
+	Permite aos Services Operators dar flags de Oper
 	a qualquer usuário. Flags devem ser prefixadas com "+" ou
 	"-". Para remover todas as flags apenas digite um "-" em
 	vez de usar alguma flag.
@@ -5413,7 +5413,6 @@ OPER_HELP_SVSNICK
 	Sintaxe: SVSNICK nick novo-nick
 	
 	Força a mudança do nick de um usuário, de nick a novo-nick.
-	Limitado aos Super-Admins.
 
 OPER_HELP_AKILL
 	Sintaxe: AKILL ADD [+tempo] máscara motivo
diff --git a/lang/tr.l b/lang/tr.l
index b02371935..96a1d8636 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -5476,14 +5476,14 @@ OPER_HELP_MODE
 OPER_HELP_UMODE
 	Syntax: UMODE user modes
 	
-	Allows Super Admins to set user modes for any user.
+	Allows Services Operators to set user modes for any user.
 	Parameters are the same as for the standard /MODE
 	command.
 
 OPER_HELP_OLINE
 	Syntax: OLINE user flags
 	
-	Allows Super Admins to give Operflags to any user.
+	Allows Services Operators to give Operflags to any user.
 	Flags have to be prefixed with a "+" or a "-". To
 	remove all flags simply type a "-" instead of any flags.
 
@@ -5512,7 +5512,6 @@ OPER_HELP_SVSNICK
 	Syntax: SVSNICK nick newnick
 	
 	Forcefully changes a user's nickname from nick to newnick.
-	Limited to Super Admins.
 
 OPER_HELP_AKILL
 	Kullanýmý: AKILL ADD [+zamanaţýmý] mask sebep
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 6bb7f592a..f394a3449 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -18,7 +18,7 @@
 class CommandOSOLine : public Command
 {
  public:
-	CommandOSOLine() : Command("OLINE", 2, 2)
+	CommandOSOLine() : Command("OLINE", 2, 2, "operserv/oline")
 	{
 	}
 
@@ -28,13 +28,6 @@ class CommandOSOLine : public Command
 		const char *flag = params[1].c_str();
 		User *u2 = NULL;
 
-		/* Only allow this if SuperAdmin is enabled */
-		if (!u->isSuperAdmin)
-		{
-			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-			return MOD_CONT;
-		}
-
 		/* let's check whether the user is online */
 		if (!(u2 = finduser(nick)))
 			notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 6f25528a1..3dfdaf12d 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -18,7 +18,7 @@
 class CommandOSSVSNick : public Command
 {
  public:
-	CommandOSSVSNick() : Command("SVSNICK", 2, 2)
+	CommandOSSVSNick() : Command("SVSNICK", 2, 2, "operserv/svsnick")
 	{
 	}
 
@@ -30,13 +30,6 @@ class CommandOSSVSNick : public Command
 		NickAlias *na;
 		const char *c;
 
-		/* Only allow this if SuperAdmin is enabled */
-		if (!u->isSuperAdmin)
-		{
-			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-			return MOD_CONT;
-		}
-
 		/* Truncate long nicknames to NICKMAX-2 characters */
 		if (strlen(newnick) > NICKMAX - 2)
 		{
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 353838eae..9868f4653 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -18,7 +18,7 @@
 class CommandOSUMode : public Command
 {
  public:
-	CommandOSUMode() : Command("UMODE", 2, 2)
+	CommandOSUMode() : Command("UMODE", 2, 2, "operserv/umode")
 	{
 	}
 
@@ -29,13 +29,6 @@ class CommandOSUMode : public Command
 
 		User *u2;
 
-		/* Only allow this if SuperAdmin is enabled */
-		if (!u->isSuperAdmin)
-		{
-			notice_lang(s_OperServ, u, OPER_SUPER_ADMIN_ONLY);
-			return MOD_CONT;
-		}
-
 		/**
 		 * Only accept a +/- mode string
 		 *-rob