Added ns_set_misc and cs_set_misc.

These modules allows users to configure settable options in /ns and /cs set
that will be displayed in /ns and /cs info.
Removed os_info, cs_set_url, ns_set_url, cs_set_email, ns_set_icq

32 files changed, 291 insertions, 2355 deletions

diff --git a/data/example.conf b/data/example.conf
index d66e98611..6c5c87bc7 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -979,7 +979,7 @@ chanserv
 	 * The core modules to load for ChanServ. This is a space separated list that corresponds
 	 * to the base names of the modules for ChanServ. This directive is optional, but highly recommended.
 	 */
-	modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_email cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_url cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban"
+	modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban"
 
 	/*
 	 * The default options for newly registered channels. Note that changing these options
@@ -1553,7 +1553,6 @@ module { name = "os_ignore" }
 module { name = "cs_appendtopic" }
 module { name = "cs_enforce" }
 module { name = "ns_maxemail" }
-module { name = "os_info" }
 module { name = "hs_request" }
 
 /*
@@ -1577,6 +1576,42 @@ db_plain
 	database = "anope.db"
 }
 
+module { name = "cs_set_misc" }
+cs_set_misc
+{
+	name = "OINFO"
+	desc = "Associate oper only information to this channel"
+	operonly = yes
+}
+cs_set_misc
+{
+	name = "URL"
+	desc = "Associate a URL with the channel"
+}
+cs_set_misc
+{
+	name = "EMail"
+	desc = "Associate an EMail with the channel"
+}
+
+module { name = "ns_set_misc" }
+ns_set_misc
+{
+	name = "OINFO"
+	desc = "Associate oper only information to this nick"
+	operonly = yes
+}
+ns_set_misc
+{
+	name = "URL"
+	desc = "Associate a URl with the nick"
+}
+ns_set_misc
+{
+	name = "ICQ"
+	desc = "Associate an ICQ number with the nick"
+}
+
 #module { name = "m_helpchan" }
 m_helpchan
 {
diff --git a/docs/Changes.conf b/docs/Changes.conf
index bad0cf57b..8cc990c3a 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -9,6 +9,7 @@ nickserv:modules added many new ns_set_command modules
 chanserv:modules added many new cs_set_command modules
 opertype:commands added nickserv/saset/* and chanserv/saset/*
 options:socketengine added to choose what socket engine to use
+module:cs_set_misc and module:ns_set_misc added to replace the old set url/icq/email modules
 
 ** MODIFIED CONFIGURATION DIRECTIVES **
 opertype:commands changed operserv/sgline to opserv/snline
diff --git a/include/account.h b/include/account.h
index 7644d9d89..82ccb3871 100644
--- a/include/account.h
+++ b/include/account.h
@@ -153,8 +153,6 @@ class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END
 	std::string pass;	/* Password of the nicks */
 	char *email;		/* E-mail associated to the nick */
 	char *greet;		/* Greet associated to the nick */
-	uint32 icq;			/* ICQ # associated to the nick */
-	char *url;			/* URL associated to the nick */
 	uint16 language;	/* Language selected by nickname owner (LANG_*) */
 	std::vector<std::string> access; /* Access list, vector of strings */
 	MemoInfo memos;
diff --git a/include/regchannel.h b/include/regchannel.h
index ec04134f1..266b057d7 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -86,8 +86,6 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	NickCore *founder;
 	NickCore *successor; /* Who gets the channel if the founder nick is dropped or expires */
 	char *desc;
-	char *url;
-	char *email;
 
 	time_t time_registered;
 	time_t last_used;
diff --git a/lang/cat.l b/lang/cat.l
index 7e24faf0b..e3fa1aa71 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -459,12 +459,6 @@ NICK_SET_LANGUAGE_UNKNOWN
 NICK_SET_LANGUAGE_CHANGED
 	Llenguatge canviat a Català.
 
