From d962ea81fc95711873a50887bb7339490d2fc90e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 6 May 2010 21:05:32 +0000 Subject: [PATCH] * cleanup --- webcit/serv_func.c | 48 +++++++++++++++------------------------- webcit/static/webcit.css | 4 ++-- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/webcit/serv_func.c b/webcit/serv_func.c index afaf957a6..07932ef2a 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -1,4 +1,4 @@ - /* +/* * $Id$ */ @@ -167,6 +167,7 @@ int GetConnected (void) StrBuf_ServGetln(Buf); /* get the server greeting */ GetServerStatus(Buf, &Status); FreeStrBuf(&Buf); + /* Are there too many users already logged in? */ if (Status == 571) { wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time. Please try again later or contact your system administrator.")); @@ -224,7 +225,7 @@ int GetConnected (void) return 0; } -/** +/* * Read Citadel variformat text and spit it out as HTML. * align html align string */ @@ -247,7 +248,7 @@ void _fmout(StrBuf *Target, char *align) } intext = 1; - /** + /* * Quoted text should be displayed in italics and in a * different colour. This code understands Citadel-style * " >" quotes and will convert to
tags. @@ -262,7 +263,7 @@ void _fmout(StrBuf *Target, char *align) if ((bq == 1) && (!strncmp(buf, " >", 2))) { strcpy(buf, &buf[2]); } - /** Activate embedded URL's */ + /* Activate embedded URL's */ url(buf, sizeof(buf)); escputs(buf); @@ -339,8 +340,9 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) while ((BufPtr != StrBufNOTNULL) && (BufPtr != NULL)); - for (i = 0; i < bn; i++) + for (i = 0; i < bn; i++) { StrBufAppendBufPlain(Target, HKEY("
"), 0); + } StrBufAppendBufPlain(Target, HKEY("
\n"), 0); FreeStrBuf(&Line); FreeStrBuf(&Line1); @@ -348,10 +350,8 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) } - - -/** - * Read Citadel variformat text and spit it out as HTML in a form +/* + * Read Citadel variformat text and spit it out as HTML in a form * suitable for embedding in another message (forward/quote). * (NO LINEBREAKS ALLOWED HERE!) */ @@ -393,10 +393,8 @@ void pullquote_fmout(void) { -/** +/* * Transmit message text (in memory) to the server. - * - * ptr Pointer to the message being transmitted */ void text_to_server(char *ptr) { @@ -436,11 +434,8 @@ void text_to_server(char *ptr) } -/** - * Transmit message text (in memory) to the server, - * converting to Quoted-Printable encoding as we go. - * - * ptr Pointer to the message being transmitted +/* + * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go. */ void text_to_server_qp(char *ptr) { @@ -512,9 +507,8 @@ void text_to_server_qp(char *ptr) -/** - * translate server message output to text - * (used for editing room info files and such) +/* + * translate server message output to text (used for editing room info files and such) */ void server_to_text() { @@ -534,8 +528,8 @@ void server_to_text() -/** - * Read text from server, appending to a string buffer until the +/* + * Read text from server, appending to a string buffer until the * usual 000 terminator is found. Caller is responsible for freeing * the returned pointer. */ @@ -563,10 +557,6 @@ int read_server_text(StrBuf *Buf, long *nLines) } - - - - int GetServerStatus(StrBuf *Line, long* FullState) { if (FullState != NULL) @@ -628,6 +618,7 @@ int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) return 0; return WCC->serv_info->serv_newuser_disabled != 0; } + int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -635,6 +626,7 @@ int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) return 0; return WCC->serv_info->serv_supports_openid != 0; } + int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -643,8 +635,6 @@ int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) return WCC->serv_info->serv_fulltext_enabled != 0; } - - void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -653,7 +643,6 @@ void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0); } - void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) { int n = 0; @@ -762,4 +751,3 @@ SessionDestroyModule_SERVFUNC { DeleteServInfo(&sess->serv_info); } -/*@}*/ diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index fc76cc1a8..ee0bce11a 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -46,8 +46,8 @@ body { font-size: 100%;} body { background-color: #6C91A6; - font-family: sans-serif; - font-weight: 400; + font-family: Bitstream Vera Sans, Tahoma, sans-serif; + /* font-weight: 400; */ } #iconbar_container, .boxcontent,.service form div,table.altern .odd, #message_list, .message_content, #roomlist_div,.editednode,.mailbox_summary, .auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_background, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .wiki_history_background, .wiki_pagelist_background, .downloads_background, .vcard_edit_background, div.auto_complete, div.auto_complete ul, #summary_view { -- 2.30.2