BUILD : 1.7.19 (1275) BUGS : 747 NOTES : CS SET XOP can not be used if cs_xop is not loaded.

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


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

18 files changed, 42 insertions, 6 deletions

diff --git a/Changes b/Changes
index 6413fc510..a88d72886 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@ Anope Version  S V N
 08/21 F Updated the WIN32.txt document a bit                              [ #00]
 08/21 F Re-worded the CHAN_LEVELS_XOP string in en_us                     [ #00]
 08/27 F Functions firstuser and first_uid now don't collide when used.    [#764]
+08/27 F Is not posible to use CS SET XOP when cs_xop is not loaded.       [#747]
 
 Anope Version 1.7.19
 --------------------
diff --git a/Changes.lang b/Changes.lang
index c6dd89adf..6b95abafb 100644
--- a/Changes.lang
+++ b/Changes.lang
@@ -1,6 +1,7 @@
 Anope Version  S V N
 --------------------
 *** New Strings:
+	CHAN_XOP_NOT_AVAILABLE
 
 *** Mod Strings:
 
diff --git a/include/services.h b/include/services.h
index 7da00a5e4..951d0f215 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1093,7 +1093,7 @@ struct session_ {
  * functions, we then call the correct function for the anope_ commands.
  **/
 typedef struct ircd_proto_ {
-	void (*ircd_set_mod_current_buffer)(int ac, char **av);
+    void (*ircd_set_mod_current_buffer)(int ac, char **av);
     void (*ircd_cmd_svsnoop)(char *server, int set);
     void (*ircd_cmd_remove_akill)(char *user, char *host);
     void (*ircd_cmd_topic)(char *whosets, char *chan, char *whosetit, char *topic, time_t when);
@@ -1159,9 +1159,9 @@ typedef struct ircd_proto_ {
     void (*ircd_cmd_svid_umode2)(User * u, char *ts);
     void (*ircd_cmd_svid_umode3)(User * u, char *ts);
     void (*ircd_cmd_ctcp)(char *source, char *dest, char *buf);
-	void (*ircd_cmd_svsjoin)(char *source, char *nick, char *chan);
-	void (*ircd_cmd_svspart)(char *source, char *nick, char *chan);
-	void (*ircd_cmd_swhois)(char *source, char *who, char *mask);
+    void (*ircd_cmd_svsjoin)(char *source, char *nick, char *chan);
+    void (*ircd_cmd_svspart)(char *source, char *nick, char *chan);
+    void (*ircd_cmd_swhois)(char *source, char *who, char *mask);
     void (*ircd_cmd_eob)();
     void (*ircd_cmd_jupe)(char *jserver, char *who, char *reason);
     void (*ircd_set_umode)(User *user, int ac, char **av);
diff --git a/lang/cat.l b/lang/cat.l
index 8efcfac9f..690633f27 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -1279,6 +1279,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	No pots utilitzar aquesta comanda. Utilitza la comanda ACCESS.
 	Escriu %R%s HELP ACCESS per més informació.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/de.l b/lang/de.l
index 8d379c042..46a5538df 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -1289,6 +1289,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Du kannst diesen Befehl nicht benutzen. Benutze Stattdessen ACCESS.
 	Tippe %R%s HELP ACCESS für weitere Informationen.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/en_us.l b/lang/en_us.l
index 46f08d8c7..73aa8453d 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -1253,6 +1253,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	You can't use this command. Use the ACCESS command instead.
 	Type %R%s HELP ACCESS for more information.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/es.l b/lang/es.l
index 16129aea1..d2b7cb6e8 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -1279,6 +1279,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	No puedes usar este comando. Usa el comando ACCESS en su lugar.
 	Tipea %R%s HELP ACCESS para mayor informacion.
+CHAN_XOP_NOT_AVAILABLE
+	El sistema xOP no esta disponible.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index d005a3d5c..ec3c365f9 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -1290,6 +1290,8 @@ CHAN_XOP_ACCESS
 	Vous ne pouvez pas utiliser cette commande. 
 	Utilisez la commandes ACCESS à la place.
 	Tapez %R%s HELP ACCESS pour plus d'informations.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/gr.l b/lang/gr.l
index bd993f7bc..49e403a67 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -1274,6 +1274,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Äåí ìðïñåßò íá ÷ñçóéìïðïéÞóåéò áõôÞ ôçí åíôïëÞ. ×ñçóéìïðïßçóå ôçí ACCESS åíôïëÞ áíôß ãéá áõôÞ.
 	ÃñÜøå %R%s HELP ACCESS ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/hun.l b/lang/hun.l
index 599e3937c..6335aade8 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -1267,6 +1267,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Nem használhatod a parancsot. Használd az ACCESS parancsot.
 	Bõvebb információ: %R%s HELP ACCESS
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP üzenetek
 CHAN_AOP_SYNTAX
diff --git a/lang/it.l b/lang/it.l
index ed1a592c0..3f0eca1d3 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -1264,6 +1264,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Questo comando non è utilizzabile; usa il comando ACCESS.
 	Digita %R%s HELP ACCESS per avere maggiori informazioni.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/nl.l b/lang/nl.l
index 44947cc13..85a918ce7 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -1274,6 +1274,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Je kan dit commando niet gebruiken. Gebruik het ACCESS commando.
 	Type %R%s HELP ACCESS voor meer informatie.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/pl.l b/lang/pl.l
index 28d7b454f..cfd8b38a9 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -1359,6 +1359,8 @@ CHAN_XOP_ACCESS
 	Nie mo¿esz u¿yæ tej komendy. U¿yj komendy ACCESS.
 	Napisz %R%s HELP ACCESS, 
 	aby uzyskaæ wiêcej informacji.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/pt.l b/lang/pt.l
index 30ab7b3f2..91e1f3e80 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -1273,6 +1273,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Você não pode usar este comando. Ao invés, use o comando ACCESS.
 	Digite %R%s HELP ACCESS para mais informação.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/ru.l b/lang/ru.l
index 9dbaaaab6..678115ced 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -1270,6 +1270,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Âû íå ìîæåòå èñïîëüçîâàò ýòó êîìàíäó. Âìåñòî íåå èñïîëüçóéòå êîìàíäó ACCESS.
 	Íàïèøèòå %R%s HELP ACCESS äëÿ ïîëó÷åíèÿ áîëåå ïîäðîáíîé èíôîðìàöèè.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/lang/tr.l b/lang/tr.l
index 069d4f043..fff2111bd 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -1281,6 +1281,8 @@ CHAN_XOP_LIST_FORMAT
 CHAN_XOP_ACCESS
 	Bu komutu kullanamazsiniz. Yerine ACCESS komutunu kullanin.
 	Daha fazla bilgi için %R%s HELP ACCESS yazin.
+CHAN_XOP_NOT_AVAILABLE
+	xOP system is not available.
 
 # AOP messages
 CHAN_AOP_SYNTAX
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 0042cff8f..d5d4e2945 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -264,7 +264,11 @@ int do_set(User * u)
     } else if (stricmp(cmd, "OPNOTICE") == 0) {
         do_set_opnotice(u, ci, param);
     } else if (stricmp(cmd, "XOP") == 0) {
-        do_set_xop(u, ci, param);
+        if (!(findModule("cs_xop"))) {
+            notice_lang(s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, cmd);
+        } else {
+            do_set_xop(u, ci, param);
+        }
     } else if (stricmp(cmd, "PEACE") == 0) {
         do_set_peace(u, ci, param);
     } else if (stricmp(cmd, "NOEXPIRE") == 0) {
diff --git a/version.log b/version.log
index 1cacc5377..b8a6edab5 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="19"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1274"
+VERSION_BUILD="1275"
 
 # $Log$
 #
+# BUILD : 1.7.19 (1275)
+# BUGS  : 747
+# NOTES : CS SET XOP can not be used if cs_xop is not loaded.
+#
 # BUILD : 1.7.19 (1274)
 # BUGS  : 764
 # NOTES : Fixed firstuser/nextuser and first_uid/next_uid using the same globals thus being unable to be used at the same time