-# SET URL responses
-NICK_SET_URL_CHANGED
-	URL canviada a %s.
-NICK_SET_URL_UNSET
-	URL no establerta.
-
 # SET EMAIL responses
 NICK_SET_EMAIL_CHANGED
 	Adreça E-mail canviada a %s.
@@ -473,138 +467,6 @@ NICK_SET_EMAIL_UNSET
 NICK_SET_EMAIL_UNSET_IMPOSSIBLE
 	No pots establir la teva adreça e-mail en aquesta xarxa.
 	
-# SET ICQ responses
-NICK_SET_ICQ_CHANGED
-	Numero ICQ establert a %s.
-NICK_SET_ICQ_UNSET
-	Numero ICQ no establert.
-NICK_SET_ICQ_INVALID
-	%s no es un numero vàlid.
-	
-# SET GREET responses
-NICK_SET_GREET_CHANGED
-	Missatge de benvinguda canviat a %s.
-NICK_SET_GREET_UNSET
-	Missatge de benvinguda no establert.
-
-# SET PROTECT responses
-NICK_SET_KILL_SYNTAX
-	SET KILL {ON | QUICK | OFF}
-NICK_SET_KILL_IMMED_SYNTAX
-	SET KILL {ON | QUICK | IMMED | OFF}
-NICK_SET_KILL_ON
-	Protecció activada.
-NICK_SET_KILL_QUICK
-	La protecció esta activada, amb demora reduida.
-NICK_SET_KILL_IMMED
-	La protecció esta activada, sense demora.
-NICK_SET_KILL_IMMED_DISABLED
-	L'opció IMMED no esta disponible en aquesta xarxa.
-NICK_SET_KILL_OFF
-	La protecció esta desactivada.
-
-# SET SECURE responses
-NICK_SET_SECURE_SYNTAX
-	SET SECURE {ON | OFF}
-NICK_SET_SECURE_ON
-	L'opció de seguretat esta activada.
-NICK_SET_SECURE_OFF
-	L'opció de seguretat esta desactivada.
-
-# SET PRIVATE responses
-NICK_SET_PRIVATE_SYNTAX
-	SET PRIVATE {ON | OFF}
-NICK_SET_PRIVATE_ON
-	L'opció de privacitat esta activada.
-NICK_SET_PRIVATE_OFF
-	L'opció de privacitat esta desactivada.
-
-# SET HIDE responses
-NICK_SET_HIDE_SYNTAX
-	SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}
-NICK_SET_HIDE_EMAIL_ON
-	La teva adreça e-mail no sera mostrada a %s INFO displays.
-NICK_SET_HIDE_EMAIL_OFF
-	La teva adreça e-mail sera mostrada a %s INFO displays.
-NICK_SET_HIDE_MASK_ON
-	La teva ultima mascara usuari@host no sera mostrada a %s INFO displays.
-NICK_SET_HIDE_MASK_OFF
-	La teva ultima mascara usuari@host sera mostrada a %s INFO displays.
-NICK_SET_HIDE_QUIT_ON
-	El teu últim missatge quit no sera mostrat a %s INFO displays.
-NICK_SET_HIDE_QUIT_OFF
-	El teu últim missatge quit sera mostrat a %s INFO displays.
-	
-# SET MSG responses
-NICK_SET_HIDE_STATUS_ON
-	Your services access status will now be hidden from %s INFO displays.
-NICK_SET_HIDE_STATUS_OFF
-	Your services access status will now be shown in %s INFO displays.
-	
-# SET MSG responses
-NICK_SET_MSG_SYNTAX
-	SET PRIVATE {ON | OFF}
-NICK_SET_MSG_ON
-	Els serveis et respondran ara amb missatge.
-NICK_SET_MSG_OFF
-	Els serveis et respondran ara amb noticies.
-
-# SET AUTOOP responses
-NICK_SET_AUTOOP_SYNTAX
-	SET AUTOOP {ON | OFF}
-NICK_SET_AUTOOP_ON
-	Services will now autoop you in channels.
-NICK_SET_AUTOOP_OFF
-	Services will no longer autoop you in channels.
-
-# SASET NOEXPIRE 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 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.
@@ -749,8 +611,6 @@ NICK_INFO_VHOST
 	            	vhost: %s
 NICK_INFO_VHOST2
 	            	vhost: %s@%s
