summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes5
-rwxr-xr-xconfigure2
-rw-r--r--include/services.h1
-rw-r--r--lang/de.l1
-rw-r--r--lang/fr.l2
-rw-r--r--lang/pt.l5
-rw-r--r--src/channels.c5
-rw-r--r--src/messages.c4
-rw-r--r--src/send.c5
-rw-r--r--version.log6
10 files changed, 29 insertions, 7 deletions
diff --git a/Changes b/Changes
index d4c21c979..0821ad3aa 100644
--- a/Changes
+++ b/Changes
@@ -28,6 +28,11 @@ Provided by Anope Dev. <dev@anope.org> - 2004
Provided by Trystan <trystan@nomadirc.net> - 2004
07/22 A Added VIAGRA support for modes +A and +H. [ #99]
+08/17 F Rage2 SNICK event handling. [#128]
+08/17 F Included XOP reference to /CS HELP SET. [#139]
+08/17 F French language update. [#146]
+08/17 F Ultimate3 channel modes fixed. [#147]
+08/17 F Ultimate3 configuration defines set properly. [#148]
Provided by Janos Kapitany <sarkanyka@cjbchat.hu>
08/04 A New language file hun.l (Hungarian) [ #00]
diff --git a/configure b/configure
index 4973e09dd..b203f58b0 100755
--- a/configure
+++ b/configure
@@ -8390,7 +8390,7 @@ _ACEOF
elif test "$withval" = "IRC_ULTIMATE3"; then
cat >>confdefs.h <<\_ACEOF
-#define IRC_DREAMFORGE 1
+#define IRC_BAHAMUT 1
_ACEOF
diff --git a/include/services.h b/include/services.h
index b400179e9..8fcdba9d4 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1345,6 +1345,7 @@ struct channel_ {
#define CMODE_N 0x00001000
#define CMODE_S 0x00002000
#define CMODE_K 0x00004000
+#define CMODE_O 0x00008000
#endif
/* These modes are for IRC_RAGE2 servers only */
diff --git a/lang/de.l b/lang/de.l
index 596bef318..abf746364 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -4049,6 +4049,7 @@ CHAN_HELP_SET
werden durch den Kicker signiert
OPNOTICE Sendet eine Notice wenn Op/Deop-Kommandos
benutzt werden
+ XOP Toggle the user privilege system
Tippe /msg %S HELP option für weitere Informationen
zu einem bestimmten Kommando.
diff --git a/lang/fr.l b/lang/fr.l
index 688f75fa8..75ee926c2 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -375,7 +375,7 @@ NICK_IDENTIFY_EMAIL_HOWTO
# LOGOUT responses
NICK_ALREADY_IDENTIFIED
- You are already identified.
+ Vous êtes déjà identifié.
# UPDATE responses
NICK_UPDATE_SUCCESS
diff --git a/lang/pt.l b/lang/pt.l
index fdd911137..821671e95 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -3890,8 +3890,9 @@ CHAN_HELP_SET
SECUREOPS Rigoroso o controle de status de OP
SECUREFOUNDER Controle restrito do fundador do canal
SIGNKICK Assinatura dos kicks usados pelo comando kick
- OPNOTICE Envia uma notice quando os comandos OP/DEOP
- são usados
+ OPNOTICE Envia uma notice quando os comandos OP/DEOP
+ são usados
+ XOP Toggle the user privilege system
Digite /msg %S HELP SET opções para maiores informações
sobre uma opção em particular.
diff --git a/src/channels.c b/src/channels.c
index 0c2a97328..f099eda32 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1120,6 +1120,9 @@ void do_cmode(const char *source, int ac, char **av)
Channel *chan;
ChannelInfo *ci = NULL;
#ifdef IRC_BAHAMUT
+
+/* Ultimate3 doesn't send TS on Mode - TSL */
+#if !defined(IRC_ULTIMATE3)
int i;
char *t;
@@ -1143,6 +1146,8 @@ void do_cmode(const char *source, int ac, char **av)
}
#endif
+#endif
+
chan = findchan(av[0]);
if (!chan) {
ci = cs_findchan(av[0]);
diff --git a/src/messages.c b/src/messages.c
index eb83909b2..887a9986f 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -409,8 +409,8 @@ static int m_client(char *source, int ac, char **av)
static int m_snick(char *source, int ac, char **av)
{
if (ac != 2) {
- User *user = do_nick(source, av[0], av[3], av[4], av[8], av[10],
- strtoul(av[1], NULL, 10), strtoul(av[7], NULL,
+ User *user = do_nick(source, av[0], av[3], av[4], av[7], av[10],
+ strtoul(av[1], NULL, 10), strtoul(av[8], NULL,
0),
strtoul(av[5], NULL, 0), av[6]);
if (user) {
diff --git a/src/send.c b/src/send.c
index 0c21b65d3..a0284323a 100644
--- a/src/send.c
+++ b/src/send.c
@@ -230,10 +230,15 @@ void send_mode(const char *source, const char *on, const char *fmt, ...)
vsnprintf(buf, sizeof(buf), fmt, args);
#ifdef IRC_BAHAMUT
+
+/* Ultimate3 doesn't send TS Mode - doing so will cause modes not to send */
+/* btw - this is used by channel setting was well - TSL */
+#if !defined(IRC_ULTIMATE3)
if (uplink_capab & CAPAB_TSMODE)
send_cmd(source, "MODE %s 0 %s", on, buf);
else
#endif
+#endif
send_cmd(source, "MODE %s %s", on, buf);
}
diff --git a/version.log b/version.log
index ed05686a8..2ec75b9d6 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="5"
-VERSION_BUILD="323"
+VERSION_BUILD="325"
# $Log$
#
+# BUILD : 1.7.5 (325)
+# BUGS : 128 139 146 147 148
+# NOTES : Applied patch supplied by Trystan to fix bugs listed above.
+#
# BUILD : 1.7.5 (323)
# BUGS :
# NOTES : fix seriously stupid booboo introduced by myself (ifdef stuff finally fixed)