striplt() is now string_trim()

[citadel.git] / citadel / server / msgbase.c

diff --git a/citadel/server/msgbase.c b/citadel/server/msgbase.c
index 0cde681fc302c04456001cc700a83050c0937532..679390eea01aa753e6e44e8cf3cb22690190d85f 100644 (file)
--- a/citadel/server/msgbase.c
+++ b/citadel/server/msgbase.c
@@ -4,12 +4,6 @@
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -1260,7 +1254,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp,
        }
 
        if (!strcasecmp(cbtype, "text/html")) {
-               ptr = html_to_ascii(content, length, 80);
+               ptr = html_to_ascii(content, length, 80, 0);
                wlen = strlen(ptr);
                client_write(ptr, wlen);
                if ((wlen > 0) && (ptr[wlen-1] != '\n')) {
@@ -2664,7 +2658,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
                if (mptr != NULL) {
                        char *aptr;
                        safestrncpy(content_type, &mptr[13], sizeof content_type);
-                       striplt(content_type);
+                       string_trim(content_type);
                        aptr = content_type;
                        while (!IsEmptyStr(aptr)) {
                                if ((*aptr == ';')
@@ -3134,8 +3128,8 @@ struct CtdlMessage *CtdlMakeMessageLen(
        msg->cm_anon_type = type;
        msg->cm_format_type = format_type;
 
-       if (recipient != NULL) rcplen = striplt(recipient);
-       if (recp_cc != NULL) cclen = striplt(recp_cc);
+       if (recipient != NULL) rcplen = string_trim(recipient);
+       if (recp_cc != NULL) cclen = string_trim(recp_cc);
 
        /* Path or Return-Path */
        if (myelen > 0) {
@@ -3184,7 +3178,7 @@ struct CtdlMessage *CtdlMakeMessageLen(
 
        if (subject != NULL) {
                long length;
-               length = striplt(subject);
+               length = string_trim(subject);
                if (length > 0) {
                        long i;
                        long IsAscii;