-NICK_INFO_ICQ
-	                 ICQ #: %d
 NICK_INFO_GREET
 	 Missatge de benvinguda: %s
 NICK_INFO_OPTIONS
@@ -1134,6 +994,10 @@ CHAN_SET_DISABLED
 	Ho sento, l'establiment d'Opciós de canal esta temporalment deshAbilitat.
 CHAN_SET_UNKNOWN_OPTION
 	Opció SET %s desconoceguda.
+CHAN_SETTING_CHANGED
+	%s for %s set to %s.
+CHAN_SETTING_UNSET
+	%s for %s unset.
 
 # SET FOUNDER responses
 CHAN_SET_FOUNDER_TOO_MANY_CHANS
@@ -1153,12 +1017,6 @@ CHAN_SUCCESSOR_IS_FOUNDER
 CHAN_DESC_CHANGED
 	La descripció de %s canviada a%s.
 
-# SET URL responses
-CHAN_URL_CHANGED
-	URL per a %s canviada a %s.
-CHAN_URL_UNSET
-	URL per a %s no establerta.
-
 # SET EMAIL responses
 CHAN_EMAIL_CHANGED
 	Adreça e-mail per a %s canviada a %s.
@@ -3656,12 +3514,8 @@ NICK_HELP_CMD_SET_PASSWORD
 NICK_HELP_CMD_SET_LANGUAGE
 	    LANGUAGE   Estableix el llenguatge amb el que els serveis
 	                   t'enviaran missatges
-NICK_HELP_CMD_SET_URL
-	    URL        Associa una URL amb el teu nickname
 NICK_HELP_CMD_SET_EMAIL
 	    EMAIL      Associa un E-mail amb el teu nickname
-NICK_HELP_CMD_SET_ICQ
-	    ICQ        Associa un numero ICQ amb el teu nickname
 NICK_HELP_CMD_SET_GREET
 	    GREET      Associa un salutació amb el teu nickname
 NICK_HELP_CMD_SET_KILL
@@ -3709,13 +3563,6 @@ NICK_HELP_SET_LANGUAGE
 	soportats:
 	
 
-NICK_HELP_SET_URL
-	Sintaxis: SET URL url
-	
-	Associa l'URL donada amb el teu nickname. Aquesta URL
-	sera mostrada quant algu demani informació
-	sobre el teu nick amb la comanda INFO.
-
 NICK_HELP_SET_EMAIL
 	Sintaxis: SET EMAIL direccion
 	
@@ -3723,13 +3570,6 @@ NICK_HELP_SET_EMAIL
 	sera mostrat quant algu demani informació
 	sobre el teu nick amb la comanda INFO.
 	
-NICK_HELP_SET_ICQ
-	Sintaxis: SET ICQ numero
-	
-	Associa el numero ICQ donat amb el teu nickname. Aquest
-	numero sera mostrat quant algu soliciti
-	informació sobre el teu nick amb la comanda INFO.
-	
 NICK_HELP_SET_GREET
 	Sintaxis: SET GREET missatge
 	
@@ -3806,12 +3646,8 @@ NICK_HELP_CMD_SASET_DISPLAY
 	    DISPLAY    Set the display of the group in Services
 NICK_HELP_CMD_SASET_PASSWORD
 	    PASSWORD   Set the nickname password
-NICK_HELP_CMD_SASET_URL
-	    URL        Associate a URL with the nickname
 NICK_HELP_CMD_SASET_EMAIL
 	    EMAIL      Associate an E-mail address with the nickname
-NICK_HELP_CMD_SASET_ICQ
-	    ICQ        Associate an ICQ number with the nickname
 NICK_HELP_CMD_SASET_GREET
 	    GREET      Associate a greet message with the nickname
 NICK_HELP_CMD_SASET_KILL
@@ -3847,25 +3683,11 @@ NICK_HELP_SASET_PASSWORD
 	
 	Changes the password used to identify as the nick's	owner.
 
-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.
-
 NICK_HELP_SASET_EMAIL
 	Syntax: SASET nickname EMAIL address
 	
 	Associates the given E-mail address with the nickname.
 	
-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.
-	
 NICK_HELP_SASET_GREET
 	Syntax: SASET nickname GREET message
 	
@@ -4399,10 +4221,6 @@ CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Estableix el successor d'un canal
 CHAN_HELP_CMD_SET_DESC
 	    DESC          Estableix la descripció del canal
-CHAN_HELP_CMD_SET_URL
-	    URL           Associa una URL amb el canal
-CHAN_HELP_CMD_SET_EMAIL
-	    EMAIL         Associa un E-mail amb el canal
 CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Estableix un missatge a enviar als
 	                  usuaris quant entrin al canal
@@ -4469,23 +4287,6 @@ CHAN_HELP_SET_DESC
 	Estableix la descripció pel canal, la que es mostrada
 	amb les comandes LIST i INFO.
 
-CHAN_HELP_SET_URL
-	Sintaxis: %s canal URL [url]
-	
-	Associa l'URL especificada amb el canal. Aquesta URL sera mostrada
-	quant algu sol.liciti informació sobre el canal amb
-	la comanda INFO. Si no s'especifica cap parametre, 
-	esborra la URL actual pel canal.
-
-CHAN_HELP_SET_EMAIL
-	Sintaxis: %s canal EMAIL [direcció]
-	
-	Associa l'adreça e-mail especificada amb el canal.
-	Aquesta adreça sera mostrada quant algu sol.liciti
-	informació sobre el canal amb la comanda INFO.
-	Si cap parametre es establert, borra l'adreça e-mail
-	actual pel canal.
-
 CHAN_HELP_SET_ENTRYMSG
 	Sintaxis: %s canal ENTRYMSG [missatge]
 	
diff --git a/lang/de.l b/lang/de.l
index 4758d2b2f..37c62571a 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -477,12 +477,6 @@ NICK_SET_LANGUAGE_UNKNOWN
 NICK_SET_LANGUAGE_CHANGED
 	Sprache wurde geändert zu Deutsch.
 
-# SET URL responses
-NICK_SET_URL_CHANGED
-	URL zu %s geändert.
-NICK_SET_URL_UNSET
-	URL entfernt.
-
 # SET EMAIL responses
 NICK_SET_EMAIL_CHANGED
 	eMail-Adresse zu %s geändert.
@@ -491,14 +485,6 @@ NICK_SET_EMAIL_UNSET
 NICK_SET_EMAIL_UNSET_IMPOSSIBLE
 	Du kannst in diesem Netzwerk deine eMail-Adresse nicht entfernen.
 	
-# SET ICQ responses
-NICK_SET_ICQ_CHANGED
-	ICQ-Nummer auf %s gesetzt.
-NICK_SET_ICQ_UNSET
-	ICQ-Nummer wurde entfernt.
-NICK_SET_ICQ_INVALID
-	%s ist keine gültige ICQ-Nummer.
-	
 # SET GREET responses
 NICK_SET_GREET_CHANGED
 	Begrüssungsnachricht wurde zu %s geändert.
@@ -599,12 +585,6 @@ NICK_SASET_PASSWORD_CHANGED
 NICK_SASET_PASSWORD_CHANGED_TO
 	Passwort für %s wurde auf %s gesetzt.
 
-# SASET LANGUAGE responses
-NICK_SASET_URL_CHANGED
-	URL für %s wurde auf %s gesetzt.
-NICK_SASET_URL_UNSET
-	URL %s wurde entfernt.
-
 # SASET EMAIL responses
 NICK_SASET_EMAIL_CHANGED
 	E-mail Adresse für %s wurde auf %s geändert.
