* use eUsrAxlvl all over the place

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index c31e3615462d725381eb051c840b1dbefb550d98..df4d224d03b209908ee244c2ecef04f4f75b3f5a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2153,19 +2153,49 @@ START_TEXT:
         */
        if (TheMessage->cm_format_type == FMT_FIXED) {
                int buflen;
+               int xlline = 0;
+               int nllen = strlen (nl);
                if (mode == MT_MIME) {
                        cprintf("Content-type: text/plain\n\n");
                }
                *buf = '\0';
                buflen = 0;
                while (ch = *mptr++, ch > 0) {
-                       if (ch == 13)
-                               ch = 10;
-                       if ((ch == 10) || (buflen > 250)) {
+                       if (ch == '\n')
+                               ch = '\r';
+
+                       if ((buflen > 250) && (!xlline)){
+                               int tbuflen;
+                               tbuflen = buflen;
+
+                               while ((buflen > 0) && 
+                                      (!isspace(buf[buflen])))
+                                       buflen --;
+                               if (buflen == 0) {
+                                       xlline = 1;
+                               }
+                               else {
+                                       mptr -= tbuflen - buflen;
+                                       buf[buflen] = '\0';
+                                       ch = '\r';
+                               }
+                       }
+                       /* if we reach the outer bounds of our buffer, 
+                          abort without respect what whe purge. */
+                       if (xlline && 
+                           ((isspace(ch)) || 
+                            (buflen > SIZ - nllen - 2)))
+                               ch = '\r';
+
+                       if (ch == '\r') {
+                               memcpy (&buf[buflen], nl, nllen);
+                               buflen += nllen;
                                buf[buflen] = '\0';
-                               cprintf("%s%s", buf, nl);
+
+                               client_write(buf, buflen);
                                *buf = '\0';
                                buflen = 0;
+                               xlline = 0;
                        } else {
                                buf[buflen] = ch;
                                buflen++;
@@ -2748,7 +2778,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
        char content_type[SIZ];                 /* We have to learn this */
        char recipient[SIZ];
        long newmsgid;
-       char *mptr = NULL;
+       const char *mptr = NULL;
        struct ctdluser userbuf;
        int a, i;
        struct MetaData smi;
@@ -2845,7 +2875,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
 
        /* If the user is a twit, move to the twit room for posting */
        if (TWITDETECT) {
-               if (CCC->user.axlevel == 2) {
+               if (CCC->user.axlevel == AxProbU) {
                        strcpy(hold_rm, actual_rm);
                        strcpy(actual_rm, config.c_twitroom);
                        CtdlLogPrintf(CTDL_DEBUG, "Diverting to twit room\n");
@@ -3234,7 +3264,6 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator,  /* token signalling EOT */
 {
        StrBuf *Message;
        StrBuf *LineBuf;
-       char buf[1024];
        int flushing = 0;
        int finished = 0;
        int dotdot = 0;
@@ -3517,7 +3546,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
 
        }
 
-       if ((CC->user.axlevel < 2)
+       if ((CC->user.axlevel < AxProbU)
            && ((CC->room.QRflags & QR_MAILBOX) == 0)) {
                snprintf(errmsgbuf, n, "Need to be validated to enter "
                                "(except in %s> to sysop)", MAILROOM);
@@ -3542,7 +3571,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf,
 int CtdlCheckInternetMailPermission(struct ctdluser *who) {
 
        /* Do not allow twits to send Internet mail */
-       if (who->axlevel <= 2) return(0);
+       if (who->axlevel <= AxProbU) return(0);
 
        /* Globally enabled? */
        if (config.c_restrict == 0) return(1);
@@ -3551,7 +3580,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) {
        if (who->flags & US_INTERNET) return(2);
 
        /* Aide level access? */
-       if (who->axlevel >= 6) return(3);
+       if (who->axlevel >= AxAideU) return(3);
 
        /* No mail for you! */
        return(0);
@@ -3567,7 +3596,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) {
  *
  * Caller needs to free the result using free_recipients()
  */
-struct recptypes *validate_recipients(char *supplied_recipients, 
+struct recptypes *validate_recipients(const char *supplied_recipients, 
                                      const char *RemoteIdentifier, 
                                      int Flags) {
        struct recptypes *ret;
@@ -3903,7 +3932,7 @@ void cmd_ent0(char *entargs)
        if (IsEmptyStr(newusername)) {
                strcpy(newusername, CC->user.fullname);
        }
-       if (  (CC->user.axlevel < 6)
+       if (  (CC->user.axlevel < AxAideU)
           && (strcasecmp(newusername, CC->user.fullname))
           && (strcasecmp(newusername, CC->cs_inet_fn))
        ) {     
@@ -3953,7 +3982,7 @@ void cmd_ent0(char *entargs)
        if (  ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) )
           || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) )
        ) {
-               if (CC->user.axlevel < 2) {
+               if (CC->user.axlevel < AxProbU) {
                        strcpy(recp, "sysop");
                        strcpy(cc, "");
                        strcpy(bcc, "");
@@ -4005,7 +4034,7 @@ void cmd_ent0(char *entargs)
                }
 
                if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
-                  && (CC->user.axlevel < 4) ) {
+                  && (CC->user.axlevel < AxNetU) ) {
                        cprintf("%d Higher access required for network mail.\n",
                                ERROR + HIGHER_ACCESS_REQUIRED);
                        free_recipients(valid_to);
@@ -4364,7 +4393,7 @@ void cmd_move(char *args)
        permit = 0;
 
        /* Aides can move/copy */
-       if (CC->user.axlevel >= 6) permit = 1;
+       if (CC->user.axlevel >= AxAideU) permit = 1;
 
        /* Room aides can move/copy */
        if (CC->user.usernum == CC->room.QRroomaide) permit = 1;