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

diff --git a/ChangeLog b/ChangeLog
index 0370654461ac8e247debf844458f11834fc7908b..ff4758db814cffcfe1148572f59547f84ee33170 100644 (file)
--- 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 <mdpoole@troilus.org>     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 <mdpoole@troilus.org>     patch-74
 
     Summary:

diff --git a/languages/de/strings.db b/languages/de/strings.db
index 9727d26a605a2b3e98da98b0a159b4eaf8ee7545..c92eec1df05efbeb3487eaacb381446ba7b4da65 100644 (file)
--- 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 7b7a7881748af0216e37ebeffe3ad84c80453bbc..c897f481d3560ac428d850d051e748a7419a71a5 100644 (file)
--- 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 2529408e72a7cde2b1e694baaf9f3dee6bea6bf4..d214fe345e95b45d1514d991ae2d134239d65fad 100644 (file)
--- 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 b2f5afda1a08ddd8b138a443d2b45420b4251dee..2288d115f4e3af4bdf0e32e720f6e6696b3f9a21 100644 (file)
--- 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)