@@ -613,14 +593,6 @@ NICK_SASET_EMAIL_UNSET
 NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
 	Auf diesem Netzwerk ist es nicht möglich die E-Mail Adresse zu entfernen.
 	
-# SASET ICQ responses
-NICK_SASET_ICQ_CHANGED
-	ICQ Nummer für %s wurde auf %s gesetzt.
-NICK_SASET_ICQ_UNSET
-	ICQ Nummer %s wurde entfernt.
-NICK_SASET_ICQ_INVALID
-	%s ist keine gültige ICQ Nummer.
-	
 # SASET GREET responses
 NICK_SASET_GREET_CHANGED
 	Begrüssungsnachricht %s wurde auf %s geändert.
@@ -766,8 +738,6 @@ NICK_INFO_VHOST
 	                   vHost: %s
 NICK_INFO_VHOST2
 	            	vHost: %s@%s
-NICK_INFO_ICQ
-	                   ICQ #: %d
 NICK_INFO_GREET
 	          Grussnachricht: %s
 NICK_INFO_OPTIONS
@@ -1155,6 +1125,10 @@ CHAN_SET_DISABLED
 	Channel-Optionen sind derzeit deaktiviert.
 CHAN_SET_UNKNOWN_OPTION
 	Unbekannte SET-Option %s.
+CHAN_SETTING_CHANGED
+	%s for %s set to %s.
+CHAN_SETTING_UNSET
+	%s for %s unset.
 
 # SET FOUNDER responses
 CHAN_SET_FOUNDER_TOO_MANY_CHANS
@@ -3633,11 +3607,6 @@ NICK_HELP_CMD_SET_PASSWORD
 NICK_HELP_CMD_SET_LANGUAGE
 	    LANGUAGE     Stellt die Sprache ein, in der dir die 
 	                 Services antworten sollen.
-NICK_HELP_CMD_SET_URL
-	    URL          Verbindet eine URL mit deinem Nicknamen
-NICK_HELP_CMD_SET_ICQ
-	    ICQ          Trägt deine ICQ-Nummer unter den Infos
-	                 zu deinem Nicknamen ein.
 NICK_HELP_CMD_SET_MSG
 	    MSG          Ändert die Methode, wie die Services mit
 	                 dir kommunizieren
@@ -3697,13 +3666,6 @@ NICK_HELP_SET_LANGUAGE
 	Nummer muss von der folgenden Liste der unter-
 	stützten Sprachen ausgewählt werden: 
 
-NICK_HELP_SET_URL
-	Syntax: SET URL Url
-	
-	Verbindet die angegebene URL mit deinem Nicknamen.
-	Diese URL wird angezeigt, wenn jemand Informationen
-	über deinen Nicknamen mit dem INFO Befehl anfordert.
-
 NICK_HELP_SET_EMAIL
 	Syntax: SET EMAIL Adresse
 	
@@ -3712,13 +3674,6 @@ NICK_HELP_SET_EMAIL
 	Informationen über deinen Nicknamen mit dem INFO 
 	Befehl anfordert.
 	
-NICK_HELP_SET_ICQ
-	Syntax: SET ICQ Nummer
-	
-	Verbindet die angegebene ICQ Nummer mit deinem Nicknamen.
-	Diese Nummer wird angezeigt, wenn jemand Informationen
-	über deinen Nicknamen mit dem INFO Befehl anfordert.
-	
 NICK_HELP_SET_GREET
 	Syntax: SET GREET Nachricht
 	
@@ -3807,12 +3762,8 @@ NICK_HELP_CMD_SASET_DISPLAY
 	    DISPLAY    Setzt einen Nicknamen als Ursprung der Nickgruppe
 NICK_HELP_CMD_SASET_PASSWORD
 	    PASSWORD   Setzt das Passwort eines Nicknamens
