diff --git a/src/elogd.c b/src/elogd.c index 13aad664..c815c190 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -6,6 +6,9 @@ Contents: Web server program for Electronic Logbook ELOG $Log$ + Revision 1.474 2004/09/18 03:27:34 midas + Fixed problem with '/' in forgotten password + Revision 1.473 2004/09/18 02:54:06 midas Removed status bar from calendar @@ -628,20 +631,20 @@ typedef int BOOL; #define stricmp(s1, s2) strcasecmp(s1, s2) -gid_t orig_gid; /* Original effective GID before dropping privilege */ -uid_t orig_uid; /* Original effective UID before dropping privilege */ -char pidfile[256]; /* Pidfile name */ +gid_t orig_gid; /* Original effective GID before dropping privilege */ +uid_t orig_uid; /* Original effective UID before dropping privilege */ +char pidfile[256]; /* Pidfile name */ -#endif /* OS_UNIX */ +#endif /* OS_UNIX */ -BOOL running_as_daemon; /* Running as a daemon/service? */ -int elog_tcp_port = (int) DEFAULT_PORT; /* Server's TCP port */ +BOOL running_as_daemon; /* Running as a daemon/service? */ +int elog_tcp_port = (int) DEFAULT_PORT; /* Server's TCP port */ -static void (*printf_handler) (const char *);/* Handler to printf for logging */ -static void (*fputs_handler) (const char *); /* Handler to fputs for logging */ -static FILE *current_output_stream = NULL; /* Currently used output stream */ +static void (*printf_handler) (const char *); /* Handler to printf for logging */ +static void (*fputs_handler) (const char *); /* Handler to fputs for logging */ +static FILE *current_output_stream = NULL; /* Currently used output stream */ -#define SYSLOG_PRIORITY LOG_NOTICE /* Default priority for syslog facility */ +#define SYSLOG_PRIORITY LOG_NOTICE /* Default priority for syslog facility */ typedef int INT; @@ -897,8 +900,7 @@ BOOL enum_user_line(LOGBOOK * lbs, int n, char *user); int get_user_line(char *logbook_name, char *user, char *password, char *full_name, char *email, char *email_notify); int strbreak(char *str, char list[][NAME_LENGTH], int size, char *brk); -int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], - char *sh_cmd); +int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], char *sh_cmd); BOOL isparam(char *param); char *getparam(char *param); void write_logfile(LOGBOOK * lbs, const char *format, ...); @@ -1185,7 +1187,7 @@ void eputs(const char *buf) { char *p; - p = xmalloc(strlen(buf)+2); + p = xmalloc(strlen(buf) + 2); strcpy(p, buf); strcat(p, "\n"); @@ -1213,8 +1215,8 @@ void print_syslog(const char *msg) /* strip trailing \r and \n */ p = xstrdup(msg); - while (p[strlen(p)-1] == '\r' || p[strlen(p)-1] == '\n') - p[strlen(p)-1] = 0; + while (p[strlen(p) - 1] == '\r' || p[strlen(p) - 1] == '\n') + p[strlen(p) - 1] = 0; #ifdef OS_UNIX syslog(SYSLOG_PRIORITY, "%s", p); @@ -1238,8 +1240,8 @@ void fputs_syslog(const char *buf) /* strip trailing \r and \n */ p = xstrdup(buf); - while (p[strlen(p)-1] == '\r' || p[strlen(p)-1] == '\n') - p[strlen(p)-1] = 0; + while (p[strlen(p) - 1] == '\r' || p[strlen(p) - 1] == '\n') + p[strlen(p) - 1] = 0; #ifdef OS_UNIX syslog(SYSLOG_PRIORITY, "%s", p); @@ -1452,7 +1454,7 @@ Encode the given string in-place by adding %XX escapes pd = str; p = ps; while (*p && (int) pd < (int) str + 250) { - if (strchr("%&=#?+", *p) || *p > 127) { + if (strchr("%&=#?+/", *p) || *p > 127) { sprintf(pd, "%%%02X", *p); pd += 3; p++; @@ -1867,8 +1869,7 @@ double date2serialdate(int day, int month, int year) serialdate = (int) ((1461 * (year + 4800 + (int) ((month - 14) / 12))) / 4) + (int) ((367 * (month - 2 - 12 * ((month - 14) / 12))) / 12) - - (int) ((3 * ((int) ((year + 4900 + (int) ((month - 14) / 12)) / 100))) / 4) + - day - 2415019 - 32075; + (int) ((3 * ((int) ((year + 4900 + (int) ((month - 14) / 12)) / 100))) / 4) + day - 2415019 - 32075; return serialdate; } @@ -1964,8 +1965,7 @@ INT recv_string(int sock, char *buffer, INT buffer_size, INT millisec) /*-------------------------------------------------------------------*/ INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, - char *subject, char *text, BOOL email_to, char *url, - char att_file[MAX_ATTACHMENTS][256]) + char *subject, char *text, BOOL email_to, char *url, char att_file[MAX_ATTACHMENTS][256]) { struct sockaddr_in bind_addr; struct hostent *phe; @@ -2126,8 +2126,7 @@ INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, write_logfile(lbs, str); sprintf(boundary, "%04X-%04X=:%04X", rand(), rand(), rand()); - snprintf(str, strsize - 1, "Content-Type: MULTIPART/MIXED; BOUNDARY=\"%s\"\r\n\r\n", - boundary); + snprintf(str, strsize - 1, "Content-Type: MULTIPART/MIXED; BOUNDARY=\"%s\"\r\n\r\n", boundary); send(s, str, strlen(str), 0); if (verbose) efputs(str); @@ -2147,8 +2146,7 @@ INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, efputs(str); write_logfile(lbs, str); - snprintf(str, strsize - 1, - "--%s\r\nContent-Type: TEXT/PLAIN; charset=US-ASCII\r\n\r\n", boundary); + snprintf(str, strsize - 1, "--%s\r\nContent-Type: TEXT/PLAIN; charset=US-ASCII\r\n\r\n", boundary); send(s, str, strlen(str), 0); if (verbose) efputs(str); @@ -2197,12 +2195,10 @@ INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, snprintf(str, strsize - 1, "Content-Type: %s; name=\"%s\"\r\n", filetype[i].type, att_file[index] + 14); else if (strchr(str, '.') == NULL) - snprintf(str, strsize - 1, "Content-Type: text/plain; name=\"%s\"\r\n", - att_file[index] + 14); + snprintf(str, strsize - 1, "Content-Type: text/plain; name=\"%s\"\r\n", att_file[index] + 14); else snprintf(str, strsize - 1, - "Content-Type: application/octet-stream; name=\"%s\"\r\n", - att_file[index] + 14); + "Content-Type: application/octet-stream; name=\"%s\"\r\n", att_file[index] + 14); send(s, str, strlen(str), 0); if (verbose) @@ -2216,8 +2212,7 @@ INT sendmail(LOGBOOK * lbs, char *smtp_host, char *from, char *to, write_logfile(lbs, str); snprintf(str, strsize - 1, - "Content-Disposition: attachment; filename=\"%s\"\r\n\r\n", - att_file[index] + 14); + "Content-Disposition: attachment; filename=\"%s\"\r\n\r\n", att_file[index] + 14); send(s, str, strlen(str), 0); if (verbose) efputs(str); @@ -2384,8 +2379,7 @@ int retrieve_url(char *url, char **buffer, char *rpwd) /* add local username/password */ if (isparam("unm")) - sprintf(str + strlen(str), "Cookie: unm=%s; upwd=%s\r\n", getparam("unm"), - getparam("upwd")); + sprintf(str + strlen(str), "Cookie: unm=%s; upwd=%s\r\n", getparam("unm"), getparam("upwd")); if (rpwd && rpwd[0]) { sprintf(auth, "anybody:%s", rpwd); @@ -2569,8 +2563,7 @@ void set_condition(char *c) BOOL match_param(char *str, char *param) { int ncl, npl, nand, i, j, k; - char *p, pcond[256], clist[10][NAME_LENGTH], plist[10][NAME_LENGTH], - alist[10][NAME_LENGTH]; + char *p, pcond[256], clist[10][NAME_LENGTH], plist[10][NAME_LENGTH], alist[10][NAME_LENGTH]; if (!_condition[0] || str[0] != '{') return strieq(str, param); @@ -3102,8 +3095,7 @@ char *loc(char *orig) } getcfg("global", "Language", language, sizeof(language)); - eprintf("Language error: string \"%s\" not found for language \"%s\"\n", orig, - language); + eprintf("Language error: string \"%s\" not found for language \"%s\"\n", orig, language); return orig; } @@ -3278,8 +3270,7 @@ void el_enum_attr(char *message, int n, char *attr_name, char *attr_value) strieq(tmp, "Date") || strieq(tmp, "Attachment") || strieq(tmp, "Reply To") || - strieq(tmp, "In Reply To") || - strieq(tmp, "Encoding") || strieq(tmp, "Locked by")) + strieq(tmp, "In Reply To") || strieq(tmp, "Encoding") || strieq(tmp, "Locked by")) i--; } } @@ -3401,14 +3392,12 @@ INT ss_file_find(char *path, char *pattern, char **plist) return 0; first = 0; *plist = (char *) xrealloc(*plist, (i + 1) * MAX_PATH_LENGTH); - strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, - strlen(lpfdata->cFileName)); + strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, strlen(lpfdata->cFileName)); *(*plist + (i * MAX_PATH_LENGTH) + strlen(lpfdata->cFileName)) = '\0'; i++; while (FindNextFile(pffile, lpfdata)) { *plist = (char *) xrealloc(*plist, (i + 1) * MAX_PATH_LENGTH); - strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, - strlen(lpfdata->cFileName)); + strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, strlen(lpfdata->cFileName)); *(*plist + (i * MAX_PATH_LENGTH) + strlen(lpfdata->cFileName)) = '\0'; i++; } @@ -3510,8 +3499,7 @@ int el_build_index(LOGBOOK * lbs, BOOL rebuild) p = strstr(p, "$@MID@$:"); if (p) { - lbs->el_index = - xrealloc(lbs->el_index, sizeof(EL_INDEX) * (*lbs->n_el_index + 1)); + lbs->el_index = xrealloc(lbs->el_index, sizeof(EL_INDEX) * (*lbs->n_el_index + 1)); if (lbs->el_index == NULL) { eprintf("Not enough memory to allocate entry index\n"); return EL_MEM_ERROR; @@ -3545,8 +3533,7 @@ int el_build_index(LOGBOOK * lbs, BOOL rebuild) eprintf(" ID %3d, %s, ofs %5d, %s, MD5=", lbs->el_index[*lbs->n_el_index].message_id, str, lbs->el_index[*lbs->n_el_index].offset, - lbs->el_index[*lbs->n_el_index]. - in_reply_to ? "reply" : "thead"); + lbs->el_index[*lbs->n_el_index].in_reply_to ? "reply" : "thead"); for (i = 0; i < 16; i++) eprintf("%02X", lbs->el_index[*lbs->n_el_index].md5_digest[i]); @@ -3733,8 +3720,7 @@ int el_index_logbooks() if (verbose) eprintf("Found empty logbook \"%s\"\n", logbook); } else if (status == EL_UPGRADE) { - eprintf("Please upgrade data files in \"%s\" with the elconv program.\n", - data_dir); + eprintf("Please upgrade data files in \"%s\" with the elconv program.\n", data_dir); return EL_UPGRADE; } else if (status != EL_SUCCESS) { eprintf("Error generating index.\n"); @@ -3925,8 +3911,7 @@ INT el_retrieve(LOGBOOK * lbs, /* file might have been deleted, rebuild index */ el_build_index(lbs, TRUE); return el_retrieve(lbs, message_id, date, attr_list, attrib, n_attr, - text, textsize, in_reply_to, reply_to, attachment, encoding, - locked_by); + text, textsize, in_reply_to, reply_to, attachment, encoding, locked_by); } lseek(fh, lbs->el_index[index].offset, SEEK_SET); @@ -3943,8 +3928,7 @@ INT el_retrieve(LOGBOOK * lbs, /* file might have been edited, rebuild index */ el_build_index(lbs, TRUE); return el_retrieve(lbs, message_id, date, attr_list, attrib, n_attr, - text, textsize, in_reply_to, reply_to, attachment, encoding, - locked_by); + text, textsize, in_reply_to, reply_to, attachment, encoding, locked_by); } /* check for correct ID */ @@ -4024,8 +4008,7 @@ INT el_retrieve(LOGBOOK * lbs, p += 41; if ((int) strlen(p) >= *textsize) { strlcpy(text, p, *textsize); - show_error - ("Entry too long to display. Please increase TEXT_SIZE and recompile elogd."); + show_error("Entry too long to display. Please increase TEXT_SIZE and recompile elogd."); return EL_FILE_ERROR; } else { strlcpy(text, p, *textsize); @@ -4050,11 +4033,9 @@ INT el_retrieve(LOGBOOK * lbs, /*------------------------------------------------------------------*/ -int el_submit_attachment(LOGBOOK * lbs, char *afilename, char *buffer, int buffer_size, - char *full_name) +int el_submit_attachment(LOGBOOK * lbs, char *afilename, char *buffer, int buffer_size, char *full_name) { - char file_name[MAX_PATH_LENGTH], ext_file_name[MAX_PATH_LENGTH], str[MAX_PATH_LENGTH], - *p; + char file_name[MAX_PATH_LENGTH], ext_file_name[MAX_PATH_LENGTH], str[MAX_PATH_LENGTH], *p; int fh; time_t now; struct tm tms; @@ -4119,8 +4100,7 @@ void el_delete_attachment(LOGBOOK * lbs, char *file_name) /*------------------------------------------------------------------*/ -INT el_retrieve_attachment(LOGBOOK * lbs, int message_id, int n, - char name[MAX_PATH_LENGTH]) +INT el_retrieve_attachment(LOGBOOK * lbs, int message_id, int n, char name[MAX_PATH_LENGTH]) { int i, index, size, fh; char file_name[256], *p; @@ -4201,8 +4181,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, char attr_value[MAX_N_ATTR][NAME_LENGTH], int n_attr, char *text, char *in_reply_to, char *reply_to, - char *encoding, char afilename[MAX_ATTACHMENTS][256], BOOL mark_original, - char *locked_by) + char *encoding, char afilename[MAX_ATTACHMENTS][256], BOOL mark_original, char *locked_by) /********************************************************************\ Routine: el_submit @@ -4278,8 +4257,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, /* file might have been edited, rebuild index */ el_build_index(lbs, TRUE); return el_submit(lbs, message_id, bedit, date, attr_name, attr_value, - n_attr, text, in_reply_to, reply_to, encoding, afilename, - mark_original, locked_by); + n_attr, text, in_reply_to, reply_to, encoding, afilename, mark_original, locked_by); } /* check for correct ID */ @@ -4313,7 +4291,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, if (tail_size > 0) { buffer = xmalloc(tail_size); - + lseek(fh, lbs->el_index[index].offset + size, SEEK_SET); n = read(fh, buffer, tail_size); } @@ -4335,8 +4313,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, if (date[8] == ' ') date[8] = '0'; - sprintf(file_name, "%c%c%02d%c%ca.log", date[22], date[23], i + 1, date[8], - date[9]); + sprintf(file_name, "%c%c%02d%c%ca.log", date[22], date[23], i + 1, date[8], date[9]); sprintf(str, "%s%s", dir, file_name); fh = open(str, O_CREAT | O_RDWR | O_BINARY, 0644); @@ -4433,8 +4410,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, break; for (j = i + 1; - j < *lbs->n_el_index - && strieq(lbs->el_index[i].file_name, lbs->el_index[j].file_name); j++) + j < *lbs->n_el_index && strieq(lbs->el_index[i].file_name, lbs->el_index[j].file_name); j++) lbs->el_index[j].offset += delta; } @@ -4476,8 +4452,7 @@ int el_submit(LOGBOOK * lbs, int message_id, BOOL bedit, void remove_reference(LOGBOOK * lbs, int message_id, int remove_id, BOOL reply_to_flag) { char date[80], attr[MAX_N_ATTR][NAME_LENGTH], enc[80], in_reply_to[80], - reply_to[MAX_REPLY_TO * 10], att[MAX_ATTACHMENTS][256], lock[256], - *p, *ps, *message; + reply_to[MAX_REPLY_TO * 10], att[MAX_ATTACHMENTS][256], lock[256], *p, *ps, *message; int size, status; /* retrieve original message */ @@ -4548,8 +4523,7 @@ INT el_delete_message(LOGBOOK * lbs, int message_id, \********************************************************************/ { INT i, index, n, size, fh, tail_size, old_offset; - char str[MAX_PATH_LENGTH], file_name[MAX_PATH_LENGTH], reply_to[MAX_REPLY_TO * 10], - in_reply_to[256]; + char str[MAX_PATH_LENGTH], file_name[MAX_PATH_LENGTH], reply_to[MAX_REPLY_TO * 10], in_reply_to[256]; char *buffer, *p; char *message, attachment_all[64 * MAX_ATTACHMENTS]; @@ -4730,8 +4704,7 @@ int el_correct_links(LOGBOOK * lbs, int old_id, int new_id) This routine corrects that. */ { int i, i1, n, n1, size; - char date[80], *attrib, *text, in_reply_to[80], reply_to[MAX_REPLY_TO * 10], - encoding[80], locked_by[256]; + char date[80], *attrib, *text, in_reply_to[80], reply_to[MAX_REPLY_TO * 10], encoding[80], locked_by[256]; char list[MAX_N_ATTR][NAME_LENGTH], list1[MAX_N_ATTR][NAME_LENGTH]; char *att_file; @@ -4747,8 +4720,7 @@ This routine corrects that. */ for (i = 0; i < n; i++) { size = TEXT_SIZE; el_retrieve(lbs, atoi(list[i]), date, attr_list, (void *) attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, (void *) att_file, encoding, - locked_by); + text, &size, in_reply_to, reply_to, (void *) att_file, encoding, locked_by); n1 = strbreak(reply_to, list1, MAX_N_ATTR, ","); reply_to[0] = 0; @@ -4764,8 +4736,7 @@ This routine corrects that. */ } el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (void *) attrib, lbs->n_attr, - text, in_reply_to, reply_to, encoding, (void *) att_file, TRUE, - locked_by); + text, in_reply_to, reply_to, encoding, (void *) att_file, TRUE, locked_by); } el_retrieve(lbs, new_id, date, attr_list, (void *) attrib, lbs->n_attr, NULL, 0, @@ -4776,8 +4747,7 @@ This routine corrects that. */ for (i = 0; i < n; i++) { size = sizeof(text); el_retrieve(lbs, atoi(list[i]), date, attr_list, (void *) attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, (void *) att_file, encoding, - locked_by); + text, &size, in_reply_to, reply_to, (void *) att_file, encoding, locked_by); n1 = strbreak(in_reply_to, list1, MAX_N_ATTR, ","); in_reply_to[0] = 0; @@ -4793,8 +4763,7 @@ This routine corrects that. */ } el_submit(lbs, atoi(list[i]), TRUE, date, attr_list, (void *) attrib, lbs->n_attr, - text, in_reply_to, reply_to, encoding, (void *) att_file, TRUE, - locked_by); + text, in_reply_to, reply_to, encoding, (void *) att_file, TRUE, locked_by); } xfree(text); @@ -4851,15 +4820,13 @@ int el_move_message(LOGBOOK * lbs, int old_id, int new_id) { int status, size; char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], *text, in_reply_to[80], - reply_to[MAX_REPLY_TO * 10], encoding[80], locked_by[256], - att_file[MAX_ATTACHMENTS][256]; + reply_to[MAX_REPLY_TO * 10], encoding[80], locked_by[256], att_file[MAX_ATTACHMENTS][256]; /* retrieve message */ text = xmalloc(TEXT_SIZE); size = TEXT_SIZE; status = el_retrieve(lbs, old_id, date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, att_file, encoding, - locked_by); + text, &size, in_reply_to, reply_to, att_file, encoding, locked_by); if (status != EL_SUCCESS) return 0; @@ -5025,7 +4992,7 @@ int is_html(char *s) int is_ascii(char *file_name) { - int i, fh, length; + int i, fh, length; unsigned char *buf; fh = open(file_name, O_RDONLY | O_BINARY); @@ -5040,14 +5007,11 @@ int is_ascii(char *file_name) read(fh, buf, length); close(fh); - for (i=0 ; i 128) { xfree(buf); return FALSE; @@ -5062,8 +5026,7 @@ int is_ascii(char *file_name) int is_image(char *att) { - return strstr(att, ".GIF") || strstr(att, ".JPG") || strstr(att, ".JPEG") || - strstr(att, ".PNG"); + return strstr(att, ".GIF") || strstr(att, ".JPG") || strstr(att, ".JPEG") || strstr(att, ".PNG"); } /*------------------------------------------------------------------*/ @@ -5136,7 +5099,7 @@ void rsputs2(const char *str) int i, j, k, l, m, n; char *p, *pd, link[1000], link_text[1000], tmp[1000]; - if (strlen_retbuf + (int) (2*strlen(str)+1000) >= return_buffer_size) { + if (strlen_retbuf + (int) (2 * strlen(str) + 1000) >= return_buffer_size) { return_buffer = xrealloc(return_buffer, return_buffer_size + 100000); memset(return_buffer + return_buffer_size, 0, 100000); return_buffer_size += 100000; @@ -5148,8 +5111,7 @@ void rsputs2(const char *str) if (strncmp(str + i, key_list[l], strlen(key_list[l])) == 0) { p = (char *) (str + i + strlen(key_list[l])); i += strlen(key_list[l]); - for (k = 0; *p && strcspn(p, " ,;\t\n\r({[)}]") && k < (int) sizeof(link); - k++, i++) + for (k = 0; *p && strcspn(p, " ,;\t\n\r({[)}]") && k < (int) sizeof(link); k++, i++) link[k] = *p++; link[k] = 0; i--; @@ -5217,14 +5179,12 @@ void rsputs2(const char *str) if (m < (int) strlen(tmp)) /* if link contains reference to other logbook, add ".." in front */ - sprintf(return_buffer + j, "elog:%s", link, - link_text); + sprintf(return_buffer + j, "elog:%s", link, link_text); else if (link[0] == '/') sprintf(return_buffer + j, "elog:%s", _current_message_id, link, link_text); else - sprintf(return_buffer + j, "elog:%s", link, - link_text); + sprintf(return_buffer + j, "elog:%s", link, link_text); } else { sprintf(return_buffer + j, "%s", key_list[l], link, key_list[l]); j += strlen(return_buffer + j); @@ -5299,22 +5259,22 @@ void rsputs3(const char *text) str[1] = 0; for (i = 0; i < (int) strlen(text); i++) { switch (text[i]) { - case '<': - rsputs("<"); - break; - case '>': - rsputs(">"); - break; - case '&': - rsputs("&"); - break; - case '\"': - rsputs("""); - break; + case '<': + rsputs("<"); + break; + case '>': + rsputs(">"); + break; + case '&': + rsputs("&"); + break; + case '\"': + rsputs("""); + break; - default: - str[0] = text[i]; - rsputs(str); + default: + str[0] = text[i]; + rsputs(str); } } } @@ -5417,8 +5377,7 @@ int setparam(char *param, char *value) strlcpy(_value[i], value, NAME_LENGTH); } else { - sprintf(str, "Error: Too many parameters (> %d). Cannot perform operation.\n", - MAX_PARAM); + sprintf(str, "Error: Too many parameters (> %d). Cannot perform operation.\n", MAX_PARAM); show_error(str); return 0; } @@ -5787,8 +5746,7 @@ int scan_attributes(char *logbook) /* scan configuration file for attributes and fill attr_list, attr_options and attr_flags arrays */ { - char list[10000], str[NAME_LENGTH], type[NAME_LENGTH], - tmp_list[MAX_N_ATTR][NAME_LENGTH]; + char list[10000], str[NAME_LENGTH], type[NAME_LENGTH], tmp_list[MAX_N_ATTR][NAME_LENGTH]; int i, j, n, m; if (getcfg(logbook, "Attributes", list, sizeof(list))) { @@ -5995,18 +5953,14 @@ void show_upgrade_page(LOGBOOK * lbs) rsprintf("\n\n"); - rsprintf - ("\n"); + rsprintf("\n"); rsprintf("
ELog Electronic Logbook Upgrade Information
ELog Electronic Logbook Upgrade Information

