diff --git a/Makefile b/Makefile index 30bd8cd0..0841a5e7 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,9 @@ all: $(EXECS) %: src/%.c $(CC) $(CFLAGS) -o $@ $< $(LIBS) +indent: + find . -name "*.[hc]" -exec indent -kr -nut -i3 {} \; + install: $(EXECS) $(INSTALL) -m 0755 -d $(DESTDIR) $(SDESTDIR) $(MANDIR)/man1/ $(MANDIR)/man8/ $(INSTALL) -m 0755 -o bin -g bin elog elconv $(DESTDIR) diff --git a/src/elconv.c b/src/elconv.c index 10c853b9..b3e1a6e9 100644 --- a/src/elconv.c +++ b/src/elconv.c @@ -6,6 +6,9 @@ Contents: Conversion program for ELOG messages $Log$ + Revision 1.2 2004/01/06 13:21:34 midas + Changed indent style + Revision 1.1 2003/01/30 14:45:07 midas Moved files to src/ subdirectory @@ -53,7 +56,7 @@ #define DIR_SEPARATOR '/' #define DIR_SEPARATOR_STR "/" -#define __USE_XOPEN /* needed for crypt() */ +#define __USE_XOPEN /* needed for crypt() */ typedef int BOOL; @@ -102,53 +105,53 @@ typedef int INT; char attr_list[MAX_N_ATTR][NAME_LENGTH]; char data_dir[256]; -int verbose; +int verbose; typedef struct { - char v1_tag[16]; - int message_id; - char in_reply_to[16]; - char reply[16]; + char v1_tag[16]; + int message_id; + char in_reply_to[16]; + char reply[16]; } THREAD; /*---- Funcions from the MIDAS library -----------------------------*/ BOOL equal_ustring(char *str1, char *str2) { - if (str1 == NULL && str2 != NULL) - return FALSE; - if (str1 != NULL && str2 == NULL) - return FALSE; - if (str1 == NULL && str2 == NULL) - return TRUE; + if (str1 == NULL && str2 != NULL) + return FALSE; + if (str1 != NULL && str2 == NULL) + return FALSE; + if (str1 == NULL && str2 == NULL) + return TRUE; - while (*str1) - if (toupper(*str1++) != toupper(*str2++)) + while (*str1) + if (toupper(*str1++) != toupper(*str2++)) + return FALSE; + + if (*str2) return FALSE; - if (*str2) - return FALSE; - - return TRUE; + return TRUE; } /*------------------------------------------------------------------*/ void el_decode(char *message, char *key, char *result) { -char *pc; + char *pc; - if (result == NULL) - return; + if (result == NULL) + return; - *result = 0; + *result = 0; - if (strstr(message, key)) - { - for (pc=strstr(message, key)+strlen(key) ; *pc != '\n' && *pc != '\r' ; ) - *result++ = *pc++; - *result = 0; - } + if (strstr(message, key)) { + for (pc = strstr(message, key) + strlen(key); + *pc != '\n' && *pc != '\r';) + *result++ = *pc++; + *result = 0; + } } /*------------------------------------------------------------------*/ @@ -159,48 +162,47 @@ char *pc; int fnmatch1(const char *pattern, const char *string) { -const char *stringstart; -char c, test; + const char *stringstart; + char c, test; - for (stringstart = string;;) - switch (c = *pattern++) { - case EOS: - return (*string == EOS ? 0 : 1); - case '?': - if (*string == EOS) - return (1); - ++string; - break; - case '*': - c = *pattern; - /* Collapse multiple stars. */ - while (c == '*') - c = *++pattern; + for (stringstart = string;;) + switch (c = *pattern++) { + case EOS: + return (*string == EOS ? 0 : 1); + case '?': + if (*string == EOS) + return (1); + ++string; + break; + case '*': + c = *pattern; + /* Collapse multiple stars. */ + while (c == '*') + c = *++pattern; - /* Optimize for pattern with * at end or before /. */ - if (c == EOS) - return (0); + /* Optimize for pattern with * at end or before /. */ + if (c == EOS) + return (0); - /* General case, use recursion. */ - while ((test = *string) != EOS) - { - if (!fnmatch1(pattern, string)) - return (0); - ++string; - } - return (1); - /* FALLTHROUGH */ - default: - if (c != *string) - return (1); - string++; - break; - } + /* General case, use recursion. */ + while ((test = *string) != EOS) { + if (!fnmatch1(pattern, string)) + return (0); + ++string; + } + return (1); + /* FALLTHROUGH */ + default: + if (c != *string) + return (1); + string++; + break; + } } /*------------------------------------------------------------------*/ -INT ss_file_find(char * path, char * pattern, char **plist) +INT ss_file_find(char *path, char *pattern, char **plist) /********************************************************************\ Routine: ss_file_find @@ -219,370 +221,343 @@ INT ss_file_find(char * path, char * pattern, char **plist) \********************************************************************/ { - int i; + int i; #ifdef OS_UNIX - DIR *dir_pointer; - struct dirent *dp; + DIR *dir_pointer; + struct dirent *dp; - if ((dir_pointer = opendir(path)) == NULL) - return 0; - *plist = (char *) malloc(MAX_PATH_LENGTH); - i = 0; - for (dp = readdir(dir_pointer); dp != NULL; dp = readdir(dir_pointer)) - { - if (fnmatch1(pattern, dp->d_name) == 0) - { - *plist = (char *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - strncpy(*plist+(i*MAX_PATH_LENGTH), dp->d_name, strlen(dp->d_name)); - *(*plist+(i*MAX_PATH_LENGTH)+strlen(dp->d_name)) = '\0'; - i++; - seekdir(dir_pointer, telldir(dir_pointer)); + if ((dir_pointer = opendir(path)) == NULL) + return 0; + *plist = (char *) malloc(MAX_PATH_LENGTH); + i = 0; + for (dp = readdir(dir_pointer); dp != NULL; dp = readdir(dir_pointer)) { + if (fnmatch1(pattern, dp->d_name) == 0) { + *plist = (char *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + strncpy(*plist + (i * MAX_PATH_LENGTH), dp->d_name, + strlen(dp->d_name)); + *(*plist + (i * MAX_PATH_LENGTH) + strlen(dp->d_name)) = '\0'; + i++; + seekdir(dir_pointer, telldir(dir_pointer)); } - } - closedir(dir_pointer); + } + closedir(dir_pointer); #endif #ifdef OS_WINNT - HANDLE pffile; - LPWIN32_FIND_DATA lpfdata; - char str[255]; - int first; + HANDLE pffile; + LPWIN32_FIND_DATA lpfdata; + char str[255]; + int first; - strcpy(str,path); - strcat(str,"\\"); - strcat(str,pattern); - first = 1; - i = 0; - lpfdata = malloc(sizeof(WIN32_FIND_DATA)); - *plist = (char *) malloc(MAX_PATH_LENGTH); - pffile = FindFirstFile(str, lpfdata); - if (pffile == INVALID_HANDLE_VALUE) - return 0; - first = 0; - *plist = (char *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - 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 *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - strncpy(*plist+(i*MAX_PATH_LENGTH), lpfdata->cFileName, strlen(lpfdata->cFileName)); - *(*plist+(i*MAX_PATH_LENGTH)+strlen(lpfdata->cFileName)) = '\0'; - i++; - } - free(lpfdata); + strcpy(str, path); + strcat(str, "\\"); + strcat(str, pattern); + first = 1; + i = 0; + lpfdata = malloc(sizeof(WIN32_FIND_DATA)); + *plist = (char *) malloc(MAX_PATH_LENGTH); + pffile = FindFirstFile(str, lpfdata); + if (pffile == INVALID_HANDLE_VALUE) + return 0; + first = 0; + *plist = (char *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + 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 *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, + strlen(lpfdata->cFileName)); + *(*plist + (i * MAX_PATH_LENGTH) + strlen(lpfdata->cFileName)) = + '\0'; + i++; + } + free(lpfdata); #endif - return i; + return i; } /*------------------------------------------------------------------*/ INT el_search_message(char *tag, int *fh, BOOL walk, BOOL first) { -int lfh, i, n, d, min, max, size, offset, direction, last, status, did_walk; -struct tm *tms, ltms; -time_t lt, ltime, lact; -char str[256], file_name[256], dir[256]; -char *file_list; + int lfh, i, n, d, min, max, size, offset, direction, last, status, + did_walk; + struct tm *tms, ltms; + time_t lt, ltime, lact; + char str[256], file_name[256], dir[256]; + char *file_list; - did_walk = 0; - ltime = lfh = 0; + did_walk = 0; + ltime = lfh = 0; - /* get data directory */ - strcpy(dir, data_dir); + /* get data directory */ + strcpy(dir, data_dir); - /* check tag for direction */ - direction = 0; - if (strpbrk(tag, "+-")) - { - direction = atoi(strpbrk(tag, "+-")); - *strpbrk(tag, "+-") = 0; - } + /* check tag for direction */ + direction = 0; + if (strpbrk(tag, "+-")) { + direction = atoi(strpbrk(tag, "+-")); + *strpbrk(tag, "+-") = 0; + } - /* if tag is given, open file directly */ - if (tag[0]) - { - /* extract time structure from tag */ - tms = <ms; - memset(tms, 0, sizeof(struct tm)); - tms->tm_year = (tag[0]-'0')*10 + (tag[1]-'0'); - tms->tm_mon = (tag[2]-'0')*10 + (tag[3]-'0') -1; - tms->tm_mday = (tag[4]-'0')*10 + (tag[5]-'0'); - tms->tm_hour = 12; + /* if tag is given, open file directly */ + if (tag[0]) { + /* extract time structure from tag */ + tms = <ms; + memset(tms, 0, sizeof(struct tm)); + tms->tm_year = (tag[0] - '0') * 10 + (tag[1] - '0'); + tms->tm_mon = (tag[2] - '0') * 10 + (tag[3] - '0') - 1; + tms->tm_mday = (tag[4] - '0') * 10 + (tag[5] - '0'); + tms->tm_hour = 12; - if (tms->tm_year < 90) - tms->tm_year += 100; - ltime = lt = mktime(tms); + if (tms->tm_year < 90) + tms->tm_year += 100; + ltime = lt = mktime(tms); - if (ltime < 0) - return -1; + if (ltime < 0) + return -1; - strcpy(str, tag); - if (strchr(str, '.')) - { - offset = atoi(strchr(str, '.')+1); - *strchr(str, '.') = 0; - } - else - return -1; + strcpy(str, tag); + if (strchr(str, '.')) { + offset = atoi(strchr(str, '.') + 1); + *strchr(str, '.') = 0; + } else + return -1; - do - { - tms = localtime(<ime); + do { + tms = localtime(<ime); - sprintf(file_name, "%s%02d%02d%02d.log", dir, - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday); - lfh = open(file_name, O_RDWR | O_BINARY, 0644); + sprintf(file_name, "%s%02d%02d%02d.log", dir, + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday); + lfh = open(file_name, O_RDWR | O_BINARY, 0644); - if (lfh < 0) - { - if (!walk) - return EL_FILE_ERROR; + if (lfh < 0) { + if (!walk) + return EL_FILE_ERROR; - did_walk = 1; + did_walk = 1; - if (direction == -1) - ltime -= 3600*24; /* one day back */ - else - ltime += 3600*24; /* go forward one day */ + if (direction == -1) + ltime -= 3600 * 24; /* one day back */ + else + ltime += 3600 * 24; /* go forward one day */ - /* set new tag */ - tms = localtime(<ime); - sprintf(tag, "%02d%02d%02d.0", tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday); - } + /* set new tag */ + tms = localtime(<ime); + sprintf(tag, "%02d%02d%02d.0", tms->tm_year % 100, + tms->tm_mon + 1, tms->tm_mday); + } - /* in forward direction, stop today */ - if (direction != -1 && ltime > (time_t)(time(NULL)+3600*24)) - break; + /* in forward direction, stop today */ + if (direction != -1 && ltime > (time_t) (time(NULL) + 3600 * 24)) + break; - /* in backward direction, go back 10 years */ - if (direction == -1 && abs((int)(lt-ltime)) > 3600*24*365*10) - break; + /* in backward direction, go back 10 years */ + if (direction == -1 + && abs((int) (lt - ltime)) > 3600 * 24 * 365 * 10) + break; } while (lfh < 0); - if (lfh < 0) - return EL_FILE_ERROR; - - if (direction == -1 && did_walk) - lseek(lfh, 0, SEEK_END); - else - lseek(lfh, offset, SEEK_SET); - } - - /* open most recent file if no tag given */ - if (tag[0] == 0) - { - if (first) - { - /* go through whole directory, find first file */ - - file_list = NULL; - n = ss_file_find(dir, "??????.log", &file_list); - if (n == 0) - { - if (file_list) - free(file_list); - return EL_FILE_ERROR; - } - - for (i=0,min=9999999 ; i max) + max = d; + } + free(file_list); + sprintf(file_name, "%s%06d.log", dir, max % 1000000); + lfh = open(file_name, O_RDWR | O_BINARY, 0644); + if (lfh < 0) + return EL_FILE_ERROR; + + lseek(lfh, 0, SEEK_END); + + /* remember tag */ + sprintf(tag, "%06d.%d", (int) (max % 1000000), (int) (TELL(lfh))); } - else - { - /* go through whole directory, find last file */ + } - file_list = NULL; - n = ss_file_find(dir, "??????.log", &file_list); - if (n == 0) - { - if (file_list) - free(file_list); - return EL_NO_MSG; - } + if (direction == -1) { + /* seek previous message */ - for (i=0,max=0 ; i max) - max = d; - } - free(file_list); - sprintf(file_name, "%s%06d.log", dir, max % 1000000); - lfh = open(file_name, O_RDWR | O_BINARY, 0644); - if (lfh < 0) - return EL_FILE_ERROR; + lt = ltime; + do { + lt -= 3600 * 24; + tms = localtime(<); + sprintf(str, "%02d%02d%02d.0", + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday); - lseek(lfh, 0, SEEK_END); + status = el_search_message(str, &lfh, FALSE, FALSE); - /* remember tag */ - sprintf(tag, "%06d.%d", (int) (max % 1000000), (int) (TELL(lfh))); + } while (status != SUCCESS && + (INT) ltime - (INT) lt < 3600 * 24 * 365); + + if (status != EL_SUCCESS) { + if (fh) + *fh = lfh; + else + close(lfh); + return EL_FIRST_MSG; + } + + /* adjust tag */ + strcpy(tag, str); + + /* go to end of current file */ + lseek(lfh, 0, SEEK_END); } - } - if (direction == -1) - { - /* seek previous message */ + /* read previous message size */ + lseek(lfh, -17, SEEK_CUR); + i = read(lfh, str, 17); + if (i <= 0) { + close(lfh); + return EL_FILE_ERROR; + } - if (TELL(lfh) == 0) - { - /* go back one day */ - close(lfh); - - lt = ltime; - do - { - lt -= 3600*24; - tms = localtime(<); - sprintf(str, "%02d%02d%02d.0", - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday); - - status = el_search_message(str, &lfh, FALSE, FALSE); - - } while (status != SUCCESS && - (INT)ltime-(INT)lt < 3600*24*365); - - if (status != EL_SUCCESS) - { - if (fh) - *fh = lfh; - else - close(lfh); - return EL_FIRST_MSG; - } + if (strncmp(str, "$End$: ", 7) == 0) { + size = atoi(str + 7); + lseek(lfh, -size, SEEK_CUR); + } else { + close(lfh); + return EL_FILE_ERROR; + } /* adjust tag */ - strcpy(tag, str); + sprintf(strchr(tag, '.') + 1, "%d", (int) (TELL(lfh))); + } - /* go to end of current file */ - lseek(lfh, 0, SEEK_END); + if (direction == 1) { + /* seek next message */ + + /* read current message size */ + last = TELL(lfh); + + i = read(lfh, str, 15); + if (i <= 0) { + close(lfh); + return EL_FILE_ERROR; } - - /* read previous message size */ - lseek(lfh, -17, SEEK_CUR); - i = read(lfh, str, 17); - if (i <= 0) - { - close(lfh); - return EL_FILE_ERROR; - } - - if (strncmp(str, "$End$: ", 7) == 0) - { - size = atoi(str+7); - lseek(lfh, -size, SEEK_CUR); - } - else - { - close(lfh); - return EL_FILE_ERROR; - } - - /* adjust tag */ - sprintf(strchr(tag, '.')+1, "%d", (int) (TELL(lfh))); - } - - if (direction == 1) - { - /* seek next message */ - - /* read current message size */ - last = TELL(lfh); - - i = read(lfh, str, 15); - if (i <= 0) - { - close(lfh); - return EL_FILE_ERROR; - } - lseek(lfh, -15, SEEK_CUR); - - if (strncmp(str, "$Start$: ", 9) == 0) - { - size = atoi(str+9); - lseek(lfh, size, SEEK_CUR); - } - else - { - close(lfh); - return EL_FILE_ERROR; - } - - /* if EOF, goto next day */ - i = read(lfh, str, 15); - if (i < 15) - { - close(lfh); - time(&lact); - - lt = ltime; - do - { - lt += 3600*24; - tms = localtime(<); - sprintf(str, "%02d%02d%02d.0", - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday); - - status = el_search_message(str, &lfh, FALSE, FALSE); - - } while (status != EL_SUCCESS && - (INT)lt-(INT)lact < 3600*24); - - if (status != EL_SUCCESS) - { - if (fh) - *fh = lfh; - else - close(lfh); - return EL_LAST_MSG; - } - - /* adjust tag */ - strcpy(tag, str); - - /* go to beginning of current file */ - lseek(lfh, 0, SEEK_SET); - } - else lseek(lfh, -15, SEEK_CUR); - /* adjust tag */ - sprintf(strchr(tag, '.')+1, "%d", (int) (TELL(lfh))); - } + if (strncmp(str, "$Start$: ", 9) == 0) { + size = atoi(str + 9); + lseek(lfh, size, SEEK_CUR); + } else { + close(lfh); + return EL_FILE_ERROR; + } - if (fh) - *fh = lfh; - else - close(lfh); + /* if EOF, goto next day */ + i = read(lfh, str, 15); + if (i < 15) { + close(lfh); + time(&lact); - return EL_SUCCESS; + lt = ltime; + do { + lt += 3600 * 24; + tms = localtime(<); + sprintf(str, "%02d%02d%02d.0", + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday); + + status = el_search_message(str, &lfh, FALSE, FALSE); + + } while (status != EL_SUCCESS && + (INT) lt - (INT) lact < 3600 * 24); + + if (status != EL_SUCCESS) { + if (fh) + *fh = lfh; + else + close(lfh); + return EL_LAST_MSG; + } + + /* adjust tag */ + strcpy(tag, str); + + /* go to beginning of current file */ + lseek(lfh, 0, SEEK_SET); + } else + lseek(lfh, -15, SEEK_CUR); + + /* adjust tag */ + sprintf(strchr(tag, '.') + 1, "%d", (int) (TELL(lfh))); + } + + if (fh) + *fh = lfh; + else + close(lfh); + + return EL_SUCCESS; } /*------------------------------------------------------------------*/ @@ -592,8 +567,7 @@ INT el_submit(char attr_name[MAX_N_ATTR][NAME_LENGTH], int n_attr, char *text, char *reply_to, char *encoding, char afilename[MAX_ATTACHMENTS][256], char *buffer[MAX_ATTACHMENTS], - INT buffer_size[MAX_ATTACHMENTS], - char *tag, INT tag_size) + INT buffer_size[MAX_ATTACHMENTS], char *tag, INT tag_size) /********************************************************************\ Routine: el_submit @@ -624,278 +598,247 @@ INT el_submit(char attr_name[MAX_N_ATTR][NAME_LENGTH], \********************************************************************/ { -INT n, i, size, fh, status, index, offset, tail_size; -struct tm *tms; -char file_name[256], afile_name[MAX_ATTACHMENTS][256], dir[256], str[256], - start_str[80], end_str[80], last[80], date[80], thread[80], attachment_all[64*MAX_ATTACHMENTS]; -time_t now; -char message[TEXT_SIZE+100], *p; -BOOL bedit; + INT n, i, size, fh, status, index, offset, tail_size; + struct tm *tms; + char file_name[256], afile_name[MAX_ATTACHMENTS][256], dir[256], + str[256], start_str[80], end_str[80], last[80], date[80], + thread[80], attachment_all[64 * MAX_ATTACHMENTS]; + time_t now; + char message[TEXT_SIZE + 100], *p; + BOOL bedit; - bedit = (tag[0] != 0); + bedit = (tag[0] != 0); - for (index = 0 ; index < MAX_ATTACHMENTS ; index++) - { - /* generate filename for attachment */ - afile_name[index][0] = file_name[0] = 0; + for (index = 0; index < MAX_ATTACHMENTS; index++) { + /* generate filename for attachment */ + afile_name[index][0] = file_name[0] = 0; - if (afilename[index][0] && buffer_size[index] == 0) - { - /* resubmission of existing attachment */ - strcpy(afile_name[index], afilename[index]); - } - else - { - if (afilename[index][0]) - { - /* strip directory, add date and time to filename */ + if (afilename[index][0] && buffer_size[index] == 0) { + /* resubmission of existing attachment */ + strcpy(afile_name[index], afilename[index]); + } else { + if (afilename[index][0]) { + /* strip directory, add date and time to filename */ - strcpy(file_name, afilename[index]); - p = file_name; - while (strchr(p, ':')) - p = strchr(p, ':')+1; - while (strchr(p, '\\')) - p = strchr(p, '\\')+1; /* NT */ - while (strchr(p, '/')) - p = strchr(p, '/')+1; /* Unix */ + strcpy(file_name, afilename[index]); + p = file_name; + while (strchr(p, ':')) + p = strchr(p, ':') + 1; + while (strchr(p, '\\')) + p = strchr(p, '\\') + 1; /* NT */ + while (strchr(p, '/')) + p = strchr(p, '/') + 1; /* Unix */ - /* assemble ELog filename */ - if (p[0]) - { - strcpy(dir, data_dir); + /* assemble ELog filename */ + if (p[0]) { + strcpy(dir, data_dir); - time(&now); - tms = localtime(&now); + time(&now); + tms = localtime(&now); - strcpy(str, p); - sprintf(afile_name[index], "%02d%02d%02d_%02d%02d%02d_%s", - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday, - tms->tm_hour, tms->tm_min, tms->tm_sec, str); - sprintf(file_name, "%s%02d%02d%02d_%02d%02d%02d_%s", dir, - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday, - tms->tm_hour, tms->tm_min, tms->tm_sec, str); + strcpy(str, p); + sprintf(afile_name[index], "%02d%02d%02d_%02d%02d%02d_%s", + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday, + tms->tm_hour, tms->tm_min, tms->tm_sec, str); + sprintf(file_name, "%s%02d%02d%02d_%02d%02d%02d_%s", dir, + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday, + tms->tm_hour, tms->tm_min, tms->tm_sec, str); - /* save attachment */ - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - printf("Cannot write attachment file \"%s\"", file_name); + /* save attachment */ + fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) { + printf("Cannot write attachment file \"%s\"", file_name); + } else { + write(fh, buffer[index], buffer_size[index]); + close(fh); + } } - else - { - write(fh, buffer[index], buffer_size[index]); + } + } + } + + /* generate new file name YYMMDD.log in data directory */ + strcpy(dir, data_dir); + + if (bedit) { + /* edit existing message */ + strcpy(str, tag); + if (strchr(str, '.')) { + offset = atoi(strchr(str, '.') + 1); + *strchr(str, '.') = 0; + } + sprintf(file_name, "%s%s.log", dir, str); + fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) + return -1; + + lseek(fh, offset, SEEK_SET); + read(fh, str, 16); + size = atoi(str + 9); + read(fh, message, size); + + el_decode(message, "Date: ", date); + el_decode(message, "Thread: ", thread); + el_decode(message, "Attachment: ", attachment_all); + + /* buffer tail of logfile */ + lseek(fh, 0, SEEK_END); + tail_size = TELL(fh) - (offset + size); + + if (tail_size > 0) { + buffer = malloc(tail_size); + if (buffer == NULL) { close(fh); - } - } - } + return -1; + } + + lseek(fh, offset + size, SEEK_SET); + n = read(fh, buffer, tail_size); } - } + lseek(fh, offset, SEEK_SET); + } else { + /* create new message */ + time(&now); + tms = localtime(&now); - /* generate new file name YYMMDD.log in data directory */ - strcpy(dir, data_dir); + sprintf(file_name, "%s%02d%02d%02d.log", dir, + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday); - if (bedit) - { - /* edit existing message */ - strcpy(str, tag); - if (strchr(str, '.')) - { - offset = atoi(strchr(str, '.')+1); - *strchr(str, '.') = 0; - } - sprintf(file_name, "%s%s.log", dir, str); - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - return -1; + fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) + return -1; - lseek(fh, offset, SEEK_SET); - read(fh, str, 16); - size = atoi(str+9); - read(fh, message, size); + strcpy(date, ctime(&now)); + date[24] = 0; - el_decode(message, "Date: ", date); - el_decode(message, "Thread: ", thread); - el_decode(message, "Attachment: ", attachment_all); - - /* buffer tail of logfile */ - lseek(fh, 0, SEEK_END); - tail_size = TELL(fh) - (offset+size); - - if (tail_size > 0) - { - buffer = malloc(tail_size); - if (buffer == NULL) - { - close(fh); - return -1; - } - - lseek(fh, offset+size, SEEK_SET); - n = read(fh, buffer, tail_size); - } - lseek(fh, offset, SEEK_SET); - } - else - { - /* create new message */ - time(&now); - tms = localtime(&now); - - sprintf(file_name, "%s%02d%02d%02d.log", dir, - tms->tm_year % 100, tms->tm_mon+1, tms->tm_mday); - - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - return -1; - - strcpy(date, ctime(&now)); - date[24] = 0; - - if (reply_to[0]) - sprintf(thread, "%16s %16s", reply_to, "0"); - else - sprintf(thread, "%16s %16s", "0", "0"); - - lseek(fh, 0, SEEK_END); - } - - /* compose message */ - - sprintf(message, "Date: %s\n", date); - sprintf(message+strlen(message), "Thread: %s\n", thread); - - for (i=0 ; itm_year % 100, tms->tm_mon+1, tms->tm_mday, (int) (TELL(fh))); + if (tag != NULL && !bedit) + sprintf(tag, "%02d%02d%02d.%d", tms->tm_year % 100, tms->tm_mon + 1, + tms->tm_mday, (int) (TELL(fh))); - sprintf(start_str, "$Start$: %6d\n", size); - sprintf(end_str, "$End$: %6d\n\f", size); + sprintf(start_str, "$Start$: %6d\n", size); + sprintf(end_str, "$End$: %6d\n\f", size); - write(fh, start_str, strlen(start_str)); - write(fh, message, strlen(message)); - write(fh, end_str, strlen(end_str)); + write(fh, start_str, strlen(start_str)); + write(fh, message, strlen(message)); + write(fh, end_str, strlen(end_str)); - if (bedit) - { - if (tail_size > 0) - { - n = write(fh, buffer, tail_size); - free(buffer); + if (bedit) { + if (tail_size > 0) { + n = write(fh, buffer, tail_size); + free(buffer); } - /* truncate file here */ + /* truncate file here */ #ifdef _MSC_VER - chsize(fh, TELL(fh)); + chsize(fh, TELL(fh)); #else - ftruncate(fh, TELL(fh)); + ftruncate(fh, TELL(fh)); #endif - } + } - close(fh); + close(fh); - /* if reply, mark original message */ - if (reply_to[0] && !bedit) - { - strcpy(last, reply_to); - do - { - status = el_search_message(last, &fh, FALSE, FALSE); - if (status == EL_SUCCESS) - { - /* position to next thread location */ - lseek(fh, 72, SEEK_CUR); - memset(str, 0, sizeof(str)); - read(fh, str, 16); - lseek(fh, -16, SEEK_CUR); + /* if reply, mark original message */ + if (reply_to[0] && !bedit) { + strcpy(last, reply_to); + do { + status = el_search_message(last, &fh, FALSE, FALSE); + if (status == EL_SUCCESS) { + /* position to next thread location */ + lseek(fh, 72, SEEK_CUR); + memset(str, 0, sizeof(str)); + read(fh, str, 16); + lseek(fh, -16, SEEK_CUR); - /* if no reply yet, set it */ - if (atoi(str) == 0) - { - sprintf(str, "%16s", tag); - write(fh, str, 16); - close(fh); - break; - } - else - { - /* if reply set, find last one in chain */ - strcpy(last, strtok(str, " ")); - close(fh); - } - } - else - /* stop on error */ - break; + /* if no reply yet, set it */ + if (atoi(str) == 0) { + sprintf(str, "%16s", tag); + write(fh, str, 16); + close(fh); + break; + } else { + /* if reply set, find last one in chain */ + strcpy(last, strtok(str, " ")); + close(fh); + } + } else + /* stop on error */ + break; } while (TRUE); - } + } - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ @@ -923,49 +866,44 @@ INT el_get_v1(char *tag, char *message, int *bufsize) \********************************************************************/ { -int i, size, fh, offset, search_status; -char str[256]; + int i, size, fh, offset, search_status; + char str[256]; - if (tag[0]) - { - search_status = el_search_message(tag, &fh, TRUE, FALSE); - if (search_status != EL_SUCCESS) - return search_status; - } - else - { - /* open most recent message */ - strcpy(tag, "-1"); - search_status = el_search_message(tag, &fh, TRUE, FALSE); - if (search_status != EL_SUCCESS) - return search_status; - } + if (tag[0]) { + search_status = el_search_message(tag, &fh, TRUE, FALSE); + if (search_status != EL_SUCCESS) + return search_status; + } else { + /* open most recent message */ + strcpy(tag, "-1"); + search_status = el_search_message(tag, &fh, TRUE, FALSE); + if (search_status != EL_SUCCESS) + return search_status; + } - /* extract message size */ - offset = TELL(fh); - i = read(fh, str, 16); - if (i <= 0) - { - close(fh); - return EL_FILE_ERROR; - } + /* extract message size */ + offset = TELL(fh); + i = read(fh, str, 16); + if (i <= 0) { + close(fh); + return EL_FILE_ERROR; + } - if (strncmp(str, "$Start$: ", 9) == 0) - size = atoi(str+9); - else - { - close(fh); - return EL_FILE_ERROR; - } + if (strncmp(str, "$Start$: ", 9) == 0) + size = atoi(str + 9); + else { + close(fh); + return EL_FILE_ERROR; + } - /* read message */ - memset(message, 0, sizeof(message)); - read(fh, message, size); - close(fh); + /* read message */ + memset(message, 0, sizeof(message)); + read(fh, message, size); + close(fh); - *bufsize = size; + *bufsize = size; - return EL_SUCCESS; + return EL_SUCCESS; } @@ -973,201 +911,190 @@ char str[256]; void scan_messages() { -int size, status, fh, message_id, i, n, n_messages; -char file_name[256], tag[256], str[256], last_file[256]; -char message[TEXT_SIZE+1000]; -char *ps, *pd, *file_list; -THREAD *thread_list; + int size, status, fh, message_id, i, n, n_messages; + char file_name[256], tag[256], str[256], last_file[256]; + char message[TEXT_SIZE + 1000]; + char *ps, *pd, *file_list; + THREAD *thread_list; - tag[0] = 0; - message_id = 1; - thread_list = malloc(sizeof(THREAD)); + tag[0] = 0; + message_id = 1; + thread_list = malloc(sizeof(THREAD)); - /* search first message */ - status = el_search_message(tag, NULL, TRUE, TRUE); + /* search first message */ + status = el_search_message(tag, NULL, TRUE, TRUE); - if (status == EL_FILE_ERROR) - { - printf("Cannot find any ??????.log file in this directory.\n"); - return; - } - - /* delete previous files */ - file_list = NULL; - getcwd(str, sizeof(str)); - n = ss_file_find(str, "??????a.log", &file_list); - for (i=0 ; i %s, ID %d\n", tag, str, message_id); - else - { - if (!equal_ustring(str, last_file)) - { - printf("Converting %s.log to %sa.log\n", str, str); - strcpy(last_file, str); - } - } - - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - printf("Error: Cannot open file %s for writing.\n", file_name); - free(thread_list); + if (status == EL_FILE_ERROR) { + printf("Cannot find any ??????.log file in this directory.\n"); return; + } + + /* delete previous files */ + file_list = NULL; + getcwd(str, sizeof(str)); + n = ss_file_find(str, "??????a.log", &file_list); + for (i = 0; i < n; i++) + unlink(file_list + i * MAX_PATH_LENGTH); + if (file_list) + free(file_list); + + /* build thread_list */ + do { + size = sizeof(message); + status = el_get_v1(tag, message, &size); + + if (verbose) + printf("Scan %s\n", tag); + + if (status == EL_LAST_MSG) + break; + + strcpy(thread_list[message_id - 1].v1_tag, tag); + thread_list[message_id - 1].message_id = message_id; + + /* extract thread */ + if (strstr(message, "Thread:")) { + ps = strstr(message, "Thread:") + 7; + while (*ps && !isdigit(*ps)) + ps++; + + pd = thread_list[message_id - 1].in_reply_to; + while (isdigit(*ps) || ispunct(*ps)) + *pd++ = *ps++; + *pd = 0; + + while (*ps && !isdigit(*ps)) + ps++; + + pd = thread_list[message_id - 1].reply; + while (isdigit(*ps) || ispunct(*ps)) + *pd++ = *ps++; + *pd = 0; } - lseek(fh, 0, SEEK_END); - - /* write new message header */ - sprintf(str, "$@MID@$: %d\n", message_id); - write(fh, str, strlen(str)); + message_id++; + strcat(tag, "+1"); + thread_list = realloc(thread_list, sizeof(THREAD) * message_id); - /* write reply-to and in-reply-to */ - if (atoi(thread_list[message_id-1].reply) > 0) - { - /* search id for reply */ - for (i=0 ; i %s, ID %d\n", tag, str, message_id); + else { + if (!equal_ustring(str, last_file)) { + printf("Converting %s.log to %sa.log\n", str, str); + strcpy(last_file, str); + } } - if (atoi(thread_list[message_id-1].in_reply_to) > 0) - { - /* search id for reply */ - for (i=0 ; i 0) { + /* search id for reply */ + for (i = 0; i < n_messages; i++) + if (strstr + (thread_list[i].v1_tag, thread_list[message_id - 1].reply)) + break; - free(thread_list); + if (i < n_messages) { + sprintf(str, "Reply to: %d\n", thread_list[i].message_id); + write(fh, str, strlen(str)); + } + } + + if (atoi(thread_list[message_id - 1].in_reply_to) > 0) { + /* search id for reply */ + for (i = 0; i < n_messages; i++) + if (strstr + (thread_list[i].v1_tag, + thread_list[message_id - 1].in_reply_to)) + break; + + if (i < n_messages) { + sprintf(str, "In reply to: %d\n", thread_list[i].message_id); + write(fh, str, strlen(str)); + } + } + + /* strip $end$ */ + if (strstr(message, "$End$")) + *strstr(message, "$End$") = 0; + + if (message[strlen(message) - 1] != '\n') + strcat(message, "\n"); + write(fh, message, strlen(message)); + + close(fh); + + message_id++; + strcat(tag, "+1"); + + } while (1); + + free(thread_list); } /*------------------------------------------------------------------*/ int main(int argc, char *argv[]) { -int i; + int i; - /* parse command line parameters */ - for (i=1 ; i= argc || argv[i+1][0] == '-') - goto usage; - else - { -usage: - printf("usage: %s ", argv[0]); - printf(" -v debugging output\n"); - return 0; - } + /* parse command line parameters */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' && argv[i][1] == 'v') + verbose = TRUE; + else if (argv[i][0] == '-') { + if (i + 1 >= argc || argv[i + 1][0] == '-') + goto usage; + else { + usage: + printf("usage: %s ", argv[0]); + printf(" -v debugging output\n"); + return 0; + } } - } + } - /* use current directory as working directory */ - getcwd(data_dir, sizeof(data_dir)); - strcat(data_dir, DIR_SEPARATOR_STR); + /* use current directory as working directory */ + getcwd(data_dir, sizeof(data_dir)); + strcat(data_dir, DIR_SEPARATOR_STR); - scan_messages(); + scan_messages(); - return 0; + return 0; } diff --git a/src/elog.c b/src/elog.c index 0acadc38..11f9e749 100755 --- a/src/elog.c +++ b/src/elog.c @@ -6,6 +6,9 @@ Contents: Electronic logbook utility $Log$ + Revision 1.12 2004/01/06 13:21:34 midas + Changed indent style + Revision 1.11 2003/11/11 12:31:34 midas Added '-s' flag for email suppression @@ -104,57 +107,57 @@ char text[TEXT_SIZE], old_text[TEXT_SIZE], new_text[TEXT_SIZE]; /*------------------------------------------------------------------*/ -char *map= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +char *map = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; void base64_encode(char *s, char *d) { -unsigned int t, pad; + unsigned int t, pad; - pad = 3 - strlen(s) % 3; - if (pad == 3) - pad = 0; - while (*s) - { - t = (*s++) << 16; - if (*s) - t |= (*s++) << 8; - if (*s) - t |= (*s++) << 0; - - *(d+3) = map[t & 63]; - t >>= 6; - *(d+2) = map[t & 63]; - t >>= 6; - *(d+1) = map[t & 63]; - t >>= 6; - *(d+0) = map[t & 63]; + pad = 3 - strlen(s) % 3; + if (pad == 3) + pad = 0; + while (*s) { + t = (*s++) << 16; + if (*s) + t |= (*s++) << 8; + if (*s) + t |= (*s++) << 0; - d += 4; - } - *d = 0; - while (pad--) - *(--d) = '='; + *(d + 3) = map[t & 63]; + t >>= 6; + *(d + 2) = map[t & 63]; + t >>= 6; + *(d + 1) = map[t & 63]; + t >>= 6; + *(d + 0) = map[t & 63]; + + d += 4; + } + *d = 0; + while (pad--) + *(--d) = '='; } /*---- string comparison -------------------------------------------*/ int equal_ustring(char *str1, char *str2) { - if (str1 == NULL && str2 != NULL) - return 0; - if (str1 != NULL && str2 == NULL) - return 0; - if (str1 == NULL && str2 == NULL) - return 1; + if (str1 == NULL && str2 != NULL) + return 0; + if (str1 != NULL && str2 == NULL) + return 0; + if (str1 == NULL && str2 == NULL) + return 1; - while (*str1) - if (toupper(*str1++) != toupper(*str2++)) + while (*str1) + if (toupper(*str1++) != toupper(*str2++)) + return 0; + + if (*str2) return 0; - if (*str2) - return 0; - - return 1; + return 1; } /*---- strlcpy and strlcat to avoid buffer overflow ----------------*/ @@ -166,29 +169,26 @@ int equal_ustring(char *str1, char *str2) */ size_t strlcpy(char *dst, const char *src, size_t size) { -char *d = dst; -const char *s = src; -size_t n = size; + char *d = dst; + const char *s = src; + size_t n = size; - /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) - { - do - { - if ((*d++ = *s++) == 0) - break; + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; } while (--n != 0); - } + } - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) - { - if (size != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++); - } + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (size != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++); + } - return (s - src - 1); /* count does not include NUL */ + return (s - src - 1); /* count does not include NUL */ } /* @@ -200,44 +200,43 @@ size_t n = size; */ size_t strlcat(char *dst, const char *src, size_t size) { -char *d = dst; -const char *s = src; -size_t n = size; -size_t dlen; + char *d = dst; + const char *s = src; + size_t n = size; + size_t dlen; - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = size - dlen; + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = size - dlen; - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; + if (n == 0) + return (dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; - return(dlen + (s - src)); /* count does not include NUL */ + return (dlen + (s - src)); /* count does not include NUL */ } /*------------------------------------------------------------------*/ void sgets(char *string, int size) { -char *p; + char *p; - do - { - p = fgets(string, size, stdin); - } while (p == NULL); + do { + p = fgets(string, size, stdin); + } while (p == NULL); - if (strlen(p) > 0 && p[strlen(p)-1] == '\n') - p[strlen(p)-1] = 0; + if (strlen(p) > 0 && p[strlen(p) - 1] == '\n') + p[strlen(p) - 1] = 0; } /*------------------------------------------------------------------*/ @@ -247,8 +246,7 @@ char request[100000], response[100000], *content; INT retrieve_elog(char *host, int port, char *subdir, char *experiment, char *passwd, char *uname, char *upwd, int message_id, char attrib_name[MAX_N_ATTR][NAME_LENGTH], - char attrib[MAX_N_ATTR][NAME_LENGTH], - char *text) + char attrib[MAX_N_ATTR][NAME_LENGTH], char *text) /********************************************************************\ Routine: retrive_elog @@ -272,256 +270,240 @@ INT retrieve_elog(char *host, int port, char *subdir, char *experiment, \********************************************************************/ { -int status, sock, i, n, first, index; -struct hostent *phe; -struct sockaddr_in bind_addr; -char host_name[256], str[80], *ph, *ps; + int status, sock, i, n, first, index; + struct hostent *phe; + struct sockaddr_in bind_addr; + char host_name[256], str[80], *ph, *ps; #if defined( _MSC_VER ) - { - WSADATA WSAData; + { + WSADATA WSAData; - /* Start windows sockets */ - if ( WSAStartup(MAKEWORD(1,1), &WSAData) != 0) - return -1; - } + /* Start windows sockets */ + if (WSAStartup(MAKEWORD(1, 1), &WSAData) != 0) + return -1; + } #endif - /* get local host name */ - gethostname(host_name, sizeof(host_name)); + /* get local host name */ + gethostname(host_name, sizeof(host_name)); - phe = gethostbyname(host_name); - if (phe == NULL) - { - perror("Cannot retrieve host name"); - return -1; - } - phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); - if (phe == NULL) - { - perror("Cannot retrieve host name"); - return -1; - } + phe = gethostbyname(host_name); + if (phe == NULL) { + perror("Cannot retrieve host name"); + return -1; + } + phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); + if (phe == NULL) { + perror("Cannot retrieve host name"); + return -1; + } - /* if domain name is not in host name, hope to get it from phe */ - if (strchr(host_name, '.') == NULL) - strcpy(host_name, phe->h_name); + /* if domain name is not in host name, hope to get it from phe */ + if (strchr(host_name, '.') == NULL) + strcpy(host_name, phe->h_name); - /* create socket */ - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - perror("cannot create socket"); - return -1; - } + /* create socket */ + if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + perror("cannot create socket"); + return -1; + } - /* compose remote address */ - memset(&bind_addr, 0, sizeof(bind_addr)); - bind_addr.sin_family = AF_INET; - bind_addr.sin_addr.s_addr = 0; - bind_addr.sin_port = htons((unsigned short)port); + /* compose remote address */ + memset(&bind_addr, 0, sizeof(bind_addr)); + bind_addr.sin_family = AF_INET; + bind_addr.sin_addr.s_addr = 0; + bind_addr.sin_port = htons((unsigned short) port); - phe = gethostbyname(host); - if (phe == NULL) - { - perror("cannot get host name"); - return -1; - } - memcpy((char *)&(bind_addr.sin_addr), phe->h_addr, phe->h_length); + phe = gethostbyname(host); + if (phe == NULL) { + perror("cannot get host name"); + return -1; + } + memcpy((char *) &(bind_addr.sin_addr), phe->h_addr, phe->h_length); - /* connect to server */ - status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); - if (status != 0) - { - printf("Cannot connect to host %s, port %d\n", host, port); - return -1; - } + /* connect to server */ + status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); + if (status != 0) { + printf("Cannot connect to host %s, port %d\n", host, port); + return -1; + } - if (verbose) - printf("Successfully connected to host %s, port %d\n", host, port); + if (verbose) + printf("Successfully connected to host %s, port %d\n", host, port); - /* compose request */ - strcpy(request, "GET /"); - if (subdir[0]) - sprintf(request+strlen(request), "%s/%d?cmd=download", subdir, message_id); - if (experiment[0]) - sprintf(request+strlen(request), "%s/%d?cmd=download", experiment, message_id); - strcat(request, " HTTP/1.0\r\n"); + /* compose request */ + strcpy(request, "GET /"); + if (subdir[0]) + sprintf(request + strlen(request), "%s/%d?cmd=download", subdir, + message_id); + if (experiment[0]) + sprintf(request + strlen(request), "%s/%d?cmd=download", experiment, + message_id); + strcat(request, " HTTP/1.0\r\n"); - sprintf(request+strlen(request), "Host: %s\r\n", host_name); - sprintf(request+strlen(request), "User-Agent: ELOG\r\n"); + sprintf(request + strlen(request), "Host: %s\r\n", host_name); + sprintf(request + strlen(request), "User-Agent: ELOG\r\n"); - first = 1; - if (passwd[0]) - { - if (first) - sprintf(request+strlen(request), "Cookie: "); - first = 0; + first = 1; + if (passwd[0]) { + if (first) + sprintf(request + strlen(request), "Cookie: "); + first = 0; - base64_encode(passwd, str); - sprintf(request+strlen(request), "wpwd=%s;", str); - } + base64_encode(passwd, str); + sprintf(request + strlen(request), "wpwd=%s;", str); + } - if (uname[0]) - { - if (first) - sprintf(request+strlen(request), "Cookie: "); - first = 0; + if (uname[0]) { + if (first) + sprintf(request + strlen(request), "Cookie: "); + first = 0; - sprintf(request+strlen(request), "unm=%s;", uname); - } + sprintf(request + strlen(request), "unm=%s;", uname); + } - if (upwd[0]) - { - if (first) - sprintf(request+strlen(request), "Cookie: "); - first = 0; + if (upwd[0]) { + if (first) + sprintf(request + strlen(request), "Cookie: "); + first = 0; - base64_encode(upwd, str); - sprintf(request+strlen(request), "upwd=%s;", str); - } + base64_encode(upwd, str); + sprintf(request + strlen(request), "upwd=%s;", str); + } - /* finish cookie line */ - if (!first) - strcat(request, "\r\n"); + /* finish cookie line */ + if (!first) + strcat(request, "\r\n"); - strcat(request, "\r\n"); + strcat(request, "\r\n"); - /* send request */ - send(sock, request, strlen(request), 0); - if (verbose) - { - printf("Request sent to host:\n"); - puts(request); - } + /* send request */ + send(sock, request, strlen(request), 0); + if (verbose) { + printf("Request sent to host:\n"); + puts(request); + } - /* receive response */ - i = recv(sock, response, sizeof(response), 0); - if (i < 0) - { - perror("Cannot receive response"); - return -1; - } + /* receive response */ + i = recv(sock, response, sizeof(response), 0); + if (i < 0) { + perror("Cannot receive response"); + return -1; + } - n = i; - while (i > 0) - { - i = recv(sock, response+n, sizeof(response)-n, 0); - if (i > 0) - n += i; - } - response[n] = 0; + n = i; + while (i > 0) { + i = recv(sock, response + n, sizeof(response) - n, 0); + if (i > 0) + n += i; + } + response[n] = 0; - closesocket(sock); + closesocket(sock); - if (verbose) - { - printf("Response received:\n"); - puts(response); - } + if (verbose) { + printf("Response received:\n"); + puts(response); + } - /* check response status */ - if (strstr(response, "$@MID@$:")) - { - /* separate attributes and message */ + /* check response status */ + if (strstr(response, "$@MID@$:")) { + /* separate attributes and message */ - ph = strstr(response, "========================================\n"); - - /* skip first line */ - ps = strstr(response, "$@MID@$:"); - while (*ps && *ps != '\n') - ps++; - while (*ps && (*ps == '\n' || *ps == '\r')) - ps++; + ph = strstr(response, "========================================\n"); - for (index = 0; index= ph) - break; - - strlcpy(attrib_name[index], ps, NAME_LENGTH); - if (strchr(attrib_name[index], ':')) - *(strchr(attrib_name[index], ':')) = 0; - - ps += strlen(attrib_name[index])+2; - strlcpy(attrib[index], ps, NAME_LENGTH); - - for (i=0 ; i= ph) + break; + + strlcpy(attrib_name[index], ps, NAME_LENGTH); + if (strchr(attrib_name[index], ':')) + *(strchr(attrib_name[index], ':')) = 0; + + ps += strlen(attrib_name[index]) + 2; + strlcpy(attrib[index], ps, NAME_LENGTH); + + for (i = 0; i < NAME_LENGTH; i++) { + if (attrib[index][i] == '\r' || attrib[index][i] == '\n') + attrib[index][i] = 0; + + if (attrib[index][i] == 0) + break; + } + + ps += strlen(attrib[index]); + while (*ps && (*ps == '\n' || *ps == '\r')) + ps++; } - attrib_name[index][0] = 0; - attrib[index][0] = 0; + attrib_name[index][0] = 0; + attrib[index][0] = 0; - ph = strchr(ph, '\n')+1; - if (*ph == '\r') - ph++; + ph = strchr(ph, '\n') + 1; + if (*ph == '\r') + ph++; - strlcpy(text, ph, TEXT_SIZE); + strlcpy(text, ph, TEXT_SIZE); - return 1; - } - - if (strstr(response, "302 Found")) - { - if (strstr(response, "Location:")) - { - if (strstr(response, "wpwd")) - printf("Error: Invalid password\n"); - else if (strstr(response, "wusr")) - printf("Error: Invalid user name\n"); - else - { - strncpy(str, strstr(response, "Location:")+10, sizeof(str)); - if (strchr(str, '?')) - *strchr(str, '?') = 0; - if (strchr(str, '\n')) - *strchr(str, '\n') = 0; - if (strchr(str, '\r')) - *strchr(str, '\r') = 0; + return 1; + } - if (strrchr(str, '/')) - printf("Message successfully transmitted, ID=%s\n", strrchr(str, '/')+1); - else - printf("Message successfully transmitted, ID=%s\n", str); - } - } - } - else if (strstr(response, "Logbook Selection")) - printf("Error: No logbook specified\n"); - else if (strstr(response, "enter password")) - printf("Error: Missing or invalid password\n"); - else if (strstr(response, "form name=form1")) - printf("Error: Missing or invalid user name/password\n"); - else - printf("Error transmitting message\n"); + if (strstr(response, "302 Found")) { + if (strstr(response, "Location:")) { + if (strstr(response, "wpwd")) + printf("Error: Invalid password\n"); + else if (strstr(response, "wusr")) + printf("Error: Invalid user name\n"); + else { + strncpy(str, strstr(response, "Location:") + 10, sizeof(str)); + if (strchr(str, '?')) + *strchr(str, '?') = 0; + if (strchr(str, '\n')) + *strchr(str, '\n') = 0; + if (strchr(str, '\r')) + *strchr(str, '\r') = 0; - return 0; + if (strrchr(str, '/')) + printf("Message successfully transmitted, ID=%s\n", + strrchr(str, '/') + 1); + else + printf("Message successfully transmitted, ID=%s\n", str); + } + } + } else if (strstr(response, "Logbook Selection")) + printf("Error: No logbook specified\n"); + else if (strstr(response, "enter password")) + printf("Error: Missing or invalid password\n"); + else if (strstr(response, "form name=form1")) + printf("Error: Missing or invalid user name/password\n"); + else + printf("Error transmitting message\n"); + + return 0; } /*------------------------------------------------------------------*/ -INT submit_elog(char *host, int port, char *subdir, char *experiment, +INT submit_elog(char *host, int port, char *subdir, char *experiment, char *passwd, char *uname, char *upwd, - int reply, - int edit, - int suppress, + int reply, + int edit, + int suppress, char attrib_name[MAX_N_ATTR][NAME_LENGTH], char attrib[MAX_N_ATTR][NAME_LENGTH], - int n_attr, + int n_attr, char *text, - char afilename[MAX_ATTACHMENTS][256], - char *buffer[MAX_ATTACHMENTS], + char afilename[MAX_ATTACHMENTS][256], + char *buffer[MAX_ATTACHMENTS], INT buffer_size[MAX_ATTACHMENTS]) /********************************************************************\ @@ -552,594 +534,573 @@ INT submit_elog(char *host, int port, char *subdir, char *experiment, \********************************************************************/ { -int status, sock, i, n, header_length, content_length, index; -struct hostent *phe; -struct sockaddr_in bind_addr; -char host_name[256], boundary[80], str[80], *encoding, *p; -char old_attrib_name[MAX_N_ATTR][NAME_LENGTH], old_attrib[MAX_N_ATTR][NAME_LENGTH]; + int status, sock, i, n, header_length, content_length, index; + struct hostent *phe; + struct sockaddr_in bind_addr; + char host_name[256], boundary[80], str[80], *encoding, *p; + char old_attrib_name[MAX_N_ATTR][NAME_LENGTH], + old_attrib[MAX_N_ATTR][NAME_LENGTH]; #if defined( _MSC_VER ) - { - WSADATA WSAData; + { + WSADATA WSAData; - /* Start windows sockets */ - if ( WSAStartup(MAKEWORD(1,1), &WSAData) != 0) - return -1; - } + /* Start windows sockets */ + if (WSAStartup(MAKEWORD(1, 1), &WSAData) != 0) + return -1; + } #endif - if (edit) - { - status = retrieve_elog(host, port, subdir, experiment, passwd, uname, upwd, edit, - old_attrib_name, old_attrib, old_text); + if (edit) { + status = + retrieve_elog(host, port, subdir, experiment, passwd, uname, + upwd, edit, old_attrib_name, old_attrib, old_text); - if (status != 1) - return status; + if (status != 1) + return status; - /* update attributes */ - for (index=0 ; index " */ - text[0] = 0; - p = old_text; + /* precede old text with "> " */ + text[0] = 0; + p = old_text; - do - { - if (strchr(p, '\n')) - { - *strchr(p, '\n') = 0; + do { + if (strchr(p, '\n')) { + *strchr(p, '\n') = 0; - if (encoding[0] == 'H') - { - strlcat(text, "> ", TEXT_SIZE); - strlcat(text, p, TEXT_SIZE); - strlcat(text, "
\n", TEXT_SIZE); - } - else - { - strlcat(text, "> ", TEXT_SIZE); - strlcat(text, p, TEXT_SIZE); - strlcat(text, "\n", TEXT_SIZE); - } + if (encoding[0] == 'H') { + strlcat(text, "> ", TEXT_SIZE); + strlcat(text, p, TEXT_SIZE); + strlcat(text, "
\n", TEXT_SIZE); + } else { + strlcat(text, "> ", TEXT_SIZE); + strlcat(text, p, TEXT_SIZE); + strlcat(text, "\n", TEXT_SIZE); + } - p += strlen(p)+1; - if (*p == '\n') - p++; - } - else - { - if (encoding[0] == 'H') - { - strlcat(text, "> ", TEXT_SIZE); - strlcat(text, p, TEXT_SIZE); - strlcat(text, "

\n", TEXT_SIZE); - } - else - { - strlcat(text, "> ", TEXT_SIZE); - strlcat(text, p, TEXT_SIZE); - strlcat(text, "\n\n", TEXT_SIZE); - } + p += strlen(p) + 1; + if (*p == '\n') + p++; + } else { + if (encoding[0] == 'H') { + strlcat(text, "> ", TEXT_SIZE); + strlcat(text, p, TEXT_SIZE); + strlcat(text, "

\n", TEXT_SIZE); + } else { + strlcat(text, "> ", TEXT_SIZE); + strlcat(text, p, TEXT_SIZE); + strlcat(text, "\n\n", TEXT_SIZE); + } - break; - } + break; + } } while (1); - strlcat(text, new_text, TEXT_SIZE); - } + strlcat(text, new_text, TEXT_SIZE); + } - /* get local host name */ - gethostname(host_name, sizeof(host_name)); + /* get local host name */ + gethostname(host_name, sizeof(host_name)); - phe = gethostbyname(host_name); - if (phe == NULL) - { - perror("Cannot retrieve host name"); - return -1; - } - phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); - if (phe == NULL) - { - perror("Cannot retrieve host name"); - return -1; - } + phe = gethostbyname(host_name); + if (phe == NULL) { + perror("Cannot retrieve host name"); + return -1; + } + phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); + if (phe == NULL) { + perror("Cannot retrieve host name"); + return -1; + } - /* if domain name is not in host name, hope to get it from phe */ - if (strchr(host_name, '.') == NULL) - strcpy(host_name, phe->h_name); + /* if domain name is not in host name, hope to get it from phe */ + if (strchr(host_name, '.') == NULL) + strcpy(host_name, phe->h_name); - /* create socket */ - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - perror("cannot create socket"); - return -1; - } + /* create socket */ + if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + perror("cannot create socket"); + return -1; + } - /* compose remote address */ - memset(&bind_addr, 0, sizeof(bind_addr)); - bind_addr.sin_family = AF_INET; - bind_addr.sin_addr.s_addr = 0; - bind_addr.sin_port = htons((unsigned short)port); + /* compose remote address */ + memset(&bind_addr, 0, sizeof(bind_addr)); + bind_addr.sin_family = AF_INET; + bind_addr.sin_addr.s_addr = 0; + bind_addr.sin_port = htons((unsigned short) port); - phe = gethostbyname(host); - if (phe == NULL) - { - perror("cannot get host name"); - return -1; - } - memcpy((char *)&(bind_addr.sin_addr), phe->h_addr, phe->h_length); + phe = gethostbyname(host); + if (phe == NULL) { + perror("cannot get host name"); + return -1; + } + memcpy((char *) &(bind_addr.sin_addr), phe->h_addr, phe->h_length); - /* connect to server */ - status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); - if (status != 0) - { - printf("Cannot connect to host %s, port %d\n", host, port); - return -1; - } + /* connect to server */ + status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); + if (status != 0) { + printf("Cannot connect to host %s, port %d\n", host, port); + return -1; + } - if (verbose) - printf("Successfully connected to host %s, port %d\n", host, port); + if (verbose) + printf("Successfully connected to host %s, port %d\n", host, port); - content_length = 100000; - for (i=0 ; i 0) - { - i = recv(sock, response+n, 10000, 0); - if (i > 0) - n += i; - } - response[n] = 0; - - closesocket(sock); - - if (verbose) - { - printf("Response received:\n"); - puts(response); - } - - /* check response status */ - if (strstr(response, "302 Found")) - { - if (strstr(response, "Location:")) + /* { - if (strstr(response, "wpwd")) - printf("Error: Invalid password\n"); - else if (strstr(response, "wusr")) - printf("Error: Invalid user name\n"); - else - { - strncpy(str, strstr(response, "Location:")+10, sizeof(str)); - if (strchr(str, '?')) - *strchr(str, '?') = 0; - if (strchr(str, '\n')) - *strchr(str, '\n') = 0; - if (strchr(str, '\r')) - *strchr(str, '\r') = 0; + FILE *f; + f = fopen("elog.log", "w"); + fwrite(request, header_length+content_length, 1, f); + fclose(f); + } + */ - if (strrchr(str, '/')) - printf("Message successfully transmitted, ID=%s\n", strrchr(str, '/')+1); - else - printf("Message successfully transmitted, ID=%s\n", str); - } - } - else - printf("Message successfully transmitted\n"); - } - else if (strstr(response, "Logbook Selection")) - printf("Error: No logbook specified\n"); - else if (strstr(response, "enter password")) - printf("Error: Missing or invalid password\n"); - else if (strstr(response, "form name=form1")) - printf("Error: Missing or invalid user name/password\n"); - else if (strstr(response, "Error: Attribute")) - { - strncpy(str, strstr(response, "Error: Attribute")+20, sizeof(str)); - if (strchr(str, '<')) - *strchr(str, '<') = 0; - printf("Error: Missing required attribute \"%s\"\n", str); - } - else - printf("Error transmitting message\n"); + /* send request */ + send(sock, request, header_length, 0); + if (verbose) { + printf("Request sent to host:\n"); + puts(request); + } - return 1; + /* send content */ + send(sock, content, content_length, 0); + if (verbose) + printf("Content sent to host.\n"); + + /* receive response */ + i = recv(sock, response, 10000, 0); + if (i < 0) { + perror("Cannot receive response"); + return -1; + } + + /* discard remainder of response */ + n = i; + while (i > 0) { + i = recv(sock, response + n, 10000, 0); + if (i > 0) + n += i; + } + response[n] = 0; + + closesocket(sock); + + if (verbose) { + printf("Response received:\n"); + puts(response); + } + + /* check response status */ + if (strstr(response, "302 Found")) { + if (strstr(response, "Location:")) { + if (strstr(response, "wpwd")) + printf("Error: Invalid password\n"); + else if (strstr(response, "wusr")) + printf("Error: Invalid user name\n"); + else { + strncpy(str, strstr(response, "Location:") + 10, sizeof(str)); + if (strchr(str, '?')) + *strchr(str, '?') = 0; + if (strchr(str, '\n')) + *strchr(str, '\n') = 0; + if (strchr(str, '\r')) + *strchr(str, '\r') = 0; + + if (strrchr(str, '/')) + printf("Message successfully transmitted, ID=%s\n", + strrchr(str, '/') + 1); + else + printf("Message successfully transmitted, ID=%s\n", str); + } + } else + printf("Message successfully transmitted\n"); + } else if (strstr(response, "Logbook Selection")) + printf("Error: No logbook specified\n"); + else if (strstr(response, "enter password")) + printf("Error: Missing or invalid password\n"); + else if (strstr(response, "form name=form1")) + printf("Error: Missing or invalid user name/password\n"); + else if (strstr(response, "Error: Attribute")) { + strncpy(str, strstr(response, "Error: Attribute") + 20, sizeof(str)); + if (strchr(str, '<')) + *strchr(str, '<') = 0; + printf("Error: Missing required attribute \"%s\"\n", str); + } else + printf("Error transmitting message\n"); + + return 1; } /*------------------------------------------------------------------*/ int main(int argc, char *argv[]) { -char str[1000], uname[80], upwd[80]; -char host_name[256], logbook[32], textfile[256], password[80], subdir[256]; -char *buffer[MAX_ATTACHMENTS], attachment[MAX_ATTACHMENTS][256]; -INT att_size[MAX_ATTACHMENTS]; -INT i, n, fh, n_att, n_attr, size, port, reply, edit, suppress; -char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; + char str[1000], uname[80], upwd[80]; + char host_name[256], logbook[32], textfile[256], password[80], + subdir[256]; + char *buffer[MAX_ATTACHMENTS], attachment[MAX_ATTACHMENTS][256]; + INT att_size[MAX_ATTACHMENTS]; + INT i, n, fh, n_att, n_attr, size, port, reply, edit, suppress; + char attr_name[MAX_N_ATTR][NAME_LENGTH], + attrib[MAX_N_ATTR][NAME_LENGTH]; - text[0] = textfile[0] = uname[0] = upwd[0] = suppress = 0; - host_name[0] = logbook[0] = password[0] = subdir[0] = n_att = n_attr = reply = edit = 0; - port = 80; + text[0] = textfile[0] = uname[0] = upwd[0] = suppress = 0; + host_name[0] = logbook[0] = password[0] = subdir[0] = n_att = n_attr = + reply = edit = 0; + port = 80; - for (i=0 ; i= argc || argv[i+1][0] == '-') - goto usage; - if (argv[i][1] == 'h') - strcpy(host_name, argv[++i]); - else if (argv[i][1] == 'p') - port = atoi(argv[++i]); - else if (argv[i][1] == 'l') - strcpy(logbook, argv[++i]); - else if (argv[i][1] == 'w') - strcpy(password, argv[++i]); - else if (argv[i][1] == 's') - strcpy(subdir, argv[++i]); - else if (argv[i][1] == 'u') - { - strcpy(uname, argv[++i]); - strcpy(upwd, argv[++i]); - } - else if (argv[i][1] == 'a') - { - strcpy(str, argv[++i]); - if (strchr(str, '=')) - { - strcpy(attrib[n_attr], strchr(str, '=')+1); - *strchr(str, '=') = 0; - strcpy(attr_name[n_attr], str); - n_attr++; + /* parse command line parameters */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' && argv[i][1] == 'v') + verbose = 1; + else if (argv[i][0] == '-' && argv[i][1] == 's') + suppress = 1; + else { + if (argv[i][0] == '-') { + if (i + 1 >= argc || argv[i + 1][0] == '-') + goto usage; + if (argv[i][1] == 'h') + strcpy(host_name, argv[++i]); + else if (argv[i][1] == 'p') + port = atoi(argv[++i]); + else if (argv[i][1] == 'l') + strcpy(logbook, argv[++i]); + else if (argv[i][1] == 'w') + strcpy(password, argv[++i]); + else if (argv[i][1] == 's') + strcpy(subdir, argv[++i]); + else if (argv[i][1] == 'u') { + strcpy(uname, argv[++i]); + strcpy(upwd, argv[++i]); + } else if (argv[i][1] == 'a') { + strcpy(str, argv[++i]); + if (strchr(str, '=')) { + strcpy(attrib[n_attr], strchr(str, '=') + 1); + *strchr(str, '=') = 0; + strcpy(attr_name[n_attr], str); + n_attr++; + } else { + printf + ("Error: Attributes must be supplied in the form \"-a =\".\n"); + return 1; + } + } else if (argv[i][1] == 'f') + strcpy(attachment[n_att++], argv[++i]); + else if (argv[i][1] == 'r') + reply = atoi(argv[++i]); + else if (argv[i][1] == 'e') + edit = atoi(argv[++i]); + else if (argv[i][1] == 'm') + strcpy(textfile, argv[++i]); + else { + usage: + printf("\nusage: elog\n"); + printf(" -h [-p port] [-s subdir]\n"); + printf + (" Location where elogd is running\n"); + printf + (" -l logbook/experiment Name of logbook or experiment\n"); + printf + (" [-v] for verbose output\n"); + printf + (" [-w password] write password defined on server\n"); + printf + (" [-u username password] user name and password\n"); + printf + (" [-f ] (up to %d times)\n", + MAX_ATTACHMENTS); + printf + (" -a = (up to %d times)\n", + MAX_N_ATTR); + printf + (" [-r ] Reply to existing message\n"); + printf + (" [-e ] Edit existing message\n"); + printf + (" [-s] Suppress email notification\n"); + printf(" -m ] | \n"); + printf + ("\nArguments with blanks must be enclosed in quotes\n"); + printf + ("The elog message can either be submitted on the command line, piped in like\n"); + printf + ("\"cat text | elog -h ... -l ... -a ...\" or in a file with the -m flag.\n"); + printf + ("Multiple attributes and attachments can be supplied\n"); + return 1; } - else - { - printf("Error: Attributes must be supplied in the form \"-a =\".\n"); - return 1; - } - } - else if (argv[i][1] == 'f') - strcpy(attachment[n_att++], argv[++i]); - else if (argv[i][1] == 'r') - reply = atoi(argv[++i]); - else if (argv[i][1] == 'e') - edit = atoi(argv[++i]); - else if (argv[i][1] == 'm') - strcpy(textfile, argv[++i]); - else - { - usage: - printf("\nusage: elog\n"); - printf(" -h [-p port] [-s subdir]\n"); - printf(" Location where elogd is running\n"); - printf(" -l logbook/experiment Name of logbook or experiment\n"); - printf(" [-v] for verbose output\n"); - printf(" [-w password] write password defined on server\n"); - printf(" [-u username password] user name and password\n"); - printf(" [-f ] (up to %d times)\n", MAX_ATTACHMENTS); - printf(" -a = (up to %d times)\n", MAX_N_ATTR); - printf(" [-r ] Reply to existing message\n"); - printf(" [-e ] Edit existing message\n"); - printf(" [-s] Suppress email notification\n"); - printf(" -m ] | \n"); - printf("\nArguments with blanks must be enclosed in quotes\n"); - printf("The elog message can either be submitted on the command line, piped in like\n"); - printf("\"cat text | elog -h ... -l ... -a ...\" or in a file with the -m flag.\n"); - printf("Multiple attributes and attachments can be supplied\n"); - return 1; - } - } - else - strcpy(text, argv[i]); + } else + strcpy(text, argv[i]); } - } + } - if (host_name[0] == 0) - { - printf("Please specify hostname.\n"); - return 1; - } - - if (logbook[0] == 0) - { - printf("Please specify logbook with the \"-l\" flag.\n"); - return 1; - } - - if (n_attr == 0 && !edit && !reply) - { - printf("Please specify attribute(s) with the \"-a\" flag.\n"); - return 1; - } - - fh = -1; - - if (textfile[0]) - { - fh = open(textfile, O_RDONLY | O_BINARY); - if (fh < 0) - { - printf("Message file \"%s\" does not exist.\n", textfile); + if (host_name[0] == 0) { + printf("Please specify hostname.\n"); return 1; - } + } - size = lseek(fh, 0, SEEK_END); - lseek(fh, 0, SEEK_SET); - - if (size > sizeof(text)-1) - { - printf("Message file \"%s\" is too long (%d bytes max).\n", textfile, sizeof(text)); + if (logbook[0] == 0) { + printf("Please specify logbook with the \"-l\" flag.\n"); return 1; - } + } - i = read(fh, text, size); - - if (i < size) - { - printf("Cannot fully read message from file %s.\n", textfile); + if (n_attr == 0 && !edit && !reply) { + printf("Please specify attribute(s) with the \"-a\" flag.\n"); return 1; + } + + fh = -1; + + if (textfile[0]) { + fh = open(textfile, O_RDONLY | O_BINARY); + if (fh < 0) { + printf("Message file \"%s\" does not exist.\n", textfile); + return 1; } - close(fh); - } + size = lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_SET); - if (text[0] == 0 && textfile[0] == 0 && !edit) - { - /* read from stdin */ + if (size > sizeof(text) - 1) { + printf("Message file \"%s\" is too long (%d bytes max).\n", + textfile, sizeof(text)); + return 1; + } - n = 0; + i = read(fh, text, size); - do - { - i = getchar(); + if (i < size) { + printf("Cannot fully read message from file %s.\n", textfile); + return 1; + } - text[n++] = i; + close(fh); + } + + if (text[0] == 0 && textfile[0] == 0 && !edit) { + /* read from stdin */ + + n = 0; + + do { + i = getchar(); + + text[n++] = i; } while (i != EOF); - if (n>0) - text[n-1] = 0; - } + if (n > 0) + text[n - 1] = 0; + } /*---- open attachment file ----*/ - for (i = 0 ; i - #include - #include - #include - #include +#include +#include +#include +#include +#include #else - #define OS_UNIX +#define OS_UNIX - #define TRUE 1 - #define FALSE 0 +#define TRUE 1 +#define FALSE 0 - #define DIR_SEPARATOR '/' - #define DIR_SEPARATOR_STR "/" +#define DIR_SEPARATOR '/' +#define DIR_SEPARATOR_STR "/" - #ifndef DEFAULT_USER - #define DEFAULT_USER "nobody" - #endif - - #ifndef DEFAULT_GROUP - #define DEFAULT_GROUP "nogroup" - #endif - - #ifndef PIDFILE - #define PIDFILE "/var/run/elogd.pid" - #endif - - #define __USE_XOPEN /* needed for crypt() */ - - typedef int BOOL; - - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - - #define closesocket(s) close(s) - #ifndef O_BINARY - #define O_BINARY 0 - #endif - - #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 */ +#ifndef DEFAULT_USER +#define DEFAULT_USER "nobody" #endif -char pidfile[256]; /* Pidfile name */ +#ifndef DEFAULT_GROUP +#define DEFAULT_GROUP "nogroup" +#endif + +#ifndef PIDFILE +#define PIDFILE "/var/run/elogd.pid" +#endif + +#define __USE_XOPEN /* needed for crypt() */ + +typedef int BOOL; + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define closesocket(s) close(s) +#ifndef O_BINARY +#define O_BINARY 0 +#endif + +#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 */ +#endif + +char pidfile[256]; /* Pidfile name */ typedef int INT; @@ -206,11 +209,11 @@ typedef int INT; #define EL_PREV 4 char *return_buffer; -int return_buffer_size; -int strlen_retbuf; -int keep_alive; +int return_buffer_size; +int strlen_retbuf; +int keep_alive; char header_buffer[1000]; -int return_length; +int return_length; char host_name[256]; char referer[256]; char browser[256]; @@ -218,7 +221,7 @@ char config_file[256]; char resource_dir[256]; char logbook_dir[256]; char tcp_hostname[256]; -int tcp_port = 80; +int tcp_port = 80; char theme_name[80]; #define MAX_GROUPS 32 @@ -236,41 +239,41 @@ char _value[MAX_PARAM][NAME_LENGTH]; char _mtext[TEXT_SIZE]; char _cmdline[CMD_SIZE]; char *_attachment_buffer; -INT _attachment_size; +INT _attachment_size; struct in_addr rem_addr; char rem_host[256]; -INT _sock; +INT _sock; BOOL verbose, use_keepalive, enable_execute = FALSE; -INT _current_message_id; -INT _logging_level; +INT _current_message_id; +INT _logging_level; char *mname[] = { - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December" + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December" }; char type_list[MAX_N_LIST][NAME_LENGTH] = { - "Routine", - "Other" + "Routine", + "Other" }; char category_list[MAX_N_LIST][NAME_LENGTH] = { - "General", - "Other", + "General", + "Other", }; char author_list[MAX_N_LIST][NAME_LENGTH] = { - "" + "" }; /* attribute flags */ @@ -290,124 +293,126 @@ char author_list[MAX_N_LIST][NAME_LENGTH] = { char attr_list[MAX_N_ATTR][NAME_LENGTH]; char attr_options[MAX_N_ATTR][MAX_N_LIST][NAME_LENGTH]; -int attr_flags[MAX_N_ATTR]; +int attr_flags[MAX_N_ATTR]; char attr_list_default[][NAME_LENGTH] = { - "Author", - "Type", - "Category", - "Subject", - "" + "Author", + "Type", + "Category", + "Subject", + "" }; char attr_options_default[][MAX_N_LIST][NAME_LENGTH] = { - { "" }, - { "Routine", "Other" }, - { "General", "Other" }, - { "" } + {""}, + {"Routine", "Other"}, + {"General", "Other"}, + {""} }; int attr_flags_default[] = { - AF_REQUIRED, - 0, - 0, - 0 + AF_REQUIRED, + 0, + 0, + 0 }; struct { - char ext[32]; - char type[32]; - } filetype[] = { + char ext[32]; + char type[32]; +} filetype[] = { - { ".CSS", "text/css" }, - { ".JPG", "image/jpeg" }, - { ".JPEG", "image/jpeg" }, - { ".GIF", "image/gif" }, - { ".PNG", "image/png" }, - { ".PS", "application/postscript" }, - { ".EPS", "application/postscript" }, - { ".HTML", "text/html" }, - { ".HTM", "text/html" }, - { ".XLS", "application/x-msexcel" }, - { ".DOC", "application/msword" }, - { ".PDF", "application/pdf" }, - { ".TXT", "text/plain" }, - { ".ASC", "text/plain" }, - { ".ZIP", "application/x-zip-compressed" }, - { "" }, -}; + { + ".CSS", "text/css"}, { + ".JPG", "image/jpeg"}, { + ".JPEG", "image/jpeg"}, { + ".GIF", "image/gif"}, { + ".PNG", "image/png"}, { + ".PS", "application/postscript"}, { + ".EPS", "application/postscript"}, { + ".HTML", "text/html"}, { + ".HTM", "text/html"}, { + ".XLS", "application/x-msexcel"}, { + ".DOC", "application/msword"}, { + ".PDF", "application/pdf"}, { + ".TXT", "text/plain"}, { + ".ASC", "text/plain"}, { + ".ZIP", "application/x-zip-compressed"}, { +""},}; typedef struct { - int message_id; - char file_name[32]; - time_t file_time; - int offset; - int in_reply_to; - unsigned char md5_digest[16]; + int message_id; + char file_name[32]; + time_t file_time; + int offset; + int in_reply_to; + unsigned char md5_digest[16]; } EL_INDEX; typedef struct { - char name[256]; - char name_enc[256]; - char data_dir[256]; - EL_INDEX *el_index; - int *n_el_index; - int n_attr; + char name[256]; + char name_enc[256]; + char data_dir[256]; + EL_INDEX *el_index; + int *n_el_index; + int n_attr; } LOGBOOK; typedef struct { - int message_id; - unsigned char md5_digest[16]; + int message_id; + unsigned char md5_digest[16]; } MD5_INDEX; typedef struct LBNODE *LBLIST; -struct LBNODE { - char name[256]; - LBLIST member; - int n_members; - int subgroup; +struct LBNODE { + char name[256]; + LBLIST member; + int n_members; + int subgroup; } LBNODE; typedef struct { - LOGBOOK *lbs; - int index; - char string[256]; - int in_reply_to; + LOGBOOK *lbs; + int index; + char string[256]; + int in_reply_to; } MSG_LIST; LOGBOOK *lb_list = NULL; void show_error(char *error); -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); +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); -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 logf(LOGBOOK *lbs, const char *format, ...); -BOOL check_login_user(LOGBOOK *lbs, char *user); +void logf(LOGBOOK * lbs, const char *format, ...); +BOOL check_login_user(LOGBOOK * lbs, char *user); /*---- Funcions from the MIDAS library -----------------------------*/ BOOL equal_ustring(char *str1, char *str2) { - if (str1 == NULL && str2 != NULL) - return FALSE; - if (str1 != NULL && str2 == NULL) - return FALSE; - if (str1 == NULL && str2 == NULL) - return TRUE; + if (str1 == NULL && str2 != NULL) + return FALSE; + if (str1 != NULL && str2 == NULL) + return FALSE; + if (str1 == NULL && str2 == NULL) + return TRUE; - while (*str1) - if (toupper(*str1++) != toupper(*str2++)) + while (*str1) + if (toupper(*str1++) != toupper(*str2++)) + return FALSE; + + if (*str2) return FALSE; - if (*str2) - return FALSE; - - return TRUE; + return TRUE; } /*---- strlcpy and strlcat to avoid buffer overflow ----------------*/ @@ -419,29 +424,26 @@ BOOL equal_ustring(char *str1, char *str2) */ size_t strlcpy(char *dst, const char *src, size_t size) { -char *d = dst; -const char *s = src; -size_t n = size; + char *d = dst; + const char *s = src; + size_t n = size; - /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) - { - do - { - if ((*d++ = *s++) == 0) - break; + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; } while (--n != 0); - } + } - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) - { - if (size != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++); - } + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (size != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++); + } - return (s - src - 1); /* count does not include NUL */ + return (s - src - 1); /* count does not include NUL */ } /* @@ -453,84 +455,80 @@ size_t n = size; */ size_t strlcat(char *dst, const char *src, size_t size) { -char *d = dst; -const char *s = src; -size_t n = size; -size_t dlen; + char *d = dst; + const char *s = src; + size_t n = size; + size_t dlen; - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = size - dlen; + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = size - dlen; - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; + if (n == 0) + return (dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; - return(dlen + (s - src)); /* count does not include NUL */ + return (dlen + (s - src)); /* count does not include NUL */ } /*-------------------------------------------------------------------*/ -void strsubst(char *string, char name[][NAME_LENGTH], char value[][NAME_LENGTH], int n) +void strsubst(char *string, char name[][NAME_LENGTH], + char value[][NAME_LENGTH], int n) /* subsitute "$name" with value corresponding to name */ { -int i, j; -char tmp[1000], str[NAME_LENGTH], uattr[NAME_LENGTH], *ps, *pt, *p; + int i, j; + char tmp[1000], str[NAME_LENGTH], uattr[NAME_LENGTH], *ps, *pt, *p; - pt = tmp; - ps = string; - for (p = strchr(ps, '$') ; p != NULL ; p = strchr(ps, '$')) - { - /* copy leading characters */ - j = (int)(p-ps); - memcpy(pt, ps, j); - pt += j; - p++; + pt = tmp; + ps = string; + for (p = strchr(ps, '$'); p != NULL; p = strchr(ps, '$')) { + /* copy leading characters */ + j = (int) (p - ps); + memcpy(pt, ps, j); + pt += j; + p++; - /* extract name */ - strlcpy(str, p, sizeof(str)); - for (j=0 ; j<(int)strlen(str) ; j++) - str[j] = toupper(str[j]); + /* extract name */ + strlcpy(str, p, sizeof(str)); + for (j = 0; j < (int) strlen(str); j++) + str[j] = toupper(str[j]); - /* search name */ - for (i=0 ; i 127) - { - sprintf(pd, "%%%02X", *p); - pd += 3; - p++; + pd = str; + p = ps; + while (*p && (int) pd < (int) str + 250) { + if (strchr(" %&=#?+", *p) || *p > 127) { + sprintf(pd, "%%%02X", *p); + pd += 3; + p++; + } else { + *pd++ = *p++; } - else - { - *pd++ = *p++; - } - } + } *pd = '\0'; strlcpy(ps, str, size); } /*-------------------------------------------------------------------*/ -char *map= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +char *map = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int cind(char c) { -int i; + int i; - if (c == '=') - return 0; + if (c == '=') + return 0; - for (i=0 ; i<64 ; i++) - if (map[i] == c) - return i; + for (i = 0; i < 64; i++) + if (map[i] == c) + return i; - return -1; + return -1; } void base64_decode(char *s, char *d) { -unsigned int t; + unsigned int t; - while (*s) - { - t = (cind(*s++) << 18) | - (cind(*s++) << 12) | - (cind(*s++) << 6) | - (cind(*s++) << 0); + while (*s) { + t = (cind(*s++) << 18) | + (cind(*s++) << 12) | (cind(*s++) << 6) | (cind(*s++) << 0); - *(d+2) = (char) (t & 0xFF); - t >>= 8; - *(d+1) = (char) (t & 0xFF); - t >>= 8; - *d = (char) (t & 0xFF); + *(d + 2) = (char) (t & 0xFF); + t >>= 8; + *(d + 1) = (char) (t & 0xFF); + t >>= 8; + *d = (char) (t & 0xFF); - d += 3; - } - *d = 0; + d += 3; + } + *d = 0; } void base64_encode(char *s, char *d) { -unsigned int t, pad; + unsigned int t, pad; - pad = 3 - strlen(s) % 3; - if (pad == 3) - pad = 0; - while (*s) - { - t = (*s++) << 16; - if (*s) - t |= (*s++) << 8; - if (*s) - t |= (*s++) << 0; + pad = 3 - strlen(s) % 3; + if (pad == 3) + pad = 0; + while (*s) { + t = (*s++) << 16; + if (*s) + t |= (*s++) << 8; + if (*s) + t |= (*s++) << 0; - *(d+3) = map[t & 63]; - t >>= 6; - *(d+2) = map[t & 63]; - t >>= 6; - *(d+1) = map[t & 63]; - t >>= 6; - *(d+0) = map[t & 63]; + *(d + 3) = map[t & 63]; + t >>= 6; + *(d + 2) = map[t & 63]; + t >>= 6; + *(d + 1) = map[t & 63]; + t >>= 6; + *(d + 0) = map[t & 63]; - d += 4; - } - *d = 0; - while (pad--) - *(--d) = '='; + d += 4; + } + *d = 0; + while (pad--) + *(--d) = '='; } void base64_bufenc(unsigned char *s, int len, char *d) { -unsigned int t, pad; -int i; + unsigned int t, pad; + int i; - pad = 3 - len % 3; - if (pad == 3) - pad = 0; - for (i=0 ; i>= 6; - *(d+2) = map[t & 63]; - t >>= 6; - *(d+1) = map[t & 63]; - t >>= 6; - *(d+0) = map[t & 63]; + *(d + 3) = map[t & 63]; + t >>= 6; + *(d + 2) = map[t & 63]; + t >>= 6; + *(d + 1) = map[t & 63]; + t >>= 6; + *(d + 0) = map[t & 63]; - d += 4; - } - *d = 0; - while (pad--) - *(--d) = '='; + d += 4; + } + *d = 0; + while (pad--) + *(--d) = '='; } void do_crypt(char *s, char *d) { #ifdef HAVE_CRYPT - strcpy(d, crypt(s, "el")); + strcpy(d, crypt(s, "el")); #else - base64_encode(s, d); + base64_encode(s, d); #endif } @@ -719,18 +701,16 @@ void do_crypt(char *s, char *d) \*------------------------------------------------------------------*/ -typedef struct -{ - unsigned int state[4]; // state (ABCD) - unsigned int count[2]; // number of bits, modulo 2^64 (lsb first) - unsigned char buffer[64]; // input buffer -} -MD5_CONTEXT; +typedef struct { + unsigned int state[4]; // state (ABCD) + unsigned int count[2]; // number of bits, modulo 2^64 (lsb first) + unsigned char buffer[64]; // input buffer +} MD5_CONTEXT; /*------------------------------------------------------------------*/ /* prototypes of the support routines */ -void _MD5_update(MD5_CONTEXT *, const void *, unsigned int) ; +void _MD5_update(MD5_CONTEXT *, const void *, unsigned int); void _MD5_transform(unsigned int[4], unsigned char[64]); void _MD5_encode(unsigned char *, unsigned int *, unsigned int); void _MD5_decode(unsigned int *, unsigned char *, unsigned int); @@ -771,203 +751,202 @@ void _MD5_decode(unsigned int *, unsigned char *, unsigned int); /* main MD5 checksum routine, returns digest from pdata buffer */ -void MD5_checksum(const void *pdata, unsigned int len, unsigned char digest[16]) +void MD5_checksum(const void *pdata, unsigned int len, + unsigned char digest[16]) { -MD5_CONTEXT ctx; -unsigned char bits[8]; -unsigned int i, padlen; + MD5_CONTEXT ctx; + unsigned char bits[8]; + unsigned int i, padlen; /* to allow multithreading we have to locate the padding memory here */ -unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; + unsigned char PADDING[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; - memset(&ctx, 0, sizeof(MD5_CONTEXT)); - ctx.count[0] = ctx.count[1] = 0; + memset(&ctx, 0, sizeof(MD5_CONTEXT)); + ctx.count[0] = ctx.count[1] = 0; - /* load magic initialization constants */ - ctx.state[0] = 0x67452301; - ctx.state[1] = 0xefcdab89; - ctx.state[2] = 0x98badcfe; - ctx.state[3] = 0x10325476; + /* load magic initialization constants */ + ctx.state[0] = 0x67452301; + ctx.state[1] = 0xefcdab89; + ctx.state[2] = 0x98badcfe; + ctx.state[3] = 0x10325476; - _MD5_update(&ctx, pdata, len); + _MD5_update(&ctx, pdata, len); - // save number of bits - _MD5_encode(bits, ctx.count, 8); + // save number of bits + _MD5_encode(bits, ctx.count, 8); - // pad out to 56 mod 64 - i = (unsigned int)((ctx.count[0] >> 3) & 0x3f); - padlen = (i < 56) ? (56 - i) : (120 - i); - _MD5_update(&ctx, PADDING, padlen); - - // append length (before padding) - _MD5_update(&ctx, bits, 8); + // pad out to 56 mod 64 + i = (unsigned int) ((ctx.count[0] >> 3) & 0x3f); + padlen = (i < 56) ? (56 - i) : (120 - i); + _MD5_update(&ctx, PADDING, padlen); - // store state in digest - _MD5_encode(digest, ctx.state, 16); + // append length (before padding) + _MD5_update(&ctx, bits, 8); + + // store state in digest + _MD5_encode(digest, ctx.state, 16); } /*------------------------------------------------------------------*/ -void _MD5_update(MD5_CONTEXT *pctx, const void *pdata, unsigned int len) +void _MD5_update(MD5_CONTEXT * pctx, const void *pdata, unsigned int len) { -unsigned char *pin; -unsigned int i, index, partlen; + unsigned char *pin; + unsigned int i, index, partlen; - pin = (unsigned char *)pdata; + pin = (unsigned char *) pdata; - // compute number of bytes mod 64 - index = (unsigned int)((pctx->count[0] >> 3) & 0x3F); + // compute number of bytes mod 64 + index = (unsigned int) ((pctx->count[0] >> 3) & 0x3F); - // update number of bits - if ((pctx->count[0] += ((unsigned int)len << 3)) < ((unsigned int)len << 3)) - pctx->count[1]++; - pctx->count[1] += ((unsigned int)len >> 29); - - partlen = 64 - index; - - // transform as many times as possible. - if (len >= partlen) - { - memcpy(&pctx->buffer[index], pin, partlen); - _MD5_transform(pctx->state, pctx->buffer); + // update number of bits + if ((pctx->count[0] += + ((unsigned int) len << 3)) < ((unsigned int) len << 3)) + pctx->count[1]++; + pctx->count[1] += ((unsigned int) len >> 29); - for (i = partlen; i + 63 < len; i += 64) - _MD5_transform(pctx->state, &pin[i]); + partlen = 64 - index; - index = 0; - } - else - i = 0; - - /* buffer remaining input */ - memcpy(&pctx->buffer[index], &pin[i], len - i); + // transform as many times as possible. + if (len >= partlen) { + memcpy(&pctx->buffer[index], pin, partlen); + _MD5_transform(pctx->state, pctx->buffer); + + for (i = partlen; i + 63 < len; i += 64) + _MD5_transform(pctx->state, &pin[i]); + + index = 0; + } else + i = 0; + + /* buffer remaining input */ + memcpy(&pctx->buffer[index], &pin[i], len - i); } /*------------------------------------------------------------------*/ /* basic transformation, transforms state based on block */ -void _MD5_transform(unsigned int state[4], unsigned char block[64]) +void _MD5_transform(unsigned int state[4], unsigned char block[64]) { -unsigned int lA = state[0], lB = state[1], lC = state[2], lD = state[3]; -unsigned int x[16]; - - _MD5_decode(x, block, 64); + unsigned int lA = state[0], lB = state[1], lC = state[2], lD = state[3]; + unsigned int x[16]; - /* round 1 */ - FF ( lA, lB, lC, lD, x[ 0], 7, 0xd76aa478); // 1 - FF ( lD, lA, lB, lC, x[ 1], 12, 0xe8c7b756); // 2 - FF ( lC, lD, lA, lB, x[ 2], 17, 0x242070db); // 3 - FF ( lB, lC, lD, lA, x[ 3], 22, 0xc1bdceee); // 4 - FF ( lA, lB, lC, lD, x[ 4], 7, 0xf57c0faf); // 5 - FF ( lD, lA, lB, lC, x[ 5], 12, 0x4787c62a); // 6 - FF ( lC, lD, lA, lB, x[ 6], 17, 0xa8304613); // 7 - FF ( lB, lC, lD, lA, x[ 7], 22, 0xfd469501); // 8 - FF ( lA, lB, lC, lD, x[ 8], 7, 0x698098d8); // 9 - FF ( lD, lA, lB, lC, x[ 9], 12, 0x8b44f7af); // 10 - FF ( lC, lD, lA, lB, x[10], 17, 0xffff5bb1); // 11 - FF ( lB, lC, lD, lA, x[11], 22, 0x895cd7be); // 12 - FF ( lA, lB, lC, lD, x[12], 7, 0x6b901122); // 13 - FF ( lD, lA, lB, lC, x[13], 12, 0xfd987193); // 14 - FF ( lC, lD, lA, lB, x[14], 17, 0xa679438e); // 15 - FF ( lB, lC, lD, lA, x[15], 22, 0x49b40821); // 16 + _MD5_decode(x, block, 64); - /* round 2 */ - GG ( lA, lB, lC, lD, x[ 1], 5, 0xf61e2562); // 17 - GG ( lD, lA, lB, lC, x[ 6], 9, 0xc040b340); // 18 - GG ( lC, lD, lA, lB, x[11], 14, 0x265e5a51); // 19 - GG ( lB, lC, lD, lA, x[ 0], 20, 0xe9b6c7aa); // 20 - GG ( lA, lB, lC, lD, x[ 5], 5, 0xd62f105d); // 21 - GG ( lD, lA, lB, lC, x[10], 9, 0x2441453); // 22 - GG ( lC, lD, lA, lB, x[15], 14, 0xd8a1e681); // 23 - GG ( lB, lC, lD, lA, x[ 4], 20, 0xe7d3fbc8); // 24 - GG ( lA, lB, lC, lD, x[ 9], 5, 0x21e1cde6); // 25 - GG ( lD, lA, lB, lC, x[14], 9, 0xc33707d6); // 26 - GG ( lC, lD, lA, lB, x[ 3], 14, 0xf4d50d87); // 27 - GG ( lB, lC, lD, lA, x[ 8], 20, 0x455a14ed); // 28 - GG ( lA, lB, lC, lD, x[13], 5, 0xa9e3e905); // 29 - GG ( lD, lA, lB, lC, x[ 2], 9, 0xfcefa3f8); // 30 - GG ( lC, lD, lA, lB, x[ 7], 14, 0x676f02d9); // 31 - GG ( lB, lC, lD, lA, x[12], 20, 0x8d2a4c8a); // 32 + /* round 1 */ + FF(lA, lB, lC, lD, x[0], 7, 0xd76aa478); // 1 + FF(lD, lA, lB, lC, x[1], 12, 0xe8c7b756); // 2 + FF(lC, lD, lA, lB, x[2], 17, 0x242070db); // 3 + FF(lB, lC, lD, lA, x[3], 22, 0xc1bdceee); // 4 + FF(lA, lB, lC, lD, x[4], 7, 0xf57c0faf); // 5 + FF(lD, lA, lB, lC, x[5], 12, 0x4787c62a); // 6 + FF(lC, lD, lA, lB, x[6], 17, 0xa8304613); // 7 + FF(lB, lC, lD, lA, x[7], 22, 0xfd469501); // 8 + FF(lA, lB, lC, lD, x[8], 7, 0x698098d8); // 9 + FF(lD, lA, lB, lC, x[9], 12, 0x8b44f7af); // 10 + FF(lC, lD, lA, lB, x[10], 17, 0xffff5bb1); // 11 + FF(lB, lC, lD, lA, x[11], 22, 0x895cd7be); // 12 + FF(lA, lB, lC, lD, x[12], 7, 0x6b901122); // 13 + FF(lD, lA, lB, lC, x[13], 12, 0xfd987193); // 14 + FF(lC, lD, lA, lB, x[14], 17, 0xa679438e); // 15 + FF(lB, lC, lD, lA, x[15], 22, 0x49b40821); // 16 - /* round 3 */ - HH ( lA, lB, lC, lD, x[ 5], 4, 0xfffa3942); // 33 - HH ( lD, lA, lB, lC, x[ 8], 11, 0x8771f681); // 34 - HH ( lC, lD, lA, lB, x[11], 16, 0x6d9d6122); // 35 - HH ( lB, lC, lD, lA, x[14], 23, 0xfde5380c); // 36 - HH ( lA, lB, lC, lD, x[ 1], 4, 0xa4beea44); // 37 - HH ( lD, lA, lB, lC, x[ 4], 11, 0x4bdecfa9); // 38 - HH ( lC, lD, lA, lB, x[ 7], 16, 0xf6bb4b60); // 39 - HH ( lB, lC, lD, lA, x[10], 23, 0xbebfbc70); // 40 - HH ( lA, lB, lC, lD, x[13], 4, 0x289b7ec6); // 41 - HH ( lD, lA, lB, lC, x[ 0], 11, 0xeaa127fa); // 42 - HH ( lC, lD, lA, lB, x[ 3], 16, 0xd4ef3085); // 43 - HH ( lB, lC, lD, lA, x[ 6], 23, 0x4881d05); // 44 - HH ( lA, lB, lC, lD, x[ 9], 4, 0xd9d4d039); // 45 - HH ( lD, lA, lB, lC, x[12], 11, 0xe6db99e5); // 46 - HH ( lC, lD, lA, lB, x[15], 16, 0x1fa27cf8); // 47 - HH ( lB, lC, lD, lA, x[ 2], 23, 0xc4ac5665); // 48 + /* round 2 */ + GG(lA, lB, lC, lD, x[1], 5, 0xf61e2562); // 17 + GG(lD, lA, lB, lC, x[6], 9, 0xc040b340); // 18 + GG(lC, lD, lA, lB, x[11], 14, 0x265e5a51); // 19 + GG(lB, lC, lD, lA, x[0], 20, 0xe9b6c7aa); // 20 + GG(lA, lB, lC, lD, x[5], 5, 0xd62f105d); // 21 + GG(lD, lA, lB, lC, x[10], 9, 0x2441453); // 22 + GG(lC, lD, lA, lB, x[15], 14, 0xd8a1e681); // 23 + GG(lB, lC, lD, lA, x[4], 20, 0xe7d3fbc8); // 24 + GG(lA, lB, lC, lD, x[9], 5, 0x21e1cde6); // 25 + GG(lD, lA, lB, lC, x[14], 9, 0xc33707d6); // 26 + GG(lC, lD, lA, lB, x[3], 14, 0xf4d50d87); // 27 + GG(lB, lC, lD, lA, x[8], 20, 0x455a14ed); // 28 + GG(lA, lB, lC, lD, x[13], 5, 0xa9e3e905); // 29 + GG(lD, lA, lB, lC, x[2], 9, 0xfcefa3f8); // 30 + GG(lC, lD, lA, lB, x[7], 14, 0x676f02d9); // 31 + GG(lB, lC, lD, lA, x[12], 20, 0x8d2a4c8a); // 32 - /* round 4 */ - II ( lA, lB, lC, lD, x[ 0], 6, 0xf4292244); // 49 - II ( lD, lA, lB, lC, x[ 7], 10, 0x432aff97); // 50 - II ( lC, lD, lA, lB, x[14], 15, 0xab9423a7); // 51 - II ( lB, lC, lD, lA, x[ 5], 21, 0xfc93a039); // 52 - II ( lA, lB, lC, lD, x[12], 6, 0x655b59c3); // 53 - II ( lD, lA, lB, lC, x[ 3], 10, 0x8f0ccc92); // 54 - II ( lC, lD, lA, lB, x[10], 15, 0xffeff47d); // 55 - II ( lB, lC, lD, lA, x[ 1], 21, 0x85845dd1); // 56 - II ( lA, lB, lC, lD, x[ 8], 6, 0x6fa87e4f); // 57 - II ( lD, lA, lB, lC, x[15], 10, 0xfe2ce6e0); // 58 - II ( lC, lD, lA, lB, x[ 6], 15, 0xa3014314); // 59 - II ( lB, lC, lD, lA, x[13], 21, 0x4e0811a1); // 60 - II ( lA, lB, lC, lD, x[ 4], 6, 0xf7537e82); // 61 - II ( lD, lA, lB, lC, x[11], 10, 0xbd3af235); // 62 - II ( lC, lD, lA, lB, x[ 2], 15, 0x2ad7d2bb); // 63 - II ( lB, lC, lD, lA, x[ 9], 21, 0xeb86d391); // 64 + /* round 3 */ + HH(lA, lB, lC, lD, x[5], 4, 0xfffa3942); // 33 + HH(lD, lA, lB, lC, x[8], 11, 0x8771f681); // 34 + HH(lC, lD, lA, lB, x[11], 16, 0x6d9d6122); // 35 + HH(lB, lC, lD, lA, x[14], 23, 0xfde5380c); // 36 + HH(lA, lB, lC, lD, x[1], 4, 0xa4beea44); // 37 + HH(lD, lA, lB, lC, x[4], 11, 0x4bdecfa9); // 38 + HH(lC, lD, lA, lB, x[7], 16, 0xf6bb4b60); // 39 + HH(lB, lC, lD, lA, x[10], 23, 0xbebfbc70); // 40 + HH(lA, lB, lC, lD, x[13], 4, 0x289b7ec6); // 41 + HH(lD, lA, lB, lC, x[0], 11, 0xeaa127fa); // 42 + HH(lC, lD, lA, lB, x[3], 16, 0xd4ef3085); // 43 + HH(lB, lC, lD, lA, x[6], 23, 0x4881d05); // 44 + HH(lA, lB, lC, lD, x[9], 4, 0xd9d4d039); // 45 + HH(lD, lA, lB, lC, x[12], 11, 0xe6db99e5); // 46 + HH(lC, lD, lA, lB, x[15], 16, 0x1fa27cf8); // 47 + HH(lB, lC, lD, lA, x[2], 23, 0xc4ac5665); // 48 - state[0] += lA; - state[1] += lB; - state[2] += lC; - state[3] += lD; - - /* lClear sensitive information */ - memset(x, 0, sizeof(x)); + /* round 4 */ + II(lA, lB, lC, lD, x[0], 6, 0xf4292244); // 49 + II(lD, lA, lB, lC, x[7], 10, 0x432aff97); // 50 + II(lC, lD, lA, lB, x[14], 15, 0xab9423a7); // 51 + II(lB, lC, lD, lA, x[5], 21, 0xfc93a039); // 52 + II(lA, lB, lC, lD, x[12], 6, 0x655b59c3); // 53 + II(lD, lA, lB, lC, x[3], 10, 0x8f0ccc92); // 54 + II(lC, lD, lA, lB, x[10], 15, 0xffeff47d); // 55 + II(lB, lC, lD, lA, x[1], 21, 0x85845dd1); // 56 + II(lA, lB, lC, lD, x[8], 6, 0x6fa87e4f); // 57 + II(lD, lA, lB, lC, x[15], 10, 0xfe2ce6e0); // 58 + II(lC, lD, lA, lB, x[6], 15, 0xa3014314); // 59 + II(lB, lC, lD, lA, x[13], 21, 0x4e0811a1); // 60 + II(lA, lB, lC, lD, x[4], 6, 0xf7537e82); // 61 + II(lD, lA, lB, lC, x[11], 10, 0xbd3af235); // 62 + II(lC, lD, lA, lB, x[2], 15, 0x2ad7d2bb); // 63 + II(lB, lC, lD, lA, x[9], 21, 0xeb86d391); // 64 + + state[0] += lA; + state[1] += lB; + state[2] += lC; + state[3] += lD; + + /* lClear sensitive information */ + memset(x, 0, sizeof(x)); } /*------------------------------------------------------------------*/ /* encodes input (unsigned int) into output (unsigned char), assumes that lLen is a multiple of 4 */ -void _MD5_encode(unsigned char *pout, unsigned int *pin, unsigned int len) +void _MD5_encode(unsigned char *pout, unsigned int *pin, unsigned int len) { -unsigned int i, j; + unsigned int i, j; - for (i=0,j=0; j> 8) & 0x0ff); - pout[j + 2] = (unsigned char)((pin[i] >> 16) & 0x0ff); - pout[j + 3] = (unsigned char)((pin[i] >> 24) & 0x0ff); - } + for (i = 0, j = 0; j < len; i++, j += 4) { + pout[j] = (unsigned char) (pin[i] & 0x0ff); + pout[j + 1] = (unsigned char) ((pin[i] >> 8) & 0x0ff); + pout[j + 2] = (unsigned char) ((pin[i] >> 16) & 0x0ff); + pout[j + 3] = (unsigned char) ((pin[i] >> 24) & 0x0ff); + } } /*------------------------------------------------------------------*/ /* encodes input (unsigned char) into output (unsigned int), assumes that lLen is a multiple of 4 */ -void _MD5_decode(unsigned int *pout, unsigned char *pin, unsigned int len) +void _MD5_decode(unsigned int *pout, unsigned char *pin, unsigned int len) { -unsigned int i, j; + unsigned int i, j; - for (i=0,j=0; jgr_gid) >= 0 && initgroups(gr->gr_name, gr->gr_gid) >= 0) - return 0; - else - { - printf("Cannot set effective GID to group \"%s\"\n", gr->gr_name); - perror("setgroup"); - } - else - printf("Group \"%s\" not found\n", str); + if (gr != NULL) + if (setegid(gr->gr_gid) >= 0 + && initgroups(gr->gr_name, gr->gr_gid) >= 0) + return 0; + else { + printf("Cannot set effective GID to group \"%s\"\n", gr->gr_name); + perror("setgroup"); + } else + printf("Group \"%s\" not found\n", str); - return -1; + return -1; #else - return 0; + return 0; #endif } @@ -1001,24 +979,22 @@ struct group *gr; int setuser(char *str) { #ifdef OS_UNIX -struct passwd *pw; + struct passwd *pw; - pw = getpwnam(str); + pw = getpwnam(str); - if (pw != NULL) - if (seteuid(pw->pw_uid) >= 0) - return 0; - else - { - printf("Cannot set effective UID to user \"%s\"\n", str); - perror("setuser"); - } - else - printf("User \"%s\" not found\n", str); + if (pw != NULL) + if (seteuid(pw->pw_uid) >= 0) + return 0; + else { + printf("Cannot set effective UID to user \"%s\"\n", str); + perror("setuser"); + } else + printf("User \"%s\" not found\n", str); - return -1; + return -1; #else - return 0; + return 0; #endif } @@ -1026,426 +1002,459 @@ struct passwd *pw; INT recv_string(int sock, char *buffer, INT buffer_size, INT millisec) { -INT i, n; -fd_set readfds; -struct timeval timeout; + INT i, n; + fd_set readfds; + struct timeval timeout; - n = 0; - memset(buffer, 0, buffer_size); + n = 0; + memset(buffer, 0, buffer_size); - do - { - if (millisec > 0) - { - FD_ZERO(&readfds); - FD_SET(sock, &readfds); + do { + if (millisec > 0) { + FD_ZERO(&readfds); + FD_SET(sock, &readfds); - timeout.tv_sec = millisec / 1000; - timeout.tv_usec = (millisec % 1000) * 1000; + timeout.tv_sec = millisec / 1000; + timeout.tv_usec = (millisec % 1000) * 1000; - select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); + select(FD_SETSIZE, (void *) &readfds, NULL, NULL, + (void *) &timeout); - if (!FD_ISSET(sock, &readfds)) - break; + if (!FD_ISSET(sock, &readfds)) + break; } - i = recv(sock, buffer+n, 1, 0); + i = recv(sock, buffer + n, 1, 0); - if (i<=0) - break; + if (i <= 0) + break; - n++; + n++; - if (n >= buffer_size) - break; + if (n >= buffer_size) + break; - } while (buffer[n-1] && buffer[n-1] != 10); + } while (buffer[n - 1] && buffer[n - 1] != 10); - return n-1; + return n - 1; } /*-------------------------------------------------------------------*/ -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]) +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]) { -struct sockaddr_in bind_addr; -struct hostent *phe; -int i, n, s, offset, strsize, n_att, index, fh; -char buf[80]; -char *str, *p, boundary[256], file_name[MAX_PATH_LENGTH]; -time_t now; -struct tm *ts; -char list[1024][NAME_LENGTH], buffer[256]; + struct sockaddr_in bind_addr; + struct hostent *phe; + int i, n, s, offset, strsize, n_att, index, fh; + char buf[80]; + char *str, *p, boundary[256], file_name[MAX_PATH_LENGTH]; + time_t now; + struct tm *ts; + char list[1024][NAME_LENGTH], buffer[256]; - if (verbose) - printf("\n\nEmail from %s to %s, SMTP host %s:\n", from, to, smtp_host); + if (verbose) + printf("\n\nEmail from %s to %s, SMTP host %s:\n", from, to, + smtp_host); - /* count attachments */ - n_att = 0; - if (att_file) - for (n_att = 0 ; att_file[n_att][0] && n_att < MAX_ATTACHMENTS ; n_att++); + /* count attachments */ + n_att = 0; + if (att_file) + for (n_att = 0; att_file[n_att][0] && n_att < MAX_ATTACHMENTS; + n_att++); - /* create a new socket for connecting to remote server */ - s = socket(AF_INET, SOCK_STREAM, 0); - if (s == -1) - return -1; + /* create a new socket for connecting to remote server */ + s = socket(AF_INET, SOCK_STREAM, 0); + if (s == -1) + return -1; - /* connect to remote node port 25 */ - memset(&bind_addr, 0, sizeof(bind_addr)); - bind_addr.sin_family = AF_INET; - bind_addr.sin_port = htons((short) 25); + /* connect to remote node port 25 */ + memset(&bind_addr, 0, sizeof(bind_addr)); + bind_addr.sin_family = AF_INET; + bind_addr.sin_port = htons((short) 25); - phe = gethostbyname(smtp_host); - if (phe == NULL) - return -1; - memcpy((char *)&(bind_addr.sin_addr), phe->h_addr, phe->h_length); + phe = gethostbyname(smtp_host); + if (phe == NULL) + return -1; + memcpy((char *) &(bind_addr.sin_addr), phe->h_addr, phe->h_length); - if (connect(s, (void *) &bind_addr, sizeof(bind_addr)) < 0) - { - closesocket(s); - return -1; - } + if (connect(s, (void *) &bind_addr, sizeof(bind_addr)) < 0) { + closesocket(s); + return -1; + } - strsize = TEXT_SIZE+1000; - str = malloc(strsize); + strsize = TEXT_SIZE + 1000; + str = malloc(strsize); - recv_string(s, str, strsize, 10000); - if (verbose) fputs(str, stdout); + recv_string(s, str, strsize, 10000); + if (verbose) + fputs(str, stdout); - /* drain server messages */ - do - { - str[0] = 0; - recv_string(s, str, strsize, 300); - if (verbose) fputs(str, stdout); - } while (str[0]); + /* drain server messages */ + do { + str[0] = 0; + recv_string(s, str, strsize, 300); + if (verbose) + fputs(str, stdout); + } while (str[0]); - snprintf(str, strsize - 1, "HELO %s\r\n", host_name); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - recv_string(s, str, strsize, 3000); - if (verbose) fputs(str, stdout); + snprintf(str, strsize - 1, "HELO %s\r\n", host_name); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + recv_string(s, str, strsize, 3000); + if (verbose) + fputs(str, stdout); - snprintf(str, strsize - 1, "MAIL FROM: <%s>\r\n", from); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - recv_string(s, str, strsize, 3000); - if (verbose) fputs(str, stdout); + snprintf(str, strsize - 1, "MAIL FROM: <%s>\r\n", from); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + recv_string(s, str, strsize, 3000); + if (verbose) + fputs(str, stdout); - /* break recipients into list */ - n = strbreak(to, list, 1024); - - for (i=0 ; i\r\n", list[i]); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - /* increased timeout for SMTP servers with long alias lists */ - recv_string(s, str, strsize, 30000); - if (verbose) fputs(str, stdout); - } - - snprintf(str, strsize - 1, "DATA\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - recv_string(s, str, strsize, 3000); - if (verbose) fputs(str, stdout); - - if (email_to) - snprintf(str, strsize - 1, "To: %s\r\n", to); - else - snprintf(str, strsize - 1, "To: ELOG user\r\n"); - - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - snprintf(str, strsize - 1, "From: %s\r\nSubject: %s\r\n", from, subject); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - snprintf(str, strsize - 1, "X-Mailer: Elog, Version %s\r\n", VERSION); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - if (url) - { - snprintf(str, strsize - 1, "X-Elog-URL: %s\r\n", url); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - } - - snprintf(str, strsize - 1, "X-Elog-submit-type: web|elog\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - time(&now); - ts = localtime(&now); - strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts); - offset = (-(int)timezone); - if (ts->tm_isdst) - offset += 3600; - snprintf(str, strsize - 1, "Date: %s %+03d%02d\r\n", buf, - (int) (offset/3600), (int) ((abs((int)offset)/60) % 60)); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - if (n_att > 0) - { - snprintf(str, strsize - 1, "MIME-Version: 1.0\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - sprintf(boundary, "%04X-%04X=:%04X", rand(), rand(), rand()); - snprintf(str, strsize - 1, "Content-Type: MULTIPART/MIXED; BOUNDARY=\"%s\"\r\n\r\n", boundary); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - snprintf(str, strsize - 1, " This message is in MIME format. The first part should be readable text,\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - snprintf(str, strsize - 1, " while the remaining parts are likely unreadable without MIME-aware tools.\r\n\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - 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) fputs(str, stdout); - } - else - { - snprintf(str, strsize - 1, "Content-Type: TEXT/PLAIN; charset=US-ASCII\r\n\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - } - - /* analyze text for "." at beginning of line */ - p = text; - str[0] = 0; - while (strstr(p, "\r\n.\r\n")) - { - i = (int) strstr(p, "\r\n.\r\n") - (int) p + 1; - strlcat(str, p, i); - p += i+4; - strlcat(str, "\r\n..\r\n", strsize); - } - strlcat(str, p, strsize); - strlcat(str, "\r\n\r\n", strsize); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - if (n_att > 0) - { - snprintf(str, strsize - 1, "--%s\r\n", boundary); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - for (index=0 ; index\r\n", list[i]); send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); + if (verbose) + fputs(str, stdout); - snprintf(str, strsize - 1, "Content-Transfer-Encoding: BASE64\r\n"); + /* increased timeout for SMTP servers with long alias lists */ + recv_string(s, str, strsize, 30000); + if (verbose) + fputs(str, stdout); + } + + snprintf(str, strsize - 1, "DATA\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + recv_string(s, str, strsize, 3000); + if (verbose) + fputs(str, stdout); + + if (email_to) + snprintf(str, strsize - 1, "To: %s\r\n", to); + else + snprintf(str, strsize - 1, "To: ELOG user\r\n"); + + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, "From: %s\r\nSubject: %s\r\n", from, + subject); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, "X-Mailer: Elog, Version %s\r\n", VERSION); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + if (url) { + snprintf(str, strsize - 1, "X-Elog-URL: %s\r\n", url); send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); + if (verbose) + fputs(str, stdout); + } - snprintf(str, strsize - 1, "Content-Disposition: attachment; filename=\"%s\"\r\n\r\n", att_file[index]+14); + snprintf(str, strsize - 1, "X-Elog-submit-type: web|elog\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + time(&now); + ts = localtime(&now); + strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", ts); + offset = (-(int) timezone); + if (ts->tm_isdst) + offset += 3600; + snprintf(str, strsize - 1, "Date: %s %+03d%02d\r\n", buf, + (int) (offset / 3600), (int) ((abs((int) offset) / 60) % 60)); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + if (n_att > 0) { + snprintf(str, strsize - 1, "MIME-Version: 1.0\r\n"); send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - - /* encode file */ - strlcpy(file_name, lbs->data_dir, sizeof(file_name)); - strlcat(file_name, att_file[index], sizeof(file_name)); - - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - do - { - n = read(fh, buffer, 45); - if (n<=0) - break; - - base64_bufenc(buffer, n, str); - strcat(str, "\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - } while(1); - - close(fh); - } - - /* send boundary */ - if (index < n_att-1) - snprintf(str, strsize - 1, "\r\n--%s\r\n", boundary); - else - snprintf(str, strsize - 1, "\r\n--%s--\r\n", boundary); + if (verbose) + fputs(str, stdout); + sprintf(boundary, "%04X-%04X=:%04X", rand(), rand(), rand()); + snprintf(str, strsize - 1, + "Content-Type: MULTIPART/MIXED; BOUNDARY=\"%s\"\r\n\r\n", + boundary); send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, + " This message is in MIME format. The first part should be readable text,\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, + " while the remaining parts are likely unreadable without MIME-aware tools.\r\n\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + 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) + fputs(str, stdout); + } else { + snprintf(str, strsize - 1, + "Content-Type: TEXT/PLAIN; charset=US-ASCII\r\n\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + } + + /* analyze text for "." at beginning of line */ + p = text; + str[0] = 0; + while (strstr(p, "\r\n.\r\n")) { + i = (int) strstr(p, "\r\n.\r\n") - (int) p + 1; + strlcat(str, p, i); + p += i + 4; + strlcat(str, "\r\n..\r\n", strsize); + } + strlcat(str, p, strsize); + strlcat(str, "\r\n\r\n", strsize); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + if (n_att > 0) { + snprintf(str, strsize - 1, "--%s\r\n", boundary); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + for (index = 0; index < n_att; index++) { + /* return proper Content-Type for file type */ + for (i = 0; i < (int) strlen(att_file[index]); i++) + str[i] = toupper(att_file[index][i]); + str[i] = 0; + + for (i = 0; filetype[i].ext[0]; i++) + if (strstr(str, filetype[i].ext)) + break; + + if (filetype[i].ext[0]) + 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); + else + snprintf(str, strsize - 1, + "Content-Type: application/octet-stream; name=\"%s\"\r\n", + att_file[index] + 14); + + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, + "Content-Transfer-Encoding: BASE64\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + snprintf(str, strsize - 1, + "Content-Disposition: attachment; filename=\"%s\"\r\n\r\n", + att_file[index] + 14); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + + /* encode file */ + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, att_file[index], sizeof(file_name)); + + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + do { + n = read(fh, buffer, 45); + if (n <= 0) + break; + + base64_bufenc(buffer, n, str); + strcat(str, "\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + } while (1); + + close(fh); + } + + /* send boundary */ + if (index < n_att - 1) + snprintf(str, strsize - 1, "\r\n--%s\r\n", boundary); + else + snprintf(str, strsize - 1, "\r\n--%s--\r\n", boundary); + + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); } - } + } - /* send "." to signal end of message */ - snprintf(str, strsize - 1, ".\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); + /* send "." to signal end of message */ + snprintf(str, strsize - 1, ".\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); - recv_string(s, str, strsize, 3000); - if (verbose) fputs(str, stdout); + recv_string(s, str, strsize, 3000); + if (verbose) + fputs(str, stdout); - snprintf(str, strsize - 1, "QUIT\r\n"); - send(s, str, strlen(str), 0); - if (verbose) fputs(str, stdout); - recv_string(s, str, strsize, 3000); - if (verbose) fputs(str, stdout); + snprintf(str, strsize - 1, "QUIT\r\n"); + send(s, str, strlen(str), 0); + if (verbose) + fputs(str, stdout); + recv_string(s, str, strsize, 3000); + if (verbose) + fputs(str, stdout); - closesocket(s); - free(str); + closesocket(s); + free(str); - return 1; + return 1; } /*-------------------------------------------------------------------*/ void split_url(char *url, char *host, int *port, char *subdir) { -char *p; + char *p; - host[0] = subdir[0] = 0; - *port = 80; + host[0] = subdir[0] = 0; + *port = 80; - p = url; - if (strncmp(url, "http://", 7) == 0) - p += 7; + p = url; + if (strncmp(url, "http://", 7) == 0) + p += 7; - strncpy(host, p, 256); - if (strchr(host, '/')) - { - strncpy(subdir, strchr(host, '/'), 256); - *strchr(host, '/') = 0; - } + strncpy(host, p, 256); + if (strchr(host, '/')) { + strncpy(subdir, strchr(host, '/'), 256); + *strchr(host, '/') = 0; + } - if (strchr(host, ':')) - { - *port = atoi(strchr(host, ':')+1); - *strchr(host, ':') = 0; - } + if (strchr(host, ':')) { + *port = atoi(strchr(host, ':') + 1); + *strchr(host, ':') = 0; + } } /*-------------------------------------------------------------------*/ int retrieve_url(char *url, char **buffer) { -struct sockaddr_in bind_addr; -struct hostent *phe; -char str[256], host[256], subdir[256]; -int port, sock, bufsize; -INT i, n; -fd_set readfds; -struct timeval timeout; + struct sockaddr_in bind_addr; + struct hostent *phe; + char str[256], host[256], subdir[256]; + int port, sock, bufsize; + INT i, n; + fd_set readfds; + struct timeval timeout; - *buffer = NULL; - split_url(url, host, &port, subdir); + *buffer = NULL; + split_url(url, host, &port, subdir); - /* create a new socket for connecting to remote server */ - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock == -1) - return -1; - - /* connect to remote node */ - memset(&bind_addr, 0, sizeof(bind_addr)); - bind_addr.sin_family = AF_INET; - bind_addr.sin_port = htons((short) port); - - phe = gethostbyname(host); - if (phe == NULL) - return -1; - memcpy((char *)&(bind_addr.sin_addr), phe->h_addr, phe->h_length); - - if (connect(sock, (void *) &bind_addr, sizeof(bind_addr)) < 0) - { - closesocket(sock); - return -1; - } - - /* compose GET request */ - sprintf(str, "GET %s HTTP/1.1\r\nConnection: Close\r\n", subdir); - - /* add local username/password */ - if (isparam("unm")) - sprintf(str+strlen(str), "Cookie: unm=%s; upwd=%s\r\n", getparam("unm"), getparam("upwd")); - - strcat(str, "\r\n"); - - send(sock, str, strlen(str), 0); - - bufsize = TEXT_SIZE+1000; - *buffer = malloc(bufsize); - memset(*buffer, 0, bufsize); - - n = 0; - - do - { - FD_ZERO(&readfds); - FD_SET(sock, &readfds); - - timeout.tv_sec = 30; /* 30 sec. timeout */ - timeout.tv_usec = 0; - - select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); - - if (!FD_ISSET(sock, &readfds)) - { - closesocket(sock); - free(buffer); - buffer = NULL; + /* create a new socket for connecting to remote server */ + sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock == -1) return -1; + + /* connect to remote node */ + memset(&bind_addr, 0, sizeof(bind_addr)); + bind_addr.sin_family = AF_INET; + bind_addr.sin_port = htons((short) port); + + phe = gethostbyname(host); + if (phe == NULL) + return -1; + memcpy((char *) &(bind_addr.sin_addr), phe->h_addr, phe->h_length); + + if (connect(sock, (void *) &bind_addr, sizeof(bind_addr)) < 0) { + closesocket(sock); + return -1; + } + + /* compose GET request */ + sprintf(str, "GET %s HTTP/1.1\r\nConnection: Close\r\n", subdir); + + /* add local username/password */ + if (isparam("unm")) + sprintf(str + strlen(str), "Cookie: unm=%s; upwd=%s\r\n", + getparam("unm"), getparam("upwd")); + + strcat(str, "\r\n"); + + send(sock, str, strlen(str), 0); + + bufsize = TEXT_SIZE + 1000; + *buffer = malloc(bufsize); + memset(*buffer, 0, bufsize); + + n = 0; + + do { + FD_ZERO(&readfds); + FD_SET(sock, &readfds); + + timeout.tv_sec = 30; /* 30 sec. timeout */ + timeout.tv_usec = 0; + + select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); + + if (!FD_ISSET(sock, &readfds)) { + closesocket(sock); + free(buffer); + buffer = NULL; + return -1; } - i = recv(sock, *buffer+n, bufsize-n, 0); + i = recv(sock, *buffer + n, bufsize - n, 0); - if (i<=0) - break; + if (i <= 0) + break; - n += i; + n += i; - if (n >= bufsize) - { - /* increase buffer size */ - bufsize += 10000; - *buffer = realloc(*buffer, bufsize); - if (*buffer == NULL) - { - closesocket(sock); - return -1; - } + if (n >= bufsize) { + /* increase buffer size */ + bufsize += 10000; + *buffer = realloc(*buffer, bufsize); + if (*buffer == NULL) { + closesocket(sock); + return -1; + } } - } while (1); + } while (1); - closesocket(sock); + closesocket(sock); - return n; + return n; } /*-------------------------------------------------------------------*/ @@ -1454,43 +1463,40 @@ INT ss_daemon_init() { #ifdef OS_UNIX - /* only implemented for UNIX */ - int i, fd, pid; + /* only implemented for UNIX */ + int i, fd, pid; - if ( (pid = fork()) < 0) - return 0; - else if (pid != 0) - exit(EXIT_SUCCESS); /* parent finished */ - - /* child continues here */ - - /* try and use up stdin, stdout and stderr, so other - routines writing to stdout etc won't cause havoc. Copied from smbd */ - for (i=0 ; i<3 ; i++) - { - close(i); - fd = open("/dev/null", O_RDWR, 0); - if (fd < 0) - fd = open("/dev/null", O_WRONLY, 0); - if (fd < 0) - { - printf("Can't open /dev/null"); + if ((pid = fork()) < 0) return 0; - } - if (fd != i) - { - printf("Did not get file descriptor"); - return 0; - } - } + else if (pid != 0) + exit(EXIT_SUCCESS); /* parent finished */ - setsid(); /* become session leader */ - chdir("/"); /* change working direcotry (not on NFS!) */ - umask(0); /* clear our file mode creation mask */ + /* child continues here */ + + /* try and use up stdin, stdout and stderr, so other + routines writing to stdout etc won't cause havoc. Copied from smbd */ + for (i = 0; i < 3; i++) { + close(i); + fd = open("/dev/null", O_RDWR, 0); + if (fd < 0) + fd = open("/dev/null", O_WRONLY, 0); + if (fd < 0) { + printf("Can't open /dev/null"); + return 0; + } + if (fd != i) { + printf("Did not get file descriptor"); + return 0; + } + } + + setsid(); /* become session leader */ + chdir("/"); /* change working direcotry (not on NFS!) */ + umask(0); /* clear our file mode creation mask */ #endif - return SUCCESS; + return SUCCESS; } /*------------------------------------------------------------------*/ @@ -1504,396 +1510,359 @@ time_t cfgfile_mtime = 0; void check_config_file() { -struct stat cfg_stat; + struct stat cfg_stat; - /* force re-read configuration file if changed */ - if (stat(config_file, &cfg_stat) == 0) - { - if (cfgfile_mtime < cfg_stat.st_mtime) - { - cfgfile_mtime = cfg_stat.st_mtime; + /* force re-read configuration file if changed */ + if (stat(config_file, &cfg_stat) == 0) { + if (cfgfile_mtime < cfg_stat.st_mtime) { + cfgfile_mtime = cfg_stat.st_mtime; - if (cfgbuffer) - { - free(cfgbuffer); - cfgbuffer = NULL; - } + if (cfgbuffer) { + free(cfgbuffer); + cfgbuffer = NULL; + } } - } - else - { - perror("Cannot stat() config file"); - } + } else { + perror("Cannot stat() config file"); + } } /*-------------------------------------------------------------------*/ int getcfg(char *group, char *param, char *value) { -char *str, *p, *pstr; -int length; -int fh; + char *str, *p, *pstr; + int length; + int fh; - value[0] = 0; + value[0] = 0; - /* read configuration file on init */ - if (!cfgbuffer) - { - fh = open(config_file, O_RDONLY | O_BINARY); - if (fh < 0) - return 0; - length = lseek(fh, 0, SEEK_END); - lseek(fh, 0, SEEK_SET); - cfgbuffer = malloc(length+1); - if (cfgbuffer == NULL) - { + /* read configuration file on init */ + if (!cfgbuffer) { + fh = open(config_file, O_RDONLY | O_BINARY); + if (fh < 0) + return 0; + length = lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_SET); + cfgbuffer = malloc(length + 1); + if (cfgbuffer == NULL) { + close(fh); + return 0; + } + read(fh, cfgbuffer, length); + cfgbuffer[length] = 0; close(fh); - return 0; - } - read(fh, cfgbuffer, length); - cfgbuffer[length] = 0; - close(fh); - } + } - /* search group */ - str = malloc(10000); - p = cfgbuffer; - do - { - if (*p == '[') - { - p++; - pstr = str; - while (*p && *p != ']' && *p != '\n') - *pstr++ = *p++; - *pstr = 0; - if (equal_ustring(str, group)) - { - /* search parameter */ - p = strchr(p, '\n'); - if (p) - p++; - while (p && *p && *p != '[') - { - pstr = str; - while (*p && *p != '=' && *p != '\n') + /* search group */ + str = malloc(10000); + p = cfgbuffer; + do { + if (*p == '[') { + p++; + pstr = str; + while (*p && *p != ']' && *p != '\n') *pstr++ = *p++; - *pstr-- = 0; - while (pstr > str && (*pstr == ' ' || *pstr == '=' || *pstr == '\t')) - *pstr-- = 0; - - if (equal_ustring(str, param)) - { - if (*p == '=') - { - p++; - while (*p == ' ' || *p == '\t') - p++; - pstr = str; - while (*p && *p != '\n' && *p != '\r') - *pstr++ = *p++; - *pstr-- = 0; - while (*pstr == ' ' || *pstr == '\t') - *pstr-- = 0; - - if (str[0] == '"' && str[strlen(str)-1] == '"') - { - strcpy(value, str+1); - value[strlen(value)-1] = 0; - } - else - strcpy(value, str); - - free(str); - return 1; - } - } - - if (p) + *pstr = 0; + if (equal_ustring(str, group)) { + /* search parameter */ p = strchr(p, '\n'); - if (p) - p++; - } - } + if (p) + p++; + while (p && *p && *p != '[') { + pstr = str; + while (*p && *p != '=' && *p != '\n') + *pstr++ = *p++; + *pstr-- = 0; + while (pstr > str + && (*pstr == ' ' || *pstr == '=' || *pstr == '\t')) + *pstr-- = 0; + + if (equal_ustring(str, param)) { + if (*p == '=') { + p++; + while (*p == ' ' || *p == '\t') + p++; + pstr = str; + while (*p && *p != '\n' && *p != '\r') + *pstr++ = *p++; + *pstr-- = 0; + while (*pstr == ' ' || *pstr == '\t') + *pstr-- = 0; + + if (str[0] == '"' && str[strlen(str) - 1] == '"') { + strcpy(value, str + 1); + value[strlen(value) - 1] = 0; + } else + strcpy(value, str); + + free(str); + return 1; + } + } + + if (p) + p = strchr(p, '\n'); + if (p) + p++; + } + } } - if (p) - p = strchr(p, '\n'); - if (p) - p++; - } while (p); + if (p) + p = strchr(p, '\n'); + if (p) + p++; + } while (p); - free(str); + free(str); - /* if parameter not found in logbook, look in [global] section */ - if (!equal_ustring(group, "global")) - return getcfg("global", param, value); + /* if parameter not found in logbook, look in [global] section */ + if (!equal_ustring(group, "global")) + return getcfg("global", param, value); - return 0; + return 0; } /*------------------------------------------------------------------*/ int getcfg_cond(char *group, char *condition, char *param, char *value) { -char str[256]; + char str[256]; - if (condition == NULL || condition[0] == 0) - return getcfg(group, param, value); + if (condition == NULL || condition[0] == 0) + return getcfg(group, param, value); - sprintf(str, "{%s}%s", condition, param); - if (getcfg(group, str, value)) - return 1; + sprintf(str, "{%s}%s", condition, param); + if (getcfg(group, str, value)) + return 1; - sprintf(str, "{%s} %s", condition, param); - if (getcfg(group, str, value)) - return 1; + sprintf(str, "{%s} %s", condition, param); + if (getcfg(group, str, value)) + return 1; - return getcfg(group, param, value); + return getcfg(group, param, value); } /*------------------------------------------------------------------*/ int enumcfg(char *group, char *param, char *value, int index) { -char str[10000], *p, *pstr; -int i; + char str[10000], *p, *pstr; + int i; - /* open configuration file */ - if (!cfgbuffer) - getcfg("dummy", "dummy", str); - if (!cfgbuffer) - return 0; + /* open configuration file */ + if (!cfgbuffer) + getcfg("dummy", "dummy", str); + if (!cfgbuffer) + return 0; - /* search group */ - p = cfgbuffer; - do - { - if (*p == '[') - { - p++; - pstr = str; - while (*p && *p != ']' && *p != '\n' && *p != '\r') - *pstr++ = *p++; - *pstr = 0; - if (equal_ustring(str, group)) - { - /* enumerate parameters */ - i = 0; - p = strchr(p, '\n'); - if (p) - p++; - while (p && *p && *p != '[') - { - pstr = str; - while (*p && *p != '=' && *p != '\n' && *p != '\r') + /* search group */ + p = cfgbuffer; + do { + if (*p == '[') { + p++; + pstr = str; + while (*p && *p != ']' && *p != '\n' && *p != '\r') *pstr++ = *p++; - *pstr-- = 0; - while (pstr > str && (*pstr == ' ' || *pstr == '\t' || *pstr == '=')) - *pstr-- = 0; - - if (i == index) - { - strcpy(param, str); - if (*p == '=') - { - p++; - while (*p == ' ' || *p == '\t') - p++; - pstr = str; - while (*p && *p != '\n' && *p != '\r') - *pstr++ = *p++; - *pstr-- = 0; - while (*pstr == ' ' || *pstr == '\t') - *pstr-- = 0; - - if (value) - strcpy(value, str); - } - return 1; - } - - if (p) + *pstr = 0; + if (equal_ustring(str, group)) { + /* enumerate parameters */ + i = 0; p = strchr(p, '\n'); - if (p) - p++; - i++; - } - } - } - if (p) - p = strchr(p, '\n'); - if (p) - p++; - } while (p); + if (p) + p++; + while (p && *p && *p != '[') { + pstr = str; + while (*p && *p != '=' && *p != '\n' && *p != '\r') + *pstr++ = *p++; + *pstr-- = 0; + while (pstr > str + && (*pstr == ' ' || *pstr == '\t' || *pstr == '=')) + *pstr-- = 0; - return 0; + if (i == index) { + strcpy(param, str); + if (*p == '=') { + p++; + while (*p == ' ' || *p == '\t') + p++; + pstr = str; + while (*p && *p != '\n' && *p != '\r') + *pstr++ = *p++; + *pstr-- = 0; + while (*pstr == ' ' || *pstr == '\t') + *pstr-- = 0; + + if (value) + strcpy(value, str); + } + return 1; + } + + if (p) + p = strchr(p, '\n'); + if (p) + p++; + i++; + } + } + } + if (p) + p = strchr(p, '\n'); + if (p) + p++; + } while (p); + + return 0; } /*------------------------------------------------------------------*/ int enumgrp(int index, char *group) { -char str[10000], *p, *pstr; -int i; + char str[10000], *p, *pstr; + int i; - /* open configuration file */ - if (!cfgbuffer) - getcfg("dummy", "dummy", str); - if (!cfgbuffer) - return 0; + /* open configuration file */ + if (!cfgbuffer) + getcfg("dummy", "dummy", str); + if (!cfgbuffer) + return 0; - /* search group */ - p = cfgbuffer; - i = 0; - do - { - if (*p == '[') - { - p++; - pstr = str; - while (*p && *p != ']' && *p != '\n' && *p != '\r') - *pstr++ = *p++; - *pstr = 0; + /* search group */ + p = cfgbuffer; + i = 0; + do { + if (*p == '[') { + p++; + pstr = str; + while (*p && *p != ']' && *p != '\n' && *p != '\r') + *pstr++ = *p++; + *pstr = 0; - if (i == index) - { - strcpy(group, str); - return 1; - } + if (i == index) { + strcpy(group, str); + return 1; + } - i++; + i++; } - while (*p && *p != '\r' && *p != '\n') - p++; - while (*p && (*p == '\r' || *p == '\n')) - p++; - } while (*p); + while (*p && *p != '\r' && *p != '\n') + p++; + while (*p && (*p == '\r' || *p == '\n')) + p++; + } while (*p); - return 0; + return 0; } /*-------------------------------------------------------------------*/ -char *_locbuffer = NULL; -char **_porig, **_ptrans; +char *_locbuffer = NULL; +char **_porig, **_ptrans; time_t _locfile_mtime = 0; /* check if language file changed and if so reload it */ int check_language() { -char language[256], file_name[256], *p; -int fh, length, n; -struct stat cfg_stat; + char language[256], file_name[256], *p; + int fh, length, n; + struct stat cfg_stat; - getcfg("global", "Language", language); + getcfg("global", "Language", language); - /* force re-read configuration file if changed */ - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, "eloglang.", sizeof(file_name)); - strlcat(file_name, language, sizeof(file_name)); + /* force re-read configuration file if changed */ + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, "eloglang.", sizeof(file_name)); + strlcat(file_name, language, sizeof(file_name)); - if (stat(file_name, &cfg_stat) == 0) - { - if (_locfile_mtime < cfg_stat.st_mtime) - { - _locfile_mtime = cfg_stat.st_mtime; + if (stat(file_name, &cfg_stat) == 0) { + if (_locfile_mtime < cfg_stat.st_mtime) { + _locfile_mtime = cfg_stat.st_mtime; - if (_locbuffer) - { - free(_locbuffer); - _locbuffer = NULL; - } + if (_locbuffer) { + free(_locbuffer); + _locbuffer = NULL; + } } - } + } - if (equal_ustring(language, "english") || - language[0] == 0) - { - if (_locbuffer) - { - free(_locbuffer); - _locbuffer = NULL; + if (equal_ustring(language, "english") || language[0] == 0) { + if (_locbuffer) { + free(_locbuffer); + _locbuffer = NULL; } - } - else - { - if (_locbuffer == NULL) - { - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh < 0) - return -1; + } else { + if (_locbuffer == NULL) { + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh < 0) + return -1; - length = lseek(fh, 0, SEEK_END); - lseek(fh, 0, SEEK_SET); - _locbuffer = malloc(length+1); - if (_locbuffer == NULL) - { - close(fh); - return -1; - } - read(fh, _locbuffer, length); - _locbuffer[length] = 0; - close(fh); + length = lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_SET); + _locbuffer = malloc(length + 1); + if (_locbuffer == NULL) { + close(fh); + return -1; + } + read(fh, _locbuffer, length); + _locbuffer[length] = 0; + close(fh); - /* scan lines, setup orig-translated pointers */ - p = _locbuffer; - n = 0; - do - { - while (*p && (*p == '\r' || *p == '\n')) - p++; + /* scan lines, setup orig-translated pointers */ + p = _locbuffer; + n = 0; + do { + while (*p && (*p == '\r' || *p == '\n')) + p++; - if (*p && (*p == ';' || *p == '#' || *p == ' ' || *p == '\t')) - { - while (*p && *p != '\n' && *p != '\r') - p++; - continue; - } + if (*p && (*p == ';' || *p == '#' || *p == ' ' || *p == '\t')) { + while (*p && *p != '\n' && *p != '\r') + p++; + continue; + } - if (n == 0) - { - _porig = malloc(sizeof(char *) * 2); - _ptrans = malloc(sizeof(char *) * 2); - } - else - { - _porig = realloc(_porig, sizeof(char *) * (n + 2)); - _ptrans = realloc(_ptrans, sizeof(char *) * (n + 2)); - } + if (n == 0) { + _porig = malloc(sizeof(char *) * 2); + _ptrans = malloc(sizeof(char *) * 2); + } else { + _porig = realloc(_porig, sizeof(char *) * (n + 2)); + _ptrans = realloc(_ptrans, sizeof(char *) * (n + 2)); + } - _porig[n] = p; - while (*p && (*p != '=' && *p != '\r' && *p != '\n')) - p++; + _porig[n] = p; + while (*p && (*p != '=' && *p != '\r' && *p != '\n')) + p++; - if (*p && *p != '=') - continue; + if (*p && *p != '=') + continue; - _ptrans[n] = p + 1; - while (*_ptrans[n] == ' ' || *_ptrans[n] == '\t') - _ptrans[n] ++; + _ptrans[n] = p + 1; + while (*_ptrans[n] == ' ' || *_ptrans[n] == '\t') + _ptrans[n]++; - /* remove '=' and surrounding blanks */ - while (*p == '=' || *p == ' ' || *p == '\t') - *p-- = 0; + /* remove '=' and surrounding blanks */ + while (*p == '=' || *p == ' ' || *p == '\t') + *p-- = 0; - p = _ptrans[n]; - while (*p && *p != '\n' && *p != '\r') - p++; + p = _ptrans[n]; + while (*p && *p != '\n' && *p != '\r') + p++; - if (p) - *p++ = 0; + if (p) + *p++ = 0; - n++; - } while (p && *p); + n++; + } while (p && *p); - _porig[n] = NULL; - _ptrans[n] = NULL; + _porig[n] = NULL; + _ptrans[n] = NULL; } - } - - return 0; + } + + return 0; } /*-------------------------------------------------------------------*/ @@ -1901,25 +1870,25 @@ struct stat cfg_stat; /* localization support */ char *loc(char *orig) { -int n; -char language[256]; + int n; + char language[256]; - if (!_locbuffer) - return orig; - - /* search string and return translation */ - for (n = 0; _porig[n] ; n++) - if (strcmp(orig, _porig[n]) == 0) - { - if (*_ptrans[n]) - return _ptrans[n]; + if (!_locbuffer) return orig; + + /* search string and return translation */ + for (n = 0; _porig[n]; n++) + if (strcmp(orig, _porig[n]) == 0) { + if (*_ptrans[n]) + return _ptrans[n]; + return orig; } - getcfg("global", "Language", language); - printf("Language error: string \"%s\" not found for language \"%s\"\n", orig, language); + getcfg("global", "Language", language); + printf("Language error: string \"%s\" not found for language \"%s\"\n", + orig, language); - return orig; + return orig; } /*-------------------------------------------------------------------*/ @@ -1928,67 +1897,64 @@ char language[256]; char *unloc(char *orig) { -int n; + int n; - if (!_locbuffer) - return orig; - - /* search string and return translation */ - for (n = 0; _ptrans[n] ; n++) - if (strcmp(orig, _ptrans[n]) == 0) - { - if (*_porig[n]) - return _porig[n]; + if (!_locbuffer) return orig; + + /* search string and return translation */ + for (n = 0; _ptrans[n]; n++) + if (strcmp(orig, _ptrans[n]) == 0) { + if (*_porig[n]) + return _porig[n]; + return orig; } - printf("Language error: string \"%s\" not found\n", orig); + printf("Language error: string \"%s\" not found\n", orig); - return orig; + return orig; } /*-------------------------------------------------------------------*/ void check_config() { - check_language(); - check_config_file(); + check_language(); + check_config_file(); } /*------------------------------------------------------------------*/ void el_decode(char *message, char *key, char *result) { -char *pc, *ph; + char *pc, *ph; - if (result == NULL) - return; - - *result = 0; - - ph = strstr(message, "========================================"); - if (ph == NULL) - return; - - do - { - if (ph[40] == '\r' || ph[40] == '\n') - break; - ph = strstr(ph+40, "========================================"); - if (ph == NULL) + if (result == NULL) return; - } while (1); + *result = 0; - if ((pc = strstr(message, key)) != NULL && - pc < ph && (*(pc-1) == '\n' || *(pc-1) == '\r')) - { - for (pc=strstr(message, key)+strlen(key) ; *pc != '\n' && *pc != '\r' ; ) - *result++ = *pc++; - *result = 0; - } - else - *result = 0; + ph = strstr(message, "========================================"); + if (ph == NULL) + return; + + do { + if (ph[40] == '\r' || ph[40] == '\n') + break; + ph = strstr(ph + 40, "========================================"); + if (ph == NULL) + return; + + } while (1); + + if ((pc = strstr(message, key)) != NULL && + pc < ph && (*(pc - 1) == '\n' || *(pc - 1) == '\r')) { + for (pc = strstr(message, key) + strlen(key); + *pc != '\n' && *pc != '\r';) + *result++ = *pc++; + *result = 0; + } else + *result = 0; } /*------------------------------------------------------------------*/ @@ -1999,43 +1965,42 @@ char *pc, *ph; int fnmatch1(const char *pattern, const char *string) { -const char *stringstart; -char c, test; + const char *stringstart; + char c, test; - for (stringstart = string;;) - switch (c = *pattern++) { - case EOS: - return (*string == EOS ? 0 : 1); - case '?': - if (*string == EOS) - return (1); - ++string; - break; - case '*': - c = *pattern; - /* Collapse multiple stars. */ - while (c == '*') - c = *++pattern; + for (stringstart = string;;) + switch (c = *pattern++) { + case EOS: + return (*string == EOS ? 0 : 1); + case '?': + if (*string == EOS) + return (1); + ++string; + break; + case '*': + c = *pattern; + /* Collapse multiple stars. */ + while (c == '*') + c = *++pattern; - /* Optimize for pattern with * at end or before /. */ - if (c == EOS) - return (0); + /* Optimize for pattern with * at end or before /. */ + if (c == EOS) + return (0); - /* General case, use recursion. */ - while ((test = *string) != EOS) - { - if (!fnmatch1(pattern, string)) - return (0); - ++string; - } - return (1); - /* FALLTHROUGH */ - default: - if (c != *string) - return (1); - string++; - break; - } + /* General case, use recursion. */ + while ((test = *string) != EOS) { + if (!fnmatch1(pattern, string)) + return (0); + ++string; + } + return (1); + /* FALLTHROUGH */ + default: + if (c != *string) + return (1); + string++; + break; + } } /*------------------------------------------------------------------*/ @@ -2060,59 +2025,60 @@ INT ss_file_find(char *path, char *pattern, char **plist) \********************************************************************/ { #ifdef OS_UNIX - DIR *dir_pointer; - struct dirent *dp; - int i; + DIR *dir_pointer; + struct dirent *dp; + int i; - if ((dir_pointer = opendir(path)) == NULL) - return 0; - *plist = (char *) malloc(MAX_PATH_LENGTH); - i = 0; - for (dp = readdir(dir_pointer); dp != NULL; dp = readdir(dir_pointer)) - { - if (fnmatch1(pattern, dp->d_name) == 0) - { - *plist = (char *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - strncpy(*plist+(i*MAX_PATH_LENGTH), dp->d_name, strlen(dp->d_name)); - *(*plist+(i*MAX_PATH_LENGTH)+strlen(dp->d_name)) = '\0'; - i++; - seekdir(dir_pointer, telldir(dir_pointer)); + if ((dir_pointer = opendir(path)) == NULL) + return 0; + *plist = (char *) malloc(MAX_PATH_LENGTH); + i = 0; + for (dp = readdir(dir_pointer); dp != NULL; dp = readdir(dir_pointer)) { + if (fnmatch1(pattern, dp->d_name) == 0) { + *plist = (char *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + strncpy(*plist + (i * MAX_PATH_LENGTH), dp->d_name, + strlen(dp->d_name)); + *(*plist + (i * MAX_PATH_LENGTH) + strlen(dp->d_name)) = '\0'; + i++; + seekdir(dir_pointer, telldir(dir_pointer)); } - } - closedir(dir_pointer); - return i; + } + closedir(dir_pointer); + return i; #endif #ifdef OS_WINNT - HANDLE pffile; - LPWIN32_FIND_DATA lpfdata; - char str[255]; - int i, first; + HANDLE pffile; + LPWIN32_FIND_DATA lpfdata; + char str[255]; + int i, first; - strlcpy(str, path, sizeof(str)); - strlcat(str, "\\", sizeof(str)); - strlcat(str, pattern, sizeof(str)); - first = 1; - i = 0; - lpfdata = malloc(sizeof(WIN32_FIND_DATA)); - *plist = (char *) malloc(MAX_PATH_LENGTH); - pffile = FindFirstFile(str, lpfdata); - if (pffile == INVALID_HANDLE_VALUE) - return 0; - first = 0; - *plist = (char *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - 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 *)realloc(*plist, (i+1)*MAX_PATH_LENGTH); - strncpy(*plist+(i*MAX_PATH_LENGTH), lpfdata->cFileName, strlen(lpfdata->cFileName)); - *(*plist+(i*MAX_PATH_LENGTH)+strlen(lpfdata->cFileName)) = '\0'; - i++; - } - free(lpfdata); - return i; + strlcpy(str, path, sizeof(str)); + strlcat(str, "\\", sizeof(str)); + strlcat(str, pattern, sizeof(str)); + first = 1; + i = 0; + lpfdata = malloc(sizeof(WIN32_FIND_DATA)); + *plist = (char *) malloc(MAX_PATH_LENGTH); + pffile = FindFirstFile(str, lpfdata); + if (pffile == INVALID_HANDLE_VALUE) + return 0; + first = 0; + *plist = (char *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + 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 *) realloc(*plist, (i + 1) * MAX_PATH_LENGTH); + strncpy(*plist + (i * MAX_PATH_LENGTH), lpfdata->cFileName, + strlen(lpfdata->cFileName)); + *(*plist + (i * MAX_PATH_LENGTH) + strlen(lpfdata->cFileName)) = + '\0'; + i++; + } + free(lpfdata); + return i; #endif } @@ -2121,380 +2087,358 @@ INT ss_file_find(char *path, char *pattern, char **plist) int eli_compare(const void *e1, const void *e2) { - if (((EL_INDEX *)e1)->file_time < ((EL_INDEX *)e2)->file_time) - return -1; - if (((EL_INDEX *)e1)->file_time >= ((EL_INDEX *)e2)->file_time) - return 1; - return 0; + if (((EL_INDEX *) e1)->file_time < ((EL_INDEX *) e2)->file_time) + return -1; + if (((EL_INDEX *) e1)->file_time >= ((EL_INDEX *) e2)->file_time) + return 1; + return 0; } /*------------------------------------------------------------------*/ -int el_build_index(LOGBOOK *lbs, BOOL rebuild) +int el_build_index(LOGBOOK * lbs, BOOL rebuild) /* scan all ??????a.log files and build an index table in eli[] */ { -char *file_list, str[256], date[256], dir[256], file_name[MAX_PATH_LENGTH], *buffer, *p, - *pn, in_reply_to[80]; -int index, n, length; -int i, fh, len; -time_t ltime; -struct tm tms; + char *file_list, str[256], date[256], dir[256], + file_name[MAX_PATH_LENGTH], *buffer, *p, *pn, in_reply_to[80]; + int index, n, length; + int i, fh, len; + time_t ltime; + struct tm tms; - if (rebuild) - { - free(lbs->el_index); - free(lbs->n_el_index); - } + if (rebuild) { + free(lbs->el_index); + free(lbs->n_el_index); + } - /* check if this logbook has same data dir as previous */ - for (i=0 ; lb_list[i].name[0] && &lb_list[i] != lbs; i++) - if (equal_ustring(lb_list[i].data_dir, lbs->data_dir)) - break; + /* check if this logbook has same data dir as previous */ + for (i = 0; lb_list[i].name[0] && &lb_list[i] != lbs; i++) + if (equal_ustring(lb_list[i].data_dir, lbs->data_dir)) + break; - if (equal_ustring(lb_list[i].data_dir, lbs->data_dir) && &lb_list[i] != lbs) - { - if (verbose) - printf("\n Same index as logbook %s\n", lb_list[i].name); + if (equal_ustring(lb_list[i].data_dir, lbs->data_dir) + && &lb_list[i] != lbs) { + if (verbose) + printf("\n Same index as logbook %s\n", lb_list[i].name); - lbs->el_index = lb_list[i].el_index; - lbs->n_el_index = lb_list[i].n_el_index; - return EL_SUCCESS; - } + lbs->el_index = lb_list[i].el_index; + lbs->n_el_index = lb_list[i].n_el_index; + return EL_SUCCESS; + } - lbs->n_el_index = malloc(sizeof(int)); - *lbs->n_el_index = 0; - lbs->el_index = malloc(0); + lbs->n_el_index = malloc(sizeof(int)); + *lbs->n_el_index = 0; + lbs->el_index = malloc(0); - /* get data directory */ - strcpy(dir, lbs->data_dir); + /* get data directory */ + strcpy(dir, lbs->data_dir); - file_list = NULL; - n = ss_file_find(dir, "??????a.log", &file_list); - if (n == 0) - { - if (file_list) - free(file_list); - file_list = NULL; + file_list = NULL; + n = ss_file_find(dir, "??????a.log", &file_list); + if (n == 0) { + if (file_list) + free(file_list); + file_list = NULL; - n = ss_file_find(dir, "??????.log", &file_list); - if (n > 0) - return EL_UPGRADE; + n = ss_file_find(dir, "??????.log", &file_list); + if (n > 0) + return EL_UPGRADE; - return EL_EMPTY; - } + return EL_EMPTY; + } - /* go through all files */ - for (index=0 ; index 0) - { - buffer = malloc(length+1); - if (buffer == NULL) - { - printf("Not enough memory to allocate file buffer (%d bytes)\n", length); - return EL_MEM_ERROR; - } - - lseek(fh, 0, SEEK_SET); - read(fh, buffer, length); - buffer[length] = 0; - close(fh); - - /* go through buffer */ - p = buffer; - - do - { - p = strstr(p, "$@MID@$:"); - - if (p) - { - lbs->el_index = realloc(lbs->el_index, sizeof(EL_INDEX)*(*lbs->n_el_index+1)); - if (lbs->el_index == NULL) - { - printf("Not enough memory to allocate message index\n"); + if (length > 0) { + buffer = malloc(length + 1); + if (buffer == NULL) { + printf + ("Not enough memory to allocate file buffer (%d bytes)\n", + length); return EL_MEM_ERROR; + } + + lseek(fh, 0, SEEK_SET); + read(fh, buffer, length); + buffer[length] = 0; + close(fh); + + /* go through buffer */ + p = buffer; + + do { + p = strstr(p, "$@MID@$:"); + + if (p) { + lbs->el_index = + realloc(lbs->el_index, + sizeof(EL_INDEX) * (*lbs->n_el_index + 1)); + if (lbs->el_index == NULL) { + printf("Not enough memory to allocate message index\n"); + return EL_MEM_ERROR; + } + + strcpy(str, file_list + index * MAX_PATH_LENGTH); + strcpy(lbs->el_index[*lbs->n_el_index].file_name, str); + + el_decode(p, "Date: ", date); + el_decode(p, "In reply to: ", in_reply_to); + + memset(&tms, 0, sizeof(struct tm)); + + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; + tms.tm_mon = i; + + tms.tm_mday = atoi(date + 8); + tms.tm_hour = atoi(date + 11); + tms.tm_min = atoi(date + 14); + tms.tm_sec = atoi(date + 17); + tms.tm_year = atoi(date + 20) - 1900; + tms.tm_isdst = -1; + + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime = mktime(&tms); + + lbs->el_index[*lbs->n_el_index].file_time = ltime; + + lbs->el_index[*lbs->n_el_index].message_id = atoi(p + 8); + lbs->el_index[*lbs->n_el_index].offset = + (int) p - (int) buffer; + lbs->el_index[*lbs->n_el_index].in_reply_to = + atoi(in_reply_to); + + pn = strstr(p + 8, "$@MID@$:"); + if (pn) + len = (int) pn - (int) p; + else + len = strlen(p); + + MD5_checksum(p, len, + lbs->el_index[*lbs->n_el_index].md5_digest); + + if (lbs->el_index[*lbs->n_el_index].message_id > 0) { + if (verbose) { + if (*lbs->n_el_index == 0) + printf("\n"); + + printf(" ID %3d in %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"); + + for (i = 0; i < 16; i++) + printf("%02X", + lbs->el_index[*lbs->n_el_index]. + md5_digest[i]); + printf("\n"); + } + + /* valid ID */ + (*lbs->n_el_index)++; + } + + p += 8; } - strcpy(str, file_list+index*MAX_PATH_LENGTH); - strcpy(lbs->el_index[*lbs->n_el_index].file_name, str); + } while (p); - el_decode(p, "Date: ", date); - el_decode(p, "In reply to: ", in_reply_to); - - memset(&tms, 0, sizeof(struct tm)); - - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; - tms.tm_mon = i; - - tms.tm_mday = atoi(date+8); - tms.tm_hour = atoi(date+11); - tms.tm_min = atoi(date+14); - tms.tm_sec = atoi(date+17); - tms.tm_year = atoi(date+20)-1900; - tms.tm_isdst = -1; - - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime = mktime(&tms); - - lbs->el_index[*lbs->n_el_index].file_time = ltime; - - lbs->el_index[*lbs->n_el_index].message_id = atoi(p+8); - lbs->el_index[*lbs->n_el_index].offset = (int) p - (int) buffer; - lbs->el_index[*lbs->n_el_index].in_reply_to = atoi(in_reply_to); - - pn = strstr(p+8, "$@MID@$:"); - if (pn) - len = (int)pn - (int)p; - else - len = strlen(p); - - MD5_checksum(p, len, lbs->el_index[*lbs->n_el_index].md5_digest); - - if (lbs->el_index[*lbs->n_el_index].message_id > 0) - { - if (verbose) - { - if (*lbs->n_el_index == 0) - printf("\n"); - - printf(" ID %3d in %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"); - - for (i=0 ; i<16 ; i++) - printf("%02X", lbs->el_index[*lbs->n_el_index].md5_digest[i]); - printf("\n"); - } - - /* valid ID */ - (*lbs->n_el_index)++; - } - - p += 8; - } - - } while (p); - - free(buffer); + free(buffer); } - } + } - free(file_list); + free(file_list); - /* sort entries according to date */ - qsort(lbs->el_index, *lbs->n_el_index, sizeof(EL_INDEX), eli_compare); + /* sort entries according to date */ + qsort(lbs->el_index, *lbs->n_el_index, sizeof(EL_INDEX), eli_compare); - if (verbose) - { - printf("After sort:\n"); - for (i=0 ; i<*lbs->n_el_index ; i++) - printf(" ID %3d in %s, ofs %5d\n", - lbs->el_index[i].message_id, lbs->el_index[i].file_name, - lbs->el_index[i].offset); - } + if (verbose) { + printf("After sort:\n"); + for (i = 0; i < *lbs->n_el_index; i++) + printf(" ID %3d in %s, ofs %5d\n", + lbs->el_index[i].message_id, lbs->el_index[i].file_name, + lbs->el_index[i].offset); + } - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ int el_index_logbooks(BOOL reinit) { -char str[256], data_dir[256], logbook[256], cwd[256], *p; -int i, j, n, status; + char str[256], data_dir[256], logbook[256], cwd[256], *p; + int i, j, n, status; - if (reinit) - { - for (i=0 ; lb_list[i].name[0] ; i++) - { - if (lb_list[i].el_index != NULL) - { - free(lb_list[i].el_index); - free(lb_list[i].n_el_index); + if (reinit) { + for (i = 0; lb_list[i].name[0]; i++) { + if (lb_list[i].el_index != NULL) { + free(lb_list[i].el_index); + free(lb_list[i].n_el_index); - /* check if other logbook uses same index */ - for (j=i+1 ; lb_list[j].name[0] ; j++) - { - /* mark that logbook already freed */ - if (lb_list[j].el_index == lb_list[i].el_index) - lb_list[j].el_index = NULL; - } - } + /* check if other logbook uses same index */ + for (j = i + 1; lb_list[j].name[0]; j++) { + /* mark that logbook already freed */ + if (lb_list[j].el_index == lb_list[i].el_index) + lb_list[j].el_index = NULL; + } + } } - free(lb_list); - } + free(lb_list); + } - /* count logbooks */ - for (i=n=0 ; ; i++) - { - if (!enumgrp(i, str)) - break; + /* count logbooks */ + for (i = n = 0;; i++) { + if (!enumgrp(i, str)) + break; - if (equal_ustring(str, "global")) - continue; + if (equal_ustring(str, "global")) + continue; - n++; - } + n++; + } - lb_list = calloc(sizeof(LOGBOOK), n+1); - for (i=n=0 ; ; i++) - { - if (!enumgrp(i, logbook)) - break; + lb_list = calloc(sizeof(LOGBOOK), n + 1); + for (i = n = 0;; i++) { + if (!enumgrp(i, logbook)) + break; - if (equal_ustring(logbook, "global")) - continue; + if (equal_ustring(logbook, "global")) + continue; - strcpy(lb_list[n].name, logbook); - strcpy(lb_list[n].name_enc, logbook); - url_encode(lb_list[n].name_enc, sizeof(lb_list[n].name_enc)); + strcpy(lb_list[n].name, logbook); + strcpy(lb_list[n].name_enc, logbook); + url_encode(lb_list[n].name_enc, sizeof(lb_list[n].name_enc)); - /* get data dir from configuration file (old method) */ - if (getcfg(logbook, "Data dir", str)) - { - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strlcpy(data_dir, str, sizeof(data_dir)); - else - { - strlcpy(data_dir, resource_dir, sizeof(data_dir)); - strlcat(data_dir, str, sizeof(data_dir)); - } - } - else - { - /* use logbook_dir + "Subdir" (new method) */ - strlcpy(data_dir, logbook_dir, sizeof(data_dir)); - if (data_dir[strlen(data_dir)-1] != DIR_SEPARATOR) - strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir)); + /* get data dir from configuration file (old method) */ + if (getcfg(logbook, "Data dir", str)) { + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strlcpy(data_dir, str, sizeof(data_dir)); + else { + strlcpy(data_dir, resource_dir, sizeof(data_dir)); + strlcat(data_dir, str, sizeof(data_dir)); + } + } else { + /* use logbook_dir + "Subdir" (new method) */ + strlcpy(data_dir, logbook_dir, sizeof(data_dir)); + if (data_dir[strlen(data_dir) - 1] != DIR_SEPARATOR) + strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir)); - if (getcfg(logbook, "Subdir", str)) - { - if (str[0] == DIR_SEPARATOR) - strlcpy(data_dir, str, sizeof(data_dir)); - else - strlcat(data_dir, str, sizeof(data_dir)); - } - else - strlcat(data_dir, logbook, sizeof(data_dir)); /* use logbook name as default */ + if (getcfg(logbook, "Subdir", str)) { + if (str[0] == DIR_SEPARATOR) + strlcpy(data_dir, str, sizeof(data_dir)); + else + strlcat(data_dir, str, sizeof(data_dir)); + } else + strlcat(data_dir, logbook, sizeof(data_dir)); /* use logbook name as default */ } - if (data_dir[strlen(data_dir)-1] != DIR_SEPARATOR) - strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir)); + if (data_dir[strlen(data_dir) - 1] != DIR_SEPARATOR) + strlcat(data_dir, DIR_SEPARATOR_STR, sizeof(data_dir)); - /* create data directory if not existing */ - getcwd(cwd, sizeof(cwd)); + /* create data directory if not existing */ + getcwd(cwd, sizeof(cwd)); - j = chdir(data_dir); - if (j < 0) - { - p = data_dir; - if (*p == DIR_SEPARATOR) - { - chdir(DIR_SEPARATOR_STR); - p++; - } - if (p[1] == ':') - { - strcpy(str, p); - if (str[2] == DIR_SEPARATOR) - str[3] = 0; - else - str[2] = 0; + j = chdir(data_dir); + if (j < 0) { + p = data_dir; + if (*p == DIR_SEPARATOR) { + chdir(DIR_SEPARATOR_STR); + p++; + } + if (p[1] == ':') { + strcpy(str, p); + if (str[2] == DIR_SEPARATOR) + str[3] = 0; + else + str[2] = 0; - chdir(str); - p += strlen(str); - } + chdir(str); + p += strlen(str); + } - do - { - if (strchr(p, DIR_SEPARATOR)) - { - strlcpy(str, p, sizeof(str)); - *strchr(str, DIR_SEPARATOR) = 0; - p = strchr(p, DIR_SEPARATOR)+1; - } - else - { - strlcpy(str, p, sizeof(str)); - p = NULL; - } - - j = chdir(str); - if (j < 0) - { - -#ifdef OS_WINNT - j = mkdir(str); -#else - j = mkdir(str, 0755); -#endif - - if (j == 0) - printf("Created directory \"%s\"\n", str); - else - { - perror("el_index_logbooks"); - printf("Cannot create directory \"%s\"\n", str); + do { + if (strchr(p, DIR_SEPARATOR)) { + strlcpy(str, p, sizeof(str)); + *strchr(str, DIR_SEPARATOR) = 0; + p = strchr(p, DIR_SEPARATOR) + 1; + } else { + strlcpy(str, p, sizeof(str)); + p = NULL; } - chdir(str); - } + j = chdir(str); + if (j < 0) { - } while (p && *p); +#ifdef OS_WINNT + j = mkdir(str); +#else + j = mkdir(str, 0755); +#endif + + if (j == 0) + printf("Created directory \"%s\"\n", str); + else { + perror("el_index_logbooks"); + printf("Cannot create directory \"%s\"\n", str); + } + + chdir(str); + } + + } while (p && *p); } - chdir(cwd); - strcpy(lb_list[n].data_dir, data_dir); - lb_list[n].el_index = NULL; + chdir(cwd); + strcpy(lb_list[n].data_dir, data_dir); + lb_list[n].el_index = NULL; - printf("Indexing logbook \"%s\" ... ", logbook); - fflush(stdout); - status = el_build_index(&lb_list[n], FALSE); - printf("ok\n"); + printf("Indexing logbook \"%s\" ... ", logbook); + fflush(stdout); + status = el_build_index(&lb_list[n], FALSE); + printf("ok\n"); - if (status == EL_EMPTY) - printf("Found empty logbook \"%s\"\n", logbook); - else if (status == EL_UPGRADE) - { - printf("Please upgrade data files in \"%s\" with the elconv program.\n", data_dir); - return EL_UPGRADE; - } - else if (status != EL_SUCCESS) - { - printf("Error generating index.\n"); - return status; + if (status == EL_EMPTY) + printf("Found empty logbook \"%s\"\n", logbook); + else if (status == EL_UPGRADE) { + printf + ("Please upgrade data files in \"%s\" with the elconv program.\n", + data_dir); + return EL_UPGRADE; + } else if (status != EL_SUCCESS) { + printf("Error generating index.\n"); + return status; } - n++; - } + n++; + } - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int el_search_message(LOGBOOK *lbs, int mode, int message_id, BOOL head_only) +int el_search_message(LOGBOOK * lbs, int mode, int message_id, + BOOL head_only) /********************************************************************\ Routine: el_search_message @@ -2510,99 +2454,92 @@ int el_search_message(LOGBOOK *lbs, int mode, int message_id, BOOL head_only) \********************************************************************/ { -int i; - - if (lbs->n_el_index == 0) - return 0; - - if (mode == EL_FIRST) - { - if (head_only) - { - for (i=0 ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].in_reply_to == 0) - return lbs->el_index[i].message_id; + int i; + if (lbs->n_el_index == 0) return 0; + + if (mode == EL_FIRST) { + if (head_only) { + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].in_reply_to == 0) + return lbs->el_index[i].message_id; + + return 0; } - if (*lbs->n_el_index == 0) - return 0; - return lbs->el_index[0].message_id; - } + if (*lbs->n_el_index == 0) + return 0; + return lbs->el_index[0].message_id; + } - if (mode == EL_LAST) - { - if (head_only) - { - for (i=*lbs->n_el_index-1 ; i>=0 ; i--) - if (lbs->el_index[i].in_reply_to == 0) - return lbs->el_index[i].message_id; + if (mode == EL_LAST) { + if (head_only) { + for (i = *lbs->n_el_index - 1; i >= 0; i--) + if (lbs->el_index[i].in_reply_to == 0) + return lbs->el_index[i].message_id; - return 0; + return 0; } - if (*lbs->n_el_index == 0) - return 0; - return lbs->el_index[*lbs->n_el_index-1].message_id; - } + if (*lbs->n_el_index == 0) + return 0; + return lbs->el_index[*lbs->n_el_index - 1].message_id; + } - if (mode == EL_NEXT) - { - for (i=0 ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].message_id == message_id) - break; + if (mode == EL_NEXT) { + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].message_id == message_id) + break; - if (i == *lbs->n_el_index) - return 0; // message not found + if (i == *lbs->n_el_index) + return 0; // message not found - if (i == *lbs->n_el_index-1) - return 0; // last message + if (i == *lbs->n_el_index - 1) + return 0; // last message - if (head_only) - { - for (i++ ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].in_reply_to == 0) - return lbs->el_index[i].message_id; + if (head_only) { + for (i++; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].in_reply_to == 0) + return lbs->el_index[i].message_id; - return 0; + return 0; } - return lbs->el_index[i+1].message_id; - } + return lbs->el_index[i + 1].message_id; + } - if (mode == EL_PREV) - { - for (i=0 ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].message_id == message_id) - break; + if (mode == EL_PREV) { + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].message_id == message_id) + break; - if (i == *lbs->n_el_index) - return 0; // message not found + if (i == *lbs->n_el_index) + return 0; // message not found - if (i == 0) - return 0; // first message + if (i == 0) + return 0; // first message - if (head_only) - { - for (i-- ; i>=0 ; i--) - if (lbs->el_index[i].in_reply_to == 0) - return lbs->el_index[i].message_id; + if (head_only) { + for (i--; i >= 0; i--) + if (lbs->el_index[i].in_reply_to == 0) + return lbs->el_index[i].message_id; - return 0; + return 0; } - return lbs->el_index[i-1].message_id; - } + return lbs->el_index[i - 1].message_id; + } - return 0; + return 0; } /*------------------------------------------------------------------*/ -INT el_retrieve(LOGBOOK *lbs, - int message_id, char *date, char attr_list[MAX_N_ATTR][NAME_LENGTH], +INT el_retrieve(LOGBOOK * lbs, + int message_id, char *date, + char attr_list[MAX_N_ATTR][NAME_LENGTH], char attrib[MAX_N_ATTR][NAME_LENGTH], int n_attr, - char *text, int *textsize, - char *in_reply_to, char *reply_to, + char *text, int *textsize, char *in_reply_to, + char *reply_to, char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], char *encoding, char *locked_by) /********************************************************************\ @@ -2638,303 +2575,287 @@ INT el_retrieve(LOGBOOK *lbs, \********************************************************************/ { -int i, index, size, fh; -char str[NAME_LENGTH], file_name[256], *p; -char message[TEXT_SIZE+1000], attachment_all[64*MAX_ATTACHMENTS]; + int i, index, size, fh; + char str[NAME_LENGTH], file_name[256], *p; + char message[TEXT_SIZE + 1000], attachment_all[64 * MAX_ATTACHMENTS]; - if (message_id == 0) - /* open most recent message */ - message_id = el_search_message(lbs, EL_LAST, 0, FALSE); + if (message_id == 0) + /* open most recent message */ + message_id = el_search_message(lbs, EL_LAST, 0, FALSE); - if (message_id == 0) - return EL_EMPTY; + if (message_id == 0) + return EL_EMPTY; - for (index = 0 ; index < *lbs->n_el_index ; index++) - if (lbs->el_index[index].message_id == message_id) - break; + for (index = 0; index < *lbs->n_el_index; index++) + if (lbs->el_index[index].message_id == message_id) + break; - if (index == *lbs->n_el_index) - return EL_NO_MSG; + if (index == *lbs->n_el_index) + return EL_NO_MSG; - sprintf(file_name, "%s%s", lbs->data_dir, lbs->el_index[index].file_name); - fh = open(file_name, O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - /* 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); - } + sprintf(file_name, "%s%s", lbs->data_dir, + lbs->el_index[index].file_name); + fh = open(file_name, O_RDWR | O_BINARY, 0644); + if (fh < 0) { + /* 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); + } - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - i = read(fh, message, sizeof(message)-1); - if (i <= 0) - { - close(fh); - return EL_FILE_ERROR; - } + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + i = read(fh, message, sizeof(message) - 1); + if (i <= 0) { + close(fh); + return EL_FILE_ERROR; + } - message[i] = 0; - close(fh); + message[i] = 0; + close(fh); - if (strncmp(message, "$@MID@$:", 8) != 0) - { - /* 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); - } + if (strncmp(message, "$@MID@$:", 8) != 0) { + /* 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); + } - /* check for correct ID */ - if (atoi(message+8) != message_id) - return EL_FILE_ERROR; + /* check for correct ID */ + if (atoi(message + 8) != message_id) + return EL_FILE_ERROR; - /* decode message size */ - p = strstr(message+8, "$@MID@$:"); - if (p == NULL) - size = strlen(message); - else - size = (int) p - (int) message; + /* decode message size */ + p = strstr(message + 8, "$@MID@$:"); + if (p == NULL) + size = strlen(message); + else + size = (int) p - (int) message; - message[size] = 0; + message[size] = 0; - /* decode message */ - if (date) - el_decode(message, "Date: ", date); - if (reply_to) - el_decode(message, "Reply to: ", reply_to); - if (in_reply_to) - el_decode(message, "In reply to: ", in_reply_to); + /* decode message */ + if (date) + el_decode(message, "Date: ", date); + if (reply_to) + el_decode(message, "Reply to: ", reply_to); + if (in_reply_to) + el_decode(message, "In reply to: ", in_reply_to); - if (attrib) - for (i=0 ; i \r conversion (e.g. zipping/unzipping) */ - if (p == NULL) - p = strstr(message, "========================================\r"); + /* check for \n -> \r conversion (e.g. zipping/unzipping) */ + if (p == NULL) + p = strstr(message, "========================================\r"); - if (text) - { - if (p != NULL) - { - p += 41; - if ((int) strlen(p) >= *textsize) - { - strlcpy(text, p, *textsize); - show_error("Message too long to display. Please increase TEXT_SIZE and recompile elogd."); - return EL_FILE_ERROR; - } - else - { - strlcpy(text, p, *textsize); + if (text) { + if (p != NULL) { + p += 41; + if ((int) strlen(p) >= *textsize) { + strlcpy(text, p, *textsize); + show_error + ("Message too long to display. Please increase TEXT_SIZE and recompile elogd."); + return EL_FILE_ERROR; + } else { + strlcpy(text, p, *textsize); - /* strip CR at end */ - if (text[strlen(text)-1] == '\n') - { - text[strlen(text)-1] = 0; - if (text[strlen(text)-1] == '\r') - text[strlen(text)-1] = 0; - } + /* strip CR at end */ + if (text[strlen(text) - 1] == '\n') { + text[strlen(text) - 1] = 0; + if (text[strlen(text) - 1] == '\r') + text[strlen(text) - 1] = 0; + } - *textsize = strlen(text); - } + *textsize = strlen(text); + } + } else { + text[0] = 0; + *textsize = 0; } - else - { - text[0] = 0; - *textsize = 0; - } - } + } - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int el_submit_attachment(LOGBOOK *lbs, char *afilename, char *buffer, +int el_submit_attachment(LOGBOOK * lbs, char *afilename, char *buffer, int buffer_size, char *full_name) { -char file_name[MAX_PATH_LENGTH], dir[MAX_PATH_LENGTH], str[MAX_PATH_LENGTH], *p; -int fh; -time_t now; -struct tm tms; + char file_name[MAX_PATH_LENGTH], dir[MAX_PATH_LENGTH], + str[MAX_PATH_LENGTH], *p; + int fh; + time_t now; + struct tm tms; - /* strip directory, add date and time to filename */ - strcpy(file_name, afilename); - p = file_name; - while (strchr(p, ':')) - p = strchr(p, ':')+1; - while (strchr(p, '\\')) - p = strchr(p, '\\')+1; /* NT */ - while (strchr(p, '/')) - p = strchr(p, '/')+1; /* Unix */ + /* strip directory, add date and time to filename */ + strcpy(file_name, afilename); + p = file_name; + while (strchr(p, ':')) + p = strchr(p, ':') + 1; + while (strchr(p, '\\')) + p = strchr(p, '\\') + 1; /* NT */ + while (strchr(p, '/')) + p = strchr(p, '/') + 1; /* Unix */ - /* assemble ELog filename */ - if (p[0]) - { - strcpy(dir, lbs->data_dir); + /* assemble ELog filename */ + if (p[0]) { + strcpy(dir, lbs->data_dir); - time(&now); - memcpy(&tms, localtime(&now), sizeof(struct tm)); + time(&now); + memcpy(&tms, localtime(&now), sizeof(struct tm)); - strcpy(str, p); - if (full_name) - sprintf(full_name, "%02d%02d%02d_%02d%02d%02d_%s", - tms.tm_year % 100, tms.tm_mon+1, tms.tm_mday, + strcpy(str, p); + if (full_name) + sprintf(full_name, "%02d%02d%02d_%02d%02d%02d_%s", + tms.tm_year % 100, tms.tm_mon + 1, tms.tm_mday, + tms.tm_hour, tms.tm_min, tms.tm_sec, str); + + sprintf(file_name, "%s%02d%02d%02d_%02d%02d%02d_%s", dir, + tms.tm_year % 100, tms.tm_mon + 1, tms.tm_mday, tms.tm_hour, tms.tm_min, tms.tm_sec, str); - sprintf(file_name, "%s%02d%02d%02d_%02d%02d%02d_%s", dir, - tms.tm_year % 100, tms.tm_mon+1, tms.tm_mday, - tms.tm_hour, tms.tm_min, tms.tm_sec, str); - - /* save attachment */ - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - sprintf(str, "Cannot write attachment file \"%s\"", file_name); - show_error(str); - return -1; + /* save attachment */ + fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) { + sprintf(str, "Cannot write attachment file \"%s\"", file_name); + show_error(str); + return -1; + } else { + write(fh, buffer, buffer_size); + close(fh); } - else - { - write(fh, buffer, buffer_size); + } + + return 0; +} + +/*------------------------------------------------------------------*/ + +void el_delete_attachment(LOGBOOK * lbs, char *file_name) +{ + char str[MAX_PATH_LENGTH]; + + strlcpy(str, lbs->data_dir, sizeof(str)); + strlcat(str, file_name, sizeof(str)); + remove(str); +} + +/*------------------------------------------------------------------*/ + +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; + char message[TEXT_SIZE + 1000], attachment_all[64 * MAX_ATTACHMENTS]; + + if (message_id == 0) + return EL_EMPTY; + + for (index = 0; index < *lbs->n_el_index; index++) + if (lbs->el_index[index].message_id == message_id) + break; + + if (index == *lbs->n_el_index) + return EL_NO_MSG; + + sprintf(file_name, "%s%s", lbs->data_dir, + lbs->el_index[index].file_name); + fh = open(file_name, O_RDWR | O_BINARY, 0644); + if (fh < 0) { + /* file might have been deleted, rebuild index */ + el_build_index(lbs, TRUE); + return el_retrieve_attachment(lbs, message_id, n, name); + } + + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + i = read(fh, message, sizeof(message) - 1); + if (i <= 0) { close(fh); - } - } + return EL_FILE_ERROR; + } - return 0; + message[i] = 0; + close(fh); + + if (strncmp(message, "$@MID@$:", 8) != 0) { + /* file might have been edited, rebuild index */ + el_build_index(lbs, TRUE); + return el_retrieve_attachment(lbs, message_id, n, name); + } + + /* check for correct ID */ + if (atoi(message + 8) != message_id) + return EL_FILE_ERROR; + + /* decode message size */ + p = strstr(message + 8, "$@MID@$:"); + if (p == NULL) + size = strlen(message); + else + size = (int) p - (int) message; + + message[size] = 0; + + el_decode(message, "Attachment: ", attachment_all); + + name[0] = 0; + + for (i = 0; i <= n; i++) { + if (i == 0) + p = strtok(attachment_all, ","); + else + p = strtok(NULL, ","); + + if (p == NULL) + break; + } + + if (p) + strlcpy(name, p, MAX_PATH_LENGTH); + + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -void el_delete_attachment(LOGBOOK *lbs, char *file_name) -{ -char str[MAX_PATH_LENGTH]; - - strlcpy(str, lbs->data_dir, sizeof(str)); - strlcat(str, file_name, sizeof(str)); - remove(str); -} - -/*------------------------------------------------------------------*/ - -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; -char message[TEXT_SIZE+1000], attachment_all[64*MAX_ATTACHMENTS]; - - if (message_id == 0) - return EL_EMPTY; - - for (index = 0 ; index < *lbs->n_el_index ; index++) - if (lbs->el_index[index].message_id == message_id) - break; - - if (index == *lbs->n_el_index) - return EL_NO_MSG; - - sprintf(file_name, "%s%s", lbs->data_dir, lbs->el_index[index].file_name); - fh = open(file_name, O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - /* file might have been deleted, rebuild index */ - el_build_index(lbs, TRUE); - return el_retrieve_attachment(lbs, message_id, n, name); - } - - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - i = read(fh, message, sizeof(message)-1); - if (i <= 0) - { - close(fh); - return EL_FILE_ERROR; - } - - message[i] = 0; - close(fh); - - if (strncmp(message, "$@MID@$:", 8) != 0) - { - /* file might have been edited, rebuild index */ - el_build_index(lbs, TRUE); - return el_retrieve_attachment(lbs, message_id, n, name); - } - - /* check for correct ID */ - if (atoi(message+8) != message_id) - return EL_FILE_ERROR; - - /* decode message size */ - p = strstr(message+8, "$@MID@$:"); - if (p == NULL) - size = strlen(message); - else - size = (int) p - (int) message; - - message[size] = 0; - - el_decode(message, "Attachment: ", attachment_all); - - name[0] = 0; - - for (i=0 ; i<=n; i++) - { - if (i == 0) - p = strtok(attachment_all, ","); - else - p = strtok(NULL, ","); - - if (p == NULL) - break; - } - - if (p) - strlcpy(name, p, MAX_PATH_LENGTH); - - return EL_SUCCESS; -} - -/*------------------------------------------------------------------*/ - -int el_submit(LOGBOOK *lbs, int message_id, +int el_submit(LOGBOOK * lbs, int message_id, char *date, char attr_name[MAX_N_ATTR][NAME_LENGTH], char attr_value[MAX_N_ATTR][NAME_LENGTH], @@ -2942,8 +2863,7 @@ int el_submit(LOGBOOK *lbs, int message_id, char *in_reply_to, char *reply_to, char *encoding, char afilename[MAX_ATTACHMENTS][256], - BOOL mark_original, - char *locked_by) + BOOL mark_original, char *locked_by) /********************************************************************\ Routine: el_submit @@ -2975,293 +2895,294 @@ int el_submit(LOGBOOK *lbs, int message_id, \********************************************************************/ { -INT n, i, j, size, fh, index, tail_size, orig_size, delta, reply_id; -struct tm tms; -char file_name[256], dir[256], str[NAME_LENGTH]; -time_t now, ltime; -char message[TEXT_SIZE+100], *p, *buffer; -BOOL bedit; -char attachment_all[64*MAX_ATTACHMENTS]; + INT n, i, j, size, fh, index, tail_size, orig_size, delta, reply_id; + struct tm tms; + char file_name[256], dir[256], str[NAME_LENGTH]; + time_t now, ltime; + char message[TEXT_SIZE + 100], *p, *buffer; + BOOL bedit; + char attachment_all[64 * MAX_ATTACHMENTS]; - /* generate new file name YYMMDD.log in data directory */ - strcpy(dir, lbs->data_dir); + /* generate new file name YYMMDD.log in data directory */ + strcpy(dir, lbs->data_dir); - bedit = (message_id > 0); + bedit = (message_id > 0); - if (bedit) - { - /* edit existing message */ - for (index=0 ; index<*lbs->n_el_index ; index++) - if (lbs->el_index[index].message_id == message_id) - break; + if (bedit) { + /* edit existing message */ + for (index = 0; index < *lbs->n_el_index; index++) + if (lbs->el_index[index].message_id == message_id) + break; - if (index == *lbs->n_el_index) - return -1; + if (index == *lbs->n_el_index) + return -1; - sprintf(file_name, "%s%s", lbs->data_dir, lbs->el_index[index].file_name); - fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); - if (fh < 0) - return -1; + sprintf(file_name, "%s%s", lbs->data_dir, + lbs->el_index[index].file_name); + fh = open(file_name, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) + return -1; - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - i = read(fh, message, sizeof(message)-1); - message[i] = 0; + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + i = read(fh, message, sizeof(message) - 1); + message[i] = 0; - /* check for valid message */ - if (strncmp(message, "$@MID@$:", 8) != 0) - { - close(fh); + /* check for valid message */ + if (strncmp(message, "$@MID@$:", 8) != 0) { + close(fh); - /* file might have been edited, rebuild index */ - el_build_index(lbs, TRUE); - return el_submit(lbs, message_id, date, attr_name, attr_value, n_attr, text, - in_reply_to, reply_to, encoding, afilename, TRUE, locked_by); + /* file might have been edited, rebuild index */ + el_build_index(lbs, TRUE); + return el_submit(lbs, message_id, date, attr_name, attr_value, + n_attr, text, in_reply_to, reply_to, encoding, + afilename, TRUE, locked_by); } - /* check for correct ID */ - if (atoi(message+8) != message_id) - { - close(fh); - return -1; + /* check for correct ID */ + if (atoi(message + 8) != message_id) { + close(fh); + return -1; } - /* decode message size */ - p = strstr(message+8, "$@MID@$:"); - if (p == NULL) - size = strlen(message); - else - size = (int) p - (int) message; + /* decode message size */ + p = strstr(message + 8, "$@MID@$:"); + if (p == NULL) + size = strlen(message); + else + size = (int) p - (int) message; - message[size] = 0; + message[size] = 0; - if (equal_ustring(date, "")) - el_decode(message, "Date: ", date); - if (equal_ustring(reply_to, "")) - el_decode(message, "Reply to: ", reply_to); - if (equal_ustring(in_reply_to, "")) - el_decode(message, "In reply to: ", in_reply_to); - el_decode(message, "Attachment: ", attachment_all); + if (equal_ustring(date, "")) + el_decode(message, "Date: ", date); + if (equal_ustring(reply_to, "")) + el_decode(message, "Reply to: ", reply_to); + if (equal_ustring(in_reply_to, "")) + el_decode(message, "In reply to: ", in_reply_to); + el_decode(message, "Attachment: ", attachment_all); - /* buffer tail of logfile */ - lseek(fh, 0, SEEK_END); - orig_size = size; - tail_size = TELL(fh) - (lbs->el_index[index].offset+size); + /* buffer tail of logfile */ + lseek(fh, 0, SEEK_END); + orig_size = size; + tail_size = TELL(fh) - (lbs->el_index[index].offset + size); - if (tail_size > 0) - { - buffer = malloc(tail_size); - if (buffer == NULL) - { - close(fh); - return -1; - } + if (tail_size > 0) { + buffer = malloc(tail_size); + if (buffer == NULL) { + close(fh); + return -1; + } - lseek(fh, lbs->el_index[index].offset+size, SEEK_SET); - n = read(fh, buffer, tail_size); + lseek(fh, lbs->el_index[index].offset + size, SEEK_SET); + n = read(fh, buffer, tail_size); } - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - } - else - { - /* create new message */ - if (!date[0]) - { - time(&now); - strcpy(date, ctime(&now)); - date[24] = 0; + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + } else { + /* create new message */ + if (!date[0]) { + time(&now); + strcpy(date, ctime(&now)); + date[24] = 0; } - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; - memset(&tms, 0, sizeof(struct tm)); - tms.tm_mon = i; - tms.tm_mday = atoi(date+8); - tms.tm_hour = atoi(date+11); - tms.tm_min = atoi(date+14); - tms.tm_sec = atoi(date+17); - tms.tm_year = atoi(date+20)-1900; + memset(&tms, 0, sizeof(struct tm)); + tms.tm_mon = i; + tms.tm_mday = atoi(date + 8); + tms.tm_hour = atoi(date + 11); + tms.tm_min = atoi(date + 14); + tms.tm_sec = atoi(date + 17); + tms.tm_year = atoi(date + 20) - 1900; - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime = mktime(&tms); + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime = mktime(&tms); - if (date[8] == ' ') - date[8] = '0'; + 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); - if (fh < 0) - return -1; + sprintf(str, "%s%s", dir, file_name); + fh = open(str, O_CREAT | O_RDWR | O_BINARY, 0644); + if (fh < 0) + return -1; - lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_END); - /* new message id is old plus one */ - message_id = 1; - for (i= 0 ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].message_id >= message_id) - message_id = lbs->el_index[i].message_id + 1; + /* new message id is old plus one */ + message_id = 1; + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].message_id >= message_id) + message_id = lbs->el_index[i].message_id + 1; - /* enter message in index */ - (*lbs->n_el_index)++; - lbs->el_index = realloc(lbs->el_index, sizeof(EL_INDEX)*(*lbs->n_el_index)); - lbs->el_index[*lbs->n_el_index-1].message_id = message_id; - strcpy(lbs->el_index[*lbs->n_el_index-1].file_name, file_name); - lbs->el_index[*lbs->n_el_index-1].file_time = ltime; - lbs->el_index[*lbs->n_el_index-1].offset = TELL(fh); - lbs->el_index[*lbs->n_el_index-1].in_reply_to = atoi(in_reply_to); + /* enter message in index */ + (*lbs->n_el_index)++; + lbs->el_index = + realloc(lbs->el_index, sizeof(EL_INDEX) * (*lbs->n_el_index)); + lbs->el_index[*lbs->n_el_index - 1].message_id = message_id; + strcpy(lbs->el_index[*lbs->n_el_index - 1].file_name, file_name); + lbs->el_index[*lbs->n_el_index - 1].file_time = ltime; + lbs->el_index[*lbs->n_el_index - 1].offset = TELL(fh); + lbs->el_index[*lbs->n_el_index - 1].in_reply_to = atoi(in_reply_to); - /* if index not ordered, sort it */ - i = *lbs->n_el_index; - if (i > 1 && lbs->el_index[i-1].file_time < lbs->el_index[i-2].file_time) - qsort(lbs->el_index, i, sizeof(EL_INDEX), eli_compare); + /* if index not ordered, sort it */ + i = *lbs->n_el_index; + if (i > 1 + && lbs->el_index[i - 1].file_time < + lbs->el_index[i - 2].file_time) + qsort(lbs->el_index, i, sizeof(EL_INDEX), eli_compare); - /* if other logbook has same index, update pointers */ - for (i=0 ; lb_list[i].name[0] ; i++) - if (&lb_list[i] != lbs && lb_list[i].n_el_index == lbs->n_el_index) - lb_list[i].el_index = lbs->el_index; - } + /* if other logbook has same index, update pointers */ + for (i = 0; lb_list[i].name[0]; i++) + if (&lb_list[i] != lbs + && lb_list[i].n_el_index == lbs->n_el_index) + lb_list[i].el_index = lbs->el_index; + } - /* compose message */ + /* compose message */ - sprintf(message, "$@MID@$: %d\n", message_id); - sprintf(message+strlen(message), "Date: %s\n", date); + sprintf(message, "$@MID@$: %d\n", message_id); + sprintf(message + strlen(message), "Date: %s\n", date); - if (reply_to[0]) - sprintf(message+strlen(message), "Reply to: %s\n", reply_to); + if (reply_to[0]) + sprintf(message + strlen(message), "Reply to: %s\n", reply_to); - if (in_reply_to[0]) - sprintf(message+strlen(message), "In reply to: %s\n", in_reply_to); + if (in_reply_to[0]) + sprintf(message + strlen(message), "In reply to: %s\n", in_reply_to); - for (i=0 ; i 0) - { - n = write(fh, buffer, tail_size); - free(buffer); + if (bedit) { + if (tail_size > 0) { + n = write(fh, buffer, tail_size); + free(buffer); - /* correct offsets for remaining messages in same file */ - delta = strlen(message) - orig_size; + /* correct offsets for remaining messages in same file */ + delta = strlen(message) - orig_size; - for (i=0 ; i<*lbs->n_el_index ; i++) - if (lbs->el_index[i].message_id == message_id) - break; + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].message_id == message_id) + break; - for (j = i+1 ; j<*lbs->n_el_index && - equal_ustring(lbs->el_index[i].file_name, lbs->el_index[j].file_name); j++) - lbs->el_index[j].offset += delta; + for (j = i + 1; j < *lbs->n_el_index && + equal_ustring(lbs->el_index[i].file_name, + lbs->el_index[j].file_name); j++) + lbs->el_index[j].offset += delta; } - /* truncate file here */ + /* truncate file here */ #ifdef _MSC_VER - chsize(fh, TELL(fh)); + chsize(fh, TELL(fh)); #else - ftruncate(fh, TELL(fh)); + ftruncate(fh, TELL(fh)); #endif - } + } - close(fh); + close(fh); - /* if reply, mark original message */ - if (mark_original && in_reply_to[0] && !bedit && atoi(in_reply_to) > 0) - { - char date[80], attr[MAX_N_ATTR][NAME_LENGTH], enc[80], - att[MAX_ATTACHMENTS][256], reply_to[MAX_REPLY_TO*10], lock[256]; + /* if reply, mark original message */ + if (mark_original && in_reply_to[0] && !bedit && atoi(in_reply_to) > 0) { + char date[80], attr[MAX_N_ATTR][NAME_LENGTH], enc[80], + att[MAX_ATTACHMENTS][256], reply_to[MAX_REPLY_TO * 10], + lock[256]; - reply_id = atoi(in_reply_to); + reply_id = atoi(in_reply_to); - /* retrieve original message */ - size = sizeof(message); - el_retrieve(lbs, reply_id, date, attr_list, attr, n_attr, - message, &size, in_reply_to, reply_to, att, enc, lock); + /* retrieve original message */ + size = sizeof(message); + el_retrieve(lbs, reply_id, date, attr_list, attr, n_attr, + message, &size, in_reply_to, reply_to, att, enc, lock); - if (reply_to[0]) - strcat(reply_to, ", "); - sprintf(reply_to + strlen(reply_to), "%d", message_id); + if (reply_to[0]) + strcat(reply_to, ", "); + sprintf(reply_to + strlen(reply_to), "%d", message_id); - /* write modified message */ - el_submit(lbs, reply_id, date, attr_list, attr, n_attr, - message, in_reply_to, reply_to, enc, att, TRUE, lock); - } + /* write modified message */ + el_submit(lbs, reply_id, date, attr_list, attr, n_attr, + message, in_reply_to, reply_to, enc, att, TRUE, lock); + } - return message_id; + return message_id; } /*------------------------------------------------------------------*/ -void remove_reference(LOGBOOK *lbs, int message_id, int remove_id, BOOL reply_to_flag) +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]; -char *p, *ps, message[TEXT_SIZE+1000]; -int size, status; + 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]; + char *p, *ps, message[TEXT_SIZE + 1000]; + int size, status; - /* retrieve original message */ - size = sizeof(message); - status = el_retrieve(lbs, message_id, date, attr_list, attr, lbs->n_attr, - message, &size, in_reply_to, reply_to, att, enc, lock); - if (status != EL_SUCCESS) - return; + /* retrieve original message */ + size = sizeof(message); + status = + el_retrieve(lbs, message_id, date, attr_list, attr, lbs->n_attr, + message, &size, in_reply_to, reply_to, att, enc, lock); + if (status != EL_SUCCESS) + return; - if (reply_to_flag) - p = reply_to; - else - p = in_reply_to; + if (reply_to_flag) + p = reply_to; + else + p = in_reply_to; - while (*p) - { - while (*p && (*p == ',' || *p == ' ')) - p++; + while (*p) { + while (*p && (*p == ',' || *p == ' ')) + p++; - ps = p; - while (isdigit(*ps)) - ps++; + ps = p; + while (isdigit(*ps)) + ps++; - while (*ps && (*ps == ',' || *ps == ' ')) - ps++; + while (*ps && (*ps == ',' || *ps == ' ')) + ps++; - if (atoi(p) == remove_id) - strcpy(p, ps); - else - while (isdigit(*p)) - p++; - } + if (atoi(p) == remove_id) + strcpy(p, ps); + else + while (isdigit(*p)) + p++; + } - /* write modified message */ - el_submit(lbs, message_id, date, attr_list, attr, lbs->n_attr, - message, in_reply_to, reply_to, enc, att, TRUE, lock); + /* write modified message */ + el_submit(lbs, message_id, date, attr_list, attr, lbs->n_attr, + message, in_reply_to, reply_to, enc, att, TRUE, lock); } /*------------------------------------------------------------------*/ -INT el_delete_message(LOGBOOK *lbs, int message_id, BOOL delete_attachments, - char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], BOOL delete_bw_ref, - BOOL delete_reply_to) +INT el_delete_message(LOGBOOK * lbs, int message_id, + BOOL delete_attachments, + char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], + BOOL delete_bw_ref, BOOL delete_reply_to) /********************************************************************\ Routine: el_delete_message @@ -3284,556 +3205,567 @@ INT el_delete_message(LOGBOOK *lbs, int message_id, BOOL delete_attachments, \********************************************************************/ { -INT i, index, n, size, fh, tail_size; -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]; + INT i, index, n, size, fh, tail_size; + 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]; - for (index = 0 ; index < *lbs->n_el_index ; index++) - if (lbs->el_index[index].message_id == message_id) - break; + for (index = 0; index < *lbs->n_el_index; index++) + if (lbs->el_index[index].message_id == message_id) + break; - if (index == *lbs->n_el_index) - return -1; + if (index == *lbs->n_el_index) + return -1; - sprintf(file_name, "%s%s", lbs->data_dir, lbs->el_index[index].file_name); - fh = open(file_name, O_RDWR | O_BINARY, 0644); - if (fh < 0) - return EL_FILE_ERROR; + sprintf(file_name, "%s%s", lbs->data_dir, + lbs->el_index[index].file_name); + fh = open(file_name, O_RDWR | O_BINARY, 0644); + if (fh < 0) + return EL_FILE_ERROR; - message = malloc(TEXT_SIZE+1000); + message = malloc(TEXT_SIZE + 1000); - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - i = read(fh, message, TEXT_SIZE+1000-1); - if (i <= 0) - { - free(message); - close(fh); - return EL_FILE_ERROR; - } - - if (_logging_level > 1) - logf(lbs, "DELETE message #%d", message_id); - - message[i] = 0; - - if (strncmp(message, "$@MID@$:", 8) != 0) - { - close(fh); - free(message); - - /* file might have been edited, rebuild index */ - el_build_index(lbs, TRUE); - return el_delete_message(lbs, message_id, delete_attachments, - attachment, delete_bw_ref, delete_reply_to); - } - - /* check for correct ID */ - if (atoi(message+8) != message_id) - { - close(fh); - free(message); - return EL_FILE_ERROR; - } - - /* decode message size */ - p = strstr(message+8, "$@MID@$:"); - if (p == NULL) - size = strlen(message); - else - size = (int) p - (int) message; - - message[size] = 0; - - /* delete attachments */ - el_decode(message, "Attachment: ", attachment_all); - - for (i=0 ; idata_dir, sizeof(str)); - strlcat(str, p, sizeof(str)); - remove(str); - } - - /* return old attachment if no new one */ - if (!attachment[i][0] && p) - strcpy(attachment[i], p); - } - - if (delete_attachments && p) - { - strlcpy(str, lbs->data_dir, sizeof(str)); - strlcat(str, p, sizeof(str)); - remove(str); - } - } - - /* decode references */ - el_decode(message, "Reply to: ", reply_to); - el_decode(message, "In reply to: ", in_reply_to); - - /* buffer tail of logfile */ - lseek(fh, 0, SEEK_END); - tail_size = TELL(fh) - (lbs->el_index[index].offset+size); - - if (tail_size > 0) - { - buffer = malloc(tail_size); - if (buffer == NULL) - { + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + i = read(fh, message, TEXT_SIZE + 1000 - 1); + if (i <= 0) { free(message); close(fh); return EL_FILE_ERROR; + } + + if (_logging_level > 1) + logf(lbs, "DELETE message #%d", message_id); + + message[i] = 0; + + if (strncmp(message, "$@MID@$:", 8) != 0) { + close(fh); + free(message); + + /* file might have been edited, rebuild index */ + el_build_index(lbs, TRUE); + return el_delete_message(lbs, message_id, delete_attachments, + attachment, delete_bw_ref, delete_reply_to); + } + + /* check for correct ID */ + if (atoi(message + 8) != message_id) { + close(fh); + free(message); + return EL_FILE_ERROR; + } + + /* decode message size */ + p = strstr(message + 8, "$@MID@$:"); + if (p == NULL) + size = strlen(message); + else + size = (int) p - (int) message; + + message[size] = 0; + + /* delete attachments */ + el_decode(message, "Attachment: ", attachment_all); + + for (i = 0; i < MAX_ATTACHMENTS; i++) { + if (i == 0) + p = strtok(attachment_all, ","); + else + p = strtok(NULL, ","); + + if (attachment != NULL) { + if (attachment[i][0] && p) { + /* delete old attachment if new one exists */ + strlcpy(str, lbs->data_dir, sizeof(str)); + strlcat(str, p, sizeof(str)); + remove(str); + } + + /* return old attachment if no new one */ + if (!attachment[i][0] && p) + strcpy(attachment[i], p); } - lseek(fh, lbs->el_index[index].offset+size, SEEK_SET); - n = read(fh, buffer, tail_size); - } - lseek(fh, lbs->el_index[index].offset, SEEK_SET); + if (delete_attachments && p) { + strlcpy(str, lbs->data_dir, sizeof(str)); + strlcat(str, p, sizeof(str)); + remove(str); + } + } - if (tail_size > 0) - { - n = write(fh, buffer, tail_size); - free(buffer); - } + /* decode references */ + el_decode(message, "Reply to: ", reply_to); + el_decode(message, "In reply to: ", in_reply_to); - /* truncate file here */ + /* buffer tail of logfile */ + lseek(fh, 0, SEEK_END); + tail_size = TELL(fh) - (lbs->el_index[index].offset + size); + + if (tail_size > 0) { + buffer = malloc(tail_size); + if (buffer == NULL) { + free(message); + close(fh); + return EL_FILE_ERROR; + } + + lseek(fh, lbs->el_index[index].offset + size, SEEK_SET); + n = read(fh, buffer, tail_size); + } + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + + if (tail_size > 0) { + n = write(fh, buffer, tail_size); + free(buffer); + } + + /* truncate file here */ #ifdef OS_WINNT - chsize(fh, TELL(fh)); + chsize(fh, TELL(fh)); #else - ftruncate(fh, TELL(fh)); + ftruncate(fh, TELL(fh)); #endif - /* if file length gets zero, delete file */ - tail_size = lseek(fh, 0, SEEK_END); - close(fh); - free(message); + /* if file length gets zero, delete file */ + tail_size = lseek(fh, 0, SEEK_END); + close(fh); + free(message); - if (tail_size == 0) - remove(file_name); + if (tail_size == 0) + remove(file_name); - /* remove message from index */ - strcpy(str, lbs->el_index[index].file_name); - for (i=index ; i<*lbs->n_el_index-1 ; i++) - { - memcpy(&lbs->el_index[i], &lbs->el_index[i+1], sizeof(EL_INDEX)); - if (equal_ustring(lbs->el_index[i].file_name, str)) - lbs->el_index[i].offset -= size; - } - (*lbs->n_el_index)--; - lbs->el_index = realloc(lbs->el_index, sizeof(EL_INDEX)*(*lbs->n_el_index)); + /* remove message from index */ + strcpy(str, lbs->el_index[index].file_name); + for (i = index; i < *lbs->n_el_index - 1; i++) { + memcpy(&lbs->el_index[i], &lbs->el_index[i + 1], sizeof(EL_INDEX)); + if (equal_ustring(lbs->el_index[i].file_name, str)) + lbs->el_index[i].offset -= size; + } + (*lbs->n_el_index)--; + lbs->el_index = + realloc(lbs->el_index, sizeof(EL_INDEX) * (*lbs->n_el_index)); - /* if other logbook has same index, update pointers */ - for (i=0 ; lb_list[i].name[0] ; i++) - if (&lb_list[i] != lbs && lb_list[i].n_el_index == lbs->n_el_index) - lb_list[i].el_index = lbs->el_index; + /* if other logbook has same index, update pointers */ + for (i = 0; lb_list[i].name[0]; i++) + if (&lb_list[i] != lbs && lb_list[i].n_el_index == lbs->n_el_index) + lb_list[i].el_index = lbs->el_index; - /* delete also replies to this message */ - if (delete_reply_to && reply_to[0]) - { - p = reply_to; - if (isdigit(*p)) - do - { - if (atoi(p)) - el_delete_message(lbs, atoi(p), TRUE, NULL, FALSE, TRUE); + /* delete also replies to this message */ + if (delete_reply_to && reply_to[0]) { + p = reply_to; + if (isdigit(*p)) + do { + if (atoi(p)) + el_delete_message(lbs, atoi(p), TRUE, NULL, FALSE, TRUE); - while (*p && isdigit(*p)) - p++; - while (*p && (*p == ',' || *p == ' ')) - p++; - } while(*p); - } + while (*p && isdigit(*p)) + p++; + while (*p && (*p == ',' || *p == ' ')) + p++; + } while (*p); + } - /* delete backward references */ - if (in_reply_to[0] && delete_bw_ref) - { - p = in_reply_to; - do - { - if (atoi(p)) - remove_reference(lbs, atoi(p), message_id, TRUE); + /* delete backward references */ + if (in_reply_to[0] && delete_bw_ref) { + p = in_reply_to; + do { + if (atoi(p)) + remove_reference(lbs, atoi(p), message_id, TRUE); - while (*p && isdigit(*p)) - p++; - while (*p && (*p == ',' || *p == ' ')) - p++; - } while(*p); - } + while (*p && isdigit(*p)) + p++; + while (*p && (*p == ',' || *p == ' ')) + p++; + } while (*p); + } - /* execute shell if requested */ - if (getcfg(lbs->name, "Execute delete", str)) - execute_shell(lbs, message_id, NULL, str); + /* execute shell if requested */ + if (getcfg(lbs->name, "Execute delete", str)) + execute_shell(lbs, message_id, NULL, str); - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int el_correct_links(LOGBOOK *lbs, int old_id, int new_id) +int el_correct_links(LOGBOOK * lbs, int old_id, int new_id) /* If a message gets resubmitted, the links to that message are wrong. This routine corrects that. */ { -int i, i1, n, n1, size; -char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], - 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[MAX_ATTACHMENTS][256]; + int i, i1, n, n1, size; + char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], + 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[MAX_ATTACHMENTS][256]; - el_retrieve(lbs, new_id, date, attr_list, attrib, lbs->n_attr, - NULL, 0, in_reply_to, reply_to, att_file, encoding, locked_by); + el_retrieve(lbs, new_id, date, attr_list, attrib, lbs->n_attr, + NULL, 0, in_reply_to, reply_to, att_file, encoding, + locked_by); - /* go through in_reply_to list */ - n = strbreak(in_reply_to, list, MAX_N_ATTR); - for (i=0 ; in_attr, - text, &size, in_reply_to, reply_to, att_file, encoding, locked_by); + /* go through in_reply_to list */ + n = strbreak(in_reply_to, list, MAX_N_ATTR); + for (i = 0; i < n; i++) { + size = sizeof(text); + el_retrieve(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, att_file, encoding, + locked_by); - n1 = strbreak(reply_to, list1, MAX_N_ATTR); - reply_to[0] = 0; - for (i1 = 0 ; i1 < n1 ; i1++) - { - /* replace old ID by new ID */ - if (atoi(list1[i1]) == old_id) - sprintf(reply_to+strlen(reply_to), "%d", new_id); - else - strcat(reply_to, list1[i1]); + n1 = strbreak(reply_to, list1, MAX_N_ATTR); + reply_to[0] = 0; + for (i1 = 0; i1 < n1; i1++) { + /* replace old ID by new ID */ + if (atoi(list1[i1]) == old_id) + sprintf(reply_to + strlen(reply_to), "%d", new_id); + else + strcat(reply_to, list1[i1]); - if (i1 < n1-1) - strcat(reply_to, ", "); + if (i1 < n1 - 1) + strcat(reply_to, ", "); } - el_submit(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, text, - in_reply_to, reply_to, encoding, att_file, TRUE, locked_by); - } + el_submit(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, + text, in_reply_to, reply_to, encoding, att_file, TRUE, + locked_by); + } - el_retrieve(lbs, new_id, date, attr_list, attrib, lbs->n_attr, - NULL, 0, in_reply_to, reply_to, att_file, encoding, locked_by); + el_retrieve(lbs, new_id, date, attr_list, attrib, lbs->n_attr, + NULL, 0, in_reply_to, reply_to, att_file, encoding, + locked_by); - /* go through reply_to list */ - n = strbreak(reply_to, list, MAX_N_ATTR); - for (i=0 ; in_attr, - text, &size, in_reply_to, reply_to, att_file, encoding, locked_by); + /* go through reply_to list */ + n = strbreak(reply_to, list, MAX_N_ATTR); + for (i = 0; i < n; i++) { + size = sizeof(text); + el_retrieve(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, att_file, encoding, + locked_by); - n1 = strbreak(in_reply_to, list1, MAX_N_ATTR); - in_reply_to[0] = 0; - for (i1 = 0 ; i1 < n1 ; i1++) - { - /* replace old ID by new ID */ - if (atoi(list1[i1]) == old_id) - sprintf(in_reply_to+strlen(in_reply_to), "%d", new_id); - else - strcat(in_reply_to, list1[i1]); + n1 = strbreak(in_reply_to, list1, MAX_N_ATTR); + in_reply_to[0] = 0; + for (i1 = 0; i1 < n1; i1++) { + /* replace old ID by new ID */ + if (atoi(list1[i1]) == old_id) + sprintf(in_reply_to + strlen(in_reply_to), "%d", new_id); + else + strcat(in_reply_to, list1[i1]); - if (i1 < n1-1) - strcat(in_reply_to, ", "); + if (i1 < n1 - 1) + strcat(in_reply_to, ", "); } - el_submit(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, text, - in_reply_to, reply_to, encoding, att_file, TRUE, locked_by); - } + el_submit(lbs, atoi(list[i]), date, attr_list, attrib, lbs->n_attr, + text, in_reply_to, reply_to, encoding, att_file, TRUE, + locked_by); + } - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int el_move_message_thread(LOGBOOK *lbs, int message_id) +int el_move_message_thread(LOGBOOK * lbs, int message_id) { -int i, n, size, new_id; -char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], - in_reply_to[80], reply_to[MAX_REPLY_TO*10], encoding[80], locked_by[256]; -char list[MAX_N_ATTR][NAME_LENGTH], str[256]; -char att_file[MAX_ATTACHMENTS][256]; + int i, n, size, new_id; + char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], + in_reply_to[80], reply_to[MAX_REPLY_TO * 10], encoding[80], + locked_by[256]; + char list[MAX_N_ATTR][NAME_LENGTH], str[256]; + char att_file[MAX_ATTACHMENTS][256]; - /* retrieve message */ - size = sizeof(text); - el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, att_file, encoding, locked_by); + /* retrieve message */ + size = sizeof(text); + el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, att_file, encoding, + locked_by); - /* submit as new message */ - date[0] = 0; - new_id = el_submit(lbs, 0, date, attr_list, attrib, lbs->n_attr, text, - in_reply_to, reply_to, encoding, att_file, FALSE, locked_by); + /* submit as new message */ + date[0] = 0; + new_id = el_submit(lbs, 0, date, attr_list, attrib, lbs->n_attr, text, + in_reply_to, reply_to, encoding, att_file, FALSE, + locked_by); - /* correct links */ - el_correct_links(lbs, message_id, new_id); + /* correct links */ + el_correct_links(lbs, message_id, new_id); - /* delete original message */ - el_delete_message(lbs, message_id, FALSE, NULL, FALSE, FALSE); + /* delete original message */ + el_delete_message(lbs, message_id, FALSE, NULL, FALSE, FALSE); - /* move all replies recursively */ - if (getcfg(lbs->name, "Resubmit replies", str) && atoi(str) == 1) - { - if (reply_to[0]) - { - n = strbreak(reply_to, list, MAX_N_ATTR); - for (i=0 ; iname, "Resubmit replies", str) && atoi(str) == 1) { + if (reply_to[0]) { + n = strbreak(reply_to, list, MAX_N_ATTR); + for (i = 0; i < n; i++) + el_move_message_thread(lbs, atoi(list[i])); } - } + } - return new_id; + return new_id; } /*------------------------------------------------------------------*/ -int el_lock_message(LOGBOOK *lbs, int message_id, char *user) +int el_lock_message(LOGBOOK * lbs, int message_id, char *user) /* lock message for editing */ { -int size; -char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], - in_reply_to[80], reply_to[MAX_REPLY_TO*10], encoding[80], locked_by[256]; -char att_file[MAX_ATTACHMENTS][256]; + int size; + char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], text[TEXT_SIZE], + in_reply_to[80], reply_to[MAX_REPLY_TO * 10], encoding[80], + locked_by[256]; + char att_file[MAX_ATTACHMENTS][256]; - /* retrieve message */ - size = sizeof(text); - el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, att_file, encoding, locked_by); + /* retrieve message */ + size = sizeof(text); + el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, att_file, encoding, + locked_by); - /* submit message, unlocked if user==NULL */ - el_submit(lbs, message_id, date, attr_list, attrib, lbs->n_attr, text, - in_reply_to, reply_to, encoding, att_file, FALSE, user); + /* submit message, unlocked if user==NULL */ + el_submit(lbs, message_id, date, attr_list, attrib, lbs->n_attr, text, + in_reply_to, reply_to, encoding, att_file, FALSE, user); - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -void logf(LOGBOOK *lbs, const char *format, ...) +void logf(LOGBOOK * lbs, const char *format, ...) { -char file_name[2000]; -va_list argptr; -char str[10000], lb[256]; -FILE* f; -time_t now; -char buf[256]; + char file_name[2000]; + va_list argptr; + char str[10000], lb[256]; + FILE *f; + time_t now; + char buf[256]; - if (!getcfg(lbs->name, "logfile", str)) - return; + if (!getcfg(lbs->name, "logfile", str)) + return; - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } - va_start(argptr, format); - vsprintf(str, (char *) format, argptr); - va_end(argptr); + va_start(argptr, format); + vsprintf(str, (char *) format, argptr); + va_end(argptr); - f = fopen(file_name, "a"); - if (!f) - return; + f = fopen(file_name, "a"); + if (!f) + return; - now=time(0); - strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&now)); + now = time(0); + strftime(buf, sizeof(buf), "%d-%b-%Y %H:%M:%S", localtime(&now)); - if (lbs == NULL) - lb[0] = 0; - else - strlcpy(lb, lbs->name, sizeof(lb)); + if (lbs == NULL) + lb[0] = 0; + else + strlcpy(lb, lbs->name, sizeof(lb)); - if (*getparam("unm")) - fprintf(f,"%s [%s@%s] %s: %s", buf, getparam("unm"), rem_host, lb, str); - else - fprintf(f,"%s [%s] %s: %s", buf, rem_host, lb, str); + if (*getparam("unm")) + fprintf(f, "%s [%s@%s] %s: %s", buf, getparam("unm"), rem_host, lb, + str); + else + fprintf(f, "%s [%s] %s: %s", buf, rem_host, lb, str); - if (str[strlen(str)-1] != '\n') - fprintf(f,"\n"); + if (str[strlen(str) - 1] != '\n') + fprintf(f, "\n"); - fclose(f); + fclose(f); } /*------------------------------------------------------------------*/ void rsputs(const char *str) { - if (strlen_retbuf + (int)strlen(str) > return_buffer_size) - { - return_buffer = realloc(return_buffer, return_buffer_size + 100000); - memset(return_buffer + return_buffer_size, 0, 100000); - return_buffer_size += 100000; - } + if (strlen_retbuf + (int) strlen(str) > return_buffer_size) { + return_buffer = realloc(return_buffer, return_buffer_size + 100000); + memset(return_buffer + return_buffer_size, 0, 100000); + return_buffer_size += 100000; + } - strcpy(return_buffer+strlen_retbuf, str); - strlen_retbuf += strlen(str); + strcpy(return_buffer + strlen_retbuf, str); + strlen_retbuf += strlen(str); } /*------------------------------------------------------------------*/ -char *list[] = { "http://", "https://", "ftp://", "mailto:", "elog:", "file://", "" }; +char *list[] = + { "http://", "https://", "ftp://", "mailto:", "elog:", "file://", "" }; void rsputs2(const char *str) { -int i, j, k, l, m, n; -char *p, *pd, link[1000], link_text[1000], tmp[256]; + int i, j, k, l, m, n; + char *p, *pd, link[1000], link_text[1000], tmp[256]; - if (strlen_retbuf + (int)strlen(str) > return_buffer_size) - { - return_buffer = realloc(return_buffer, return_buffer_size + 100000); - memset(return_buffer + return_buffer_size, 0, 100000); - return_buffer_size += 100000; - } + if (strlen_retbuf + (int) strlen(str) > return_buffer_size) { + return_buffer = realloc(return_buffer, return_buffer_size + 100000); + memset(return_buffer + return_buffer_size, 0, 100000); + return_buffer_size += 100000; + } - j = strlen_retbuf; - for (i=0 ; i<(int)strlen(str) ; i++) - { - for (l=0 ; list[l][0] ; l++) - { - if (strncmp(str+i, list[l], strlen(list[l])) == 0) - { - p = (char *) (str+i+strlen(list[l])); - i += strlen(list[l]); - for (k=0 ; *p && strcspn(p, "> ,\t\n\r({[)}]") ; k++,i++) - link[k] = *p++; - link[k] = 0; - i--; + j = strlen_retbuf; + for (i = 0; i < (int) strlen(str); i++) { + for (l = 0; list[l][0]; l++) { + if (strncmp(str + i, list[l], strlen(list[l])) == 0) { + p = (char *) (str + i + strlen(list[l])); + i += strlen(list[l]); + for (k = 0; *p && strcspn(p, "> ,\t\n\r({[)}]"); k++, i++) + link[k] = *p++; + link[k] = 0; + i--; - /* check if link contains coloring */ - p = strchr(link, '\001'); - if (p != NULL) - { - strlcpy(link_text, link, sizeof(link_text)); + /* check if link contains coloring */ + p = strchr(link, '\001'); + if (p != NULL) { + strlcpy(link_text, link, sizeof(link_text)); - /* skip everything between '<' and '>' */ - pd = p; - while (*pd && *pd != '\002') - *p = *pd++; + /* skip everything between '<' and '>' */ + pd = p; + while (*pd && *pd != '\002') + *p = *pd++; - strcpy(p, pd+1); + strcpy(p, pd + 1); - /* skip '' */ - p = strchr(link, '\001'); - if (p != NULL) - { - pd = p; + /* skip '' */ + p = strchr(link, '\001'); + if (p != NULL) { + pd = p; - while (*pd && *pd != '\002') - *p = *pd++; + while (*pd && *pd != '\002') + *p = *pd++; - strcpy(p, pd+1); - } + strcpy(p, pd + 1); + } - /* correct link text */ - for (n=0 ; n<(int)strlen(link_text) ; n++) - { - switch (link_text[n]) - { - /* the translation for the search highliting */ - case '\001' : link_text[n] = '<'; break; - case '\002' : link_text[n] = '>'; break; - case '\003' : link_text[n] = '\"'; break; - case '\004' : link_text[n] = ' '; break; - } - } + /* correct link text */ + for (n = 0; n < (int) strlen(link_text); n++) { + switch (link_text[n]) { + /* the translation for the search highliting */ + case '\001': + link_text[n] = '<'; + break; + case '\002': + link_text[n] = '>'; + break; + case '\003': + link_text[n] = '\"'; + break; + case '\004': + link_text[n] = ' '; + break; + } + } - } - else - strlcpy(link_text, link, sizeof(link_text)); + } else + strlcpy(link_text, link, sizeof(link_text)); - if (strcmp(list[l], "elog:") == 0) - { - strlcpy(tmp, link, sizeof(tmp)); - if (strchr(tmp, '/')) - *strchr(tmp, '/') = 0; + if (strcmp(list[l], "elog:") == 0) { + strlcpy(tmp, link, sizeof(tmp)); + if (strchr(tmp, '/')) + *strchr(tmp, '/') = 0; - for (m=0 ; m<(int)strlen(tmp) ; m++) - if (!isdigit(tmp[m])) - break; + for (m = 0; m < (int) strlen(tmp); m++) + if (!isdigit(tmp[m])) + break; - if (m < (int)strlen(tmp)) - /* if link contains reference to other logbook, add ".." in front */ - 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); - } - else - sprintf(return_buffer+j, "%s%s", list[l], link, list[l], link_text); + if (m < (int) strlen(tmp)) + /* if link contains reference to other logbook, add ".." in front */ + 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); + } else + sprintf(return_buffer + j, "%s%s", + list[l], link, list[l], link_text); - j += strlen(return_buffer+j); - break; - } + j += strlen(return_buffer + j); + break; + } } - if (!list[l][0]) - { - if (strncmp(str+i, "
", 4) == 0) - { - strcpy(return_buffer+j, "
"); - j+=4; - i+=3; - } - else - switch (str[i]) - { - case '<': strcat(return_buffer, "<"); j+=4; break; - case '>': strcat(return_buffer, ">"); j+=4; break; + if (!list[l][0]) { + if (strncmp(str + i, "
", 4) == 0) { + strcpy(return_buffer + j, "
"); + j += 4; + i += 3; + } else + switch (str[i]) { + case '<': + strcat(return_buffer, "<"); + j += 4; + break; + case '>': + strcat(return_buffer, ">"); + j += 4; + break; - /* the translation for the search highliting */ - case '\001' : strcat(return_buffer, "<"); j++; break; - case '\002' : strcat(return_buffer, ">"); j++; break; - case '\003' : strcat(return_buffer, "\""); j++; break; - case '\004' : strcat(return_buffer, " "); j++; break; + /* the translation for the search highliting */ + case '\001': + strcat(return_buffer, "<"); + j++; + break; + case '\002': + strcat(return_buffer, ">"); + j++; + break; + case '\003': + strcat(return_buffer, "\""); + j++; + break; + case '\004': + strcat(return_buffer, " "); + j++; + break; - default: return_buffer[j++] = str[i]; - } + default: + return_buffer[j++] = str[i]; + } } - } + } - return_buffer[j] = 0; - strlen_retbuf = j; + return_buffer[j] = 0; + strlen_retbuf = j; } /*------------------------------------------------------------------*/ void rsprintf(const char *format, ...) { -va_list argptr; -char str[10000]; + va_list argptr; + char str[10000]; - va_start(argptr, format); - vsprintf(str, (char *) format, argptr); - va_end(argptr); + va_start(argptr, format); + vsprintf(str, (char *) format, argptr); + va_end(argptr); - if (strlen_retbuf + (int)strlen(str) > return_buffer_size) - { - return_buffer = realloc(return_buffer, return_buffer_size + 100000); - memset(return_buffer + return_buffer_size, 0, 100000); - return_buffer_size += 100000; - } + if (strlen_retbuf + (int) strlen(str) > return_buffer_size) { + return_buffer = realloc(return_buffer, return_buffer_size + 100000); + memset(return_buffer + return_buffer_size, 0, 100000); + return_buffer_size += 100000; + } - strcpy(return_buffer+strlen_retbuf, str); + strcpy(return_buffer + strlen_retbuf, str); - strlen_retbuf += strlen(str); + strlen_retbuf += strlen(str); } /*------------------------------------------------------------------*/ void flush_return_buffer() { - send(_sock, return_buffer, strlen_retbuf+1, 0); - memset(return_buffer, 0, return_buffer_size); - strlen_retbuf= 0; + send(_sock, return_buffer, strlen_retbuf + 1, 0); + memset(return_buffer, 0, return_buffer_size); + strlen_retbuf = 0; } /*------------------------------------------------------------------*/ @@ -3842,319 +3774,291 @@ void flush_return_buffer() void initparam() { - memset(_param, 0, sizeof(_param)); - memset(_value, 0, sizeof(_value)); - _mtext[0] = 0; - _cmdline[0] = 0; + memset(_param, 0, sizeof(_param)); + memset(_value, 0, sizeof(_value)); + _mtext[0] = 0; + _cmdline[0] = 0; } int setparam(char *param, char *value) { -int i; -char str[10000]; + int i; + char str[10000]; - if (equal_ustring(param, "text")) - { - if (strlen(value) >= TEXT_SIZE) - { - sprintf(str, "Error: Message text too big (%d bytes). Please increase TEXT_SIZE and recompile elogd\n", - strlen(value)); - show_error(str); - return 0; + if (equal_ustring(param, "text")) { + if (strlen(value) >= TEXT_SIZE) { + sprintf(str, + "Error: Message text too big (%d bytes). Please increase TEXT_SIZE and recompile elogd\n", + strlen(value)); + show_error(str); + return 0; } - strlcpy(_mtext, value, TEXT_SIZE); - return 1; - } + strlcpy(_mtext, value, TEXT_SIZE); + return 1; + } - if (equal_ustring(param, "cmdline")) - { - if (strlen(value) >= CMD_SIZE) - { - sprintf(str, "Error: Command line too big (%d bytes). Please increase CMD_SIZE and recompile elogd\n", - strlen(value)); - show_error(str); - return 0; + if (equal_ustring(param, "cmdline")) { + if (strlen(value) >= CMD_SIZE) { + sprintf(str, + "Error: Command line too big (%d bytes). Please increase CMD_SIZE and recompile elogd\n", + strlen(value)); + show_error(str); + return 0; } - strlcpy(_cmdline, value, CMD_SIZE); - return 1; - } + strlcpy(_cmdline, value, CMD_SIZE); + return 1; + } - /* paremeters can be superseeded */ - for (i=0 ; i= NAME_LENGTH) - { - sprintf(str, "Error: Parameter name too big (%d bytes).\n", strlen(param)); - show_error(str); - return 0; + if (i < MAX_PARAM) { + if (strlen(param) >= NAME_LENGTH) { + sprintf(str, "Error: Parameter name too big (%d bytes).\n", + strlen(param)); + show_error(str); + return 0; } - strlcpy(_param[i], param, NAME_LENGTH); + strlcpy(_param[i], param, NAME_LENGTH); - if (strlen(value) >= NAME_LENGTH) - { - sprintf(str, "Error: Parameter value for parameter %s too big (%d bytes). Please increase NAME_LENGTH and recompile elogd\n", param, strlen(value)); - show_error(str); - return 0; + if (strlen(value) >= NAME_LENGTH) { + sprintf(str, + "Error: Parameter value for parameter %s too big (%d bytes). Please increase NAME_LENGTH and recompile elogd\n", + param, strlen(value)); + show_error(str); + return 0; } - strlcpy(_value[i], value, NAME_LENGTH); - } - else - { - printf("Error: parameter array too small\n"); - } + strlcpy(_value[i], value, NAME_LENGTH); + } else { + printf("Error: parameter array too small\n"); + } - return 1; + return 1; } char *getparam(char *param) { -int i; + int i; - if (equal_ustring(param, "text")) - return _mtext; + if (equal_ustring(param, "text")) + return _mtext; - if (equal_ustring(param, "cmdline")) - return _cmdline; + if (equal_ustring(param, "cmdline")) + return _cmdline; - for (i=0 ; iname, "URL", str); - else - getcfg("global", "URL", str); - - if (str[0]) - { - /* absolute path */ - if (str[strlen(str)-1] != '/') - strcat(str, "/"); + char str[NAME_LENGTH]; + if (strncmp(rel_path, "http://", 7) == 0) { rsputs("Location: "); - rsputs(str); - - if (strncmp(rel_path, "../", 3) == 0) - rsputs(rel_path+3); - else if (strcmp(rel_path, ".") == 0) - { - if (lbs) - rsputs(lbs->name_enc); - } - else if (rel_path[0] == '/') - rsputs(rel_path+1); + rsputs(rel_path); + } else { + if (lbs) + getcfg(lbs->name, "URL", str); else - { - if (lbs) - { - rsputs(lbs->name_enc); - rsputs("/"); - rsputs(rel_path); - } - else - rsputs(rel_path); - } - } - else - { - /* relative path */ - rsputs("Location: "); + getcfg("global", "URL", str); - if (rel_path[0] == 0) - rsputs("."); /* empty location forbidden for konqueror */ - else - rsputs(rel_path); - } - } + if (str[0]) { + /* absolute path */ + if (str[strlen(str) - 1] != '/') + strcat(str, "/"); - rsprintf("\r\n\r\nredir\r\n"); + rsputs("Location: "); + rsputs(str); + + if (strncmp(rel_path, "../", 3) == 0) + rsputs(rel_path + 3); + else if (strcmp(rel_path, ".") == 0) { + if (lbs) + rsputs(lbs->name_enc); + } else if (rel_path[0] == '/') + rsputs(rel_path + 1); + else { + if (lbs) { + rsputs(lbs->name_enc); + rsputs("/"); + rsputs(rel_path); + } else + rsputs(rel_path); + } + } else { + /* relative path */ + rsputs("Location: "); + + if (rel_path[0] == 0) + rsputs("."); /* empty location forbidden for konqueror */ + else + rsputs(rel_path); + } + } + + rsprintf("\r\n\r\nredir\r\n"); } /*------------------------------------------------------------------*/ -void set_redir(LOGBOOK *lbs, char *redir) +void set_redir(LOGBOOK * lbs, char *redir) { -char str[NAME_LENGTH]; + char str[NAME_LENGTH]; - /* prepare relative path */ - if (redir[0]) - strcpy(str, redir); - else - { - if (lbs) - sprintf(str, "../%s/", lbs->name_enc); - else - sprintf(str, "."); - } - - set_location(lbs, str); -} - -/*------------------------------------------------------------------*/ - -void set_cookie(LOGBOOK *lbs, char *name, char *value, BOOL global, char *expiration) -{ -char lb_name[256], str[NAME_LENGTH]; -double exp; -time_t now; -struct tm *gmt; - - if (lbs) - strcpy(lb_name, lbs->name); - else - strcpy(lb_name, "global"); - - rsprintf("Set-Cookie: %s=%s;", name, value); - - /* add path */ - if (global) - { - /* path for all logbooks */ - if (getcfg(lb_name, "URL", str)) - { - extract_path(str); - url_encode(str, sizeof(str)); - rsprintf(" path=/%s;", str); - } - else - rsprintf(" path=/;"); - } - else - { - /* bug in lynx: path has to be absolute */ - if (strstr(browser, "Lynx/") != NULL) - { - /* path for individual logbook */ - if (getcfg(lb_name, "URL", str)) - { - extract_path(str); - url_encode(str, sizeof(str)); - if (str[0]) - rsprintf(" path=/%s/%s;", str, lbs->name_enc); - else - rsprintf(" path=/%s;", lbs->name_enc); - } + /* prepare relative path */ + if (redir[0]) + strcpy(str, redir); + else { + if (lbs) + sprintf(str, "../%s/", lbs->name_enc); else - rsprintf(" path=/%s;", lbs->name_enc); - } - } + sprintf(str, "."); + } - exp = atof(expiration); - - /* to clear a cookie, set expiration date to yesterday */ - if (value[0] == 0) - exp = -24; - - /* add expriation date */ - if (exp != 0) - { - time(&now); - now += (int) (3600*exp); - gmt = gmtime(&now); - strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); - - rsprintf(" expires=%s;", str); - } - - rsprintf("\r\n"); + set_location(lbs, str); } /*------------------------------------------------------------------*/ -void redirect(LOGBOOK *lbs, char *rel_path) +void set_cookie(LOGBOOK * lbs, char *name, char *value, BOOL global, + char *expiration) { - /* redirect */ - rsprintf("HTTP/1.1 302 Found\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); - } + char lb_name[256], str[NAME_LENGTH]; + double exp; + time_t now; + struct tm *gmt; - set_location(lbs, rel_path); + if (lbs) + strcpy(lb_name, lbs->name); + else + strcpy(lb_name, "global"); + + rsprintf("Set-Cookie: %s=%s;", name, value); + + /* add path */ + if (global) { + /* path for all logbooks */ + if (getcfg(lb_name, "URL", str)) { + extract_path(str); + url_encode(str, sizeof(str)); + rsprintf(" path=/%s;", str); + } else + rsprintf(" path=/;"); + } else { + /* bug in lynx: path has to be absolute */ + if (strstr(browser, "Lynx/") != NULL) { + /* path for individual logbook */ + if (getcfg(lb_name, "URL", str)) { + extract_path(str); + url_encode(str, sizeof(str)); + if (str[0]) + rsprintf(" path=/%s/%s;", str, lbs->name_enc); + else + rsprintf(" path=/%s;", lbs->name_enc); + } else + rsprintf(" path=/%s;", lbs->name_enc); + } + } + + exp = atof(expiration); + + /* to clear a cookie, set expiration date to yesterday */ + if (value[0] == 0) + exp = -24; + + /* add expriation date */ + if (exp != 0) { + time(&now); + now += (int) (3600 * exp); + gmt = gmtime(&now); + strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); + + rsprintf(" expires=%s;", str); + } + + rsprintf("\r\n"); +} + +/*------------------------------------------------------------------*/ + +void redirect(LOGBOOK * lbs, char *rel_path) +{ + /* redirect */ + rsprintf("HTTP/1.1 302 Found\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + } + + set_location(lbs, rel_path); } /*------------------------------------------------------------------*/ @@ -4163,55 +4067,51 @@ int strbreak(char *str, char list[][NAME_LENGTH], int size) /* break comma-separated list into char array, stripping leading and trailing blanks */ { -int i; -char *p; + int i; + char *p; - memset(list, 0, size*NAME_LENGTH); - p = str; - if (!p || !*p) - return 0; + memset(list, 0, size * NAME_LENGTH); + p = str; + if (!p || !*p) + return 0; - while (*p == ' ') - p++; - - for (i=0 ; *p && i\n"); + /* DOCTYPE */ + rsprintf + ("\n"); - /* page title */ - rsprintf("%s\n", title); + /* page title */ + rsprintf("%s\n", title); - /* Cascading Style Sheet */ - strlcpy(css, "default.css", sizeof(css)); + /* Cascading Style Sheet */ + strlcpy(css, "default.css", sizeof(css)); - if (lbs != NULL && getcfg(lbs->name, "CSS", str)) - strlcpy(css, str, sizeof(css)); + if (lbs != NULL && getcfg(lbs->name, "CSS", str)) + strlcpy(css, str, sizeof(css)); - else if (lbs == NULL && getcfg("global", "CSS", str)) - strlcpy(css, str, sizeof(css)); + else if (lbs == NULL && getcfg("global", "CSS", str)) + strlcpy(css, str, sizeof(css)); - rsprintf("", css); + rsprintf("", + css); - rsprintf("\n"); + rsprintf("\n"); } -void show_standard_header(LOGBOOK *lbs, BOOL expires, char *title, char *path) +void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, + char *path) { - show_html_header(lbs, expires, title); + show_html_header(lbs, expires, title); - rsprintf("\n"); + rsprintf("\n"); - if (path) - rsprintf("

\n\n", path); - else - rsprintf("\n\n"); + if (path) + rsprintf("\n\n", path); + else + rsprintf("\n\n"); } /*------------------------------------------------------------------*/ -void show_upgrade_page(LOGBOOK *lbs) +void show_upgrade_page(LOGBOOK * lbs) { -char str[1000]; + char str[1000]; - show_html_header(lbs, FALSE, "ELOG Upgrade Information"); + show_html_header(lbs, FALSE, "ELOG Upgrade Information"); - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n\n"); + rsprintf("
\n\n"); - rsprintf("\n"); + rsprintf + ("\n"); - rsprintf("
ELog Electronic Logbook Upgrade Information
ELog Electronic Logbook Upgrade Information

\n"); + rsprintf("

\n"); - rsprintf("You probably use an elogd.cfg configuration file for a ELOG version\n"); - 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("following entries:

\n"); - rsprintf("

\n");
-  rsprintf("Attributes = Author, Type, Category, Subject\n");
-  rsprintf("Required Attributes = Author\n");
-  getcfg(lbs->name, "Types", str);
-  rsprintf("Options Type = %s\n", str);
-  getcfg(lbs->name, "Categories", str);
-  rsprintf("Options Category = %s\n", str);
-  rsprintf("Page title = $subject\n");
-  rsprintf("
\n"); - rsprintf("

\n"); + rsprintf + ("You probably use an elogd.cfg configuration file for a ELOG version\n"); + 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("following entries:

\n"); + rsprintf("

\n");
+   rsprintf("Attributes = Author, Type, Category, Subject\n");
+   rsprintf("Required Attributes = Author\n");
+   getcfg(lbs->name, "Types", str);
+   rsprintf("Options Type = %s\n", str);
+   getcfg(lbs->name, "Categories", str);
+   rsprintf("Options Category = %s\n", str);
+   rsprintf("Page title = $subject\n");
+   rsprintf("
\n"); + rsprintf("

\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(".\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(".\n"); - rsprintf("

\n\n"); + rsprintf("\n\n"); - rsprintf("
\n"); - rsprintf("
\n"); - rsprintf("S. Ritt, 18 October 2001"); - rsprintf("
"); + rsprintf("
\n"); + rsprintf("
\n"); + rsprintf + ("S. Ritt, 18 October 2001"); + rsprintf("
"); - rsprintf("\r\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -int get_logbook_hierarchy(LBLIST *lblist) +int get_logbook_hierarchy(LBLIST * lblist) { -int i, j, k, n, m; -char str[1000], grpname[256], grpmembers[1000]; -LBLIST lbl; -char grplist[MAX_N_LIST][NAME_LENGTH]; + int i, j, k, n, m; + char str[1000], grpname[256], grpmembers[1000]; + LBLIST lbl; + char grplist[MAX_N_LIST][NAME_LENGTH]; - /* enumerate groups */ - for (i=n=0 ; ; i++) - { - if (!enumcfg("global", grpname, grpmembers, i)) - break; + /* enumerate groups */ + for (i = n = 0;; i++) { + if (!enumcfg("global", grpname, grpmembers, i)) + break; - strlcpy(str, grpname, sizeof(str)); - str[5] = 0; - if (equal_ustring(str, "group")) - { - if (n == 0) - lbl = malloc(sizeof(LBNODE)); - else - lbl = realloc(lbl, (n+1) * sizeof(LBNODE)); - memset(lbl+n, 0, sizeof(LBNODE)); + strlcpy(str, grpname, sizeof(str)); + str[5] = 0; + if (equal_ustring(str, "group")) { + if (n == 0) + lbl = malloc(sizeof(LBNODE)); + else + lbl = realloc(lbl, (n + 1) * sizeof(LBNODE)); + memset(lbl + n, 0, sizeof(LBNODE)); - if (strlen(grpname) < 7) - strlcpy(lbl[n].name, "Invalid group definition!", 256); - else - strlcpy(lbl[n].name, grpname+6, 256); - m = strbreak(grpmembers, grplist, MAX_N_LIST); - lbl[n].n_members = m; + if (strlen(grpname) < 7) + strlcpy(lbl[n].name, "Invalid group definition!", 256); + else + strlcpy(lbl[n].name, grpname + 6, 256); + m = strbreak(grpmembers, grplist, MAX_N_LIST); + lbl[n].n_members = m; - lbl[n].member = calloc(sizeof(LBNODE), m); - for (j=0 ; jname, logbook)) - return 1; - - for (i=0 ; in_members ; i++) - { - if (equal_ustring(logbook, lbl->member[i].name)) + if (equal_ustring(lbl->name, logbook)) return 1; - if (lbl->member[i].n_members > 0 && - is_logbook_in_group(&(lbl->member[i]), logbook)) - return 1; - } + for (i = 0; i < lbl->n_members; i++) { + if (equal_ustring(logbook, lbl->member[i].name)) + return 1; - return 0; + if (lbl->member[i].n_members > 0 && + is_logbook_in_group(&(lbl->member[i]), logbook)) + return 1; + } + + return 0; } @@ -4532,7787 +4425,7616 @@ int i; void show_standard_title(char *logbook, char *text, int printable) { -char str[256], ref[256], sclass[32]; -int i, j, n_grp, n_lb, nnum, level; -LBLIST clb, flb, nlb, lbl; + char str[256], ref[256], sclass[32]; + int i, j, n_grp, n_lb, nnum, level; + LBLIST clb, flb, nlb, lbl; - if (printable) - rsprintf("\n\n"); - else - rsprintf("
\n\n"); + if (printable) + rsprintf + ("
\n\n"); + else + rsprintf + ("
\n\n"); - /* scan logbook hierarchy */ - n_grp = get_logbook_hierarchy(&lbl); + /* scan logbook hierarchy */ + n_grp = get_logbook_hierarchy(&lbl); /*---- logbook selection row ----*/ - clb = lbl; - nlb = NULL; - n_lb = n_grp; - if (!printable && getcfg(logbook, "logbook tabs", str) && atoi(str) == 1) - { - for (level = 0 ; ; level++) - { - rsprintf("\n\n"); + rsprintf("\n"); + } + rsprintf("\n\n"); - clb = nlb; - n_lb = nnum; + clb = nlb; + n_lb = nnum; - if (nlb == NULL) - break; + if (nlb == NULL) + break; } - } + } - /* free logbook node memory */ - for (i=0 ; i\n\n"); } /*------------------------------------------------------------------*/ void show_error(char *error) { - /* header */ - show_html_header(NULL, FALSE, "ELOG error"); + /* header */ + show_html_header(NULL, FALSE, "ELOG error"); - rsprintf("
\n"); - rsprintf("
\n"); + clb = lbl; + nlb = NULL; + n_lb = n_grp; + if (!printable && getcfg(logbook, "logbook tabs", str) + && atoi(str) == 1) { + for (level = 0;; level++) { + rsprintf("
\n"); - if (level == 0 && getcfg("global", "main tab", str)) - rsprintf("%s\n", str); + if (level == 0 && getcfg("global", "main tab", str)) + rsprintf + ("%s\n", + str); - for (i=0 ; imember) // so traverse hierarchy - flb = &flb->member[0]; - strlcpy(ref, flb->name, sizeof(ref)); - } - url_encode(ref, sizeof(ref)); + /* build reference to first logbook in group */ + if (clb[i].member == NULL) + strlcpy(ref, str, sizeof(ref)); // current node is logbook + else { + flb = &clb[i].member[0]; // current node is group + while (flb->member) // so traverse hierarchy + flb = &flb->member[0]; + strlcpy(ref, flb->name, sizeof(ref)); + } + url_encode(ref, sizeof(ref)); - if (is_logbook_in_group(&clb[i], logbook)) - { - nlb = clb[i].member; - nnum = clb[i].n_members; + if (is_logbook_in_group(&clb[i], logbook)) { + nlb = clb[i].member; + nnum = clb[i].n_members; - if (clb[i].member == NULL) - /* selected logbook */ - strcpy(sclass, "sltab"); - else - /* selected group */ - strcpy(sclass, "sgtab"); - } - else - { - if (clb[i].member == NULL) - /* unselected logbook */ - strcpy(sclass, "ltab"); - else - /* unselected group */ - strcpy(sclass, "gtab"); - } + if (clb[i].member == NULL) + /* selected logbook */ + strcpy(sclass, "sltab"); + else + /* selected group */ + strcpy(sclass, "sgtab"); + } else { + if (clb[i].member == NULL) + /* unselected logbook */ + strcpy(sclass, "ltab"); + else + /* unselected group */ + strcpy(sclass, "gtab"); + } - // rsprintf(" ", sclass, sclass, ref); - rsprintf("", sclass, ref); + // rsprintf(" ", sclass, sclass, ref); + rsprintf("", sclass, + ref); - strlcpy(str, clb[i].name, sizeof(str)); + strlcpy(str, clb[i].name, sizeof(str)); - for (j=0 ; j<(int)strlen(str) ; j++) - if (str[j] == ' ') - rsprintf(" "); - else - rsprintf("%c", str[j]); + for (j = 0; j < (int) strlen(str); j++) + if (str[j] == ' ') + rsprintf(" "); + else + rsprintf("%c", str[j]); - rsprintf("\n"); - } - rsprintf("
\n"); + rsprintf + ("\n\n"); + rsprintf("
\n"); - /* left cell */ - rsprintf("\n", str, text); + rsprintf("  %s%s \n", str, text); - /* middle cell */ - if (*getparam("full_name")) - rsprintf("\n", loc("Logged in as"), getparam("full_name")); - else - if (getcfg(logbook, "Guest menu commands", str)) - rsprintf("\n", loc("Not logged in")); + /* middle cell */ + if (*getparam("full_name")) + rsprintf("\n", + loc("Logged in as"), getparam("full_name")); + else if (getcfg(logbook, "Guest menu commands", str)) + rsprintf("\n", + loc("Not logged in")); - /* right cell */ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("
"); + /* left cell */ + rsprintf("
"); - /* use comment as title if available, else logbook name */ - if (!getcfg(logbook, "Comment", str)) - strcpy(str, logbook); + /* use comment as title if available, else logbook name */ + if (!getcfg(logbook, "Comment", str)) + strcpy(str, logbook); - rsprintf("  %s%s %s \"%s\"%s%s \"%s\"%s"); + /* right cell */ + rsprintf(""); - if (getcfg(logbook, "Title image URL", str)) - rsprintf("\n", str); + if (getcfg(logbook, "Title image URL", str)) + rsprintf("\n", str); - if (getcfg(logbook, "Title image", str)) - rsprintf(str); - else - rsprintf("\"ELOG"); + if (getcfg(logbook, "Title image", str)) + rsprintf(str); + else + rsprintf("\"ELOG"); - if (getcfg(logbook, "Title image URL", str)) - rsprintf("\n"); + if (getcfg(logbook, "Title image URL", str)) + rsprintf("\n"); - rsprintf("
\n", error); + rsprintf("
\n"); + rsprintf + ("
%s
\n", error); - rsprintf("\n
%s
"); + rsprintf("
"); - /* - rsprintf("\n"); + /* + rsprintf("\n"); - rsprintf("\n"); + */ - rsprintf("
\n"); - rsprintf("\n"); + rsprintf("\n\n"); + rsprintf("\n"); } /*------------------------------------------------------------------*/ -void set_login_cookies(LOGBOOK *lbs, char *user, char *enc_pwd) +void set_login_cookies(LOGBOOK * lbs, char *user, char *enc_pwd) { -char str[256], lb_name[256], exp[80]; -BOOL global; + char str[256], lb_name[256], exp[80]; + BOOL global; - rsprintf("HTTP/1.1 302 Found\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); - } + rsprintf("HTTP/1.1 302 Found\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + } - if (lbs) - strcpy(lb_name, lbs->name); - else - strcpy(lb_name, "global"); + if (lbs) + strcpy(lb_name, lbs->name); + else + strcpy(lb_name, "global"); - /* get optional expriation from configuration file */ - if (isparam("remember")) - { - if (!getcfg(lb_name, "Login expiration", exp)) - strcpy(exp, "31*24"); /* one month by default */ - } - else - exp[0] = 0; + /* get optional expriation from configuration file */ + if (isparam("remember")) { + if (!getcfg(lb_name, "Login expiration", exp)) + strcpy(exp, "31*24"); /* one month by default */ + } else + exp[0] = 0; - /* check if cookies should be global */ - global = getcfg("global", "Password file", str); + /* check if cookies should be global */ + global = getcfg("global", "Password file", str); - /* two cookies for password and user name */ - set_cookie(lbs, "unm", user, global, exp); - set_cookie(lbs, "upwd", enc_pwd, global, exp); + /* two cookies for password and user name */ + set_cookie(lbs, "unm", user, global, exp); + set_cookie(lbs, "upwd", enc_pwd, global, exp); - set_redir(lbs, getparam("redir")); + set_redir(lbs, getparam("redir")); } /*------------------------------------------------------------------*/ int exist_file(char *file_name) { -int fh; + int fh; - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - close(fh); - return 1; - } - return 0; + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + close(fh); + return 1; + } + return 0; } /*------------------------------------------------------------------*/ void send_file_direct(char *file_name) { -int fh, i, length, delta; -char str[MAX_PATH_LENGTH]; -time_t now; -struct tm *gmt; + int fh, i, length, delta; + char str[MAX_PATH_LENGTH]; + time_t now; + struct tm *gmt; - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - length = TELL(fh); - lseek(fh, 0, SEEK_SET); + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + length = TELL(fh); + lseek(fh, 0, SEEK_SET); - rsprintf("HTTP/1.1 200 Document follows\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - rsprintf("Accept-Ranges: bytes\r\n"); + rsprintf("HTTP/1.1 200 Document follows\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + rsprintf("Accept-Ranges: bytes\r\n"); - /* set expiration time to one day */ - time(&now); - now += (int) (3600*24); - gmt = gmtime(&now); - strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); - rsprintf("Expires: %s\r\n", str); + /* set expiration time to one day */ + time(&now); + now += (int) (3600 * 24); + gmt = gmtime(&now); + strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); + rsprintf("Expires: %s\r\n", str); - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); } - /* return proper header for file type */ - for (i=0 ; i<(int)strlen(file_name) ; i++) - str[i] = toupper(file_name[i]); - str[i] = 0; + /* return proper header for file type */ + for (i = 0; i < (int) strlen(file_name); i++) + str[i] = toupper(file_name[i]); + str[i] = 0; - for (i=0 ; filetype[i].ext[0] ; i++) - if (strstr(str, filetype[i].ext)) - break; + for (i = 0; filetype[i].ext[0]; i++) + if (strstr(str, filetype[i].ext)) + break; - if (filetype[i].ext[0]) - rsprintf("Content-Type: %s\r\n", filetype[i].type); - else if (strchr(str, '.') == NULL) - rsprintf("Content-Type: text/plain\r\n"); - else - rsprintf("Content-Type: application/octet-stream\r\n"); + if (filetype[i].ext[0]) + rsprintf("Content-Type: %s\r\n", filetype[i].type); + else if (strchr(str, '.') == NULL) + rsprintf("Content-Type: text/plain\r\n"); + else + rsprintf("Content-Type: application/octet-stream\r\n"); - rsprintf("Content-Length: %d\r\n\r\n", length); + rsprintf("Content-Length: %d\r\n\r\n", length); - /* increase return buffer size if file too big */ - if (length > return_buffer_size - (int)strlen(return_buffer)) - { - delta = length - (return_buffer_size - strlen(return_buffer)) + 1000; + /* increase return buffer size if file too big */ + if (length > return_buffer_size - (int) strlen(return_buffer)) { + delta = + length - (return_buffer_size - strlen(return_buffer)) + 1000; - return_buffer = realloc(return_buffer, return_buffer_size + delta); - memset(return_buffer + return_buffer_size, 0, delta); - return_buffer_size += delta; + return_buffer = + realloc(return_buffer, return_buffer_size + delta); + memset(return_buffer + return_buffer_size, 0, delta); + return_buffer_size += delta; } - return_length = strlen(return_buffer)+length; - read(fh, return_buffer+strlen(return_buffer), length); + return_length = strlen(return_buffer) + length; + read(fh, return_buffer + strlen(return_buffer), length); - close(fh); - } - else - { - show_html_header(NULL, FALSE, "404 Not Found"); + close(fh); + } else { + show_html_header(NULL, FALSE, "404 Not Found"); - rsprintf("

Not Found

\r\n"); - 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; - } + rsprintf("

Not Found

\r\n"); + 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; + } } /*------------------------------------------------------------------*/ void strencode(char *text) { -int i; + int i; - for (i=0 ; i<(int) strlen(text) ; i++) - { - switch (text[i]) - { - case '\n': rsprintf("
\n"); break; - case '<': rsprintf("<"); break; - case '>': rsprintf(">"); break; - case '&': rsprintf("&"); break; - case '\"': rsprintf("""); break; - case ' ': rsprintf(" "); break; + for (i = 0; i < (int) strlen(text); i++) { + switch (text[i]) { + case '\n': + rsprintf("
\n"); + break; + case '<': + rsprintf("<"); + break; + case '>': + rsprintf(">"); + break; + case '&': + rsprintf("&"); + break; + case '\"': + rsprintf("""); + break; + case ' ': + rsprintf(" "); + break; - /* the translation for the search highliting */ - case '\001': rsprintf("<"); break; - case '\002': rsprintf(">"); break; - case '\003': rsprintf("\""); break; - case '\004': rsprintf(" "); break; + /* the translation for the search highliting */ + case '\001': + rsprintf("<"); + break; + case '\002': + rsprintf(">"); + break; + case '\003': + rsprintf("\""); + break; + case '\004': + rsprintf(" "); + break; - default: rsprintf("%c", text[i]); + default: + rsprintf("%c", text[i]); } - } + } } /*------------------------------------------------------------------*/ void strencode2(char *b, char *text) { -int i; + int i; - for (i=0 ; i<(int) strlen(text) ; b++,i++) - { - switch (text[i]) - { - case '\n': sprintf(b, "
\n"); break; - case '<': sprintf(b, "<"); break; - case '>': sprintf(b, ">"); break; - case '&': sprintf(b, "&"); break; - case '\"': sprintf(b, """); break; - default: sprintf(b, "%c", text[i]); + for (i = 0; i < (int) strlen(text); b++, i++) { + switch (text[i]) { + case '\n': + sprintf(b, "
\n"); + break; + case '<': + sprintf(b, "<"); + break; + case '>': + sprintf(b, ">"); + break; + case '&': + sprintf(b, "&"); + break; + case '\"': + sprintf(b, """); + break; + default: + sprintf(b, "%c", text[i]); } - } - *b = 0; + } + *b = 0; } /*------------------------------------------------------------------*/ -int build_subst_list(LOGBOOK *lbs, char list[][NAME_LENGTH], +int build_subst_list(LOGBOOK * lbs, char list[][NAME_LENGTH], char value[][NAME_LENGTH], char attrib[][NAME_LENGTH]) { -int i; -char str[NAME_LENGTH], format[256]; -time_t now; -struct tm *ts; + int i; + char str[NAME_LENGTH], format[256]; + time_t now; + struct tm *ts; - /* copy attribute list */ - i = 0; - if (attrib != NULL) - for (; in_attr ; i++) - { - strcpy(list[i], attr_list[i]); - if (attrib) - strcpy(value[i], attrib[i]); - else - strcpy(value[i], getparam(attr_list[i])); + /* copy attribute list */ + i = 0; + if (attrib != NULL) + for (; i < lbs->n_attr; i++) { + strcpy(list[i], attr_list[i]); + if (attrib) + strcpy(value[i], attrib[i]); + else + strcpy(value[i], getparam(attr_list[i])); } - /* add remote host */ - strcpy(list[i], "remote_host"); - strlcpy(value[i++], rem_host, NAME_LENGTH); + /* add remote host */ + strcpy(list[i], "remote_host"); + strlcpy(value[i++], rem_host, NAME_LENGTH); - /* add local host */ - strcpy(list[i], "host"); - strlcpy(value[i++], host_name, NAME_LENGTH); + /* add local host */ + strcpy(list[i], "host"); + strlcpy(value[i++], host_name, NAME_LENGTH); - /* add user names */ - strcpy(list[i], "short_name"); - strlcpy(value[i++], getparam("unm"), NAME_LENGTH); - strcpy(list[i], "long_name"); - strlcpy(value[i++], getparam("full_name"), NAME_LENGTH); + /* add user names */ + strcpy(list[i], "short_name"); + strlcpy(value[i++], getparam("unm"), NAME_LENGTH); + strcpy(list[i], "long_name"); + strlcpy(value[i++], getparam("full_name"), NAME_LENGTH); - /* add email */ - strcpy(list[i], "user_email"); - strcpy(value[i], "mailto:"); - strlcat(value[i++], getparam("user_email"), NAME_LENGTH); + /* add email */ + strcpy(list[i], "user_email"); + strcpy(value[i], "mailto:"); + strlcat(value[i++], getparam("user_email"), NAME_LENGTH); - /* add logbook */ - strcpy(list[i], "logbook"); - strlcpy(value[i++], lbs->name, NAME_LENGTH); + /* add logbook */ + strcpy(list[i], "logbook"); + strlcpy(value[i++], lbs->name, NAME_LENGTH); - /* add date */ - strcpy(list[i], "date"); - time(&now); - ts = localtime(&now); - if (getcfg(lbs->name, "Date format", format)) - strftime(str, sizeof(str), format, ts); - else - { - strcpy(str, ctime(&now)); - str[strlen(str)-1] = 0; - } - strcpy(value[i++], str); + /* add date */ + strcpy(list[i], "date"); + time(&now); + ts = localtime(&now); + if (getcfg(lbs->name, "Date format", format)) + strftime(str, sizeof(str), format, ts); + else { + strcpy(str, ctime(&now)); + str[strlen(str) - 1] = 0; + } + strcpy(value[i++], str); - return i; + return i; } /*------------------------------------------------------------------*/ -BOOL change_pwd(LOGBOOK *lbs, char *user, char *pwd) +BOOL change_pwd(LOGBOOK * lbs, char *user, char *pwd) { -char str[256], file_name[256], line[256], *p, *pl; -char *buf; -int i, fh, size; + char str[256], file_name[256], line[256], *p, *pl; + char *buf; + int i, fh, size; - getcfg(lbs->name, "Password file", str); + getcfg(lbs->name, "Password file", str); - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } - fh = open(file_name, O_RDWR | O_BINARY, 644); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - size = TELL(fh); - lseek(fh, 0, SEEK_SET); + fh = open(file_name, O_RDWR | O_BINARY, 644); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + size = TELL(fh); + lseek(fh, 0, SEEK_SET); - buf = malloc(size+1); - read(fh, buf, size); - buf[size] = 0; - pl = buf; + buf = malloc(size + 1); + read(fh, buf, size); + buf[size] = 0; + pl = buf; - while (pl < buf+size) - { - for (i=0 ; pl[i] && pl[i] != '\r' && pl[i] != '\n' ; i++) - line[i] = pl[i]; - line[i] = 0; + while (pl < buf + size) { + for (i = 0; pl[i] && pl[i] != '\r' && pl[i] != '\n'; i++) + line[i] = pl[i]; + line[i] = 0; - if (line[0] == ';' || line[0] == '#' || line[0] == 0) - { - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - continue; - } + if (line[0] == ';' || line[0] == '#' || line[0] == 0) { + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + continue; + } - strcpy(str, line); - if (strchr(str, ':')) - *strchr(str, ':') = 0; - if (strcmp(str, user) == 0) - break; + strcpy(str, line); + if (strchr(str, ':')) + *strchr(str, ':') = 0; + if (strcmp(str, user) == 0) + break; + + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + } + + /* return if not found */ + if (pl >= buf + size) { + free(buf); + close(fh); + return FALSE; + } + + p = strchr(line, ':'); + if (p) + p = strchr(p + 1, ':'); + if (p == NULL) + return FALSE; + + /* replace password */ + lseek(fh, 0, SEEK_SET); + write(fh, buf, pl - buf); + + sprintf(str, "%s:%s%s\n", user, pwd, p); + write(fh, str, strlen(str)); pl += strlen(line); while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - } + pl++; - /* return if not found */ - if (pl >= buf+size) - { - free(buf); - close(fh); - return FALSE; - } - - p = strchr(line, ':'); - if (p) - p = strchr(p+1, ':'); - if (p == NULL) - return FALSE; - - /* replace password */ - lseek(fh, 0, SEEK_SET); - write(fh, buf, pl-buf); - - sprintf(str, "%s:%s%s\n", user, pwd, p); - write(fh, str, strlen(str)); - - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - - write(fh, pl, strlen(pl)); + write(fh, pl, strlen(pl)); #ifdef _MSC_VER - chsize(fh, TELL(fh)); + chsize(fh, TELL(fh)); #else - ftruncate(fh, TELL(fh)); + ftruncate(fh, TELL(fh)); #endif - free(buf); - close(fh); + free(buf); + close(fh); - return TRUE; - } + return TRUE; + } - return FALSE; + return FALSE; } /*------------------------------------------------------------------*/ -void show_change_pwd_page(LOGBOOK *lbs) +void show_change_pwd_page(LOGBOOK * lbs) { -char str[256], old_pwd[32], + char str[256], old_pwd[32], new_pwd[32], new_pwd2[32], act_pwd[32], user[80]; -int wrong_pwd; + int wrong_pwd; - do_crypt(getparam("oldpwd"), old_pwd); - do_crypt(getparam("newpwd"), new_pwd); - do_crypt(getparam("newpwd2"), new_pwd2); + do_crypt(getparam("oldpwd"), old_pwd); + do_crypt(getparam("newpwd"), new_pwd); + do_crypt(getparam("newpwd2"), new_pwd2); - strcpy(user, getparam("unm")); - if (isparam("config")) - strcpy(user, getparam("config")); + strcpy(user, getparam("unm")); + if (isparam("config")) + strcpy(user, getparam("config")); - wrong_pwd = FALSE; + wrong_pwd = FALSE; - if (old_pwd[0] || new_pwd[0]) - { - if (user[0] && get_user_line(lbs->name, user, act_pwd, NULL, NULL, NULL)) - { - /* administrator does not have to supply old password */ - if (getcfg(lbs->name, "Admin user", str) && - strstr(str, getparam("unm")) != 0) - wrong_pwd = 0; - else - { - if (strcmp(old_pwd, act_pwd) != 0) - wrong_pwd = 1; - } + if (old_pwd[0] || new_pwd[0]) { + if (user[0] + && get_user_line(lbs->name, user, act_pwd, NULL, NULL, NULL)) { + /* administrator does not have to supply old password */ + if (getcfg(lbs->name, "Admin user", str) && + strstr(str, getparam("unm")) != 0) + wrong_pwd = 0; + else { + if (strcmp(old_pwd, act_pwd) != 0) + wrong_pwd = 1; + } - if (strcmp(new_pwd, new_pwd2) != 0) - wrong_pwd = 2; + if (strcmp(new_pwd, new_pwd2) != 0) + wrong_pwd = 2; } - /* replace password */ - if (!wrong_pwd) - change_pwd(lbs, user, new_pwd); + /* replace password */ + if (!wrong_pwd) + change_pwd(lbs, user, new_pwd); - if (!wrong_pwd && strcmp(user, getparam("unm")) == 0) - { - set_login_cookies(lbs, user, new_pwd); - return; + if (!wrong_pwd && strcmp(user, getparam("unm")) == 0) { + set_login_cookies(lbs, user, new_pwd); + return; } - if (!wrong_pwd) - { - /* redirect back to configuration page */ - sprintf(str, "?cmd=%s&cfg_user=%s", loc("Config"), getparam("config")); - redirect(lbs, str); - return; + if (!wrong_pwd) { + /* redirect back to configuration page */ + sprintf(str, "?cmd=%s&cfg_user=%s", loc("Config"), + getparam("config")); + redirect(lbs, str); + return; } - } + } - show_standard_header(lbs, TRUE, loc("ELOG change password"), NULL); + show_standard_header(lbs, TRUE, loc("ELOG change password"), NULL); - rsprintf(""); + rsprintf("
"); - if (wrong_pwd == 1) - rsprintf("\n", loc("Wrong password")); + if (wrong_pwd == 1) + rsprintf("\n", + loc("Wrong password")); - if (wrong_pwd == 2) - rsprintf("\n", loc("New passwords do not match, please retype")); + if (wrong_pwd == 2) + rsprintf("\n", + loc("New passwords do not match, please retype")); - rsprintf("\n", loc("Change password for user"), user); + rsprintf("%s \"%s\"\n", loc("Change password for user"), + user); - if (!getcfg(lbs->name, "Admin user", str) || - !strstr(str, getparam("unm")) != 0) - { - if (isparam("old_pwd")) - rsprintf("\n"); + if (!getcfg(lbs->name, "Admin user", str) || + !strstr(str, getparam("unm")) != 0) { + if (isparam("old_pwd")) + rsprintf("\n"); } - } + } - rsprintf("\n", loc("New password")); - rsprintf("\n"); + rsprintf("\n", + loc("New password")); + rsprintf + ("\n"); - rsprintf("\n", loc("Retype new password")); - rsprintf("\n"); + rsprintf("\n", + loc("Retype new password")); + rsprintf + ("\n"); - rsprintf("", - loc("Submit")); + rsprintf + ("", + loc("Submit")); - rsprintf("
%s!
%s!
%s!
%s!
\n"); + rsprintf("
\n"); - rsprintf("", user); + rsprintf("", user); - rsprintf("%s \"%s\"
%s:\n", loc("Old password")); - rsprintf("\n"); - rsprintf("
%s:\n", + loc("Old password")); + rsprintf + ("\n"); + rsprintf("
%s:
%s:
%s:
%s:
\n"); + rsprintf("\n"); - rsprintf("\r\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -int get_last_index(LOGBOOK *lbs, int index) +int get_last_index(LOGBOOK * lbs, int index) /* return value of specific attribute of last entry, can be used to auto-increment tags */ { -int i, message_id; -char str[80], attrib[MAX_N_ATTR][NAME_LENGTH], + int i, message_id; + char str[80], attrib[MAX_N_ATTR][NAME_LENGTH], att[MAX_ATTACHMENTS][256]; - str[0] = 0; - message_id = el_search_message(lbs, EL_LAST, 0, FALSE); + str[0] = 0; + message_id = el_search_message(lbs, EL_LAST, 0, FALSE); - 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]); + strcpy(str, attrib[index]); - /* look for first digit, return value */ - for (i=0 ; i<(int)strlen(str) ; i++) - if (isdigit(str[i])) - break; + /* look for first digit, return value */ + for (i = 0; i < (int) strlen(str); i++) + if (isdigit(str[i])) + break; - return atoi(str+i); + return atoi(str + i); } /*------------------------------------------------------------------*/ -BOOL is_author(LOGBOOK *lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *owner) +BOOL is_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], + char *owner) { -char str[1000], preset[1000]; -int i; + char str[1000], preset[1000]; + int i; - /* check if current user is admin */ - if (getcfg(lbs->name, "Admin user", str) && strstr(str, getparam("unm")) != 0) - return TRUE; + /* check if current user is admin */ + if (getcfg(lbs->name, "Admin user", str) + && strstr(str, getparam("unm")) != 0) + return TRUE; - /* search attribute which contains short_name of author */ - for (i=0 ; in_attr ; i++) - { - sprintf(str, "Preset %s", attr_list[i]); - if (getcfg(lbs->name, str, preset)) - { - if (strstr(preset, "$short_name")) - { - if (strstr(attrib[i], getparam("unm")) == NULL) - { - strcpy(owner, attrib[i]); - return FALSE; - } - else - break; - } - } - } - - if (i == lbs->n_attr) - { - /* if not found, search attribute which contains full_name of author */ - for (i=0 ; in_attr ; i++) - { + /* search attribute which contains short_name of author */ + for (i = 0; i < lbs->n_attr; i++) { sprintf(str, "Preset %s", attr_list[i]); - if (getcfg(lbs->name, str, preset)) - { - if (strstr(preset, "$long_name")) - { - if (strstr(attrib[i], getparam("full_name")) == NULL) - { - strcpy(owner, attrib[i]); - return FALSE; - } - } - } + if (getcfg(lbs->name, str, preset)) { + if (strstr(preset, "$short_name")) { + if (strstr(attrib[i], getparam("unm")) == NULL) { + strcpy(owner, attrib[i]); + return FALSE; + } else + break; + } } - } + } - return TRUE; + if (i == lbs->n_attr) { + /* if not found, search attribute which contains full_name of author */ + for (i = 0; i < lbs->n_attr; i++) { + sprintf(str, "Preset %s", attr_list[i]); + if (getcfg(lbs->name, str, preset)) { + if (strstr(preset, "$long_name")) { + if (strstr(attrib[i], getparam("full_name")) == NULL) { + strcpy(owner, attrib[i]); + return FALSE; + } + } + } + } + } + + return TRUE; } /*------------------------------------------------------------------*/ BOOL is_cond_attr(index) { -int i; + int i; - for (i=0 ; in_attr ; i++) - attrib[i][0] = 0; + for (i = 0; i < lbs->n_attr; i++) + attrib[i][0] = 0; - text[0] = 0; + text[0] = 0; - if (breedit) - { - /* get date from parameter */ - if (*getparam("entry_date")) - strcpy(date, getparam("entry_date")); + if (breedit) { + /* get date from parameter */ + if (*getparam("entry_date")) + strcpy(date, getparam("entry_date")); - /* get attributes from parameters */ - for (i=0 ; in_attr ; i++) - { - if (attr_flags[i] & AF_MULTI) - { - attrib[i][0] = 0; - first = 1; - for (j=0 ; jn_attr; i++) { + if (attr_flags[i] & AF_MULTI) { + attrib[i][0] = 0; + first = 1; + for (j = 0; j < MAX_N_LIST; j++) { + sprintf(str, "%s#%d", attr_list[i], j); + if (getparam(str)) { + if (*getparam(str)) { + if (first) + first = 0; + else + strlcat(attrib[i], " | ", NAME_LENGTH); + if (strlen(attrib[i]) + strlen(getparam(str)) < + NAME_LENGTH - 2) + strlcat(attrib[i], getparam(str), NAME_LENGTH); + else + break; + } + } else + break; } - else + } else { + strlcpy(attrib[i], getparam(attr_list[i]), NAME_LENGTH); + } + } + + strlcpy(text, getparam("text"), TEXT_SIZE); + + for (i = 0; i < MAX_ATTACHMENTS; i++) { + sprintf(str, "attachment%d", i); + if (isparam(str)) + strlcpy(att[i], getparam(str), 256); + } + + /* get encoding */ + strcpy(encoding, atoi(getparam("html")) == 1 ? "HTML" : "plain"); + } else { + if (message_id) { + /* get message for reply/edit */ + + size = sizeof(text); + el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + text, &size, orig_tag, reply_tag, att, encoding, + locked_by); + + if (bedit) { + if (getcfg(lbs->name, "Use Lock", str) && atoi(str) == 1) { + if (*getparam("full_name")) + strcpy(str, getparam("full_name")); + else + strcpy(str, loc("user")); + + strcat(str, " "); + strcat(str, loc("on")); + strcat(str, " "); + strcat(str, rem_host); + + el_lock_message(lbs, message_id, str); + } + } + } else { + /* get preset attributes */ + for (i = 0; i < lbs->n_attr; i++) { + sprintf(str, "p%s", attr_list[i]); + strcpy(attrib[i], getparam(str)); + } + } + } + + /* evaluate conditional attributes */ + condition[0] = 0; + for (i = 0; i < lbs->n_attr; i++) { + if (strchr(attrib[i], '{') && strchr(attrib[i], '}')) { + strlcpy(str, strchr(attrib[i], '{') + 1, sizeof(str)); + if (*strchr(str, '}')) + *strchr(str, '}') = 0; + + if (condition[0] == 0) + strlcpy(condition, str, sizeof(condition)); + else { + strlcat(condition, ",", sizeof(condition)); + strlcat(condition, str, sizeof(condition)); + } + } + } + + /* check for maximum number of replies */ + if (breply) { + i = 0; + p = strtok(reply_tag, ","); + while (p) { + i++; + p = strtok(NULL, ","); + } + + if (i >= MAX_REPLY_TO) { + sprintf(str, loc("Maximum number of replies (%d) exceeded"), + MAX_REPLY_TO); + show_error(str); + return; + } + } + + /* check for author */ + if (bedit && getcfg_cond(lbs->name, condition, "Restrict edit", str) + && atoi(str) == 1) { + if (!is_author(lbs, attrib, owner)) { + sprintf(str, loc("Only user %s can edit this entry"), + owner); + show_error(str); + return; + } + } + + /* check for editing interval */ + if (bedit + && getcfg_cond(lbs->name, condition, "Restrict edit time", str)) { + for (i = 0; i < *lbs->n_el_index; i++) + if (lbs->el_index[i].message_id == message_id) break; - } - } - else - { - strlcpy(attrib[i], getparam(attr_list[i]), NAME_LENGTH); - } + + if (i < *lbs->n_el_index + && time(NULL) > lbs->el_index[i].file_time + atof(str) * 3600) { + sprintf(str, + loc + ("Message can only be edited %1.2lg hours after creation"), + atof(str)); + show_error(str); + return; } + } - strlcpy(text, getparam("text"), TEXT_SIZE); + /* remove attributes for replies */ + if (breply) { + getcfg_cond(lbs->name, condition, "Remove on reply", str); + n = strbreak(str, list, MAX_N_ATTR); + for (i = 0; i < n; i++) + for (j = 0; j < lbs->n_attr; j++) { + if (equal_ustring(attr_list[j], list[i])) + attrib[j][0] = 0; + } + } - for (i=0 ; in_attr; index++) { + sprintf(str, "Subst on reply %s", attr_list[index]); + if (getcfg_cond(lbs->name, condition, str, preset)) { + /* check if already second reply */ + if (orig_tag[0] == 0) { + i = build_subst_list(lbs, slist, svalue, attrib); + strsubst(preset, slist, svalue, i); + strcpy(attrib[index], preset); + } + } } + } - /* get encoding */ - strcpy(encoding, atoi(getparam("html")) == 1 ? "HTML" : "plain"); - } - else - { - if (message_id) - { - /* get message for reply/edit */ - - size = sizeof(text); - el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, - text, &size, orig_tag, reply_tag, att, encoding, locked_by); - - if (bedit) - { - if (getcfg(lbs->name, "Use Lock", str) && atoi(str) == 1) - { - if (*getparam("full_name")) - strcpy(str, getparam("full_name")); - else - strcpy(str, loc("user")); - - strcat(str, " "); - strcat(str, loc("on")); - strcat(str, " "); - strcat(str, rem_host); - - el_lock_message(lbs, message_id, str); - } - } + /* subst attributes for edits */ + if (message_id && bedit && !breedit) { + for (index = 0; index < lbs->n_attr; index++) { + sprintf(str, "Subst on edit %s", attr_list[index]); + if (getcfg_cond(lbs->name, condition, str, preset)) { + i = build_subst_list(lbs, slist, svalue, attrib); + strsubst(preset, slist, svalue, i); + if (strncmp(preset, "
", 4) == 0) + strcpy(attrib[index], preset + 4); + else + strcpy(attrib[index], preset); + } } - else - { - /* get preset attributes */ - for (i=0 ; in_attr ; i++) - { - sprintf(str, "p%s", attr_list[i]); - strcpy(attrib[i], getparam(str)); - } - } - } + } - /* evaluate conditional attributes */ - condition[0] = 0; - for (i=0 ; in_attr ; i++) - { - if (strchr(attrib[i], '{') && strchr(attrib[i], '}')) - { - strlcpy(str, strchr(attrib[i], '{')+1, sizeof(str)); - if (*strchr(str, '}')) - *strchr(str, '}') = 0; + /* header */ + show_html_header(lbs, FALSE, "ELOG"); - if (condition[0] == 0) - strlcpy(condition, str, sizeof(condition)); - else - { - strlcat(condition, ",", sizeof(condition)); - strlcat(condition, str, sizeof(condition)); - } - } - } - - /* check for maximum number of replies */ - if (breply) - { - i = 0; - p = strtok(reply_tag, ","); - while (p) - { - i++; - p = strtok(NULL, ","); - } - - if (i >= MAX_REPLY_TO) - { - sprintf(str, loc("Maximum number of replies (%d) exceeded"), MAX_REPLY_TO); - show_error(str); - return; - } - } - - /* check for author */ - if (bedit && getcfg_cond(lbs->name, condition, "Restrict edit", str) && atoi(str) == 1) - { - if (!is_author(lbs, attrib, owner)) - { - sprintf(str, loc("Only user %s can edit this entry"), owner); - show_error(str); - return; - } - } - - /* check for editing interval */ - if (bedit && getcfg_cond(lbs->name, condition, "Restrict edit time", str)) - { - for (i = 0 ; i < *lbs->n_el_index ; i++) - if (lbs->el_index[i].message_id == message_id) - break; - - if (i < *lbs->n_el_index && time(NULL) > lbs->el_index[i].file_time + atof(str)*3600) - { - sprintf(str, loc("Message can only be edited %1.2lg hours after creation"), atof(str)); - show_error(str); - return; - } - } - - /* remove attributes for replies */ - if (breply) - { - getcfg_cond(lbs->name, condition, "Remove on reply", str); - n = strbreak(str, list, MAX_N_ATTR); - for (i=0 ; in_attr ; j++) - { - if (equal_ustring(attr_list[j], list[i])) - attrib[j][0] = 0; - } - } - - /* subst attributes for replies */ - if (breply) - { - for (index = 0 ; index < lbs->n_attr ; index++) - { - sprintf(str, "Subst on reply %s", attr_list[index]); - if (getcfg_cond(lbs->name, condition, str, preset)) - { - /* check if already second reply */ - if (orig_tag[0] == 0) - { - i = build_subst_list(lbs, slist, svalue, attrib); - strsubst(preset, slist, svalue, i); - strcpy(attrib[index], preset); - } - } - } - } - - /* subst attributes for edits */ - if (message_id && bedit && !breedit) - { - for (index = 0 ; index < lbs->n_attr ; index++) - { - sprintf(str, "Subst on edit %s", attr_list[index]); - if (getcfg_cond(lbs->name, condition, str, preset)) - { - i = build_subst_list(lbs, slist, svalue, attrib); - strsubst(preset, slist, svalue, i); - if (strncmp(preset, "
", 4) == 0) - strcpy(attrib[index], preset+4); - else - strcpy(attrib[index], preset); - } - } - } - - /* header */ - show_html_header(lbs, FALSE, "ELOG"); - - rsprintf("\n"); + rsprintf + ("\n"); /*---- add password in case cookie expires during edit ----*/ - if (getcfg(lbs->name, "Write password", str)) - rsprintf("\n", str); + if (getcfg(lbs->name, "Write password", str)) + rsprintf("\n", str); - if (getcfg(lbs->name, "Password file", str)) - { - rsprintf("\n", getparam("unm")); - rsprintf("\n", getparam("upwd")); - } + if (getcfg(lbs->name, "Password file", str)) { + rsprintf("\n", + getparam("unm")); + rsprintf("\n", + getparam("upwd")); + } /*---- title row ----*/ - show_standard_title(lbs->name, "", 0); + show_standard_title(lbs->name, "", 0); /*---- menu buttons ----*/ - rsprintf("\n"); + rsprintf("\n"); - /* default cmd */ - rsprintf("\n", loc("Update")); + /* default cmd */ + rsprintf("\n", loc("Update")); - rsprintf("\n", loc("Submit")); - rsprintf("\n", loc("Back")); - rsprintf("\n\n"); + rsprintf("\n", + loc("Submit")); + rsprintf("\n", + loc("Back")); + rsprintf("\n\n"); /*---- entry form ----*/ - /* table for two-column items */ - rsprintf(""); + /* table for two-column items */ + rsprintf + ("\n\n"); + rsprintf("\n\n"); - rsprintf("
"); - /* print required message if one of the attributes has it set */ - for (i= 0 ; i < lbs->n_attr ; i++) - { - if (attr_flags[i] & AF_REQUIRED) - { - rsprintf("\n", - loc("Fields marked with"), loc("are required")); - break; + /* print required message if one of the attributes has it set */ + for (i = 0; i < lbs->n_attr; i++) { + if (attr_flags[i] & AF_REQUIRED) { + rsprintf + ("\n", + loc("Fields marked with"), loc("are required")); + break; } - } + } - time(&now); - if (bedit) - { - if (getcfg_cond(lbs->name, condition, "Date format", format)) - { - struct tm ts; + time(&now); + if (bedit) { + if (getcfg_cond(lbs->name, condition, "Date format", format)) { + struct tm ts; - memset(&ts, 0, sizeof(ts)); + memset(&ts, 0, sizeof(ts)); - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; - ts.tm_mon = i; + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; + ts.tm_mon = i; - ts.tm_mday = atoi(date+8); - ts.tm_hour = atoi(date+11); - ts.tm_min = atoi(date+14); - ts.tm_sec = atoi(date+17); - ts.tm_year = atoi(date+20)-1900; - ts.tm_isdst = -1; /* let mktime compute DST */ + ts.tm_mday = atoi(date + 8); + ts.tm_hour = atoi(date + 11); + ts.tm_min = atoi(date + 14); + ts.tm_sec = atoi(date + 17); + ts.tm_year = atoi(date + 20) - 1900; + ts.tm_isdst = -1; /* let mktime compute DST */ - mktime(&ts); - strftime(str, sizeof(str), format, &ts); - } - else - strcpy(str, date); - } - else - { - if (getcfg_cond(lbs->name, condition, "Date format", format)) - strftime(str, sizeof(str), format, localtime(&now)); - else - strcpy(str, ctime(&now)); - strcpy(date, ctime(&now)); - date[24] = 0; - } - - rsprintf("", loc("Entry date")); - rsprintf("\n", date); - - /* rescan attributes if condition set */ - if (condition[0]) - scan_attributes(lbs->name, condition); - - /* display attributes */ - for (index = 0 ; index < lbs->n_attr ; index++) - { - strcpy(class_name, "attribname"); - strcpy(class_value, "attribvalue"); - input_size = 80; - input_maxlen = NAME_LENGTH; - - sprintf(str, "Format %s", attr_list[index]); - if (getcfg_cond(lbs->name, condition, str, format)) - { - n = strbreak(format, fl, 8); - if (n > 0) - format_flags = atoi(fl[0]); - if (n > 1) - strlcpy(class_name, fl[1], sizeof(class_name)); - if (n > 2) - strlcpy(class_value, fl[2], sizeof(class_value)); - if (n > 3 && atoi(fl[3]) > 0) - input_size = atoi(fl[3]); - if (n > 4 && atoi(fl[4]) > 0) - input_maxlen = atoi(fl[4]); - } - - strcpy(star, (attr_flags[index] & AF_REQUIRED) ? "*" : ""); - - /* check for preset string */ - sprintf(str, "Preset %s", attr_list[index]); - if (getcfg_cond(lbs->name, condition, str, preset)) - { - if (!bedit) - { - i = build_subst_list(lbs, slist, svalue, NULL); - strsubst(preset, slist, svalue, i); - - /* check for index substitution */ - if (!bedit && strchr(preset, '%')) - { - /* get index */ - i = get_last_index(lbs, index); - - strcpy(str, preset); - sprintf(preset, str, i+1); - } - - if (!strchr(preset, '%')) - strcpy(attrib[index], preset); - } - } - - /* display text box */ - rsprintf("\n"); - - /* if attribute cannot be changed, just display text */ - if ((attr_flags[index] & AF_LOCKED) || - (bedit && (attr_flags[index] & AF_FIXED_EDIT)) || - (message_id && !bedit && (attr_flags[index] & AF_FIXED_REPLY))) - { - rsprintf("\n", + strcpy(str, ctime(&now)); + strcpy(date, ctime(&now)); + date[24] = 0; + } + + rsprintf("", + loc("Entry date")); + rsprintf("\n", + date); + + /* rescan attributes if condition set */ + if (condition[0]) + scan_attributes(lbs->name, condition); + + /* display attributes */ + for (index = 0; index < lbs->n_attr; index++) { + strcpy(class_name, "attribname"); + strcpy(class_value, "attribvalue"); + input_size = 80; + input_maxlen = NAME_LENGTH; + + sprintf(str, "Format %s", attr_list[index]); + if (getcfg_cond(lbs->name, condition, str, format)) { + n = strbreak(format, fl, 8); + if (n > 0) + format_flags = atoi(fl[0]); + if (n > 1) + strlcpy(class_name, fl[1], sizeof(class_name)); + if (n > 2) + strlcpy(class_value, fl[2], sizeof(class_value)); + if (n > 3 && atoi(fl[3]) > 0) + input_size = atoi(fl[3]); + if (n > 4 && atoi(fl[4]) > 0) + input_maxlen = atoi(fl[4]); + } + + strcpy(star, + (attr_flags[index] & AF_REQUIRED) ? "*" + : ""); + + /* check for preset string */ + sprintf(str, "Preset %s", attr_list[index]); + if (getcfg_cond(lbs->name, condition, str, preset)) { + if (!bedit) { + i = build_subst_list(lbs, slist, svalue, NULL); + strsubst(preset, slist, svalue, i); + + /* check for index substitution */ + if (!bedit && strchr(preset, '%')) { + /* get index */ + i = get_last_index(lbs, index); + + strcpy(str, preset); + sprintf(preset, str, i + 1); + } + + if (!strchr(preset, '%')) + strcpy(attrib[index], preset); + } + } + + /* display text box */ + rsprintf("\n"); + + /* if attribute cannot be changed, just display text */ + if ((attr_flags[index] & AF_LOCKED) || + (bedit && (attr_flags[index] & AF_FIXED_EDIT)) || + (message_id && !bedit && (attr_flags[index] & AF_FIXED_REPLY))) { + rsprintf("\n", attr_list[index], attrib[index]); + } else { + if (attr_options[index][0][0] == 0) { + rsprintf + ("\n", + class_value, input_size, input_maxlen, attr_list[index], + attrib[index]); + } else { + if (equal_ustring(attr_options[index][0], "boolean")) { + /* display checkbox */ + if (atoi(attrib[index]) == 1) + rsprintf + ("\n"); + } else if (attr_flags[index] & AF_RADIO) { + /* display radio buttons */ + rsprintf("\n"); + } else if (attr_flags[index] & AF_ICON) { + /* display icons */ + rsprintf("\n"); + } else { + /* display drop-down box */ + rsprintf("\n"); + } + } + } } - else - { - if (attr_options[index][0][0] == 0) - { - rsprintf("\n", - class_value, input_size, input_maxlen, attr_list[index], attrib[index]); - } - else - { - if (equal_ustring(attr_options[index][0], "boolean")) - { - /* display checkbox */ - if (atoi(attrib[index]) == 1) - rsprintf("\n"); - } - else if (attr_flags[index] & AF_RADIO) - { - /* display radio buttons */ - rsprintf("\n"); - } - else if (attr_flags[index] & AF_ICON) - { - /* display icons */ - rsprintf("\n"); - } - else - { - /* display drop-down box */ - rsprintf("\n"); - } - } - } - } - } - - /* set textarea width */ - width = 76; - - if (getcfg_cond(lbs->name, condition, "Message width", str)) - width = atoi(str); - - /* increased width according to longest line */ - if (message_id) - { - p = text; - do - { - pend = strchr(p, '\n'); - if (pend == NULL) - pend = p+strlen(p); - - if ((int) pend - (int) p + 1 > width) - width = (int) pend - (int) p + 1; - - if (*pend == 0) - break; - - p = pend; - while (*p && (*p == '\r' || *p == '\n')) - p++; + p = pend; + while (*p && (*p == '\r' || *p == '\n')) + p++; } while (1); - /* leave space for '> ' */ - if (!bedit) - width += 2; - } + /* leave space for '> ' */ + if (!bedit) + width += 2; + } - /* set textarea height */ - height = 20; - if (getcfg_cond(lbs->name, condition, "Message height", str)) - height = atoi(str); + /* set textarea height */ + height = 20; + if (getcfg_cond(lbs->name, condition, "Message height", str)) + height = atoi(str); - rsprintf("\n"); - - if (!getcfg_cond(lbs->name, condition, "Enable attachments", str) || atoi(str) > 0) - { - i = 0; - if (bedit) - { - /* show existing attachments */ - for (i=0 ; i\n", loc("Attachment"), i+1); - sprintf(str, "attachment%d", i); - rsprintf("\n", - i, loc("Delete")); - } - else - break; - } - - /* optional attachment comment */ - if (getcfg_cond(lbs->name, condition, "Attachment comment", comment) && !message_id) - { - rsprintf("\n"); + rsputs("
\n"); + } + + if (!getcfg_cond(lbs->name, condition, "Show text", str) + || atoi(str) == 1) { + rsprintf("
\n"); + + /* HTML check box */ + if (message_id) { + if (getcfg_cond(lbs->name, condition, "HTML default", str)) { + if (atoi(str) < 2) { + if (encoding[0] == 'H') + rsprintf + ("%s\n", + loc("Submit as HTML text")); + else + rsprintf("%s\n", + loc("Submit as HTML text")); + } else if (atoi(str) == 3) { + rsprintf("\n"); + } + } else { + if (encoding[0] == 'H') + rsprintf + ("%s\n", + loc("Submit as HTML text")); + else + rsprintf("%s\n", + loc("Submit as HTML text")); + } + } else { + if (getcfg_cond(lbs->name, condition, "HTML default", str)) { + if (atoi(str) == 0) { + rsprintf("%s\n", + loc("Submit as HTML text")); + } else if (atoi(str) == 1) { + rsprintf + ("%s\n", + loc("Submit as HTML text")); + } else if (atoi(str) == 3) { + rsprintf("\n"); + } + } else + rsprintf("%s\n", + loc("Submit as HTML text")); + } + } + + /* Suppress email check box */ + if (! + (bedit + && getcfg_cond(lbs->name, condition, "Suppress Email on edit", str) + && atoi(str) == 1)) { + if (getcfg_cond(lbs->name, condition, "Suppress default", str)) { + if (atoi(str) == 0) { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Suppress Email notification")); + } else if (atoi(str) == 1) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Suppress Email notification")); + } + } else { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Suppress Email notification")); + } + } + + /* Suppress execute shell check box */ + if (!bedit && getcfg_cond(lbs->name, condition, "Execute new", str)) { + if (getcfg_cond + (lbs->name, condition, "Suppress execute default", str)) { + if (atoi(str) == 0) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Suppress shell execution")); + } else if (atoi(str) == 1) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Suppress shell execution")); + } + } else { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Suppress shell execution")); + } + } + + if (bedit && getcfg_cond(lbs->name, condition, "Execute edit", str)) { + if (getcfg_cond + (lbs->name, condition, "Suppress execute default", str)) { + if (atoi(str) == 0) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Suppress shell execution")); + } else if (atoi(str) == 1) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Suppress shell execution")); + } + } else { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Suppress shell execution")); + } + } + + /* Resubmit check box */ + if (bedit) { + if (getcfg_cond(lbs->name, condition, "Resubmit default", str)) { + if (atoi(str) == 0) { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Resubmit as new entry")); + } else if (atoi(str) == 1) { + rsprintf("        \n"); + rsprintf + ("%s\n", + loc("Resubmit as new entry")); + } + } else { + rsprintf("        \n"); + rsprintf("%s\n", + loc("Resubmit as new entry")); + } + } + + rsprintf("\n"); + + if (!getcfg_cond(lbs->name, condition, "Enable attachments", str) + || atoi(str) > 0) { + i = 0; + if (bedit) { + /* show existing attachments */ + for (i = 0; i < MAX_ATTACHMENTS; i++) + if (att[i][0]) { + rsprintf + ("\n", + loc("Attachment"), i + 1); + sprintf(str, "attachment%d", i); + rsprintf("\n", + i, loc("Delete")); + } else + break; + } + + /* optional attachment comment */ + if (getcfg_cond(lbs->name, condition, "Attachment comment", comment) + && !message_id) { + rsprintf("\n"); + } + + /* field for add attachment */ + if (att[MAX_ATTACHMENTS - 1][0]) { + rsprintf("\n", + loc("Maximum number of attachments reached")); + rsprintf("\n"); + } else { + rsprintf("\n", + loc("Attachment"), i + 1); + rsprintf + ("\n"); + } + } + + rsprintf("
%s * %s
%s * %s
%s:%s\n", str); - rsprintf("
%s%s:", attr_list[index], star); - - /* show optional comment */ - sprintf(str, "Comment %s", attr_list[index]); - if (getcfg_cond(lbs->name, condition, str, comment)) - rsprintf("
%s\n", comment); - - rsprintf("		\n"); - rsputs2(attrib[index]); - rsprintf(" "); - - if (attr_flags[index] & AF_MULTI) - { - for (i=0 ; i\n", str, attr_options[index][i]); - } - } - else if (attr_flags[index] & AF_RADIO) - { - for (i=0 ; i\n", str, attr_options[index][i]); - } - } - else if (attr_flags[index] & AF_ICON) - { - for (i=0 ; i\n", str, attr_options[index][i]); - } - } + mktime(&ts); + strftime(str, sizeof(str), format, &ts); + } else + strcpy(str, date); + } else { + if (getcfg_cond(lbs->name, condition, "Date format", format)) + strftime(str, sizeof(str), format, localtime(&now)); else - rsprintf("
%s:%s\n", str); + rsprintf("
%s%s:", + attr_list[index], star); + + /* show optional comment */ + sprintf(str, "Comment %s", attr_list[index]); + if (getcfg_cond(lbs->name, condition, str, comment)) + rsprintf("
%s\n", + comment); + + rsprintf("		\n"); + rsputs2(attrib[index]); + rsprintf(" "); + + if (attr_flags[index] & AF_MULTI) { + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) { + sprintf(str, "%s#%d", attr_list[index], i); + + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("\n", + str, attr_options[index][i]); + } + } else if (attr_flags[index] & AF_RADIO) { + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) { + sprintf(str, "%s#%d", attr_list[index], i); + + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("\n", + str, attr_options[index][i]); + } + } else if (attr_flags[index] & AF_ICON) { + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; i++) { + sprintf(str, "%s#%d", attr_list[index], i); + + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("\n", + str, attr_options[index][i]); + } + } else + rsprintf + ("
\n", + attr_list[index]); + else + rsprintf + ("\n", + attr_list[index]); + } else { + if (attr_flags[index] & AF_MULTI) { + /* display multiple check boxes */ + rsprintf("\n"); + + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; + i++) { + sprintf(str, "%s#%d", attr_list[index], i); + + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("%s\n", + str, attr_options[index][i], + attr_options[index][i]); + else + rsprintf + ("%s\n", + str, attr_options[index][i], + attr_options[index][i]); + + if (format_flags & AFF_MULTI_LINE) + rsprintf("
"); + } + + rsprintf("
\n"); + + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; + i++) { + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("%s\n", + attr_list[index], attr_options[index][i], + attr_options[index][i]); + else + rsprintf + ("%s\n", + attr_list[index], attr_options[index][i], + attr_options[index][i]); + + if (format_flags & AFF_MULTI_LINE) + rsprintf("
"); + } + + rsprintf("
\n"); + + for (i = 0; i < MAX_N_LIST && attr_options[index][i][0]; + i++) { + if (strstr(attrib[index], attr_options[index][i])) + rsprintf + ("", + attr_list[index], attr_options[index][i]); + else + rsprintf + ("", + attr_list[index], attr_options[index][i]); + + sprintf(str, "Icon comment %s", + attr_options[index][i]); + getcfg_cond(lbs->name, condition, str, comment); + + if (comment[0]) + rsprintf + ("\"%s\"\n", + attr_options[index][i], comment); + else + rsprintf("\n", + attr_options[index][i]); + + if (format_flags & AFF_MULTI_LINE) + rsprintf("
"); + } + + rsprintf("
\n"); + if (is_cond_attr(index)) { + /* show "update" button only of javascript is not enabled */ + rsprintf + ("\n"); + + rsprintf("\n"); + } + rsprintf("
\n", - attr_list[index]); - else - rsprintf("\n", - attr_list[index]); - } - else - { - if (attr_flags[index] & AF_MULTI) - { - /* display multiple check boxes */ - rsprintf("\n"); + } - for (i=0 ; i%s\n", - str, attr_options[index][i], attr_options[index][i]); - else - rsprintf("%s\n", - str, attr_options[index][i], attr_options[index][i]); + if (getcfg_cond(lbs->name, condition, "Message width", str)) + width = atoi(str); - if (format_flags & AFF_MULTI_LINE) - rsprintf("
"); - } + /* increased width according to longest line */ + if (message_id) { + p = text; + do { + pend = strchr(p, '\n'); + if (pend == NULL) + pend = p + strlen(p); - rsprintf("
\n"); + if ((int) pend - (int) p + 1 > width) + width = (int) pend - (int) p + 1; - for (i=0 ; i%s\n", - attr_list[index], attr_options[index][i], attr_options[index][i]); - else - rsprintf("%s\n", - attr_list[index], attr_options[index][i], attr_options[index][i]); + if (*pend == 0) + break; - if (format_flags & AFF_MULTI_LINE) - rsprintf("
"); - } - - rsprintf("
\n"); - - for (i=0 ; i", attr_list[index], attr_options[index][i]); - else - rsprintf("", attr_list[index], attr_options[index][i]); - - sprintf(str, "Icon comment %s", attr_options[index][i]); - getcfg_cond(lbs->name, condition, str, comment); - - if (comment[0]) - rsprintf("\"%s\"\n", attr_options[index][i], comment); - else - rsprintf("\n", attr_options[index][i]); - - if (format_flags & AFF_MULTI_LINE) - rsprintf("
"); - } - - rsprintf("
\n"); - if (is_cond_attr(index)) - { - /* show "update" button only of javascript is not enabled */ - rsprintf("\n"); - - rsprintf("\n"); - } - rsprintf("
\n"); + rsprintf("
\n"); - if (breply) - /* hidden text for original message */ - rsprintf("\n", message_id); + if (breply) + /* hidden text for original message */ + rsprintf("\n", + message_id); - if (breedit) - /* hidden text for original message */ - rsprintf("\n", getparam("reply_to")); + if (breedit) + /* hidden text for original message */ + rsprintf("\n", + getparam("reply_to")); - if (bedit && message_id) - rsprintf("\n", message_id); + if (bedit && message_id) + rsprintf("\n", + message_id); - if (getcfg_cond(lbs->name, condition, "Message comment", comment) && !message_id) - { - rsputs(comment); - rsputs("
\n"); - } - - if (!getcfg_cond(lbs->name, condition, "Show text", str) || atoi(str) == 1) - { - rsprintf("
\n"); - - /* HTML check box */ - if (message_id) - { - if (getcfg_cond(lbs->name, condition, "HTML default", str)) - { - if (atoi(str) < 2) - { - if (encoding[0] == 'H') - rsprintf("%s\n", loc("Submit as HTML text")); - else - rsprintf("%s\n", loc("Submit as HTML text")); - } - else if (atoi(str) == 3) - { - rsprintf("\n"); - } - } - else - { - if (encoding[0] == 'H') - rsprintf("%s\n", loc("Submit as HTML text")); - else - rsprintf("%s\n", loc("Submit as HTML text")); - } - } - else - { - if (getcfg_cond(lbs->name, condition, "HTML default", str)) - { - if (atoi(str) == 0) - { - rsprintf("%s\n", loc("Submit as HTML text")); - } - else if (atoi(str) == 1) - { - rsprintf("%s\n", loc("Submit as HTML text")); - } - else if (atoi(str) == 3) - { - rsprintf("\n"); - } - } - else - rsprintf("%s\n", loc("Submit as HTML text")); - } - } - - /* Suppress email check box */ - if ( !(bedit && getcfg_cond(lbs->name, condition, "Suppress Email on edit", str) && atoi(str) == 1) ) - { - if (getcfg_cond(lbs->name, condition, "Suppress default", str)) - { - if (atoi(str) == 0) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress Email notification")); - } - else if (atoi(str) == 1) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress Email notification")); - } - } - else - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress Email notification")); - } - } - - /* Suppress execute shell check box */ - if ( !bedit && getcfg_cond(lbs->name, condition, "Execute new", str) ) - { - if (getcfg_cond(lbs->name, condition, "Suppress execute default", str)) - { - if (atoi(str) == 0) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - else if (atoi(str) == 1) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - } - else - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - } - - if ( bedit && getcfg_cond(lbs->name, condition, "Execute edit", str) ) - { - if (getcfg_cond(lbs->name, condition, "Suppress execute default", str)) - { - if (atoi(str) == 0) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - else if (atoi(str) == 1) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - } - else - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Suppress shell execution")); - } - } - - /* Resubmit check box */ - if (bedit) - { - if (getcfg_cond(lbs->name, condition, "Resubmit default", str)) - { - if (atoi(str) == 0) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Resubmit as new entry")); - } - else if (atoi(str) == 1) - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Resubmit as new entry")); - } - } - else - { - rsprintf("        \n"); - rsprintf("%s\n", loc("Resubmit as new entry")); - } - } - - rsprintf("
%s %d:\n"); - rsprintf("\n", str, att[i]); - rsprintf("%s\n", att[i]+14); - rsprintf("  
\n"); + if (getcfg_cond(lbs->name, condition, "Message comment", comment) + && !message_id) { rsputs(comment); - rsputs("
%s %d:\n"); + rsprintf("\n", + str, att[i]); + rsprintf("%s\n", att[i] + 14); + rsprintf + ("  
\n"); + rsputs(comment); + rsputs("
%s
%s %d:\n"); + rsprintf + ("  \n", + loc("Upload")); + rsprintf("
\n"); /*---- menu buttons again ----*/ - rsprintf("
\n"); - rsprintf("\n", loc("Submit")); - rsprintf("\n", loc("Back")); - rsprintf("
\n"); + rsprintf("\n", + loc("Submit")); + rsprintf("\n", + loc("Back")); + rsprintf("
\n"); - rsprintf("\r\n"); + rsprintf("\n"); + rsprintf("\r\n"); - /* rescan unconditional attributes */ - if (condition[0]) - scan_attributes(lbs->name, NULL); + /* rescan unconditional attributes */ + if (condition[0]) + scan_attributes(lbs->name, NULL); } /*------------------------------------------------------------------*/ -void show_find_form(LOGBOOK *lbs) +void show_find_form(LOGBOOK * lbs) { -int i, j; -char str[NAME_LENGTH], mode[256], comment[256]; + int i, j; + char str[NAME_LENGTH], mode[256], comment[256]; /*---- header ----*/ - show_standard_header(lbs, TRUE, loc("ELOG find"), NULL); + show_standard_header(lbs, TRUE, loc("ELOG find"), NULL); /*---- title ----*/ - show_standard_title(lbs->name, "", 0); + show_standard_title(lbs->name, "", 0); /*---- menu buttons ----*/ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", loc("Search")); - rsprintf("\n", loc("Reset Form")); - rsprintf("\n", loc("Back")); - rsprintf("\n\n"); + rsprintf("\n", loc("Search")); + rsprintf("\n", loc("Reset Form")); + rsprintf("\n", loc("Back")); + rsprintf("\n\n"); /*---- entry form ----*/ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("%s:  ", loc("Mode")); + rsprintf("%s:  ", loc("Mode")); - if (!getcfg(lbs->name, "Display mode", mode)) - strcpy(mode, "Full"); - - if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) - { - if (equal_ustring(mode, "Full")) - rsprintf("%s  \n", loc("Display full message")); - else - rsprintf("%s  \n", loc("Display full message")); - - if (equal_ustring(mode, "Summary")) - rsprintf("%s  \n", loc("Summary only")); - else - rsprintf("%s  \n", loc("Summary only")); - } - else - { - if (equal_ustring(mode, "Full") || equal_ustring(mode, "Summary")) - rsprintf("%s  \n", loc("Summary")); - else - rsprintf("%s  \n", loc("Summary")); - } - - - if (equal_ustring(mode, "Threaded")) - rsprintf("%s  \n", loc("Display threads")); - else - rsprintf("%s  \n", loc("Display threads")); - - rsprintf("\n"); - - rsprintf("%s:
", loc("Options")); - - if (!getcfg(lbs->name, "Number attachments", str) || atoi(str) > 0) - rsprintf("%s
\n", loc("Show attachments")); - - rsprintf("%s
\n", loc("Printable output")); - - if (getcfg(lbs->name, "Reverse sort", str) && atoi(str) == 1) - rsprintf("%s
\n", loc("Sort in reverse order")); - else - rsprintf("%s
\n", loc("Sort in reverse order")); - - /* count logbooks */ - for (i=0 ; ; i++) - { - if (!enumgrp(i, str)) - break; - - if (equal_ustring(str, "global")) - continue; - } - - if (i > 2) - { - if (!getcfg(lbs->name, "Search all logbooks", str) || atoi(str) == 1) - rsprintf("%s
\n", loc("Search all logbooks")); - } - - rsprintf(loc("Display")); - if (!getcfg(lbs->name, "Entries per page", str)) - strcpy(str, "20"); - rsprintf(" ", str); - rsprintf(loc("entries per page")); - - rsprintf("\n"); - - - rsprintf("%s:
", loc("Filters")); - - /* table for two-column items */ - rsprintf("\n"); - - rsprintf("", loc("Start date")); - rsprintf("\n"); - - rsprintf("", loc("End date")); - rsprintf("\n"); - - for (i=0 ; in_attr ; i++) - { - rsprintf("", attr_list[i]); - rsprintf("\n"); + + rsprintf("\n"); + + + rsprintf("
%s:\n"); - - rsprintf("\n"); - - rsprintf(" %s: ", loc("Year")); - - rsprintf("  /  %s: ", loc("Show last")); - - rsprintf(" \n"); - - rsprintf("
%s:\n"); - - rsprintf("\n"); - - rsprintf(" %s: ", loc("Year")); - rsprintf("
%s:"); - if (attr_options[i][0][0] == 0) - { - rsprintf("\n", attr_list[i]); - rsprintf("%s\n", loc("(case insensitive substring)")); - } - else - { - if (equal_ustring(attr_options[i][0], "boolean")) - rsprintf("\n", attr_list[i]); - - /* display image for icon */ - else if (attr_flags[i] & AF_ICON) - { - for (j=0 ; jname, str, comment); - - rsprintf("", attr_list[i], attr_options[i][j]); - - if (comment[0]) - rsprintf("\"%s\"\n", attr_options[i][j], comment); - else - rsprintf("\n", attr_options[i][j]); - } - } + if (!getcfg(lbs->name, "Display mode", mode)) + strcpy(mode, "Full"); + if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) { + if (equal_ustring(mode, "Full")) + rsprintf + ("%s  \n", + loc("Display full message")); else - { - rsprintf("\n"); - } + rsprintf + ("%s  \n", + loc("Display full message")); + + if (equal_ustring(mode, "Summary")) + rsprintf + ("%s  \n", + loc("Summary only")); + else + rsprintf + ("%s  \n", + loc("Summary only")); + } else { + if (equal_ustring(mode, "Full") || equal_ustring(mode, "Summary")) + rsprintf + ("%s  \n", + loc("Summary")); + else + rsprintf + ("%s  \n", + loc("Summary")); + } + + + if (equal_ustring(mode, "Threaded")) + rsprintf + ("%s  \n", + loc("Display threads")); + else + rsprintf + ("%s  \n", + loc("Display threads")); + + rsprintf("
%s:
", loc("Options")); + + if (!getcfg(lbs->name, "Number attachments", str) || atoi(str) > 0) + rsprintf("%s
\n", + loc("Show attachments")); + + rsprintf("%s
\n", + loc("Printable output")); + + if (getcfg(lbs->name, "Reverse sort", str) && atoi(str) == 1) + rsprintf + ("%s
\n", + loc("Sort in reverse order")); + else + rsprintf("%s
\n", + loc("Sort in reverse order")); + + /* count logbooks */ + for (i = 0;; i++) { + if (!enumgrp(i, str)) + break; + + if (equal_ustring(str, "global")) + continue; + } + + if (i > 2) { + if (!getcfg(lbs->name, "Search all logbooks", str) || atoi(str) == 1) + rsprintf("%s
\n", + loc("Search all logbooks")); + } + + rsprintf(loc("Display")); + if (!getcfg(lbs->name, "Entries per page", str)) + strcpy(str, "20"); + rsprintf(" ", str); + rsprintf(loc("entries per page")); + + rsprintf("
%s:
", loc("Filters")); + + /* table for two-column items */ + rsprintf("\n"); + + rsprintf("", loc("Start date")); + rsprintf("\n"); + + rsprintf("", loc("End date")); + rsprintf("\n"); + + for (i = 0; i < lbs->n_attr; i++) { + rsprintf("", attr_list[i]); + rsprintf("\n"); - } + rsprintf("\n"); + } - rsprintf("", loc("Text")); - rsprintf("\n", loc("(case insensitive substring)")); + rsprintf("", loc("Text")); + rsprintf + ("\n", loc("(case insensitive substring)")); - rsprintf("\n", loc("Search text also in attributes")); + rsprintf + ("\n", + loc("Search text also in attributes")); - rsprintf("
%s:\n"); + + rsprintf("\n"); + + rsprintf + (" %s: ", + loc("Year")); + + rsprintf("  /  %s: ", loc("Show last")); + + rsprintf(" \n"); + + rsprintf("
%s:\n"); + + rsprintf("\n"); + + rsprintf + (" %s: ", + loc("Year")); + rsprintf("
%s:"); + if (attr_options[i][0][0] == 0) { + rsprintf + ("\n", + attr_list[i]); + rsprintf("%s\n", loc("(case insensitive substring)")); + } else { + if (equal_ustring(attr_options[i][0], "boolean")) + rsprintf("\n", + attr_list[i]); + + /* display image for icon */ + else if (attr_flags[i] & AF_ICON) { + for (j = 0; j < MAX_N_LIST && attr_options[i][j][0]; j++) { + sprintf(str, "Icon comment %s", attr_options[i][j]); + getcfg(lbs->name, str, comment); + + rsprintf + ("", + attr_list[i], attr_options[i][j]); + + if (comment[0]) + rsprintf("\"%s\"\n", + attr_options[i][j], comment); + else + rsprintf("\n", + attr_options[i][j]); + } + } + + else { + rsprintf("\n"); + } } - rsprintf("
%s:\n"); - rsprintf("%s
%s:\n"); + rsprintf("%s
%s
%s
\n"); - rsprintf("\r\n"); + rsprintf("\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -void show_admin_page(LOGBOOK *lbs) +void show_admin_page(LOGBOOK * lbs) { -int fh, length, rows, cols; -char *buffer; -char str[NAME_LENGTH]; + int fh, length, rows, cols; + char *buffer; + char str[NAME_LENGTH]; /*---- header ----*/ - sprintf(str, "ELOG %s", loc("Admin")); - show_html_header(lbs, FALSE, str); + sprintf(str, "ELOG %s", loc("Admin")); + show_html_header(lbs, FALSE, str); - rsprintf("
\n"); + rsprintf + ("\n"); /*---- title ----*/ - show_standard_title(lbs->name, "", 0); + show_standard_title(lbs->name, "", 0); /*---- menu buttons ----*/ - rsprintf("\n"); - rsprintf("\n", loc("Save")); - rsprintf("\n", loc("Cancel")); - rsprintf("\n\n"); + rsprintf("\n"); + rsprintf("\n", loc("Save")); + rsprintf("\n", loc("Cancel")); + rsprintf("\n\n"); /*---- entry form ----*/ - rsprintf("\n"); + rsprintf("\n"); - fh = open(config_file, O_RDONLY | O_BINARY); - if (fh < 0) - { - rsprintf("Cannot read configuration file \"%s\"", config_file); - rsprintf("\n"); - rsprintf("\r\n"); - return; - } - length = lseek(fh, 0, SEEK_END); - lseek(fh, 0, SEEK_SET); - buffer = malloc(length+1); - if (buffer == NULL) - { - close(fh); - rsprintf("Error: out of memory

"); - rsprintf("\n"); - rsprintf("\r\n"); - return; - } - read(fh, buffer, length); - buffer[length] = 0; - close(fh); + fh = open(config_file, O_RDONLY | O_BINARY); + if (fh < 0) { + rsprintf("Cannot read configuration file \"%s\"", + config_file); + rsprintf("\n"); + rsprintf("\r\n"); + return; + } + length = lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_SET); + buffer = malloc(length + 1); + if (buffer == NULL) { + close(fh); + rsprintf("Error: out of memory

"); + rsprintf("\n"); + rsprintf("\r\n"); + return; + } + read(fh, buffer, length); + buffer[length] = 0; + close(fh); - if (getcfg(lbs->name, "Admin textarea", str) && strchr(str, ',') != NULL) - { - cols = atoi(str); - rows = atoi(strchr(str, ',')+1); - } - else - { - cols = 120; - rows = 30; - } + if (getcfg(lbs->name, "Admin textarea", str) + && strchr(str, ',') != NULL) { + cols = atoi(str); + rows = atoi(strchr(str, ',') + 1); + } else { + cols = 120; + rows = 30; + } - rsprintf("\n"); + rsprintf("\n"); - /* put link for config page */ - rsprintf("
Syntax Help"); + /* put link for config page */ + rsprintf + ("
Syntax Help"); - rsprintf("\n"); + rsprintf("\n"); /*---- menu buttons ----*/ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", loc("Save")); - rsprintf("\n", loc("Cancel")); - rsprintf("\n\n"); + rsprintf("\n", loc("Save")); + rsprintf("\n", loc("Cancel")); + rsprintf("\n\n"); - rsprintf("\n\n"); - rsprintf("\r\n"); + rsprintf("\n\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ int save_admin_config() { -int fh, i; -char str[80]; + int fh, i; + char str[80]; - fh = open(config_file, O_RDWR | O_BINARY | O_TRUNC, 644); - if (fh < 0) - { - sprintf(str, loc("Cannot open file %s"), config_file); - strcat(str, ": "); - strcat(str, strerror(errno)); - show_error(str); - return 0; - } - i = write(fh, _mtext, strlen(_mtext)); - if (i < (int)strlen(_mtext)) - { - sprintf(str, loc("Cannot write to %s"), config_file); - strcat(str, ": "); - strcat(str, strerror(errno)); - show_error(str); - close(fh); - return 0; - } + fh = open(config_file, O_RDWR | O_BINARY | O_TRUNC, 644); + if (fh < 0) { + sprintf(str, loc("Cannot open file %s"), config_file); + strcat(str, ": "); + strcat(str, strerror(errno)); + show_error(str); + return 0; + } + i = write(fh, _mtext, strlen(_mtext)); + if (i < (int) strlen(_mtext)) { + sprintf(str, loc("Cannot write to %s"), config_file); + strcat(str, ": "); + strcat(str, strerror(errno)); + show_error(str); + close(fh); + return 0; + } - close(fh); + close(fh); - /* language might have changed, so re-read config file */ - check_config(); + /* language might have changed, so re-read config file */ + check_config(); - return 1; + return 1; } /*------------------------------------------------------------------*/ -int save_user_config(LOGBOOK *lbs, char *user, BOOL new_user, BOOL activate) +int save_user_config(LOGBOOK * lbs, char *user, BOOL new_user, + BOOL activate) { -char file_name[256], str[256], line[256], *buf, *pl, new_pwd[80], new_pwd2[80]; -char smtp_host[256], email_addr[256], mail_from[256], subject[256], mail_text[2000]; -char admin_user[80], enc_pwd[80], url[256]; -int i, fh, size, self_register; + char file_name[256], str[256], line[256], *buf, *pl, new_pwd[80], + new_pwd2[80]; + char smtp_host[256], email_addr[256], mail_from[256], subject[256], + mail_text[2000]; + char admin_user[80], enc_pwd[80], url[256]; + int i, fh, size, self_register; - /* check self register flag */ - self_register = 0; - if (getcfg(lbs->name, "Self register", str)) - self_register = atoi(str); + /* check self register flag */ + self_register = 0; + if (getcfg(lbs->name, "Self register", str)) + self_register = atoi(str); - if (!activate) - { - /* check for hidden password */ - if (isparam("hpwd")) - { - strcpy(new_pwd, getparam("hpwd")); - } - else - { - /* check if passwords match */ - do_crypt(getparam("newpwd"), new_pwd); - do_crypt(getparam("newpwd2"), new_pwd2); + if (!activate) { + /* check for hidden password */ + if (isparam("hpwd")) { + strcpy(new_pwd, getparam("hpwd")); + } else { + /* check if passwords match */ + do_crypt(getparam("newpwd"), new_pwd); + do_crypt(getparam("newpwd2"), new_pwd2); - if (strcmp(new_pwd, new_pwd2) != 0) - { - show_error(loc("New passwords do not match, please retype")); - return 0; - } + if (strcmp(new_pwd, new_pwd2) != 0) { + show_error(loc("New passwords do not match, please retype")); + return 0; + } } - /* check if user exists */ - if (new_user && self_register == 3) - { - if (get_user_line(lbs->name, user, NULL, NULL, NULL, NULL) == 1) - { - sprintf(str, "%s \"%s\" %s", loc("Login name"), user, loc("exists already")); - show_error(str); - return 0; - } + /* check if user exists */ + if (new_user && self_register == 3) { + if (get_user_line(lbs->name, user, NULL, NULL, NULL, NULL) == 1) { + sprintf(str, "%s \"%s\" %s", loc("Login name"), user, + loc("exists already")); + show_error(str); + return 0; + } } - } + } - if (activate || !new_user || self_register != 3) /* do not save in mode 3 */ - { - getcfg(lbs->name, "Password file", str); + if (activate || !new_user || self_register != 3) { /* do not save in mode 3 */ + getcfg(lbs->name, "Password file", str); - if (str[0] == DIR_SEPARATOR || str[1] == ':') + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } + + fh = open(file_name, O_RDWR | O_BINARY | O_CREAT, 644); + if (fh < 0) { + sprintf(str, loc("Cannot open file %s"), file_name); + show_error(str); + return 0; + } + + lseek(fh, 0, SEEK_END); + size = TELL(fh); + lseek(fh, 0, SEEK_SET); + + buf = malloc(size + 1); + read(fh, buf, size); + buf[size] = 0; + pl = buf; + + while (pl < buf + size) { + for (i = 0; pl[i] && pl[i] != '\r' && pl[i] != '\n'; i++) + line[i] = pl[i]; + line[i] = 0; + + /* skip outcommented lines */ + if (line[0] == ';' || line[0] == '#') { + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + continue; + } + + if (line[0] == 0) + break; + + strcpy(str, line); + if (strchr(str, ':')) + *strchr(str, ':') = 0; + if (strcmp(str, user) == 0) { + if (new_user) { + sprintf(str, "%s \"%s\" %s", loc("Login name"), user, + loc("exists already")); + show_error(str); + free(buf); + close(fh); + return 0; + } + break; + } + + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + } + + if (new_user) { + lseek(fh, 0, SEEK_END); + if (strlen(buf) != 0 && + (buf[strlen(buf) - 1] != '\r' + && buf[strlen(buf) - 1] != '\n')) + write(fh, "\n", 1); + + if (activate) + sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), + getparam("encpwd"), getparam("new_full_name"), + getparam("new_user_email"), getparam("email_notify")); + else + sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), + new_pwd, getparam("new_full_name"), + getparam("new_user_email"), getparam("email_notify")); + write(fh, str, strlen(str)); + } else { + /* replace line */ + lseek(fh, 0, SEEK_SET); + write(fh, buf, pl - buf); + + sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), + new_pwd, getparam("new_full_name"), + getparam("new_user_email"), getparam("email_notify")); + write(fh, str, strlen(str)); + + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + + write(fh, pl, strlen(pl)); + +#ifdef _MSC_VER + chsize(fh, TELL(fh)); +#else + ftruncate(fh, TELL(fh)); +#endif + } + + free(buf); + close(fh); + } + + /* if requested, send notification email to admin user */ + if (new_user && (self_register == 2 || self_register == 3) + && !isparam("admin")) { + if (!getcfg("global", "SMTP host", smtp_host)) { + show_error(loc + ("No SMTP host defined in [global] section of configuration file")); + return 0; + } + + /* try to get URL from referer */ + if (!getcfg("global", "URL", url)) { + if (referer[0]) + strcpy(url, referer); + else { + if (tcp_port == 80) + sprintf(url, "http://%s/", host_name); + else + sprintf(url, "http://%s:%d/", host_name, tcp_port); + } + } else { + if (url[strlen(url) - 1] != '/') + strlcat(url, "/", sizeof(url)); + if (lbs) { + strlcat(url, lbs->name_enc, sizeof(url)); + strlcat(url, "/", sizeof(url)); + } + } + + if (!getcfg(lbs->name, "Use Email from", mail_from)) + sprintf(mail_from, "ELog@%s", host_name); + + if (activate) { + sprintf(subject, loc("Your ELOG account has been activated")); + sprintf(mail_text, + loc("Your ELOG account has been activated on host")); + sprintf(mail_text + strlen(mail_text), " %s", host_name); + sprintf(mail_text + strlen(mail_text), ".\r\n\r\n"); + sprintf(url + strlen(url), "?cmd=Login&unm=%s", + getparam("new_user_name")); + sprintf(mail_text + strlen(mail_text), "%s %s\r\n", + loc("You can access it at"), url); + + sendmail(lbs, smtp_host, mail_from, getparam("new_user_email"), + subject, mail_text, TRUE, url, NULL); + } else { + if (getcfg(lbs->name, "Admin user", admin_user)) { + pl = strtok(admin_user, " ,"); + while (pl) { + get_user_line(lbs->name, pl, NULL, NULL, email_addr, NULL); + if (email_addr[0]) { + /* compose subject */ + if (self_register == 3) { + if (lbs) + sprintf(subject, + loc + ("Registration request on logbook \"%s\""), + lbs->name); + else + sprintf(subject, + loc("Registration request on host \"%s\""), + host_name); + sprintf(mail_text, + loc + ("A new ELOG user wants to register on \"%s\""), + host_name); + } else { + if (lbs) + sprintf(subject, + loc + ("User \"%s\" registered on logbook \"%s\""), + getparam("new_user_name"), lbs->name); + else + sprintf(subject, + loc + ("User \"%s\" registered on host \"%s\""), + getparam("new_user_name"), host_name); + + sprintf(mail_text, + loc + ("A new ELOG user has been registered on %s"), + host_name); + } + + sprintf(mail_text + strlen(mail_text), "\r\n\r\n"); + + if (lbs) + sprintf(mail_text + strlen(mail_text), + "%s : %s\r\n", loc("Logbook"), + lbs->name); + else + sprintf(mail_text + strlen(mail_text), + "%s : %s\r\n", loc("Host"), + host_name); + + sprintf(mail_text + strlen(mail_text), + "%s : %s\r\n", loc("Login name"), + getparam("new_user_name")); + sprintf(mail_text + strlen(mail_text), + "%s : %s\r\n", loc("Full name"), + getparam("new_full_name")); + sprintf(mail_text + strlen(mail_text), + "%s : %s\r\n", loc("Email"), + getparam("new_user_email")); + + if (self_register == 3) { + sprintf(mail_text + strlen(mail_text), "\r\n%s:\r\n", + loc + ("Hit following URL to activate that account")); + + sprintf(mail_text + strlen(mail_text), + "\r\nURL : %s", url); + + strcpy(str, getparam("new_full_name")); + url_encode(str, sizeof(str)); + do_crypt(getparam("newpwd"), enc_pwd); + url_encode(enc_pwd, sizeof(enc_pwd)); + sprintf(mail_text + strlen(mail_text), + "?cmd=Activate&new_user_name=%s&new_full_name=%s&new_user_email=%s&email_notify=%s&encpwd=%s&unm=%s\r\n", + getparam("new_user_name"), str, + getparam("new_user_email"), + getparam("email_notify"), enc_pwd, pl); + } else { + sprintf(mail_text + strlen(mail_text), + "\r\n%s URL : %s?cmd=Config&cfg_user=%s&unm=%s\r\n", + loc("Logbook"), url, + getparam("new_user_name"), pl); + } + + sendmail(lbs, smtp_host, mail_from, email_addr, subject, + mail_text, TRUE, url, NULL); + } + + pl = strtok(NULL, " ,"); + } + } + + if (self_register == 3) { + sprintf(str, "?cmd=%s", loc("Requested")); + redirect(lbs, str); + return 0; + } + } + } + + /* if user name changed, set cookie */ + if (strcmp(user, getparam("new_user_name")) != 0 && + strcmp(user, getparam("unm")) == 0) { + set_login_cookies(lbs, getparam("new_user_name"), new_pwd); + return 0; + } + + /* if new user, login as this user */ + if (new_user && !*getparam("unm")) { + set_login_cookies(lbs, getparam("new_user_name"), new_pwd); + return 0; + } + + return 1; +} + +/*------------------------------------------------------------------*/ + +int remove_user(LOGBOOK * lbs, char *user) +{ + char file_name[256], str[256], line[256], *buf, *pl; + int i, fh, size; + + getcfg(lbs->name, "Password file", str); + + if (str[0] == DIR_SEPARATOR || str[1] == ':') strcpy(file_name, str); - else - { + else { strlcpy(file_name, resource_dir, sizeof(file_name)); strlcat(file_name, str, sizeof(file_name)); - } + } - fh = open(file_name, O_RDWR | O_BINARY | O_CREAT, 644); - if (fh < 0) - { + fh = open(file_name, O_RDWR | O_BINARY, 0644); + if (fh < 0) { sprintf(str, loc("Cannot open file %s"), file_name); + strcat(str, ": "); + strcat(str, strerror(errno)); show_error(str); return 0; - } + } - lseek(fh, 0, SEEK_END); - size = TELL(fh); - lseek(fh, 0, SEEK_SET); + lseek(fh, 0, SEEK_END); + size = TELL(fh); + lseek(fh, 0, SEEK_SET); - buf = malloc(size+1); - read(fh, buf, size); - buf[size] = 0; - pl = buf; + buf = malloc(size + 1); + read(fh, buf, size); + buf[size] = 0; + pl = buf; - while (pl < buf+size) - { - for (i=0 ; pl[i] && pl[i] != '\r' && pl[i] != '\n' ; i++) - line[i] = pl[i]; + while (pl < buf + size) { + for (i = 0; pl[i] && pl[i] != '\r' && pl[i] != '\n'; i++) + line[i] = pl[i]; line[i] = 0; - /* skip outcommented lines */ - if (line[0] == ';' || line[0] == '#') - { - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - continue; - } - - if (line[0] == 0) - break; + if (line[0] == ';' || line[0] == '#' || line[0] == 0) { + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) + pl++; + continue; + } strcpy(str, line); if (strchr(str, ':')) - *strchr(str, ':') = 0; + *strchr(str, ':') = 0; if (strcmp(str, user) == 0) - { - if (new_user) - { - sprintf(str, "%s \"%s\" %s", loc("Login name"), user, loc("exists already")); - show_error(str); - free(buf); - close(fh); - return 0; - } - break; - } + break; pl += strlen(line); while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - } + pl++; + } - if (new_user) - { - lseek(fh, 0, SEEK_END); - if (strlen(buf) != 0 && - (buf[strlen(buf)-1] != '\r' && buf[strlen(buf)-1] != '\n')) - write(fh, "\n", 1); + /* remove line */ + lseek(fh, 0, SEEK_SET); + write(fh, buf, pl - buf); - if (activate) - sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), getparam("encpwd"), - getparam("new_full_name"), getparam("new_user_email"), getparam("email_notify")); - else - sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), new_pwd, - getparam("new_full_name"), getparam("new_user_email"), getparam("email_notify")); - write(fh, str, strlen(str)); - } - else - { - /* replace line */ - lseek(fh, 0, SEEK_SET); - write(fh, buf, pl-buf); - - sprintf(str, "%s:%s:%s:%s:%s\n", getparam("new_user_name"), new_pwd, - getparam("new_full_name"), getparam("new_user_email"), getparam("email_notify")); - write(fh, str, strlen(str)); - - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - - write(fh, pl, strlen(pl)); - - #ifdef _MSC_VER - chsize(fh, TELL(fh)); - #else - ftruncate(fh, TELL(fh)); - #endif - } - - free(buf); - close(fh); - } - - /* if requested, send notification email to admin user */ - if (new_user && (self_register == 2 || self_register == 3) && !isparam("admin")) - { - if (!getcfg("global", "SMTP host", smtp_host)) - { - show_error(loc("No SMTP host defined in [global] section of configuration file")); - return 0; - } - - /* try to get URL from referer */ - if (!getcfg("global", "URL", url)) - { - if (referer[0]) - strcpy(url, referer); - else - { - if (tcp_port == 80) - sprintf(url, "http://%s/", host_name); - else - sprintf(url, "http://%s:%d/", host_name, tcp_port); - } - } - else - { - if (url[strlen(url)-1] != '/') - strlcat(url, "/", sizeof(url)); - if (lbs) - { - strlcat(url, lbs->name_enc, sizeof(url)); - strlcat(url, "/", sizeof(url)); - } - } - - if (!getcfg(lbs->name, "Use Email from", mail_from)) - sprintf(mail_from, "ELog@%s", host_name); - - if (activate) - { - sprintf(subject, loc("Your ELOG account has been activated")); - sprintf(mail_text, loc("Your ELOG account has been activated on host")); - sprintf(mail_text+strlen(mail_text), " %s", host_name); - sprintf(mail_text+strlen(mail_text), ".\r\n\r\n"); - sprintf(url+strlen(url), "?cmd=Login&unm=%s", getparam("new_user_name")); - sprintf(mail_text+strlen(mail_text), "%s %s\r\n", loc("You can access it at"), url); - - sendmail(lbs, smtp_host, mail_from, getparam("new_user_email"), subject, mail_text, TRUE, url, NULL); - } - else - { - if (getcfg(lbs->name, "Admin user", admin_user)) - { - pl = strtok(admin_user, " ,"); - while (pl) - { - get_user_line(lbs->name, pl, NULL, NULL, email_addr, NULL); - if (email_addr[0]) - { - /* compose subject */ - if (self_register == 3) - { - if (lbs) - sprintf(subject, loc("Registration request on logbook \"%s\""), lbs->name); - else - sprintf(subject, loc("Registration request on host \"%s\""), host_name); - sprintf(mail_text, loc("A new ELOG user wants to register on \"%s\""), host_name); - } - else - { - if (lbs) - sprintf(subject, loc("User \"%s\" registered on logbook \"%s\""), getparam("new_user_name"), lbs->name); - else - sprintf(subject, loc("User \"%s\" registered on host \"%s\""), getparam("new_user_name"), host_name); - - sprintf(mail_text, loc("A new ELOG user has been registered on %s"), host_name); - } - - sprintf(mail_text+strlen(mail_text), "\r\n\r\n"); - - if (lbs) - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Logbook"), lbs->name); - else - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Host"), host_name); - - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Login name"), getparam("new_user_name")); - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Full name"), getparam("new_full_name")); - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Email"), getparam("new_user_email")); - - if (self_register == 3) - { - sprintf(mail_text+strlen(mail_text), "\r\n%s:\r\n", loc("Hit following URL to activate that account")); - - sprintf(mail_text+strlen(mail_text), "\r\nURL : %s", url); - - strcpy(str, getparam("new_full_name")); - url_encode(str, sizeof(str)); - do_crypt(getparam("newpwd"), enc_pwd); - url_encode(enc_pwd, sizeof(enc_pwd)); - sprintf(mail_text+strlen(mail_text), "?cmd=Activate&new_user_name=%s&new_full_name=%s&new_user_email=%s&email_notify=%s&encpwd=%s&unm=%s\r\n", - getparam("new_user_name"), - str, - getparam("new_user_email"), - getparam("email_notify"), - enc_pwd, - pl); - } - else - { - sprintf(mail_text+strlen(mail_text), "\r\n%s URL : %s?cmd=Config&cfg_user=%s&unm=%s\r\n", - loc("Logbook"), url, getparam("new_user_name"), pl); - } - - sendmail(lbs, smtp_host, mail_from, email_addr, subject, mail_text, TRUE, url, NULL); - } - - pl = strtok(NULL, " ,"); - } - } - - if (self_register == 3) - { - sprintf(str, "?cmd=%s", loc("Requested")); - redirect(lbs, str); - return 0; - } - } - } - - /* if user name changed, set cookie */ - if (strcmp(user, getparam("new_user_name")) != 0 && - strcmp(user, getparam("unm")) == 0) - { - set_login_cookies(lbs, getparam("new_user_name"), new_pwd); - return 0; - } - - /* if new user, login as this user */ - if (new_user && !*getparam("unm")) - { - set_login_cookies(lbs, getparam("new_user_name"), new_pwd); - return 0; - } - - return 1; -} - -/*------------------------------------------------------------------*/ - -int remove_user(LOGBOOK *lbs, char *user) -{ -char file_name[256], str[256], line[256], *buf, *pl; -int i, fh, size; - - getcfg(lbs->name, "Password file", str); - - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } - - fh = open(file_name, O_RDWR | O_BINARY, 0644); - if (fh < 0) - { - sprintf(str, loc("Cannot open file %s"), file_name); - strcat(str, ": "); - strcat(str, strerror(errno)); - show_error(str); - return 0; - } - - lseek(fh, 0, SEEK_END); - size = TELL(fh); - lseek(fh, 0, SEEK_SET); - - buf = malloc(size+1); - read(fh, buf, size); - buf[size] = 0; - pl = buf; - - while (pl < buf+size) - { - for (i=0 ; pl[i] && pl[i] != '\r' && pl[i] != '\n' ; i++) - line[i] = pl[i]; - line[i] = 0; - - if (line[0] == ';' || line[0] == '#' || line[0] == 0) - { - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - continue; - } - - strcpy(str, line); - if (strchr(str, ':')) - *strchr(str, ':') = 0; - if (strcmp(str, user) == 0) - break; - - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) + pl += strlen(line); + while (*pl && (*pl == '\r' || *pl == '\n')) pl++; - } - /* remove line */ - lseek(fh, 0, SEEK_SET); - write(fh, buf, pl-buf); - - pl += strlen(line); - while (*pl && (*pl == '\r' || *pl == '\n')) - pl++; - - write(fh, pl, strlen(pl)); + write(fh, pl, strlen(pl)); #ifdef _MSC_VER - chsize(fh, TELL(fh)); + chsize(fh, TELL(fh)); #else - ftruncate(fh, TELL(fh)); + ftruncate(fh, TELL(fh)); #endif - free(buf); - close(fh); + free(buf); + close(fh); - return 1; + return 1; } /*------------------------------------------------------------------*/ -void show_config_page(LOGBOOK *lbs) +void show_config_page(LOGBOOK * lbs) { -char str[256], user[80], password[80], full_name[80], user_email[80], email_notify[256], logbook[256]; -int i; + char str[256], user[80], password[80], full_name[80], user_email[80], + email_notify[256], logbook[256]; + int i; - if (lbs) - strcpy(logbook, lbs->name); - else - strcpy(logbook, "global"); + if (lbs) + strcpy(logbook, lbs->name); + else + strcpy(logbook, "global"); /*---- header ----*/ - show_standard_header(lbs, TRUE, loc("ELOG user config"), "."); + show_standard_header(lbs, TRUE, loc("ELOG user config"), "."); /*---- title ----*/ - show_standard_title(logbook, "", 0); + show_standard_title(logbook, "", 0); - /* get user */ - strcpy(user, getparam("unm")); - if (isparam("cfg_user")) - strcpy(user, getparam("cfg_user")); + /* get user */ + strcpy(user, getparam("unm")); + if (isparam("cfg_user")) + strcpy(user, getparam("cfg_user")); /*---- menu buttons ----*/ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", loc("Config")); // for select javascript - rsprintf("\n", loc("Save")); - rsprintf("\n", loc("Back")); - rsprintf("\n", user); + rsprintf("\n", loc("Config")); // for select javascript + rsprintf("\n", loc("Save")); + rsprintf("\n", loc("Back")); + rsprintf("\n", user); - rsprintf("\n\n"); + rsprintf("\n\n"); - /* table for two-column items */ - rsprintf(""); - rsprintf("\n"); + /* table for two-column items */ + rsprintf("\n"); + rsprintf("
"); + rsprintf("\n"); /*---- if admin user, show user list ----*/ - if (getcfg(logbook, "Admin user", str) && - strstr(str, getparam("unm")) != 0) - { - rsprintf("\n"); - rsprintf("\n", loc("Select user")); - rsprintf("\n", + loc("Select user")); + rsprintf + ("\n", loc("Login name")); + rsprintf("\n", loc("Login name")); - if (get_user_line(logbook, user, password, full_name, user_email, email_notify) != 1) - sprintf(str, loc("User [%s] has been deleted"), user); - else - strcpy(str, user); + if (get_user_line + (logbook, user, password, full_name, user_email, email_notify) != 1) + sprintf(str, loc("User [%s] has been deleted"), user); + else + strcpy(str, user); - rsprintf("\n", str); + rsprintf + ("\n", + str); - rsprintf("\n", loc("Full name")); - rsprintf("\n", - full_name); + rsprintf("\n", loc("Full name")); + rsprintf + ("\n", + full_name); - rsprintf("\n"); - rsprintf("\n"); + rsprintf + ("\n"); - else - rsprintf("\n"); + if (email_notify[0]) + rsprintf + ("\n"); + else + rsprintf + ("\n"); - rsprintf("
%s:\n"); + rsprintf("
%s:\n"); + rsprintf("\n"); - /* show "update" button only of javascript is not enabled */ - rsprintf("\n"); + /* show "update" button only of javascript is not enabled */ + rsprintf + ("\n"); - rsprintf("\n"); - } + rsprintf("\n"); + } /*---- entry form ----*/ - rsprintf("
%s:
%s:
%s:
%s:
Email:    \n", - user_email); + rsprintf("
Email:    \n", + user_email); - rsprintf("%s:\n", loc("Enable email notifications")); + rsprintf("%s:\n", loc("Enable email notifications")); - if (email_notify[0]) - rsprintf("
\n"); - rsprintf("\n"); - rsprintf("\n", loc("Change password")); - rsprintf("\n", loc("Remove user")); + rsprintf("\n"); + rsprintf("\n", + loc("Change password")); + rsprintf("\n", + loc("Remove user")); - if (!getcfg(logbook, "Admin user", str) || - (getcfg(logbook, "Admin user", str) && strstr(str, getparam("unm")) != 0)) - { - rsprintf("\n", loc("New user")); - rsprintf("\n", loc("Change elogd.cfg")); - } + if (!getcfg(logbook, "Admin user", str) || + (getcfg(logbook, "Admin user", str) + && strstr(str, getparam("unm")) != 0)) { + rsprintf("\n", + loc("New user")); + rsprintf("\n", + loc("Change elogd.cfg")); + } - /* hidden field for password */ - rsprintf("\n", password); + /* hidden field for password */ + rsprintf("\n", password); - rsprintf("\n\n"); - rsprintf("\r\n"); + rsprintf("\n\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -void show_forgot_pwd_page(LOGBOOK *lbs) +void show_forgot_pwd_page(LOGBOOK * lbs) { -int i; -char str[1000], login_name[256], full_name[256], user_email[256], name[256], pwd[256], redir[256], - pwd_encrypted[256], smtp_host[256], mail_from[256], subject[256], mail_text[1000], url[1000]; + int i; + char str[1000], login_name[256], full_name[256], user_email[256], + name[256], pwd[256], redir[256], pwd_encrypted[256], smtp_host[256], + mail_from[256], subject[256], mail_text[1000], url[1000]; - if (isparam("login_name")) - { - /* seach in pwd file */ + if (isparam("login_name")) { + /* seach in pwd file */ - strcpy(name, getparam("login_name")); + strcpy(name, getparam("login_name")); - for (i=0 ; ; i++) - { - if (!enum_user_line(lbs, i, login_name)) - break; + for (i = 0;; i++) { + if (!enum_user_line(lbs, i, login_name)) + break; - get_user_line(lbs->name, login_name, NULL, full_name, user_email, NULL); + get_user_line(lbs->name, login_name, NULL, full_name, user_email, + NULL); - if (equal_ustring(name, login_name) || equal_ustring(name, full_name) || equal_ustring(name, user_email)) - { - if (user_email[0] == 0) - { - sprintf(str, loc("No Email address registered with user name \"%s\""), name); - show_error(str); - return; - } + if (equal_ustring(name, login_name) + || equal_ustring(name, full_name) + || equal_ustring(name, user_email)) { + if (user_email[0] == 0) { + sprintf(str, + loc + ("No Email address registered with user name \"%s\""), + name); + show_error(str); + return; + } - /* create random password */ - srand((unsigned int)time(NULL)); - for (i=0 ; i<6 ; i++) - str[i] = rand() & 0x7F; - str[i] = 0; - base64_encode(str, pwd); - do_crypt(pwd, pwd_encrypted); + /* create random password */ + srand((unsigned int) time(NULL)); + for (i = 0; i < 6; i++) + str[i] = rand() & 0x7F; + str[i] = 0; + base64_encode(str, pwd); + do_crypt(pwd, pwd_encrypted); - /* send email with new password */ - if (!getcfg("global", "SMTP host", smtp_host)) - { - show_error(loc("No SMTP host defined in [global] section of configuration file")); - return; - } + /* send email with new password */ + if (!getcfg("global", "SMTP host", smtp_host)) { + show_error(loc + ("No SMTP host defined in [global] section of configuration file")); + return; + } - /* try to get URL from referer */ - if (!getcfg("global", "URL", url)) - { - if (referer[0]) - strcpy(url, referer); - else - { - if (tcp_port == 80) - sprintf(url, "http://%s/", host_name); + /* try to get URL from referer */ + if (!getcfg("global", "URL", url)) { + if (referer[0]) + strcpy(url, referer); + else { + if (tcp_port == 80) + sprintf(url, "http://%s/", host_name); + else + sprintf(url, "http://%s:%d/", host_name, tcp_port); + } + } else { + if (url[strlen(url) - 1] != '/') + strlcat(url, "/", sizeof(url)); + if (lbs) { + strlcat(url, lbs->name_enc, sizeof(url)); + strlcat(url, "/", sizeof(url)); + } + } + + sprintf(redir, "?cmd=%s&old_pwd=%s", loc("Change password"), + pwd); + url_encode(redir, sizeof(redir)); + sprintf(str, "?redir=%s&uname=%s&upassword=%s", redir, + login_name, pwd); + strlcat(url, str, sizeof(url)); + + if (!getcfg(lbs->name, "Use Email from", mail_from)) + sprintf(mail_from, "ELog@%s", host_name); + + if (lbs) + sprintf(subject, loc("Password recovery for ELOG %s"), + lbs->name); else - sprintf(url, "http://%s:%d/", host_name, tcp_port); + sprintf(subject, loc("Password recovery for ELOG %s"), + host_name); + + sprintf(mail_text, + loc + ("A new password has been created for you on host %s"), + host_name); + strlcat(mail_text, ".\r\n", sizeof(mail_text)); + strlcat(mail_text, + loc + ("Please log on by clicking on following link and change your password"), + sizeof(mail_text)); + strlcat(mail_text, ":\r\n\r\n", sizeof(mail_text)); + strlcat(mail_text, url, sizeof(mail_text)); + strlcat(mail_text, "\r\n\r\n", sizeof(mail_text)); + sprintf(mail_text + strlen(mail_text), "ELOG Version %s\r\n", + VERSION); + + if (sendmail + (lbs, smtp_host, mail_from, user_email, subject, mail_text, + TRUE, url, NULL) != -1) { + /* save new password */ + change_pwd(lbs, login_name, pwd_encrypted); + + /* show notification web page */ + show_standard_header(lbs, FALSE, + loc("ELOG password recovery"), ""); + + rsprintf + (""); + rsprintf("
\n"); + + rsprintf(loc + ("A new password for user \"%s\" has been sent to %s"), + full_name, user_email); + + rsprintf("
\n"); + rsprintf("\n"); + return; + } else { + sprintf(str, loc("Error sending Email via \"%s\""), + smtp_host); + show_error(str); + return; } - } - else - { - if (url[strlen(url)-1] != '/') - strlcat(url, "/", sizeof(url)); - if (lbs) - { - strlcat(url, lbs->name_enc, sizeof(url)); - strlcat(url, "/", sizeof(url)); - } - } - - sprintf(redir, "?cmd=%s&old_pwd=%s", loc("Change password"), pwd); - url_encode(redir, sizeof(redir)); - sprintf(str, "?redir=%s&uname=%s&upassword=%s", redir, login_name, pwd); - strlcat(url, str, sizeof(url)); - - if (!getcfg(lbs->name, "Use Email from", mail_from)) - sprintf(mail_from, "ELog@%s", host_name); - - if (lbs) - sprintf(subject, loc("Password recovery for ELOG %s"), lbs->name); - else - sprintf(subject, loc("Password recovery for ELOG %s"), host_name); - - sprintf(mail_text, loc("A new password has been created for you on host %s"), host_name); - strlcat(mail_text, ".\r\n", sizeof(mail_text)); - strlcat(mail_text, loc("Please log on by clicking on following link and change your password"), sizeof(mail_text)); - strlcat(mail_text, ":\r\n\r\n", sizeof(mail_text)); - strlcat(mail_text, url, sizeof(mail_text)); - strlcat(mail_text, "\r\n\r\n", sizeof(mail_text)); - sprintf(mail_text+strlen(mail_text), "ELOG Version %s\r\n", VERSION); - - if (sendmail(lbs, smtp_host, mail_from, user_email, subject, mail_text, TRUE, url, NULL) != -1) - { - /* save new password */ - change_pwd(lbs, login_name, pwd_encrypted); - - /* show notification web page */ - show_standard_header(lbs, FALSE, loc("ELOG password recovery"), ""); - - rsprintf(""); - rsprintf("
\n"); - - rsprintf(loc("A new password for user \"%s\" has been sent to %s"), full_name, user_email); - - rsprintf("
\n"); - rsprintf("\n"); - return; - } - else - { - sprintf(str, loc("Error sending Email via \"%s\""), smtp_host); - show_error(str); - return; - } - } + } } - if (strchr(name, '@')) - sprintf(str, loc("Email address \"%s\" not registered"), name); - else - sprintf(str, loc("User name \"%s\" not registered"), name); + if (strchr(name, '@')) + sprintf(str, loc("Email address \"%s\" not registered"), + name); + else + sprintf(str, loc("User name \"%s\" not registered"), name); - show_error(str); + show_error(str); - return; - } - else - { + return; + } else { /*---- header ----*/ - show_standard_header(lbs, TRUE, loc("ELOG password recovery"), NULL); + show_standard_header(lbs, TRUE, loc("ELOG password recovery"), NULL); - rsprintf(""); + rsprintf("
"); /*---- entry form ----*/ - rsprintf("\n", loc("Enter your user name or email address")); + rsprintf("\n", + loc("Enter your user name or email address")); - rsprintf("\n"); + rsprintf("\n"); - rsprintf("
%s
%s
\n"); - rsprintf("\n", loc("Forgot")); - rsprintf("
\n"); + rsprintf("\n", loc("Forgot")); + rsprintf("
\n", loc("Submit")); + rsprintf + ("
\n", + loc("Submit")); - rsprintf("
\n\n"); - rsprintf("\r\n"); - } + rsprintf("\n\n"); + rsprintf("\r\n"); + } } /*------------------------------------------------------------------*/ -void show_new_user_page(LOGBOOK *lbs) +void show_new_user_page(LOGBOOK * lbs) { /*---- header ----*/ - show_standard_header(lbs, TRUE, loc("ELOG new user"), ""); + show_standard_header(lbs, TRUE, loc("ELOG new user"), ""); /*---- title ----*/ - if (lbs) - show_standard_title(lbs->name, "", 1); - else - show_standard_title("ELOG", "", 1); + if (lbs) + show_standard_title(lbs->name, "", 1); + else + show_standard_title("ELOG", "", 1); /*---- menu buttons ----*/ - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", loc("Save")); - rsprintf("\n", loc("Cancel")); - rsprintf("\n\n"); + rsprintf("\n", loc("Save")); + rsprintf("\n", loc("Cancel")); + rsprintf("\n\n"); - /* table for two-column items */ - rsprintf(""); - rsprintf("\n"); + /* table for two-column items */ + rsprintf("\n"); + rsprintf("
"); + rsprintf("\n"); /*---- entry form ----*/ - rsprintf("\n", loc("Login name")); - rsprintf("\n", - loc("name may not contain blanks")); + rsprintf("\n", loc("Login name")); + rsprintf + ("\n", + loc("name may not contain blanks")); - rsprintf("\n", loc("Full name")); - rsprintf("\n"); + rsprintf("\n", loc("Full name")); + rsprintf + ("\n"); - rsprintf("\n"); - rsprintf("\n"); + rsprintf("\n"); + rsprintf + ("\n"); - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n", loc("Password")); - rsprintf("\n", loc("Password")); + rsprintf("\n", loc("Retype password")); - rsprintf("\n", + loc("Retype password")); + rsprintf("
%s:(%s)
%s:(%s)
%s:
%s:
Email:
Email:
%s: \n", loc("Enable email notifications")); - rsprintf("
%s: \n", + loc("Enable email notifications")); + rsprintf + ("
%s:\n"); + rsprintf("
%s:\n"); - rsprintf("
%s:\n"); + rsprintf("
%s:\n"); - rsprintf("
\n"); - rsprintf("\n\n"); - rsprintf("\r\n"); + rsprintf("\n\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -void show_elog_delete(LOGBOOK *lbs, int message_id) +void show_elog_delete(LOGBOOK * lbs, int message_id) { -int i, status, reply, next; -char str[256], in_reply_to[80], reply_to[MAX_REPLY_TO*10], owner[256]; -char attrib[MAX_N_ATTR][NAME_LENGTH]; + int i, status, reply, next; + char str[256], in_reply_to[80], reply_to[MAX_REPLY_TO * 10], owner[256]; + char attrib[MAX_N_ATTR][NAME_LENGTH]; - /* redirect if confirm = NO */ - if (getparam("confirm") && *getparam("confirm") && - strcmp(getparam("confirm"), loc("No")) == 0) - { - if (message_id) - { - sprintf(str, "%d", message_id); - redirect(lbs, str); + /* redirect if confirm = NO */ + if (getparam("confirm") && *getparam("confirm") && + strcmp(getparam("confirm"), loc("No")) == 0) { + if (message_id) { + sprintf(str, "%d", message_id); + redirect(lbs, str); + } else { + strlcpy(str, getparam("lastcmd"), sizeof(str)); + url_decode(str); + redirect(lbs, str); } - else - { - strlcpy(str, getparam("lastcmd"), sizeof(str)); - url_decode(str); - redirect(lbs, str); - } - return; - } + return; + } - if (getparam("confirm") && *getparam("confirm")) - { - if (strcmp(getparam("confirm"), loc("Yes")) == 0) - { + if (getparam("confirm") && *getparam("confirm")) { + if (strcmp(getparam("confirm"), loc("Yes")) == 0) { + if (message_id) { + /* delete message */ + status = + el_delete_message(lbs, message_id, TRUE, NULL, TRUE, TRUE); + if (status != EL_SUCCESS) { + sprintf(str, "%s = %d", + loc("Error deleting message: status"), status); + show_error(str); + return; + } else { + strcpy(str, getparam("nextmsg")); + if (atoi(str) == 0) + sprintf(str, "%d", + el_search_message(lbs, EL_LAST, 0, TRUE)); + if (atoi(str) == 0) + redirect(lbs, ""); + else + redirect(lbs, str); + return; + } + } else { + for (i = reply = 0; i < atoi(getparam("nsel")); i++) { + sprintf(str, "s%d", i); + if (isparam(str)) + status = + el_delete_message(lbs, atoi(getparam(str)), TRUE, + NULL, TRUE, TRUE); + } + + redirect(lbs, getparam("lastcmd")); + return; + } + } + } else { + /* check if at least one message is selected */ + if (!message_id) { + for (i = 0; i < atoi(getparam("nsel")); i++) { + sprintf(str, "s%d", i); + if (isparam(str)) + break; + } + if (i == atoi(getparam("nsel"))) { + show_error(loc("No message selected for deletion")); + return; + } + } + + /* check for author */ + if (getcfg(lbs->name, "Restrict edit", str) && atoi(str) == 1) { + /* get message for reply/edit */ + + el_retrieve(lbs, message_id, NULL, attr_list, attrib, lbs->n_attr, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + if (!is_author(lbs, attrib, owner)) { + sprintf(str, loc("Only user %s can delete this entry"), + owner); + show_error(str); + return; + } + } + + /* header */ if (message_id) - { - /* delete message */ - status = el_delete_message(lbs, message_id, TRUE, NULL, TRUE, TRUE); - if (status != EL_SUCCESS) - { - sprintf(str, "%s = %d", loc("Error deleting message: status"), status); - show_error(str); - return; - } - else - { - strcpy(str, getparam("nextmsg")); - if (atoi(str) == 0) - sprintf(str, "%d", el_search_message(lbs, EL_LAST, 0, TRUE)); - if (atoi(str) == 0) - redirect(lbs, ""); - else - redirect(lbs, str); - return; - } - } + sprintf(str, "%d", message_id); else - { - for (i=reply=0 ; i"); + rsprintf("\n"); + + /* define hidden field for command */ + rsprintf("\n", + loc("Delete")); + + if (!message_id) { + rsprintf("%s\n", + loc("Are you sure to delete these messages?")); + + rsprintf("\n"); + rsprintf("\n", + getparam("nsel")); + + if (isparam("lastcmd")) { + strcpy(str, getparam("lastcmd")); + rsprintf("\n", + str); + } + + for (i = reply = 0; i < atoi(getparam("nsel")); i++) { + sprintf(str, "s%d", i); + if (isparam(str)) { + rsprintf("#%s ", getparam(str)); + rsprintf("\n", str, + getparam(str)); + } + + if (!reply) { + el_retrieve(lbs, atoi(getparam(str)), NULL, attr_list, NULL, + 0, NULL, NULL, in_reply_to, reply_to, NULL, + NULL, NULL); + if (reply_to[0]) + reply = TRUE; + } + } + + rsprintf("\n"); + + if (reply) + rsprintf + ("%s\n", + loc("and all their replies")); + + } else { + rsprintf("%s\n", + loc("Are you sure to delete this message?")); + + /* check for replies */ + + /* retrieve original message */ + el_retrieve(lbs, message_id, NULL, attr_list, NULL, 0, + NULL, NULL, in_reply_to, reply_to, NULL, NULL, NULL); + + if (reply_to[0]) + rsprintf + ("#%d
%s\n", + message_id, loc("and all its replies")); + else + rsprintf + ("#%d\n", + message_id); + + /* put link to next message */ + next = el_search_message(lbs, EL_NEXT, message_id, TRUE); + + rsprintf("\n", next); } - /* check for author */ - if (getcfg(lbs->name, "Restrict edit", str) && atoi(str) == 1) - { - /* get message for reply/edit */ + rsprintf + ("\n", + loc("Yes")); + rsprintf("\n", + loc("No")); + rsprintf("\n\n"); + } - el_retrieve(lbs, message_id, NULL, attr_list, attrib, lbs->n_attr, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - - if (!is_author(lbs, attrib, owner)) - { - sprintf(str, loc("Only user %s can delete this entry"), owner); - show_error(str); - return; - } - } - - /* header */ - if (message_id) - sprintf(str, "%d", message_id); - else - str[0] = 0; - show_standard_header(lbs, TRUE, "Delete ELog entry", str); - - rsprintf(""); - rsprintf("\n", loc("Are you sure to delete these messages?")); - - rsprintf("\n"); - - if (reply) - rsprintf("\n", loc("and all their replies")); - - } - else - { - rsprintf("%s\n", loc("Are you sure to delete this message?")); - - /* check for replies */ - - /* retrieve original message */ - el_retrieve(lbs, message_id, NULL, attr_list, NULL, 0, - NULL, NULL, in_reply_to, reply_to, NULL, NULL, NULL); - - if (reply_to[0]) - rsprintf("\n", message_id, loc("and all its replies")); - else - rsprintf("\n", message_id); - - /* put link to next message */ - next = el_search_message(lbs, EL_NEXT, message_id, TRUE); - - rsprintf("\n", next); - } - - rsprintf("\n\n"); - } - - rsprintf("
\n"); - - /* define hidden field for command */ - rsprintf("\n", loc("Delete")); - - if (!message_id) - { - rsprintf("%s
\n"); - rsprintf("\n", getparam("nsel")); - - if (isparam("lastcmd")) - { - strcpy(str, getparam("lastcmd")); - rsprintf("\n", str); - } - - for (i=reply=0 ; i\n", str, getparam(str)); - } - - if (!reply) - { - el_retrieve(lbs, atoi(getparam(str)), NULL, attr_list, NULL, 0, - NULL, NULL, in_reply_to, reply_to, NULL, NULL, NULL); - if (reply_to[0]) - reply = TRUE; - } - } - - rsprintf("
%s
#%d
%s
#%d
\n", - loc("Yes")); - rsprintf("\n", loc("No")); - rsprintf("
\n"); - rsprintf("\r\n"); + rsprintf("\n"); + rsprintf("\r\n"); } /*------------------------------------------------------------------*/ -int show_download_page(LOGBOOK *lbs, char *path) +int show_download_page(LOGBOOK * lbs, char *path) { -char file_name[256]; -int index, message_id, fh, i, size, delta; -char message[TEXT_SIZE+1000], *p; + char file_name[256]; + int index, message_id, fh, i, size, delta; + char message[TEXT_SIZE + 1000], *p; - message_id = atoi(path); + message_id = atoi(path); - for (index = 0 ; index < *lbs->n_el_index ; index++) - if (lbs->el_index[index].message_id == message_id) - break; + for (index = 0; index < *lbs->n_el_index; index++) + if (lbs->el_index[index].message_id == message_id) + break; - if (index == *lbs->n_el_index) - return EL_NO_MSG; + if (index == *lbs->n_el_index) + return EL_NO_MSG; - sprintf(file_name, "%s%s", lbs->data_dir, lbs->el_index[index].file_name); - fh = open(file_name, O_RDWR | O_BINARY, 0644); - if (fh < 0) - return EL_FILE_ERROR; + sprintf(file_name, "%s%s", lbs->data_dir, + lbs->el_index[index].file_name); + fh = open(file_name, O_RDWR | O_BINARY, 0644); + if (fh < 0) + return EL_FILE_ERROR; - lseek(fh, lbs->el_index[index].offset, SEEK_SET); - i = read(fh, message, sizeof(message)-1); - if (i <= 0) - { - close(fh); - return EL_FILE_ERROR; - } + lseek(fh, lbs->el_index[index].offset, SEEK_SET); + i = read(fh, message, sizeof(message) - 1); + if (i <= 0) { + close(fh); + return EL_FILE_ERROR; + } - message[i] = 0; - close(fh); + message[i] = 0; + close(fh); - /* decode message size */ - p = strstr(message+8, "$@MID@$:"); - if (p == NULL) - size = strlen(message); - else - size = (int) p - (int) message; + /* decode message size */ + p = strstr(message + 8, "$@MID@$:"); + if (p == NULL) + size = strlen(message); + else + size = (int) p - (int) message; - message[size] = 0; + message[size] = 0; - /* header */ - rsprintf("HTTP/1.1 200 Document follows\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - rsprintf("Accept-Ranges: bytes\r\n"); + /* header */ + rsprintf("HTTP/1.1 200 Document follows\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + rsprintf("Accept-Ranges: bytes\r\n"); - /* - time(&now); - now += (int) (3600*3); - gmt = gmtime(&now); - strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); - rsprintf("Expires: %s\r\n", str); - */ + /* + time(&now); + now += (int) (3600*3); + gmt = gmtime(&now); + strftime(str, sizeof(str), "%A, %d-%b-%y %H:%M:%S GMT", gmt); + rsprintf("Expires: %s\r\n", str); + */ - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); - } + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + } - rsprintf("Content-Type: text/plain\r\n"); - rsprintf("Content-Length: %d\r\n\r\n", size); + rsprintf("Content-Type: text/plain\r\n"); + rsprintf("Content-Length: %d\r\n\r\n", size); - /* increase return buffer size if file too big */ - if (size > return_buffer_size - (int)strlen(return_buffer)) - { - delta = size - (return_buffer_size - strlen(return_buffer)) + 1000; + /* increase return buffer size if file too big */ + if (size > return_buffer_size - (int) strlen(return_buffer)) { + delta = size - (return_buffer_size - strlen(return_buffer)) + 1000; - return_buffer = realloc(return_buffer, return_buffer_size + delta); - memset(return_buffer + return_buffer_size, 0, delta); - return_buffer_size += delta; - } + return_buffer = realloc(return_buffer, return_buffer_size + delta); + memset(return_buffer + return_buffer_size, 0, delta); + return_buffer_size += delta; + } - return_length = strlen(return_buffer)+size; - strlcat(return_buffer, message, return_buffer_size); + return_length = strlen(return_buffer) + size; + strlcat(return_buffer, message, return_buffer_size); - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int show_md5_page(LOGBOOK *lbs, char *path) +int show_md5_page(LOGBOOK * lbs, char *path) { -int i, j; + int i, j; - /* header */ - rsprintf("HTTP/1.1 200 Document follows\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - rsprintf("Accept-Ranges: bytes\r\n"); - rsprintf("Connection: close\r\n"); - rsprintf("Content-Type: text/plain;charset=iso-8859-1\r\n"); - rsprintf("Pragma: no-cache\r\n"); - rsprintf("Expires: Fri, 01 Jan 1983 00:00:00 GMT\r\n\r\n"); + /* header */ + rsprintf("HTTP/1.1 200 Document follows\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + rsprintf("Accept-Ranges: bytes\r\n"); + rsprintf("Connection: close\r\n"); + rsprintf("Content-Type: text/plain;charset=iso-8859-1\r\n"); + rsprintf("Pragma: no-cache\r\n"); + rsprintf("Expires: Fri, 01 Jan 1983 00:00:00 GMT\r\n\r\n"); - for (i=0 ; i<*lbs->n_el_index ; i++) - { - rsprintf("ID: %6d MD5:", lbs->el_index[i].message_id); - for (j=0 ; j<16 ; j++) - rsprintf("%02X", lbs->el_index[i].md5_digest[j]); - rsprintf("\n"); - } + for (i = 0; i < *lbs->n_el_index; i++) { + rsprintf("ID: %6d MD5:", lbs->el_index[i].message_id); + for (j = 0; j < 16; j++) + rsprintf("%02X", lbs->el_index[i].md5_digest[j]); + rsprintf("\n"); + } - keep_alive = 0; + keep_alive = 0; - return EL_SUCCESS; + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -int retrieve_remote_md5(char *url, MD5_INDEX **md5_index) +int retrieve_remote_md5(char *url, MD5_INDEX ** md5_index) { -int i, n, id; -char *text, *p; + int i, n, id; + char *text, *p; - text = NULL; - retrieve_url(url, &text); - *md5_index = NULL; - p = strstr(text, "\r\n\r\n"); - if (!p) - return -1; + text = NULL; + retrieve_url(url, &text); + *md5_index = NULL; + p = strstr(text, "\r\n\r\n"); + if (!p) + return -1; - for (n=0 ; ; n++) - { - p = strstr(p, "ID:"); - if (!p) - break; - p += 3; + for (n = 0;; n++) { + p = strstr(p, "ID:"); + if (!p) + break; + p += 3; - id = atoi(p); + id = atoi(p); - p = strstr(p, "MD5:"); - if (!p) - break; - p += 4; + p = strstr(p, "MD5:"); + if (!p) + break; + p += 4; - if (n==0) - *md5_index = malloc(sizeof(MD5_INDEX)); - else - *md5_index = realloc(*md5_index, (i+1)*sizeof(MD5_INDEX)); - - (*md5_index)[n].message_id = id; - - for (i=0 ; i<16 ; i++) - sscanf(p+2*i, "%02X", &((*md5_index)[n].md5_digest[i])); - } - - for (i=0 ; in_attr, - text, &size, in_reply_to, reply_to, - attachment, encoding, locked_by); - - if (status != EL_SUCCESS) - { - free(text); - strcpy(error_str, "cannot read message from local logbook"); - return -1; - } - - split_url(url, host_name, &port, subdir); - - /* create socket */ - if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - free(text); - strcpy(error_str, "cannot create socket"); - return -1; - } - - /* get local host name */ - gethostname(local_host_name, sizeof(local_host_name)); - - /* compose remote address */ - memset(&bind_addr, 0, sizeof(bind_addr)); - bind_addr.sin_family = AF_INET; - bind_addr.sin_addr.s_addr = 0; - bind_addr.sin_port = htons((unsigned short)port); - - phe = gethostbyname(host_name); - if (phe == NULL) - { - closesocket(sock); - free(text); - strcpy(error_str, "cannot get host name"); - return -1; - } - memcpy((char *)&(bind_addr.sin_addr), phe->h_addr, phe->h_length); - - /* connect to server */ - status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); - if (status != 0) - { - closesocket(sock); - free(text); - sprintf(error_str, "Cannot connect to host %s, port %d\n", host_name, port); - return -1; - } - - content_length = 100000; - for (i=0 ; idata_dir, sizeof(file_name)); - strlcat(file_name, attachment[i], sizeof(file_name)); - - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - size = TELL(fh); - close(fh); - } + if (n == 0) + *md5_index = malloc(sizeof(MD5_INDEX)); else - size = 0; + *md5_index = realloc(*md5_index, (i + 1) * sizeof(MD5_INDEX)); - content_length += size; - } + (*md5_index)[n].message_id = id; - content = malloc(content_length); - if (content == NULL) - { - closesocket(sock); - free(text); - strcpy(error_str, "Not enough memory\n"); - return -1; - } + for (i = 0; i < 16; i++) + sscanf(p + 2 * i, "%02X", &((*md5_index)[n].md5_digest[i])); + } - /* compose content */ - srand((unsigned)time(NULL)); - sprintf(boundary, "---------------------------%04X%04X%04X", rand(), rand(), rand()); - strcpy(content, boundary); - strcat(content, "\r\nContent-Disposition: form-data; name=\"cmd\"\r\n\r\nSubmit\r\n"); + for (i = 0; i < n; i++) { + int j; - if (isparam("unm")) - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"unm\"\r\n\r\n%s\r\n", boundary, getparam("unm")); + printf("ID %d MD5:", (*md5_index)[i].message_id); + for (j = 0; j < 16; j++) + printf("%02X", (*md5_index)[i].md5_digest[j]); - if (isparam("upwd")) - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"upwd\"\r\n\r\n%s\r\n", boundary, getparam("upwd")); + printf("\n"); + } - if (isparam("exp")) - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"exp\"\r\n\r\n%s\r\n", boundary, getparam("exp")); - - if (reply_to[0]) - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"reply_to\"\r\n\r\n%d\r\n", boundary, reply_to); + free(text); - for (i=0 ; in_attr ; i++) - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n", boundary, attr_list[i], attrib[i]); - - sprintf(content+strlen(content), - "%s\r\nContent-Disposition: form-data; name=\"Text\"\r\n\r\n%s\r\n%s\r\n", boundary, text, boundary); - - content_length = strlen(content); - p = content+content_length; - - /* read attachments */ - for (i=0 ; idata_dir, sizeof(file_name)); - strlcat(file_name, attachment[i], sizeof(file_name)); - - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - size = TELL(fh); - lseek(fh, 0, SEEK_SET); - - buffer = malloc(size); - - if (buffer == NULL) - { - closesocket(sock); - free(text); - strcpy(error_str, "Not enough memory"); - return -1; - } - - read(fh, buffer, size); - - close(fh); - - /* submit attachment */ - sprintf(p, "Content-Disposition: form-data; name=\"attfile%d\"; filename=\"%s\"\r\n\r\n", - i+1, attachment[i]); - - content_length += strlen(p); - p += strlen(p); - - memcpy(p, buffer, size); - p += size; - strcpy(p, boundary); - strcat(p, "\r\n"); - - content_length += size + strlen(p); - p += strlen(p); - - free(buffer); - } - } - - /* compose request */ - strcpy(request, "POST "); - if (subdir[0]) - { - if (subdir[0] != '/') - strcat(request, "/"); - strcat(request, subdir); - if (request[strlen(request)-1] != '/') - strcat(request, "/"); - } - strcat(request, " HTTP/1.0\r\n"); - - sprintf(request+strlen(request), "Content-Type: multipart/form-data; boundary=%s\r\n", boundary); - sprintf(request+strlen(request), "Host: %s\r\n", local_host_name); - sprintf(request+strlen(request), "User-Agent: ELOGD\r\n"); - sprintf(request+strlen(request), "Content-Length: %d\r\n", content_length); - - if (isparam("wpwd")) - sprintf(request+strlen(request), "Cookie: wpwd=%s\r\n", getparam("wpwd")); - - strcat(request, "\r\n"); - - header_length = strlen(request); - - /* send request */ - send(sock, request, header_length, 0); - - /* send content */ - send(sock, content, content_length, 0); - - /* receive response */ - i = recv(sock, response, 10000, 0); - if (i < 0) - { - closesocket(sock); - free(text); - strcpy(error_str, "Cannot receive response"); - return -1; - } - - /* discard remainder of response */ - n = i; - while (i > 0) - { - i = recv(sock, response+n, 10000, 0); - if (i > 0) - n += i; - } - response[n] = 0; - - closesocket(sock); - - /* check response status */ - if (strstr(response, "302 Found")) - { - if (strstr(response, "Location:")) - { - if (strstr(response, "wpwd")) - sprintf(error_str, "Invalid password\n"); - else if (strstr(response, "wusr")) - sprintf(error_str, "Invalid user name\n"); - } - } - else if (strstr(response, "Logbook Selection")) - sprintf(error_str, "No logbook specified\n"); - else if (strstr(response, "enter password")) - sprintf(error_str, "Missing or invalid password\n"); - else if (strstr(response, "form name=form1")) - sprintf(error_str, "Missing or invalid user name/password\n"); - else if (strstr(response, "Error: Attribute")) - { - strncpy(str, strstr(response, "Error: Attribute")+20, sizeof(str)); - if (strchr(str, '<')) - *strchr(str, '<') = 0; - sprintf(error_str, "Missing required attribute \"%s\"\n", str); - } - else - sprintf(error_str, "Error transmitting message\n"); - - free(text); - - if (error_str[0]) - return -1; - - return EL_SUCCESS; + return n; } /*------------------------------------------------------------------*/ -void synchronize(LOGBOOK *lbs, char *path) +int submit_message(LOGBOOK * lbs, char *url, int message_id, + char *error_str) { -int index, i, j, k, n, nserver, priority_remote = 0; -char str[2000]; -MD5_INDEX *md5_index; -char list[MAX_N_LIST][NAME_LENGTH], error_str[256]; + int size, i, n, status, fh, port, sock, content_length, header_length; + char str[256], file_name[MAX_PATH_LENGTH], + attrib[MAX_N_ATTR][NAME_LENGTH]; + char host_name[256], subdir[256], local_host_name[256]; + char date[80], *text, in_reply_to[80], reply_to[MAX_REPLY_TO * 10], + attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], + locked_by[256], *buffer; + char *content, *p, boundary[80], request[10000], response[10000]; + struct hostent *phe; + struct sockaddr_in bind_addr; - show_html_header(NULL, FALSE, loc("Synchronization")); + text = malloc(TEXT_SIZE); + error_str[0] = 0; - rsprintf("\n"); + /* get message */ + size = TEXT_SIZE; + status = + el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, attachment, + encoding, locked_by); - rsprintf("\n\n"); + if (status != EL_SUCCESS) { + free(text); + strcpy(error_str, "cannot read message from local logbook"); + return -1; + } - if (getcfg(lbs->name, "Mirror server", str)) - { - nserver = strbreak(str, list, MAX_N_LIST); + split_url(url, host_name, &port, subdir); - for (index=0 ; index%s %s\n", loc("Synchronizing with"), list[index]); - rsprintf("

\n"); + /* create socket */ + if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + free(text); + strcpy(error_str, "cannot create socket"); + return -1; + } - /* send partial return buffer */ - flush_return_buffer(); + /* get local host name */ + gethostname(local_host_name, sizeof(local_host_name)); - sprintf(str, "%s?cmd=GetMD5", list[index]); - n = retrieve_remote_md5(str, &md5_index); - if (n<0) - continue; + /* compose remote address */ + memset(&bind_addr, 0, sizeof(bind_addr)); + bind_addr.sin_family = AF_INET; + bind_addr.sin_addr.s_addr = 0; + bind_addr.sin_port = htons((unsigned short) port); - /* loop through logbook entries */ - for (i=0 ; i<*lbs->n_el_index ; i++) - { - rsprintf("ID: %6d ", lbs->el_index[i].message_id); + phe = gethostbyname(host_name); + if (phe == NULL) { + closesocket(sock); + free(text); + strcpy(error_str, "cannot get host name"); + return -1; + } + memcpy((char *) &(bind_addr.sin_addr), phe->h_addr, phe->h_length); - for (j=0 ; jel_index[i].message_id) - break; + /* connect to server */ + status = connect(sock, (void *) &bind_addr, sizeof(bind_addr)); + if (status != 0) { + closesocket(sock); + free(text); + sprintf(error_str, "Cannot connect to host %s, port %d\n", host_name, + port); + return -1; + } - if (j < n) - { - /* message found, compare MD5 */ + content_length = 100000; + for (i = 0; i < MAX_ATTACHMENTS; i++) + if (attachment[i][0]) { + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, attachment[i], sizeof(file_name)); - for (k=0 ; k<16 ; k++) - if (md5_index[j].md5_digest[k] != lbs->el_index[j].md5_digest[k]) - break; + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + size = TELL(fh); + close(fh); + } else + size = 0; - if (k < 16) - { - if (priority_remote) - { - /* retrieve remote message */ - rsprintf("Retrieve remote message
\n"); - } - else - { - /* submit local message */ - submit_message(lbs, list[index], lbs->el_index[i].message_id, error_str); - - if (error_str[0]) - rsprintf("Error sending local message: %s
\n", error_str); - else - rsprintf("Local message submitted
\n"); - } - } - else - { - rsprintf("%s
\n", loc("Message identical")); - } - } - else - { - /* message not found remotely */ - if (priority_remote) - { - /* delete local message */ - rsprintf("Delete local message
\n"); - } - else - { - /* submit message */ - submit_message(lbs, list[index], lbs->el_index[j].message_id, error_str); - - if (error_str[0]) - rsprintf("Error sending local message: %s
\n", error_str); - else - rsprintf("Local message submitted
\n"); - } - } - } + content_length += size; } - } - rsprintf("\n"); - flush_return_buffer(); - keep_alive = 0; + content = malloc(content_length); + if (content == NULL) { + closesocket(sock); + free(text); + strcpy(error_str, "Not enough memory\n"); + return -1; + } + + /* compose content */ + srand((unsigned) time(NULL)); + sprintf(boundary, "---------------------------%04X%04X%04X", rand(), + rand(), rand()); + strcpy(content, boundary); + strcat(content, + "\r\nContent-Disposition: form-data; name=\"cmd\"\r\n\r\nSubmit\r\n"); + + if (isparam("unm")) + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"unm\"\r\n\r\n%s\r\n", + boundary, getparam("unm")); + + if (isparam("upwd")) + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"upwd\"\r\n\r\n%s\r\n", + boundary, getparam("upwd")); + + if (isparam("exp")) + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"exp\"\r\n\r\n%s\r\n", + boundary, getparam("exp")); + + if (reply_to[0]) + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"reply_to\"\r\n\r\n%d\r\n", + boundary, reply_to); + + for (i = 0; i < lbs->n_attr; i++) + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n", + boundary, attr_list[i], attrib[i]); + + sprintf(content + strlen(content), + "%s\r\nContent-Disposition: form-data; name=\"Text\"\r\n\r\n%s\r\n%s\r\n", + boundary, text, boundary); + + content_length = strlen(content); + p = content + content_length; + + /* read attachments */ + for (i = 0; i < MAX_ATTACHMENTS; i++) + if (attachment[i][0]) { + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, attachment[i], sizeof(file_name)); + + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + size = TELL(fh); + lseek(fh, 0, SEEK_SET); + + buffer = malloc(size); + + if (buffer == NULL) { + closesocket(sock); + free(text); + strcpy(error_str, "Not enough memory"); + return -1; + } + + read(fh, buffer, size); + + close(fh); + + /* submit attachment */ + sprintf(p, + "Content-Disposition: form-data; name=\"attfile%d\"; filename=\"%s\"\r\n\r\n", + i + 1, attachment[i]); + + content_length += strlen(p); + p += strlen(p); + + memcpy(p, buffer, size); + p += size; + strcpy(p, boundary); + strcat(p, "\r\n"); + + content_length += size + strlen(p); + p += strlen(p); + + free(buffer); + } + } + + /* compose request */ + strcpy(request, "POST "); + if (subdir[0]) { + if (subdir[0] != '/') + strcat(request, "/"); + strcat(request, subdir); + if (request[strlen(request) - 1] != '/') + strcat(request, "/"); + } + strcat(request, " HTTP/1.0\r\n"); + + sprintf(request + strlen(request), + "Content-Type: multipart/form-data; boundary=%s\r\n", boundary); + sprintf(request + strlen(request), "Host: %s\r\n", local_host_name); + sprintf(request + strlen(request), "User-Agent: ELOGD\r\n"); + sprintf(request + strlen(request), "Content-Length: %d\r\n", + content_length); + + if (isparam("wpwd")) + sprintf(request + strlen(request), "Cookie: wpwd=%s\r\n", + getparam("wpwd")); + + strcat(request, "\r\n"); + + header_length = strlen(request); + + /* send request */ + send(sock, request, header_length, 0); + + /* send content */ + send(sock, content, content_length, 0); + + /* receive response */ + i = recv(sock, response, 10000, 0); + if (i < 0) { + closesocket(sock); + free(text); + strcpy(error_str, "Cannot receive response"); + return -1; + } + + /* discard remainder of response */ + n = i; + while (i > 0) { + i = recv(sock, response + n, 10000, 0); + if (i > 0) + n += i; + } + response[n] = 0; + + closesocket(sock); + + /* check response status */ + if (strstr(response, "302 Found")) { + if (strstr(response, "Location:")) { + if (strstr(response, "wpwd")) + sprintf(error_str, "Invalid password\n"); + else if (strstr(response, "wusr")) + sprintf(error_str, "Invalid user name\n"); + } + } else if (strstr(response, "Logbook Selection")) + sprintf(error_str, "No logbook specified\n"); + else if (strstr(response, "enter password")) + sprintf(error_str, "Missing or invalid password\n"); + else if (strstr(response, "form name=form1")) + sprintf(error_str, "Missing or invalid user name/password\n"); + else if (strstr(response, "Error: Attribute")) { + strncpy(str, strstr(response, "Error: Attribute") + 20, sizeof(str)); + if (strchr(str, '<')) + *strchr(str, '<') = 0; + sprintf(error_str, "Missing required attribute \"%s\"\n", str); + } else + sprintf(error_str, "Error transmitting message\n"); + + free(text); + + if (error_str[0]) + return -1; + + return EL_SUCCESS; } /*------------------------------------------------------------------*/ -void display_line(LOGBOOK *lbs, int message_id, int number, char *mode, - int expand, int level, BOOL printable, int n_line, int show_attachments, - char *date, char *in_reply_to, char *reply_to, - int n_attr_disp, char disp_attr[MAX_N_ATTR+4][NAME_LENGTH], - char attrib[MAX_N_ATTR][NAME_LENGTH], - int n_attr, char *text, - char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], char *encoding, - BOOL select, int *n_display, char *locked_by) +void synchronize(LOGBOOK * lbs, char *path) { -char str[NAME_LENGTH], ref[256], *nowrap, sclass[80], format[256], file_name[MAX_PATH_LENGTH]; -char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -char display[NAME_LENGTH], attr_icon[80]; -int i, j, i_line, index, colspan; -BOOL skip_comma; -FILE *f; + int index, i, j, k, n, nserver, priority_remote = 0; + char str[2000]; + MD5_INDEX *md5_index; + char list[MAX_N_LIST][NAME_LENGTH], error_str[256]; - sprintf(ref, "../%s/%d", lbs->name_enc, message_id); + show_html_header(NULL, FALSE, loc("Synchronization")); - if (equal_ustring(mode, "Summary")) - { - if (number % 2 == 1) - strcpy(sclass, "list1"); - else - strcpy(sclass, "list2"); - } - else if (equal_ustring(mode, "Full")) - strcpy(sclass, "list1"); - else if (equal_ustring(mode, "Threaded")) - { - if (level == 0) - strcpy(sclass, "thread"); - else - strcpy(sclass, "threadreply"); - } + rsprintf("\n"); - rsprintf(""); + rsprintf("\n\n"); - /* only single cell for threaded display */ - if (equal_ustring(mode, "Threaded")) - { - rsprintf("", sclass); + if (getcfg(lbs->name, "Mirror server", str)) { + nserver = strbreak(str, list, MAX_N_LIST); - if (locked_by && locked_by[0]) - { - sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\"%s\" ", str); - } + for (index = 0; index < nserver; index++) { + rsprintf("\n", + loc("Synchronizing with"), list[index]); + rsprintf("
%s %s

\n"); - /* show select box */ - if (select && level == 0) - rsprintf("\n", (*n_display)++, message_id); + /* send partial return buffer */ + flush_return_buffer(); - for (i=0 ; in_el_index; i++) { + rsprintf("ID: %6d ", lbs->el_index[i].message_id); - nowrap = printable ? "" : "nowrap"; - skip_comma = FALSE; + for (j = 0; j < n; j++) + if (md5_index[j].message_id == lbs->el_index[i].message_id) + break; - if (equal_ustring(mode, "Threaded") && getcfg(lbs->name, "Thread display", display)) - { - /* check if to use icon from attributes */ - attr_icon[0] = 0; - if (getcfg(lbs->name, "Thread icon", attr_icon)) - { - for (i=0 ; i ", ref, attr_icon); - else - { - /* if top level only, display reply icon if message has a reply */ - if (getcfg(lbs->name, "Top level only", str) && atoi(str) == 1 && reply_to[0]) - rsprintf(" ", ref); - else - { - /* display standard icons */ - if (level == 0) - rsprintf(" "); - else - rsprintf(" ", ref); - } - } + for (k = 0; k < 16; k++) + if (md5_index[j].md5_digest[k] != + lbs->el_index[j].md5_digest[k]) + break; - j = build_subst_list(lbs, slist, svalue, attrib); + if (k < 16) { + if (priority_remote) { + /* retrieve remote message */ + rsprintf("Retrieve remote message
\n"); + } else { + /* submit local message */ + submit_message(lbs, list[index], + lbs->el_index[i].message_id, + error_str); - /* add message id and entry date */ - strcpy(slist[j], "Message ID"); - sprintf(svalue[j++], "%d", message_id); - - strcpy(slist[j], "entry date"); - - if (getcfg(lbs->name, "Date format", format)) - { - struct tm ts; - - memset(&ts, 0, sizeof(ts)); - - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; - ts.tm_mon = i; - - ts.tm_mday = atoi(date+8); - ts.tm_hour = atoi(date+11); - ts.tm_min = atoi(date+14); - ts.tm_sec = atoi(date+17); - ts.tm_year = atoi(date+20)-1900; - ts.tm_isdst = -1; /* let mktime compute DST */ - - mktime(&ts); - strftime(svalue[j++], sizeof(str), format, &ts); - } - else - strcpy(svalue[j++], date); - - strsubst(display, slist, svalue, j); - - rsprintf("", ref); - rsputs2(display); - rsprintf("\n"); - } - else - { - /* show select box */ - if (select && !equal_ustring(mode, "Threaded")) - { - rsprintf("", sclass); - - if (in_reply_to[0] == 0) - rsprintf("\n", (*n_display)++, message_id); - else - rsprintf(" \n"); - - rsprintf("\n"); - } - - if (equal_ustring(mode, "Threaded")) - rsprintf("", ref); - - for (index=0 ; index "); - else - rsprintf(" "); - - skip_comma = TRUE; - } - else - { - rsprintf("", sclass); - - if (locked_by && locked_by[0]) - { - sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\"%s\" ", str); - } - - rsprintf("  %d  \n", ref, message_id); - } - } - - if (equal_ustring(disp_attr[index], "Logbook")) - { - if (equal_ustring(mode, "Threaded")) - { - if (skip_comma) - { - rsprintf(" %s", lbs->name); - skip_comma = FALSE; - } - else - rsprintf(", %s", lbs->name); - } - else - rsprintf("%s\n", sclass, nowrap, ref, lbs->name); - } - - if (equal_ustring(disp_attr[index], loc("Date"))) - { - if (getcfg(lbs->name, "Date format", format)) - { - struct tm ts; - - memset(&ts, 0, sizeof(ts)); - - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; - ts.tm_mon = i; - - ts.tm_mday = atoi(date+8); - ts.tm_hour = atoi(date+11); - ts.tm_min = atoi(date+14); - ts.tm_sec = atoi(date+17); - ts.tm_year = atoi(date+20)-1900; - ts.tm_isdst = -1; /* let mktime compute DST */ - - mktime(&ts); - strftime(str, sizeof(str), format, &ts); - } - else - strcpy(str, date); - - if (equal_ustring(mode, "Threaded")) - { - if (skip_comma) - { - rsprintf(" %s", str); - skip_comma = FALSE; - } - else - rsprintf(", %s", str); - } - else - rsprintf("%s\n", sclass, nowrap, ref, str); - } - - for (i=0 ; i\n", + error_str); + else + rsprintf("Local message submitted
\n"); } - else - rsprintf(", "); + } else { + rsprintf("%s
\n", loc("Message identical")); + } + } else { + /* message not found remotely */ + if (priority_remote) { + /* delete local message */ + rsprintf("Delete local message
\n"); + } else { + /* submit message */ + submit_message(lbs, list[index], + lbs->el_index[j].message_id, error_str); - rsputs2(attrib[i]); - - rsprintf(" "); - } - } - - else if (attr_flags[i] & AF_ICON) - { - if (attrib[i][0]) - rsprintf("  ", attrib[i]); - } - - else - { - if (skip_comma) - { - rsprintf(" "); - skip_comma = FALSE; - } - else - rsprintf(", "); - - rsputs2(attrib[i]); - } + if (error_str[0]) + rsprintf("Error sending local message: %s
\n", + error_str); + else + rsprintf("Local message submitted
\n"); + } } - else - { - if (equal_ustring(attr_options[i][0], "boolean")) - { - if (atoi(attrib[i]) == 1) - rsprintf("\n", sclass); - else - rsprintf("\n", sclass); - } + } + } + } - else if (attr_flags[i] & AF_ICON) - { - rsprintf("", sclass); - if (attrib[i][0]) - rsprintf("", attrib[i]); - rsprintf(" "); - } + rsprintf("\n"); + flush_return_buffer(); + keep_alive = 0; +} +/*------------------------------------------------------------------*/ + +void display_line(LOGBOOK * lbs, int message_id, int number, char *mode, + int expand, int level, BOOL printable, int n_line, + int show_attachments, char *date, char *in_reply_to, + char *reply_to, int n_attr_disp, + char disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], + char attrib[MAX_N_ATTR][NAME_LENGTH], int n_attr, + char *text, + char attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], + char *encoding, BOOL select, int *n_display, + char *locked_by) +{ + char str[NAME_LENGTH], ref[256], *nowrap, sclass[80], format[256], + file_name[MAX_PATH_LENGTH]; + char slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH]; + char display[NAME_LENGTH], attr_icon[80]; + int i, j, i_line, index, colspan; + BOOL skip_comma; + FILE *f; + + sprintf(ref, "../%s/%d", lbs->name_enc, message_id); + + if (equal_ustring(mode, "Summary")) { + if (number % 2 == 1) + strcpy(sclass, "list1"); + else + strcpy(sclass, "list2"); + } else if (equal_ustring(mode, "Full")) + strcpy(sclass, "list1"); + else if (equal_ustring(mode, "Threaded")) { + if (level == 0) + strcpy(sclass, "thread"); + else + strcpy(sclass, "threadreply"); + } + + rsprintf(""); + + /* only single cell for threaded display */ + if (equal_ustring(mode, "Threaded")) { + rsprintf("", sclass); + + if (locked_by && locked_by[0]) { + sprintf(str, "%s %s", loc("Entry is currently edited by"), + locked_by); + rsprintf("\"%s\" ", str); + } + + /* show select box */ + if (select && level == 0) + rsprintf("\n", + (*n_display)++, message_id); + + for (i = 0; i < level; i++) + rsprintf("   "); + + /* display "+" if expandable */ + if (expand == 0 && reply_to[0]) + rsprintf("+ "); + } + + nowrap = printable ? "" : "nowrap"; + skip_comma = FALSE; + + if (equal_ustring(mode, "Threaded") + && getcfg(lbs->name, "Thread display", display)) { + /* check if to use icon from attributes */ + attr_icon[0] = 0; + if (getcfg(lbs->name, "Thread icon", attr_icon)) { + for (i = 0; i < n_attr; i++) + if (equal_ustring(attr_list[i], attr_icon)) + break; + if (i < n_attr && attrib[i][0]) + strcpy(attr_icon, attrib[i]); + else + attr_icon[0] = 0; + } + + if (attr_icon[0]) + rsprintf + (" ", + ref, attr_icon); + else { + /* if top level only, display reply icon if message has a reply */ + if (getcfg(lbs->name, "Top level only", str) && atoi(str) == 1 + && reply_to[0]) + rsprintf + (" ", + ref); + else { + /* display standard icons */ + if (level == 0) + rsprintf + (" "); else - { - rsprintf("", sclass, ref); - rsputs2(attrib[i]); - rsprintf(" "); - } - } - } - } + rsprintf + (" ", + ref); + } + } + + j = build_subst_list(lbs, slist, svalue, attrib); + + /* add message id and entry date */ + strcpy(slist[j], "Message ID"); + sprintf(svalue[j++], "%d", message_id); + + strcpy(slist[j], "entry date"); + + if (getcfg(lbs->name, "Date format", format)) { + struct tm ts; + + memset(&ts, 0, sizeof(ts)); + + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; + ts.tm_mon = i; + + ts.tm_mday = atoi(date + 8); + ts.tm_hour = atoi(date + 11); + ts.tm_min = atoi(date + 14); + ts.tm_sec = atoi(date + 17); + ts.tm_year = atoi(date + 20) - 1900; + ts.tm_isdst = -1; /* let mktime compute DST */ + + mktime(&ts); + strftime(svalue[j++], sizeof(str), format, &ts); + } else + strcpy(svalue[j++], date); + + strsubst(display, slist, svalue, j); + + rsprintf("", ref); + rsputs2(display); + rsprintf("\n"); + } else { + /* show select box */ + if (select && !equal_ustring(mode, "Threaded")) { + rsprintf("", sclass); + + if (in_reply_to[0] == 0) + rsprintf("\n", + (*n_display)++, message_id); + else + rsprintf(" \n"); + + rsprintf("\n"); + } if (equal_ustring(mode, "Threaded")) - rsprintf("\n"); - } + rsprintf("", ref); - if (equal_ustring(mode, "Threaded") && expand > 1) - { - rsprintf("\n"); + for (index = 0; index < n_attr_disp; index++) { + if (equal_ustring(disp_attr[index], loc("ID"))) { + if (equal_ustring(mode, "Threaded")) { + if (level == 0) + rsprintf(" "); + else + rsprintf(" "); - rsprintf(""); + skip_comma = TRUE; + } else { + rsprintf("", sclass); - if (expand == 2) - { - for (i=i_line=0 ; i ", str); + } - if (i_line == n_line) - break; - } + rsprintf + ("  %d  \n", + ref, message_id); + } + } + + if (equal_ustring(disp_attr[index], "Logbook")) { + if (equal_ustring(mode, "Threaded")) { + if (skip_comma) { + rsprintf(" %s", lbs->name); + skip_comma = FALSE; + } else + rsprintf(", %s", lbs->name); + } else + rsprintf("%s\n", + sclass, nowrap, ref, lbs->name); + } + + if (equal_ustring(disp_attr[index], loc("Date"))) { + if (getcfg(lbs->name, "Date format", format)) { + struct tm ts; + + memset(&ts, 0, sizeof(ts)); + + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; + ts.tm_mon = i; + + ts.tm_mday = atoi(date + 8); + ts.tm_hour = atoi(date + 11); + ts.tm_min = atoi(date + 14); + ts.tm_sec = atoi(date + 17); + ts.tm_year = atoi(date + 20) - 1900; + ts.tm_isdst = -1; /* let mktime compute DST */ + + mktime(&ts); + strftime(str, sizeof(str), format, &ts); + } else + strcpy(str, date); + + if (equal_ustring(mode, "Threaded")) { + if (skip_comma) { + rsprintf(" %s", str); + skip_comma = FALSE; + } else + rsprintf(", %s", str); + } else + rsprintf("%s\n", + sclass, nowrap, ref, str); + } + + for (i = 0; i < n_attr; i++) + if (equal_ustring(disp_attr[index], attr_list[i])) { + if (equal_ustring(mode, "Threaded")) { + if (equal_ustring(attr_options[i][0], "boolean")) { + if (atoi(attrib[i]) == 1) { + if (skip_comma) { + rsprintf(" "); + skip_comma = FALSE; + } else + rsprintf(", "); + + rsputs2(attrib[i]); + + rsprintf(" "); + } + } + + else if (attr_flags[i] & AF_ICON) { + if (attrib[i][0]) + rsprintf + ("  ", + attrib[i]); + } + + else { + if (skip_comma) { + rsprintf(" "); + skip_comma = FALSE; + } else + rsprintf(", "); + + rsputs2(attrib[i]); + } + } else { + if (equal_ustring(attr_options[i][0], "boolean")) { + if (atoi(attrib[i]) == 1) + rsprintf + ("\n", + sclass); + else + rsprintf + ("\n", + sclass); + } + + else if (attr_flags[i] & AF_ICON) { + rsprintf("", sclass); + if (attrib[i][0]) + rsprintf("", + attrib[i]); + rsprintf(" "); + } + + else { + rsprintf("", sclass, + ref); + rsputs2(attrib[i]); + rsprintf(" "); + } + } + } + } + + if (equal_ustring(mode, "Threaded")) + rsprintf("\n"); + } + + if (equal_ustring(mode, "Threaded") && expand > 1) { + rsprintf("\n"); + + rsprintf(""); + + if (expand == 2) { + for (i = i_line = 0; i < sizeof(str) - 1; i++) { + str[i] = text[i]; + if (str[i] == '\n') + i_line++; + + if (i_line == n_line) + break; + } + str[i] = 0; + + /* always encode, not to rip apart HTML documents, + e.g. only the start of a table */ + strencode(str); + } else { + if (equal_ustring(encoding, "plain")) { + rsputs("

");
+            rsputs2(text);
+            rsputs("
"); + } else + rsputs(text); + + } + + rsprintf("\n"); + } + + + if ((equal_ustring(mode, "Summary") && n_line > 0)) { + rsprintf(""); + for (i = i_line = 0; i < sizeof(str) - 1; i++) { + str[i] = text[i]; + if (str[i] == '\n') + i_line++; + + if (i_line == n_line) + break; + } str[i] = 0; /* always encode, not to rip apart HTML documents, e.g. only the start of a table */ strencode(str); - } - else - { - if (equal_ustring(encoding, "plain")) - { - rsputs("
");
-        rsputs2(text);
-        rsputs("
"); - } - else - rsputs(text); + rsprintf(" \n"); + + if (equal_ustring(mode, "Threaded")) + rsprintf("\n"); + } + + colspan = n_attr_disp; + + if (select) + colspan++; + + if (equal_ustring(mode, "Full")) { + if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) { + rsprintf("", colspan); + + if (equal_ustring(encoding, "plain")) { + rsputs("
");
+            rsputs2(text);
+            rsputs("
"); + } else + rsputs(text); + + rsprintf("\n"); } - rsprintf("\n"); - } + if (!show_attachments && attachment[0][0]) { + rsprintf("", colspan); - - if ( (equal_ustring(mode, "Summary") && n_line > 0)) - { - rsprintf(""); - for (i=i_line=0 ; i\n"); - - if (equal_ustring(mode, "Threaded")) - rsprintf("\n"); - } - - colspan = n_attr_disp; - - if (select) - colspan++; - - if (equal_ustring(mode, "Full")) - { - if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) - { - rsprintf("", colspan); - - if (equal_ustring(encoding, "plain")) - { - rsputs("
");
-        rsputs2(text);
-        rsputs("
"); - } - else - rsputs(text); - - rsprintf("\n"); + if (attachment[1][0]) + rsprintf("%s: ", loc("Attachments")); + else + rsprintf("%s: ", loc("Attachment")); } - if (!show_attachments && attachment[0][0]) - { - rsprintf("", colspan); + for (index = 0; index < MAX_ATTACHMENTS; index++) { + if (attachment[index][0]) { + strcpy(str, attachment[index]); + str[13] = 0; + sprintf(ref, "../%s/%s/%s", lbs->name, str, + attachment[index] + 14); + url_encode(ref, sizeof(ref)); /* for file names with special characters like "+" */ - if (attachment[1][0]) - rsprintf("%s: ", loc("Attachments")); - else - rsprintf("%s: ", loc("Attachment")); - } + for (i = 0; i < (int) strlen(attachment[index]); i++) + str[i] = toupper(attachment[index][i]); + str[i] = 0; - for (index = 0 ; index < MAX_ATTACHMENTS ; index++) - { - if (attachment[index][0]) - { - strcpy(str, attachment[index]); - str[13] = 0; - sprintf(ref, "../%s/%s/%s", lbs->name, str, attachment[index]+14); - url_encode(ref, sizeof(ref)); /* for file names with special characters like "+" */ + if (!show_attachments) { + rsprintf("%s     ", + ref, attachment[index] + 14); + } else { + if (strstr(str, ".GIF") || + strstr(str, ".JPG") || + strstr(str, ".JPEG") || strstr(str, ".PNG")) { + rsprintf + ("%s %d: %s\n", + colspan, loc("Attachment"), index + 1, ref, + attachment[index] + 14); + if (show_attachments) + rsprintf + ("", + colspan, ref); + } else { + rsprintf + ("%s %d: %s\n", + colspan, loc("Attachment"), index + 1, ref, + attachment[index] + 14); - for (i=0 ; i<(int)strlen(attachment[index]) ; i++) - str[i] = toupper(attachment[index][i]); - str[i] = 0; + if ((strstr(str, ".TXT") || + strstr(str, ".ASC") || + strchr(str, '.') == NULL) && show_attachments) { + /* display attachment */ + rsprintf + ("
",
+                          colspan);
 
-        if (!show_attachments)
-          {
-          rsprintf("%s     ",
-                    ref, attachment[index]+14);
-          }
-        else
-          {
-          if (strstr(str, ".GIF") ||
-              strstr(str, ".JPG") ||
-              strstr(str, ".JPEG") ||
-              strstr(str, ".PNG"))
-            {
-            rsprintf("%s %d: %s\n",
-                      colspan, loc("Attachment"), index+1, ref, attachment[index]+14);
-            if (show_attachments)
-              rsprintf("", colspan, ref);
-            }
-          else
-            {
-            rsprintf("%s %d: %s\n",
-                      colspan, loc("Attachment"), index+1, ref, attachment[index]+14);
+                     strlcpy(file_name, lbs->data_dir, sizeof(file_name));
 
-            if ((strstr(str, ".TXT") ||
-                 strstr(str, ".ASC") ||
-                 strchr(str, '.') == NULL) && show_attachments)
-              {
-              /* display attachment */
-              rsprintf("
", colspan);
+                     strlcat(file_name, attachment[index],
+                             sizeof(file_name));
 
-              strlcpy(file_name, lbs->data_dir, sizeof(file_name));
+                     f = fopen(file_name, "rt");
+                     if (f != NULL) {
+                        while (!feof(f)) {
+                           str[0] = 0;
+                           fgets(str, sizeof(str), f);
+                           rsputs2(str);
+                        }
+                        fclose(f);
+                     }
 
-              strlcat(file_name, attachment[index], sizeof(file_name));
-
-              f = fopen(file_name, "rt");
-              if (f != NULL)
-                {
-                while (!feof(f))
-                  {
-                  str[0] = 0;
-                  fgets(str, sizeof(str), f);
-                  rsputs2(str);
+                     rsprintf("
\n");
                   }
-                fclose(f);
-                }
-
-              rsprintf("
\n"); - } - rsprintf("\n"); + rsprintf("\n"); + } } - } - } + } } - if (!show_attachments && attachment[0][0]) - rsprintf("\n"); - } + if (!show_attachments && attachment[0][0]) + rsprintf("\n"); + } } /*------------------------------------------------------------------*/ -void display_reply(LOGBOOK *lbs, int message_id, int printable, int expand, int n_line, - int n_attr_disp, char disp_attr[MAX_N_ATTR+4][NAME_LENGTH], int level) +void display_reply(LOGBOOK * lbs, int message_id, int printable, + int expand, int n_line, int n_attr_disp, + char disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], int level) { -char *date, *text, *in_reply_to, *reply_to, *encoding, *locked_by, *attachment, *attrib, *p; -int status, size; + char *date, *text, *in_reply_to, *reply_to, *encoding, *locked_by, + *attachment, *attrib, *p; + int status, size; - text = malloc(TEXT_SIZE); - attachment = malloc(MAX_ATTACHMENTS*MAX_PATH_LENGTH); - attrib = malloc(MAX_N_ATTR*NAME_LENGTH); - date = malloc(80); - in_reply_to = malloc(80); - reply_to = malloc(256); - encoding = malloc(80); - locked_by = malloc(256); + text = malloc(TEXT_SIZE); + attachment = malloc(MAX_ATTACHMENTS * MAX_PATH_LENGTH); + attrib = malloc(MAX_N_ATTR * NAME_LENGTH); + date = malloc(80); + in_reply_to = malloc(80); + reply_to = malloc(256); + encoding = malloc(80); + locked_by = malloc(256); - if (locked_by == NULL) - return; + if (locked_by == NULL) + return; - reply_to[0] = 0; - size = TEXT_SIZE; - status = el_retrieve(lbs, message_id, date, attr_list, (void *)attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, - (void *)attachment, encoding, locked_by); + reply_to[0] = 0; + size = TEXT_SIZE; + status = + el_retrieve(lbs, message_id, date, attr_list, (void *) attrib, + lbs->n_attr, text, &size, in_reply_to, reply_to, + (void *) attachment, encoding, locked_by); - if (status != EL_SUCCESS) - { - free(text); - free(attachment); - free(attrib); - free(date); - free(in_reply_to); - free(reply_to); - free(encoding); - free(locked_by); - return; - } + if (status != EL_SUCCESS) { + free(text); + free(attachment); + free(attrib); + free(date); + free(in_reply_to); + free(reply_to); + free(encoding); + free(locked_by); + return; + } - display_line(lbs, message_id, 0, "threaded", expand, level, printable, n_line, - FALSE, date, in_reply_to, reply_to, n_attr_disp, disp_attr, - (void *)attrib, lbs->n_attr, text, NULL, encoding, 0, NULL, locked_by); + display_line(lbs, message_id, 0, "threaded", expand, level, printable, + n_line, FALSE, date, in_reply_to, reply_to, n_attr_disp, + disp_attr, (void *) attrib, lbs->n_attr, text, NULL, + encoding, 0, NULL, locked_by); - if (reply_to[0]) - { - p = reply_to; - do - { - display_reply(lbs, atoi(p), printable, expand, n_line, n_attr_disp, disp_attr, level+1); + if (reply_to[0]) { + p = reply_to; + do { + display_reply(lbs, atoi(p), printable, expand, n_line, + n_attr_disp, disp_attr, level + 1); - while (*p && isdigit(*p)) - p++; - while (*p && (*p == ',' || *p == ' ')) - p++; - } while(*p); - } + while (*p && isdigit(*p)) + p++; + while (*p && (*p == ',' || *p == ' ')) + p++; + } while (*p); + } - free(text); - free(attachment); - free(attrib); - free(date); - free(in_reply_to); - free(reply_to); - free(encoding); - free(locked_by); + free(text); + free(attachment); + free(attrib); + free(date); + free(in_reply_to); + free(reply_to); + free(encoding); + free(locked_by); } /*------------------------------------------------------------------*/ int msg_compare(const void *m1, const void *m2) { - return stricmp(((MSG_LIST *)m1)->string, ((MSG_LIST *)m2)->string); + return stricmp(((MSG_LIST *) m1)->string, ((MSG_LIST *) m2)->string); } int msg_compare_reverse(const void *m1, const void *m2) { - return stricmp(((MSG_LIST *)m2)->string, ((MSG_LIST *)m1)->string); + return stricmp(((MSG_LIST *) m2)->string, ((MSG_LIST *) m1)->string); } /*------------------------------------------------------------------*/ char *param_in_str(char *str, char *param) { -char *p; + char *p; - p = str; - do - { - if (strstr(p, param) == NULL) - return NULL; + p = str; + do { + if (strstr(p, param) == NULL) + return NULL; - p = strstr(p, param); + p = strstr(p, param); - /* if parameter is value of another parameter, skip it */ - if (p > str+1 && *(p-1) == '=') - p += strlen(param); - else - return p; + /* if parameter is value of another parameter, skip it */ + if (p > str + 1 && *(p - 1) == '=') + p += strlen(param); + else + return p; - if (*p == 0) - return NULL; + if (*p == 0) + return NULL; - } while (1); + } while (1); } /*------------------------------------------------------------------*/ void subst_param(char *str, int size, char *param, char *value) { -int len; -char *p1, *p2, *s; + int len; + char *p1, *p2, *s; - if (!value[0]) - { - /* remove parameter */ - s = param_in_str(str, param); + if (!value[0]) { + /* remove parameter */ + s = param_in_str(str, param); + + if (s == NULL) + return; + + /* remove parameter */ + p1 = s - 1; + + for (p2 = p1 + strlen(param) + 1; *p2 && *p2 != '&'; p2++); + strlcpy(p1, p2, size - ((int) p1 - (int) str)); + + if (!strchr(str, '?') && strchr(str, '&')) + *strchr(str, '&') = '?'; - if (s == NULL) return; + } - /* remove parameter */ - p1 = s-1; + if ((p1 = param_in_str(str, param)) == NULL) { + if (strchr(str, '?')) + strlcat(str, "&", size); + else + strlcat(str, "?", size); - for (p2 = p1+strlen(param)+1 ; *p2 && *p2 != '&' ; p2++); - strlcpy(p1, p2, size - ((int)p1 - (int)str)); + strlcat(str, param, size); + strlcat(str, "=", size); + strlcat(str, value, size); + return; + } - if (!strchr(str, '?') && strchr(str, '&')) - *strchr(str, '&') = '?'; - - return; - } - - if ((p1 = param_in_str(str, param)) == NULL) - { - if (strchr(str, '?')) - strlcat(str, "&", size); - else - strlcat(str, "?", size); - - strlcat(str, param, size); - strlcat(str, "=", size); - strlcat(str, value, size); - return; - } - - p1 += strlen(param) + 1; - for (p2 = p1 ; *p2 && *p2 != '&' ; p2++); - len = (int)p2 - (int)p1; - if (len > (int)strlen(value)) - { - /* new value is shorter than old one */ - strlcpy(p1, value, size - ((int)p1 - (int)str)); - strlcpy(p1 + strlen(value), p2, size - ((int)p1 + strlen(value) - (int)str)); - } - else - { - /* new value is longer than old one */ - s = malloc(size); - strlcpy(s, p2, size); - strlcpy(p1, value, size - ((int)p1 - (int)str)); - strlcat(p1, s, size - ((int)p1 + strlen(value) - (int)str)); - free(s); - } + p1 += strlen(param) + 1; + for (p2 = p1; *p2 && *p2 != '&'; p2++); + len = (int) p2 - (int) p1; + if (len > (int) strlen(value)) { + /* new value is shorter than old one */ + strlcpy(p1, value, size - ((int) p1 - (int) str)); + strlcpy(p1 + strlen(value), p2, + size - ((int) p1 + strlen(value) - (int) str)); + } else { + /* new value is longer than old one */ + s = malloc(size); + strlcpy(s, p2, size); + strlcpy(p1, value, size - ((int) p1 - (int) str)); + strlcat(p1, s, size - ((int) p1 + strlen(value) - (int) str)); + free(s); + } } /*------------------------------------------------------------------*/ -BOOL is_user_allowed(LOGBOOK *lbs, char *command) +BOOL is_user_allowed(LOGBOOK * lbs, char *command) { -char str[1000], users[2000]; -char list[MAX_N_LIST][NAME_LENGTH]; -int i, n; + char str[1000], users[2000]; + char list[MAX_N_LIST][NAME_LENGTH]; + int i, n; - /* check for user level access */ - if (!getcfg(lbs->name, "Password file", str)) - return TRUE; - - /* check for deny */ - sprintf(str, "Deny %s", unloc(command)); - if (getcfg(lbs->name, str, users)) - { - /* check if current user in list */ - n = strbreak(users, list, MAX_N_LIST); - for (i=0 ; iname, "Admin user", str)) - { - if (strstr(str, getparam("unm")) != 0) - return TRUE; - else - return FALSE; - } - } - - /* check for allow */ - sprintf(str, "Allow %s", unloc(command)); - if (!getcfg(lbs->name, str, users)) - return TRUE; - - /* check if current user in list */ - n = strbreak(users, list, MAX_N_LIST); - for (i=0 ; iname, "Password file", str)) return TRUE; - return FALSE; + /* check for deny */ + sprintf(str, "Deny %s", unloc(command)); + if (getcfg(lbs->name, str, users)) { + /* check if current user in list */ + n = strbreak(users, list, MAX_N_LIST); + for (i = 0; i < n; i++) + if (equal_ustring(list[i], getparam("unm"))) + break; + + if (i < n) + return FALSE; + } + + /* check admin command */ + if (equal_ustring(command, loc("Admin"))) { + if (getcfg(lbs->name, "Admin user", str)) { + if (strstr(str, getparam("unm")) != 0) + return TRUE; + else + return FALSE; + } + } + + /* check for allow */ + sprintf(str, "Allow %s", unloc(command)); + if (!getcfg(lbs->name, str, users)) + return TRUE; + + /* check if current user in list */ + n = strbreak(users, list, MAX_N_LIST); + for (i = 0; i < n; i++) + if (equal_ustring(list[i], getparam("unm"))) + return TRUE; + + return FALSE; } /*------------------------------------------------------------------*/ -BOOL is_command_allowed(LOGBOOK *lbs, char *command) +BOOL is_command_allowed(LOGBOOK * lbs, char *command) { -char str[1000], menu_str[1000], other_str[1000]; -char menu_item[MAX_N_LIST][NAME_LENGTH], admin_user[80]; -int i, n; + char str[1000], menu_str[1000], other_str[1000]; + char menu_item[MAX_N_LIST][NAME_LENGTH], admin_user[80]; + int i, n; - if (command[0] == 0) - return TRUE; + if (command[0] == 0) + return TRUE; - /* check for guest access */ - if (!getcfg(lbs->name, "Guest Menu commands", menu_str) || - *getparam("unm") != 0) - getcfg(lbs->name, "Menu commands", menu_str); + /* check for guest access */ + if (!getcfg(lbs->name, "Guest Menu commands", menu_str) || + *getparam("unm") != 0) + getcfg(lbs->name, "Menu commands", menu_str); - /* default menu commands */ - if (menu_str[0] == 0) - { - strcpy(menu_str, "Back, New, Edit, Delete, Reply, Find, "); + /* default menu commands */ + if (menu_str[0] == 0) { + strcpy(menu_str, "Back, New, Edit, Delete, Reply, Find, "); - if (getcfg(lbs->name, "Password file", str)) - { - if (!getcfg(lbs->name, "Admin user", str) || - (getcfg(lbs->name, "Admin user", str) && strstr(str, getparam("unm")) != 0)) - { - strcat(menu_str, "Admin, "); - strcat(menu_str, "Change elogd.cfg"); - strcat(menu_str, ", "); - } - strcat(menu_str, "Config, Logout, "); - } - else - { - strcat(menu_str, "Config, "); + if (getcfg(lbs->name, "Password file", str)) { + if (!getcfg(lbs->name, "Admin user", str) || + (getcfg(lbs->name, "Admin user", str) + && strstr(str, getparam("unm")) != 0)) { + strcat(menu_str, "Admin, "); + strcat(menu_str, "Change elogd.cfg"); + strcat(menu_str, ", "); + } + strcat(menu_str, "Config, Logout, "); + } else { + strcat(menu_str, "Config, "); } - strcat(menu_str, "Help, "); - } - else - { - /* check for admin command */ - n = strbreak(menu_str, menu_item, MAX_N_LIST); - menu_str[0] = 0; - admin_user[0] = 0; - getcfg(lbs->name, "Admin user", admin_user); - for (i=0 ; iname, "Admin user", admin_user); + for (i = 0; i < n; i++) { + if (strcmp(menu_item[i], "Admin") == 0) { + if (strstr(admin_user, getparam("unm")) == NULL) + continue; + } + strcat(menu_str, menu_item[i]); + strcat(menu_str, ", "); } - if (strstr(admin_user, getparam("unm")) != NULL) - { - strcat(menu_str, "Change elogd.cfg"); - strcat(menu_str, ", "); + if (strstr(admin_user, getparam("unm")) != NULL) { + strcat(menu_str, "Change elogd.cfg"); + strcat(menu_str, ", "); } - } + } - /* check find menu commands */ - str[0] = 0; - if (!getcfg(lbs->name, "Guest Find Menu commands", str) || - *getparam("unm") != 0) - getcfg(lbs->name, "Find Menu commands", str); + /* check find menu commands */ + str[0] = 0; + if (!getcfg(lbs->name, "Guest Find Menu commands", str) || + *getparam("unm") != 0) + getcfg(lbs->name, "Find Menu commands", str); - if (str[0]) - strlcat(menu_str, str, sizeof(menu_str)); - else - { - strlcat(menu_str, "New, Find, Select, Last x, Help, ", sizeof(menu_str)); + if (str[0]) + strlcat(menu_str, str, sizeof(menu_str)); + else { + strlcat(menu_str, "New, Find, Select, Last x, Help, ", + sizeof(menu_str)); - if (getcfg(lbs->name, "Password file", str)) - strlcat(menu_str, "Admin, Config, Logout, ", sizeof(menu_str)); - else - strlcat(menu_str, "Config, ", sizeof(menu_str)); - } + if (getcfg(lbs->name, "Password file", str)) + strlcat(menu_str, "Admin, Config, Logout, ", sizeof(menu_str)); + else + strlcat(menu_str, "Config, ", sizeof(menu_str)); + } - strcpy(other_str, "Update, Upload, Submit, Back, Search, Save, Download, Cancel, First, Last, Previous, Next, Requested, Forgot, "); + strcpy(other_str, + "Update, Upload, Submit, Back, Search, Save, Download, Cancel, First, Last, Previous, Next, Requested, Forgot, "); - /* admin commands */ - if (getcfg(lbs->name, "Admin user", str) && - *getparam("unm") && - strstr(str, getparam("unm")) != 0) - { - strcat(other_str, "Remove user, New user, Activate, "); - } - else - if (getcfg(lbs->name, "Self register", str) && - atoi(str) > 0) - { + /* admin commands */ + if (getcfg(lbs->name, "Admin user", str) && + *getparam("unm") && strstr(str, getparam("unm")) != 0) { + strcat(other_str, "Remove user, New user, Activate, "); + } else if (getcfg(lbs->name, "Self register", str) && atoi(str) > 0) { strcat(other_str, "Remove user, New user, "); + } + + /* allow change password if "config" possible */ + if (equal_ustring(command, loc("Change password")) && + strstr(menu_str, "Config")) { + return TRUE; + } + /* exclude non-localized submit for elog */ + else if (command[0] && equal_ustring(command, "Submit")) { + return TRUE; + } + /* exclude other non-localized commands */ + else if (command[0] && equal_ustring(command, "GetMD5")) { + return TRUE; + } + /* check if command is present in the menu list */ + else if (command[0]) { + n = strbreak(menu_str, menu_item, MAX_N_LIST); + for (i = 0; i < n; i++) + if (equal_ustring(command, loc(menu_item[i]))) + break; + + if (i == n) { + n = strbreak(other_str, menu_item, MAX_N_LIST); + for (i = 0; i < n; i++) + if (equal_ustring(command, loc(menu_item[i]))) + break; + + if (i == n) + return FALSE; } + } - /* allow change password if "config" possible */ - if (equal_ustring(command, loc("Change password")) && - strstr(menu_str, "Config")) - { - return TRUE; - } - /* exclude non-localized submit for elog */ - else if (command[0] && equal_ustring(command, "Submit")) - { - return TRUE; - } - /* exclude other non-localized commands */ - else if (command[0] && equal_ustring(command, "GetMD5")) - { - return TRUE; - } - /* check if command is present in the menu list */ - else if (command[0]) - { - n = strbreak(menu_str, menu_item, MAX_N_LIST); - for (i=0 ; i\n"); - rsprintf("\n"); + rsprintf("\n\n"); + rsprintf("
\n"); + rsprintf + ("\n"); - rsprintf("\n"); + rsprintf("\n"); - if (mode_commands) - { - rsprintf("\n"); - } + rsprintf("\n"); + } - if (getcfg(lbs->name, "Quick filter", str)) - { - rsprintf("\n"); - } + rsprintf("\n"); + } - rsprintf("
\n"); + if (mode_commands) { + rsprintf("\n"); - if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) - { - if (page_n != 1) - sprintf(ref, "page%d", page_n); - else - ref[0] = 0; - build_ref(ref, sizeof(ref), "full", ""); - rsprintf(" %s |", ref, loc("Full")); + if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) { + if (page_n != 1) + sprintf(ref, "page%d", page_n); + else + ref[0] = 0; + build_ref(ref, sizeof(ref), "full", ""); + rsprintf(" %s |", ref, loc("Full")); } - if (page_n != 1) - sprintf(ref, "page%d", page_n); - else - ref[0] = 0; - build_ref(ref, sizeof(ref), "summary", ""); - rsprintf(" %s |", ref, loc("Summary")); - - if (page_n != 1) - sprintf(ref, "page%d", page_n); - else - ref[0] = 0; - build_ref(ref, sizeof(ref), "threaded", ""); - rsprintf(" %s ", ref, loc("Threaded")); - - if (threaded) - { if (page_n != 1) - sprintf(ref, "page%d", page_n); + sprintf(ref, "page%d", page_n); else - ref[0] = 0; + ref[0] = 0; + build_ref(ref, sizeof(ref), "summary", ""); + rsprintf(" %s |", ref, loc("Summary")); - cur_exp = 1; - if (getcfg(lbs->name, "Expand default", str)) - cur_exp = atoi(str); - if (isparam("expand")) - cur_exp = atoi(getparam("expand")); - - if (cur_exp > 0) - { - sprintf(str, "%d", cur_exp > 0 ? cur_exp-1 : 0); - build_ref(ref, sizeof(ref), "", str); - rsprintf("| %s ", ref, loc("Collapse")); - } + if (page_n != 1) + sprintf(ref, "page%d", page_n); else - rsprintf("| %s ", loc("Collapse")); + ref[0] = 0; + build_ref(ref, sizeof(ref), "threaded", ""); + rsprintf(" %s ", ref, loc("Threaded")); - if (cur_exp < 3) - { - if (page_n != 1) - sprintf(ref, "page%d", page_n); - else - ref[0] = 0; - sprintf(str, "%d", cur_exp < 3 ? cur_exp+1 : 3); - build_ref(ref, sizeof(ref), "", str); - rsprintf("| %s ", ref, loc("Expand")); - } - else - rsprintf("| %s ", loc("Expand")); + if (threaded) { + if (page_n != 1) + sprintf(ref, "page%d", page_n); + else + ref[0] = 0; + + cur_exp = 1; + if (getcfg(lbs->name, "Expand default", str)) + cur_exp = atoi(str); + if (isparam("expand")) + cur_exp = atoi(getparam("expand")); + + if (cur_exp > 0) { + sprintf(str, "%d", cur_exp > 0 ? cur_exp - 1 : 0); + build_ref(ref, sizeof(ref), "", str); + rsprintf("| %s ", ref, + loc("Collapse")); + } else + rsprintf("| %s ", loc("Collapse")); + + if (cur_exp < 3) { + if (page_n != 1) + sprintf(ref, "page%d", page_n); + else + ref[0] = 0; + sprintf(str, "%d", cur_exp < 3 ? cur_exp + 1 : 3); + build_ref(ref, sizeof(ref), "", str); + rsprintf("| %s ", ref, + loc("Expand")); + } else + rsprintf("| %s ", loc("Expand")); } - rsprintf("\n"); - n = strbreak(str, list, MAX_N_LIST); + if (getcfg(lbs->name, "Quick filter", str)) { + rsprintf("\n"); + n = strbreak(str, list, MAX_N_LIST); - for (index=0 ; index < n ; index++) - { - if (equal_ustring(list[index], loc("Date"))) - { - i = atoi(getparam("last")); + for (index = 0; index < n; index++) { + if (equal_ustring(list[index], loc("Date"))) { + i = atoi(getparam("last")); - rsprintf(" \n", loc("Show last")); + rsprintf(" \n", + loc("Show last")); - rsprintf("\n"); - rsprintf("
\n\n"); } /*------------------------------------------------------------------*/ -void show_page_navigation(LOGBOOK *lbs, int n_msg, int page_n, int n_page, BOOL top, BOOL mode_commands, - BOOL threaded) +void show_page_navigation(LOGBOOK * lbs, int n_msg, int page_n, int n_page, + BOOL top, BOOL mode_commands, BOOL threaded) { -int i, num_pages, skip; -char ref[256]; + int i, num_pages, skip; + char ref[256]; - if (!page_n || n_msg <= n_page) - return; + if (!page_n || n_msg <= n_page) + return; - rsprintf("\n"); + rsprintf("\n"); - rsprintf("%s \n", loc("Goto page")); + rsprintf("%s \n", loc("Goto page")); - if (page_n > 1) - { - sprintf(ref, "page%d", page_n - 1); - build_ref(ref, sizeof(ref), "", ""); - - rsprintf("%s  ", ref, loc("Previous")); - } - - if (page_n && n_msg > n_page) - { - /* number of pages */ - num_pages = (n_msg-1)/n_page+1; - skip = FALSE; - - for (i=1 ; i<=num_pages ; i++) - { - sprintf(ref, "page%d", i); + if (page_n > 1) { + sprintf(ref, "page%d", page_n - 1); build_ref(ref, sizeof(ref), "", ""); - if (i <= 3 || (i >= page_n - 1 && i <= page_n + 1) || i >= num_pages-2) - { - if (i > 1 && !skip) - rsprintf(", \n"); + rsprintf("%s  ", ref, loc("Previous")); + } - skip = FALSE; - } - else - { - if (!skip) - rsprintf(" ... "); + if (page_n && n_msg > n_page) { + /* number of pages */ + num_pages = (n_msg - 1) / n_page + 1; + skip = FALSE; - skip = TRUE; - } + for (i = 1; i <= num_pages; i++) { + sprintf(ref, "page%d", i); + build_ref(ref, sizeof(ref), "", ""); - if (skip) - continue; + if (i <= 3 || (i >= page_n - 1 && i <= page_n + 1) + || i >= num_pages - 2) { + if (i > 1 && !skip) + rsprintf(", \n"); - if (page_n == i) - rsprintf("%d", i); - else - rsprintf("%d", ref, i); + skip = FALSE; + } else { + if (!skip) + rsprintf(" ... "); - /* - if (i == num_pages ) - rsprintf("  \n"); - else - rsprintf(", "); - */ + skip = TRUE; + } + + if (skip) + continue; + + if (page_n == i) + rsprintf("%d", i); + else + rsprintf("%d", ref, i); + + /* + if (i == num_pages ) + rsprintf("  \n"); + else + rsprintf(", "); + */ } - rsprintf("  \n"); - } + rsprintf("  \n"); + } - if (page_n != -1 && n_page < n_msg && page_n * n_page < n_msg) - { - sprintf(ref, "page%d", page_n + 1); - build_ref(ref, sizeof(ref), "", ""); + if (page_n != -1 && n_page < n_msg && page_n * n_page < n_msg) { + sprintf(ref, "page%d", page_n + 1); + build_ref(ref, sizeof(ref), "", ""); - rsprintf("%s  ", ref, loc("Next")); - } + rsprintf("%s  ", ref, loc("Next")); + } - if (page_n != -1 && n_page < n_msg) - { - sprintf(ref, "page"); - build_ref(ref, sizeof(ref), "", ""); + if (page_n != -1 && n_page < n_msg) { + sprintf(ref, "page"); + build_ref(ref, sizeof(ref), "", ""); - rsprintf("%s\n", ref, loc("All")); - } + rsprintf("%s\n", ref, loc("All")); + } - rsprintf("\n"); + rsprintf("\n"); } /*------------------------------------------------------------------*/ -void show_select_navigation(LOGBOOK *lbs) +void show_select_navigation(LOGBOOK * lbs) { -int i, n_log; -char str[NAME_LENGTH]; -char lbk_list[MAX_N_LIST][NAME_LENGTH]; + int i, n_log; + char str[NAME_LENGTH]; + char lbk_list[MAX_N_LIST][NAME_LENGTH]; - rsprintf("\n"); + rsprintf("\n"); - rsprintf(" \n"); + rsprintf + (" \n"); - rsprintf("%s: \n", loc("Selected entries")); + rsprintf("%s: \n", loc("Selected entries")); - rsprintf("\n", loc("Toggle all")); + rsprintf("\n", + loc("Toggle all")); - if (!getcfg(lbs->name, "Menu commands", str) || - strstr(str, "Delete")) - { - rsprintf("\n", loc("Delete")); - } + if (!getcfg(lbs->name, "Menu commands", str) || strstr(str, "Delete")) { + rsprintf("\n", + loc("Delete")); + } - if (getcfg(lbs->name, "Menu commands", str) && - strstr(str, "Copy to")) - { - rsprintf("\n", loc("Copy to")); - rsprintf("\n", + loc("Copy to")); + rsprintf("\n"); + } - if (equal_ustring(str, "global")) - continue; + if (getcfg(lbs->name, "Menu commands", str) && strstr(str, "Move to")) { + rsprintf("\n", + loc("Move to")); + rsprintf("\n"); - } - - if (getcfg(lbs->name, "Menu commands", str) && - strstr(str, "Move to")) - { - rsprintf("\n", loc("Move to")); - rsprintf("\n"); - } + rsprintf("\n"); + } - rsprintf("\n\n"); + rsprintf("\n\n"); } /*------------------------------------------------------------------*/ -void show_elog_list(LOGBOOK *lbs, INT past_n, INT last_n, INT page_n) +void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n) { -int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line; -int current_year, current_month, current_day, printable, n_logbook, n_display, - reverse, n_attr_disp, n_msg, search_all, message_id, n_page, i_start, i_stop, - in_reply_to_id; -char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], disp_attr[MAX_N_ATTR+4][NAME_LENGTH], - list[10000], *text, *text1, *text2, - in_reply_to[80], reply_to[MAX_REPLY_TO*10], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], - encoding[80], locked_by[256]; -char str[NAME_LENGTH], ref[256], img[80], comment[NAME_LENGTH]; -char mode[80]; -char menu_str[1000], menu_item[MAX_N_LIST][NAME_LENGTH]; -char *p , *pt, *pt1, *pt2; -BOOL show_attachments, threaded, mode_commands, expand, filtering, disp_filter; -time_t ltime, ltime_start, ltime_end, now; -struct tm tms, *ptms; -MSG_LIST *msg_list; -char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -LOGBOOK *lbs_cur; + int i, j, n, index, size, status, d1, m1, y1, d2, m2, y2, n_line; + int current_year, current_month, current_day, printable, n_logbook, + n_display, reverse, n_attr_disp, n_msg, search_all, message_id, + n_page, i_start, i_stop, in_reply_to_id; + char date[80], attrib[MAX_N_ATTR][NAME_LENGTH], + disp_attr[MAX_N_ATTR + 4][NAME_LENGTH], list[10000], *text, *text1, + *text2, in_reply_to[80], reply_to[MAX_REPLY_TO * 10], + attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], + locked_by[256]; + char str[NAME_LENGTH], ref[256], img[80], comment[NAME_LENGTH]; + char mode[80]; + char menu_str[1000], menu_item[MAX_N_LIST][NAME_LENGTH]; + char *p, *pt, *pt1, *pt2; + BOOL show_attachments, threaded, mode_commands, expand, filtering, + disp_filter; + time_t ltime, ltime_start, ltime_end, now; + struct tm tms, *ptms; + MSG_LIST *msg_list; + char slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH]; + LOGBOOK *lbs_cur; - /* redirect if enpty parameters */ - if (strstr(_cmdline, "=&")) - { - while (pt1 = strstr(_cmdline, "=&")) - { - pt2 = pt1+2; - while (*pt1 != '&' && *pt1 != '?') - pt1--; - strcpy(pt1+1, pt2); + /* redirect if enpty parameters */ + if (strstr(_cmdline, "=&")) { + while (pt1 = strstr(_cmdline, "=&")) { + pt2 = pt1 + 2; + while (*pt1 != '&' && *pt1 != '?') + pt1--; + strcpy(pt1 + 1, pt2); } - if (_cmdline[strlen(_cmdline)-1] == '=') - { - pt1 = _cmdline+strlen(_cmdline)-1; - while (*pt1 != '&' && *pt1 != '?') - *pt1-- = 0; - *pt1 = 0; + if (_cmdline[strlen(_cmdline) - 1] == '=') { + pt1 = _cmdline + strlen(_cmdline) - 1; + while (*pt1 != '&' && *pt1 != '?') + *pt1-- = 0; + *pt1 = 0; } - /* add reverse=0 if not present */ - if (strstr(_cmdline, "reverse=") == NULL && - getcfg(lbs->name, "Reverse sort", str) && - atoi(str) == 1) - { - if (strchr(_cmdline, '?')) - strlcat(_cmdline, "&reverse=0", sizeof(_cmdline)); - else - strlcat(_cmdline, "?reverse=0", sizeof(_cmdline)); + /* add reverse=0 if not present */ + if (strstr(_cmdline, "reverse=") == NULL && + getcfg(lbs->name, "Reverse sort", str) && atoi(str) == 1) { + if (strchr(_cmdline, '?')) + strlcat(_cmdline, "&reverse=0", sizeof(_cmdline)); + else + strlcat(_cmdline, "?reverse=0", sizeof(_cmdline)); } - redirect(lbs, _cmdline); - return; - } + redirect(lbs, _cmdline); + return; + } - /* redirect "go" command */ - if (isparam("lastcmd")) //## and not copy to / move to / delete ... - { - strlcpy(str, getparam("lastcmd"), sizeof(str)); - url_decode(str); + /* redirect "go" command */ + if (isparam("lastcmd")) //## and not copy to / move to / delete ... + { + strlcpy(str, getparam("lastcmd"), sizeof(str)); + url_decode(str); - /* subsitute "last" in command line from new parameter */ - if (isparam("last")) - { - if (equal_ustring(getparam("last"), "_all_")) - subst_param(str, sizeof(str), "last", ""); - else - subst_param(str, sizeof(str), "last", getparam("last")); + /* subsitute "last" in command line from new parameter */ + if (isparam("last")) { + if (equal_ustring(getparam("last"), "_all_")) + subst_param(str, sizeof(str), "last", ""); + else + subst_param(str, sizeof(str), "last", getparam("last")); } - /* subsitute attributes in command line from new parameter */ - for (i=0 ; iname, "Reverse sort", str)) - reverse = atoi(str); - } + if (*getparam("Reverse")) + reverse = atoi(getparam("Reverse")); + else { + reverse = 0; + if (getcfg(lbs->name, "Reverse sort", str)) + reverse = atoi(str); + } - /* default mode */ - strcpy(mode, "Summary"); - show_attachments = FALSE; + /* default mode */ + strcpy(mode, "Summary"); + show_attachments = FALSE; - /* for page display, get mode from config file */ - if (past_n || last_n || page_n) - { - if (getcfg(lbs->name, "Display Mode", str)) - strcpy(mode, str); - if (*getparam("mode")) + /* for page display, get mode from config file */ + if (past_n || last_n || page_n) { + if (getcfg(lbs->name, "Display Mode", str)) + strcpy(mode, str); + if (*getparam("mode")) + strcpy(mode, getparam("mode")); + } else { + /* for find result, get mode from find form */ strcpy(mode, getparam("mode")); - } - else - { - /* for find result, get mode from find form */ - strcpy(mode, getparam("mode")); - if (mode[0] == 0) - strcpy(mode, "Full"); - } + if (mode[0] == 0) + strcpy(mode, "Full"); + } - /* supersede mode if in parameter */ - if (*getparam("attach")) - show_attachments = (*getparam("attach") > 0); + /* supersede mode if in parameter */ + if (*getparam("attach")) + show_attachments = (*getparam("attach") > 0); - threaded = equal_ustring(mode, "threaded"); + threaded = equal_ustring(mode, "threaded"); /*---- convert dates to ltime ----*/ - time(&now); - ptms = localtime(&now); - current_year = ptms->tm_year+1900; - current_month = ptms->tm_mon+1; - current_day = ptms->tm_mday; + time(&now); + ptms = localtime(&now); + current_year = ptms->tm_year + 1900; + current_month = ptms->tm_mon + 1; + current_day = ptms->tm_mday; - ltime_end = ltime_start = 0; + ltime_end = ltime_start = 0; - if (!past_n && !last_n) - { - if (*getparam("m1") || *getparam("y1") || *getparam("d1")) - { - /* if year not given, use current year */ - if (!*getparam("y1")) - y1 = current_year; - else - y1 = atoi(getparam("y1")); - if (y1 < 1990 || y1 > current_year) - { - sprintf(str, "Error: Year %s out of range", getparam("y1")); - show_error(str); - return; - } + if (!past_n && !last_n) { + if (*getparam("m1") || *getparam("y1") || *getparam("d1")) { + /* if year not given, use current year */ + if (!*getparam("y1")) + y1 = current_year; + else + y1 = atoi(getparam("y1")); + if (y1 < 1990 || y1 > current_year) { + sprintf(str, "Error: Year %s out of range", getparam("y1")); + show_error(str); + return; + } - /* if month not given, use current month */ - if (*getparam("m1")) - { - strcpy(str, getparam("m1")); - for (m1=0 ; m1<12 ; m1++) - if (equal_ustring(str, mname[m1])) - break; - if (m1 == 12) - m1 = 0; - m1++; - } - else - m1 = current_month; + /* if month not given, use current month */ + if (*getparam("m1")) { + strcpy(str, getparam("m1")); + for (m1 = 0; m1 < 12; m1++) + if (equal_ustring(str, mname[m1])) + break; + if (m1 == 12) + m1 = 0; + m1++; + } else + m1 = current_month; - /* if day not given, use 1 */ - if (*getparam("d1")) - d1 = atoi(getparam("d1")); - else - d1 = 1; + /* if day not given, use 1 */ + if (*getparam("d1")) + d1 = atoi(getparam("d1")); + else + d1 = 1; - memset(&tms, 0, sizeof(struct tm)); - tms.tm_year = y1 % 100; - tms.tm_mon = m1-1; - tms.tm_mday = d1; - tms.tm_hour = 0; + memset(&tms, 0, sizeof(struct tm)); + tms.tm_year = y1 % 100; + tms.tm_mon = m1 - 1; + tms.tm_mday = d1; + tms.tm_hour = 0; - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime_start = mktime(&tms); + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime_start = mktime(&tms); } - if (*getparam("m2") || *getparam("y2") || *getparam("d2")) - { - /* if year not give, use current year */ - if (*getparam("y2")) - y2 = atoi(getparam("y2")); - else - y2 = current_year; + if (*getparam("m2") || *getparam("y2") || *getparam("d2")) { + /* if year not give, use current year */ + if (*getparam("y2")) + y2 = atoi(getparam("y2")); + else + y2 = current_year; - if (y2 < 1990 || y2 > current_year) - { - sprintf(date, "%d", y2); - sprintf(str, "Error: Year %s out of range", date); - show_error(str); - return; - } + if (y2 < 1990 || y2 > current_year) { + sprintf(date, "%d", y2); + sprintf(str, "Error: Year %s out of range", date); + show_error(str); + return; + } - /* if month not given, use current month */ - if (*getparam("m2")) - { - strcpy(str, getparam("m2")); - for (m2=0 ; m2<12 ; m2++) - if (equal_ustring(str, mname[m2])) - break; - if (m2 == 12) - m2 = 0; - m2++; - } - else - m2 = current_month; + /* if month not given, use current month */ + if (*getparam("m2")) { + strcpy(str, getparam("m2")); + for (m2 = 0; m2 < 12; m2++) + if (equal_ustring(str, mname[m2])) + break; + if (m2 == 12) + m2 = 0; + m2++; + } else + m2 = current_month; - /* if day not given, use last day of month */ - if (*getparam("d2")) - d2 = atoi(getparam("d2")); - else - { - memset(&tms, 0, sizeof(struct tm)); - tms.tm_year = y2 % 100; - tms.tm_mon = m2-1+1; - tms.tm_mday = 1; - tms.tm_hour = 12; + /* if day not given, use last day of month */ + if (*getparam("d2")) + d2 = atoi(getparam("d2")); + else { + memset(&tms, 0, sizeof(struct tm)); + tms.tm_year = y2 % 100; + tms.tm_mon = m2 - 1 + 1; + tms.tm_mday = 1; + tms.tm_hour = 12; - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime = mktime(&tms); - ltime -= 3600*24; - memcpy(&tms, localtime(<ime), sizeof(struct tm)); - d2 = tms.tm_mday; - } + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime = mktime(&tms); + ltime -= 3600 * 24; + memcpy(&tms, localtime(<ime), sizeof(struct tm)); + d2 = tms.tm_mday; + } - memset(&tms, 0, sizeof(struct tm)); - tms.tm_year = y2 % 100; - tms.tm_mon = m2-1; - tms.tm_mday = d2; - tms.tm_hour = 0; - tms.tm_min = 0; - tms.tm_sec = 0; + memset(&tms, 0, sizeof(struct tm)); + tms.tm_year = y2 % 100; + tms.tm_mon = m2 - 1; + tms.tm_mday = d2; + tms.tm_hour = 0; + tms.tm_min = 0; + tms.tm_sec = 0; - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime_end = mktime(&tms); + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime_end = mktime(&tms); - /* end time is first second of next day */ - ltime_end += 3600*24; + /* end time is first second of next day */ + ltime_end += 3600 * 24; - memcpy(&tms, localtime(<ime_end), sizeof(struct tm)); - y2 = tms.tm_year + 1900; - m2 = tms.tm_mon +1; - d2 = tms.tm_mday; + memcpy(&tms, localtime(<ime_end), sizeof(struct tm)); + y2 = tms.tm_year + 1900; + m2 = tms.tm_mon + 1; + d2 = tms.tm_mday; } - } + } - if (ltime_start && ltime_end && ltime_start > ltime_end) - { - show_error(loc("Error: start date after end date")); - return; - } + if (ltime_start && ltime_end && ltime_start > ltime_end) { + show_error(loc("Error: start date after end date")); + return; + } /*---- assemble message list ----*/ - /* check for search all */ - search_all = atoi(getparam("all")); + /* check for search all */ + search_all = atoi(getparam("all")); - if (getcfg(lbs->name, "Search all logbooks", str) && atoi(str) == 0) - search_all = 0; + if (getcfg(lbs->name, "Search all logbooks", str) && atoi(str) == 0) + search_all = 0; - n_msg = 0; - n_display = 0; - if (search_all) - { - /* count logbooks */ - for (n_logbook=0 ; ; n_logbook++) - { - if (!lb_list[n_logbook].name[0]) - break; + n_msg = 0; + n_display = 0; + if (search_all) { + /* count logbooks */ + for (n_logbook = 0;; n_logbook++) { + if (!lb_list[n_logbook].name[0]) + break; - if (isparam("unm") && !check_login_user(&lb_list[n_logbook], getparam("unm"))) - continue; + if (isparam("unm") + && !check_login_user(&lb_list[n_logbook], getparam("unm"))) + continue; - n_msg += *lb_list[n_logbook].n_el_index; + n_msg += *lb_list[n_logbook].n_el_index; } - } - else - { - n_logbook = 1; - n_msg = *lbs->n_el_index; - } + } else { + n_logbook = 1; + n_msg = *lbs->n_el_index; + } - msg_list = malloc(sizeof(MSG_LIST)*n_msg); + msg_list = malloc(sizeof(MSG_LIST) * n_msg); - lbs_cur = lbs; - for (i=n=0 ; in_el_index ; j++) - { - msg_list[n].lbs = lbs_cur; - msg_list[n].index = j; - sprintf(msg_list[n].string, "%010d", lbs_cur->el_index[j].file_time); - msg_list[n].in_reply_to = lbs_cur->el_index[j].in_reply_to; - n++; + for (j = 0; j < *lbs_cur->n_el_index; j++) { + msg_list[n].lbs = lbs_cur; + msg_list[n].index = j; + sprintf(msg_list[n].string, "%010d", + lbs_cur->el_index[j].file_time); + msg_list[n].in_reply_to = lbs_cur->el_index[j].in_reply_to; + n++; } - } + } /*---- apply start/end date cut ----*/ - if (past_n) - ltime_start = now-3600*24*past_n; + if (past_n) + ltime_start = now - 3600 * 24 * past_n; - if (last_n && last_n < n_msg) - { - for (i=n_msg-last_n-1 ; i>=0 ; i--) - msg_list[i].lbs = NULL; - } + if (last_n && last_n < n_msg) { + for (i = n_msg - last_n - 1; i >= 0; i--) + msg_list[i].lbs = NULL; + } - if (ltime_start) - { - for (i=0 ; iel_index[msg_list[i].index].file_time < ltime_start) - msg_list[i].lbs = NULL; - } + if (ltime_start) { + for (i = 0; i < n_msg; i++) + if (msg_list[i].lbs && + msg_list[i].lbs->el_index[msg_list[i].index].file_time < + ltime_start) + msg_list[i].lbs = NULL; + } - if (ltime_end) - { - for (i=0 ; iel_index[msg_list[i].index].file_time > ltime_end) - msg_list[i].lbs = NULL; - } + if (ltime_end) { + for (i = 0; i < n_msg; i++) + if (msg_list[i].lbs && + msg_list[i].lbs->el_index[msg_list[i].index].file_time > + ltime_end) + msg_list[i].lbs = NULL; + } - if (isparam("last")) - { - n = atoi(getparam("last")); + if (isparam("last")) { + n = atoi(getparam("last")); - if (n > 0) - { - for (i=0 ; iel_index[msg_list[i].index].file_time < now-3600*24*n) - msg_list[i].lbs = NULL; + if (n > 0) { + for (i = 0; i < n_msg; i++) + if (msg_list[i].lbs && + msg_list[i].lbs->el_index[msg_list[i].index].file_time < + now - 3600 * 24 * n) + msg_list[i].lbs = NULL; } - } + } /*---- filter message list ----*/ - filtering = FALSE; + filtering = FALSE; - for (i=0 ; in_attr ; i++) - { - /* check if attribute filter */ - if (*getparam(attr_list[i])) - break; - - /* check if sort by attribute */ - if (equal_ustring(getparam("sort"), attr_list[i]) || - equal_ustring(getparam("rsort"), attr_list[i])) - break; - } - - /* turn on filtering if found */ - if (in_attr) - filtering = TRUE; - - if (*getparam("subtext")) - filtering = TRUE; - - text = malloc(TEXT_SIZE); - text1 = malloc(TEXT_SIZE); - text2 = malloc(TEXT_SIZE); - if (text2 == NULL) - { - show_error("Out of memory"); - return; - } - - /* do filtering */ - for (index=0 ; indexel_index[msg_list[index].index].message_id; - in_reply_to_id = msg_list[index].lbs->el_index[msg_list[index].index].in_reply_to; - - if (filtering) - { - status = el_retrieve(msg_list[index].lbs, message_id, - date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, - attachment, - encoding, locked_by); - if (status != EL_SUCCESS) - break; - } - - for (i=0 ; in_attr ; i++) - { + for (i = 0; i < lbs->n_attr; i++) { + /* check if attribute filter */ if (*getparam(attr_list[i])) - { - strcpy(str, getparam(attr_list[i])); + break; - /* if value starts with '$', substitute it */ - if (str[0] == '$') - { - j = build_subst_list(lbs, slist, svalue, attrib); - strsubst(str, slist, svalue, j); - setparam(attr_list[i], str); - } - - for (j=0 ; j<(int)strlen(str) ; j++) - str[j] = toupper(str[j]); - str[j] = 0; - for (j=0 ; j<(int)strlen(attrib[i]) ; j++) - text1[j] = toupper(attrib[i][j]); - text1[j] = 0; - - if (strstr(text1, str) == NULL) - break; - } - } - if (i < lbs->n_attr) - { - msg_list[index].lbs = NULL; - continue; - } - - if (*getparam("subtext")) - { - strcpy(str, getparam("subtext")); - for (i=0 ; i<(int)strlen(str) ; i++) - str[i] = toupper(str[i]); - str[i] = 0; - for (i=0 ; i<(int)strlen(text) ; i++) - text1[i] = toupper(text[i]); - text1[i] = 0; - - if (atoi(getparam("sall")) && strstr(text1, str) == NULL) - { - /* search text in attributes */ - for (i=0 ; in_attr ; i++) - { - for (j=0 ; j<(int)strlen(attrib[i]) ; j++) - text1[j] = toupper(attrib[i][j]); - text1[j] = 0; - - if (strstr(text1, str) != NULL) - break; - } - - if (i == lbs->n_attr) - { - msg_list[index].lbs = NULL; - continue; - } - } - else if (strstr(text1, str) == NULL) - { - msg_list[index].lbs = NULL; - continue; - } - } - - /* in threaded mode, find message head */ - if (threaded && in_reply_to_id) - { - do - { - message_id = in_reply_to_id; - - /* search index of message */ - for (i=0 ; i < *msg_list[index].lbs->n_el_index ; i++) - if (msg_list[index].lbs->el_index[i].message_id == message_id) - break; - - /* stop if not found */ - if (i == *msg_list[index].lbs->n_el_index) - break; - - in_reply_to_id = msg_list[index].lbs->el_index[i].in_reply_to; - - } while (in_reply_to_id); - - /* if head not found, skip message */ - if (i == *msg_list[index].lbs->n_el_index) - { - msg_list[index].lbs = NULL; - continue; - } - - /* check if message head already in list */ - for (j=0 ; jn_attr ; i++) - { + /* check if sort by attribute */ if (equal_ustring(getparam("sort"), attr_list[i]) || equal_ustring(getparam("rsort"), attr_list[i])) - { - strlcpy(msg_list[index].string, attrib[i], 256); - } + break; + } - if (equal_ustring(getparam("sort"), loc("ID")) || - equal_ustring(getparam("rsort"), loc("ID"))) - { - sprintf(msg_list[index].string, "%08d", message_id); - } + /* turn on filtering if found */ + if (i < lbs->n_attr) + filtering = TRUE; + + if (*getparam("subtext")) + filtering = TRUE; + + text = malloc(TEXT_SIZE); + text1 = malloc(TEXT_SIZE); + text2 = malloc(TEXT_SIZE); + if (text2 == NULL) { + show_error("Out of memory"); + return; + } + + /* do filtering */ + for (index = 0; index < n_msg; index++) { + if (!msg_list[index].lbs) + continue; + + /* retrieve message */ + size = TEXT_SIZE; + message_id = + msg_list[index].lbs->el_index[msg_list[index].index].message_id; + in_reply_to_id = + msg_list[index].lbs->el_index[msg_list[index].index].in_reply_to; + + if (filtering) { + status = el_retrieve(msg_list[index].lbs, message_id, + date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, + attachment, encoding, locked_by); + if (status != EL_SUCCESS) + break; } - if (isparam("rsort")) - reverse = 1; + for (i = 0; i < lbs->n_attr; i++) { + if (*getparam(attr_list[i])) { + strcpy(str, getparam(attr_list[i])); - if (isparam("sort")) - reverse = 0; - } + /* if value starts with '$', substitute it */ + if (str[0] == '$') { + j = build_subst_list(lbs, slist, svalue, attrib); + strsubst(str, slist, svalue, j); + setparam(attr_list[i], str); + } + + for (j = 0; j < (int) strlen(str); j++) + str[j] = toupper(str[j]); + str[j] = 0; + for (j = 0; j < (int) strlen(attrib[i]); j++) + text1[j] = toupper(attrib[i][j]); + text1[j] = 0; + + if (strstr(text1, str) == NULL) + break; + } + } + if (i < lbs->n_attr) { + msg_list[index].lbs = NULL; + continue; + } + + if (*getparam("subtext")) { + strcpy(str, getparam("subtext")); + for (i = 0; i < (int) strlen(str); i++) + str[i] = toupper(str[i]); + str[i] = 0; + for (i = 0; i < (int) strlen(text); i++) + text1[i] = toupper(text[i]); + text1[i] = 0; + + if (atoi(getparam("sall")) && strstr(text1, str) == NULL) { + /* search text in attributes */ + for (i = 0; i < lbs->n_attr; i++) { + for (j = 0; j < (int) strlen(attrib[i]); j++) + text1[j] = toupper(attrib[i][j]); + text1[j] = 0; + + if (strstr(text1, str) != NULL) + break; + } + + if (i == lbs->n_attr) { + msg_list[index].lbs = NULL; + continue; + } + } else if (strstr(text1, str) == NULL) { + msg_list[index].lbs = NULL; + continue; + } + } + + /* in threaded mode, find message head */ + if (threaded && in_reply_to_id) { + do { + message_id = in_reply_to_id; + + /* search index of message */ + for (i = 0; i < *msg_list[index].lbs->n_el_index; i++) + if (msg_list[index].lbs->el_index[i].message_id == + message_id) + break; + + /* stop if not found */ + if (i == *msg_list[index].lbs->n_el_index) + break; + + in_reply_to_id = msg_list[index].lbs->el_index[i].in_reply_to; + + } while (in_reply_to_id); + + /* if head not found, skip message */ + if (i == *msg_list[index].lbs->n_el_index) { + msg_list[index].lbs = NULL; + continue; + } + + /* check if message head already in list */ + for (j = 0; j < index; j++) + if (msg_list[j].lbs == msg_list[index].lbs && + msg_list[j].index == i) + break; + + if (j < index) { + /* set date from current message, if later */ + if (strcmp(msg_list[j].string, msg_list[index].string) < 0) + strcpy(msg_list[j].string, msg_list[index].string); + + msg_list[index].lbs = NULL; // delete current message + continue; + } else { + msg_list[index].index = i; // replace current message with message head + } + } + + /* add attribute for sorting */ + for (i = 0; i < lbs->n_attr; i++) { + if (equal_ustring(getparam("sort"), attr_list[i]) || + equal_ustring(getparam("rsort"), attr_list[i])) { + strlcpy(msg_list[index].string, attrib[i], 256); + } + + if (equal_ustring(getparam("sort"), loc("ID")) || + equal_ustring(getparam("rsort"), loc("ID"))) { + sprintf(msg_list[index].string, "%08d", message_id); + } + } + + if (isparam("rsort")) + reverse = 1; + + if (isparam("sort")) + reverse = 0; + } /*---- remove duplicate messages ----*/ - for (i=0 ; iname, "Entries per page", str)) - n_page = atoi(str); - else - n_page = 20; - if (isparam("npp")) - n_page = atoi(getparam("npp")); + n_page = 1000000; + i_start = 0; + i_stop = n_msg - 1; + if (page_n) { + if (getcfg(lbs->name, "Entries per page", str)) + n_page = atoi(str); + else + n_page = 20; + if (isparam("npp")) + n_page = atoi(getparam("npp")); - if (page_n != -1) - { - i_start = (page_n - 1) * n_page; - i_stop = i_start + n_page - 1; + if (page_n != -1) { + i_start = (page_n - 1) * n_page; + i_stop = i_start + n_page - 1; - if (i_start >= n_msg && n_msg > 0) - { - page_n = 1; - i_start = 0; - } + if (i_start >= n_msg && n_msg > 0) { + page_n = 1; + i_start = 0; + } - if (i_stop >= n_msg) - i_stop = n_msg-1; + if (i_stop >= n_msg) + i_stop = n_msg - 1; } - } + } /*---- header ----*/ - if (getcfg(lbs->name, "Summary Page Title", str)) - { - i = build_subst_list(lbs, slist, svalue, NULL); - strsubst(str, slist, svalue, i); - } - else - sprintf(str, "ELOG %s", lbs->name); + if (getcfg(lbs->name, "Summary Page Title", str)) { + i = build_subst_list(lbs, slist, svalue, NULL); + strsubst(str, slist, svalue, i); + } else + sprintf(str, "ELOG %s", lbs->name); - show_standard_header(lbs, TRUE, str, NULL); + show_standard_header(lbs, TRUE, str, NULL); /*---- title ----*/ - strcpy(str, ", "); - if (past_n == 1) - strcat(str, loc("Last day")); - else if (past_n > 1) - sprintf(str+strlen(str), loc("Last %d days"), past_n); - else if (last_n) - sprintf(str+strlen(str), loc("Last %d entries"), last_n); - else if (page_n == -1) - sprintf(str+strlen(str), loc("all entries")); - else if (page_n) - sprintf(str+strlen(str), loc("Page %d of %d"), page_n, (n_msg-1)/n_page+1); - if (strlen(str) == 2) - str[0] = 0; + strcpy(str, ", "); + if (past_n == 1) + strcat(str, loc("Last day")); + else if (past_n > 1) + sprintf(str + strlen(str), loc("Last %d days"), past_n); + else if (last_n) + sprintf(str + strlen(str), loc("Last %d entries"), last_n); + else if (page_n == -1) + sprintf(str + strlen(str), loc("all entries")); + else if (page_n) + sprintf(str + strlen(str), loc("Page %d of %d"), page_n, + (n_msg - 1) / n_page + 1); + if (strlen(str) == 2) + str[0] = 0; - if (printable) - show_standard_title(lbs->name, str, 1); - else - show_standard_title(lbs->name, str, 0); + if (printable) + show_standard_title(lbs->name, str, 1); + else + show_standard_title(lbs->name, str, 0); /*---- menu buttons ----*/ - if (!printable) - { - rsprintf("\n"); + if (!printable) { + rsprintf("\n"); - /* current command line for select command */ - strcpy(str, getparam("cmdline")); + /* current command line for select command */ + strcpy(str, getparam("cmdline")); - /* remove select switch */ - if (strstr(str, "select=1")) - { - *strstr(str, "select=1") = 0; - if (strlen(str) > 1 && - (str[strlen(str)-1] == '&' || str[strlen(str)-1] == '?')) - str[strlen(str)-1] = 0; + /* remove select switch */ + if (strstr(str, "select=1")) { + *strstr(str, "select=1") = 0; + if (strlen(str) > 1 && + (str[strlen(str) - 1] == '&' || str[strlen(str) - 1] == '?')) + str[strlen(str) - 1] = 0; } - /* store current command line as hidden parameter for page navigation */ - if (str[0] && !equal_ustring(str, "?")) - { - rsprintf("\n", str); + /* store current command line as hidden parameter for page navigation */ + if (str[0] && !equal_ustring(str, "?")) { + rsprintf("\n", str); } - if (!getcfg(lbs->name, "Guest Find menu commands", menu_str) || - *getparam("unm") != 0) - getcfg(lbs->name, "Find menu commands", menu_str); + if (!getcfg(lbs->name, "Guest Find menu commands", menu_str) || + *getparam("unm") != 0) + getcfg(lbs->name, "Find menu commands", menu_str); - /* default menu commands */ - if (menu_str[0] == 0) - { - strcpy(menu_str, "New, Find, Select, "); + /* default menu commands */ + if (menu_str[0] == 0) { + strcpy(menu_str, "New, Find, Select, "); - if (getcfg(lbs->name, "Password file", str)) - strcat(menu_str, "Config, Logout, "); - else - strcat(menu_str, "Config, "); + if (getcfg(lbs->name, "Password file", str)) + strcat(menu_str, "Config, Logout, "); + else + strcat(menu_str, "Config, "); - strcat(menu_str, "Last x, Help"); + strcat(menu_str, "Last x, Help"); } - n = strbreak(menu_str, menu_item, MAX_N_LIST); + n = strbreak(menu_str, menu_item, MAX_N_LIST); - for (i=0 ; i%s |\n", past_n*2, mode, str); - } + for (i = 0; i < n; i++) { + if (is_user_allowed(lbs, menu_item[i])) { + if (equal_ustring(menu_item[i], "Last x")) { + if (past_n) { + sprintf(str, loc("Last %d days"), past_n * 2); + rsprintf + (" %s |\n", + past_n * 2, mode, str); + } - if (last_n) - { - sprintf(str, loc("Last %d entries"), last_n*2); - rsprintf(" %s |\n", last_n*2, mode, str); - } - } - else if (equal_ustring(menu_item[i], "Select")) - { - strcpy(str, getparam("cmdline")); - if (atoi(getparam("select")) == 1) - { - /* remove select switch */ - if (strstr(str, "select=1")) - { - *strstr(str, "select=1") = 0; - if (strlen(str) > 1 && - (str[strlen(str)-1] == '&' || str[strlen(str)-1] == '?')) - str[strlen(str)-1] = 0; - } - } - else - { - /* add select switch */ - if (strchr(str, '?')) - strcat(str, "&select=1"); - else - strcat(str, "?select=1"); - } - rsprintf(" %s |\n", str, loc("Select")); - } - else - { - strcpy(str, loc(menu_item[i])); - url_encode(str, sizeof(str)); + if (last_n) { + sprintf(str, loc("Last %d entries"), last_n * 2); + rsprintf + (" %s |\n", + last_n * 2, mode, str); + } + } else if (equal_ustring(menu_item[i], "Select")) { + strcpy(str, getparam("cmdline")); + if (atoi(getparam("select")) == 1) { + /* remove select switch */ + if (strstr(str, "select=1")) { + *strstr(str, "select=1") = 0; + if (strlen(str) > 1 && + (str[strlen(str) - 1] == '&' + || str[strlen(str) - 1] == '?')) + str[strlen(str) - 1] = 0; + } + } else { + /* add select switch */ + if (strchr(str, '?')) + strcat(str, "&select=1"); + else + strcat(str, "?select=1"); + } + rsprintf(" %s |\n", str, + loc("Select")); + } else { + strcpy(str, loc(menu_item[i])); + url_encode(str, sizeof(str)); - if (i < n-1) - rsprintf(" %s |\n", str, loc(menu_item[i])); - else - rsprintf(" %s \n", str, loc(menu_item[i])); - } - } + if (i < n - 1) + rsprintf(" %s |\n", + str, loc(menu_item[i])); + else + rsprintf(" %s \n", str, + loc(menu_item[i])); + } + } } - rsprintf("\n\n"); - } + rsprintf("\n\n"); + } /*---- find menu text ----*/ - if (getcfg(lbs->name, "find menu text", str) && !printable) - { - FILE *f; - char file_name[256], *buf; + if (getcfg(lbs->name, "find menu text", str) && !printable) { + FILE *f; + char file_name[256], *buf; - rsprintf("\n"); + rsprintf("\n"); - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); } - f = fopen(file_name, "rb"); - if (f != NULL) - { - fseek(f, 0, SEEK_END); - size = TELL(fileno(f)); - fseek(f, 0, SEEK_SET); + f = fopen(file_name, "rb"); + if (f != NULL) { + fseek(f, 0, SEEK_END); + size = TELL(fileno(f)); + fseek(f, 0, SEEK_SET); - buf = malloc(size+1); - fread(buf, 1, size, f); - buf[size] = 0; - fclose(f); + buf = malloc(size + 1); + fread(buf, 1, size, f); + buf[size] = 0; + fclose(f); - rsputs(buf); + rsputs(buf); - } - else - rsprintf("
Error: file \"%s\" not found
", file_name); + } else + rsprintf + ("
Error: file \"%s\" not found
", + file_name); - rsprintf(""); - } + rsprintf(""); + } /*---- display filters ----*/ - disp_filter = *getparam("m1") || *getparam("y1") || *getparam("d1") || - *getparam("m2") || *getparam("y2") || *getparam("d2") || *getparam("subtext"); + disp_filter = *getparam("m1") || *getparam("y1") || *getparam("d1") || + *getparam("m2") || *getparam("y2") || *getparam("d2") + || *getparam("subtext"); - for (i=0 ; in_attr ; i++) - if (*getparam(attr_list[i])) - disp_filter = TRUE; - - if (disp_filter) - { - rsprintf("\n"); - rsprintf("\n"); - - if (*getparam("m1") || *getparam("y1") || *getparam("d1")) - { - rsprintf("", loc("Start date")); - rsprintf("", mname[m1-1], d1, y1); - } - - if (*getparam("m2") || *getparam("y2") || *getparam("d2")) - { - /* calculate previous day */ - memset(&tms, 0, sizeof(struct tm)); - tms.tm_year = y2 % 100; - tms.tm_mon = m2-1; - tms.tm_mday = d2; - tms.tm_hour = 12; - - if (tms.tm_year < 90) - tms.tm_year += 100; - ltime = mktime(&tms); - ltime -= 3600*24; - memcpy(&tms, localtime(<ime), sizeof(struct tm)); - - rsprintf("", loc("End date")); - rsprintf("", - mname[tms.tm_mon], tms.tm_mday, tms.tm_year + 1900); - } - - for (i=0 ; in_attr ; i++) - { + for (i = 0; i < lbs->n_attr; i++) if (*getparam(attr_list[i])) - { - comment[0] = 0; - if (attr_flags[i] & AF_ICON) - { - sprintf(str, "Icon comment %s", getparam(attr_list[i])); - getcfg(lbs->name, str, comment); - } + disp_filter = TRUE; - if (comment[0] == 0) - strcpy(comment, getparam(attr_list[i])); + if (disp_filter) { + rsprintf("\n\n"); - } + for (i = 0; i < lbs->n_attr; i++) { + if (*getparam(attr_list[i])) { + comment[0] = 0; + if (attr_flags[i] & AF_ICON) { + sprintf(str, "Icon comment %s", getparam(attr_list[i])); + getcfg(lbs->name, str, comment); + } - /* get number of summary lines */ - n_line = 3; - if (getcfg(lbs->name, "Summary lines", str)) - n_line = atoi(str); + if (comment[0] == 0) + strcpy(comment, getparam(attr_list[i])); - /* get mode commands flag */ - mode_commands = TRUE; - if (getcfg(lbs->name, "Mode commands", str) && atoi(str) == 0) - mode_commands = FALSE; + rsprintf + ("", + attr_list[i]); + rsprintf("", comment); + } + } + + if (*getparam("subtext")) { + rsprintf + ("", + loc("Text")); + rsprintf + ("", + getparam("subtext")); + } + + rsprintf("
%s:%s %d, %d
%s:%s %d, %d
\n"); + rsprintf + ("\n"); - rsprintf("", - attr_list[i]); - rsprintf("", comment); - } + if (*getparam("m1") || *getparam("y1") || *getparam("d1")) { + rsprintf + ("", + loc("Start date")); + rsprintf("", + mname[m1 - 1], d1, y1); } - if (*getparam("subtext")) - { - rsprintf("", loc("Text")); - rsprintf("", - getparam("subtext")); + if (*getparam("m2") || *getparam("y2") || *getparam("d2")) { + /* calculate previous day */ + memset(&tms, 0, sizeof(struct tm)); + tms.tm_year = y2 % 100; + tms.tm_mon = m2 - 1; + tms.tm_mday = d2; + tms.tm_hour = 12; + + if (tms.tm_year < 90) + tms.tm_year += 100; + ltime = mktime(&tms); + ltime -= 3600 * 24; + memcpy(&tms, localtime(<ime), sizeof(struct tm)); + + rsprintf + ("", + loc("End date")); + rsprintf("", + mname[tms.tm_mon], tms.tm_mday, tms.tm_year + 1900); } - rsprintf("
%s:%s
%s:%s %d, %d
%s:%s
%s:%s %d, %d
%s:%s
%s:%s
\n\n"); + } + + /* get number of summary lines */ + n_line = 3; + if (getcfg(lbs->name, "Summary lines", str)) + n_line = atoi(str); + + /* get mode commands flag */ + mode_commands = TRUE; + if (getcfg(lbs->name, "Mode commands", str) && atoi(str) == 0) + mode_commands = FALSE; /*---- page navigation ----*/ - if (!printable) - { - show_page_filters(lbs, n_msg, page_n, n_page, TRUE, mode_commands, threaded); - show_page_navigation(lbs, n_msg, page_n, n_page, TRUE, mode_commands, threaded); - } + if (!printable) { + show_page_filters(lbs, n_msg, page_n, n_page, TRUE, mode_commands, + threaded); + show_page_navigation(lbs, n_msg, page_n, n_page, TRUE, mode_commands, + threaded); + } /*---- select navigation ----*/ - if (atoi(getparam("select")) == 1) - show_select_navigation(lbs); + if (atoi(getparam("select")) == 1) + show_select_navigation(lbs); /*---- table titles ----*/ - /* overall listing table */ - rsprintf("\n"); + /* overall listing table */ + rsprintf + ("
\n"); - size = printable ? 2 : 3; + size = printable ? 2 : 3; - list[0] = 0; - if (!getcfg(lbs->name, "List display", list)) /* new 2.3.10 format */ - getcfg(lbs->name, "Display search", list); /* old 2.3.9 format */ + list[0] = 0; + if (!getcfg(lbs->name, "List display", list)) /* new 2.3.10 format */ + getcfg(lbs->name, "Display search", list); /* old 2.3.9 format */ - if (list[0]) - n_attr_disp = strbreak(list, disp_attr, MAX_N_ATTR); - else - { - if (search_all) - { - n_attr_disp = lbs->n_attr + 3; + if (list[0]) + n_attr_disp = strbreak(list, disp_attr, MAX_N_ATTR); + else { + if (search_all) { + n_attr_disp = lbs->n_attr + 3; - strcpy(disp_attr[0], loc("ID")); - strcpy(disp_attr[1], loc("Logbook")); - strcpy(disp_attr[2], loc("Date")); - memcpy(disp_attr+3, attr_list, sizeof(attr_list)); + strcpy(disp_attr[0], loc("ID")); + strcpy(disp_attr[1], loc("Logbook")); + strcpy(disp_attr[2], loc("Date")); + memcpy(disp_attr + 3, attr_list, sizeof(attr_list)); + } else { + n_attr_disp = lbs->n_attr + 2; + + strcpy(disp_attr[0], loc("ID")); + strcpy(disp_attr[1], loc("Date")); + memcpy(disp_attr + 2, attr_list, sizeof(attr_list)); } - else - { - n_attr_disp = lbs->n_attr + 2; + } - strcpy(disp_attr[0], loc("ID")); - strcpy(disp_attr[1], loc("Date")); - memcpy(disp_attr+2, attr_list, sizeof(attr_list)); - } - } + if (threaded) { + } else { + rsprintf("\n"); - if (threaded) - { - } - else - { - rsprintf("\n"); + /* empty title for selection box */ + if (atoi(getparam("select")) == 1) + rsprintf("\n"); - /* empty title for selection box */ - if (atoi(getparam("select")) == 1) - rsprintf("\n"); + for (i = 0; i < n_attr_disp; i++) { + /* assemble current command line, replace sort statements */ + strcpy(ref, getparam("cmdline")); + if (strstr(ref, "&sort=")) { + p = strstr(ref, "&sort=") + 1; + while (*p && *p != '&') + p++; + strcpy(strstr(ref, "&sort="), p); + } + if (strstr(ref, "&rsort=")) { + p = strstr(ref, "&rsort=") + 1; + while (*p && *p != '&') + p++; + strcpy(strstr(ref, "&rsort="), p); + } + if (strstr(ref, "?sort=")) + *strstr(ref, "?sort=") = 0; + if (strstr(ref, "?rsort=")) + *strstr(ref, "?rsort=") = 0; - for (i=0 ; i"); + else if (strcmp(getparam("rsort"), disp_attr[i]) == 0) + strcpy(img, ""); - img[0] = 0; - if (strcmp(getparam("sort"), disp_attr[i]) == 0) - strcpy(img, ""); - else if (strcmp(getparam("rsort"), disp_attr[i]) == 0) - strcpy(img, ""); - - rsprintf("\n", - ref, disp_attr[i], img); + rsprintf("\n", + ref, disp_attr[i], img); } - if (!equal_ustring(mode, "Full") && n_line > 0) - rsprintf("\n"); + if (!equal_ustring(mode, "Full") && n_line > 0) + rsprintf("\n"); - rsprintf("\n\n"); - } + rsprintf("\n\n"); + } /*---- display message list ----*/ - for (index=i_start ; index<=i_stop ; index++) - { - size = TEXT_SIZE; - message_id = msg_list[index].lbs->el_index[msg_list[index].index].message_id; + for (index = i_start; index <= i_stop; index++) { + size = TEXT_SIZE; + message_id = + msg_list[index].lbs->el_index[msg_list[index].index].message_id; - status = el_retrieve(msg_list[index].lbs, message_id, - date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, - attachment, - encoding, locked_by); - if (status != EL_SUCCESS) - break; + status = el_retrieve(msg_list[index].lbs, message_id, + date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, + attachment, encoding, locked_by); + if (status != EL_SUCCESS) + break; /*---- add highlighting for searched subtext ----*/ - if (*getparam("subtext")) - { - strcpy(str, getparam("subtext")); - for (i=0 ; i<(int)strlen(str) ; i++) - str[i] = toupper(str[i]); + if (*getparam("subtext")) { + strcpy(str, getparam("subtext")); + for (i = 0; i < (int) strlen(str); i++) + str[i] = toupper(str[i]); - for (i=0 ; i<(int)strlen(text) ; i++) - text1[i] = toupper(text[i]); - text1[i] = 0; + for (i = 0; i < (int) strlen(text); i++) + text1[i] = toupper(text[i]); + text1[i] = 0; - text2[0] = 0; - pt = text; /* original text */ - pt1 = text1; /* upper-case text */ - pt2 = text2; /* text with inserted coloring */ - do - { - p = strstr(pt1, str); - size = (int)(p - pt1); - if (p != NULL) - { - pt1 = p+strlen(str); + text2[0] = 0; + pt = text; /* original text */ + pt1 = text1; /* upper-case text */ + pt2 = text2; /* text with inserted coloring */ + do { + p = strstr(pt1, str); + size = (int) (p - pt1); + if (p != NULL) { + pt1 = p + strlen(str); - /* copy first part original text */ - memcpy(pt2, pt, size); - pt2 += size; - pt += size; + /* copy first part original text */ + memcpy(pt2, pt, size); + pt2 += size; + pt += size; - /* add coloring 1st part */ + /* add coloring 1st part */ - /* here: \001='<', \002='>', /003='"', and \004=' ' */ - /* see also rsputs2(char* ) */ + /* here: \001='<', \002='>', /003='"', and \004=' ' */ + /* see also rsputs2(char* ) */ - if (equal_ustring(encoding, "plain") || !equal_ustring(mode, "Full")) - strcpy(pt2, "\001B\004style=\003color:black;background-color:#ffff66\003\002"); - else - strcpy(pt2, ""); + if (equal_ustring(encoding, "plain") + || !equal_ustring(mode, "Full")) + strcpy(pt2, + "\001B\004style=\003color:black;background-color:#ffff66\003\002"); + else + strcpy(pt2, + ""); - pt2 += strlen(pt2); + pt2 += strlen(pt2); - /* copy origial search text */ - memcpy(pt2, pt, strlen(str)); - pt2 += strlen(str); - pt += strlen(str); + /* copy origial search text */ + memcpy(pt2, pt, strlen(str)); + pt2 += strlen(str); + pt += strlen(str); - /* add coloring 2nd part */ - if (equal_ustring(encoding, "plain") || !equal_ustring(mode, "Full")) - strcpy(pt2, "\001/B\002"); - else - strcpy(pt2, ""); - pt2 += strlen(pt2); - } - } while (p != NULL); + /* add coloring 2nd part */ + if (equal_ustring(encoding, "plain") + || !equal_ustring(mode, "Full")) + strcpy(pt2, "\001/B\002"); + else + strcpy(pt2, ""); + pt2 += strlen(pt2); + } + } while (p != NULL); - strcpy(pt2, pt); - strcpy(text, text2); + strcpy(pt2, pt); + strcpy(text, text2); } /*---- display line ----*/ - expand = 1; - if (threaded) - { - if (getcfg(lbs->name, "Expand default", str)) - expand = atoi(str); + expand = 1; + if (threaded) { + if (getcfg(lbs->name, "Expand default", str)) + expand = atoi(str); - if (isparam("expand")) - expand = atoi(getparam("expand")); + if (isparam("expand")) + expand = atoi(getparam("expand")); } - display_line(msg_list[index].lbs, message_id, - index, mode, expand, 0, printable, n_line, - show_attachments, date, in_reply_to, reply_to, n_attr_disp, disp_attr, - attrib, lbs->n_attr, text, attachment, encoding, atoi(getparam("select")), - &n_display, locked_by); + display_line(msg_list[index].lbs, message_id, + index, mode, expand, 0, printable, n_line, + show_attachments, date, in_reply_to, reply_to, + n_attr_disp, disp_attr, attrib, lbs->n_attr, text, + attachment, encoding, atoi(getparam("select")), + &n_display, locked_by); - if (threaded) - { - if (reply_to[0] && expand > 0) - { - p = reply_to; - do - { - display_reply(msg_list[index].lbs, atoi(p), printable, expand, n_line, - n_attr_disp, disp_attr, 1); + if (threaded) { + if (reply_to[0] && expand > 0) { + p = reply_to; + do { + display_reply(msg_list[index].lbs, atoi(p), printable, + expand, n_line, n_attr_disp, disp_attr, 1); - while (*p && isdigit(*p)) - p++; - while (*p && (*p == ',' || *p == ' ')) - p++; - } while(*p); - } + while (*p && isdigit(*p)) + p++; + while (*p && (*p == ',' || *p == ' ')) + p++; + } while (*p); + } } - } + } - rsprintf("
  %s%s%s%sTextText
\n"); + rsprintf("
\n"); - if (n_display) - rsprintf("\n", n_display); + if (n_display) + rsprintf("\n", n_display); - rsprintf("\n"); + rsprintf("\n"); - if (n_msg == 0) - rsprintf("%s", loc("No entries found")); + if (n_msg == 0) + rsprintf("%s", + loc("No entries found")); /*---- page navigation ----*/ - if (!printable) - show_page_navigation(lbs, n_msg, page_n, n_page, FALSE, FALSE, threaded); + if (!printable) + show_page_navigation(lbs, n_msg, page_n, n_page, FALSE, FALSE, + threaded); - rsprintf("\n"); + rsprintf("\n"); /*---- bottom text ----*/ - if (getcfg(lbs->name, "bottom text", str)) - { - FILE *f; - char file_name[256], *buf; + if (getcfg(lbs->name, "bottom text", str)) { + FILE *f; + char file_name[256], *buf; - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); } - f = fopen(file_name, "rb"); - if (f != NULL) - { - fseek(f, 0, SEEK_END); - size = TELL(fileno(f)); - fseek(f, 0, SEEK_SET); + f = fopen(file_name, "rb"); + if (f != NULL) { + fseek(f, 0, SEEK_END); + size = TELL(fileno(f)); + fseek(f, 0, SEEK_SET); - buf = malloc(size+1); - fread(buf, 1, size, f); - buf[size] = 0; - fclose(f); + buf = malloc(size + 1); + fread(buf, 1, size, f); + buf[size] = 0; + fclose(f); - rsputs(buf); - } - else - rsprintf("
Error: file \"%s\" not found
", file_name); - } - else - /* add little logo */ - rsprintf("
ELOG V%s
", VERSION); + rsputs(buf); + } else + rsprintf + ("
Error: file \"%s\" not found
", + file_name); + } else + /* add little logo */ + rsprintf + ("
ELOG V%s
", + VERSION); - rsprintf("\r\n"); + rsprintf("\r\n"); - free(msg_list); - free(text); - free(text1); - free(text2); + free(msg_list); + free(text); + free(text1); + free(text2); } /*------------------------------------------------------------------*/ -int compose_email(LOGBOOK *lbs, char *mail_to, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], - char *mail_param, int old_mail, char att_file[MAX_ATTACHMENTS][256]) +int compose_email(LOGBOOK * lbs, char *mail_to, int message_id, + char attrib[MAX_N_ATTR][NAME_LENGTH], char *mail_param, + int old_mail, char att_file[MAX_ATTACHMENTS][256]) { -int i, j, k, n, flags, status; -char str[NAME_LENGTH+100], str2[256], mail_from[256], *mail_text, smtp_host[256], subject[256]; -char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -char list[MAX_PARAM][NAME_LENGTH], url[256], comment[256]; + int i, j, k, n, flags, status; + char str[NAME_LENGTH + 100], str2[256], mail_from[256], *mail_text, + smtp_host[256], subject[256]; + char slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH]; + char list[MAX_PARAM][NAME_LENGTH], url[256], comment[256]; - if (!getcfg("global", "SMTP host", smtp_host)) - { - show_error(loc("No SMTP host defined in [global] section of configuration file")); - return 0; - } + if (!getcfg("global", "SMTP host", smtp_host)) { + show_error(loc + ("No SMTP host defined in [global] section of configuration file")); + return 0; + } - flags = 63; - if (getcfg(lbs->name, "Email format", str)) - flags = atoi(str); + flags = 63; + if (getcfg(lbs->name, "Email format", str)) + flags = atoi(str); - if (getcfg(lbs->name, "Use Email from", mail_from)) - { - j = build_subst_list(lbs, slist, svalue, attrib); - strsubst(mail_from, slist, svalue, j); - if (strncmp(mail_from, "mailto:", 7) == 0) - strcpy(mail_from, mail_from+7); - } - else - sprintf(mail_from, "ELog@%s", host_name); + if (getcfg(lbs->name, "Use Email from", mail_from)) { + j = build_subst_list(lbs, slist, svalue, attrib); + strsubst(mail_from, slist, svalue, j); + if (strncmp(mail_from, "mailto:", 7) == 0) + strcpy(mail_from, mail_from + 7); + } else + sprintf(mail_from, "ELog@%s", host_name); - mail_text = malloc(TEXT_SIZE+1000); - mail_text[0] = 0; + mail_text = malloc(TEXT_SIZE + 1000); + mail_text[0] = 0; - if (flags & 1) - { - if (getcfg(lbs->name, "Use Email heading", str)) - { - sprintf(mail_text+strlen(mail_text), str); + if (flags & 1) { + if (getcfg(lbs->name, "Use Email heading", str)) { + sprintf(mail_text + strlen(mail_text), str); + } else { + if (old_mail) + sprintf(mail_text + strlen(mail_text), + loc("A old entry has been updated on %s"), host_name); + else + sprintf(mail_text + strlen(mail_text), + loc("A new entry has been submitted on %s"), + host_name); } - else - { + + sprintf(mail_text + strlen(mail_text), "\r\n\r\n"); + } + + if (flags & 32) + sprintf(mail_text + strlen(mail_text), "%s : %s\r\n", + loc("Logbook"), lbs->name); + + if (flags & 2) { + for (j = 0; j < lbs->n_attr; j++) { + strcpy(str, + " "); + memcpy(str, attr_list[j], strlen(attr_list[j])); + + comment[0] = 0; + if (attr_flags[j] & AF_ICON) { + sprintf(str2, "Icon comment %s", attrib[j]); + getcfg(lbs->name, str2, comment); + } + if (!comment[0]) + strcpy(comment, attrib[j]); + + if (equal_ustring(attr_options[j][0], "boolean")) + strcpy(comment, atoi(attrib[j]) ? loc("Yes") : loc("No")); + + for (k = strlen(str) - 1; k > 0; k--) + if (str[k] != ' ') + break; + + if (k < 20) + sprintf(str + 20, ": %s\r\n", comment); + else + sprintf(str + k + 1, ": %s\r\n", comment); + + strcpy(mail_text + strlen(mail_text), str); + } + } + + /* compose subject from attributes */ + if (getcfg(lbs->name, "Use Email Subject", subject)) { + j = build_subst_list(lbs, slist, svalue, attrib); + strsubst(subject, slist, svalue, j); + } else { if (old_mail) - sprintf(mail_text+strlen(mail_text), loc("A old entry has been updated on %s"), host_name); + strcpy(subject, "Updated ELOG entry"); else - sprintf(mail_text+strlen(mail_text), loc("A new entry has been submitted on %s"), host_name); + strcpy(subject, "New ELOG entry"); + } + + /* try to get URL from referer */ + + if (!getcfg("global", "URL", str)) { + if (referer[0]) + strcpy(str, referer); + else { + if (tcp_port == 80) + sprintf(str, "http://%s/", host_name); + else + sprintf(str, "http://%s:%d/", host_name, tcp_port); + strcat(str, lbs->name); + strcat(str, "/"); } + } else { + strlcat(str, lbs->name_enc, sizeof(str)); + strlcat(str, "/", sizeof(str)); + } - sprintf(mail_text+strlen(mail_text), "\r\n\r\n"); - } + sprintf(url, "%s%d", str, message_id); - if (flags & 32) - sprintf(mail_text+strlen(mail_text), "%s : %s\r\n", loc("Logbook"), lbs->name); + if (flags & 4) { + sprintf(mail_text + strlen(mail_text), "\r\n%s URL : %s\r\n", + loc("Logbook"), url); + } - if (flags & 2) - { - for (j=0 ; jn_attr ; j++) - { - strcpy(str, " "); - memcpy(str, attr_list[j], strlen(attr_list[j])); + if (flags & 8) { + if (*getparam("text")) + sprintf(mail_text + strlen(mail_text), + "\r\n=================================\r\n\r\n%s", + getparam("text")); + } - comment[0] = 0; - if (attr_flags[j] & AF_ICON) - { - sprintf(str2, "Icon comment %s", attrib[j]); - getcfg(lbs->name, str2, comment); - } - if (!comment[0]) - strcpy(comment, attrib[j]); - - if (equal_ustring(attr_options[j][0], "boolean")) - strcpy(comment, atoi(attrib[j]) ? loc("Yes") : loc("No")); - - for (k=strlen(str)-1 ; k>0 ; k--) - if (str[k] != ' ') - break; - - if (k < 20) - sprintf(str+20, ": %s\r\n", comment); + status = 0; + if (flags & 16) { + if (getcfg(lbs->name, "Omit Email to", str) && atoi(str) == 1) + status = + sendmail(lbs, smtp_host, mail_from, mail_to, subject, + mail_text, FALSE, url, att_file); else - sprintf(str+k+1, ": %s\r\n", comment); - - strcpy(mail_text+strlen(mail_text), str); - } - } - - /* compose subject from attributes */ - if (getcfg(lbs->name, "Use Email Subject", subject)) - { - j = build_subst_list(lbs, slist, svalue, attrib); - strsubst(subject, slist, svalue, j); - } - else - { - if (old_mail) - strcpy(subject, "Updated ELOG entry"); - else - strcpy(subject, "New ELOG entry"); - } - - /* try to get URL from referer */ - - if (!getcfg("global", "URL", str)) - { - if (referer[0]) - strcpy(str, referer); - else - { - if (tcp_port == 80) - sprintf(str, "http://%s/", host_name); + status = + sendmail(lbs, smtp_host, mail_from, mail_to, subject, + mail_text, TRUE, url, att_file); + } else { + if (getcfg(lbs->name, "Omit Email to", str) && atoi(str) == 1) + status = + sendmail(lbs, smtp_host, mail_from, mail_to, subject, + mail_text, FALSE, url, NULL); else - sprintf(str, "http://%s:%d/", host_name, tcp_port); - strcat(str, lbs->name); - strcat(str, "/"); - } - } - else - { - strlcat(str, lbs->name_enc, sizeof(str)); - strlcat(str, "/", sizeof(str)); - } + status = + sendmail(lbs, smtp_host, mail_from, mail_to, subject, + mail_text, TRUE, url, NULL); + } - sprintf(url, "%s%d", str, message_id); - - if (flags & 4) - { - sprintf(mail_text+strlen(mail_text), "\r\n%s URL : %s\r\n", - loc("Logbook"), url); - } - - if (flags & 8) - { - if (*getparam("text")) - sprintf(mail_text+strlen(mail_text), "\r\n=================================\r\n\r\n%s", - getparam("text")); - } - - status = 0; - if (flags & 16) - { - if (getcfg(lbs->name, "Omit Email to", str) && atoi(str) == 1) - status = sendmail(lbs, smtp_host, mail_from, mail_to, subject, mail_text, FALSE, url, att_file); - else - status = sendmail(lbs, smtp_host, mail_from, mail_to, subject, mail_text, TRUE, url, att_file); - } - else - { - if (getcfg(lbs->name, "Omit Email to", str) && atoi(str) == 1) - status = sendmail(lbs, smtp_host, mail_from, mail_to, subject, mail_text, FALSE, url, NULL); - else - status = sendmail(lbs, smtp_host, mail_from, mail_to, subject, mail_text, TRUE, url, NULL); - } - - if (status < 0) - { - sprintf(str, loc("Error sending Email via \"%s\""), smtp_host); - url_encode(str, sizeof(str)); - sprintf(mail_param, "?error=%s", str); - } - else - { - if (!getcfg(lbs->name, "Display email recipients", str) || - atoi(str) == 1) - { - if (mail_param[0] == 0) - strcpy(mail_param, "?"); - else - strcat(mail_param, "&"); - - n = strbreak(mail_to, list, MAX_PARAM); - - if (n < 10) - { - for (i=0 ; i\"%s\""), + smtp_host); + url_encode(str, sizeof(str)); + sprintf(mail_param, "?error=%s", str); + } else { + if (!getcfg(lbs->name, "Display email recipients", str) || + atoi(str) == 1) { + if (mail_param[0] == 0) + strcpy(mail_param, "?"); + else strcat(mail_param, "&"); - } - } - else - { - sprintf(str, "%d%%20%s", n, loc("recipients")); - sprintf(mail_param+strlen(mail_param), "mail0=%s", str); - } + + n = strbreak(mail_to, list, MAX_PARAM); + + if (n < 10) { + for (i = 0; i < n && i < MAX_PARAM; i++) { + sprintf(mail_param + strlen(mail_param), "mail%d=%s", i, + list[i]); + if (i < n - 1) + strcat(mail_param, "&"); + } + } else { + sprintf(str, "%d%%20%s", n, loc("recipients")); + sprintf(mail_param + strlen(mail_param), "mail0=%s", str); + } } - } + } - free(mail_text); + free(mail_text); - return status; + return status; } /*------------------------------------------------------------------*/ -int execute_shell(LOGBOOK *lbs, int message_id, +int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LENGTH], char *sh_cmd) { -int i; -char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -char shell_cmd[1000]; + int i; + char slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH]; + char shell_cmd[1000]; - if (!enable_execute) - { - printf("Shell execution not enabled via -x flag.\n"); - return SUCCESS; - } + if (!enable_execute) { + printf("Shell execution not enabled via -x flag.\n"); + return SUCCESS; + } - strlcpy(shell_cmd, sh_cmd, sizeof(shell_cmd)); + strlcpy(shell_cmd, sh_cmd, sizeof(shell_cmd)); - i = build_subst_list(lbs, slist, svalue, attrib); - - /* add message id */ - strcpy(slist[i], "Message ID"); - sprintf(svalue[i++], "%d", message_id); + i = build_subst_list(lbs, slist, svalue, attrib); - strsubst(shell_cmd, slist, svalue, i); + /* add message id */ + strcpy(slist[i], "Message ID"); + sprintf(svalue[i++], "%d", message_id); - logf(lbs, "SHELL \"%s\"", shell_cmd); + strsubst(shell_cmd, slist, svalue, i); - system(shell_cmd); + logf(lbs, "SHELL \"%s\"", shell_cmd); - return SUCCESS; + system(shell_cmd); + + return SUCCESS; } /*------------------------------------------------------------------*/ -void submit_elog(LOGBOOK *lbs) +void submit_elog(LOGBOOK * lbs) { -char str[1000], str2[1000], file_name[256], error[1000], date[80], + char str[1000], str2[1000], file_name[256], error[1000], date[80], mail_list[MAX_N_LIST][NAME_LENGTH], list[10000], - attrib[MAX_N_ATTR][NAME_LENGTH], subst_str[MAX_PATH_LENGTH], in_reply_to[80], - reply_to[MAX_REPLY_TO*10], user[256], user_email[256], email_notify[256]; -char mail_param[1000], *mail_to; -char att_file[MAX_ATTACHMENTS][256]; -char slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH]; -int i, j, n, missing, first, index, mindex, suppress, message_id, resubmit_orig, mail_to_size; + attrib[MAX_N_ATTR][NAME_LENGTH], subst_str[MAX_PATH_LENGTH], + in_reply_to[80], reply_to[MAX_REPLY_TO * 10], user[256], + user_email[256], email_notify[256]; + char mail_param[1000], *mail_to; + char att_file[MAX_ATTACHMENTS][256]; + char slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH]; + int i, j, n, missing, first, index, mindex, suppress, message_id, + resubmit_orig, mail_to_size; - /* check for required attributs */ - missing = 0; - for (i=0 ; in_attr ; i++) - if (attr_flags[i] & AF_REQUIRED) - { - if ((attr_flags[i] & AF_MULTI) == 0 && *getparam(attr_list[i]) == 0) - { - missing = 1; - break; - } - if ((attr_flags[i] & AF_MULTI)) - { - for (j=0 ; jn_attr; i++) + if (attr_flags[i] & AF_REQUIRED) { + if ((attr_flags[i] & AF_MULTI) == 0 + && *getparam(attr_list[i]) == 0) { + missing = 1; break; - } - - if (j == MAX_N_LIST) - { - missing = 1; - break; - } - } - } - - if (missing) - { - sprintf(error, ""); - sprintf(error+strlen(error), loc("Error: Attribute %s not supplied"), attr_list[i]); - sprintf(error+strlen(error), ".

\n"); - sprintf(error+strlen(error), loc("Please go back and enter the %s field"), attr_list[i]); - strcat(error, ".\n"); - - show_error(error); - return; - } - - /* get attachments */ - for (i=0 ; in_attr ; i++) - { - if (attr_flags[i] & AF_MULTI) - { - attrib[i][0] = 0; - first = 1; - for (j=0 ; jname, str, subst_str)) - { - strsubst(subst_str, slist, svalue, n); - strcpy(attrib[i], subst_str); - } + if (missing) { + sprintf(error, ""); + sprintf(error + strlen(error), + loc("Error: Attribute %s not supplied"), + attr_list[i]); + sprintf(error + strlen(error), ".

\n"); + sprintf(error + strlen(error), + loc("Please go back and enter the %s field"), + attr_list[i]); + strcat(error, ".\n"); + + show_error(error); + return; + } + + /* get attachments */ + for (i = 0; i < MAX_ATTACHMENTS; i++) { + sprintf(str, "attachment%d", i); + strcpy(att_file[i], getparam(str)); + } + + /* compile substitution list */ + n = build_subst_list(lbs, slist, svalue, NULL); + + /* retrieve attributes */ + for (i = 0; i < lbs->n_attr; i++) { + if (attr_flags[i] & AF_MULTI) { + attrib[i][0] = 0; + first = 1; + for (j = 0; j < MAX_N_LIST; j++) { + sprintf(str, "%s#%d", attr_list[i], j); + if (getparam(str)) { + if (*getparam(str)) { + if (first) + first = 0; + else + strlcat(attrib[i], " | ", NAME_LENGTH); + if (strlen(attrib[i]) + strlen(getparam(str)) < + NAME_LENGTH - 2) + strlcat(attrib[i], getparam(str), NAME_LENGTH); + else + break; + } + } else + break; + } + } else { + strlcpy(attrib[i], getparam(attr_list[i]), NAME_LENGTH); + + /* strip trailing "{...}" */ + if (strchr(attrib[i], '{') && strchr(attrib[i], '}')) + *strchr(attrib[i], '{') = 0; } - } - message_id = 0; - reply_to[0] = 0; - in_reply_to[0] = 0; - date[0] = 0; - resubmit_orig = 0; - - if (*getparam("edit_id") && - *getparam("resubmit") && - atoi(getparam("resubmit")) == 1) - { - resubmit_orig = atoi(getparam("edit_id")); - - /* get old links */ - el_retrieve(lbs, resubmit_orig, NULL, NULL, NULL, 0, - NULL, 0, in_reply_to, reply_to, NULL, NULL, NULL); - - /* if not message head, move all preceeding messages */ - /* outcommented, users want only resubmitted message occur at end (see what's new) - if (in_reply_to[0]) - { - do - { - resubmit_orig = atoi(in_reply_to); - el_retrieve(lbs, resubmit_orig, NULL, NULL, NULL, 0, - NULL, 0, in_reply_to, reply_to, NULL, NULL); - } while (in_reply_to[0]); + if (!*getparam("edit_id")) { + sprintf(str, "Subst %s", attr_list[i]); + if (getcfg(lbs->name, str, subst_str)) { + strsubst(subst_str, slist, svalue, n); + strcpy(attrib[i], subst_str); + } } - */ + } + + message_id = 0; + reply_to[0] = 0; + in_reply_to[0] = 0; + date[0] = 0; + resubmit_orig = 0; + + if (*getparam("edit_id") && + *getparam("resubmit") && atoi(getparam("resubmit")) == 1) { + resubmit_orig = atoi(getparam("edit_id")); + + /* get old links */ + el_retrieve(lbs, resubmit_orig, NULL, NULL, NULL, 0, + NULL, 0, in_reply_to, reply_to, NULL, NULL, NULL); + + /* if not message head, move all preceeding messages */ + /* outcommented, users want only resubmitted message occur at end (see what's new) + if (in_reply_to[0]) + { + do + { + resubmit_orig = atoi(in_reply_to); + el_retrieve(lbs, resubmit_orig, NULL, NULL, NULL, 0, + NULL, 0, in_reply_to, reply_to, NULL, NULL); + } while (in_reply_to[0]); + } + */ - message_id = atoi(getparam("edit_id")); - strcpy(in_reply_to, ""); - strcpy(reply_to, ""); - date[0] = 0; - } - else - { - if (*getparam("edit_id")) - { message_id = atoi(getparam("edit_id")); strcpy(in_reply_to, ""); strcpy(reply_to, ""); - strcpy(date, ""); - } - else - strcpy(in_reply_to, getparam("reply_to")); - } + date[0] = 0; + } else { + if (*getparam("edit_id")) { + message_id = atoi(getparam("edit_id")); + strcpy(in_reply_to, ""); + strcpy(reply_to, ""); + strcpy(date, ""); + } else + strcpy(in_reply_to, getparam("reply_to")); + } - if (_logging_level > 1 && message_id) - logf(lbs, "EDIT message #%d", message_id); + if (_logging_level > 1 && message_id) + logf(lbs, "EDIT message #%d", message_id); - message_id = el_submit(lbs, message_id, date, attr_list, attrib, lbs->n_attr, getparam("text"), - in_reply_to, reply_to, *getparam("html") ? "HTML" : "plain", - att_file, TRUE, NULL); + message_id = + el_submit(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + getparam("text"), in_reply_to, reply_to, + *getparam("html") ? "HTML" : "plain", att_file, TRUE, + NULL); - if (message_id <= 0) - { - sprintf(str, loc("New message cannot be written to directory \"%s\""), lbs->data_dir); - strcat(str, "\n

"); - strcat(str, loc("Please check that it exists and elogd has write access")); - show_error(str); - return; - } + if (message_id <= 0) { + sprintf(str, + loc("New message cannot be written to directory \"%s\""), + lbs->data_dir); + strcat(str, "\n

"); + strcat(str, + loc + ("Please check that it exists and elogd has write access")); + show_error(str); + return; + } - if (_logging_level > 1 && !*getparam("edit_id")) - logf(lbs, "NEW message #%d", message_id); - - /* resubmit thread if requested */ - if (resubmit_orig) - message_id = el_move_message_thread(lbs, resubmit_orig); + if (_logging_level > 1 && !*getparam("edit_id")) + logf(lbs, "NEW message #%d", message_id); + + /* resubmit thread if requested */ + if (resubmit_orig) + message_id = el_move_message_thread(lbs, resubmit_orig); /*---- email notifications ----*/ - suppress = atoi(getparam("suppress")); + suppress = atoi(getparam("suppress")); - /* check for mail submissions */ - mail_param[0] = 0; - mail_to = malloc(256); - mail_to[0] = 0; - mail_to_size = 256; + /* check for mail submissions */ + mail_param[0] = 0; + mail_to = malloc(256); + mail_to[0] = 0; + mail_to_size = 256; - if (suppress) - { - strcpy(mail_param, "?suppress=1"); - } - else - { - if (!(*getparam("edit_id") && getcfg(lbs->name, "Suppress Email on edit", str) && atoi(str) == 1)) - { - /* go throuch "Email xxx" in configuration file */ - for (index=mindex=0 ; index <= lbs->n_attr ; index++) - { - if (index < lbs->n_attr) - { - strcpy(str, "Email "); - if (strchr(attr_list[index], ' ')) - sprintf(str+strlen(str), "\"%s\"", attr_list[index]); - else - strlcat(str, attr_list[index], sizeof(str)); - strcat(str, " "); + if (suppress) { + strcpy(mail_param, "?suppress=1"); + } else { + if (!(*getparam("edit_id") + && getcfg(lbs->name, "Suppress Email on edit", str) + && atoi(str) == 1)) { + /* go throuch "Email xxx" in configuration file */ + for (index = mindex = 0; index <= lbs->n_attr; index++) { + if (index < lbs->n_attr) { + strcpy(str, "Email "); + if (strchr(attr_list[index], ' ')) + sprintf(str + strlen(str), "\"%s\"", attr_list[index]); + else + strlcat(str, attr_list[index], sizeof(str)); + strcat(str, " "); - if (attr_flags[index] & AF_MULTI) - { - sprintf(str2, "%s#%d", attr_list[index], mindex); + if (attr_flags[index] & AF_MULTI) { + sprintf(str2, "%s#%d", attr_list[index], mindex); - mindex++; - if (mindex == MAX_N_LIST) - mindex = 0; - else - index--; /* repeat this loop */ + mindex++; + if (mindex == MAX_N_LIST) + mindex = 0; + else + index--; /* repeat this loop */ + } else + strcpy(str2, attr_list[index]); + + if (strchr(getparam(str2), ' ')) + sprintf(str + strlen(str), "\"%s\"", getparam(str2)); + else + strlcat(str, getparam(str2), sizeof(str)); + } else + sprintf(str, "Email ALL"); + + if (getcfg(lbs->name, str, list)) { + n = strbreak(list, mail_list, MAX_N_LIST); + + if (verbose) + printf("\n%s to %s\n\n", str, list); + + for (i = 0; i < n; i++) { + j = build_subst_list(lbs, slist, svalue, attrib); + strsubst(mail_list[i], slist, svalue, j); + + if ((int) strlen(mail_to) + (int) strlen(mail_list[i]) >= + mail_to_size) { + mail_to_size += 256; + mail_to = realloc(mail_to, mail_to_size); + } + strcat(mail_to, mail_list[i]); + strcat(mail_to, ","); + } } - else - strcpy(str2, attr_list[index]); + } - if (strchr(getparam(str2), ' ')) - sprintf(str+strlen(str), "\"%s\"", getparam(str2)); - else - strlcat(str, getparam(str2), sizeof(str)); - } - else - sprintf(str, "Email ALL"); + if (!getcfg(lbs->name, "Suppress Email to users", str) || + atoi(str) == 0) { + /* go through password file */ + for (index = 0;; index++) { + if (!enum_user_line(lbs, index, user)) + break; - if (getcfg(lbs->name, str, list)) - { - n = strbreak(list, mail_list, MAX_N_LIST); + get_user_line(lbs->name, user, NULL, NULL, user_email, + email_notify); - if (verbose) - printf("\n%s to %s\n\n", str, list); + if (email_notify[0]) { + /* check if user has access to this logbook */ + if (!check_login_user(lbs, user)) + continue; - for (i=0 ; i= mail_to_size) - { - mail_to_size += 256; - mail_to = realloc(mail_to, mail_to_size); - } - strcat(mail_to, mail_list[i]); - strcat(mail_to, ","); + if ((int) strlen(mail_to) + (int) strlen(user_email) >= + mail_to_size) { + mail_to_size += 256; + mail_to = realloc(mail_to, mail_to_size); + } + strcat(mail_to, user_email); + strcat(mail_to, ","); + } } - } - } - - if (!getcfg(lbs->name, "Suppress Email to users", str) || - atoi(str) == 0) - { - /* go through password file */ - for (index=0 ; ; index++) - { - if (!enum_user_line(lbs, index, user)) - break; - - get_user_line(lbs->name, user, NULL, NULL, user_email, email_notify); - - if (email_notify[0]) - { - /* check if user has access to this logbook */ - if (!check_login_user(lbs, user)) - continue; - - if ((int)strlen(mail_to) + (int)strlen(user_email) >= mail_to_size) - { - mail_to_size += 256; - mail_to = realloc(mail_to, mail_to_size); - } - strcat(mail_to, user_email); - strcat(mail_to, ","); - } - } - } + } } - } + } - if (strlen(mail_to) > 0) - { - mail_to[strlen(mail_to)-1] = 0; /* strip last ',' */ - if (compose_email(lbs, mail_to, message_id, attrib, mail_param, *getparam("edit_id"), att_file) == 0) - return; - } + if (strlen(mail_to) > 0) { + mail_to[strlen(mail_to) - 1] = 0; /* strip last ',' */ + if (compose_email + (lbs, mail_to, message_id, attrib, mail_param, + *getparam("edit_id"), att_file) == 0) + return; + } - free(mail_to); + free(mail_to); /*---- shell execution ----*/ - if (!atoi(getparam("shell_suppress"))) - { - if (!*getparam("edit_id")) - { - if (getcfg(lbs->name, "Execute new", str)) - execute_shell(lbs, message_id, attrib, str); + if (!atoi(getparam("shell_suppress"))) { + if (!*getparam("edit_id")) { + if (getcfg(lbs->name, "Execute new", str)) + execute_shell(lbs, message_id, attrib, str); + } else { + if (getcfg(lbs->name, "Execute edit", str)) + execute_shell(lbs, message_id, attrib, str); } - else - { - if (getcfg(lbs->name, "Execute edit", str)) - execute_shell(lbs, message_id, attrib, str); - } - } + } /*---- custom submit page ----*/ - if (getcfg(lbs->name, "Submit page", str)) - { - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); + if (getcfg(lbs->name, "Submit page", str)) { + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); } - send_file_direct(file_name); - return; - } + send_file_direct(file_name); + return; + } - sprintf(str, "%d%s", message_id, mail_param); - redirect(lbs, str); + sprintf(str, "%d%s", message_id, mail_param); + redirect(lbs, str); } /*------------------------------------------------------------------*/ -void copy_to(LOGBOOK *lbs, int src_id, char *dest_logbook, int move, int orig_id) +void copy_to(LOGBOOK * lbs, int src_id, char *dest_logbook, int move, + int orig_id) { -int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, source_id, message_id; -char str[256], file_name[MAX_PATH_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH]; -char date[80], *text, msg_str[32], in_reply_to[80], reply_to[MAX_REPLY_TO*10], - attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], - *buffer, list[MAX_N_ATTR][NAME_LENGTH]; -LOGBOOK *lbs_dest; + int size, i, n, n_done, n_done_reply, n_reply, index, status, fh, + source_id, message_id; + char str[256], file_name[MAX_PATH_LENGTH], + attrib[MAX_N_ATTR][NAME_LENGTH]; + char date[80], *text, msg_str[32], in_reply_to[80], + reply_to[MAX_REPLY_TO * 10], + attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], + locked_by[256], *buffer, list[MAX_N_ATTR][NAME_LENGTH]; + LOGBOOK *lbs_dest; - for (i=0 ; lb_list[i].name[0] ; i++) - if (equal_ustring(lb_list[i].name, dest_logbook)) - break; - if (!lb_list[i].name[0]) - return; - lbs_dest = &lb_list[i]; - - if (src_id) - n = 1; - else - n = atoi(getparam("nsel")); - - text = malloc(TEXT_SIZE); - - n_done = n_done_reply = 0; - for (index=0 ; indexn_attr, - text, &size, in_reply_to, reply_to, - attachment, encoding, locked_by); - - if (status != EL_SUCCESS) - { - sprintf(msg_str, "%d", source_id); - sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name); - show_error(str); - free(text); + for (i = 0; lb_list[i].name[0]; i++) + if (equal_ustring(lb_list[i].name, dest_logbook)) + break; + if (!lb_list[i].name[0]) return; + lbs_dest = &lb_list[i]; + + if (src_id) + n = 1; + else + n = atoi(getparam("nsel")); + + text = malloc(TEXT_SIZE); + + n_done = n_done_reply = 0; + for (index = 0; index < n; index++) { + if (src_id) + source_id = src_id; + else { + sprintf(str, "s%d", index); + if (!isparam(str)) + continue; + + source_id = atoi(getparam(str)); } - if (orig_id == 0) - { - /* search message head */ - while (atoi(in_reply_to) > 0) - { - source_id = atoi(in_reply_to); - size = TEXT_SIZE; - status = el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr, - text, &size, in_reply_to, reply_to, - attachment, encoding, locked_by); + /* get message */ + size = TEXT_SIZE; + status = + el_retrieve(lbs, source_id, date, attr_list, attrib, lbs->n_attr, + text, &size, in_reply_to, reply_to, attachment, + encoding, locked_by); - if (status != EL_SUCCESS) - { - sprintf(msg_str, "%d", source_id); - sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), msg_str, lbs->name); - show_error(str); - free(text); - return; - } - } + if (status != EL_SUCCESS) { + sprintf(msg_str, "%d", source_id); + sprintf(str, loc("Message %s cannot be read from logbook \"%s\""), + msg_str, lbs->name); + show_error(str); + free(text); + return; + } + + if (orig_id == 0) { + /* search message head */ + while (atoi(in_reply_to) > 0) { + source_id = atoi(in_reply_to); + size = TEXT_SIZE; + status = + el_retrieve(lbs, source_id, date, attr_list, attrib, + lbs->n_attr, text, &size, in_reply_to, + reply_to, attachment, encoding, locked_by); + + if (status != EL_SUCCESS) { + sprintf(msg_str, "%d", source_id); + sprintf(str, + loc + ("Message %s cannot be read from logbook \"%s\""), + msg_str, lbs->name); + show_error(str); + free(text); + return; + } + } } - /* read attachments */ - for (i=0 ; idata_dir, sizeof(file_name)); - strlcat(file_name, attachment[i], sizeof(file_name)); + /* read attachments */ + for (i = 0; i < MAX_ATTACHMENTS; i++) + if (attachment[i][0]) { + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, attachment[i], sizeof(file_name)); - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - size = TELL(fh); - lseek(fh, 0, SEEK_SET); + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + size = TELL(fh); + lseek(fh, 0, SEEK_SET); - buffer = malloc(size); + buffer = malloc(size); - if (buffer) - read(fh, buffer, size); + if (buffer) + read(fh, buffer, size); - close(fh); + close(fh); - /* stip date/time from file name */ - strlcpy(file_name, attachment[i]+14, NAME_LENGTH); + /* stip date/time from file name */ + strlcpy(file_name, attachment[i] + 14, NAME_LENGTH); - el_submit_attachment(lbs_dest, file_name, buffer, size, - attachment[i]); + el_submit_attachment(lbs_dest, file_name, buffer, size, + attachment[i]); - if (buffer) - free(buffer); - } - else - /* attachment is invalid */ - attachment[i][0] = 0; - } + if (buffer) + free(buffer); + } else + /* attachment is invalid */ + attachment[i][0] = 0; + } - /* if called recursively (for threads), put in correct in_reply_to */ - str[0] = 0; - if (orig_id) - sprintf(str, "%d", orig_id); + /* if called recursively (for threads), put in correct in_reply_to */ + str[0] = 0; + if (orig_id) + sprintf(str, "%d", orig_id); - /* submit in destination logbook without links, submit all attributes from - the source logbook even if the destination has a differnt number of attributes */ + /* submit in destination logbook without links, submit all attributes from + the source logbook even if the destination has a differnt number of attributes */ - message_id = el_submit(lbs_dest, 0, date, attr_list, attrib, lbs->n_attr, text, - str, "", encoding, - attachment, TRUE, NULL); + message_id = + el_submit(lbs_dest, 0, date, attr_list, attrib, lbs->n_attr, + text, str, "", encoding, attachment, TRUE, NULL); - if (message_id <= 0) - { - sprintf(str, loc("New message cannot be written to directory \"%s\""), lbs_dest->data_dir); - strcat(str, "\n

"); - strcat(str, loc("Please check that it exists and elogd has write access")); - show_error(str); - free(text); + if (message_id <= 0) { + sprintf(str, + loc("New message cannot be written to directory \"%s\""), + lbs_dest->data_dir); + strcat(str, "\n

"); + strcat(str, + loc + ("Please check that it exists and elogd has write access")); + show_error(str); + free(text); + return; + } + + n_done++; + + /* submit all replies */ + n_reply = strbreak(reply_to, list, MAX_N_ATTR); + for (i = 0; i < n_reply; i++) { + copy_to(lbs, atoi(list[i]), dest_logbook, move, message_id); + } + + n_done_reply += n_reply; + + /* delete original message for move */ + if (move && orig_id == 0) { + el_delete_message(lbs, source_id, TRUE, NULL, TRUE, TRUE); + + /* check if this was the last message */ + source_id = el_search_message(lbs, EL_NEXT, source_id, FALSE); + + /* if yes, force display of new last message */ + if (source_id <= 0) + source_id = el_search_message(lbs, EL_LAST, 0, FALSE); + } + } + + free(text); + + if (orig_id) return; + + /* display status message */ + sprintf(str, "%d", source_id); + show_standard_header(lbs, FALSE, loc("Copy ELog entry"), str); + + rsprintf(""); + rsprintf("\n"); + if (src_id) + rsprintf + ("\n", + loc("Go to"), lbs->name, source_id, lbs->name); + else { + strcpy(str, getparam("lastcmd")); + url_decode(str); - if (move) - rsprintf(loc("moved successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name); - else - rsprintf(loc("copied successfully from \"%s\" to \"%s\""), lbs->name, lbs_dest->name); - } + rsprintf + ("\n", + loc("Go to"), lbs->name, str, lbs->name); + } - rsprintf("\n"); - if (src_id) - rsprintf("\n", - loc("Go to"), lbs->name, source_id, lbs->name); - else - { - strcpy(str, getparam("lastcmd")); - url_decode(str); + rsprintf + ("\n", + loc("Go to"), lbs_dest->name, lbs_dest->name); - rsprintf("\n", - loc("Go to"), lbs->name, str, lbs->name); - } + rsprintf("
\n"); + + if (n_done == 0) + rsprintf(loc("No message selected")); + else { + if (n_done == 1) + rsprintf(loc("One message")); + else + rsprintf(loc("%d messages"), n_done); + + if (n_done_reply) { + rsprintf(" "); + + if (n_done == 1) + rsprintf(loc("and its replies")); + else + rsprintf(loc("and their replies")); } - n_done++; - - /* submit all replies */ - n_reply = strbreak(reply_to, list, MAX_N_ATTR); - for (i=0 ; i"); - rsprintf("
\n"); - - if (n_done == 0) - rsprintf(loc("No message selected")); - else - { - if (n_done == 1) - rsprintf(loc("One message")); - else - rsprintf(loc("%d messages"), n_done); - - if (n_done_reply) - { rsprintf(" "); - if (n_done == 1) - rsprintf(loc("and its replies")); + if (move) + rsprintf(loc("moved successfully from \"%s\" to \"%s\""), + lbs->name, lbs_dest->name); else - rsprintf(loc("and their replies")); - } + rsprintf(loc("copied successfully from \"%s\" to \"%s\""), + lbs->name, lbs_dest->name); + } - rsprintf(" "); + rsprintf("
%s %s
%s %s
%s %s
%s %s
%s %s
\n"); + rsprintf("\r\n"); - rsprintf("%s %s\n", - loc("Go to"), lbs_dest->name, lbs_dest->name); - - rsprintf("\n"); - rsprintf("\r\n"); - - return; + return; } /*------------------------------------------------------------------*/ -void show_elog_message(LOGBOOK *lbs, char *dec_path, char *command) +void show_elog_message(LOGBOOK * lbs, char *dec_path, char *command) { -int size, i, j, n, n_log, status, fh, length, message_error, index; -int message_id, orig_message_id, format_flags[MAX_N_ATTR]; -char str[1000], ref[256], file_name[256], attrib[MAX_N_ATTR][NAME_LENGTH]; -char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256], - orig_tag[80], reply_tag[MAX_REPLY_TO*10], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], - encoding[80], locked_by[256], att[256], lattr[256]; -char menu_item[MAX_N_LIST][NAME_LENGTH], format[80], admin_user[80], - slist[MAX_N_ATTR+10][NAME_LENGTH], svalue[MAX_N_ATTR+10][NAME_LENGTH], *p; -char lbk_list[MAX_N_LIST][NAME_LENGTH], comment[256], class_name[80], class_value[80], - fl[8][NAME_LENGTH]; -FILE *f; -BOOL first; + int size, i, j, n, n_log, status, fh, length, message_error, index; + int message_id, orig_message_id, format_flags[MAX_N_ATTR]; + char str[1000], ref[256], file_name[256], + attrib[MAX_N_ATTR][NAME_LENGTH]; + char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256], + orig_tag[80], reply_tag[MAX_REPLY_TO * 10], + attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], + locked_by[256], att[256], lattr[256]; + char menu_item[MAX_N_LIST][NAME_LENGTH], format[80], admin_user[80], + slist[MAX_N_ATTR + 10][NAME_LENGTH], + svalue[MAX_N_ATTR + 10][NAME_LENGTH], *p; + char lbk_list[MAX_N_LIST][NAME_LENGTH], comment[256], class_name[80], + class_value[80], fl[8][NAME_LENGTH]; + FILE *f; + BOOL first; - message_id = atoi(dec_path); - message_error = EL_SUCCESS; - _current_message_id = message_id; + message_id = atoi(dec_path); + message_error = EL_SUCCESS; + _current_message_id = message_id; - /* check for guest access */ - if (!getcfg(lbs->name, "Guest Menu commands", menu_str) || - *getparam("unm") != 0) - getcfg(lbs->name, "Menu commands", menu_str); + /* check for guest access */ + if (!getcfg(lbs->name, "Guest Menu commands", menu_str) || + *getparam("unm") != 0) + getcfg(lbs->name, "Menu commands", menu_str); - /* default menu commands */ - if (menu_str[0] == 0) - { - strcpy(menu_str, "Back, New, Edit, Delete, Reply, Find, "); + /* default menu commands */ + if (menu_str[0] == 0) { + strcpy(menu_str, "Back, New, Edit, Delete, Reply, Find, "); - if (getcfg(lbs->name, "Password file", str)) - { - strcat(menu_str, "Config, Logout, "); - } - else - { - strcat(menu_str, "Config, "); + if (getcfg(lbs->name, "Password file", str)) { + strcat(menu_str, "Config, Logout, "); + } else { + strcat(menu_str, "Config, "); } - strcat(menu_str, "Help"); - } - else - { - /* check for admin command */ - n = strbreak(menu_str, menu_item, MAX_N_LIST); - menu_str[0] = 0; - admin_user[0] = 0; - getcfg(lbs->name, "Admin user", admin_user); - for (i=0 ; iname, "Admin user", admin_user); + for (i = 0; i < n; i++) { + if (strcmp(menu_item[i], "Admin") == 0) { + if (strstr(admin_user, getparam("unm")) == NULL) + continue; + } + strcat(menu_str, menu_item[i]); + if (i < n - 1) + strcat(menu_str, ", "); } - } + } /*---- check next/previous message -------------------------------*/ - if (equal_ustring(command, loc("Next")) || equal_ustring(command, loc("Previous")) || - equal_ustring(command, loc("Last")) || equal_ustring(command, loc("First"))) - { - orig_message_id = message_id; + if (equal_ustring(command, loc("Next")) + || equal_ustring(command, loc("Previous")) + || equal_ustring(command, loc("Last")) + || equal_ustring(command, loc("First"))) { + orig_message_id = message_id; - if (equal_ustring(command, loc("Last"))) - message_id = el_search_message(lbs, EL_LAST, 0, FALSE); + if (equal_ustring(command, loc("Last"))) + message_id = el_search_message(lbs, EL_LAST, 0, FALSE); - if (equal_ustring(command, loc("First"))) - message_id = el_search_message(lbs, EL_FIRST, 0, FALSE); + if (equal_ustring(command, loc("First"))) + message_id = el_search_message(lbs, EL_FIRST, 0, FALSE); - if (!message_id) - { - redirect(lbs, ""); - return; + if (!message_id) { + redirect(lbs, ""); + return; } - first = TRUE; - do - { - if (equal_ustring(command, loc("Next"))) - message_id = el_search_message(lbs, EL_NEXT, message_id, FALSE); + first = TRUE; + do { + if (equal_ustring(command, loc("Next"))) + message_id = + el_search_message(lbs, EL_NEXT, message_id, FALSE); - if (equal_ustring(command, loc("Previous"))) - message_id = el_search_message(lbs, EL_PREV, message_id, FALSE); + if (equal_ustring(command, loc("Previous"))) + message_id = + el_search_message(lbs, EL_PREV, message_id, FALSE); - if (!first) - { - if (equal_ustring(command, loc("First"))) - message_id = el_search_message(lbs, EL_NEXT, message_id, FALSE); + if (!first) { + if (equal_ustring(command, loc("First"))) + message_id = + el_search_message(lbs, EL_NEXT, message_id, FALSE); - if (equal_ustring(command, loc("Last"))) - message_id = el_search_message(lbs, EL_PREV, message_id, FALSE); - } - else - first = FALSE; + if (equal_ustring(command, loc("Last"))) + message_id = + el_search_message(lbs, EL_PREV, message_id, FALSE); + } else + first = FALSE; - if (message_id == 0) - { - if (equal_ustring(command, loc("Next"))) - message_error = EL_LAST_MSG; - else - message_error = EL_FIRST_MSG; + if (message_id == 0) { + if (equal_ustring(command, loc("Next"))) + message_error = EL_LAST_MSG; + else + message_error = EL_FIRST_MSG; - message_id = orig_message_id; - break; - } - - size = sizeof(text); - el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, - text, &size, orig_tag, reply_tag, - attachment, encoding, locked_by); - - /* check for locked attributes */ - for (i=0 ; in_attr ; i++) - { - sprintf(lattr, "l%s", attr_list[i]); - if (*getparam(lattr) == '1' && !equal_ustring(getparam(attr_list[i]), attrib[i])) - break; - } - if (i < lbs->n_attr) - continue; - - /* check for attribute filter if not browsing */ - if (!*getparam("browsing")) - { - for (i=0 ; in_attr ; i++) - { - if (*getparam(attr_list[i]) && !equal_ustring(getparam(attr_list[i]), attrib[i])) + message_id = orig_message_id; break; - } - if (i < lbs->n_attr) - continue; - } + } - sprintf(str, "%d", message_id); + size = sizeof(text); + el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, + text, &size, orig_tag, reply_tag, + attachment, encoding, locked_by); - for (i=0 ; in_attr ; i++) - { - sprintf(lattr, "l%s", attr_list[i]); - if (*getparam(lattr) == '1') - { - if (strchr(str, '?') == NULL) - sprintf(str+strlen(str), "?%s=1", lattr); - else - sprintf(str+strlen(str), "&%s=1", lattr); - } - } + /* check for locked attributes */ + for (i = 0; i < lbs->n_attr; i++) { + sprintf(lattr, "l%s", attr_list[i]); + if (*getparam(lattr) == '1' + && !equal_ustring(getparam(attr_list[i]), attrib[i])) + break; + } + if (i < lbs->n_attr) + continue; - redirect(lbs, str); - return; + /* check for attribute filter if not browsing */ + if (!*getparam("browsing")) { + for (i = 0; i < lbs->n_attr; i++) { + if (*getparam(attr_list[i]) + && !equal_ustring(getparam(attr_list[i]), attrib[i])) + break; + } + if (i < lbs->n_attr) + continue; + } + + sprintf(str, "%d", message_id); + + for (i = 0; i < lbs->n_attr; i++) { + sprintf(lattr, "l%s", attr_list[i]); + if (*getparam(lattr) == '1') { + if (strchr(str, '?') == NULL) + sprintf(str + strlen(str), "?%s=1", lattr); + else + sprintf(str + strlen(str), "&%s=1", lattr); + } + } + + redirect(lbs, str); + return; } while (TRUE); - } + } /*---- check for valid URL ---------------------------------------*/ - if (dec_path[0] && atoi(dec_path) == 0) - { - sprintf(str, "Invalid URL: %s", dec_path); - show_error(str); - return; - } + if (dec_path[0] && atoi(dec_path) == 0) { + sprintf(str, "Invalid URL: %s", dec_path); + show_error(str); + return; + } /*---- get current message ---------------------------------------*/ - if (message_id == 0) - message_id = el_search_message(lbs, EL_LAST, 0, FALSE); + if (message_id == 0) + message_id = el_search_message(lbs, EL_LAST, 0, FALSE); - if (message_id) - { - size = sizeof(text); - status = el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr, - text, &size, orig_tag, reply_tag, - attachment, encoding, locked_by); + if (message_id) { + size = sizeof(text); + status = + el_retrieve(lbs, message_id, date, attr_list, attrib, + lbs->n_attr, text, &size, orig_tag, reply_tag, + attachment, encoding, locked_by); - if (status != EL_SUCCESS) - message_error = status; - else - { - if (_logging_level > 2) - logf(lbs, "READ message #%d", message_id); + if (status != EL_SUCCESS) + message_error = status; + else { + if (_logging_level > 2) + logf(lbs, "READ message #%d", message_id); } - } - else - message_error = EL_EMPTY; + } else + message_error = EL_EMPTY; /*---- header ----*/ - /* header */ - if (status == EL_SUCCESS && message_error != EL_EMPTY) - { - str[0] = 0; + /* header */ + if (status == EL_SUCCESS && message_error != EL_EMPTY) { + str[0] = 0; - if (getcfg(lbs->name, "Page Title", str)) - { - i = build_subst_list(lbs, slist, svalue, attrib); - strsubst(str, slist, svalue, i); - } - else - strcpy(str, "ELOG"); + if (getcfg(lbs->name, "Page Title", str)) { + i = build_subst_list(lbs, slist, svalue, attrib); + strsubst(str, slist, svalue, i); + } else + strcpy(str, "ELOG"); - sprintf(ref, "%d", message_id); - if (str[0]) - show_standard_header(lbs, TRUE, str, ref); - else - show_standard_header(lbs, TRUE, lbs->name, ref); - } - else - show_standard_header(lbs, TRUE, "", ""); + sprintf(ref, "%d", message_id); + if (str[0]) + show_standard_header(lbs, TRUE, str, ref); + else + show_standard_header(lbs, TRUE, lbs->name, ref); + } else + show_standard_header(lbs, TRUE, "", ""); /*---- title ----*/ - show_standard_title(lbs->name, "", 0); + show_standard_title(lbs->name, "", 0); /*---- menu buttons ----*/ - rsprintf("\n"); - rsprintf("\n"); - rsprintf("\n\n"); + rsprintf("
\n"); + rsprintf("
\n"); + rsprintf + ("\n"); + rsprintf("\n\n"); + rsprintf("\n\n"); /*---- next/previous buttons ----*/ - if (!getcfg(lbs->name, "Enable browsing", str) || - atoi(str) == 1) - { - rsprintf("\n"); - } + rsprintf("\n"); + } - rsprintf("
\n"); - n = strbreak(menu_str, menu_item, MAX_N_LIST); + n = strbreak(menu_str, menu_item, MAX_N_LIST); - for (i=0 ; iname, cmd, str)) - { - n_log = strbreak(str, lbk_list, MAX_N_LIST); + if (equal_ustring(cmd, "Copy to") || equal_ustring(cmd, "Move to")) { + if (getcfg(lbs->name, cmd, str)) { + n_log = strbreak(str, lbk_list, MAX_N_LIST); - for (j=0 ; j%s \"%s\" |\n", - lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), lbk_list[j]); - else - rsprintf(" %s \"%s\" |\n", - lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), lbk_list[j]); - } - } - else - { - /* put one link for each logbook except current one */ - for (j=0 ; ; j++) - { - if (!enumgrp(j, str)) - break; + if (equal_ustring(cmd, loc("Copy to"))) + rsprintf + (" %s \"%s\" |\n", + lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), + lbk_list[j]); + else + rsprintf + (" %s \"%s\" |\n", + lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), + lbk_list[j]); + } + } else { + /* put one link for each logbook except current one */ + for (j = 0;; j++) { + if (!enumgrp(j, str)) + break; - if (equal_ustring(str, "global")) - continue; + if (equal_ustring(str, "global")) + continue; - if (equal_ustring(str, lbs->name)) - continue; + if (equal_ustring(str, lbs->name)) + continue; - strlcpy(ref, str, sizeof(ref)); - url_encode(ref, sizeof(ref)); + strlcpy(ref, str, sizeof(ref)); + url_encode(ref, sizeof(ref)); - strcpy(cmd_enc, loc(cmd)); - url_encode(cmd_enc, sizeof(cmd_enc)); + strcpy(cmd_enc, loc(cmd)); + url_encode(cmd_enc, sizeof(cmd_enc)); - if (equal_ustring(cmd, "Copy to")) - rsprintf(" %s \"%s\" |\n", - lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), str); - else - rsprintf(" %s \"%s\" |\n", - lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), str); - } - } + if (equal_ustring(cmd, "Copy to")) + rsprintf + (" %s \"%s\" |\n", + lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), + str); + else + rsprintf + (" %s \"%s\" |\n", + lbs->name_enc, message_id, cmd_enc, ref, loc(cmd), + str); + } + } + } else { + strcpy(str, loc(menu_item[i])); + url_encode(str, sizeof(str)); + + if (i < n - 1) + rsprintf(" %s |\n", + message_id, str, loc(menu_item[i])); + else + rsprintf(" %s \n", + message_id, str, loc(menu_item[i])); } - else - { - strcpy(str, loc(menu_item[i])); - url_encode(str, sizeof(str)); + } - if (i < n-1) - rsprintf(" %s |\n", message_id, str, loc(menu_item[i])); - else - rsprintf(" %s \n", message_id, str, loc(menu_item[i])); - } - } - - rsprintf("\n"); + if (!getcfg(lbs->name, "Enable browsing", str) || atoi(str) == 1) { + rsprintf("\n"); - rsprintf("\n", - loc("First entry")); - rsprintf("\n", - loc("Previous entry")); - rsprintf("\n", - loc("Next entry")); - rsprintf("\n", - loc("Last entry")); + rsprintf + ("\n", + loc("First entry")); + rsprintf + ("\n", + loc("Previous entry")); + rsprintf + ("\n", + loc("Next entry")); + rsprintf + ("\n", + loc("Last entry")); - rsprintf("
\n\n"); /*---- menu text ----*/ - if (getcfg(lbs->name, "menu text", str)) - { - FILE *f; - char file_name[256], *buf; + if (getcfg(lbs->name, "menu text", str)) { + FILE *f; + char file_name[256], *buf; - rsprintf("\n"); + rsprintf("\n"); - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); } - f = fopen(file_name, "rb"); - if (f != NULL) - { - fseek(f, 0, SEEK_END); - size = TELL(fileno(f)); - fseek(f, 0, SEEK_SET); + f = fopen(file_name, "rb"); + if (f != NULL) { + fseek(f, 0, SEEK_END); + size = TELL(fileno(f)); + fseek(f, 0, SEEK_SET); - buf = malloc(size+1); - fread(buf, 1, size, f); - buf[size] = 0; - fclose(f); + buf = malloc(size + 1); + fread(buf, 1, size, f); + buf[size] = 0; + fclose(f); - rsputs(buf); + rsputs(buf); - } - else - rsprintf("

Error: file \"%s\" not found
", file_name); + } else + rsprintf + ("
Error: file \"%s\" not found
", + file_name); - rsprintf(""); - } + rsprintf(""); + } /*---- message ----*/ - if (message_error == EL_EMPTY) - rsprintf("%s\n", loc("Logbook is empty")); - else if (message_error == EL_NO_MSG) - rsprintf("%s\n", loc("This message has been deleted")); - else - { - /* overall message table */ - rsprintf("\n"); + if (message_error == EL_EMPTY) + rsprintf("\n", + loc("Logbook is empty")); + else if (message_error == EL_NO_MSG) + rsprintf("\n", + loc("This message has been deleted")); + else { + /* overall message table */ + rsprintf + ("\n"); + rsputs("
%s
%s
\n"); - /* check for locked attributes */ - for (i=0 ; in_attr ; i++) - { - sprintf(lattr, "l%s", attr_list[i]); - if (*getparam(lattr) == '1') - break; + /* check for locked attributes */ + for (i = 0; i < lbs->n_attr; i++) { + sprintf(lattr, "l%s", attr_list[i]); + if (*getparam(lattr) == '1') + break; } - if (i < lbs->n_attr) - sprintf(str, " %s \"%s = %s\"", loc("with"), attr_list[i], getparam(attr_list[i])); - else - str[0] = 0; + if (i < lbs->n_attr) + sprintf(str, " %s \"%s = %s\"", loc("with"), attr_list[i], + getparam(attr_list[i])); + else + str[0] = 0; - if (message_error == EL_LAST_MSG) - rsprintf("\n", - loc("This is the last entry"), str); + if (message_error == EL_LAST_MSG) + rsprintf + ("\n", + loc("This is the last entry"), str); - if (message_error == EL_FIRST_MSG) - rsprintf("\n", - loc("This is the first entry"), str); + if (message_error == EL_FIRST_MSG) + rsprintf + ("\n", + loc("This is the first entry"), str); - /* check for mail submissions */ - if (*getparam("suppress")) - { - rsprintf("\n", loc("Email notification suppressed")); - } - else if (isparam("error")) - { - rsprintf("\n", getparam("error")); - } - else - { - for (i=0 ; ; i++) - { - sprintf(str, "mail%d", i); - if (*getparam(str)) - { - if (i==0) - rsprintf("\n"); + /* check for mail submissions */ + if (*getparam("suppress")) { + rsprintf("\n", + loc("Email notification suppressed")); + } else if (isparam("error")) { + rsprintf("\n", + getparam("error")); + } else { + for (i = 0;; i++) { + sprintf(str, "mail%d", i); + if (*getparam(str)) { + if (i == 0) + rsprintf("\n"); } /*---- display message ID ----*/ - if (locked_by && locked_by[0]) - { - sprintf(str, "%s %s", loc("Entry is currently edited by"), locked_by); - rsprintf("\n", str); + if (locked_by && locked_by[0]) { + sprintf(str, "%s %s", loc("Entry is currently edited by"), + locked_by); + rsprintf + ("\n", str); } - rsprintf("\n"); + rsprintf("\n"); /*---- display attributes ----*/ - /* retrieve attribute flags */ - for (i=0 ; in_attr ; i++) - { - format_flags[i] = 0; - sprintf(str, "Format %s", attr_list[i]); - if (getcfg(lbs->name, str, format)) - { - n = strbreak(format, fl, 8); - if (n > 0) - format_flags[i] = atoi(fl[0]); - } + /* retrieve attribute flags */ + for (i = 0; i < lbs->n_attr; i++) { + format_flags[i] = 0; + sprintf(str, "Format %s", attr_list[i]); + if (getcfg(lbs->name, str, format)) { + n = strbreak(format, fl, 8); + if (n > 0) + format_flags[i] = atoi(fl[0]); + } } - for (i=0 ; in_attr ; i++) - { - strcpy(class_name, "attribname"); - strcpy(class_value, "attribvalue"); + for (i = 0; i < lbs->n_attr; i++) { + strcpy(class_name, "attribname"); + strcpy(class_value, "attribvalue"); - sprintf(str, "Format %s", attr_list[i]); - if (getcfg(lbs->name, str, format)) - { - n = strbreak(format, fl, 8); - if (n > 1) - strlcpy(class_name, fl[1], sizeof(class_name)); - if (n > 2) - strlcpy(class_value, fl[2], sizeof(class_value)); - } + sprintf(str, "Format %s", attr_list[i]); + if (getcfg(lbs->name, str, format)) { + n = strbreak(format, fl, 8); + if (n > 1) + strlcpy(class_name, fl[1], sizeof(class_name)); + if (n > 2) + strlcpy(class_value, fl[2], sizeof(class_value)); + } - if ((format_flags[i] & AFF_SAME_LINE) == 0) - rsprintf("\n"); } - rsputs("
%s %s
%s %s
%s %s
%s %s
%s
%s
"); - rsprintf("%s %s
\n", loc("Email sent to"), getparam(str)); - } - else - break; - } - if (i>0) - rsprintf("
%s
%s
"); + rsprintf("%s %s
\n", loc("Email sent to"), + getparam(str)); + } else + break; + } + if (i > 0) + rsprintf("
\n"); - rsprintf("%s
\n"); + rsprintf("%s
\n"); + rsprintf("
\n"); - for (i=0 ; in_attr ; i++) - rsprintf("\n", attr_list[i], attrib[i]); + for (i = 0; i < lbs->n_attr; i++) + rsprintf("\n", + attr_list[i], attrib[i]); - /* browsing flag to distinguish "/../=" from browsing */ - rsprintf("\n"); + /* browsing flag to distinguish "/../=" from browsing */ + rsprintf("\n"); - rsprintf("%s: %d\n", loc("Message ID"), message_id); + rsprintf("%s: %d\n", loc("Message ID"), message_id); /*---- display date ----*/ - if (getcfg(lbs->name, "Date format", format)) - { - struct tm ts; + if (getcfg(lbs->name, "Date format", format)) { + struct tm ts; - memset(&ts, 0, sizeof(ts)); + memset(&ts, 0, sizeof(ts)); - for (i=0 ; i<12 ; i++) - if (strncmp(date+4, mname[i], 3) == 0) - break; - ts.tm_mon = i; + for (i = 0; i < 12; i++) + if (strncmp(date + 4, mname[i], 3) == 0) + break; + ts.tm_mon = i; - ts.tm_mday = atoi(date+8); - ts.tm_hour = atoi(date+11); - ts.tm_min = atoi(date+14); - ts.tm_sec = atoi(date+17); - ts.tm_year = atoi(date+20)-1900; - ts.tm_isdst = -1; /* let mktime compute DST */ + ts.tm_mday = atoi(date + 8); + ts.tm_hour = atoi(date + 11); + ts.tm_min = atoi(date + 14); + ts.tm_sec = atoi(date + 17); + ts.tm_year = atoi(date + 20) - 1900; + ts.tm_isdst = -1; /* let mktime compute DST */ - mktime(&ts); - strftime(str, sizeof(str), format, &ts); + mktime(&ts); + strftime(str, sizeof(str), format, &ts); - rsprintf("    %s: %s\n", - loc("Entry date"), str); - } - else - rsprintf("    %s: %s\n", - loc("Entry date"), date); + rsprintf("    %s: %s\n", + loc("Entry date"), str); + } else + rsprintf("    %s: %s\n", + loc("Entry date"), date); /*---- link to original message or reply ----*/ - if (message_error != EL_FILE_ERROR && (reply_tag[0] || orig_tag[0])) - { + if (message_error != EL_FILE_ERROR && (reply_tag[0] || orig_tag[0])) { - if (orig_tag[0]) - { - sprintf(ref, "%s", orig_tag); - rsprintf("    %s: ", loc("In reply to")); - rsprintf("%s\n", ref, orig_tag); - } - if (reply_tag[0]) - { - rsprintf("    %s: ", loc("Reply to this")); + if (orig_tag[0]) { + sprintf(ref, "%s", orig_tag); + rsprintf("    %s: ", + loc("In reply to")); + rsprintf("%s\n", ref, orig_tag); + } + if (reply_tag[0]) { + rsprintf("    %s: ", + loc("Reply to this")); - p = strtok(reply_tag, ","); - do - { - rsprintf("%s\n", p, p); + p = strtok(reply_tag, ","); + do { + rsprintf("%s\n", p, p); - p = strtok(NULL, ","); + p = strtok(NULL, ","); - if (p) - rsprintf("  \n"); + if (p) + rsprintf("  \n"); - } while (p); + } while (p); - rsprintf("\n"); - } + rsprintf("\n"); + } } - rsprintf("
"); + if ((format_flags[i] & AFF_SAME_LINE) == 0) + rsprintf + ("\n"); + if (i == lbs->n_attr - 1 + || (format_flags[i + 1] & AFF_SAME_LINE) == 0) + rsprintf("
"); - sprintf(lattr, "l%s", attr_list[i]); - rsprintf("\n", - attr_list[i], class_value); - else - rsprintf("%s:\n", - attr_list[i], class_value); - } - /* display image for icon */ - else if (attr_flags[i] & AF_ICON) - { - rsprintf("%s:\n", + attr_list[i], class_value); + else + rsprintf + ("%s:\n", + attr_list[i], class_value); + } + /* display image for icon */ + else if (attr_flags[i] & AF_ICON) { + rsprintf("%s:\n"); - } - else if ((attr_flags[i] & AF_MULTI) && (format_flags[i] & AFF_MULTI_LINE)) - { - rsprintf("%s:\n"); + } else if ((attr_flags[i] & AF_MULTI) + && (format_flags[i] & AFF_MULTI_LINE)) { + rsprintf("%s:\n"); - } - else - { - rsprintf("%s:\n"); - } + rsprintf("\n"); + } else { + rsprintf("%s:\n"); + } - if (i == lbs->n_attr-1 || (format_flags[i+1] & AFF_SAME_LINE) == 0) - rsprintf("
", class_name); + sprintf(lattr, "l%s", attr_list[i]); + rsprintf("", class_name); - if (getcfg(lbs->name, "Filtered browsing", str) && - atoi(str) == 1) - { - if (*getparam(lattr) == '1') - rsprintf(" ", lattr); - else - rsprintf(" ", lattr); - } + if (getcfg(lbs->name, "Filtered browsing", str) && atoi(str) == 1) { + if (*getparam(lattr) == '1') + rsprintf + (" ", + lattr); + else + rsprintf + (" ", + lattr); + } - /* display checkbox for boolean attributes */ - if (equal_ustring(attr_options[i][0], "boolean")) - { - if (atoi(attrib[i]) == 1) - rsprintf("%s:\n", attr_list[i], class_value); - if (attrib[i][0]) - { - sprintf(str, "Icon comment %s", attrib[i]); - getcfg(lbs->name, str, comment); + /* display checkbox for boolean attributes */ + if (equal_ustring(attr_options[i][0], "boolean")) { + if (atoi(attrib[i]) == 1) + rsprintf + ("%s:\n", attr_list[i], + class_value); + if (attrib[i][0]) { + sprintf(str, "Icon comment %s", attrib[i]); + getcfg(lbs->name, str, comment); - if (comment[0]) - rsprintf("\"%s\"", attrib[i], comment); - else - rsprintf("\"%s\"", attrib[i], attrib[i]); - } - rsprintf(" \n", attr_list[i], class_value); + if (comment[0]) + rsprintf("\"%s\"", attrib[i], + comment); + else + rsprintf("\"%s\"", attrib[i], + attrib[i]); + } + rsprintf(" \n", attr_list[i], + class_value); - /* separate options into individual lines */ - strlcpy(str, attrib[i], sizeof(str)); - p = strtok(str, "|"); - while (p) - { - while (*p == ' ') - p++; + /* separate options into individual lines */ + strlcpy(str, attrib[i], sizeof(str)); + p = strtok(str, "|"); + while (p) { + while (*p == ' ') + p++; - rsputs2(p); + rsputs2(p); - p = strtok(NULL, "|"); + p = strtok(NULL, "|"); - if (p) - rsprintf("
"); - } + if (p) + rsprintf("
"); + } - rsprintf("		\n", attr_list[i], class_value); - rsputs2(attrib[i]); - rsprintf(" \n", attr_list[i], + class_value); + rsputs2(attrib[i]); + rsprintf(" 
\n"); - - rsputs("
\n"); + + rsputs("\n"); /*---- message text ----*/ - if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) - { - rsprintf("\n"); + if (!getcfg(lbs->name, "Show text", str) || atoi(str) == 1) { + rsprintf("\n"); - if (equal_ustring(encoding, "plain")) - { - rsputs("
");
-        rsputs2(text);
-        rsputs("
"); - } - else - rsputs(text); + if (equal_ustring(encoding, "plain")) { + rsputs("
");
+            rsputs2(text);
+            rsputs("
"); + } else + rsputs(text); - rsputs("\n"); + rsputs("\n"); } - for (index = 0 ; index < MAX_ATTACHMENTS ; index++) - { - if (attachment[index][0] && strlen(attachment[index])>14) - { - for (i=0 ; i<(int)strlen(attachment[index]) ; i++) - att[i] = toupper(attachment[index][i]); - att[i] = 0; + for (index = 0; index < MAX_ATTACHMENTS; index++) { + if (attachment[index][0] && strlen(attachment[index]) > 14) { + for (i = 0; i < (int) strlen(attachment[index]); i++) + att[i] = toupper(attachment[index][i]); + att[i] = 0; - /* determine size of attachment */ - strlcpy(file_name, lbs->data_dir, sizeof(file_name)); - strlcat(file_name, attachment[index], sizeof(file_name)); + /* determine size of attachment */ + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, attachment[index], sizeof(file_name)); - length = 0; - fh = open(file_name, O_RDONLY | O_BINARY); - if (fh > 0) - { - lseek(fh, 0, SEEK_END); - length = TELL(fh); - close(fh); - } - - strcpy(str, attachment[index]); - str[13] = 0; - sprintf(ref, "%s/%s", str, attachment[index]+14); - url_encode(ref, sizeof(ref)); /* for file names with special characters like "+" */ - - /* overall table */ - rsprintf("\n"); - - rsprintf("\n", - loc("Attachment"), index+1); - - rsprintf("
%s %d:%s\n", - ref, attachment[index]+14); - - rsprintf(" "); - - if (length < 1024) - rsprintf("%d Bytes", length); - else if (length < 1024*1024) - rsprintf("%d kB", length/1024); - else - rsprintf("%1.3lf MB", length/1024.0/1024.0); - - rsprintf("
\n"); - - if (!getcfg(lbs->name, "Show attachments", str) || - atoi(str) == 1) - { - if (strstr(att, ".GIF") || - strstr(att, ".JPG") || - strstr(att, ".JPEG") || - strstr(att, ".PNG")) - { - rsprintf("\n"); - rsprintf("\n", index+1); - rsprintf("", ref); - rsprintf("\n\n"); + length = 0; + fh = open(file_name, O_RDONLY | O_BINARY); + if (fh > 0) { + lseek(fh, 0, SEEK_END); + length = TELL(fh); + close(fh); } - else - { - if (strstr(att, ".TXT") || - strstr(att, ".ASC") || - strchr(att, '.') == NULL) - { - /* display attachment */ - rsprintf("\n"); - /* anchor for references */ - rsprintf("\n", index+1); + strcpy(str, attachment[index]); + str[13] = 0; + sprintf(ref, "%s/%s", str, attachment[index] + 14); + url_encode(ref, sizeof(ref)); /* for file names with special characters like "+" */ - if (!strstr(att, ".HTML")) - rsprintf("
");
+            /* overall table */
+            rsprintf
+                ("\n");
 
-              strlcpy(file_name, lbs->data_dir, sizeof(file_name));
-              strlcat(file_name, attachment[index], sizeof(file_name));
+            rsprintf
+                ("\n",
+                 loc("Attachment"), index + 1);
 
-              f = fopen(file_name, "rt");
-              if (f != NULL)
-                {
-                while (!feof(f))
-                  {
-                  str[0] = 0;
-                  fgets(str, sizeof(str), f);
+            rsprintf("
%s %d:%s\n",
+                     ref, attachment[index] + 14);
 
-                  if (!strstr(att, ".HTML"))
-                    rsputs2(str);
-                  else
-                    rsputs(str);
+            rsprintf(" ");
+
+            if (length < 1024)
+               rsprintf("%d Bytes", length);
+            else if (length < 1024 * 1024)
+               rsprintf("%d kB", length / 1024);
+            else
+               rsprintf("%1.3lf MB", length / 1024.0 / 1024.0);
+
+            rsprintf("
\n");
+
+            if (!getcfg(lbs->name, "Show attachments", str) ||
+                atoi(str) == 1) {
+               if (strstr(att, ".GIF") ||
+                   strstr(att, ".JPG") ||
+                   strstr(att, ".JPEG") || strstr(att, ".PNG")) {
+                  rsprintf("\n");
+                  rsprintf("\n", index + 1);
+                  rsprintf("", ref);
+                  rsprintf("\n\n");
+               } else {
+                  if (strstr(att, ".TXT") ||
+                      strstr(att, ".ASC") || strchr(att, '.') == NULL) {
+                     /* display attachment */
+                     rsprintf("\n");
+
+                     /* anchor for references */
+                     rsprintf("\n", index + 1);
+
+                     if (!strstr(att, ".HTML"))
+                        rsprintf("
");
+
+                     strlcpy(file_name, lbs->data_dir, sizeof(file_name));
+                     strlcat(file_name, attachment[index],
+                             sizeof(file_name));
+
+                     f = fopen(file_name, "rt");
+                     if (f != NULL) {
+                        while (!feof(f)) {
+                           str[0] = 0;
+                           fgets(str, sizeof(str), f);
+
+                           if (!strstr(att, ".HTML"))
+                              rsputs2(str);
+                           else
+                              rsputs(str);
+                        }
+                        fclose(f);
+                     }
+
+                     if (!strstr(att, ".HTML"))
+                        rsprintf("
");
+                     rsprintf("\n");
+                     rsprintf("\n");
                   }
-                fclose(f);
-                }
-
-              if (!strstr(att, ".HTML"))
-                rsprintf("
"); - rsprintf("\n"); - rsprintf("\n"); - } + } } - } - } + } } - } + } - /* overall table (class "frame" from show_standard_header) */ - rsprintf("\r\n\r\n"); + /* overall table (class "frame" from show_standard_header) */ + rsprintf("\r\n\r\n"); - if (getcfg(lbs->name, "bottom text", str)) - { - FILE *f; - char file_name[256], *buf; + if (getcfg(lbs->name, "bottom text", str)) { + FILE *f; + char file_name[256], *buf; - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } + + f = fopen(file_name, "rb"); + if (f != NULL) { + fseek(f, 0, SEEK_END); + size = TELL(fileno(f)); + fseek(f, 0, SEEK_SET); + + buf = malloc(size + 1); + fread(buf, 1, size, f); + buf[size] = 0; + fclose(f); + + rsputs(buf); + } else + rsprintf + ("
Error: file \"%s\" not found
", + file_name); + } else + /* add little logo */ + rsprintf + ("
ELOG V%s
", + VERSION); + + rsprintf("\r\n"); +} + +/*------------------------------------------------------------------*/ + +BOOL check_password(LOGBOOK * lbs, char *name, char *password, char *redir) +{ + char str[256]; + + /* get password from configuration file */ + if (getcfg(lbs->name, name, str)) { + if (strcmp(password, str) == 0) + return TRUE; + + if (!isparam("wpwd") && password[0]) { + strlcpy(str, redir, sizeof(str)); + if (strchr(str, '?')) + strlcat(str, "&wpwd=1", sizeof(str)); + else + strlcat(str, "?wpwd=1", sizeof(str)); + redirect(lbs, str); + return FALSE; + } + + /* show web password page */ + show_standard_header(lbs, FALSE, loc("ELOG password"), NULL); + + rsprintf(""); + + if (isparam("wpwd")) + rsprintf("\n", + loc("Wrong password")); + + rsprintf("\n", + loc("Please enter password to obtain write access")); + rsprintf + ("\n"); + } else { + rsprintf("%s\n", + loc + ("Please enter password to obtain administration access")); + rsprintf + ("\n"); + } + + rsprintf + ("", + loc("Submit")); + + rsprintf("
%s!
\n"); + + /* define hidden fields for current destination */ + if (redir[0]) + rsprintf("\n", redir); + + if (strcmp(name, "Write password") == 0) { + rsprintf("%s
\n"); + + rsprintf("\r\n"); + + return FALSE; + } else + return TRUE; +} + +/*------------------------------------------------------------------*/ + +int get_user_line(char *logbook_name, char *user, char *password, + char *full_name, char *email, char *email_notify) +{ + char str[256], line[256], file_name[256], *p; + FILE *f; + int i, fd; + + if (password) + password[0] = 0; + if (full_name) + full_name[0] = 0; + if (email) + email[0] = 0; + if (email_notify) + email_notify[0] = 0; + + getcfg(logbook_name, "Password file", str); + + if (!str[0]) + return 1; + + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strlcpy(file_name, str, sizeof(file_name)); + else { strlcpy(file_name, resource_dir, sizeof(file_name)); strlcat(file_name, str, sizeof(file_name)); + } + + f = fopen(file_name, "r"); + + /* if password file doen't exist, try to create it */ + if (f == NULL) { + fd = open(file_name, O_CREAT | O_RDWR, 0600); + if (fd < 0) + return 3; + close(fd); + f = fopen(file_name, "r"); + } + + if (f != NULL) { + if (!user[0]) { + fclose(f); + return 1; } - f = fopen(file_name, "rb"); - if (f != NULL) - { - fseek(f, 0, SEEK_END); - size = TELL(fileno(f)); - fseek(f, 0, SEEK_SET); + while (!feof(f)) { + line[0] = 0; + fgets(line, sizeof(line), f); - buf = malloc(size+1); - fread(buf, 1, size, f); - buf[size] = 0; + if (line[0] == ';' || line[0] == '#' || line[0] == 0) + continue; + + strcpy(str, line); + if (strchr(str, ':')) + *strchr(str, ':') = 0; + if (strcmp(str, user) == 0) + break; + } fclose(f); - rsputs(buf); + if (strcmp(str, user) != 0) + return 2; + + /* if user found, retrieve other info */ + p = line; + + for (i = 0; i < 4; i++) { + if (strchr(p, ':') == NULL) + break; + p = strchr(p, ':') + 1; + + while (*p && *p == ' ') + p++; + strlcpy(str, p, sizeof(str)); + if (strchr(str, ':')) + *strchr(str, ':') = 0; + + while (str[strlen(str) - 1] == ' ' || + str[strlen(str) - 1] == '\r' || + str[strlen(str) - 1] == '\n') + str[strlen(str) - 1] = 0; + + if (i == 0 && password) + strcpy(password, str); + else if (i == 1 && full_name) + strcpy(full_name, str); + else if (i == 2 && email) + strcpy(email, str); + else if (i == 3 && email_notify) + strcpy(email_notify, str); } - else - rsprintf("
Error: file \"%s\" not found
", file_name); - } - else - /* add little logo */ - rsprintf("
ELOG V%s
", VERSION); - rsprintf("\r\n"); -} - -/*------------------------------------------------------------------*/ - -BOOL check_password(LOGBOOK *lbs, char *name, char *password, char *redir) -{ -char str[256]; - - /* get password from configuration file */ - if (getcfg(lbs->name, name, str)) - { - if (strcmp(password, str) == 0) - return TRUE; - - if (!isparam("wpwd") && password[0]) - { - strlcpy(str, redir, sizeof(str)); - if (strchr(str, '?')) - strlcat(str, "&wpwd=1", sizeof(str)); + return 1; + } else { + if (user[0]) + return 3; else - strlcat(str, "?wpwd=1", sizeof(str)); - redirect(lbs, str); + return 1; + } +} + +/*------------------------------------------------------------------*/ + +BOOL enum_user_line(LOGBOOK * lbs, int n, char *user) +{ + char str[256], line[256], file_name[256]; + FILE *f; + int i; + + getcfg(lbs->name, "Password file", str); + + if (!str[0]) return FALSE; + + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } + + f = fopen(file_name, "r"); + i = 0; + if (f != NULL) { + while (!feof(f)) { + line[0] = 0; + fgets(line, sizeof(line), f); + + if (line[0] == ';' || line[0] == '#' || line[0] == 0) + continue; + + if (strchr(line, ':') == NULL) + continue; + + strcpy(str, line); + if (strchr(str, ':')) + *strchr(str, ':') = 0; + + if (i == n) { + strcpy(user, str); + fclose(f); + return TRUE; + } + + i++; } - - /* show web password page */ - show_standard_header(lbs, FALSE, loc("ELOG password"), NULL); - - rsprintf(""); - - if (isparam("wpwd")) - rsprintf("\n", loc("Wrong password")); - - rsprintf("\n", loc("Please enter password to obtain write access")); - rsprintf("\n"); - } - else - { - rsprintf("%s\n", loc("Please enter password to obtain administration access")); - rsprintf("\n"); - } - - rsprintf("", loc("Submit")); - - rsprintf("
%s!
\n"); - - /* define hidden fields for current destination */ - if (redir[0]) - rsprintf("\n", redir); - - if (strcmp(name, "Write password") == 0) - { - rsprintf("%s
\n"); - - rsprintf("\r\n"); - - return FALSE; - } - else - return TRUE; -} - -/*------------------------------------------------------------------*/ - -int get_user_line(char *logbook_name, char *user, char *password, char *full_name, char *email, char *email_notify) -{ -char str[256], line[256], file_name[256], *p; -FILE *f; -int i, fd; - - if (password) password[0] = 0; - if (full_name) full_name[0] = 0; - if (email) email[0] = 0; - if (email_notify) email_notify[0] = 0; - - getcfg(logbook_name, "Password file", str); - - if (!str[0]) - return 1; - - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strlcpy(file_name, str, sizeof(file_name)); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } - - f = fopen(file_name, "r"); - - /* if password file doen't exist, try to create it */ - if (f == NULL) - { - fd = open(file_name, O_CREAT | O_RDWR, 0600); - if (fd < 0) - return 3; - close(fd); - f = fopen(file_name, "r"); - } - - if (f != NULL) - { - if (!user[0]) - { fclose(f); - return 1; - } + } - while (!feof(f)) - { - line[0] = 0; - fgets(line, sizeof(line), f); - - if (line[0] == ';' || line[0] == '#' || line[0] == 0) - continue; - - strcpy(str, line); - if (strchr(str, ':')) - *strchr(str, ':') = 0; - if (strcmp(str, user) == 0) - break; - } - fclose(f); - - if (strcmp(str, user) != 0) - return 2; - - /* if user found, retrieve other info */ - p = line; - - for (i=0 ; i<4 ; i++) - { - if (strchr(p, ':') == NULL) - break; - p = strchr(p, ':')+1; - - while (*p && *p == ' ') - p++; - strlcpy(str, p, sizeof(str)); - if (strchr(str, ':')) - *strchr(str, ':') = 0; - - while (str[strlen(str)-1] == ' ' || - str[strlen(str)-1] == '\r' || - str[strlen(str)-1] == '\n') - str[strlen(str)-1] = 0; - - if (i==0 && password) - strcpy(password, str); - else if (i==1 && full_name) - strcpy(full_name, str); - else if (i==2 && email) - strcpy(email, str); - else if (i==3 && email_notify) - strcpy(email_notify, str); - } - - return 1; - } - else - { - if (user[0]) - return 3; - else - return 1; - } + return FALSE; } /*------------------------------------------------------------------*/ -BOOL enum_user_line(LOGBOOK *lbs, int n, char *user) +BOOL check_login_user(LOGBOOK * lbs, char *user) { -char str[256], line[256], file_name[256]; -FILE *f; -int i; + int i, n; + char str[1000]; + char list[MAX_N_LIST][NAME_LENGTH]; - getcfg(lbs->name, "Password file", str); - - if (!str[0]) - return FALSE; - - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } - - f = fopen(file_name, "r"); - i = 0; - if (f != NULL) - { - while (!feof(f)) - { - line[0] = 0; - fgets(line, sizeof(line), f); - - if (line[0] == ';' || line[0] == '#' || line[0] == 0) - continue; - - if (strchr(line, ':') == NULL) - continue; - - strcpy(str, line); - if (strchr(str, ':')) - *strchr(str, ':') = 0; + if (getcfg(lbs->name, "Login user", str) && user[0]) { + n = strbreak(str, list, MAX_N_LIST); + for (i = 0; i < n; i++) + if (strcmp(user, list[i]) == 0) + break; if (i == n) - { - strcpy(user, str); - fclose(f); - return TRUE; - } - - i++; - } - fclose(f); - } - - return FALSE; + return FALSE; + } + return TRUE; } /*------------------------------------------------------------------*/ -BOOL check_login_user(LOGBOOK *lbs, char *user) +BOOL check_user_password(LOGBOOK * lbs, char *user, char *password, + char *redir) { -int i, n; -char str[1000]; -char list[MAX_N_LIST][NAME_LENGTH]; + char status, str[1000], upwd[256], full_name[256], email[256]; - if (getcfg(lbs->name, "Login user", str) && user[0]) - { - n = strbreak(str, list, MAX_N_LIST); - for (i=0 ; iname, user, upwd, full_name, email, NULL); - if (i== n) - return FALSE; - } - return TRUE; -} - -/*------------------------------------------------------------------*/ - -BOOL check_user_password(LOGBOOK *lbs, char *user, char *password, char *redir) -{ -char status, str[1000], upwd[256], full_name[256], email[256]; - - if (lbs == NULL) - status = get_user_line("global", user, upwd, full_name, email, NULL); - else - status = get_user_line(lbs->name, user, upwd, full_name, email, NULL); - - /* check for logout */ - if (isparam("LO")) - { - /* remove cookies */ - set_login_cookies(lbs, "", ""); - return FALSE; - } - - /* check for "forgot password" */ - if (isparam("cmd") && strcmp(getparam("cmd"), loc("Forgot")) == 0) - { - show_forgot_pwd_page(lbs); - return FALSE; - } - - /* display error message for invalid user */ - if (isparam("iusr")) - { - /* header */ - show_html_header(NULL, FALSE, "ELOG error"); - - rsprintf("
\n"); - rsprintf(""); - sprintf(str, loc("User \"%s\" has no access to logbook \"%s\""), getparam("iusr"), lbs->name); - rsprintf("\n", str); - - rsprintf("", loc("Login as different user")); - - rsprintf("", loc("Goto logbook selection page")); - - rsprintf("
%s
"); - rsprintf("%s
"); - rsprintf("%s
\n"); - rsprintf("
\n"); - - return FALSE; - } - - if (!check_login_user(lbs, user)) - { - sprintf(str, "?iusr=%s", user); - - redirect(lbs, str); - return FALSE; - } - - if (status == 1) - { - if (user[0] && strcmp(password, upwd) == 0) - { - setparam("full_name", full_name); - setparam("user_email", email); - return TRUE; - } - - if (!isparam("wpwd") && password[0]) - { - redirect(lbs, "?wpwd=1"); - return FALSE; - } - - /* show login password page */ - sprintf(str, "ELOG %s", loc("Login")); - show_html_header(lbs, TRUE, str); - - /* set focus on name field */ - rsprintf("\n"); - - rsprintf("
\n\n"); - - /* define hidden fields for current destination */ - rsprintf("\n", redir); - - rsprintf(""); - - if (isparam("wpwd")) - rsprintf("\n", loc("Wrong password")); - - if (isparam("wusr")) - { - sprintf(str, loc("Invalid user name \"%s\""), getparam("wusr")); - rsprintf("\n", str); - } - - rsprintf("\n", loc("Please login")); - - rsprintf("\n", loc("Username")); - rsprintf("\n", - getparam("unm")); - - rsprintf("\n", loc("Password")); - rsprintf("\n"); - - if (!getcfg(lbs->name, "Login expiration", str) || atoi(str) > 0) - { - rsprintf("\n", loc("Remember me on this computer")); - } - - rsprintf("", - str, loc("Register as new user")); - } - - rsprintf("", - loc("Submit")); - - rsprintf("
%s!
%s!
%s
%s:
%s:
\n"); - rsprintf("%s
%s", - loc("Forgot"), loc("Forgot password?")); - - if (getcfg(lbs->name, "Self register", str) && atoi(str) > 0) - { - strcpy(str, loc("New user")); - url_encode(str, sizeof(str)); - rsprintf("      %s
\n"); - - rsprintf("
ELOG V%s
", VERSION); - - rsprintf("\r\n"); - - return FALSE; - } - else - { - if (status == 2) - { - sprintf(str, "?wusr=%s", user); - - setparam("redir", str); - - /* remove remaining cookies */ + /* check for logout */ + if (isparam("LO")) { + /* remove cookies */ set_login_cookies(lbs, "", ""); - } - else - { - getcfg(lbs->name, "Password file", full_name); - sprintf(str, loc("Cannot open file %s"), full_name); + return FALSE; + } - show_error(str); + /* check for "forgot password" */ + if (isparam("cmd") && strcmp(getparam("cmd"), loc("Forgot")) == 0) { + show_forgot_pwd_page(lbs); + return FALSE; + } + + /* display error message for invalid user */ + if (isparam("iusr")) { + /* header */ + show_html_header(NULL, FALSE, "ELOG error"); + + rsprintf("
\n"); + rsprintf + (""); + sprintf(str, + loc + ("User \"%s\" has no access to logbook \"%s\""), + getparam("iusr"), lbs->name); + rsprintf("\n", str); + + rsprintf("", + loc("Login as different user")); + + rsprintf("", + loc("Goto logbook selection page")); + + rsprintf("
%s
"); + rsprintf("%s
"); + rsprintf("%s
\n"); + rsprintf("
\n"); + + return FALSE; + } + + if (!check_login_user(lbs, user)) { + sprintf(str, "?iusr=%s", user); + + redirect(lbs, str); + return FALSE; + } + + if (status == 1) { + if (user[0] && strcmp(password, upwd) == 0) { + setparam("full_name", full_name); + setparam("user_email", email); + return TRUE; } - return FALSE; - } + + if (!isparam("wpwd") && password[0]) { + redirect(lbs, "?wpwd=1"); + return FALSE; + } + + /* show login password page */ + sprintf(str, "ELOG %s", loc("Login")); + show_html_header(lbs, TRUE, str); + + /* set focus on name field */ + rsprintf("\n"); + + rsprintf("\n\n"); + + /* define hidden fields for current destination */ + rsprintf("\n", redir); + + rsprintf(""); + + if (isparam("wpwd")) + rsprintf("\n", + loc("Wrong password")); + + if (isparam("wusr")) { + sprintf(str, loc("Invalid user name \"%s\""), + getparam("wusr")); + rsprintf("\n", + str); + } + + rsprintf("\n", + loc("Please login")); + + rsprintf("\n", + loc("Username")); + rsprintf + ("\n", + getparam("unm")); + + rsprintf("\n", + loc("Password")); + rsprintf + ("\n"); + + if (!getcfg(lbs->name, "Login expiration", str) || atoi(str) > 0) { + rsprintf + ("\n", loc("Remember me on this computer")); + } + + rsprintf + ("", + str, loc("Register as new user")); + } + + rsprintf + ("", + loc("Submit")); + + rsprintf("
%s!
%s!
%s
%s:
%s:
\n"); + rsprintf("%s
%s", + loc("Forgot"), loc("Forgot password?")); + + if (getcfg(lbs->name, "Self register", str) && atoi(str) > 0) { + strcpy(str, loc("New user")); + url_encode(str, sizeof(str)); + rsprintf + ("      %s
\n"); + + rsprintf + ("
ELOG V%s
", + VERSION); + + rsprintf("\r\n"); + + return FALSE; + } else { + if (status == 2) { + sprintf(str, "?wusr=%s", user); + + setparam("redir", str); + + /* remove remaining cookies */ + set_login_cookies(lbs, "", ""); + } else { + getcfg(lbs->name, "Password file", full_name); + sprintf(str, loc("Cannot open file %s"), full_name); + + show_error(str); + } + return FALSE; + } } /*------------------------------------------------------------------*/ void show_selection_page() { -int i; -char str[10000]; -struct tm *tms; + int i; + char str[10000]; + struct tm *tms; - if (getcfg("global", "Page Title", str)) - show_html_header(NULL, TRUE, str); - else - show_html_header(NULL, TRUE, "ELOG Logbook Selection"); + if (getcfg("global", "Page Title", str)) + show_html_header(NULL, TRUE, str); + else + show_html_header(NULL, TRUE, "ELOG Logbook Selection"); - rsprintf("\n\n"); + rsprintf("\n\n"); - rsprintf("\n"); - rsprintf("
\n"); + rsprintf("\n"); + rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n"); - rsprintf("\n", loc("Logbook")); - rsprintf("\n", loc("Entries")); - rsprintf("\n", loc("Last submission")); - rsprintf("\n"); + rsprintf("\n"); + rsprintf("\n", loc("Logbook")); + rsprintf("\n", loc("Entries")); + rsprintf("\n", loc("Last submission")); + rsprintf("\n"); - for (i=0 ; ; i++) - { - if (!lb_list[i].name[0]) - break; + for (i = 0;; i++) { + if (!lb_list[i].name[0]) + break; - if (!getcfg(lb_list[i].name, "Hidden", str) || atoi(str) == 0) - { - rsprintf("\n", str); + rsprintf("
\n"); + str[0] = 0; + getcfg(lb_list[i].name, "Comment", str); + rsprintf("%s\n", str); - rsprintf("\n"); + rsprintf("\n"); - rsprintf("\n"); + rsprintf("\n"); } - } + } - rsprintf("
\n"); - if (getcfg("global", "Welcome title", str)) - { - rsputs(str); - } - else - { - rsprintf("%s.
\n", loc("Several logbooks are defined on this host")); - rsprintf("%s:\n", loc("Please select the one to connect to")); - } + if (getcfg("global", "Welcome title", str)) { + rsputs(str); + } else { + rsprintf("%s.
\n", + loc("Several logbooks are defined on this host")); + rsprintf("%s:\n", loc("Please select the one to connect to")); + } - rsprintf("
%s%s%s
%s%s%s
%s", lb_list[i].name_enc, lb_list[i].name); + if (!getcfg(lb_list[i].name, "Hidden", str) || atoi(str) == 0) { + rsprintf("
%s", + lb_list[i].name_enc, lb_list[i].name); - if (getcfg(lb_list[i].name, "Read password", str) || - (getcfg(lb_list[i].name, "Password file", str) && - !getcfg(lb_list[i].name, "Guest menu commands", str))) - rsprintf("  "); + if (getcfg(lb_list[i].name, "Read password", str) || + (getcfg(lb_list[i].name, "Password file", str) && + !getcfg(lb_list[i].name, "Guest menu commands", str))) + rsprintf("  "); - rsprintf("
\n"); - str[0] = 0; - getcfg(lb_list[i].name, "Comment", str); - rsprintf("%s		"); - rsprintf("%d", *lb_list[i].n_el_index); - rsprintf(""); + rsprintf("%d", *lb_list[i].n_el_index); + rsprintf(""); - if (*lb_list[i].n_el_index == 0) - rsprintf("-"); - else - { - tms = localtime(&(lb_list[i].el_index[*lb_list[i].n_el_index-1].file_time)); - strftime(str, sizeof(str), "%a %b %d, %Y %H:%M", tms); - rsprintf(str); - } - rsprintf("
"); + if (*lb_list[i].n_el_index == 0) + rsprintf("-"); + else { + tms = + localtime(& + (lb_list[i].el_index[*lb_list[i].n_el_index - 1]. + file_time)); + strftime(str, sizeof(str), "%a %b %d, %Y %H:%M", tms); + rsprintf(str); + } + rsprintf("
\n"); - rsprintf("\r\n\r\n"); + rsprintf("
\n"); + rsprintf("\r\n\r\n"); } @@ -12320,60 +12042,59 @@ struct tm *tms; void get_password(char *password) { -static char last_password[32]; + static char last_password[32]; - if (strncmp(password, "set=", 4) == 0) - strcpy(last_password, password+4); - else - strcpy(password, last_password); + if (strncmp(password, "set=", 4) == 0) + strcpy(last_password, password + 4); + else + strcpy(password, last_password); } /*------------------------------------------------------------------*/ -int do_self_register(LOGBOOK *lbs, char *command) +int do_self_register(LOGBOOK * lbs, char *command) /* evaluate self-registration commands */ { -char str[256]; + char str[256]; - /* display new user page if "self register" is clicked */ - if (equal_ustring(command, loc("New user"))) - { - show_new_user_page(lbs); - return 0; - } - - /* save user info if "save" is pressed */ - if (equal_ustring(command, loc("Save")) && isparam("new_user_name") && !isparam("config")) - { - if (!save_user_config(lbs, getparam("new_user_name"), TRUE, FALSE)) + /* display new user page if "self register" is clicked */ + if (equal_ustring(command, loc("New user"))) { + show_new_user_page(lbs); return 0; + } - if (lbs) - sprintf(str, "../%s/", lbs->name_enc); - else - sprintf(str, "."); + /* save user info if "save" is pressed */ + if (equal_ustring(command, loc("Save")) && isparam("new_user_name") + && !isparam("config")) { + if (!save_user_config(lbs, getparam("new_user_name"), TRUE, FALSE)) + return 0; - redirect(lbs, str); - return 0; - } + if (lbs) + sprintf(str, "../%s/", lbs->name_enc); + else + sprintf(str, "."); - /* display account request notification */ - if (equal_ustring(command, loc("Requested"))) - { - show_standard_header(lbs, FALSE, loc("ELOG registration"), ""); + redirect(lbs, str); + return 0; + } - rsprintf(""); - rsprintf("
\n"); + /* display account request notification */ + if (equal_ustring(command, loc("Requested"))) { + show_standard_header(lbs, FALSE, loc("ELOG registration"), ""); - rsprintf(loc("Your request has been forwarded to the administrator. You will be notified by email upon activation of your new account.")); + rsprintf(""); + rsprintf("
\n"); - rsprintf("
\n"); - rsprintf("\n"); - return 0; - } + rsprintf(loc + ("Your request has been forwarded to the administrator. You will be notified by email upon activation of your new account.")); - /* indicate continue */ - return 1; + rsprintf("
\n"); + rsprintf("\n"); + return 0; + } + + /* indicate continue */ + return 1; } /*------------------------------------------------------------------*/ @@ -12393,1071 +12114,976 @@ void interprete(char *lbook, char *path) \********************************************************************/ { -int status, i, j, n, index, lb_index, message_id; -char exp[80]; -char str[NAME_LENGTH], enc_pwd[80], file_name[256], command[80], ref[256]; -char enc_path[256], dec_path[256], logbook[256], logbook_enc[256]; -char *experiment, *value, *group, css[256]; -char attachment[MAX_PATH_LENGTH]; -BOOL global; -LOGBOOK *lbs; -FILE *f; + int status, i, j, n, index, lb_index, message_id; + char exp[80]; + char str[NAME_LENGTH], enc_pwd[80], file_name[256], command[80], + ref[256]; + char enc_path[256], dec_path[256], logbook[256], logbook_enc[256]; + char *experiment, *value, *group, css[256]; + char attachment[MAX_PATH_LENGTH]; + BOOL global; + LOGBOOK *lbs; + FILE *f; - /* encode path for further usage */ - strcpy(dec_path, path); - url_decode(dec_path); - strcpy(enc_path, dec_path); - url_encode(enc_path, sizeof(enc_path)); + /* encode path for further usage */ + strcpy(dec_path, path); + url_decode(dec_path); + strcpy(enc_path, dec_path); + url_encode(enc_path, sizeof(enc_path)); - strcpy(command, getparam("cmd")); - experiment = getparam("exp"); - value = getparam("value"); - group = getparam("group"); - index = atoi(getparam("index")); + strcpy(command, getparam("cmd")); + experiment = getparam("exp"); + value = getparam("value"); + group = getparam("group"); + index = atoi(getparam("index")); - if (getcfg(lbook, "Logging Level", str)) - _logging_level = atoi(str); - else - _logging_level = 1; + if (getcfg(lbook, "Logging Level", str)) + _logging_level = atoi(str); + else + _logging_level = 1; - /* if experiment given, use it as logbook (for elog!) */ - if (experiment && experiment[0]) - { - strcpy(logbook_enc, experiment); - strcpy(logbook, experiment); - url_decode(logbook); - } - else - { - strcpy(logbook_enc, lbook); - strcpy(logbook, lbook); - url_decode(logbook); - } + /* if experiment given, use it as logbook (for elog!) */ + if (experiment && experiment[0]) { + strcpy(logbook_enc, experiment); + strcpy(logbook, experiment); + url_decode(logbook); + } else { + strcpy(logbook_enc, lbook); + strcpy(logbook, lbook); + url_decode(logbook); + } - /* check if new logbook */ - for (i=j=0 ; ; i++) - { - if (!enumgrp(i, str)) - break; - if (!equal_ustring(str, "global")) - { - /* redo index if logbooks in cfg file do not match lb_list */ - if (!equal_ustring(str, lb_list[j++].name)) - { - el_index_logbooks(TRUE); - break; - } + /* check if new logbook */ + for (i = j = 0;; i++) { + if (!enumgrp(i, str)) + break; + if (!equal_ustring(str, "global")) { + /* redo index if logbooks in cfg file do not match lb_list */ + if (!equal_ustring(str, lb_list[j++].name)) { + el_index_logbooks(TRUE); + break; + } } - } + } - /* check for deleted logbook */ - if (lb_list[j].name[0] != 0) - el_index_logbooks(TRUE); + /* check for deleted logbook */ + if (lb_list[j].name[0] != 0) + el_index_logbooks(TRUE); - /* check for global selection page if no logbook given */ - if (!logbook[0] && getcfg("global", "Selection page", str)) - { - /* check for URL */ - if (strstr(str, "http://")) - { - redirect(NULL, str); + /* check for global selection page if no logbook given */ + if (!logbook[0] && getcfg("global", "Selection page", str)) { + /* check for URL */ + if (strstr(str, "http://")) { + redirect(NULL, str); + return; + } + + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strlcpy(file_name, str, sizeof(file_name)); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } + send_file_direct(file_name); return; - } + } - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strlcpy(file_name, str, sizeof(file_name)); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } - send_file_direct(file_name); - return; - } + /* count logbooks */ + for (n = 0; lb_list[n].name[0]; n++); - /* count logbooks */ - for (n=0 ; lb_list[n].name[0] ; n++); - - /* if no logbook given, display logbook selection page */ - if (!logbook[0]) - { - if (n > 1) - { - /* if password file is given in global section, protect also logbook selection page */ - if (getcfg("global", "password file", str)) - { - /* check for self register */ - if (getcfg("global", "Self register", str) && atoi(str) > 0) - { - if (!do_self_register(NULL, command)) - return; - } - - /* check for activate */ - if (equal_ustring(command, "Activate")) - { - if (!save_user_config(NULL, getparam("new_user_name"), TRUE, TRUE)) - return; - - setparam("cfg_user", getparam("new_user_name")); - show_config_page(NULL); - return; - } - - /* check for save after activate */ - if (equal_ustring(command, loc("Save"))) - { - if (isparam("config")) - { - /* change existing user */ - if (!save_user_config(NULL, getparam("config"), FALSE, FALSE)) - return; + /* if no logbook given, display logbook selection page */ + if (!logbook[0]) { + if (n > 1) { + /* if password file is given in global section, protect also logbook selection page */ + if (getcfg("global", "password file", str)) { + /* check for self register */ + if (getcfg("global", "Self register", str) && atoi(str) > 0) { + if (!do_self_register(NULL, command)) + return; } - redirect(NULL, "."); - return; - } + /* check for activate */ + if (equal_ustring(command, "Activate")) { + if (!save_user_config + (NULL, getparam("new_user_name"), TRUE, TRUE)) + return; - /* check for password recovery */ - if (isparam("cmd") || isparam("newpwd")) - { - if (equal_ustring(getparam("cmd"), loc("Change password")) || isparam("newpwd")) - { - show_change_pwd_page(NULL); - return; - } - } - - /* if data from login screen, evaluate it and set cookies */ - if (*getparam("uname") && getparam("upassword")) - { - /* check if password correct */ - do_crypt(getparam("upassword"), enc_pwd); - - /* log logins */ - logf(NULL, "LOGIN user \"%s\" (attempt) for logbook selection page", getparam("uname")); - - if (isparam("redir")) - strcpy(str, getparam("redir")); - else - strcpy(str, getparam("cmdline")); - - if (!check_user_password(NULL, getparam("uname"), enc_pwd, str)) - return; - - logf(NULL, "LOGIN user \"%s\" (success)", getparam("uname")); - - /* set cookies */ - set_login_cookies(NULL, getparam("uname"), enc_pwd); - - return; - } - - /* check for Guest Selection Page */ - if (getcfg("global", "Guest Selection Page", str) && - !(isparam("unm") && isparam("upwd"))) - { - /* check for URL */ - if (strstr(str, "http://")) - { - redirect(NULL, str); - return; + setparam("cfg_user", getparam("new_user_name")); + show_config_page(NULL); + return; } - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strlcpy(file_name, str, sizeof(file_name)); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); + /* check for save after activate */ + if (equal_ustring(command, loc("Save"))) { + if (isparam("config")) { + /* change existing user */ + if (!save_user_config + (NULL, getparam("config"), FALSE, FALSE)) + return; + } + + redirect(NULL, "."); + return; } - send_file_direct(file_name); - return; - } - if (!check_user_password(NULL, getparam("unm"), getparam("upwd"), "")) - return; - } + /* check for password recovery */ + if (isparam("cmd") || isparam("newpwd")) { + if (equal_ustring(getparam("cmd"), loc("Change password")) + || isparam("newpwd")) { + show_change_pwd_page(NULL); + return; + } + } - show_selection_page(); - return; + /* if data from login screen, evaluate it and set cookies */ + if (*getparam("uname") && getparam("upassword")) { + /* check if password correct */ + do_crypt(getparam("upassword"), enc_pwd); + + /* log logins */ + logf(NULL, + "LOGIN user \"%s\" (attempt) for logbook selection page", + getparam("uname")); + + if (isparam("redir")) + strcpy(str, getparam("redir")); + else + strcpy(str, getparam("cmdline")); + + if (!check_user_password + (NULL, getparam("uname"), enc_pwd, str)) + return; + + logf(NULL, "LOGIN user \"%s\" (success)", + getparam("uname")); + + /* set cookies */ + set_login_cookies(NULL, getparam("uname"), enc_pwd); + + return; + } + + /* check for Guest Selection Page */ + if (getcfg("global", "Guest Selection Page", str) && + !(isparam("unm") && isparam("upwd"))) { + /* check for URL */ + if (strstr(str, "http://")) { + redirect(NULL, str); + return; + } + + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strlcpy(file_name, str, sizeof(file_name)); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); + } + send_file_direct(file_name); + return; + } + + if (!check_user_password + (NULL, getparam("unm"), getparam("upwd"), "")) + return; + } + + show_selection_page(); + return; } - strcpy(logbook_enc, logbook); - url_encode(logbook_enc, sizeof(logbook_enc)); - } + strcpy(logbook_enc, logbook); + url_encode(logbook_enc, sizeof(logbook_enc)); + } - /* get logbook from list */ - for (i=0 ; lb_list[i].name[0] ; i++) - if (equal_ustring(logbook, lb_list[i].name)) - break; + /* get logbook from list */ + for (i = 0; lb_list[i].name[0]; i++) + if (equal_ustring(logbook, lb_list[i].name)) + break; - lbs = &lb_list[i]; + lbs = &lb_list[i]; - /* get theme for logbook */ - if (getcfg(logbook, "Theme", str)) - strlcpy(theme_name, str, sizeof(theme_name)); - else - strlcpy(theme_name, "default", sizeof(theme_name)); + /* get theme for logbook */ + if (getcfg(logbook, "Theme", str)) + strlcpy(theme_name, str, sizeof(theme_name)); + else + strlcpy(theme_name, "default", sizeof(theme_name)); - lb_index = i; - lbs = lb_list+i; - lbs->n_attr = scan_attributes(lbs->name, NULL); + lb_index = i; + lbs = lb_list + i; + lbs->n_attr = scan_attributes(lbs->name, NULL); - if (*getparam("wpassword")) - { - /* check if password correct */ - do_crypt(getparam("wpassword"), enc_pwd); + if (*getparam("wpassword")) { + /* check if password correct */ + do_crypt(getparam("wpassword"), enc_pwd); - if (!check_password(lbs, "Write password", enc_pwd, getparam("redir"))) - return; + if (!check_password + (lbs, "Write password", enc_pwd, getparam("redir"))) + return; - rsprintf("HTTP/1.1 302 Found\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + rsprintf("HTTP/1.1 302 Found\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); } - global = getcfg("global", "Write password", str); + global = getcfg("global", "Write password", str); - /* get optional expriation from configuration file */ - getcfg(logbook, "Write password expiration", exp); + /* get optional expriation from configuration file */ + getcfg(logbook, "Write password expiration", exp); - /* set "wpwd" cookie */ - set_cookie(lbs, "wpwd", enc_pwd, global, exp); + /* set "wpwd" cookie */ + set_cookie(lbs, "wpwd", enc_pwd, global, exp); - /* redirect according to "redir" parameter */ - set_redir(lbs, getparam("redir")); - return; - } - - if (*getparam("apassword")) - { - /* check if password correct */ - do_crypt(getparam("apassword"), enc_pwd); - - if (!check_password(lbs, "Admin password", enc_pwd, getparam("redir"))) + /* redirect according to "redir" parameter */ + set_redir(lbs, getparam("redir")); return; + } - rsprintf("HTTP/1.1 302 Found\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - if (use_keepalive) - { - rsprintf("Connection: Keep-Alive\r\n"); - rsprintf("Keep-Alive: timeout=60, max=10\r\n"); + if (*getparam("apassword")) { + /* check if password correct */ + do_crypt(getparam("apassword"), enc_pwd); + + if (!check_password + (lbs, "Admin password", enc_pwd, getparam("redir"))) + return; + + rsprintf("HTTP/1.1 302 Found\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + if (use_keepalive) { + rsprintf("Connection: Keep-Alive\r\n"); + rsprintf("Keep-Alive: timeout=60, max=10\r\n"); } - global = getcfg("global", "Admin password", str); + global = getcfg("global", "Admin password", str); - /* get optional expriation from configuration file */ - getcfg(logbook, "Admin password expiration", exp); + /* get optional expriation from configuration file */ + getcfg(logbook, "Admin password expiration", exp); - /* set "apwd" cookie */ - set_cookie(lbs, "apwd", enc_pwd, global, exp); + /* set "apwd" cookie */ + set_cookie(lbs, "apwd", enc_pwd, global, exp); - /* redirect according to "redir" parameter */ - set_redir(lbs, getparam("redir")); - return; - } - - if (*getparam("uname") && getparam("upassword")) - { - /* check if password correct */ - do_crypt(getparam("upassword"), enc_pwd); - - /* log logins */ - logf(lbs, "LOGIN user \"%s\" (attempt)", getparam("uname")); - - if (isparam("redir")) - strcpy(str, getparam("redir")); - else - strcpy(str, getparam("cmdline")); - - if (!check_user_password(lbs, getparam("uname"), enc_pwd, str)) + /* redirect according to "redir" parameter */ + set_redir(lbs, getparam("redir")); return; + } - logf(lbs, "LOGIN user \"%s\" (success)", getparam("uname")); + if (*getparam("uname") && getparam("upassword")) { + /* check if password correct */ + do_crypt(getparam("upassword"), enc_pwd); - /* set cookies */ - set_login_cookies(lbs, getparam("uname"), enc_pwd); + /* log logins */ + logf(lbs, "LOGIN user \"%s\" (attempt)", getparam("uname")); - return; - } + if (isparam("redir")) + strcpy(str, getparam("redir")); + else + strcpy(str, getparam("cmdline")); - /* if password file given, check password and user name */ - if (getcfg(logbook, "Password file", str)) - { - /* get current CSS */ - strlcpy(css, "default.css", sizeof(css)); - if (lbs != NULL && getcfg(lbs->name, "CSS", str)) - strlcpy(css, str, sizeof(css)); - else if (lbs == NULL && getcfg("global", "CSS", str)) - strlcpy(css, str, sizeof(css)); + if (!check_user_password(lbs, getparam("uname"), enc_pwd, str)) + return; - /* check if guest access */ - if (!(getcfg(lbs->name, "Guest menu commands", str) && *getparam("unm") == 0 && - !isparam("wpwd") && !isparam("wusr"))) - { - if (strcmp(path, css) != 0) - { - /* if no guest menu commands but self register, evaluate new user commands */ - if (getcfg(lbs->name, "Self register", str) && atoi(str) > 0) - { - if (!do_self_register(lbs, command)) - return; - } + logf(lbs, "LOGIN user \"%s\" (success)", getparam("uname")); - if (!check_user_password(lbs, getparam("unm"), getparam("upwd"), getparam("cmdline"))) - return; - } + /* set cookies */ + set_login_cookies(lbs, getparam("uname"), enc_pwd); + + return; + } + + /* if password file given, check password and user name */ + if (getcfg(logbook, "Password file", str)) { + /* get current CSS */ + strlcpy(css, "default.css", sizeof(css)); + if (lbs != NULL && getcfg(lbs->name, "CSS", str)) + strlcpy(css, str, sizeof(css)); + else if (lbs == NULL && getcfg("global", "CSS", str)) + strlcpy(css, str, sizeof(css)); + + /* check if guest access */ + if (!(getcfg(lbs->name, "Guest menu commands", str) + && *getparam("unm") == 0 && !isparam("wpwd") + && !isparam("wusr"))) { + if (strcmp(path, css) != 0) { + /* if no guest menu commands but self register, evaluate new user commands */ + if (getcfg(lbs->name, "Self register", str) && atoi(str) > 0) { + if (!do_self_register(lbs, command)) + return; + } + + if (!check_user_password + (lbs, getparam("unm"), getparam("upwd"), + getparam("cmdline"))) + return; + } } - } + } - if (equal_ustring(command, loc("Login"))) - { - check_user_password(lbs, "", "", path); - return; - } - - if (equal_ustring(command, loc("New")) || - equal_ustring(command, loc("Edit")) || - equal_ustring(command, loc("Reply")) || - equal_ustring(command, loc("Delete")) || - equal_ustring(command, loc("Upload")) || - equal_ustring(command, loc("Submit"))) - { - sprintf(str, "%s?cmd=%s", path, command); - if (!check_password(lbs, "Write password", getparam("wpwd"), str)) + if (equal_ustring(command, loc("Login"))) { + check_user_password(lbs, "", "", path); return; - } + } - if (equal_ustring(command, loc("Delete")) || - equal_ustring(command, loc("Config")) || - equal_ustring(command, loc("Copy to")) || - equal_ustring(command, loc("Move to"))) - { - sprintf(str, "%s?cmd=%s", path, command); - if (!check_password(lbs, "Admin password", getparam("apwd"), str)) + if (equal_ustring(command, loc("New")) || + equal_ustring(command, loc("Edit")) || + equal_ustring(command, loc("Reply")) || + equal_ustring(command, loc("Delete")) || + equal_ustring(command, loc("Upload")) || + equal_ustring(command, loc("Submit"))) { + sprintf(str, "%s?cmd=%s", path, command); + if (!check_password(lbs, "Write password", getparam("wpwd"), str)) + return; + } + + if (equal_ustring(command, loc("Delete")) || + equal_ustring(command, loc("Config")) || + equal_ustring(command, loc("Copy to")) || + equal_ustring(command, loc("Move to"))) { + sprintf(str, "%s?cmd=%s", path, command); + if (!check_password(lbs, "Admin password", getparam("apwd"), str)) + return; + } + + /* check for "Back" button */ + if (equal_ustring(command, loc("Back")) && + getcfg(lbs->name, "Back to main", str) && atoi(str) == 1) { + redirect(lbs, "../"); return; - } + } - /* check for "Back" button */ - if (equal_ustring(command, loc("Back")) && - getcfg(lbs->name, "Back to main", str) && - atoi(str) == 1) - { - redirect(lbs, "../"); - return; - } + if (equal_ustring(command, loc("Back"))) { + if (isparam("edit_id")) { + /* unlock message */ + el_lock_message(lbs, atoi(getparam("edit_id")), NULL); - if (equal_ustring(command, loc("Back"))) - { - if (isparam("edit_id")) - { - /* unlock message */ - el_lock_message(lbs, atoi(getparam("edit_id")), NULL); + /* redirect to message */ + sprintf(str, "../%s/%s", logbook_enc, getparam("edit_id")); + } else + sprintf(str, "../%s/", logbook_enc); - /* redirect to message */ - sprintf(str, "../%s/%s", logbook_enc, getparam("edit_id")); - } - else - sprintf(str, "../%s/", logbook_enc); + redirect(lbs, str); + return; + } - redirect(lbs, str); - return; - } + /* check for "Cancel" button */ + if (equal_ustring(command, loc("Cancel"))) { + sprintf(str, "../%s/%s", logbook_enc, path); + redirect(lbs, str); + return; + } - /* check for "Cancel" button */ - if (equal_ustring(command, loc("Cancel"))) - { - sprintf(str, "../%s/%s", logbook_enc, path); - redirect(lbs, str); - return; - } + /* check for "Last n*2 Entries" */ + strcpy(str, getparam("last")); + if (strchr(str, ' ')) { + i = atoi(strchr(str, ' ')); + sprintf(str, "last%d", i); + if (isparam("mode")) + sprintf(str + strlen(str), "?mode=%s", getparam("mode")); + redirect(lbs, str); + return; + } - /* check for "Last n*2 Entries" */ - strcpy(str, getparam("last")); - if (strchr(str, ' ')) - { - i = atoi(strchr(str, ' ')); - sprintf(str, "last%d", i); - if (isparam("mode")) - sprintf(str+strlen(str), "?mode=%s", getparam("mode")); - redirect(lbs, str); - return; - } + strcpy(str, getparam("past")); + if (strchr(str, ' ')) { + i = atoi(strchr(str, ' ')); + sprintf(str, "past%d", i); + redirect(lbs, str); + return; + } - strcpy(str, getparam("past")); - if (strchr(str, ' ')) - { - i = atoi(strchr(str, ' ')); - sprintf(str, "past%d", i); - redirect(lbs, str); - return; - } + /* check for lastxx and pastxx and listxx */ + if (strncmp(path, "past", 4) == 0 && *getparam("cmd") == 0) { + show_elog_list(lbs, atoi(path + 4), 0, 0); + return; + } - /* check for lastxx and pastxx and listxx */ - if (strncmp(path, "past", 4) == 0 && - *getparam("cmd") == 0) - { - show_elog_list(lbs, atoi(path+4), 0, 0); - return; - } + if (strncmp(path, "last", 4) == 0 && strstr(path, ".gif") == NULL && + (!isparam("cmd") || equal_ustring(getparam("cmd"), loc("Select"))) + && !isparam("newpwd")) { + show_elog_list(lbs, 0, atoi(path + 4), 0); + return; + } - if (strncmp(path, "last", 4) == 0 && strstr(path, ".gif") == NULL && - (!isparam("cmd") || equal_ustring(getparam("cmd"), loc("Select"))) - && !isparam("newpwd")) - { - show_elog_list(lbs, 0, atoi(path+4), 0); - return; - } - - if (strncmp(path, "page", 4) == 0 && - *getparam("cmd") == 0) - { - if (!path[4]) - show_elog_list(lbs, 0, 0, -1); - else - show_elog_list(lbs, 0, 0, atoi(path+4)); - return; - } + if (strncmp(path, "page", 4) == 0 && *getparam("cmd") == 0) { + if (!path[4]) + show_elog_list(lbs, 0, 0, -1); + else + show_elog_list(lbs, 0, 0, atoi(path + 4)); + return; + } /*---- check if file requested -----------------------------------*/ - if ((strlen(dec_path) > 13 && dec_path[6] == '_' && dec_path[13] == '_') || - (strlen(dec_path) > 13 && dec_path[6] == '_' && dec_path[13] == '/') || - strstr(dec_path, ".gif") || strstr(dec_path, ".jpg") || - strstr(dec_path, ".jpeg") || strstr(dec_path, ".png") || - strstr(dec_path, ".css")) - { - if ((strlen(dec_path) > 13 && dec_path[6] == '_' && dec_path[13] == '_') || - (strlen(dec_path) > 13 && dec_path[6] == '_' && dec_path[13] == '/')) - { - if (dec_path[13] == '/') - dec_path[13] = '_'; + if ((strlen(dec_path) > 13 && dec_path[6] == '_' && dec_path[13] == '_') + || (strlen(dec_path) > 13 && dec_path[6] == '_' + && dec_path[13] == '/') || strstr(dec_path, ".gif") + || strstr(dec_path, ".jpg") || strstr(dec_path, ".jpeg") + || strstr(dec_path, ".png") || strstr(dec_path, ".css")) { + if ((strlen(dec_path) > 13 && dec_path[6] == '_' + && dec_path[13] == '_') || (strlen(dec_path) > 13 + && dec_path[6] == '_' + && dec_path[13] == '/')) { + if (dec_path[13] == '/') + dec_path[13] = '_'; - /* file from data directory requested */ - strlcpy(file_name, lbs->data_dir, sizeof(file_name)); - strlcat(file_name, dec_path, sizeof(file_name)); - } - else - { - /* file from theme directory requested */ - strlcpy(file_name, resource_dir, sizeof(file_name)); - if (file_name[0] && file_name[strlen(file_name)-1] != DIR_SEPARATOR) - strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); - strlcat(file_name, "themes", sizeof(file_name)); - strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); - if (theme_name[0]) - { - strlcat(file_name, theme_name, sizeof(file_name)); - strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); - } - strlcat(file_name, dec_path, sizeof(file_name)); + /* file from data directory requested */ + strlcpy(file_name, lbs->data_dir, sizeof(file_name)); + strlcat(file_name, dec_path, sizeof(file_name)); + } else { + /* file from theme directory requested */ + strlcpy(file_name, resource_dir, sizeof(file_name)); + if (file_name[0] + && file_name[strlen(file_name) - 1] != DIR_SEPARATOR) + strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); + strlcat(file_name, "themes", sizeof(file_name)); + strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); + if (theme_name[0]) { + strlcat(file_name, theme_name, sizeof(file_name)); + strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name)); + } + strlcat(file_name, dec_path, sizeof(file_name)); } - send_file_direct(file_name); - return; - } + send_file_direct(file_name); + return; + } /*---- check if attachment requested -----------------------------*/ - if (strchr(dec_path, '/')) - { - message_id = atoi(dec_path); - n = atoi(strchr(dec_path, '/')+1) - 1; + if (strchr(dec_path, '/')) { + message_id = atoi(dec_path); + n = atoi(strchr(dec_path, '/') + 1) - 1; - status = el_retrieve_attachment(lbs, message_id, n, attachment); + status = el_retrieve_attachment(lbs, message_id, n, attachment); - if (status != EL_SUCCESS || n >= MAX_ATTACHMENTS) - { - sprintf(str, "Attachment #%d of message #%d not found", n+1, message_id); + if (status != EL_SUCCESS || n >= MAX_ATTACHMENTS) { + sprintf(str, "Attachment #%d of message #%d not found", n + 1, + message_id); + show_error(str); + } else { + sprintf(str, "../%s", attachment); + redirect(lbs, str); + } + + return; + } + + /* check for new syntax in elogd.cfg */ + if (getcfg(lbs->name, "Types", str)) { + show_upgrade_page(lbs); + return; + } + + /* correct for image buttons */ + if (*getparam("cmd_first.x")) + strcpy(command, loc("First")); + if (*getparam("cmd_previous.x")) + strcpy(command, loc("Previous")); + if (*getparam("cmd_next.x")) + strcpy(command, loc("Next")); + if (*getparam("cmd_last.x")) + strcpy(command, loc("Last")); + + /* check if command allowed for current user */ + if (!is_user_allowed(lbs, command)) { + sprintf(str, + loc + ("Error: Command \"%s\" is not allowed for user \"%s\""), + command, getparam("full_name")); show_error(str); - } - else - { - sprintf(str, "../%s", attachment); - redirect(lbs, str); - } + return; + } - return; - } - - /* check for new syntax in elogd.cfg */ - if (getcfg(lbs->name, "Types", str)) - { - show_upgrade_page(lbs); - return; - } - - /* correct for image buttons */ - if (*getparam("cmd_first.x")) - strcpy(command, loc("First")); - if (*getparam("cmd_previous.x")) - strcpy(command, loc("Previous")); - if (*getparam("cmd_next.x")) - strcpy(command, loc("Next")); - if (*getparam("cmd_last.x")) - strcpy(command, loc("Last")); - - /* check if command allowed for current user */ - if (!is_user_allowed(lbs, command)) - { - sprintf(str, loc("Error: Command \"%s\" is not allowed for user \"%s\""), - command, getparam("full_name")); - show_error(str); - return; - } - - /* check if command in menu list */ - if (!is_command_allowed(lbs, command)) - { - sprintf(str, loc("Error: Command \"%s\" not allowed"), command); - show_error(str); - return; - } + /* check if command in menu list */ + if (!is_command_allowed(lbs, command)) { + sprintf(str, loc("Error: Command \"%s\" not allowed"), + command); + show_error(str); + return; + } /*---- check for various commands --------------------------------*/ - if (equal_ustring(command, loc("Help"))) - { - if (getcfg(lbs->name, "Help URL", str)) - { - /* if file is given, add '/' to make absolute path */ - if (strchr(str, '/') == NULL) - sprintf(ref, "/%s", str); - else - strcpy(ref, str); + if (equal_ustring(command, loc("Help"))) { + if (getcfg(lbs->name, "Help URL", str)) { + /* if file is given, add '/' to make absolute path */ + if (strchr(str, '/') == NULL) + sprintf(ref, "/%s", str); + else + strcpy(ref, str); - redirect(lbs, ref); + redirect(lbs, ref); + return; + } + + /* send local help file */ + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, "eloghelp_", sizeof(file_name)); + + if (getcfg("global", "Language", str)) { + str[2] = 0; + strlcat(file_name, str, sizeof(file_name)); + } else + strlcat(file_name, "en", sizeof(file_name)); + strlcat(file_name, ".html", sizeof(file_name)); + + f = fopen(file_name, "r"); + if (f == NULL) + redirect(lbs, "http://midas.psi.ch/elog/eloghelp_en.html"); + else { + fclose(f); + send_file_direct(file_name); + } return; - } + } - /* send local help file */ - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, "eloghelp_", sizeof(file_name)); + if (equal_ustring(command, loc("New"))) { + show_edit_form(lbs, 0, FALSE, FALSE, FALSE); + return; + } - if (getcfg("global", "Language", str)) - { - str[2] = 0; - strlcat(file_name, str, sizeof(file_name)); - } - else - strlcat(file_name, "en", sizeof(file_name)); - strlcat(file_name, ".html", sizeof(file_name)); - - f = fopen(file_name, "r"); - if (f == NULL) - redirect(lbs, "http://midas.psi.ch/elog/eloghelp_en.html"); - else - { - fclose(f); - send_file_direct(file_name); - } - return; - } - - if (equal_ustring(command, loc("New"))) - { - show_edit_form(lbs, 0, FALSE, FALSE, FALSE); - return; - } - - message_id = atoi(dec_path); - - if (equal_ustring(command, loc("Upload"))) - { - show_edit_form(lbs, atoi(getparam("edit_id")), FALSE, TRUE, TRUE); - return; - } - - /* check for deletion of attachments */ - for (i=0 ; iname_enc, loc("Find")); + redirect(lbs, str); + return; } - } + show_find_form(lbs); + return; + } - if (equal_ustring(command, loc("Reply"))) - { - show_edit_form(lbs, message_id, TRUE, FALSE, FALSE); - return; - } + if (equal_ustring(command, loc("Search"))) { + if (dec_path[0] && atoi(dec_path) == 0 + && strchr(dec_path, '/') != NULL) { + sprintf(str, "Invalid URL: %s", dec_path); + show_error(str); + return; + } - if (equal_ustring(command, loc("Update"))) - { - show_edit_form(lbs, atoi(getparam("edit_id")), FALSE, TRUE, TRUE); - return; - } + show_elog_list(lbs, 0, 0, 1); + return; + } - if (equal_ustring(command, loc("Submit")) || - equal_ustring(command, "Submit")) - { - submit_elog(lbs); - return; - } + if (equal_ustring(command, loc("Last day"))) { + redirect(lbs, "past1"); + return; + } + + if (equal_ustring(command, loc("Last 10"))) { + redirect(lbs, "last10"); + return; + } + + if (equal_ustring(command, loc("Copy to"))) { + copy_to(lbs, message_id, getparam("destc"), 0, 0); + return; + } + + if (equal_ustring(command, loc("Move to"))) { + copy_to(lbs, message_id, getparam("destm"), 1, 0); + return; + } + + if (equal_ustring(command, loc("Admin")) || + equal_ustring(command, loc("Change elogd.cfg"))) { + show_admin_page(lbs); + return; + } + + if (equal_ustring(command, loc("Change password")) || + (isparam("newpwd") && !equal_ustring(command, loc("Cancel")) + && !equal_ustring(command, loc("Save")))) { + show_change_pwd_page(lbs); + return; + } + + if (equal_ustring(command, loc("Save"))) { + if (isparam("config")) { + if (!equal_ustring(getparam("config"), getparam("new_user_name"))) { + if (get_user_line + (lbs->name, getparam("new_user_name"), NULL, NULL, NULL, + NULL) == 1) { + sprintf(str, "%s \"%s\" %s", loc("Login name"), + getparam("new_user_name"), loc("exists already")); + show_error(str); + return; + } + } + + /* change existing user */ + if (!save_user_config(lbs, getparam("config"), FALSE, FALSE)) + return; + } else if (isparam("new_user_name")) { + /* new user */ + if (!save_user_config + (lbs, getparam("new_user_name"), TRUE, FALSE)) + return; + } else if (!save_admin_config()) /* save cfg file */ + return; + + if (lbs) + sprintf(str, "../%s/", lbs->name_enc); + else + sprintf(str, "."); + + if (isparam("new_user_name")) + sprintf(str + strlen(str), "?cmd=%s&cfg_user=%s", loc("Config"), + getparam("new_user_name")); + else if (isparam("cfg_user")) + sprintf(str + strlen(str), "?cmd=%s&cfg_user=%s", loc("Config"), + getparam("cfg_user")); + else + sprintf(str + strlen(str), "?cmd=%s", loc("Config")); - if (equal_ustring(command, loc("Find"))) - { - /* stip message id */ - if (dec_path[0]) - { - sprintf(str, "../%s/?cmd=%s", lbs->name_enc, loc("Find")); redirect(lbs, str); return; - } - show_find_form(lbs); - return; - } + } - if (equal_ustring(command, loc("Search"))) - { - if (dec_path[0] && atoi(dec_path) == 0 && strchr(dec_path, '/') != NULL) - { - sprintf(str, "Invalid URL: %s", dec_path); - show_error(str); + if (equal_ustring(command, "Activate")) { + if (!save_user_config(lbs, getparam("new_user_name"), TRUE, TRUE)) + return; + + setparam("cfg_user", getparam("new_user_name")); + show_config_page(lbs); return; + } + + if (equal_ustring(command, loc("Remove user"))) { + remove_user(lbs, getparam("config")); + + /* if removed user is current user, do logout */ + if (equal_ustring(getparam("config"), getparam("unm"))) { + /* log activity */ + logf(lbs, "LOGOUT"); + + /* set cookies */ + set_login_cookies(lbs, "", ""); } - show_elog_list(lbs, 0, 0, 1); - return; - } - - if (equal_ustring(command, loc("Last day"))) - { - redirect(lbs, "past1"); - return; - } - - if (equal_ustring(command, loc("Last 10"))) - { - redirect(lbs, "last10"); - return; - } - - if (equal_ustring(command, loc("Copy to"))) - { - copy_to(lbs, message_id, getparam("destc"), 0, 0); - return; - } - - if (equal_ustring(command, loc("Move to"))) - { - copy_to(lbs, message_id, getparam("destm"), 1, 0); - return; - } - - if (equal_ustring(command, loc("Admin")) || - equal_ustring(command, loc("Change elogd.cfg"))) - { - show_admin_page(lbs); - return; - } - - if (equal_ustring(command, loc("Change password")) || - (isparam("newpwd") && !equal_ustring(command, loc("Cancel")) && !equal_ustring(command, loc("Save")))) - { - show_change_pwd_page(lbs); - return; - } - - if (equal_ustring(command, loc("Save"))) - { - if (isparam("config")) - { - if (!equal_ustring(getparam("config"), getparam("new_user_name"))) - { - if (get_user_line(lbs->name, getparam("new_user_name"), NULL, NULL, NULL, NULL) == 1) - { - sprintf(str, "%s \"%s\" %s", loc("Login name"), getparam("new_user_name"), - loc("exists already")); - show_error(str); - return; - } - } - - /* change existing user */ - if (!save_user_config(lbs, getparam("config"), FALSE, FALSE)) - return; - } - else if (isparam("new_user_name")) - { - /* new user */ - if (!save_user_config(lbs, getparam("new_user_name"), TRUE, FALSE)) - return; - } - else if (!save_admin_config()) /* save cfg file */ + /* continue configuration as administrator */ + unsetparam("cfg_user"); + show_config_page(lbs); return; + } - if (lbs) - sprintf(str, "../%s/", lbs->name_enc); - else - sprintf(str, "."); - - if (isparam("new_user_name")) - sprintf(str+strlen(str), "?cmd=%s&cfg_user=%s", loc("Config"), getparam("new_user_name")); - else if (isparam("cfg_user")) - sprintf(str+strlen(str), "?cmd=%s&cfg_user=%s", loc("Config"), getparam("cfg_user")); - else - sprintf(str+strlen(str), "?cmd=%s", loc("Config")); - - redirect(lbs, str); - return; - } - - if (equal_ustring(command, "Activate")) - { - if (!save_user_config(lbs, getparam("new_user_name"), TRUE, TRUE)) + if (equal_ustring(command, loc("New user"))) { + show_new_user_page(lbs); return; + } - setparam("cfg_user", getparam("new_user_name")); - show_config_page(lbs); - return; - } + if (equal_ustring(command, loc("Forgot"))) { + show_forgot_pwd_page(lbs); + return; + } - if (equal_ustring(command, loc("Remove user"))) - { - remove_user(lbs, getparam("config")); + if (equal_ustring(command, loc("Config"))) { + if (!getcfg(lbs->name, "Password file", str)) + show_admin_page(lbs); + else + show_config_page(lbs); + return; + } - /* if removed user is current user, do logout */ - if (equal_ustring(getparam("config"), getparam("unm"))) - { + if (equal_ustring(command, loc("Download")) || + equal_ustring(command, "Download")) { + show_download_page(lbs, dec_path); + return; + } + + if (equal_ustring(command, "getmd5")) { + show_md5_page(lbs, dec_path); + return; + } + + if (equal_ustring(command, loc("Synchronize"))) { + synchronize(lbs, dec_path); + return; + } + + if (equal_ustring(command, loc("Logout"))) { /* log activity */ logf(lbs, "LOGOUT"); - /* set cookies */ + if (getcfg(lbs->name, "Logout to main", str) && atoi(str) == 1) + setparam("redir", "../"); + set_login_cookies(lbs, "", ""); + return; + } + + if (equal_ustring(command, loc("Delete"))) { + show_elog_delete(lbs, message_id); + return; + } + + /* check for welcome page */ + if (!_cmdline[0] && getcfg(lbs->name, "Welcome page", str) && str[0]) { + /* check if file starts with an absolute directory */ + if (str[0] == DIR_SEPARATOR || str[1] == ':') + strcpy(file_name, str); + else { + strlcpy(file_name, resource_dir, sizeof(file_name)); + strlcat(file_name, str, sizeof(file_name)); } + send_file_direct(file_name); + return; + } - /* continue configuration as administrator */ - unsetparam("cfg_user"); - show_config_page(lbs); - return; - } + /* check for start page */ + if (!_cmdline[0] && getcfg(lbs->name, "Start page", str) && str[0]) { + redirect(lbs, str); + return; + } - if (equal_ustring(command, loc("New user"))) - { - show_new_user_page(lbs); - return; - } + /* show page listing or display single entry */ + if (dec_path[0] == 0) + show_elog_list(lbs, 0, 0, 1); + else + show_elog_message(lbs, dec_path, command); - if (equal_ustring(command, loc("Forgot"))) - { - show_forgot_pwd_page(lbs); - return; - } - - if (equal_ustring(command, loc("Config"))) - { - if (!getcfg(lbs->name, "Password file", str)) - show_admin_page(lbs); - else - show_config_page(lbs); - return; - } - - if (equal_ustring(command, loc("Download")) || - equal_ustring(command, "Download")) - { - show_download_page(lbs, dec_path); - return; - } - - if (equal_ustring(command, "getmd5")) - { - show_md5_page(lbs, dec_path); - return; - } - - if (equal_ustring(command, loc("Synchronize"))) - { - synchronize(lbs, dec_path); - return; - } - - if (equal_ustring(command, loc("Logout"))) - { - /* log activity */ - logf(lbs, "LOGOUT"); - - if (getcfg(lbs->name, "Logout to main", str) && - atoi(str) == 1) - setparam("redir", "../"); - - set_login_cookies(lbs, "", ""); - return; - } - - if (equal_ustring(command, loc("Delete"))) - { - show_elog_delete(lbs, message_id); - return; - } - - /* check for welcome page */ - if (!_cmdline[0] && getcfg(lbs->name, "Welcome page", str) && str[0]) - { - /* check if file starts with an absolute directory */ - if (str[0] == DIR_SEPARATOR || str[1] == ':') - strcpy(file_name, str); - else - { - strlcpy(file_name, resource_dir, sizeof(file_name)); - strlcat(file_name, str, sizeof(file_name)); - } - send_file_direct(file_name); - return; - } - - /* check for start page */ - if (!_cmdline[0] && getcfg(lbs->name, "Start page", str) && str[0]) - { - redirect(lbs, str); - return; - } - - /* show page listing or display single entry */ - if (dec_path[0] == 0) - show_elog_list(lbs, 0, 0, 1); - else - show_elog_message(lbs, dec_path, command); - - return; + return; } /*------------------------------------------------------------------*/ void decode_get(char *logbook, char *string) { -char path[256]; -char *p, *pitem; + char path[256]; + char *p, *pitem; - setparam("cmdline", string); + setparam("cmdline", string); - strlcpy(path, string, sizeof(path)); - path[255] = 0; - if (strchr(path, '?')) - *strchr(path, '?') = 0; - setparam("path", path); + strlcpy(path, string, sizeof(path)); + path[255] = 0; + if (strchr(path, '?')) + *strchr(path, '?') = 0; + setparam("path", path); - if (strchr(string, '?')) - { - p = strchr(string, '?')+1; + if (strchr(string, '?')) { + p = strchr(string, '?') + 1; - /* cut trailing "/" from netscape */ - if (p[strlen(p)-1] == '/') - p[strlen(p)-1] = 0; + /* cut trailing "/" from netscape */ + if (p[strlen(p) - 1] == '/') + p[strlen(p) - 1] = 0; - p = strtok(p, "&"); - while (p != NULL) - { - pitem = p; - p = strchr(p,'='); - if (p != NULL) - { - *p++ = 0; - url_decode(pitem); - url_decode(p); + p = strtok(p, "&"); + while (p != NULL) { + pitem = p; + p = strchr(p, '='); + if (p != NULL) { + *p++ = 0; + url_decode(pitem); + url_decode(p); - setparam(pitem, p); + setparam(pitem, p); - p = strtok(NULL, "&"); - } + p = strtok(NULL, "&"); + } } - } + } - interprete(logbook, path); + interprete(logbook, path); } /*------------------------------------------------------------------*/ -void decode_post(LOGBOOK *lbs, char *string, char *boundary, int length) +void decode_post(LOGBOOK * lbs, char *string, char *boundary, int length) { -int n_att; -char *pinit, *p, *ptmp, file_name[256], full_name[256], - str[NAME_LENGTH], line[NAME_LENGTH], item[NAME_LENGTH]; + int n_att; + char *pinit, *p, *ptmp, file_name[256], full_name[256], + str[NAME_LENGTH], line[NAME_LENGTH], item[NAME_LENGTH]; - n_att = 0; + n_att = 0; - pinit = string; + pinit = string; - /* return if no boundary defined */ - if (!boundary[0]) - return; + /* return if no boundary defined */ + if (!boundary[0]) + return; - if (strstr(string, boundary)) - string = strstr(string, boundary) + strlen(boundary); + if (strstr(string, boundary)) + string = strstr(string, boundary) + strlen(boundary); - do - { - if (strstr(string, "name=")) - { - strlcpy(line, strstr(string, "name=") + 5, sizeof(line)); + do { + if (strstr(string, "name=")) { + strlcpy(line, strstr(string, "name=") + 5, sizeof(line)); - if (strchr(line, '\r')) - *strchr(line, '\r') = 0; + if (strchr(line, '\r')) + *strchr(line, '\r') = 0; - if (strchr(line, '\n')) - *strchr(line, '\n') = 0; + if (strchr(line, '\n')) + *strchr(line, '\n') = 0; - strcpy(item, line); - if (item[0] == '\"') - { - strcpy(item, line+1); + strcpy(item, line); + if (item[0] == '\"') { + strcpy(item, line + 1); - if (strchr(item, '\"')) - *strchr(item, '\"') = 0; - } - else - if (strchr(item, ' ')) - *strchr(item, ' ') = 0; + if (strchr(item, '\"')) + *strchr(item, '\"') = 0; + } else if (strchr(item, ' ')) + *strchr(item, ' ') = 0; - if (strncmp(item, "attachment", 10) == 0) - { - /* attachment names from previous uploads */ - n_att = atoi(item+10)+1; - } + if (strncmp(item, "attachment", 10) == 0) { + /* attachment names from previous uploads */ + n_att = atoi(item + 10) + 1; + } - if (strncmp(item, "attfile", 7) == 0) - { - /* evaluate file attachment */ - if (strstr(string, "filename=")) - { - p = strstr(string, "filename=")+9; + if (strncmp(item, "attfile", 7) == 0) { + /* evaluate file attachment */ + if (strstr(string, "filename=")) { + p = strstr(string, "filename=") + 9; - if (*p == '\"') - p++; - if (strstr(p, "\r\n\r\n")) - string = strstr(p, "\r\n\r\n")+4; - else if (strstr(p, "\r\r\n\r\r\n")) - string = strstr(p, "\r\r\n\r\r\n")+6; - if (strchr(p, '\"')) - *strchr(p, '\"') = 0; + if (*p == '\"') + p++; + if (strstr(p, "\r\n\r\n")) + string = strstr(p, "\r\n\r\n") + 4; + else if (strstr(p, "\r\r\n\r\r\n")) + string = strstr(p, "\r\r\n\r\r\n") + 6; + if (strchr(p, '\"')) + *strchr(p, '\"') = 0; - /* set attachment filename */ - strcpy(file_name, p); + /* set attachment filename */ + strcpy(file_name, p); - if (file_name[0]) - { - if (verbose) - printf("decode_post: Found attachment %s\n", file_name); + if (file_name[0]) { + if (verbose) + printf("decode_post: Found attachment %s\n", + file_name); - /* check filename for invalid characters */ - if (strpbrk(file_name, ",;")) - { - sprintf(str, "Error: Filename \"%s\" contains invalid character", file_name); - show_error(str); - return; - } + /* check filename for invalid characters */ + if (strpbrk(file_name, ",;")) { + sprintf(str, + "Error: Filename \"%s\" contains invalid character", + file_name); + show_error(str); + return; + } + } + + /* find next boundary */ + ptmp = string; + do { + while (*ptmp != '-') + ptmp++; + + if ((p = strstr(ptmp, boundary)) != NULL) { + if (*(p - 1) == '-') + p--; + while (*p == '-') + p--; + if (*p == 10) + p--; + if (*p == 13) + p--; + p++; + break; + } else + ptmp += strlen(ptmp); + + } while (TRUE); + + /* save attachment */ + if (file_name[0]) { + el_submit_attachment(lbs, file_name, string, + (int) (p - string), full_name); + sprintf(str, "attachment%d", n_att++); + setparam(str, full_name); + } + + string = strstr(p, boundary) + strlen(boundary); + } else + string = strstr(string, boundary) + strlen(boundary); + + } else { + p = string; + if (strstr(p, "\r\n\r\n")) + p = strstr(p, "\r\n\r\n") + 4; + else if (strstr(p, "\r\r\n\r\r\n")) + p = strstr(p, "\r\r\n\r\r\n") + 6; + + if (strstr(p, boundary)) { + string = strstr(p, boundary) + strlen(boundary); + *strstr(p, boundary) = 0; + ptmp = p + (strlen(p) - 1); + while (*ptmp == '-') + *ptmp-- = 0; + while (*ptmp == '\n' || *ptmp == '\r') + *ptmp-- = 0; } - /* find next boundary */ - ptmp = string; - do - { - while (*ptmp != '-') - ptmp++; + if (setparam(item, p) == 0) + return; + } - if ((p = strstr(ptmp, boundary)) != NULL) - { - if (*(p-1) == '-') - p--; - while (*p == '-') - p--; - if (*p == 10) - p--; - if (*p == 13) - p--; - p++; - break; - } - else - ptmp += strlen(ptmp); - - } while (TRUE); - - /* save attachment */ - if (file_name[0]) - { - el_submit_attachment(lbs, file_name, string, (int)(p - string), full_name); - sprintf(str, "attachment%d", n_att++); - setparam(str, full_name); - } - - string = strstr(p, boundary) + strlen(boundary); - } - else - string = strstr(string, boundary) + strlen(boundary); - - } - else - { - p = string; - if (strstr(p, "\r\n\r\n")) - p = strstr(p, "\r\n\r\n")+4; - else if (strstr(p, "\r\r\n\r\r\n")) - p = strstr(p, "\r\r\n\r\r\n")+6; - - if (strstr(p, boundary)) - { - string = strstr(p, boundary) + strlen(boundary); - *strstr(p, boundary) = 0; - ptmp = p + (strlen(p) - 1); - while (*ptmp == '-') - *ptmp-- = 0; - while (*ptmp == '\n' || *ptmp == '\r') - *ptmp-- = 0; - } - - if (setparam(item, p) == 0) - return; - } - - while (*string == '-' || *string == '\n' || *string == '\r') - string++; + while (*string == '-' || *string == '\n' || *string == '\r') + string++; } - } while ((int)(string - pinit) < length); + } while ((int) (string - pinit) < length); - interprete(lbs->name, ""); + interprete(lbs->name, ""); } /*------------------------------------------------------------------*/ @@ -13466,13 +13092,13 @@ BOOL _abort = FALSE; void ctrlc_handler(int sig) { - _abort = TRUE; + _abort = TRUE; } void hup_handler(int sig) { - /* reload configuration */ - check_config(); + /* reload configuration */ + check_config(); } /*------------------------------------------------------------------*/ @@ -13487,1119 +13113,1051 @@ char remote_host[N_MAX_CONNECTION][256]; void server_loop(int tcp_port, int daemon) { -int status, i, n, n_error, authorized, min, i_min, i_conn, length; -struct sockaddr_in serv_addr, acc_addr; -char pwd[256], str[256], url[256], cl_pwd[256], *p, *pd; -char cookie[256], boundary[256], list[1000], theme[256], - host_list[MAX_N_LIST][NAME_LENGTH], - rem_host_ip[256], logbook[256], logbook_enc[256]; -int lsock, len, flag, content_length, header_length; -struct hostent *phe; -fd_set readfds; -struct timeval timeout; -char *net_buffer = NULL; -int net_buffer_size; + int status, i, n, n_error, authorized, min, i_min, i_conn, length; + struct sockaddr_in serv_addr, acc_addr; + char pwd[256], str[256], url[256], cl_pwd[256], *p, *pd; + char cookie[256], boundary[256], list[1000], theme[256], + host_list[MAX_N_LIST][NAME_LENGTH], + rem_host_ip[256], logbook[256], logbook_enc[256]; + int lsock, len, flag, content_length, header_length; + struct hostent *phe; + fd_set readfds; + struct timeval timeout; + char *net_buffer = NULL; + int net_buffer_size; - net_buffer_size = 100000; - net_buffer = malloc(net_buffer_size); + net_buffer_size = 100000; + net_buffer = malloc(net_buffer_size); - return_buffer_size = 100000; - return_buffer = malloc(return_buffer_size); + return_buffer_size = 100000; + return_buffer = malloc(return_buffer_size); #ifdef OS_WINNT - { - WSADATA WSAData; + { + WSADATA WSAData; - /* Start windows sockets */ - if ( WSAStartup(MAKEWORD(1,1), &WSAData) != 0) - return; - } + /* Start windows sockets */ + if (WSAStartup(MAKEWORD(1, 1), &WSAData) != 0) + return; + } #endif - /* create a new socket */ - lsock = socket(AF_INET, SOCK_STREAM, 0); + /* create a new socket */ + lsock = socket(AF_INET, SOCK_STREAM, 0); - if (lsock == -1) - { - printf("Cannot create socket\n"); - return; - } - - /* bind local node name and port to socket */ - memset(&serv_addr, 0, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - - /* if no hostname given with the -h flag, listen on any interface */ - if (tcp_hostname[0] == 0) - serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); - else - { - /* look up the given hostname. gethostbyname() will take a hostname - or an IP address */ - phe = gethostbyname(tcp_hostname); - if (!phe) - { - printf("Cannot find address for -h %s\n", tcp_hostname); + if (lsock == -1) { + printf("Cannot create socket\n"); return; + } + + /* bind local node name and port to socket */ + memset(&serv_addr, 0, sizeof(serv_addr)); + serv_addr.sin_family = AF_INET; + + /* if no hostname given with the -h flag, listen on any interface */ + if (tcp_hostname[0] == 0) + serv_addr.sin_addr.s_addr = htonl(INADDR_ANY); + else { + /* look up the given hostname. gethostbyname() will take a hostname + or an IP address */ + phe = gethostbyname(tcp_hostname); + if (!phe) { + printf("Cannot find address for -h %s\n", tcp_hostname); + return; } - if (phe->h_addrtype != AF_INET) - { - printf("Non Internet address for -h %s\n", tcp_hostname); + if (phe->h_addrtype != AF_INET) { + printf("Non Internet address for -h %s\n", tcp_hostname); + return; + } + memcpy(&serv_addr.sin_addr.s_addr, phe->h_addr_list[0], + phe->h_length); + } + + serv_addr.sin_port = htons((short) tcp_port); + + /* try reusing address */ + flag = 1; + setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, + sizeof(INT)); + + status = bind(lsock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)); + if (status < 0) { + printf + ("Cannot bind to port %d.\nPlease try later or use the \"-p\" flag to specify a different port\n", + tcp_port); return; - } - memcpy(&serv_addr.sin_addr.s_addr, phe->h_addr_list[0], phe->h_length); - } + } - serv_addr.sin_port = htons((short) tcp_port); + /* get host name for mail notification */ + gethostname(host_name, sizeof(host_name)); - /* try reusing address */ - flag = 1; - setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof(INT)); + phe = gethostbyname(host_name); + if (phe != NULL) + phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); - status = bind(lsock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)); - if (status < 0) - { - printf("Cannot bind to port %d.\nPlease try later or use the \"-p\" flag to specify a different port\n", tcp_port); - return; - } + /* if domain name is not in host name, hope to get it from phe */ + if (strchr(host_name, '.') == NULL && phe != NULL) + strcpy(host_name, phe->h_name); - /* get host name for mail notification */ - gethostname(host_name, sizeof(host_name)); - - phe = gethostbyname(host_name); - if (phe != NULL) - phe = gethostbyaddr(phe->h_addr, sizeof(int), AF_INET); - - /* if domain name is not in host name, hope to get it from phe */ - if (strchr(host_name, '.') == NULL && phe != NULL) - strcpy(host_name, phe->h_name); - - /* open configuration file */ - getcfg("dummy", "dummy", str); - - /* initiate daemon */ - if (daemon) - { - printf("Becoming a daemon...\n"); - ss_daemon_init(); - } + /* open configuration file */ + getcfg("dummy", "dummy", str); + /* initiate daemon */ + if (daemon) { + printf("Becoming a daemon...\n"); + ss_daemon_init(); + } #ifdef OS_UNIX - /* create PID file if given as command line parameter or if running under root */ + /* create PID file if given as command line parameter or if running under root */ - if (geteuid() == 0 || pidfile[0]) - { - int fd; - char buf[20]; - struct stat finfo; + if (geteuid() == 0 || pidfile[0]) { + int fd; + char buf[20]; + struct stat finfo; - if (pidfile[0] == 0) - strcpy(pidfile, PIDFILE); + if (pidfile[0] == 0) + strcpy(pidfile, PIDFILE); - /* check if file exists */ - if (stat(pidfile, &finfo) >= 0) - { - printf("File \"%s\" exists, using \"%s.%d\" instead.\n", pidfile, pidfile, tcp_port); - sprintf(pidfile + strlen(pidfile), ".%d", tcp_port); + /* check if file exists */ + if (stat(pidfile, &finfo) >= 0) { + printf("File \"%s\" exists, using \"%s.%d\" instead.\n", pidfile, + pidfile, tcp_port); + sprintf(pidfile + strlen(pidfile), ".%d", tcp_port); - /* check again for the new name */ - if (stat(pidfile, &finfo) >= 0) - { - /* never overwrite a file */ - printf("Refuse to overwrite existing file \"%s\".\n", pidfile); - exit(EXIT_FAILURE); - } + /* check again for the new name */ + if (stat(pidfile, &finfo) >= 0) { + /* never overwrite a file */ + printf("Refuse to overwrite existing file \"%s\".\n", pidfile); + exit(EXIT_FAILURE); + } } - fd = open(pidfile, O_CREAT | O_RDWR, 0644); - if (fd < 0) - { - sprintf(str, "Error creating pid file \"%s\"", pidfile); - perror(str); + fd = open(pidfile, O_CREAT | O_RDWR, 0644); + if (fd < 0) { + sprintf(str, "Error creating pid file \"%s\"", pidfile); + perror(str); + exit(EXIT_FAILURE); + } + + sprintf(buf, "%d\n", (int) getpid()); + if (write(fd, buf, strlen(buf)) == -1) { + sprintf(str, "Error writing to pid file \"%s\"", pidfile); + perror(str); + exit(EXIT_FAILURE); + } + close(fd); + } + + /* install signal handler */ + signal(SIGTERM, ctrlc_handler); + signal(SIGINT, ctrlc_handler); + signal(SIGPIPE, SIG_IGN); + signal(SIGHUP, hup_handler); + + /* give up root privilege */ + + if (geteuid() == 0) { + if (!getcfg("global", "Grp", str) || setgroup(str) < 0) { + printf("Falling back to default group \"elog\"\n"); + if (setgroup("elog") < 0) { + printf("Falling back to default group \"%s\"\n", + DEFAULT_GROUP); + if (setgroup(DEFAULT_GROUP) < 0) { + printf("Refuse to run as setgid root.\n"); + printf + ("Please consider to define a Grp statement in configuration file\n"); + exit(EXIT_FAILURE); + } + } + } + + if (!getcfg("global", "Usr", str) || setuser(str) < 0) { + printf("Falling back to default user \"elog\"\n"); + if (setuser("elog") < 0) { + printf("Falling back to default user \"%s\"\n", DEFAULT_USER); + if (setuser(DEFAULT_USER) < 0) { + printf("Refuse to run as setuid root.\n"); + printf + ("Please consider to define a Usr statement in configuration file\n"); + exit(EXIT_FAILURE); + } + } + } + } +#endif + + /* load initial configuration */ + check_config(); + + /* build logbook indices */ + if (el_index_logbooks(FALSE) != EL_SUCCESS) exit(EXIT_FAILURE); - } - sprintf(buf, "%d\n", (int)getpid()); - if (write(fd, buf, strlen(buf)) == -1) - { - sprintf(str, "Error writing to pid file \"%s\"", pidfile); - perror(str); - exit(EXIT_FAILURE); - } - close(fd); - } + /* listen for connection */ + status = listen(lsock, SOMAXCONN); + if (status < 0) { + printf("Cannot listen\n"); + return; + } - /* install signal handler */ - signal(SIGTERM, ctrlc_handler); - signal(SIGINT, ctrlc_handler); - signal(SIGPIPE, SIG_IGN); - signal(SIGHUP, hup_handler); + printf("Server listening on port %d...\n", tcp_port); + do { + FD_ZERO(&readfds); + FD_SET(lsock, &readfds); - /* give up root privilege */ + for (i = 0; i < N_MAX_CONNECTION; i++) + if (ka_sock[i] > 0) + FD_SET(ka_sock[i], &readfds); - if (geteuid() == 0) - { - if (!getcfg("global", "Grp", str) || setgroup(str) < 0) - { - printf("Falling back to default group \"elog\"\n"); - if (setgroup("elog") < 0) - { - printf("Falling back to default group \"%s\"\n", DEFAULT_GROUP); - if (setgroup(DEFAULT_GROUP) < 0) - { - printf("Refuse to run as setgid root.\n"); - printf("Please consider to define a Grp statement in configuration file\n"); - exit(EXIT_FAILURE); - } - } - } + timeout.tv_sec = 0; + timeout.tv_usec = 100000; - if (!getcfg("global", "Usr", str) || setuser(str) < 0) - { - printf("Falling back to default user \"elog\"\n"); - if (setuser("elog") < 0) - { - printf("Falling back to default user \"%s\"\n", DEFAULT_USER); - if (setuser(DEFAULT_USER) < 0) - { - printf("Refuse to run as setuid root.\n"); - printf("Please consider to define a Usr statement in configuration file\n"); - exit(EXIT_FAILURE); - } - } - } - } + status = + select(FD_SETSIZE, (void *) &readfds, NULL, NULL, + (void *) &timeout); + + if (_abort) + break; + + if (FD_ISSET(lsock, &readfds)) { + len = sizeof(acc_addr); + _sock = accept(lsock, (struct sockaddr *) &acc_addr, &len); + + /* find new entry in socket table */ + for (i = 0; i < N_MAX_CONNECTION; i++) + if (ka_sock[i] == 0) + break; + + /* recycle last connection */ + if (i == N_MAX_CONNECTION) { + for (i = i_min = 0, min = ka_time[0]; i < N_MAX_CONNECTION; + i++) + if (ka_time[i] < min) { + min = ka_time[i]; + i_min = i; + } + + closesocket(ka_sock[i_min]); + ka_sock[i_min] = 0; + i = i_min; + +#ifdef DEBUG_CONN + printf("## close connection %d\n", i_min); #endif + } - /* load initial configuration */ - check_config(); + i_conn = i; + ka_sock[i_conn] = _sock; + ka_time[i_conn] = (int) time(NULL); - /* build logbook indices */ - if (el_index_logbooks(FALSE) != EL_SUCCESS) - exit(EXIT_FAILURE); + /* save remote host address */ + memcpy(&remote_addr[i_conn], &(acc_addr.sin_addr), + sizeof(rem_addr)); + memcpy(&rem_addr, &(acc_addr.sin_addr), sizeof(rem_addr)); - /* listen for connection */ - status = listen(lsock, SOMAXCONN); - if (status < 0) - { - printf("Cannot listen\n"); - return; - } + phe = gethostbyaddr((char *) &rem_addr, 4, PF_INET); + if (phe != NULL) + strcpy(remote_host[i_conn], phe->h_name); + else + strcpy(remote_host[i_conn], (char *) inet_ntoa(rem_addr)); - printf("Server listening on port %d...\n", tcp_port); - do - { - FD_ZERO(&readfds); - FD_SET(lsock, &readfds); + strcpy(rem_host, remote_host[i_conn]); - for (i=0 ; i 0) - FD_SET(ka_sock[i], &readfds); +#ifdef DEBUG_CONN + printf("## open new connection %d\n", i_conn); +#endif + } - timeout.tv_sec = 0; - timeout.tv_usec = 100000; + else { + /* check if open connection received data */ + for (i = 0; i < N_MAX_CONNECTION; i++) + if (ka_sock[i] > 0 && FD_ISSET(ka_sock[i], &readfds)) + break; - status = select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); + if (i == N_MAX_CONNECTION) { + _sock = 0; + } else { + i_conn = i; + _sock = ka_sock[i_conn]; + ka_time[i_conn] = (int) time(NULL); + memcpy(&rem_addr, &remote_addr[i_conn], sizeof(rem_addr)); + strcpy(rem_host, remote_host[i_conn]); - if (_abort) - break; +#ifdef DEBUG_CONN + printf("## received request on connection %d\n", i_conn); +#endif + } + } - if (FD_ISSET(lsock, &readfds)) - { - len = sizeof(acc_addr); - _sock = accept(lsock, (struct sockaddr *) &acc_addr, &len); + /* turn off keep_alive by default */ + keep_alive = FALSE; - /* find new entry in socket table */ - for (i=0 ; i 0) { + memset(net_buffer, 0, net_buffer_size); + len = 0; + header_length = 0; + n_error = 0; + do { + FD_ZERO(&readfds); + FD_SET(_sock, &readfds); - /* recycle last connection */ - if (i == N_MAX_CONNECTION) - { - for (i=i_min=0,min=ka_time[0] ; i 0) + len += i; + + /* check if net_buffer needs to be increased */ + if (len == net_buffer_size) { + net_buffer = realloc(net_buffer, net_buffer_size + 100000); + + if (net_buffer == NULL) { + sprintf(str, + "Error: Cannot increase net_buffer, out of memory, net_buffer_size = %d", + net_buffer_size); + show_error(str); + send(_sock, return_buffer, strlen_retbuf + 1, 0); + keep_alive = 0; + if (verbose) { + printf + ("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); + } + goto finished; + } + + memset(net_buffer + net_buffer_size, 0, 100000); + net_buffer_size += 100000; } - closesocket(ka_sock[i_min]); - ka_sock[i_min] = 0; - i = i_min; + if (i == 0) { + n_error++; + if (n_error == 100) + goto finished; + } -#ifdef DEBUG_CONN - printf("## close connection %d\n", i_min); -#endif - } + /* finish when empty line received */ + if (strstr(net_buffer, "GET") != NULL + && strstr(net_buffer, "POST") == NULL) { + if (len > 4 + && strcmp(&net_buffer[len - 4], "\r\n\r\n") == 0) + break; + if (len > 6 + && strcmp(&net_buffer[len - 6], "\r\r\n\r\r\n") == 0) + break; + } else if (strstr(net_buffer, "POST") != NULL) { + if (header_length == 0) { + /* extract logbook */ + strlcpy(str, net_buffer + 6, sizeof(str)); + if (strstr(str, "HTTP")) + *(strstr(str, "HTTP") - 1) = 0; + strlcpy(logbook, str, sizeof(logbook)); + strlcpy(logbook_enc, str, sizeof(logbook)); + url_decode(logbook); - i_conn = i; - ka_sock[i_conn] = _sock; - ka_time[i_conn] = (int) time(NULL); + /* extract header and content length */ + if (strstr(net_buffer, "Content-Length:")) + content_length = + atoi(strstr(net_buffer, "Content-Length:") + 15); + else if (strstr(net_buffer, "Content-length:")) + content_length = + atoi(strstr(net_buffer, "Content-length:") + 15); - /* save remote host address */ - memcpy(&remote_addr[i_conn], &(acc_addr.sin_addr), sizeof(rem_addr)); - memcpy(&rem_addr, &(acc_addr.sin_addr), sizeof(rem_addr)); + boundary[0] = 0; + if (strstr(net_buffer, "boundary=")) { + strlcpy(boundary, strstr(net_buffer, "boundary=") + 9, + sizeof(boundary)); + if (strchr(boundary, '\r')) + *strchr(boundary, '\r') = 0; + } - phe = gethostbyaddr((char *) &rem_addr, 4, PF_INET); - if (phe != NULL) - strcpy(remote_host[i_conn], phe->h_name); - else - strcpy(remote_host[i_conn], (char *)inet_ntoa(rem_addr)); + if (strstr(net_buffer, "\r\n\r\n")) + header_length = + (INT) strstr(net_buffer, + "\r\n\r\n") - (INT) net_buffer + 4; - strcpy(rem_host, remote_host[i_conn]); + if (strstr(net_buffer, "\r\r\n\r\r\n")) + header_length = + (INT) strstr(net_buffer, + "\r\r\n\r\r\n") - (INT) net_buffer + + 6; -#ifdef DEBUG_CONN - printf("## open new connection %d\n", i_conn); -#endif - } + if (header_length) + net_buffer[header_length - 1] = 0; + } - else - { - /* check if open connection received data */ - for (i= 0 ; i 0 && FD_ISSET(ka_sock[i], &readfds)) - break; + if (header_length > 0 + && len >= header_length + content_length) + break; + } else if (strstr(net_buffer, "HEAD") != NULL) { + /* just return header */ + rsprintf("HTTP/1.1 200 OK\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + rsprintf("Connection: close\r\n"); + rsprintf("Content-Type: text/html\r\n\r\n"); - if (i == N_MAX_CONNECTION) - { - _sock = 0; - } - else - { - i_conn = i; - _sock = ka_sock[i_conn]; - ka_time[i_conn] = (int) time(NULL); - memcpy(&rem_addr, &remote_addr[i_conn], sizeof(rem_addr)); - strcpy(rem_host, remote_host[i_conn]); + keep_alive = FALSE; + return_length = strlen_retbuf + 1; + send(_sock, return_buffer, return_length, 0); -#ifdef DEBUG_CONN - printf("## received request on connection %d\n", i_conn); -#endif - } - } + goto finished; + } else if (strstr(net_buffer, "OPTIONS") != NULL) + goto finished; + else { + puts(net_buffer); + goto finished; + } - /* turn off keep_alive by default */ - keep_alive = FALSE; + } while (1); - if (_sock > 0) - { - memset(net_buffer, 0, net_buffer_size); - len = 0; - header_length = 0; - n_error = 0; - do - { - FD_ZERO(&readfds); - FD_SET(_sock, &readfds); - - timeout.tv_sec = 6; - timeout.tv_usec = 0; - - status = select(FD_SETSIZE, (void *) &readfds, NULL, NULL, (void *) &timeout); - - if (FD_ISSET(_sock, &readfds)) - i = recv(_sock, net_buffer+len, net_buffer_size-len, 0); - else - goto finished; - - /* abort if connection got broken */ - if (i<0) - goto finished; - - if (i>0) - len += i; - - /* check if net_buffer needs to be increased */ - if (len == net_buffer_size) - { - net_buffer = realloc(net_buffer, net_buffer_size + 100000); - - if (net_buffer == NULL) - { - sprintf(str, "Error: Cannot increase net_buffer, out of memory, net_buffer_size = %d", net_buffer_size); - show_error(str); - send(_sock, return_buffer, strlen_retbuf+1, 0); - keep_alive = 0; - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); - } + if (!strchr(net_buffer, '\r')) goto finished; - } - memset(net_buffer + net_buffer_size, 0, 100000); - net_buffer_size += 100000; - } + if (verbose) { + puts("\n"); + puts(net_buffer); + } - if (i == 0) - { - n_error++; - if (n_error == 100) - goto finished; - } + /* initialize parametr array */ + initparam(); - /* finish when empty line received */ - if (strstr(net_buffer, "GET") != NULL && strstr(net_buffer, "POST") == NULL) - { - if (len>4 && strcmp(&net_buffer[len-4], "\r\n\r\n") == 0) - break; - if (len>6 && strcmp(&net_buffer[len-6], "\r\r\n\r\r\n") == 0) - break; - } - else if (strstr(net_buffer, "POST") != NULL) - { - if (header_length == 0) - { - /* extract logbook */ - strlcpy(str, net_buffer+6, sizeof(str)); - if (strstr(str, "HTTP")) - *(strstr(str, "HTTP")-1) = 0; - strlcpy(logbook, str, sizeof(logbook)); - strlcpy(logbook_enc, str, sizeof(logbook)); - url_decode(logbook); + /* extract cookies */ + if ((p = strstr(net_buffer, "Cookie:")) != NULL) { + p += 6; + do { + p++; + while (*p && *p == ' ') + p++; + strlcpy(str, p, sizeof(str)); - /* extract header and content length */ - if (strstr(net_buffer, "Content-Length:")) - content_length = atoi(strstr(net_buffer, "Content-Length:") + 15); - else if (strstr(net_buffer, "Content-length:")) - content_length = atoi(strstr(net_buffer, "Content-length:") + 15); + for (i = 0; i < (int) strlen(str); i++) + if (str[i] == '=' || str[i] == ';') + break; - boundary[0] = 0; - if (strstr(net_buffer, "boundary=")) - { - strlcpy(boundary, strstr(net_buffer, "boundary=")+9, sizeof(boundary)); - if (strchr(boundary, '\r')) - *strchr(boundary, '\r') = 0; - } + if (str[i] == '=') { + str[i] = 0; + p += i + 1; + for (i = 0; *p && *p != ';' && *p != '\r' && *p != '\n'; + i++) + cookie[i] = *p++; + cookie[i] = 0; + } else { + /* empty cookie */ + str[i] = 0; + cookie[0] = 0; + p += i; + } - if (strstr(net_buffer, "\r\n\r\n")) - header_length = (INT)strstr(net_buffer, "\r\n\r\n") - (INT)net_buffer + 4; + /* store cookie as parameter */ + setparam(str, cookie); + } while (*p && *p == ';'); + } - if (strstr(net_buffer, "\r\r\n\r\r\n")) - header_length = (INT)strstr(net_buffer, "\r\r\n\r\r\n") - (INT)net_buffer + 6; + /* extract referer */ + referer[0] = 0; + if ((p = strstr(net_buffer, "Referer:")) != NULL) { + p += 9; + while (*p && *p == ' ') + p++; + strlcpy(referer, p, sizeof(referer)); + if (strchr(referer, '\r')) + *strchr(referer, '\r') = 0; + if (strchr(referer, '?')) + *strchr(referer, '?') = 0; + for (p = referer + strlen(referer) - 1; + p > referer && *p != '/'; p--) + *p = 0; - if (header_length) - net_buffer[header_length-1] = 0; - } + if (strchr(referer, ' ')) + url_encode(referer, sizeof(referer)); + } - if (header_length > 0 && len >= header_length+content_length) - break; - } - else if (strstr(net_buffer, "HEAD") != NULL) - { - /* just return header */ - rsprintf("HTTP/1.1 200 OK\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - rsprintf("Connection: close\r\n"); - rsprintf("Content-Type: text/html\r\n\r\n"); + /* extract browser */ + browser[0] = 0; + if ((p = strstr(net_buffer, "User-Agent:")) != NULL) { + p += 11; + while (*p && *p == ' ') + p++; + strlcpy(browser, p, sizeof(browser)); + if (strchr(browser, '\r')) + *strchr(browser, '\r') = 0; + } - keep_alive = FALSE; - return_length = strlen_retbuf+1; - send(_sock, return_buffer, return_length, 0); - - goto finished; - } - else if (strstr(net_buffer, "OPTIONS") != NULL) - goto finished; - else - { - puts(net_buffer); - goto finished; - } - - } while (1); - - if (!strchr(net_buffer, '\r')) - goto finished; - - if (verbose) - { - puts("\n"); - puts(net_buffer); - } - - /* initialize parametr array */ - initparam(); - - /* extract cookies */ - if ((p = strstr(net_buffer, "Cookie:")) != NULL) - { - p += 6; - do - { - p++; - while (*p && *p == ' ') - p++; - strlcpy(str, p, sizeof(str)); - - for (i=0 ; i<(int)strlen(str) ; i++) - if (str[i] == '=' || str[i] == ';') - break; - - if (str[i] == '=') - { - str[i] = 0; - p += i+1; - for (i=0 ; *p && *p != ';' && *p != '\r' && *p != '\n' ; i++) - cookie[i] = *p++; - cookie[i] = 0; - } - else - { - /* empty cookie */ - str[i] = 0; - cookie[0] = 0; - p += i; - } - - /* store cookie as parameter */ - setparam(str, cookie); - } while (*p && *p == ';'); - } - - /* extract referer */ - referer[0] = 0; - if ((p = strstr(net_buffer, "Referer:")) != NULL) - { - p += 9; - while (*p && *p == ' ') - p++; - strlcpy(referer, p, sizeof(referer)); - if (strchr(referer, '\r')) - *strchr(referer, '\r') = 0; - if (strchr(referer, '?')) - *strchr(referer, '?') = 0; - for (p=referer+strlen(referer)-1 ; p>referer && *p != '/' ; p--) - *p = 0; - - if (strchr(referer, ' ')) - url_encode(referer, sizeof(referer)); - } - - /* extract browser */ - browser[0] = 0; - if ((p = strstr(net_buffer, "User-Agent:")) != NULL) - { - p += 11; - while (*p && *p == ' ') - p++; - strlcpy(browser, p, sizeof(browser)); - if (strchr(browser, '\r')) - *strchr(browser, '\r') = 0; - } - - /* extract "X-Forwarded-For:" */ - if ((p = strstr(net_buffer, "X-Forwarded-For:")) != NULL) - { - p += 16; - while (*p && *p == ' ') - p++; - strlcpy(str, p, sizeof(str)); - if (strchr(str, '\r')) - *strchr(str, '\r') = 0; + /* extract "X-Forwarded-For:" */ + if ((p = strstr(net_buffer, "X-Forwarded-For:")) != NULL) { + p += 16; + while (*p && *p == ' ') + p++; + strlcpy(str, p, sizeof(str)); + if (strchr(str, '\r')) + *strchr(str, '\r') = 0; #ifdef _MSC_VER - rem_addr.S_un.S_addr = inet_addr(str); + rem_addr.S_un.S_addr = inet_addr(str); #else - rem_addr.s_addr = inet_addr(str); + rem_addr.s_addr = inet_addr(str); #endif - phe = gethostbyaddr((char *) &rem_addr, 4, PF_INET); - if (phe != NULL) - { - strcpy(remote_host[i_conn], phe->h_name); - strcpy(rem_host, remote_host[i_conn]); - } - } - - memset(return_buffer, 0, return_buffer_size); - strlen_retbuf = 0; - - if (strncmp(net_buffer, "GET", 3) != 0 && - strncmp(net_buffer, "POST", 4) != 0) - goto finished; - - return_length = 0; - - /* extract logbook */ - if (strchr(net_buffer, '/') == NULL || - strchr(net_buffer, '\r') == NULL || - strstr(net_buffer, "HTTP") == NULL) - { - /* invalid request, make valid */ - strcpy(net_buffer, "GET / HTTP/1.0\r\n\r\n"); - } - - p = strchr(net_buffer, '/')+1; - logbook[0] = 0; - for (i=0 ; *p && *p != '/' && *p != '?' && *p != ' '; i++) - logbook[i] = *p++; - logbook[i] = 0; - strcpy(logbook_enc, logbook); - url_decode(logbook); - - /* check for trailing '/' after logbook */ - if (strstr(net_buffer, "POST") == NULL) // fix for konqueror - { - if (logbook[0] && *p == ' ') - { - if (!strstr(logbook, ".css") && - !strstr(logbook, ".htm") && - !strstr(logbook, ".gif") && - !strstr(logbook, ".jpg")) - { - sprintf(str, "%s/", logbook_enc); - redirect(NULL, str); - goto redir; + phe = gethostbyaddr((char *) &rem_addr, 4, PF_INET); + if (phe != NULL) { + strcpy(remote_host[i_conn], phe->h_name); + strcpy(rem_host, remote_host[i_conn]); } - } - } + } - /* check for trailing '/' after logbook/ID */ - if (logbook[0] && *p == '/' && *(p+1) != ' ') - { - sprintf(url, "%s", logbook_enc); - pd = url+strlen(url); + memset(return_buffer, 0, return_buffer_size); + strlen_retbuf = 0; - while (*p && *p != ' ') - *pd++ = *p++; - *pd = 0; + if (strncmp(net_buffer, "GET", 3) != 0 && + strncmp(net_buffer, "POST", 4) != 0) + goto finished; - if (*(p-1) == '/') - { - sprintf(str, "Invalid URL: %s", url); - show_error(str); - send(_sock, return_buffer, strlen_retbuf+1, 0); - keep_alive = 0; - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); + return_length = 0; + + /* extract logbook */ + if (strchr(net_buffer, '/') == NULL || + strchr(net_buffer, '\r') == NULL || + strstr(net_buffer, "HTTP") == NULL) { + /* invalid request, make valid */ + strcpy(net_buffer, "GET / HTTP/1.0\r\n\r\n"); + } + + p = strchr(net_buffer, '/') + 1; + logbook[0] = 0; + for (i = 0; *p && *p != '/' && *p != '?' && *p != ' '; i++) + logbook[i] = *p++; + logbook[i] = 0; + strcpy(logbook_enc, logbook); + url_decode(logbook); + + /* check for trailing '/' after logbook */ + if (strstr(net_buffer, "POST") == NULL) // fix for konqueror + { + if (logbook[0] && *p == ' ') { + if (!strstr(logbook, ".css") && + !strstr(logbook, ".htm") && + !strstr(logbook, ".gif") && !strstr(logbook, ".jpg")) { + sprintf(str, "%s/", logbook_enc); + redirect(NULL, str); + goto redir; + } } - goto finished; - } - } + } + /* check for trailing '/' after logbook/ID */ + if (logbook[0] && *p == '/' && *(p + 1) != ' ') { + sprintf(url, "%s", logbook_enc); + pd = url + strlen(url); + + while (*p && *p != ' ') + *pd++ = *p++; + *pd = 0; + + if (*(p - 1) == '/') { + sprintf(str, "Invalid URL: %s", url); + show_error(str); + send(_sock, return_buffer, strlen_retbuf + 1, 0); + keep_alive = 0; + if (verbose) { + printf("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); + } + goto finished; + } + } #ifdef OS_WINNT - /* under windows, check if configuration changed (via stat()) once each access */ - check_config(); + /* under windows, check if configuration changed (via stat()) once each access */ + check_config(); - /* under unix, rely on "kill -HUP elogd" */ + /* under unix, rely on "kill -HUP elogd" */ #endif - /* check if logbook exists */ - for (i=0 ; ; i++) - { - if (!enumgrp(i, str)) - break; - if (equal_ustring(logbook, str)) - break; - } + /* check if logbook exists */ + for (i = 0;; i++) { + if (!enumgrp(i, str)) + break; + if (equal_ustring(logbook, str)) + break; + } - if (strstr(logbook, ".gif") || strstr(logbook, ".jpg") || - strstr(logbook, ".jpg") || strstr(logbook, ".png") || - strstr(logbook, ".htm") || strstr(logbook, ".css")) - { - /* check if file in resource directory */ - strlcpy(str, resource_dir, sizeof(str)); - strlcat(str, logbook, sizeof(str)); - if (exist_file(str)) - send_file_direct(str); - else - { - /* else search file in themes directory */ - strlcpy(str, resource_dir, sizeof(str)); - strlcat(str, "themes", sizeof(str)); - strlcat(str, DIR_SEPARATOR_STR, sizeof(str)); + if (strstr(logbook, ".gif") || strstr(logbook, ".jpg") || + strstr(logbook, ".jpg") || strstr(logbook, ".png") || + strstr(logbook, ".htm") || strstr(logbook, ".css")) { + /* check if file in resource directory */ + strlcpy(str, resource_dir, sizeof(str)); + strlcat(str, logbook, sizeof(str)); + if (exist_file(str)) + send_file_direct(str); + else { + /* else search file in themes directory */ + strlcpy(str, resource_dir, sizeof(str)); + strlcat(str, "themes", sizeof(str)); + strlcat(str, DIR_SEPARATOR_STR, sizeof(str)); - if (getcfg("global", "theme", theme)) - strlcat(str, theme, sizeof(str)); - else - strlcat(str, "default", sizeof(str)); + if (getcfg("global", "theme", theme)) + strlcat(str, theme, sizeof(str)); + else + strlcat(str, "default", sizeof(str)); - strlcat(str, DIR_SEPARATOR_STR, sizeof(str)); - strlcat(str, logbook, sizeof(str)); - send_file_direct(str); - } - - send(_sock, return_buffer, return_length, 0); - - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); - } - - goto finished; - } - else - { - if (!equal_ustring(logbook, str) && logbook[0]) - { - sprintf(str, "Error: logbook \"%s\" not defined in elogd.cfg", logbook); - show_error(str); - send(_sock, return_buffer, strlen(return_buffer), 0); - - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); + strlcat(str, DIR_SEPARATOR_STR, sizeof(str)); + strlcat(str, logbook, sizeof(str)); + send_file_direct(str); } - goto finished; - } - } - /* if no logbook is given and only one logbook defined, use this one */ - if (!logbook[0]) - { - for (i=n=0 ; ; i++) - { - if (!enumgrp(i, str)) - break; - if (!equal_ustring(str, "global")) - n++; - } + send(_sock, return_buffer, return_length, 0); - if (n == 1) - { - strlcpy(logbook, str, sizeof(logbook)); - strlcpy(logbook_enc, logbook, sizeof(logbook_enc)); - url_encode(logbook_enc, sizeof(logbook_enc)); - strlcat(logbook_enc, "/", sizeof(logbook_enc)); - - /* redirect to logbook, necessary to get optional cookies for that logbook */ - redirect(NULL, logbook_enc); - - send(_sock, return_buffer, strlen(return_buffer), 0); - - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); + if (verbose) { + printf("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); } - goto finished; - } - } + + goto finished; + } else { + if (!equal_ustring(logbook, str) && logbook[0]) { + sprintf(str, + "Error: logbook \"%s\" not defined in elogd.cfg", + logbook); + show_error(str); + send(_sock, return_buffer, strlen(return_buffer), 0); + + if (verbose) { + printf("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); + } + goto finished; + } + } + + /* if no logbook is given and only one logbook defined, use this one */ + if (!logbook[0]) { + for (i = n = 0;; i++) { + if (!enumgrp(i, str)) + break; + if (!equal_ustring(str, "global")) + n++; + } + + if (n == 1) { + strlcpy(logbook, str, sizeof(logbook)); + strlcpy(logbook_enc, logbook, sizeof(logbook_enc)); + url_encode(logbook_enc, sizeof(logbook_enc)); + strlcat(logbook_enc, "/", sizeof(logbook_enc)); + + /* redirect to logbook, necessary to get optional cookies for that logbook */ + redirect(NULL, logbook_enc); + + send(_sock, return_buffer, strlen(return_buffer), 0); + + if (verbose) { + printf("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); + } + goto finished; + } + } /*---- check "hosts deny" ----*/ - authorized = 1; - if (getcfg(logbook, "Hosts deny", list)) - { - strcpy(rem_host_ip, (char *)inet_ntoa(rem_addr)); + authorized = 1; + if (getcfg(logbook, "Hosts deny", list)) { + strcpy(rem_host_ip, (char *) inet_ntoa(rem_addr)); - n = strbreak(list, host_list, MAX_N_LIST); + n = strbreak(list, host_list, MAX_N_LIST); - /* check if current connection matches anyone on the list */ - for (i=0 ; i strlen(host_list[i]) && - equal_ustring(host_list[i], rem_host+strlen(rem_host)-strlen(host_list[i]))) - { - if (verbose) - printf("Remote host \"%s\" matches \"%s\" in \"Hosts deny\". Access denied.\n", - rem_host, host_list[i]); - authorized = 0; - break; - } - } - if (host_list[i][strlen(host_list[i])-1] == '.') - { - strcpy(str, rem_host_ip); - if (strlen(str) > strlen(host_list[i])) - str[strlen(host_list[i])] = 0; + /* check if current connection matches anyone on the list */ + for (i = 0; i < n; i++) { + if (equal_ustring(rem_host, host_list[i]) || + equal_ustring(rem_host_ip, host_list[i]) || + equal_ustring(host_list[i], "all")) { + if (verbose) + printf + ("Remote host \"%s\" matches \"%s\" in \"Hosts deny\". Access denied.\n", + equal_ustring(rem_host_ip, + host_list[i]) ? rem_host_ip : + rem_host, host_list[i]); + authorized = 0; + break; + } + if (host_list[i][0] == '.') { + if (strlen(rem_host) > strlen(host_list[i]) && + equal_ustring(host_list[i], + rem_host + strlen(rem_host) - + strlen(host_list[i]))) { + if (verbose) + printf + ("Remote host \"%s\" matches \"%s\" in \"Hosts deny\". Access denied.\n", + rem_host, host_list[i]); + authorized = 0; + break; + } + } + if (host_list[i][strlen(host_list[i]) - 1] == '.') { + strcpy(str, rem_host_ip); + if (strlen(str) > strlen(host_list[i])) + str[strlen(host_list[i])] = 0; - if (equal_ustring(host_list[i], str)) - { - if (verbose) - printf("Remote host \"%s\" matches \"%s\" in \"Hosts deny\". Access denied.\n", - rem_host_ip, host_list[i]); - authorized = 0; - break; - } + if (equal_ustring(host_list[i], str)) { + if (verbose) + printf + ("Remote host \"%s\" matches \"%s\" in \"Hosts deny\". Access denied.\n", + rem_host_ip, host_list[i]); + authorized = 0; + break; + } + } } - } - } + } /*---- check "hosts allow" ----*/ - if (getcfg(logbook, "Hosts allow", list)) - { - strcpy(rem_host_ip, (char *)inet_ntoa(acc_addr.sin_addr)); + if (getcfg(logbook, "Hosts allow", list)) { + strcpy(rem_host_ip, (char *) inet_ntoa(acc_addr.sin_addr)); - n = strbreak(list, host_list, MAX_N_LIST); + n = strbreak(list, host_list, MAX_N_LIST); - /* check if current connection matches anyone on the list */ - for (i=0 ; i strlen(host_list[i]) && + equal_ustring(host_list[i], + rem_host + strlen(rem_host) - + strlen(host_list[i]))) { + if (verbose) + printf + ("Remote host \"%s\" matches \"%s\" in \"Hosts allow\". Access granted.\n", + rem_host, host_list[i]); + authorized = 1; + break; + } + } + if (host_list[i][strlen(host_list[i]) - 1] == '.') { + strcpy(str, rem_host_ip); + if (strlen(str) > strlen(host_list[i])) + str[strlen(host_list[i])] = 0; + + if (equal_ustring(host_list[i], str)) { + if (verbose) + printf + ("Remote host \"%s\" matches \"%s\" in \"Hosts allow\". Access granted.\n", + rem_host_ip, host_list[i]); + authorized = 1; + break; + } + } } - if (host_list[i][0] == '.') - { - if (strlen(rem_host) > strlen(host_list[i]) && - equal_ustring(host_list[i], rem_host+strlen(rem_host)-strlen(host_list[i]))) - { - if (verbose) - printf("Remote host \"%s\" matches \"%s\" in \"Hosts allow\". Access granted.\n", - rem_host, host_list[i]); - authorized = 1; - break; - } - } - if (host_list[i][strlen(host_list[i])-1] == '.') - { - strcpy(str, rem_host_ip); - if (strlen(str) > strlen(host_list[i])) - str[strlen(host_list[i])] = 0; + } - if (equal_ustring(host_list[i], str)) - { - if (verbose) - printf("Remote host \"%s\" matches \"%s\" in \"Hosts allow\". Access granted.\n", - rem_host_ip, host_list[i]); - authorized = 1; - break; - } - } - } - } - - if (!authorized) - { - keep_alive = 0; - goto finished; - } - - /* ask for password if configured */ - authorized = 1; - if (getcfg(logbook, "Read Password", pwd)) - { - authorized = 0; - - /* decode authorization */ - if (strstr(net_buffer, "Authorization:")) - { - p = strstr(net_buffer, "Authorization:")+14; - if (strstr(p, "Basic")) - { - p = strstr(p, "Basic")+6; - while (*p == ' ') - p++; - i = 0; - while (*p && *p != ' ' && *p != '\r') - str[i++] = *p++; - str[i] = 0; - } - base64_decode(str, cl_pwd); - if (strchr(cl_pwd, ':')) - { - p = strchr(cl_pwd, ':')+1; - do_crypt(p, str); - strcpy(cl_pwd, str); - - /* check authorization */ - if (strcmp(str, pwd) == 0) - authorized = 1; - } - } - } - - /* check for Keep-alive */ - if (strstr(net_buffer, "Keep-Alive") != NULL && use_keepalive) - keep_alive = TRUE; - - if (!authorized) - { - /* return request for authorization */ - rsprintf("HTTP/1.1 401 Authorization Required\r\n"); - rsprintf("Server: ELOG HTTP %s\r\n", VERSION); - rsprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", logbook); - rsprintf("Connection: close\r\n"); - rsprintf("Content-Type: text/html\r\n\r\n"); - - rsprintf("\r\n"); - rsprintf("401 Authorization Required\r\n"); - rsprintf("\r\n"); - rsprintf("

Authorization Required

\r\n"); - rsprintf("This server could not verify that you\r\n"); - rsprintf("are authorized to access the document\r\n"); - rsprintf("requested. Either you supplied the wrong\r\n"); - rsprintf("credentials (e.g., bad password), or your\r\n"); - rsprintf("browser doesn't understand how to supply\r\n"); - rsprintf("the credentials required.

\r\n"); - rsprintf("\r\n"); - - keep_alive = FALSE; - } - else - { - if (strncmp(net_buffer, "GET", 3) == 0) - { - /* extract path and commands */ - *strchr(net_buffer, '\r') = 0; - - if (!strstr(net_buffer, "HTTP")) + if (!authorized) { + keep_alive = 0; goto finished; - *(strstr(net_buffer, "HTTP")-1)=0; + } - /* strip logbook from path */ - p = net_buffer+5; - for (i=0 ; *p && *p != '/' && *p != '?'; p++); - while (*p && *p == '/') - p++; + /* ask for password if configured */ + authorized = 1; + if (getcfg(logbook, "Read Password", pwd)) { + authorized = 0; - /* decode command and return answer */ - decode_get(logbook, p); - } - else if (strncmp(net_buffer, "POST", 4) == 0) - { - if (verbose) - puts(net_buffer+header_length); + /* decode authorization */ + if (strstr(net_buffer, "Authorization:")) { + p = strstr(net_buffer, "Authorization:") + 14; + if (strstr(p, "Basic")) { + p = strstr(p, "Basic") + 6; + while (*p == ' ') + p++; + i = 0; + while (*p && *p != ' ' && *p != '\r') + str[i++] = *p++; + str[i] = 0; + } + base64_decode(str, cl_pwd); + if (strchr(cl_pwd, ':')) { + p = strchr(cl_pwd, ':') + 1; + do_crypt(p, str); + strcpy(cl_pwd, str); - /* get logbook from list (needed for attachment dir) */ - for (i=0 ; lb_list[i].name[0] ; i++) - if (equal_ustring(logbook, lb_list[i].name)) - break; + /* check authorization */ + if (strcmp(str, pwd) == 0) + authorized = 1; + } + } + } - decode_post(&lb_list[i], net_buffer+header_length, boundary, content_length); - } - else - { - net_buffer[50] = 0; - sprintf(str, "Unknown request:

%s", net_buffer); - show_error(str); - } - } + /* check for Keep-alive */ + if (strstr(net_buffer, "Keep-Alive") != NULL && use_keepalive) + keep_alive = TRUE; -redir: - if (return_length != -1) - { - if (return_length == 0) - return_length = strlen_retbuf; + if (!authorized) { + /* return request for authorization */ + rsprintf("HTTP/1.1 401 Authorization Required\r\n"); + rsprintf("Server: ELOG HTTP %s\r\n", VERSION); + rsprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", logbook); + rsprintf("Connection: close\r\n"); + rsprintf("Content-Type: text/html\r\n\r\n"); - if (keep_alive && strstr(return_buffer, "Content-Length") == NULL || - strstr(return_buffer, "Content-Length") > - strstr(return_buffer, "\r\n\r\n")) - { + rsprintf("\r\n"); + rsprintf("401 Authorization Required\r\n"); + rsprintf("\r\n"); + rsprintf("

Authorization Required

\r\n"); + rsprintf("This server could not verify that you\r\n"); + rsprintf("are authorized to access the document\r\n"); + rsprintf("requested. Either you supplied the wrong\r\n"); + rsprintf("credentials (e.g., bad password), or your\r\n"); + rsprintf("browser doesn't understand how to supply\r\n"); + rsprintf("the credentials required.

\r\n"); + rsprintf("\r\n"); + + keep_alive = FALSE; + } else { + if (strncmp(net_buffer, "GET", 3) == 0) { + /* extract path and commands */ + *strchr(net_buffer, '\r') = 0; + + if (!strstr(net_buffer, "HTTP")) + goto finished; + *(strstr(net_buffer, "HTTP") - 1) = 0; + + /* strip logbook from path */ + p = net_buffer + 5; + for (i = 0; *p && *p != '/' && *p != '?'; p++); + while (*p && *p == '/') + p++; + + /* decode command and return answer */ + decode_get(logbook, p); + } else if (strncmp(net_buffer, "POST", 4) == 0) { + if (verbose) + puts(net_buffer + header_length); + + /* get logbook from list (needed for attachment dir) */ + for (i = 0; lb_list[i].name[0]; i++) + if (equal_ustring(logbook, lb_list[i].name)) + break; + + decode_post(&lb_list[i], net_buffer + header_length, + boundary, content_length); + } else { + net_buffer[50] = 0; + sprintf(str, "Unknown request:

%s", net_buffer); + show_error(str); + } + } + + redir: + if (return_length != -1) { + if (return_length == 0) + return_length = strlen_retbuf; + + if (keep_alive + && strstr(return_buffer, "Content-Length") == NULL + || strstr(return_buffer, + "Content-Length") > strstr(return_buffer, + "\r\n\r\n")) { /*---- add content-length ----*/ - p = strstr(return_buffer, "\r\n\r\n"); + p = strstr(return_buffer, "\r\n\r\n"); - if (p != NULL) - { - length = strlen(p+4); + if (p != NULL) { + length = strlen(p + 4); - header_length = (int) (p - return_buffer); - memcpy(header_buffer, return_buffer, header_length); + header_length = (int) (p - return_buffer); + memcpy(header_buffer, return_buffer, header_length); - sprintf(header_buffer+header_length, "\r\nContent-Length: %d\r\n\r\n", length); + sprintf(header_buffer + header_length, + "\r\nContent-Length: %d\r\n\r\n", length); - send(_sock, header_buffer, strlen(header_buffer), 0); - send(_sock, p+4, length, 0); + send(_sock, header_buffer, strlen(header_buffer), 0); + send(_sock, p + 4, length, 0); - if (verbose) - { - printf("==== Return ================================\n"); - puts(header_buffer); - puts(p+2); - printf("\n"); - } + if (verbose) { + printf + ("==== Return ================================\n"); + puts(header_buffer); + puts(p + 2); + printf("\n"); + } + } else + printf("Internal error, no valid header!\n"); + } else { + send(_sock, return_buffer, return_length, 0); + + if (verbose) { + printf("==== Return ================================\n"); + puts(return_buffer); + printf("\n\n"); + } } - else - printf("Internal error, no valid header!\n"); - } - else - { - send(_sock, return_buffer, return_length, 0); + finished: - if (verbose) - { - printf("==== Return ================================\n"); - puts(return_buffer); - printf("\n\n"); - } - } -finished: - - if (!keep_alive) - { - closesocket(_sock); - ka_sock[i_conn] = 0; + if (!keep_alive) { + closesocket(_sock); + ka_sock[i_conn] = 0; #ifdef DEBUG_CONN - printf("## close connection %d\n", i_conn); + printf("## close connection %d\n", i_conn); #endif - } - } + } + } } - } while (!_abort); + } while (!_abort); - printf("Server aborted.\n"); + printf("Server aborted.\n"); } /*------------------------------------------------------------------*/ void create_password(char *logbook, char *name, char *pwd) { -int fh, length, i; -char *cfgbuffer, str[256], *p; + int fh, length, i; + char *cfgbuffer, str[256], *p; - fh = open(config_file, O_RDONLY); - if (fh < 0) - { - /* create new file */ - fh = open(config_file, O_CREAT | O_WRONLY, 0640); - if (fh < 0) - { - printf("Cannot create \"%s\".\n", config_file); - return; + fh = open(config_file, O_RDONLY); + if (fh < 0) { + /* create new file */ + fh = open(config_file, O_CREAT | O_WRONLY, 0640); + if (fh < 0) { + printf("Cannot create \"%s\".\n", config_file); + return; } - sprintf(str, "[%s]\n%s=%s\n", logbook, name, pwd); - write(fh, str, strlen(str)); - close(fh); - printf("File \"%s\" created with password in logbook \"%s\".\n", config_file, logbook); - return; - } + sprintf(str, "[%s]\n%s=%s\n", logbook, name, pwd); + write(fh, str, strlen(str)); + close(fh); + printf("File \"%s\" created with password in logbook \"%s\".\n", + config_file, logbook); + return; + } - /* read existing file and add password */ - length = lseek(fh, 0, SEEK_END); - lseek(fh, 0, SEEK_SET); - cfgbuffer = malloc(length+1); - if (cfgbuffer == NULL) - { - close(fh); - return; - } - length = read(fh, cfgbuffer, length); - cfgbuffer[length] = 0; - close(fh); + /* read existing file and add password */ + length = lseek(fh, 0, SEEK_END); + lseek(fh, 0, SEEK_SET); + cfgbuffer = malloc(length + 1); + if (cfgbuffer == NULL) { + close(fh); + return; + } + length = read(fh, cfgbuffer, length); + cfgbuffer[length] = 0; + close(fh); - fh = open(config_file, O_TRUNC | O_WRONLY, 0640); + fh = open(config_file, O_TRUNC | O_WRONLY, 0640); - sprintf(str, "[%s]", logbook); + sprintf(str, "[%s]", logbook); - /* check if logbook exists already */ - if (strstr(cfgbuffer, str)) - { - p = strstr(cfgbuffer, str); + /* check if logbook exists already */ + if (strstr(cfgbuffer, str)) { + p = strstr(cfgbuffer, str); - /* search password in current logbook */ - do - { - while (*p && *p != '\n') - p++; - if (*p && *p == '\n') - p++; + /* search password in current logbook */ + do { + while (*p && *p != '\n') + p++; + if (*p && *p == '\n') + p++; - if (strncmp(p, name, strlen(name)) == 0) - { - /* replace existing password */ - i = (int) (p - cfgbuffer); - write(fh, cfgbuffer, i); - sprintf(str, "%s=%s\n", name, pwd); - write(fh, str, strlen(str)); + if (strncmp(p, name, strlen(name)) == 0) { + /* replace existing password */ + i = (int) (p - cfgbuffer); + write(fh, cfgbuffer, i); + sprintf(str, "%s=%s\n", name, pwd); + write(fh, str, strlen(str)); - printf("Password replaced in logbook \"%s\".\n", logbook); + printf("Password replaced in logbook \"%s\".\n", logbook); - while (*p && *p != '\n') - p++; - if (*p && *p == '\n') - p++; + while (*p && *p != '\n') + p++; + if (*p && *p == '\n') + p++; - /* write remainder of file */ - write(fh, p, strlen(p)); + /* write remainder of file */ + write(fh, p, strlen(p)); - free(cfgbuffer); - close(fh); - return; - } + free(cfgbuffer); + close(fh); + return; + } } while (*p && *p != '['); - if (!*p || *p == '[') - { - /* enter password into current logbook */ - p = strstr(cfgbuffer, str); - while (*p && *p != '\n') - p++; - if (*p && *p == '\n') - p++; + if (!*p || *p == '[') { + /* enter password into current logbook */ + p = strstr(cfgbuffer, str); + while (*p && *p != '\n') + p++; + if (*p && *p == '\n') + p++; - i = (int) (p - cfgbuffer); - write(fh, cfgbuffer, i); - sprintf(str, "%s=%s\n", name, pwd); + i = (int) (p - cfgbuffer); + write(fh, cfgbuffer, i); + sprintf(str, "%s=%s\n", name, pwd); + write(fh, str, strlen(str)); + + printf("Password added to logbook \"%s\".\n", logbook); + + /* write remainder of file */ + write(fh, p, strlen(p)); + + free(cfgbuffer); + close(fh); + return; + } + } else { /* write new logbook entry */ + + write(fh, cfgbuffer, strlen(cfgbuffer)); + sprintf(str, "\n[%s]\n%s=%s\n\n", logbook, name, pwd); write(fh, str, strlen(str)); - printf("Password added to logbook \"%s\".\n", logbook); + printf("Password added to new logbook \"%s\".\n", logbook); + } - /* write remainder of file */ - write(fh, p, strlen(p)); - - free(cfgbuffer); - close(fh); - return; - } - } - else /* write new logbook entry */ - { - write(fh, cfgbuffer, strlen(cfgbuffer)); - sprintf(str, "\n[%s]\n%s=%s\n\n", logbook, name, pwd); - write(fh, str, strlen(str)); - - printf("Password added to new logbook \"%s\".\n", logbook); - } - - free(cfgbuffer); - close(fh); + free(cfgbuffer); + close(fh); } void cleanup(void) { #ifdef OS_UNIX - char str[256]; + char str[256]; - /* regain original uid */ - if (setegid(orig_gid) < 0 || seteuid(orig_uid) < 0) - printf("Cannot restore original GID/UID.\n"); + /* regain original uid */ + if (setegid(orig_gid) < 0 || seteuid(orig_uid) < 0) + printf("Cannot restore original GID/UID.\n"); - if (pidfile[0]) - { - if (remove(pidfile) < 0) - { - sprintf(str, "Cannot remove pidfile \"%s\"\n", pidfile); - perror(str); + if (pidfile[0]) { + if (remove(pidfile) < 0) { + sprintf(str, "Cannot remove pidfile \"%s\"\n", pidfile); + perror(str); } - } + } #endif } @@ -14607,215 +14165,211 @@ void cleanup(void) int main(int argc, char *argv[]) { -int i, fh, tcp_port_cl; -int daemon = FALSE; -char read_pwd[80], write_pwd[80], admin_pwd[80], str[256], logbook[256]; -time_t now; -struct tm *tms; + int i, fh, tcp_port_cl; + int daemon = FALSE; + char read_pwd[80], write_pwd[80], admin_pwd[80], str[256], logbook[256]; + time_t now; + struct tm *tms; #ifdef OS_UNIX - /* save gid/uid to regain later */ - orig_gid = getegid(); - orig_uid = geteuid(); + /* save gid/uid to regain later */ + orig_gid = getegid(); + orig_uid = geteuid(); #endif - /* register cleanup function */ - atexit(cleanup); + /* register cleanup function */ + atexit(cleanup); - tzset(); + tzset(); - read_pwd[0] = write_pwd[0] = admin_pwd[0] = logbook[0] = 0; - logbook_dir [0] = resource_dir[0] = logbook_dir[0] = pidfile[0] = 0; - tcp_port_cl = 0; + read_pwd[0] = write_pwd[0] = admin_pwd[0] = logbook[0] = 0; + logbook_dir[0] = resource_dir[0] = logbook_dir[0] = pidfile[0] = 0; + tcp_port_cl = 0; - /* default config file */ - strcpy(config_file, "elogd.cfg"); + /* default config file */ + strcpy(config_file, "elogd.cfg"); - /* evaluate predefined files and directories */ + /* evaluate predefined files and directories */ #ifdef CONFIG_FILE - strlcpy(config_file, CONFIG_FILE, sizeof(config_file)); + strlcpy(config_file, CONFIG_FILE, sizeof(config_file)); #endif #ifdef RESOURCE_DIR - strlcpy(resource_dir, RESOURCE_DIR, sizeof(resource_dir)); + strlcpy(resource_dir, RESOURCE_DIR, sizeof(resource_dir)); #endif #ifdef LOGBOOK_DIR - strlcpy(logbook_dir, LOGBOOK_DIR, sizeof(logbook_dir)); + strlcpy(logbook_dir, LOGBOOK_DIR, sizeof(logbook_dir)); #endif - /* look for config file in command line parameters */ - for (i=1 ; itm_year % 100, tms->tm_mon+1, tms->tm_mday, - tms->tm_hour, tms->tm_min, tms->tm_sec); + /* parse command line parameters */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' && argv[i][1] == 'D') + daemon = TRUE; + else if (argv[i][0] == '-' && argv[i][1] == 'v') + verbose = TRUE; + else if (argv[i][0] == '-' && argv[i][1] == 'k') + use_keepalive = FALSE; + else if (argv[i][0] == '-' && argv[i][1] == 'x') + enable_execute = TRUE; + else if (argv[i][1] == 't') { + time(&now); + tms = localtime(&now); + printf("Actual date/time: %02d%02d%02d_%02d%02d%02d\n", + tms->tm_year % 100, tms->tm_mon + 1, tms->tm_mday, + tms->tm_hour, tms->tm_min, tms->tm_sec); + exit(EXIT_SUCCESS); + } else if (argv[i][0] == '-') { + if (i + 1 >= argc || argv[i + 1][0] == '-') + goto usage; + if (argv[i][1] == 'p') + tcp_port_cl = atoi(argv[++i]); + else if (argv[i][1] == 'c') + strcpy(config_file, argv[++i]); + else if (argv[i][1] == 's') + strcpy(resource_dir, argv[++i]); + else if (argv[i][1] == 'd') + strcpy(logbook_dir, argv[++i]); + else if (argv[i][1] == 'r') + strcpy(read_pwd, argv[++i]); + else if (argv[i][1] == 'w') + strcpy(write_pwd, argv[++i]); + else if (argv[i][1] == 'a') + strcpy(admin_pwd, argv[++i]); + else if (argv[i][1] == 'l') + strcpy(logbook, argv[++i]); + else if (argv[i][1] == 'h') + strlcpy(tcp_hostname, argv[++i], sizeof(tcp_hostname)); + else if (argv[i][1] == 'f') + strlcpy(pidfile, argv[++i], sizeof(pidfile)); + else { + usage: + printf + ("usage: %s [-p port] [-h hostname] [-D] [-c file] [-r pwd] [-w pwd] [-a pwd] [-l logbook] [-k] [-f file]\n\n", + argv[0]); + printf(" -p TCP/IP port\n"); + printf(" -h TCP/IP hostname\n"); + printf(" -D become a daemon\n"); + printf(" -c specify configuration file\n"); + printf + (" -s

specify resource directory (themes, icons, ...)\n"); + printf(" -d specify logbook root directory\n"); + printf(" -v debugging output\n"); + printf + (" -r create/overwrite read password in config file\n"); + printf + (" -w create/overwrite write password in config file\n"); + printf + (" -a create/overwrite admin password in config file\n"); + printf + (" -l specify logbook for -r and -w commands\n\n"); + printf(" -k do not use keep-alive\n"); + printf(" -f path/filename for PID file\n"); + printf(" -x enable execution of shell commands\n\n"); + exit(EXIT_SUCCESS); + } + } + } + + if ((read_pwd[0] || write_pwd[0] || admin_pwd[0]) && !logbook[0]) { + printf("Must specify a lookbook via the -l parameter.\n"); exit(EXIT_SUCCESS); + } + + if (read_pwd[0]) { + do_crypt(read_pwd, str); + create_password(logbook, "Read Password", str); + exit(EXIT_SUCCESS); + } + + if (write_pwd[0]) { + do_crypt(write_pwd, str); + create_password(logbook, "Write Password", str); + exit(EXIT_SUCCESS); + } + + if (admin_pwd[0]) { + do_crypt(admin_pwd, str); + create_password(logbook, "Admin Password", str); + exit(EXIT_SUCCESS); + } + + /* extract resource directory from configuration file if not given */ + if (config_file[0] && strchr(config_file, DIR_SEPARATOR) + && !resource_dir[0]) { + strcpy(resource_dir, config_file); + for (i = strlen(resource_dir) - 1; i > 0; i--) { + if (resource_dir[i] == DIR_SEPARATOR) + break; + resource_dir[i] = 0; } - else if (argv[i][0] == '-') - { - if (i+1 >= argc || argv[i+1][0] == '-') - goto usage; - if (argv[i][1] == 'p') - tcp_port_cl = atoi(argv[++i]); - else if (argv[i][1] == 'c') - strcpy(config_file, argv[++i]); - else if (argv[i][1] == 's') - strcpy(resource_dir, argv[++i]); - else if (argv[i][1] == 'd') - strcpy(logbook_dir, argv[++i]); - else if (argv[i][1] == 'r') - strcpy(read_pwd, argv[++i]); - else if (argv[i][1] == 'w') - strcpy(write_pwd, argv[++i]); - else if (argv[i][1] == 'a') - strcpy(admin_pwd, argv[++i]); - else if (argv[i][1] == 'l') - strcpy(logbook, argv[++i]); - else if (argv[i][1] == 'h') - strlcpy(tcp_hostname, argv[++i], sizeof(tcp_hostname)); - else if (argv[i][1] == 'f') - strlcpy(pidfile, argv[++i], sizeof(pidfile)); - else - { -usage: - printf("usage: %s [-p port] [-h hostname] [-D] [-c file] [-r pwd] [-w pwd] [-a pwd] [-l logbook] [-k] [-f file]\n\n", argv[0]); - printf(" -p TCP/IP port\n"); - printf(" -h TCP/IP hostname\n"); - printf(" -D become a daemon\n"); - printf(" -c specify configuration file\n"); - printf(" -s specify resource directory (themes, icons, ...)\n"); - printf(" -d specify logbook root directory\n"); - printf(" -v debugging output\n"); - printf(" -r create/overwrite read password in config file\n"); - printf(" -w create/overwrite write password in config file\n"); - printf(" -a create/overwrite admin password in config file\n"); - printf(" -l specify logbook for -r and -w commands\n\n"); - printf(" -k do not use keep-alive\n"); - printf(" -f path/filename for PID file\n"); - printf(" -x enable execution of shell commands\n\n"); - exit(EXIT_SUCCESS); - } + } + + /* do the same for the logbook dir */ + if (config_file[0] && strchr(config_file, DIR_SEPARATOR) + && !logbook_dir[0]) { + strcpy(logbook_dir, config_file); + for (i = strlen(logbook_dir) - 1; i > 0; i--) { + if (logbook_dir[i] == DIR_SEPARATOR) + break; + logbook_dir[i] = 0; } - } + strlcat(logbook_dir, "logbooks", sizeof(logbook_dir)); + } - if ((read_pwd[0] || write_pwd[0] || admin_pwd[0]) && !logbook[0]) - { - printf("Must specify a lookbook via the -l parameter.\n"); - exit(EXIT_SUCCESS); - } + /* set default logbook dir if not given */ + if (!logbook_dir[0]) + strcpy(logbook_dir, "logbooks"); - if (read_pwd[0]) - { - do_crypt(read_pwd, str); - create_password(logbook, "Read Password", str); - exit(EXIT_SUCCESS); - } + if (resource_dir[0] + && resource_dir[strlen(resource_dir) - 1] != DIR_SEPARATOR) + strlcat(resource_dir, DIR_SEPARATOR_STR, sizeof(resource_dir)); - if (write_pwd[0]) - { - do_crypt(write_pwd, str); - create_password(logbook, "Write Password", str); - exit(EXIT_SUCCESS); - } + if (logbook_dir[0] + && logbook_dir[strlen(logbook_dir) - 1] != DIR_SEPARATOR) + strlcat(logbook_dir, DIR_SEPARATOR_STR, sizeof(logbook_dir)); - if (admin_pwd[0]) - { - do_crypt(admin_pwd, str); - create_password(logbook, "Admin Password", str); - exit(EXIT_SUCCESS); - } + if (verbose) { + printf("Config file : %s\n", config_file); + printf("Resource dir : %s\n", + resource_dir[0] ? resource_dir : "current dir"); + printf("Logbook dir : %s\n", + logbook_dir[0] ? logbook_dir : "current dir"); + } - /* extract resource directory from configuration file if not given */ - if (config_file[0] && strchr(config_file, DIR_SEPARATOR) && !resource_dir[0]) - { - strcpy(resource_dir, config_file); - for (i=strlen(resource_dir)-1 ; i>0 ; i--) - { - if (resource_dir[i] == DIR_SEPARATOR) - break; - resource_dir[i] = 0; - } - } + /* get port from configuration file */ + if (tcp_port_cl != 0) + tcp_port = tcp_port_cl; + else { + if (getcfg("global", "Port", str)) + tcp_port = atoi(str); + } - /* do the same for the logbook dir */ - if (config_file[0] && strchr(config_file, DIR_SEPARATOR) && !logbook_dir[0]) - { - strcpy(logbook_dir, config_file); - for (i=strlen(logbook_dir)-1 ; i>0 ; i--) - { - if (logbook_dir[i] == DIR_SEPARATOR) - break; - logbook_dir[i] = 0; - } - strlcat(logbook_dir, "logbooks", sizeof(logbook_dir)); - } + server_loop(tcp_port, daemon); - /* set default logbook dir if not given */ - if (!logbook_dir[0]) - strcpy(logbook_dir, "logbooks"); - - if (resource_dir[0] && resource_dir[strlen(resource_dir)-1] != DIR_SEPARATOR) - strlcat(resource_dir, DIR_SEPARATOR_STR, sizeof(resource_dir)); - - if (logbook_dir[0] && logbook_dir[strlen(logbook_dir)-1] != DIR_SEPARATOR) - strlcat(logbook_dir, DIR_SEPARATOR_STR, sizeof(logbook_dir)); - - if (verbose) - { - printf("Config file : %s\n", config_file); - printf("Resource dir : %s\n", resource_dir[0] ? resource_dir : "current dir"); - printf("Logbook dir : %s\n", logbook_dir[0] ? logbook_dir : "current dir"); - } - - /* get port from configuration file */ - if (tcp_port_cl != 0) - tcp_port = tcp_port_cl; - else - { - if (getcfg("global", "Port", str)) - tcp_port = atoi(str); - } - - server_loop(tcp_port, daemon); - - exit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); }