From ab2fc94b004ee50878e32a1c6b51fc072beac3fa Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Mon, 2 Aug 2004 12:54:13 +0000 Subject: [PATCH] Assorted bug fixes * Add missing semicolon in German translation of CSMSG_TRANSFER_WAIT. * Fix pointer used in !trim max_access calculation. * Default to maximum line length for all "single-line" messages. * Return success from NickServ ounregister so it is logged properly. git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-75 --- ChangeLog | 20 ++++++++++++++++++++ languages/de/strings.db | 2 +- src/chanserv.c | 2 +- src/helpfile.c | 2 +- src/nickserv.c | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0370654..ff4758d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,26 @@ # arch-tag: automatic-ChangeLog--srvx@srvx.net--2004-srvx/srvx--devo--1.3 # +2004-08-02 12:54:13 GMT Michael Poole patch-75 + + Summary: + Assorted bug fixes + Revision: + srvx--devo--1.3--patch-75 + + * Add missing semicolon in German translation of CSMSG_TRANSFER_WAIT. + + * Fix pointer used in !trim max_access calculation. + + * Default to maximum line length for all "single-line" messages. + + * Return success from NickServ ounregister so it is logged properly. + + modified files: + ChangeLog languages/de/strings.db src/chanserv.c + src/helpfile.c src/nickserv.c + + 2004-07-22 04:03:22 GMT Michael Poole patch-74 Summary: diff --git a/languages/de/strings.db b/languages/de/strings.db index 9727d26..c92eec1 100644 --- a/languages/de/strings.db +++ b/languages/de/strings.db @@ -233,7 +233,7 @@ "CSMSG_TOYS_DISABLED" "Toys sind vollständig abgeschaltet."; "CSMSG_TOYS_PRIVATE" "Toys werden nur dem User direkt beantwortet."; "CSMSG_TOYS_PUBLIC" "Toys werden im Channel beantwortet."; -"CSMSG_TRANSFER_WAIT" "Du musst %s warten, bis du jemand anderem Ownership in $b%s$b geben kannst." +"CSMSG_TRANSFER_WAIT" "Du musst %s warten, bis du jemand anderem Ownership in $b%s$b geben kannst."; "CSMSG_TRIMMED_BANS" "Es wurden $b%d Bans$b von der %s Banliste gelöscht, welche für mindestens %s inaktiv waren."; "CSMSG_TRIMMED_USERS" "Es wurden $b%d User$b mit dem Access Level von %d bis %d von der %s Userliste gelöscht, welche für mindestens %s inaktiv waren."; "CSMSG_UNF_RESPONSE" "Ich will kein Teil deiner versauten Phantasien sein !"; diff --git a/src/chanserv.c b/src/chanserv.c index 7b7a788..c897f48 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -2451,7 +2451,7 @@ cmd_trim_users(struct userNode *user, struct chanNode *channel, unsigned short m if(!max_access) { min_access = 1; - max_access = (uData->access >= UL_OWNER) ? UL_OWNER : (uData->access - 1); + max_access = (actor->access > UL_OWNER) ? UL_OWNER : (actor->access - 1); } send_message(user, chanserv, "CSMSG_TRIMMED_USERS", count, min_access, max_access, channel->name, intervalString(interval, duration, user->handle_info)); return 1; diff --git a/src/helpfile.c b/src/helpfile.c index 2529408..d214fe3 100644 --- a/src/helpfile.c +++ b/src/helpfile.c @@ -425,7 +425,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle size = sizeof(line); use_color = 1; } - if (!size) + if (!size || !(msg_type & MSG_TYPE_MULTILINE)) size = DEFAULT_LINE_SIZE; switch (msg_type & 3) { case 0: diff --git a/src/nickserv.c b/src/nickserv.c index b2f5afd..2288d11 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -2595,7 +2595,7 @@ static NICKSERV_FUNC(cmd_ounregister) if (!(hi = get_victim_oper(user, argv[1]))) return 0; nickserv_unregister_handle(hi, user); - return 0; + return 1; } static NICKSERV_FUNC(cmd_status) -- 2.20.1