-NICK_HELP_CMD_SASET_URL
-	    URL        Fügt eine URL dem Nicknamen hinzu
 NICK_HELP_CMD_SASET_EMAIL
 	    EMAIL      Fügt eine Emailadresse dem Nicknamen hinzu
-NICK_HELP_CMD_SASET_ICQ
-	    ICQ        Fügt eine ICQ Nummer dem Nicknamen hinzu
 NICK_HELP_CMD_SASET_GREET
 	    GREET      Fügt eine Begrüssungsnachricht dem Nicknamen hinzu
 NICK_HELP_CMD_SASET_KILL
@@ -3858,26 +3809,12 @@ NICK_HELP_SASET_PASSWORD
 	Ändert das Passwort um sich als Besitzer eines Nicknamens
 	zu identifizieren.
 	
-NICK_HELP_SASET_URL
-	Syntax: SASET nickname URL url
-	
-	Verknüpft eine URL mit dem Nicknamen. Diese URL wird
-	angezeigt wenn jemand mit dem INFO Befehl nähere 
-	Informationen zu dem Nicknamen abruft.
-
 NICK_HELP_SASET_EMAIL
 	Syntax: SASET nickname EMAIL address
 	
 	Verknüpft die angegeben Emailadresse mit dem
 	Nicknamen.
 	
-NICK_HELP_SASET_ICQ
-	Syntax: SASET nickname ICQ number
-	
-	Verknüpft die angegebene ICQ Nummer mit dem Nicknamen.
-	Diese ICQ Nummer wird angezeigt wenn jemand mit dem 
-	INFO Befehl nähere Informationen zu dem Nicknamen abruft.
-	
 NICK_HELP_SASET_GREET
 	Syntax: SASET nickname GREET message
 	
@@ -4439,11 +4376,6 @@ CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Stellt den Vertreter des Founders ein
 CHAN_HELP_CMD_SET_DESC
 	    DESC          Ändert die Channel-Beschreibung
-CHAN_HELP_CMD_SET_URL
-	    URL           Verbindet eine URL mit dem Channel
-CHAN_HELP_CMD_SET_EMAIL
-	    EMAIL         Verbindet eine eMail-Adresse mit dem
-	                  Channel
 CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Stellt eine Begrüssungsmeldung des
 	                  Channels ein
@@ -4508,24 +4440,6 @@ CHAN_HELP_SET_DESC
 	Ändert die Beschreibung für einen Channel, die bei
 	dem LIST und INFO Befehl angezeigt wird.
 
-CHAN_HELP_SET_URL
-	Syntax: %s Channel URL [Url]
-	
-	Verbindet die angegebene URL mit dem Channel. Diese
-	URL wird angezeigt, wenn jemand Informationen
-	über den Channel mit dem INFO Befehl abfragt.
-	Wird kein Parameter angegeben, wird die aktuelle
-	URL gelöscht.
-
-CHAN_HELP_SET_EMAIL
-	Syntax: %s Channel EMAIL [eMail-Adresse]
-	
-	Verbindet die angegebene eMail-Adresse mit dem
-	Channel. Diese eMail-Adresse wird angezeigt,
-	wenn jemand Informationen über den Channel mit
-	dem INFO Befehl abfragt.Wird kein Parameter 
-	angegeben, wird die aktuelle eMail-Adresse gelöscht.
-
 CHAN_HELP_SET_ENTRYMSG
 	Syntax: %s Channel ENTRYMSG [Nachricht]
 	
diff --git a/lang/en_us.l b/lang/en_us.l
index c86043854..c6352de49 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -445,12 +445,6 @@ NICK_SET_LANGUAGE_UNKNOWN
 NICK_SET_LANGUAGE_CHANGED
 	Language changed to English.
 
-# SET URL responses
-NICK_SET_URL_CHANGED
-	URL changed to %s.
-NICK_SET_URL_UNSET
-	URL unset.
-
 # SET EMAIL responses
 NICK_SET_EMAIL_CHANGED
 	E-mail address changed to %s.