\n"); - rsprintf - ("You probably use an %s configuration file for a ELOG version\n", CFGFILE); - rsprintf - ("1.1.x, since it contains a \"Types = ...\" entry. From version\n"); + rsprintf("You probably use an %s configuration file for a ELOG version\n", CFGFILE); + rsprintf("1.1.x, since it contains a \"Types = ...\" entry. From version\n"); rsprintf("1.2.0 on, the fixed attributes Type and Category have been\n"); - rsprintf - ("replaced by arbitrary attributes. Please replace these two lines with the\n"); + rsprintf("replaced by arbitrary attributes. Please replace these two lines with the\n"); rsprintf("following entries:

\n"); rsprintf("

\n");
    rsprintf("Attributes = Author, Type, Category, Subject\n");
@@ -6019,11 +5973,9 @@ void show_upgrade_page(LOGBOOK * lbs)
    rsprintf("
\n"); rsprintf("

\n"); - rsprintf - ("It is of course possible to change the attributes or add new ones. The new\n"); + rsprintf("It is of course possible to change the attributes or add new ones. The new\n"); rsprintf("options in the configuration file are described under http://midas.psi.ch/elog/config.html\n"); + rsprintf("http://midas.psi.ch/elog/config.html\">http://midas.psi.ch/elog/config.html\n"); rsprintf(".\n"); rsprintf("

\n\n"); @@ -6279,11 +6231,9 @@ void show_standard_title(char *logbook, char *text, int printable) LBLIST phier, pnode, pnext, flb; if (printable) - rsprintf - ("\n\n"); + rsprintf("
\n\n"); else - rsprintf - ("
\n\n"); + rsprintf("
\n\n"); /* scan logbook hierarchy */ phier = get_logbook_hierarchy(); @@ -6305,8 +6255,7 @@ void show_standard_title(char *logbook, char *text, int printable) if (level == 1 && getcfg("global", "main tab", str, sizeof(str)) && getcfg_topgroup()) - rsprintf("%s\n", - getcfg_topgroup(), str); + rsprintf("%s\n", getcfg_topgroup(), str); /* iterate through members of this group */ for (i = 0; i < pnode->n_members; i++) { @@ -6391,8 +6340,7 @@ void show_standard_title(char *logbook, char *text, int printable) /* middle cell */ if (*getparam("full_name")) - rsprintf("\n", loc("Logged in as"), - getparam("full_name")); + rsprintf("\n", loc("Logged in as"), getparam("full_name")); else if (getcfg(logbook, "Guest menu commands", str, sizeof(str))) rsprintf("\n", loc("Not logged in")); @@ -6544,7 +6492,7 @@ void set_login_cookies(LOGBOOK * lbs, char *user, char *enc_pwd) /* get optional expriation from configuration file */ if (isparam("remember")) { if (!getcfg(lb_name, "Login expiration", exp, sizeof(exp))) - strcpy(exp, "744"); /* one month by default = 31*24 */ + strcpy(exp, "744"); /* one month by default = 31*24 */ } else exp[0] = 0; @@ -6555,7 +6503,7 @@ void set_login_cookies(LOGBOOK * lbs, char *user, char *enc_pwd) set_cookie(lbs, "unm", user, global, exp); set_cookie(lbs, "upwd", enc_pwd, global, exp); - if (global && user[0] == 0 && enc_pwd[0] == 0) { + if (global &&user[0] == 0 && enc_pwd[0] == 0) { /* if logging out global, also delete possible non-global cookies */ set_cookie(lbs, "unm", user, 0, exp); set_cookie(lbs, "upwd", enc_pwd, 0, exp); @@ -6564,7 +6512,7 @@ void set_login_cookies(LOGBOOK * lbs, char *user, char *enc_pwd) if (user[0]) { /* set "remember me" cookie on login */ if (isparam("remember")) - set_cookie(lbs, "urem", "1", global, "8760"); /* one year = 24*365 */ + set_cookie(lbs, "urem", "1", global, "8760"); /* one year = 24*365 */ else set_cookie(lbs, "urem", "0", global, "8760"); } @@ -6656,8 +6604,7 @@ void send_file_direct(char *file_name) show_html_header(NULL, FALSE, "404 Not Found", TRUE); rsprintf("

Not Found

\r\n"); - rsprintf("The requested file %s was not found on this server

\r\n", - file_name); + rsprintf("The requested file %s was not found on this server

\r\n", file_name); rsprintf("

ELOG version %s
\r\n\r\n", VERSION); return_length = strlen_retbuf; keep_alive = 0; @@ -6691,8 +6638,8 @@ void strencode(char *text) rsprintf(" "); break; - /* the translation for the search highliting */ - + /* the translation for the search highliting */ + case '\001': rsprintf("<"); break; @@ -6854,16 +6801,14 @@ int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_ /*------------------------------------------------------------------*/ -void add_subst_list(char list[][NAME_LENGTH], char value[][NAME_LENGTH], - char *item, char *str, int *i) +void add_subst_list(char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item, char *str, int *i) { strcpy(list[*i], item); strcpy(value[(*i)++], str); } void add_subst_time(LOGBOOK * lbs, - char list[][NAME_LENGTH], char value[][NAME_LENGTH], - char *item, char *date, int *i) + char list[][NAME_LENGTH], char value[][NAME_LENGTH], char *item, char *date, int *i) { char format[80], str[256]; time_t ltime; @@ -7029,8 +6974,7 @@ void show_change_pwd_page(LOGBOOK * lbs) rsprintf("
%s \"%s\"%s \"%s\"%s
"); if (wrong_pwd == 1) - rsprintf("\n", - loc("Wrong password")); + rsprintf("\n", loc("Wrong password")); if (wrong_pwd == 2) rsprintf("\n", @@ -7054,13 +6998,10 @@ void show_change_pwd_page(LOGBOOK * lbs) } rsprintf("\n", loc("New password")); - rsprintf - ("\n"); + rsprintf("\n"); - rsprintf("\n", - loc("Retype new password")); - rsprintf - ("\n"); + rsprintf("\n", loc("Retype new password")); + rsprintf("\n"); rsprintf ("", @@ -7086,8 +7027,7 @@ auto-increment tags */ if (!message_id) return 0; - el_retrieve(lbs, message_id, NULL, attr_list, attrib, lbs->n_attr, NULL, 0, NULL, NULL, - att, NULL, NULL); + el_retrieve(lbs, message_id, NULL, attr_list, attrib, lbs->n_attr, NULL, 0, NULL, NULL, att, NULL, NULL); strcpy(str, attrib[index]); @@ -7185,8 +7125,7 @@ void show_date_selector(int day, int month, int year, char *index) (" %s: ", loc("Year"), index, year); else - rsprintf(" %s: ", - loc("Year"), index); + rsprintf(" %s: ", loc("Year"), index); rsprintf("\n
%s!
%s!
%s!
%s:
%s:
%s: