--- sqwebmail/folder.orig.c Tue Mar 19 16:28:10 2002 +++ sqwebmail/folder.c Fri Mar 8 12:44:07 2002 @@ -323,6 +323,7 @@ const char *beforelab, *afterlab; const char *nomsg, *selectalllab; const char *qerrmsg; +const char *mobile=getenv("SQWEBMAIL_MOBILE"); maildir_reload(dir); contents=maildir_read(dir, pref_flagpagesize, &pos, @@ -340,53 +341,73 @@ if (strcmp(cgi("error"), "quota") == 0) printf("%s", qerrmsg); - - printf(""); - printf("
"); - printf("
"); - if (morebefore) - { - size_t beforepos; - - if (pos < pref_flagpagesize) beforepos=0; - else beforepos=pos-pref_flagpagesize; - - printf("", - (long)beforepos); - } - printf("%s", beforelab); - if (morebefore) - printf(""); - - printf("
\n"); - - printf("		\n"); - - printf("
"); - if (moreafter) - { - printf("", - (long)(pos+pref_flagpagesize)); + if (!mobile || !*mobile){ + printf(""); + printf("
"); + printf("
"); + }else{ + + } + if (!mobile || !*mobile){ + if (morebefore) + { + size_t beforepos; + + if (pos < pref_flagpagesize) beforepos=0; + else beforepos=pos-pref_flagpagesize; + + printf("", + (long)beforepos); + } + printf("%s", beforelab); + if (morebefore) + printf(""); + } + if (!mobile || !*mobile){ + printf("
\n"); + + printf("		\n"); + + printf("
"); + }else{ + + } + if (!mobile || !*mobile){ + if (moreafter) + { + printf("", + (long)(pos+pref_flagpagesize)); + } + printf("%s", afterlab); + if (moreafter) + printf(""); + } + if (!mobile || !*mobile){ + printf("
\n"); + + printf("
"); + printf("\n", + + getarg("NUM"), + getarg("DATE"), + getarg("FROM"), + getarg("SUBJECT"), + getarg("SIZE")); + }else{ + /* + printf("%s   %s%s%s%s\n", + + getarg("NUM"), + getarg("DATE"), + getarg("FROM"), + getarg("SUBJECT"), + getarg("SIZE")); + */ } - printf("%s", afterlab); - if (moreafter) - printf(""); - - printf("
%s %s%s%s%s
\n"); - - printf("
"); - printf("\n", - - getarg("NUM"), - getarg("DATE"), - getarg("FROM"), - getarg("SUBJECT"), - getarg("SIZE")); - found=0; for (i=0; i"; end_bold=""; - + if (!mobile || !*mobile){ + start_bold=""; end_bold=""; + }else{ + start_bold=""; end_bold=""; + } if (type[0] == MSGTYPE_NEW) { + if (!mobile || !*mobile){ start_bold=""; end_bold=""; + }else{ + start_bold=""; end_bold=""; + } } p=MSGINFO_FILENAME(contents[i]); if ((q=strrchr(p, '/')) != 0) p=q+1; - - printf("\n", end_bold, folder_index_entry_end, folder_index_entry_start, start_bold, size, end_bold, folder_index_entry_end); + if (!mobile || !*mobile){ + printf("%s%s\n", end_bold, folder_index_entry_end, folder_index_entry_start, start_bold, size, end_bold, folder_index_entry_end); + }else{ + printf("%s %s %s   %s
\n", end_bold, start_bold, size, end_bold); + } } if (found) { + if (!mobile || !*mobile){ puts(""); puts(""); printf("", selectalllab); + }else{ + /*printf(" %s", + selectalllab);*/ + } } if (!found && nomsg) { + if (!mobile || !*mobile){ puts(""); + }else{ + puts(nomsg); + } } + if (!mobile || !*mobile){ + printf("
%s %s%s%s%s
%s%s%ld.%s%s %s%s%s%s%s%s%s", - folder_index_entry_start, start_bold, - type, - end_bold, folder_index_entry_end, - - folder_index_entry_start, start_bold - ); + if (!mobile || !*mobile){ + printf("
%s%s%ld.%s%s %s%s%s%s%s%s%s", + folder_index_entry_start, start_bold, + type, + end_bold, folder_index_entry_end, + + folder_index_entry_start, start_bold + ); + }else{ + printf("%s%ld.%s", + start_bold, + (long)(i+pos+1), + end_bold); + + printf(" %s %s %s %s", + start_bold, + type, + end_bold, + start_bold + ); + } if (!*date) date=" "; - folder_msg_link("message-date", dir, pos+i, type[0]); + if (!mobile || !*mobile){ + folder_msg_link("message-date", dir, pos+i, type[0]); + } print_safe(date); - folder_msg_unlink(dir, pos+i, type[0]); - printf("%s%s%s%s", end_bold, folder_index_entry_end, - folder_index_entry_start, start_bold); + if (!mobile || !*mobile){ + folder_msg_unlink(dir, pos+i, type[0]); + } + if (!mobile || !*mobile){ + printf("%s%s%s%s", end_bold, folder_index_entry_end, + folder_index_entry_start, start_bold); + }else{ + printf("%s %s", end_bold, + start_bold); + } if (!*from) from=" "; - folder_msg_link("message-from", dir, pos+i, type[0]); + if (!mobile || !*mobile){ + folder_msg_link("message-from", dir, pos+i, type[0]); + } froms=rfc2047_decode_simple(from); if (froms == 0) enomem(); @@ -457,11 +508,21 @@ strcpy(froms+27, "..."); print_safe(froms); free(froms); - folder_msg_unlink(dir, pos+i, type[0]); - printf("%s%s
%s%s", end_bold, folder_index_entry_end, - folder_index_entry_start, start_bold); - - folder_msg_link("message-subject", dir, pos+i, type[0]); + if (!mobile || !*mobile){ + folder_msg_unlink(dir, pos+i, type[0]); + } + if (!mobile || !*mobile){ + printf("%s%s
%s%s", end_bold, folder_index_entry_end, + folder_index_entry_start, start_bold); + }else{ + printf("%s %s", end_bold, + start_bold); + } + if (!mobile || !*mobile){ + folder_msg_link("message-subject", dir, pos+i, type[0]); + }else{ + folder_msg_link("", dir, pos+i, type[0]); + } subjs=rfc2047_decode_simple(subj); if (subjs == 0) enomem(); @@ -474,23 +535,39 @@ free(subjs); folder_msg_unlink(dir, pos+i, type[0]); - printf("%s%s%s%s%s %s%s
%s%s%s %s%s
  %s

"); puts(nomsg); puts("

\n"); + }else{ - printf("
\n"); + } maildir_free(contents, pref_flagpagesize); } @@ -571,6 +648,7 @@ #if HAVE_SQWEBMAIL_UNICODE int fd; #endif + const char *mobile=getenv("SQWEBMAIL_MOBILE"); cgi_put(MIMEGPGFILENAME, ""); @@ -684,8 +762,10 @@ info=maildir_read(dir, 1, &pos, &msg_hasprev, &msg_hasnext); msg_pos=pos; - printf("", + if (!mobile || !*mobile){ + printf("", (long)msg_pos); + } p=strrchr(MSGINFO_FILENAME(info[0]), '/'); if (p) p++; @@ -735,167 +815,233 @@ void folder_nextprev() { +const char *mobile=getenv("SQWEBMAIL_MOBILE"); + if (!mobile || !*mobile){ printf(""); printf("
"); - + } /* PREV */ - - printf(""); + }else{ + if (msg_hasprev) + { + printf("", + (long)(msg_pos-1)); + } + + printf("%s", msg_prevlab ? msg_prevlab:""); + + if (msg_hasprev) + { + printf(""); + } } - - printf("%s", msg_prevlab ? msg_prevlab:""); - - if (msg_hasprev) - { - printf(""); - } - printf(""); - /* NEXT */ - - printf(""); + }else{ + if (msg_hasnext) + { + printf("", + (long)(msg_pos+1)); + } + + printf("%s", msg_nextlab ? msg_nextlab:""); + + if (msg_hasnext) + { + printf(""); + } } - printf(""); - /* DEL */ + if (!mobile || !*mobile){ + printf("\n"); + }else{ + if (msg_type != MSGTYPE_DELETED) + { + printf("", + (long)msg_pos); + } + printf("%s", strcmp(sqwebmail_folder, TRASH) == 0 + ? msg_purgelab : msg_deletelab); + + if (msg_type != MSGTYPE_DELETED) + printf(""); - printf("\n"); - /* FOLDER */ - - printf("\n", - (long)( (msg_pos/pref_flagpagesize)*pref_flagpagesize ), - msg_folderlab); - + if (!mobile || !*mobile){ + + printf("\n", + (long)( (msg_pos/pref_flagpagesize)*pref_flagpagesize ), + msg_folderlab); + } /* REPLY */ - - printf("\n", - (long)msg_pos, + if (!mobile || !*mobile){ + printf("\n", + (long)msg_pos, + msg_replylab); + }else{ + printf("%s\n", + (long)msg_pos, msg_replylab); - + } /* REPLY ALL */ - - printf("\n", - (long)msg_pos, - msg_replyalllab); - + if (!mobile || !*mobile){ + printf("\n", + (long)msg_pos, + msg_replyalllab); + }else{ + printf("%s\n", + (long)msg_pos, + msg_replyalllab); + } /* REPLY LIST */ - - printf("\n", - (long)msg_pos, - msg_replylistlab); - - printf("
"); - - if (msg_hasprev) - { - printf("", - (long)(msg_pos-1)); + if (!mobile || !*mobile){ + printf(""); + + if (msg_hasprev) + { + printf("", + (long)(msg_pos-1)); + } + + printf("%s", msg_prevlab ? msg_prevlab:""); + + if (msg_hasprev) + { + printf(""); + } + printf(""); - - if (msg_hasnext) - { - printf(""); + + if (msg_hasnext) + { + printf("", - (long)(msg_pos+1)); - } - - printf("%s", msg_nextlab ? msg_nextlab:""); - - if (msg_hasnext) - { - printf(""); + (long)(msg_pos+1)); + } + + printf("%s", msg_nextlab ? msg_nextlab:""); + + if (msg_hasnext) + { + printf(""); + } + printf(""); + if (msg_type != MSGTYPE_DELETED) + { + printf("", + (long)msg_pos); + } + printf("%s", strcmp(sqwebmail_folder, TRASH) == 0 + ? msg_purgelab : msg_deletelab); + + if (msg_type != MSGTYPE_DELETED) + printf(""); + + printf(""); - if (msg_type != MSGTYPE_DELETED) - { - printf("", - (long)msg_pos); } - printf("%s", strcmp(sqwebmail_folder, TRASH) == 0 - ? msg_purgelab : msg_deletelab); - - if (msg_type != MSGTYPE_DELETED) - printf(""); - - printf("%s%s%s%s%s%s%s
"); - + if (!mobile || !*mobile){ + printf("\n", + (long)msg_pos, + msg_replylistlab); + printf("
%s
"); + } /* FORWARD */ - - printf("\n", - (long)msg_pos, - msg_forwardlab); - + if (!mobile || !*mobile){ + printf("\n", + (long)msg_pos, + msg_forwardlab); + } /* FORWARD AS ATTACHMENT*/ - - printf("\n", - (long)msg_pos, - msg_forwardattlab); - + if (!mobile || !*mobile){ + printf("\n", + (long)msg_pos, + msg_forwardattlab); + } /* FULL HEADERS */ - - if (!pref_flagfullheaders && !*cgi("fullheaders")) - { - printf("\n", - (long)msg_pos, msg_fullheaderlab); + if (!mobile || !*mobile){ + if (!pref_flagfullheaders && !*cgi("fullheaders")) + { + printf("\n", + (long)msg_pos, msg_fullheaderlab); + } } - /* PRINT MESSAGE */ - - printf("\n", (long)msg_pos, msg_print); - } - else - { + if (!mobile || !*mobile){ + printf("\n", (long)msg_pos, msg_print); + } + else + { printf("&pos=%ld&form=print&setcookie=1\" TARGET=\"_BLANK\">%s\n", (long)msg_pos, msg_print); + } } - /* SAVE MESSAGE */ - - printf("", (long)msg_pos, - getarg("SAVEMESSAGE")); - - printf("
%s%s%s%s%s%s%s%s%s
"); - - printf("
 "); - printf(msg_msglab, (int)msg_pos+1, (int)msg_count); - printf(" 
"); - printf("
\n"); + if (!mobile || !*mobile){ + printf("%s", (long)msg_pos, + getarg("SAVEMESSAGE")); + } + + if (!mobile || !*mobile){ + printf(""); + + printf("
 "); + printf(msg_msglab, (int)msg_pos+1, (int)msg_count); + printf(" 
"); + printf("\n"); + } } void list_folder(const char *p) @@ -996,20 +1142,34 @@ void folder_msgmove() { +const char *mobile=getenv("SQWEBMAIL_MOBILE"); ++initnextprevcnt; - printf("
\n"); - printf("
 %s 
\n"); + printf("
 %s \n", msg_movetolab, initnextprevcnt); + } show_transfer_dest(sqwebmail_folder); - - printf("
\n", - (msg_type == MSGTYPE_DELETED ? "DISABLED":""), - initnextprevcnt, - msg_golab ? msg_golab:""); - printf("", cgi("pos")); - printf("
\n"); + if (!mobile || !*mobile){ + printf("
\n", + (msg_type == MSGTYPE_DELETED ? "DISABLED":""), + initnextprevcnt, + msg_golab ? msg_golab:""); + printf("", cgi("pos")); + printf("
\n"); + }else{ + printf("\n", + (msg_type == MSGTYPE_DELETED ? "DISABLED":""), + initnextprevcnt, + msg_golab ? msg_golab:""); + printf("", cgi("pos")); + printf("\n"); + } } void folder_delmsg(size_t pos) @@ -1397,9 +1557,16 @@ void print_header_uc(char *h) { +const char *mobile=getenv("SQWEBMAIL_MOBILE"); + if (!mobile || !*mobile){ header_uc(h); printf("%s: ", h); + }else{ + header_uc(h); + printf("%s:", + h); + } } static void showmsgrfc822_body(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *idptr, int flag) @@ -1412,6 +1579,7 @@ struct rfc2045id *p, newpart; off_t dummy; off_t pos; +const char *mobile=getenv("SQWEBMAIL_MOBILE"); rfc2045_mimepos(rfc, &start_pos, &end_pos, &start_body, &dummy, &dummy); if (fseek(fp, start_pos, SEEK_SET) < 0) @@ -1419,10 +1587,13 @@ error("Seek error."); return; } - - printf("

\n"); - par=""; /* Obsolete */ - + + if (!mobile || !*mobile){ + printf("

\n"); + par=""; /* Obsolete */ + }else{ + par=""; /* Obsolete */ + } pos=start_pos; while ((header=maildir_readheader_mimepart(fp, &value, 1, &pos, &start_body)) != 0) @@ -1436,9 +1607,14 @@ { print_header_uc(header); par=""; - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + showmsgrfc2369_header(value); + printf("
"); + } continue; } @@ -1447,12 +1623,20 @@ int isaddress=isaddressheader(header); print_header_uc(header); - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + if (isaddress) + showmsgrfc822_addressheader(value); + else + showmsgrfc822_header(value); + printf("
"); + } par=""; continue; } @@ -1477,9 +1661,14 @@ if (isaddressheader(header)) { print_header_uc(header); - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + showmsgrfc822_addressheader(value); + printf("
"); + } par=""; } } @@ -1498,9 +1687,14 @@ print_header_uc(date_header); strftime(date_buf, sizeof(date_buf)-1, "%d %b %Y, %I:%M:%S %p", tmp); date_buf[sizeof(date_buf)-1]=0; - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + showmsgrfc822_header(date_buf); + printf("
"); + } par=""; } free(save_date); @@ -1512,20 +1706,31 @@ strcpy(subj_header, "Subject"); print_header_uc(subj_header); - - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + showmsgrfc822_header(save_subject); + printf("
"); + } par=""; } if (flag && !is_preview_mode()) { - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + digestaction(idptr); + printf("
"); + } + } + if (!mobile || !*mobile){ + printf("
"); - showmsgrfc2369_header(value); - printf("
"); + showmsgrfc2369_header(value); + printf("
"); - if (isaddress) - showmsgrfc822_addressheader(value); - else - showmsgrfc822_header(value); - printf("
"); + if (isaddress) + showmsgrfc822_addressheader(value); + else + showmsgrfc822_header(value); + printf("
"); - showmsgrfc822_addressheader(value); - printf("
"); + showmsgrfc822_addressheader(value); + printf("
"); - showmsgrfc822_header(date_buf); - printf("
"); + showmsgrfc822_header(date_buf); + printf("
"); - showmsgrfc822_header(save_subject); - printf("
"); + showmsgrfc822_header(save_subject); + printf("
 "); - digestaction(idptr); - printf("
 "); + digestaction(idptr); + printf("
\n

\n"); } - printf("\n
\n"); #if HAVE_SQWEBMAIL_UNICODE if (!flag && has_gpg(GPGDIR) == 0 && gpgmime_has_mimegpg(rfc)) @@ -1600,7 +1805,7 @@ static void showaddressheader_printc(char c, void *p) { struct showaddrinfo *sai= (struct showaddrinfo *)p; - + const char *mobile=getenv("SQWEBMAIL_MOBILE"); if (sai->isfirstchar) { char *name=0; @@ -1636,12 +1841,17 @@ output_urlencoded(addr); free(addr); } - - printf("\" STYLE=\"text-decoration: none\" " - "ONMOUSEOVER=\"window.status='%s'; return true;\" " - "ONMOUSEOUT=\"window.status=''; return true;\" >" - "", - msg_add ? msg_add:""); + if (!mobile || !*mobile){ + printf("\" STYLE=\"text-decoration: none\" " + "ONMOUSEOVER=\"window.status='%s'; return true;\" " + "ONMOUSEOUT=\"window.status=''; return true;\" >" + "", + msg_add ? msg_add:""); + }else{ + printf("\"" + ">" + ""); + } } sai->isfirstchar=0; @@ -2303,6 +2513,7 @@ static void showtextplain(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id) { +const char *mobile=getenv("SQWEBMAIL_MOBILE"); int rc; const char *mime_charset, *dummy; @@ -2358,12 +2569,15 @@ rfc2646tohtml_free(flowtohtml); enomem(); } - - printf(""); + if (!mobile || !*mobile){ + printf(""); + } } else { - printf("
");
+	        if (!mobile || !*mobile){ 
+		  printf("
");
+		}
 		filter_start(FILTER_FOR_DISPLAY, &showtextplainfunc);
 	}
 
@@ -2392,10 +2606,19 @@
 	showtextplainfunc(0, 0);
 	buf_free(&showtextplain_buf);
 
-	if (isflowed)
-		printf("
\n");
-	else
-		printf("

\n");
+	if (isflowed){
+	  if (!mobile || !*mobile){
+	    printf("
\n");
+	  }else{
+	    printf("
\n");
+	  }
+	}else{
+	  if (!mobile || !*mobile){
+	    printf("

\n"); + }else{ + printf("
\n"); + } + } } static void showdsn(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id) @@ -2775,6 +2998,7 @@ const char *folders_img; const char *folderdir; +const char *mobile=getenv("SQWEBMAIL_MOBILE"); unread_label=getarg("UNREAD"); err_invalid=getarg("INVALID"); @@ -2944,15 +3168,19 @@ sqwebmail_folder=0; folderdir=cgi("folderdir"); - - printf("\n"); + if (!mobile || !*mobile){ + printf("
\n"); + } maildir_readfolders(&folders); if (*folderdir) { char *parentfolder=get_parent_folder(folderdir); size_t i; - + if (!mobile || !*mobile){ printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + printf("
"); + } free(parentfolder); } @@ -3037,7 +3269,12 @@ s[p-folders[i]]=0; img=folders_img; - printf("\n\n", - tot_nnew + tot_nother); + if (!mobile || !*mobile){ + printf("\n\n", + tot_nnew + tot_nother); + }else{ + printf("%d  
\n\n", + tot_nnew + tot_nother); + } continue; } @@ -3084,21 +3326,28 @@ if (!isunsubscribed) maildir_count(folders[i], &nnew, ¬her); - - printf("\n\n"); + if (!mobile || !*mobile){ + printf("\n\n"); + }else{ + printf("
"); + } } maildir_freefolders(&folders); - printf("
%s<<< "); print_safe(name_inbox); @@ -2982,7 +3210,11 @@ if ( (*p=c) != 0) ++p; i=p-parentfolder; } - printf("
%s%s %s%s "); } - printf("%d  
%d  
", - isunsubscribed ? "class=\"folderunsubscribed\"":""); - - printf("%s "); + if (!mobile || !*mobile){ + printf("
", + isunsubscribed ? "class=\"folderunsubscribed\"":""); + + printf("%s "); + }else{ + /*printf("%s", img);*/ + } if (!isunsubscribed) { + if (!mobile || !*mobile){ printf(""); + }else{ + printf(""); } if (strcmp(folders[i], INBOX) == 0) shortname=name_inbox; @@ -3114,23 +3363,39 @@ printf(""); if (nnew) { + if (!mobile || !*mobile){ printf(" "); printf(unread_label, nnew); printf(""); + }else{ + printf(unread_label, nnew); + } + } + if (!mobile || !*mobile){ + printf(""); } - printf(""); - if (!isunsubscribed) { + if (!mobile || !*mobile){ printf("%d  ", nnew + nother); + }else{ + printf("%d ", + nnew + nother); + } } else printf(" \n"); - printf("
\n"); + if (!mobile || !*mobile){ + printf("\n"); + } } void folder_list2() --- sqwebmail/newmsg.org.c Tue Mar 19 16:28:34 2002 +++ sqwebmail/newmsg.c Tue Mar 19 15:59:19 2002 @@ -65,13 +65,22 @@ static void newmsg_header(const char *label, const char *field, const char *val) { - printf("

" - "%s" - " ", - field, label); - - printf("

" + "%s" + " ", + field, label); + + printf("\n"); + if (!mobile || !*mobile){ + printf("\">\n"); + }else{ + printf("\">
\n"); + } } static const char *ispreviewmsg() @@ -352,6 +365,7 @@ FILE *fp; int attachcnt=0; char *cursubj, *curto, *curcc, *curbcc, *curfrom, *curreplyto; + const char *mobile=getenv("SQWEBMAIL_MOBILE"); /* Picking up an existing draft? */ @@ -395,9 +409,13 @@ if (strcmp(p, "SPELLCHK") == 0) printf("%s

\n", checkspellingdone); #endif - printf("
\n"); - printf("
\n"); + if (!mobile || !*mobile){ + printf("
\n"); + printf("
\n"); + }else{ + + } if (draftmessagefilename) { const char *p=strrchr(draftmessagefilename, '/'); @@ -409,10 +427,14 @@ newmsg_preview(p); } - printf("
\n"); - printf("
\n"); + if (!mobile || !*mobile){ + printf("
\n"); + printf("
\n"); + + printf("
\n"); + }else{ - printf("
\n"); + } } printf("\n"); @@ -428,9 +450,14 @@ if (*cgi("foldermsg")) { + if (!mobile || !*mobile){ printf("

"); output_attrencoded_nltobr(cgi("foldermsg")); printf("
"); + }else{ + output_attrencoded_nltobr(cgi("foldermsg")); + printf("
"); + } } if (strcmp(cgi("error"), "quota") == 0) @@ -494,37 +521,55 @@ } } } + if (!mobile || !*mobile){ + printf("
\n"); + printf("
\n"); - printf("
\n"); - printf("
\n"); + printf("\n"); + }else{ - printf("
\n"); + } if (access(NOCHANGINGFROM, 0)) newmsg_header(fromlab, "headerfrom", curfrom ? curfrom: *cgi("from") ? cgi("from"): pref_from && *pref_from ? pref_from: login_fromhdr()); - - printf("\n"); + if (!mobile || !*mobile){ + printf("\n"); + }else{ + printf("%s", + addressbooklab); + printf(""); + printf("", + tolab); + printf("", + cclab); + printf("", + bcclab); + printf("
\n"); + } newmsg_header(tolab, "headerto", curto ? curto:cgi("to")); newmsg_header(cclab, "headercc", curcc ? curcc:cgi("cc")); newmsg_header(bcclab, "headerbcc", curbcc ? curbcc:cgi("bcc")); @@ -537,16 +582,20 @@ if (curcc) free(curcc); if (curbcc) free(curbcc); if (cursubj) free(cursubj); - - printf(""); - printf("", messagelab); - - printf("
" - "

" - "" - "%s

 ", - addressbooklab); - - printf(""); - printf(""); - printf("
"); - printf("", - tolab); - printf("", - cclab); - printf("", - bcclab); - printf("
"); - - printf("
" + "

" + "" + "%s

 ", + addressbooklab); + + printf(""); + printf(""); + printf("
"); + + printf("", + tolab); + printf("", + cclab); + printf("", + bcclab); + printf("
"); + + printf("
" - "

" - "" - "%s