Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Subsittute ' ' in attachment file names by '_'

Browse Source 
SVN revision: 1300
This commit is contained in:
Stefan Ritt 2005-03-29 13:16:47 +00:00
parent c4cd583273
commit 998299c96c
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.607 2005/03/29 13:16:47 ritt
Subsittute ' ' in attachment file names by '_'
Revision 1.606 2005/03/29 11:52:59 ritt Revision 1.606 2005/03/29 11:52:59 ritt
Changed is_ascii() to accept umlaute Changed is_ascii() to accept umlaute
@ -1936,12 +1939,24 @@ Do the same including '/' characters
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
void btou(char *str) void btou(char *str)
/* convert all blanks and dots to underscores in a string */ /* convert all blanks to underscores in a string */
{ {
int i; int i;
for (i = 0; i < (int) strlen(str); i++) for (i = 0; i < (int) strlen(str); i++)
if (str[i] == ' ' || str[i] == '.') if (str[i] == ' ')
str[i] = '_';
}
/*-------------------------------------------------------------------*/
void dtou(char *str)
/* convert all dots to underscores in a string */
{
int i;
for (i = 0; i < (int) strlen(str); i++)
if (str[i] == '.')
str[i] = '_'; str[i] = '_';
} }
@ -8057,6 +8072,9 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
btou(ua); btou(ua);
/* convert dots to underscores */
dtou(ua);
if (attr_flags[i] & AF_MULTI) { if (attr_flags[i] & AF_MULTI) {
rsprintf(" if (\n"); rsprintf(" if (\n");
for (j = 0; j < MAX_N_LIST && attr_options[i][j][0]; j++) { for (j = 0; j < MAX_N_LIST && attr_options[i][j][0]; j++) {
@ -8116,6 +8134,8 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
/* convert blanks to underscores */ /* convert blanks to underscores */
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
btou(ua); btou(ua);
/* convert dots to underscores */
dtou(ua);
rsprintf(" for (var i=0 ; i<document.form1.%s.value.length ; i++)\n", ua); rsprintf(" for (var i=0 ; i<document.form1.%s.value.length ; i++)\n", ua);
rsprintf(" if (document.form1.%s.value.charAt(i) != \",\" &&\n", ua); rsprintf(" if (document.form1.%s.value.charAt(i) != \",\" &&\n", ua);
@ -8316,6 +8336,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
input_maxlen = NAME_LENGTH; input_maxlen = NAME_LENGTH;
strcpy(ua, attr_list[index]); strcpy(ua, attr_list[index]);
btou(ua); btou(ua);
dtou(ua);
sprintf(str, "Format %s", attr_list[index]); sprintf(str, "Format %s", attr_list[index]);
if (getcfg(lbs->name, str, format, sizeof(format))) { if (getcfg(lbs->name, str, format, sizeof(format))) {
@ -10592,7 +10613,7 @@ void show_new_user_page(LOGBOOK * lbs)
/*---- header ----*/ /*---- header ----*/
show_html_header(NULL, TRUE, loc("ELOG new user"), TRUE, FALSE); show_html_header(lbs, TRUE, loc("ELOG new user"), TRUE, FALSE);
rsprintf("<body><center><p><p>\n"); rsprintf("<body><center><p><p>\n");
show_top_text(lbs); show_top_text(lbs);
rsprintf("<form name=form1 method=\"GET\" action=\"\">\n\n"); rsprintf("<form name=form1 method=\"GET\" action=\"\">\n\n");
@ -16888,6 +16909,7 @@ void submit_elog(LOGBOOK * lbs)
for (i = 0; i < lbs->n_attr; i++) { for (i = 0; i < lbs->n_attr; i++) {
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
btou(ua); btou(ua);
dtou(ua);
if (attr_flags[i] & AF_REQUIRED) { if (attr_flags[i] & AF_REQUIRED) {
if (attr_flags[i] & AF_DATE) { if (attr_flags[i] & AF_DATE) {
@ -16940,6 +16962,7 @@ void submit_elog(LOGBOOK * lbs)
if (attr_flags[index] & AF_NUMERIC) { if (attr_flags[index] & AF_NUMERIC) {
strcpy(ua, attr_list[index]); strcpy(ua, attr_list[index]);
btou(ua); btou(ua);
dtou(ua);
strlcpy(str, getparam(ua), sizeof(str)); strlcpy(str, getparam(ua), sizeof(str));
for (j = 0; i < (int) strlen(str); i++) for (j = 0; i < (int) strlen(str); i++)
@ -16965,6 +16988,7 @@ void submit_elog(LOGBOOK * lbs)
for (i = 0; i < n_attr; i++) { for (i = 0; i < n_attr; i++) {
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
btou(ua); btou(ua);
dtou(ua);
if (attr_flags[i] & AF_MULTI) if (attr_flags[i] & AF_MULTI)
strcat(ua, "_0"); strcat(ua, "_0");
@ -17030,6 +17054,7 @@ void submit_elog(LOGBOOK * lbs)
strcpy(ua, attr_list[i]); strcpy(ua, attr_list[i]);
btou(ua); btou(ua);
dtou(ua);
if (attr_flags[i] & AF_MULTI) { if (attr_flags[i] & AF_MULTI) {
@ -17211,6 +17236,7 @@ void submit_elog(LOGBOOK * lbs)
strcpy(ua, attr_list[index]); strcpy(ua, attr_list[index]);
btou(ua); btou(ua);
dtou(ua);
if (index < n_attr) { if (index < n_attr) {
strcpy(str, "Email "); strcpy(str, "Email ");
@ -20584,6 +20610,9 @@ void decode_post(LOGBOOK * lbs, char *string, char *boundary, int length)
*strchr(p, '\"') = 0; *strchr(p, '\"') = 0;
/* set attachment filename */ /* set attachment filename */
strlcpy(file_name, p, sizeof(file_name)); strlcpy(file_name, p, sizeof(file_name));
/* remove spaces */
btou(file_name);
if (file_name[0]) { if (file_name[0]) {
if (verbose) if (verbose)
eprintf("decode_post: Found attachment %s\n", file_name); eprintf("decode_post: Found attachment %s\n", file_name);