BUILD : 1.7.10 (853) BUGS : NOTES : Moved SET for other nicks (SA only) to a seperate SASET command

git-svn-id: svn://svn.anope.org/anope/trunk@853 31f1291d-b8d6-0310-a050-a5561fc1590b


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

19 files changed, 4089 insertions, 412 deletions

diff --git a/Changes b/Changes
index 381c8960c..ba21b6299 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Anope Version  S V N
 --------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
+08/21 A NickServ SASET to set options on other nicks (split from SET).    [ #00]
 08/10 A New Windows installation files.                                   [ #00]
 07/04 A Warning when running Anope as root (DON'T DO THAT! :)).           [ #00]
 07/01 A Events for channel access/xop updates.                            [ #00]
diff --git a/Changes.lang b/Changes.lang
index 1b037e38a..aaa487ae9 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -1,10 +1,86 @@
 Anope Version  S V N
 --------------------
 *** New Strings:
+	NICK_SASET_SYNTAX
+	NICK_SASET_DISABLED
+	NICK_SASET_UNKNOWN_OPTION
+	NICK_SASET_BAD_NICK
+	NICK_SASET_OPTION_DISABLED
+	NICK_SASET_DISPLAY_INVALID
+	NICK_SASET_DISPLAY_CHANGED
+	NICK_SASET_PASSWORD_FAILED
+	NICK_SASET_PASSWORD_CHANGED
+	NICK_SASET_PASSWORD_CHANGED_TO
+	NICK_SASET_LANGUAGE_SYNTAX
+	NICK_SASET_LANGUAGE_UNKNOWN
+	NICK_SASET_LANGUAGE_CHANGED
+	NICK_SASET_URL_CHANGED
+	NICK_SASET_URL_UNSET
+	NICK_SASET_EMAIL_CHANGED
+	NICK_SASET_EMAIL_UNSET
+	NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
+	NICK_SASET_ICQ_CHANGED
+	NICK_SASET_ICQ_UNSET
+	NICK_SASET_ICQ_INVALID
+	NICK_SASET_GREET_CHANGED
+	NICK_SASET_GREET_UNSET
+	NICK_SASET_KILL_SYNTAX
+	NICK_SASET_KILL_IMMED_SYNTAX
+	NICK_SASET_KILL_ON
+	NICK_SASET_KILL_QUICK
+	NICK_SASET_KILL_IMMED
+	NICK_SASET_KILL_IMMED_DISABLED
+	NICK_SASET_KILL_OFF
+	NICK_SASET_SECURE_SYNTAX
+	NICK_SASET_SECURE_ON
+	NICK_SASET_SECURE_OFF
+	NICK_SASET_PRIVATE_SYNTAX
+	NICK_SASET_PRIVATE_ON
+	NICK_SASET_PRIVATE_OFF
+	NICK_SASET_HIDE_SYNTAX
+	NICK_SASET_HIDE_EMAIL_ON
+	NICK_SASET_HIDE_EMAIL_OFF
+	NICK_SASET_HIDE_MASK_ON
+	NICK_SASET_HIDE_MASK_OFF
+	NICK_SASET_HIDE_QUIT_ON
+	NICK_SASET_HIDE_QUIT_OFF
+	NICK_SASET_HIDE_STATUS_ON
+	NICK_SASET_HIDE_STATUS_OFF
+	NICK_SASET_MSG_SYNTAX
+	NICK_SASET_MSG_ON
+	NICK_SASET_MSG_OFF
+	NICK_SASET_NOEXPIRE_SYNTAX
+	NICK_SASET_NOEXPIRE_ON
+	NICK_SASET_NOEXPIRE_OFF
+	NICK_HELP_SASET
+	NICK_HELP_SASET_DISPLAY
+	NICK_HELP_SASET_PASSWORD
+	NICK_HELP_SASET_LANGUAGE
+	NICK_HELP_SASET_URL
+	NICK_HELP_SASET_EMAIL
+	NICK_HELP_SASET_ICQ
+	NICK_HELP_SASET_GREET
+	NICK_HELP_SASET_KILL
+	NICK_HELP_SASET_SECURE
+	NICK_HELP_SASET_PRIVATE
+	NICK_HELP_SASET_HIDE
+	NICK_HELP_SASET_MSG
+	NICK_HELP_SASET_NOEXPIRE
+	NICK_HELP_CMD_SASET
 
 *** Mod Strings:
 
 *** Del Strings:
+	NICK_SERVADMIN_HELP_SET
+	NICK_SERVADMIN_HELP_SET_NOEXPIRE
+	NICK_SET_NOEXPIRE_SYNTAX
+	NICK_SET_NOEXPIRE_ON
+	NICK_SET_NOEXPIRE_OFF
+	NICK_SASET_LANGUAGE_SYNTAX
+	NICK_SASET_LANGUAGE_UNKNOWN
+	NICK_SASET_LANGUAGE_CHANGED
+	NICK_HELP_SASET_LANGUAGE
+
 
 Anope Version 1.7.10
 --------------------
diff --git a/data/example.conf b/data/example.conf
index 43c5a91c1..30b6e2f95 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -135,7 +135,7 @@ OperCoreModules "os_help os_global os_stats os_oper os_admin os_staff os_mode os
 #     These modules will be loaded as part of NickServ's core.
 #     It is not recommended you change these settings unless you are 
 #     sure you understand exactly what it is you are doing.
-NickCoreModules "ns_help ns_register ns_group ns_identify ns_access ns_set ns_drop ns_recover ns_release ns_sendpass ns_ghost ns_alist ns_info ns_list ns_logout ns_status ns_update ns_getpass ns_getemail ns_forbid ns_suspend"
+NickCoreModules "ns_help ns_register ns_group ns_identify ns_access ns_set ns_saset ns_drop ns_recover ns_release ns_sendpass ns_ghost ns_alist ns_info ns_list ns_logout ns_status ns_update ns_getpass ns_getemail ns_forbid ns_suspend"
 
 # ChanCoreModules <list> [RECOMMENDED]
 #     These modules will be loaded as part of ChanServ's core.
diff --git a/lang/cat.l b/lang/cat.l
index b022c1cb6..1b5a47eb5 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -530,12 +530,126 @@ NICK_SET_MSG_OFF
 	Els serveis et respondran ara amb noticies.
 
 # SET NOEXPIRE responses
-NICK_SET_NOEXPIRE_SYNTAX
-	SET [nickname] NOEXPIRE {ON | OFF}
-NICK_SET_NOEXPIRE_ON
-	El Nick %s No caducara.
-NICK_SET_NOEXPIRE_OFF
-	El Nick %s caducara.
+NICK_SASET_SYNTAX
+	SASET nickname option parameters
+NICK_SASET_DISABLED
+	Sorry, nickname option setting is temporarily disabled.
+NICK_SASET_UNKNOWN_OPTION
+	Unknown SASET option %s.
+NICK_SASET_BAD_NICK
+	Nickname %s not registered.
+NICK_SASET_OPTION_DISABLED
+	Option %s cannot be set on this network.
+
+# SASET DISPLAY responses
+NICK_SASET_DISPLAY_INVALID
+	The new display for %s MUST be a nickname of the nickname group!
+NICK_SASET_DISPLAY_CHANGED
+	The new display is now %s.
+
+# SASET PASSWORD responses
+NICK_SASET_PASSWORD_FAILED
+	Sorry, couldn't change password for %s.
+NICK_SASET_PASSWORD_CHANGED
+	Password for %s changed.
+NICK_SASET_PASSWORD_CHANGED_TO
+	Password for %s changed to %s.
+
+# SASET LANGUAGE responses
+NICK_SASET_URL_CHANGED
+	URL for %s changed to %s.
+NICK_SASET_URL_UNSET
+	URL %s unset.
+
+# SASET EMAIL responses
+NICK_SASET_EMAIL_CHANGED
+	E-mail address for %s changed to %s.
+NICK_SASET_EMAIL_UNSET
+	E-mail address for %s unset.
+NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
+	You cannot unset the e-mail on this network.
+	
+# SASET ICQ responses
+NICK_SASET_ICQ_CHANGED
+	ICQ number for %s set to %s.
+NICK_SASET_ICQ_UNSET
+	ICQ number for %s unset.
+NICK_SASET_ICQ_INVALID
+	%s is not a valid number.
+	
+# SASET GREET responses
+NICK_SASET_GREET_CHANGED
+	Greet message for %s changed to %s.
+NICK_SASET_GREET_UNSET
+	Greet message for %s unset.
+
+# SASET PROTECT responses
+NICK_SASET_KILL_SYNTAX
+	SASET nickname KILL {ON | QUICK | OFF}
+NICK_SASET_KILL_IMMED_SYNTAX
+	SASET nickname KILL {ON | QUICK | IMMED | OFF}
+NICK_SASET_KILL_ON
+	Protection is now ON for %s.
+NICK_SASET_KILL_QUICK
+	Protection is now ON for %s, with a reduced delay.
+NICK_SASET_KILL_IMMED
+	Protection is now ON for %s, with no delay.
+NICK_SASET_KILL_IMMED_DISABLED
+	The IMMED option is not available on this network.
+NICK_SASET_KILL_OFF
+	Protection is now OFF for %s.
+
+# SASET SECURE responses
+NICK_SASET_SECURE_SYNTAX
+	SASET nickname SECURE {ON | OFF}
+NICK_SASET_SECURE_ON
+	Secure option is now ON for %s.
+NICK_SASET_SECURE_OFF
+	Secure option is now OFF for %s.
+
+# SASET PRIVATE responses
+NICK_SASET_PRIVATE_SYNTAX
+	SASET nickname PRIVATE {ON | OFF}
+NICK_SASET_PRIVATE_ON
+	Private option is now ON for %s.
+NICK_SASET_PRIVATE_OFF
+	Private option is now OFF for %s.
+
+# SASET HIDE responses
+NICK_SASET_HIDE_SYNTAX
+	SET nickname HIDE {EMAIL | USERMASK | QUIT} {ON | OFF}
+NICK_SASET_HIDE_EMAIL_ON
+	The E-mail address of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_EMAIL_OFF
+	The E-mail address of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_MASK_ON
+	The last seen user@host mask of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_MASK_OFF
+	The last seen user@host mask of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_QUIT_ON
+	The last quit message of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_QUIT_OFF
+	The last quit message of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_STATUS_ON
+	The services access status of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_STATUS_OFF
+	The services access status of %s will now be shown in %s INFO displays.
+	
+# SASET MSG responses
+NICK_SASET_MSG_SYNTAX
+	SSAET nickname PRIVATE {ON | OFF}
+NICK_SASET_MSG_ON
+	Services will now reply to %s with messages.
+NICK_SASET_MSG_OFF
+	Services will now reply to %s with notices.
+
+# SET NOEXPIRE responses
+NICK_SASET_NOEXPIRE_SYNTAX
+	SASET nickname NOEXPIRE {ON | OFF}
+NICK_SASET_NOEXPIRE_ON
+	Nick %s will not expire.
+NICK_SASET_NOEXPIRE_OFF
+	Nick %s will expire.
 
 # ACCESS responses
 NICK_ACCESS_SYNTAX
@@ -3304,6 +3418,8 @@ NICK_HELP_CMD_ACCESS
 	    ACCESS     Modifica la llista d'adreçes autoritzades
 NICK_HELP_CMD_SET
 	    SET        Estableix proteccions, inclouent kills
+NICK_HELP_CMD_SASET
+	    SASET      Set SET-options on another nickname
 NICK_HELP_CMD_DROP
 	    DROP       Cancela el registre d'un nickname
 NICK_HELP_CMD_RECOVER
@@ -3618,6 +3734,155 @@ NICK_HELP_SET_MSG
 	comunicaran amb tu. Amb MSG establert, els serveis
 	utilitzaran msgs, de l'altra forma utilitzaran notícies. 
 
+NICK_HELP_SASET
+	Syntax: SASET nickname option parameters.
+	
+	Sets various nickname options.  option can be one of:
+	
+	    DISPLAY    Set the display of the group in Services
+	    PASSWORD   Set the nickname password
+	    LANGUAGE   Set the language Services will use when
+	                   sending messages
+	    URL        Associate a URL with the nickname
+	    EMAIL      Associate an E-mail address with the nickname
+	    ICQ        Associate an ICQ number with the nickname
+	    GREET      Associate a greet message with the nickname
+	    KILL       Turn protection on or off
+	    SECURE     Turn nickname security on or off
+	    PRIVATE    Prevent the nickname from appearing in a
+	                   /msg %S LIST
+	    HIDE       Hide certain pieces of nickname information
+	    MSG        Change the communication method of Services
+	    NOEXPIRE   Prevent the nickname from expiring
+	
+	Type /msg %S HELP SASET option for more information
+	on a specific option. The options will be set on the given
+	nickname. 
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_DISPLAY
+	Syntax: SASET nickname DISPLAY new-display
+	
+	Changes the display used to refer to the nickname group in 
+	Services. The new display MUST be a nick of the group.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_PASSWORD
+	Syntax: SET nickname PASSWORD new-password
+	
+	Changes the password used to identify as the nick's	owner.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_URL
+	Syntax: SASET nickname URL url
+	
+	Associates the given URL with the nickname.  This URL
+	will be displayed whenever someone requests information
+	on the nick with the INFO command.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_EMAIL
+	Syntax: SASET nickname EMAIL address
+	
+	Associates the given E-mail address with the nickname.
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_ICQ
+	Syntax: SASET nickname ICQ number
+	
+	Associates the given ICQ number with the nickname.  This 
+	number will be displayed whenever someone requests 
+	information on the nick with the INFO command.
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_GREET
+	Syntax: SASET nickname GREET message
+	
+	Makes the given message the greet of the nickname, that
+	will be displayed when joining a channel that has GREET
+	option enabled, provided that the user has the necessary 
+	access on it.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_KILL
+	Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}
+	
+	Turns the automatic protection option for the nick
+	on or off.  With protection on, if another user
+	tries to take the nick, they will be given one minute to
+	change to another nick, after which %S will forcibly change
+	their nick.
+	
+	If you select QUICK, the user will be given only 20 seconds
+	to change nicks instead of the usual 60.  If you select
+	IMMED, user's nick will be changed immediately without being
+	warned first or given a chance to change their nick; please
+	do not use this option unless necessary.  Also, your
+	network's administrators may have disabled this option.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_SECURE
+	Syntax: SASET nickname SECURE {ON | OFF}
+	
+	Turns %S's security features on or off for your
+	nick.  With SECURE set, you must enter your password
+	before you will be recognized as the owner of the nick,
+	regardless of whether your address is on the access
+	list.  However, if you are on the access list, %S
+	will not auto-kill you regardless of the setting of the
+	KILL option.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_PRIVATE
+	Syntax: SASET nickname PRIVATE {ON | OFF}
+	
+	Turns %S's privacy option on or off for the nick.
+	With PRIVATE set, the nickname will not appear in
+	nickname lists generated with %S's LIST command.
+	(However, anyone who knows the nickname can still get
+	information on it using the INFO command.)
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_HIDE
+	Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
+	
+	Allows you to prevent certain pieces of information from
+	being displayed when someone does a %S INFO on the
+	nick.  You can hide the E-mail address (EMAIL), last seen
+	user@host mask (USERMASK), the services access status
+	(STATUS) and  last quit message (QUIT).
+	The second parameter specifies whether the information should
+	be displayed (OFF) or hidden (ON).
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_MSG
+	Syntax: SASET nickname MSG {ON | OFF}
+	
+	Allows you to choose the way Services are communicating with 
+	the given user. With MSG set, Services will use messages,
+	else they'll use notices.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_NOEXPIRE
+	Syntax: SASET nickname NOEXPIRE {ON | OFF}
+	
+	Sets whether the given nickname will expire.  Setting this
+	to ON prevents the nickname from expiring.
+	
+	Limited to Services admins.
+
 NICK_HELP_RECOVER
 	Sintaxis: RECOVER nickname [clau]
 	
@@ -3790,24 +4055,6 @@ NICK_SERVADMIN_HELP_DROP
 	privilegis especials. Eliminar qualsevol nick esta
 	limitat a administradors de serveis.
 
-NICK_SERVADMIN_HELP_SET
-	
-	Administradors de serveis poden tambe establir
-	l'opció NOEXPIRE, amb la qual nicknames poden ser
-	previnguts abans de caducar. A més a més, administradors de
-	serveis poden establir opcions per qualsevol nickname
-	sense especificar una clau, utilitzant el format SET
-	nickname opció parametres.
-
-NICK_SERVADMIN_HELP_SET_NOEXPIRE
-	Sintaxis: SET [nickname] NOEXPIRE {ON | OFF}
-	
-	Estableix si el nick esmentat caducara o no. Establir-lo a ON
-	evita que el nickname caduqui. Si cap nickname es
-	especificat, estableix l'opció de no caducitat pel teu nick.
-	
-	Limitat a administradors de serveis.
-
 NICK_SERVADMIN_HELP_INFO
 	
 	Administradors de serveis poden utilitzar el parametre
diff --git a/lang/de.l b/lang/de.l
index b85f20ba0..64339387e 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -546,12 +546,126 @@ NICK_SET_MSG_OFF
 	Die Services werden dir jetzt durch notices antworten.
 
 # SET NOEXPIRE responses
-NICK_SET_NOEXPIRE_SYNTAX
-	SET [Nickname] NOEXPIRE {ON | OFF}
-NICK_SET_NOEXPIRE_ON
-	Der Nickname %s wird nicht auslaufen.
-NICK_SET_NOEXPIRE_OFF
-	Der Nickname %s wird auslaufen.
+NICK_SASET_SYNTAX
+	SASET nickname option parameters
+NICK_SASET_DISABLED
+	Sorry, nickname option setting is temporarily disabled.
+NICK_SASET_UNKNOWN_OPTION
+	Unknown SASET option %s.
+NICK_SASET_BAD_NICK
+	Nickname %s not registered.
+NICK_SASET_OPTION_DISABLED
+	Option %s cannot be set on this network.
+
+# SASET DISPLAY responses
+NICK_SASET_DISPLAY_INVALID
+	The new display for %s MUST be a nickname of the nickname group!
+NICK_SASET_DISPLAY_CHANGED
+	The new display is now %s.
+
+# SASET PASSWORD responses
+NICK_SASET_PASSWORD_FAILED
+	Sorry, couldn't change password for %s.
+NICK_SASET_PASSWORD_CHANGED
+	Password for %s changed.
+NICK_SASET_PASSWORD_CHANGED_TO
+	Password for %s changed to %s.
+
+# SASET LANGUAGE responses
+NICK_SASET_URL_CHANGED
+	URL for %s changed to %s.
+NICK_SASET_URL_UNSET
+	URL %s unset.
+
+# SASET EMAIL responses
+NICK_SASET_EMAIL_CHANGED
+	E-mail address for %s changed to %s.
+NICK_SASET_EMAIL_UNSET
+	E-mail address for %s unset.
+NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
+	You cannot unset the e-mail on this network.
+	
+# SASET ICQ responses
+NICK_SASET_ICQ_CHANGED
+	ICQ number for %s set to %s.
+NICK_SASET_ICQ_UNSET
+	ICQ number for %s unset.
+NICK_SASET_ICQ_INVALID
+	%s is not a valid number.
+	
+# SASET GREET responses
+NICK_SASET_GREET_CHANGED
+	Greet message for %s changed to %s.
+NICK_SASET_GREET_UNSET
+	Greet message for %s unset.
+
+# SASET PROTECT responses
+NICK_SASET_KILL_SYNTAX
+	SASET nickname KILL {ON | QUICK | OFF}
+NICK_SASET_KILL_IMMED_SYNTAX
+	SASET nickname KILL {ON | QUICK | IMMED | OFF}
+NICK_SASET_KILL_ON
+	Protection is now ON for %s.
+NICK_SASET_KILL_QUICK
+	Protection is now ON for %s, with a reduced delay.
+NICK_SASET_KILL_IMMED
+	Protection is now ON for %s, with no delay.
+NICK_SASET_KILL_IMMED_DISABLED
+	The IMMED option is not available on this network.
+NICK_SASET_KILL_OFF
+	Protection is now OFF for %s.
+
+# SASET SECURE responses
+NICK_SASET_SECURE_SYNTAX
+	SASET nickname SECURE {ON | OFF}
+NICK_SASET_SECURE_ON
+	Secure option is now ON for %s.
+NICK_SASET_SECURE_OFF
+	Secure option is now OFF for %s.
+
+# SASET PRIVATE responses
+NICK_SASET_PRIVATE_SYNTAX
+	SASET nickname PRIVATE {ON | OFF}
+NICK_SASET_PRIVATE_ON
+	Private option is now ON for %s.
+NICK_SASET_PRIVATE_OFF
+	Private option is now OFF for %s.
+
+# SASET HIDE responses
+NICK_SASET_HIDE_SYNTAX
+	SET nickname HIDE {EMAIL | USERMASK | QUIT} {ON | OFF}
+NICK_SASET_HIDE_EMAIL_ON
+	The E-mail address of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_EMAIL_OFF
+	The E-mail address of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_MASK_ON
+	The last seen user@host mask of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_MASK_OFF
+	The last seen user@host mask of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_QUIT_ON
+	The last quit message of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_QUIT_OFF
+	The last quit message of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_STATUS_ON
+	The services access status of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_STATUS_OFF
+	The services access status of %s will now be shown in %s INFO displays.
+	
+# SASET MSG responses
+NICK_SASET_MSG_SYNTAX
+	SSAET nickname PRIVATE {ON | OFF}
+NICK_SASET_MSG_ON
+	Services will now reply to %s with messages.
+NICK_SASET_MSG_OFF
+	Services will now reply to %s with notices.
+
+# SET NOEXPIRE responses
+NICK_SASET_NOEXPIRE_SYNTAX
+	SASET nickname NOEXPIRE {ON | OFF}
+NICK_SASET_NOEXPIRE_ON
+	Nick %s will not expire.
+NICK_SASET_NOEXPIRE_OFF
+	Nick %s will expire.
 
 # ACCESS responses
 NICK_ACCESS_SYNTAX
@@ -3264,6 +3378,8 @@ NICK_HELP_CMD_ACCESS
 	    ACCESS      Liste der autorisierten Adressen
 NICK_HELP_CMD_SET
 	    SET         Optionen einstellen, auch Kill-Schutz
+NICK_HELP_CMD_SASET
+	    SASET      Set SET-options on another nickname
 NICK_HELP_CMD_DROP
 	    DROP        Die Registrierung einen Nicknamen löschen
 NICK_HELP_CMD_RECOVER
@@ -3622,6 +3738,155 @@ NICK_HELP_SET_MSG
 	(Queries), ansonsten werden dir die Antworten als Notices
 	geschickt (Standard).
 
+NICK_HELP_SASET
+	Syntax: SASET nickname option parameters.
+	
+	Sets various nickname options.  option can be one of:
+	
+	    DISPLAY    Set the display of the group in Services
+	    PASSWORD   Set the nickname password
+	    LANGUAGE   Set the language Services will use when
+	                   sending messages
+	    URL        Associate a URL with the nickname
+	    EMAIL      Associate an E-mail address with the nickname
+	    ICQ        Associate an ICQ number with the nickname
+	    GREET      Associate a greet message with the nickname
+	    KILL       Turn protection on or off
+	    SECURE     Turn nickname security on or off
+	    PRIVATE    Prevent the nickname from appearing in a
+	                   /msg %S LIST
+	    HIDE       Hide certain pieces of nickname information
+	    MSG        Change the communication method of Services
+	    NOEXPIRE   Prevent the nickname from expiring
+	
+	Type /msg %S HELP SASET option for more information
+	on a specific option. The options will be set on the given
+	nickname. 
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_DISPLAY
+	Syntax: SASET nickname DISPLAY new-display
+	
+	Changes the display used to refer to the nickname group in 
+	Services. The new display MUST be a nick of the group.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_PASSWORD
+	Syntax: SET nickname PASSWORD new-password
+	
+	Changes the password used to identify as the nick's	owner.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_URL
+	Syntax: SASET nickname URL url
+	
+	Associates the given URL with the nickname.  This URL
+	will be displayed whenever someone requests information
+	on the nick with the INFO command.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_EMAIL
+	Syntax: SASET nickname EMAIL address
+	
+	Associates the given E-mail address with the nickname.
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_ICQ
+	Syntax: SASET nickname ICQ number
+	
+	Associates the given ICQ number with the nickname.  This 
+	number will be displayed whenever someone requests 
+	information on the nick with the INFO command.
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_GREET
+	Syntax: SASET nickname GREET message
+	
+	Makes the given message the greet of the nickname, that
+	will be displayed when joining a channel that has GREET
+	option enabled, provided that the user has the necessary 
+	access on it.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_KILL
+	Syntax: SASET nickname KILL {ON | QUICK | IMMED | OFF}
+	
+	Turns the automatic protection option for the nick
+	on or off.  With protection on, if another user
+	tries to take the nick, they will be given one minute to
+	change to another nick, after which %S will forcibly change
+	their nick.
+	
+	If you select QUICK, the user will be given only 20 seconds
+	to change nicks instead of the usual 60.  If you select
+	IMMED, user's nick will be changed immediately without being
+	warned first or given a chance to change their nick; please
+	do not use this option unless necessary.  Also, your
+	network's administrators may have disabled this option.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_SECURE
+	Syntax: SASET nickname SECURE {ON | OFF}
+	
+	Turns %S's security features on or off for your
+	nick.  With SECURE set, you must enter your password
+	before you will be recognized as the owner of the nick,
+	regardless of whether your address is on the access
+	list.  However, if you are on the access list, %S
+	will not auto-kill you regardless of the setting of the
+	KILL option.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_PRIVATE
+	Syntax: SASET nickname PRIVATE {ON | OFF}
+	
+	Turns %S's privacy option on or off for the nick.
+	With PRIVATE set, the nickname will not appear in
+	nickname lists generated with %S's LIST command.
+	(However, anyone who knows the nickname can still get
+	information on it using the INFO command.)
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_HIDE
+	Syntax: SASET nickname HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
+	
+	Allows you to prevent certain pieces of information from
+	being displayed when someone does a %S INFO on the
+	nick.  You can hide the E-mail address (EMAIL), last seen
+	user@host mask (USERMASK), the services access status
+	(STATUS) and  last quit message (QUIT).
+	The second parameter specifies whether the information should
+	be displayed (OFF) or hidden (ON).
+	
+	Limited to Services admins.
+	
+NICK_HELP_SASET_MSG
+	Syntax: SASET nickname MSG {ON | OFF}
+	
+	Allows you to choose the way Services are communicating with 
+	the given user. With MSG set, Services will use messages,
+	else they'll use notices.
+	
+	Limited to Services admins.
+
+NICK_HELP_SASET_NOEXPIRE
+	Syntax: SASET nickname NOEXPIRE {ON | OFF}
+	
+	Sets whether the given nickname will expire.  Setting this
+	to ON prevents the nickname from expiring.
+	
+	Limited to Services admins.
+
 NICK_HELP_RECOVER
 	Syntax: RECOVER Nickname [Passwort]
 	
@@ -3835,29 +4100,6 @@ NICK_SERVADMIN_HELP_DROP
 	Das Entfernen eines beliebigen Nicknamen ist beschränkt
 	auf Services Administratoren.
 
-NICK_SERVADMIN_HELP_SET
-	
-	Als zusätzliche Option können die Services das
-	NOEXPIRE-Flag an einem Nickname setzen, dass diesen
-	vor dem Auslaufen bei Nichtnutzung verhindert.
-	
-	Zusätzlich können Services Administratoren die
-	Optionen eines beliebigen Nicknamens verändern, 
-	ohne vorher ein Passwort für den Nicknamen einzugeben. 
-	Dafür gilt das Format :
-	SET Nickname Option Parameter.
-
-NICK_SERVADMIN_HELP_SET_NOEXPIRE
-	Syntax: SET [Nickname] NOEXPIRE {ON | OFF}
-	
-	Stellt den Auslauf bei Nichtnutzung des angegebenen
-	Nicknamen ein. Setzt man diesen Wert auf ON, wird
-	der Nickname nicht auslaufen. Wird kein Parameter
-	eigegeben, wird das No-Expire Flag deines Nicknamens
-	geändert.
-	
-	Diese Funktion ist beschränkt auf Services Administratoren.
-
 NICK_SERVADMIN_HELP_INFO
 	
 	Services Administratoren können den ALL Parameter für
diff --git a/lang/en_us.l b/lang/en_us.l
index 77c19838b..4e0e7a639 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -170,7 +170,7 @@ PASSWORD_INCORRECT
 # of meaning.  If you want to make a distinction, "Access denied" is
 # usually used more generally; for example, a non-oper trying to access
 # OperServ gets "Access denied", while a non-Services admin trying to use
-# NickServ SET NOEXPIRE gets "Permission denied".
+# NickServ SASET NOEXPIRE gets "Permission denied".
 ACCESS_DENIED
 	Access denied.
 PERMISSION_DENIED
@@ -519,12 +519,126 @@ NICK_SET_MSG_ON
 NICK_SET_MSG_OFF
 	Services will now reply to you with notices.
 
-# SET NOEXPIRE responses
-NICK_SET_NOEXPIRE_SYNTAX
-	SET [nickname] NOEXPIRE {ON | OFF}
-NICK_SET_NOEXPIRE_ON
+# SASET responses
+NICK_SASET_SYNTAX
+	SASET nickname option parameters
+NICK_SASET_DISABLED
+	Sorry, nickname option setting is temporarily disabled.
+NICK_SASET_UNKNOWN_OPTION
+	Unknown SASET option %s.
+NICK_SASET_BAD_NICK
+	Nickname %s not registered.
+NICK_SASET_OPTION_DISABLED
+	Option %s cannot be set on this network.
+
+# SASET DISPLAY responses
+NICK_SASET_DISPLAY_INVALID
+	The new display for %s MUST be a nickname of the nickname group!
+NICK_SASET_DISPLAY_CHANGED
+	The new display is now %s.
+
+# SASET PASSWORD responses
+NICK_SASET_PASSWORD_FAILED
+	Sorry, couldn't change password for %s.
+NICK_SASET_PASSWORD_CHANGED
+	Password for %s changed.
+NICK_SASET_PASSWORD_CHANGED_TO
+	Password for %s changed to %s.
+
+# SASET URL responses
+NICK_SASET_URL_CHANGED
+	URL for %s changed to %s.
+NICK_SASET_URL_UNSET
+	URL %s unset.
+
+# SASET EMAIL responses
+NICK_SASET_EMAIL_CHANGED
+	E-mail address for %s changed to %s.
+NICK_SASET_EMAIL_UNSET
+	E-mail address for %s unset.
+NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
+	You cannot unset the e-mail on this network.
+	
+# SASET ICQ responses
+NICK_SASET_ICQ_CHANGED
+	ICQ number for %s set to %s.
+NICK_SASET_ICQ_UNSET
+	ICQ number for %s unset.
+NICK_SASET_ICQ_INVALID
+	%s is not a valid number.
+	
+# SASET GREET responses
+NICK_SASET_GREET_CHANGED
+	Greet message for %s changed to %s.
+NICK_SASET_GREET_UNSET
+	Greet message for %s unset.
+
+# SASET PROTECT responses
+NICK_SASET_KILL_SYNTAX
+	SASET nickname KILL {ON | QUICK | OFF}
+NICK_SASET_KILL_IMMED_SYNTAX
+	SASET nickname KILL {ON | QUICK | IMMED | OFF}
+NICK_SASET_KILL_ON
+	Protection is now ON for %s.
+NICK_SASET_KILL_QUICK
+	Protection is now ON for %s, with a reduced delay.
+NICK_SASET_KILL_IMMED
+	Protection is now ON for %s, with no delay.
+NICK_SASET_KILL_IMMED_DISABLED
+	The IMMED option is not available on this network.
+NICK_SASET_KILL_OFF
+	Protection is now OFF for %s.
+
+# SASET SECURE responses
+NICK_SASET_SECURE_SYNTAX
+	SASET nickname SECURE {ON | OFF}
+NICK_SASET_SECURE_ON
+	Secure option is now ON for %s.
+NICK_SASET_SECURE_OFF
+	Secure option is now OFF for %s.
+
+# SASET PRIVATE responses
+NICK_SASET_PRIVATE_SYNTAX
+	SASET nickname PRIVATE {ON | OFF}
+NICK_SASET_PRIVATE_ON
+	Private option is now ON for %s.
+NICK_SASET_PRIVATE_OFF
+	Private option is now OFF for %s.
+
+# SASET HIDE responses
+NICK_SASET_HIDE_SYNTAX
+	SET nickname HIDE {EMAIL | USERMASK | QUIT} {ON | OFF}
+NICK_SASET_HIDE_EMAIL_ON
+	The E-mail address of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_EMAIL_OFF
+	The E-mail address of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_MASK_ON
+	The last seen user@host mask of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_MASK_OFF
+	The last seen user@host mask of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_QUIT_ON
+	The last quit message of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_QUIT_OFF
+	The last quit message of %s will now be shown in %s INFO displays.
+NICK_SASET_HIDE_STATUS_ON
+	The services access status of %s will now be hidden from %s INFO displays.
+NICK_SASET_HIDE_STATUS_OFF
+	The services access status of %s will now be shown in %s INFO displays.
+	
+# SASET MSG responses
+NICK_SASET_MSG_SYNTAX
+	SSAET nickname PRIVATE {ON | OFF}
+NICK_SASET_MSG_ON
+	Services will now reply to %s with messages.
+NICK_SASET_MSG_OFF
+	Services will now reply to %s with notices.
+
+# SASET NOEXPIRE responses
+NICK_SASET_NOEXPIRE_SYNTAX
+	SASET nickname NOEXPIRE {ON | OFF}
+NICK_SASET_NOEXPIRE_ON
 	Nick %s will not expire.
-NICK_SET_NOEXPIRE_OFF
+NICK_SASET_NOEXPIRE_OFF
 	Nick %s will expire.
 
 # ACCESS responses
@@ -3177,6 +3291,8 @@ NICK_HELP_CMD_ACCESS
 	    ACCESS     Modify the list of authorized addresses
 NICK_HELP_CMD_SET
 	    SET        Set options, including kill protection
+NICK_HELP_CMD_SASET
+	    SASET      Set SET-options on another nickname
 NICK_HELP_CMD_DROP
 	    DROP       Cancel the registration of a nickname
 NICK_HELP_CMD_RECOVER
@@ -3493,6 +3609,153 @@ NICK_HELP_SET_MSG
 	you. With MSG set, Services will use messages, else they'll 
 	use notices.
 
+NICK_HELP_SASET
+	Syntax: SASET nickname option parameters.
+	
+	Sets various nickname options.  option can be one of:
+	
+	    DISPLAY    Set the display of the group in Services
+	    PASSWORD   Set the nickname password
+