@@ -459,14 +453,6 @@ NICK_SET_EMAIL_UNSET
 NICK_SET_EMAIL_UNSET_IMPOSSIBLE
 	You cannot unset the e-mail on this network.
 	
-# SET ICQ responses
-NICK_SET_ICQ_CHANGED
-	ICQ number set to %s.
-NICK_SET_ICQ_UNSET
-	ICQ number unset.
-NICK_SET_ICQ_INVALID
-	%s is not a valid number.
-	
 # SET GREET responses
 NICK_SET_GREET_CHANGED
 	Greet message changed to %s.
@@ -568,12 +554,6 @@ NICK_SASET_PASSWORD_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.
@@ -582,14 +562,6 @@ NICK_SASET_EMAIL_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.
@@ -734,8 +706,6 @@ NICK_INFO_VHOST
 	            vhost: %s
 NICK_INFO_VHOST2
 	            vhost: %s@%s
-NICK_INFO_ICQ
-	            ICQ #: %d
 NICK_INFO_GREET
 	    Greet message: %s
 NICK_INFO_OPTIONS
@@ -1110,6 +1080,10 @@ CHAN_SET_DISABLED
 	Sorry, channel option setting is temporarily disabled.
 CHAN_SET_UNKNOWN_OPTION
 	Unknown SET option %s.
+CHAN_SETTING_CHANGED
+	%s for %s set to %s.
+CHAN_SETTING_UNSET
+	%s for %s unset.
 
 # SET FOUNDER responses
 CHAN_SET_FOUNDER_TOO_MANY_CHANS
@@ -1129,12 +1103,6 @@ CHAN_SUCCESSOR_IS_FOUNDER
 CHAN_DESC_CHANGED
 	Description of %s changed to %s.
 
-# SET URL responses
-CHAN_URL_CHANGED
-	URL for %s changed to %s.
-CHAN_URL_UNSET
-	URL for %s unset.
-
 # SET EMAIL responses
 CHAN_EMAIL_CHANGED
 	E-mail address for %s changed to %s.
@@ -3521,12 +3489,8 @@ NICK_HELP_CMD_SET_PASSWORD
 NICK_HELP_CMD_SET_LANGUAGE
 	    LANGUAGE   Set the language Services will use when
 	                   sending messages to you
-NICK_HELP_CMD_SET_URL
-	    URL        Associate a URL with your nickname
 NICK_HELP_CMD_SET_EMAIL
 	    EMAIL      Associate an E-mail address with your nickname
-NICK_HELP_CMD_SET_ICQ
-	    ICQ        Associate an ICQ number with your nickname
 NICK_HELP_CMD_SET_GREET
 	    GREET      Associate a greet message with your nickname
 NICK_HELP_CMD_SET_KILL
@@ -3572,13 +3536,6 @@ NICK_HELP_SET_LANGUAGE
 	supported languages:
 	
 
-NICK_HELP_SET_URL
-	Syntax: SET URL url
-	
-	Associates the given URL with your nickname.  This URL
-	will be displayed whenever someone requests information
-	on your nick with the INFO command.
-
 NICK_HELP_SET_EMAIL
 	Syntax: SET EMAIL address
 	
@@ -3586,13 +3543,6 @@ NICK_HELP_SET_EMAIL
 	This address will be displayed whenever someone requests
 	information on the nickname with the INFO command.
 	
-NICK_HELP_SET_ICQ
-	Syntax: SET ICQ number
-	
-	Associates the given ICQ number with your nickname.  This 
-	number will be displayed whenever someone requests 
-	information on your nick with the INFO command.
-	
 NICK_HELP_SET_GREET
 	Syntax: SET GREET message
 	
@@ -3670,12 +3620,8 @@ NICK_HELP_CMD_SASET_DISPLAY
 	    DISPLAY    Set the display of the group in Services
 NICK_HELP_CMD_SASET_PASSWORD
 	    PASSWORD   Set the nickname password
