summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2007-12-28 19:12:02 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2007-12-28 19:12:02 +0000
commit4a5cf6e1e3a3e8031cc4980477c456ec684cb971 (patch)
tree7ca35b3ff7a3897d10f7f56a78ea0c71eca4747f /src/core
parentf8f64944c27f09a728f2c75d3b66ca7ce1e700ae (diff)
BUILD : 1.7.19 (1322) BUGS : 685 NOTES : Applied a patch by Jilles which should fix SJOIN not always sending the correct TS
git-svn-id: svn://svn.anope.org/anope/trunk@1322 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1040 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core')
-rw-r--r--src/core/cs_akick.c4
-rw-r--r--src/core/cs_topic.c2
-rw-r--r--src/core/os_set.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 4108f58e3..39eb6d25c 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -284,7 +284,7 @@ int do_akick(User * u)
cu = c->users;
while (cu) {
next = cu->next;
- if (check_kick(cu->user, c->name)) {
+ if (check_kick(cu->user, c->name, c->creation_time)) {
argv[0] = sstrdup(c->name);
argv[1] = sstrdup(cu->user->nick);
if (akick->reason)
@@ -553,7 +553,7 @@ int do_akick(User * u)
while (cu) {
next = cu->next;
- if (check_kick(cu->user, c->name)) {
+ if (check_kick(cu->user, c->name, c->creation_time)) {
argv[0] = sstrdup(c->name);
argv[1] = sstrdup(cu->user->nick);
argv[2] = sstrdup(CSAutokickReason);
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index c4af5fc5b..fe2a0b27d 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -103,7 +103,7 @@ int do_cs_topic(User * u)
s_ChanServ, u->nick, u->username, u->host, c->name);
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
- anope_cmd_join(s_ChanServ, c->name, time(NULL));
+ anope_cmd_join(s_ChanServ, c->name, c->creation_time);
anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
}
}
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 240b60a5f..860270dfb 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -97,6 +97,7 @@ int do_set(User * u)
char *option = strtok(NULL, " ");
char *setting = strtok(NULL, " ");
int index;
+ Channel *c;
if (!option) {
syntax_error(s_OperServ, u, "SET", OPER_SET_SYNTAX);
@@ -185,7 +186,8 @@ int do_set(User * u)
*/
if (LogChannel && (stricmp(setting, "on") == 0)) {
if (ircd->join2msg) {
- anope_cmd_join(s_GlobalNoticer, LogChannel, time(NULL));
+ c = findchan(LogChannel);
+ anope_cmd_join(s_GlobalNoticer, LogChannel, c ? c->creation_time : time(NULL));
}
logchan = 1;
alog("Now sending log messages to %s", LogChannel);