-NICK_HELP_CMD_SASET_URL
-	    URL        Associate a URL with the nickname
 NICK_HELP_CMD_SASET_EMAIL
 	    EMAIL      Associate an E-mail address with the nickname
-NICK_HELP_CMD_SASET_ICQ
-	    ICQ        Associate an ICQ number with the nickname
 NICK_HELP_CMD_SASET_GREET
 	    GREET      Associate a greet message with the nickname
 NICK_HELP_CMD_SASET_KILL
@@ -3713,25 +3659,11 @@ NICK_HELP_SASET_PASSWORD
 	
 	Changes the password used to identify as the nick's	owner.
 
-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.
-
 NICK_HELP_SASET_EMAIL
 	Syntax: SASET nickname EMAIL address
 	
 	Associates the given E-mail address with the nickname.
 	
-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.
-	
 NICK_HELP_SASET_GREET
 	Syntax: SASET nickname GREET message
 	
@@ -4245,10 +4177,6 @@ CHAN_HELP_CMD_SET_SUCCESSOR
 	    SUCCESSOR     Set the successor for a channel
 CHAN_HELP_CMD_SET_DESC
 	    DESC          Set the channel description
-CHAN_HELP_CMD_SET_URL
-	    URL           Associate a URL with the channel
-CHAN_HELP_CMD_SET_EMAIL
-	    EMAIL         Associate an E-mail address with the channel
 CHAN_HELP_CMD_SET_ENTRYMSG
 	    ENTRYMSG      Set a message to be sent to users when they
 	                     enter the channel
@@ -4310,23 +4238,6 @@ CHAN_HELP_SET_DESC
 	Sets the description for the channel, which shows up with
 	the LIST and INFO commands.
 
-CHAN_HELP_SET_URL
-	Syntax: %s channel URL [url]
-	
-	Associates the given URL with the channel.  This URL will
-	be displayed whenever someone requests information on the
-	channel with the INFO command.  If no parameter is given,
-	deletes any current URL for the channel.
-
-CHAN_HELP_SET_EMAIL
-	Syntax: %s channel EMAIL [address]
-	
-	Associates the given E-mail address with the channel.
-	This address will be displayed whenever someone requests
-	information on the channel with the INFO command.  If no
-	parameter is given, deletes any current E-mail address for
-	the channel.
-
 CHAN_HELP_SET_ENTRYMSG
 	Syntax: %s channel ENTRYMSG [message]
 	
diff --git a/lang/es.l b/lang/es.l
index 83258b716..78d52c566 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -461,12 +461,6 @@ NICK_SET_LANGUAGE_UNKNOWN
 NICK_SET_LANGUAGE_CHANGED
 	Lenguage cambiado a Español.
 
-# SET URL responses
-NICK_SET_URL_CHANGED
-	URL cambiada a %s.
-NICK_SET_URL_UNSET
-	URL no seteada.
-
 # SET EMAIL responses
 NICK_SET_EMAIL_CHANGED
 	Direccion E-mail cambiada a %s.
@@ -475,14 +469,6 @@ NICK_SET_EMAIL_UNSET
 NICK_SET_EMAIL_UNSET_IMPOSSIBLE
 	No puedes no setear tu direccion e-mail en esta red.
 	
-# SET ICQ responses
-NICK_SET_ICQ_CHANGED
-	Numero ICQ seteado a %s.
-NICK_SET_ICQ_UNSET
-	Numero ICQ no seteado.
-NICK_SET_ICQ_INVALID
-	%s no es un numero valido.
-	
 # SET GREET responses
 NICK_SET_GREET_CHANGED
 	Mensaje de bienvenida cambiado a %s.
@@ -585,12 +571,6 @@ NICK_SASET_PASSWORD_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.
@@ -599,14 +579,6 @@ NICK_SASET_EMAIL_UNSET
 NICK_SASET_EMAIL_UNSET_IMPOSSIBLE
 	You cannot unset the e-mail on this network.